nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

refactor(access): Rename model Organization -> Tenant

Browse Source 
ref: #756 #505
This commit is contained in:
Jon Lockwood
2025-05-14 23:22:48 +09:30
parent 2e49de8573
commit 2d7335ff85
348 changed files with 1107 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/forms/common.py
View File

@ -1,7 +1,7 @@
from django import forms
from django.db.models import Q
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team_user import TeamUsers

6
app/core/lib/slash_commands/linked_model.py
View File

@ -209,11 +209,11 @@ For this command to process the following conditions must be met:
item_type = TicketLinkedItem.Modules.OPERATING_SYSTEM
elif model_type == 'organization':
elif model_type == 'tenant':
from access.models.organization import Organization
from access.models.tenant import Tenant
model = Organization
model = Tenant
item_type = TicketLinkedItem.Modules.ORGANIZATION

4
app/core/migrations/0016_data_move_history_to_new_table.py
View File

@ -6,7 +6,7 @@ from django.conf import settings
from django.contrib.auth.models import ContentType
from django.db import migrations, models
from access.models.organization_history import Organization, OrganizationHistory
from access.models.organization_history import Tenant, OrganizationHistory
from access.models.team_history import Team, TeamHistory
from assistance.models.knowledge_base_history import KnowledgeBase, KnowledgeBaseHistory
@ -334,7 +334,7 @@ def model_details(item_pk, item_class) -> dict:
case 'organization':
model_class = Organization
model_class = Tenant
history_class = OrganizationHistory

76
app/core/migrations/0026_alter_manufacturer_organization_and_more.py Normal file
View File

@ -0,0 +1,76 @@
# Generated by Django 5.1.9 on 2025-05-14 13:48
import access.models.tenancy
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('access', '0008_alter_tenant_options_alter_entity_organization_and_more'),
('core', '0025_ticketcommentaction'),
]
operations = [
migrations.AlterField(
model_name='manufacturer',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='modelhistory',
name='organization',
field=models.ForeignKey(help_text='Tenant this belongs to', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', verbose_name='Tenant'),
),
migrations.AlterField(
model_name='modelnotes',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='notes',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='relatedtickets',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticket',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketbase',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketcategory',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketcomment',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketcommentbase',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketcommentcategory',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
migrations.AlterField(
model_name='ticketlinkeditem',
name='organization',
field=models.ForeignKey(help_text='Tenancy this belongs to', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='access.tenant', validators=[access.models.tenancy.TenancyObject.validatate_organization_exists], verbose_name='Tenant'),
),
]

2
app/core/mixin/history_save.py
View File

@ -158,7 +158,7 @@ class SaveHistory(models.Model):
organization = getattr(self, 'organization', None)
if self._meta.model_name == 'organization':
if self._meta.model_name == 'tenant':
organization = self

8
app/core/models/model_history.py
View File

@ -7,7 +7,7 @@ from django.db import models
from rest_framework.reverse import reverse
from access.fields import AutoCreatedField
from access.models.organization import Organization
from access.models.tenant import Tenant
from access.models.tenancy import TenancyObject
from core.lib.feature_not_used import FeatureNotUsed
@ -72,13 +72,13 @@ class ModelHistory(
)
organization = models.ForeignKey(
Organization,
Tenant,
blank = False,
help_text = 'Organization this belongs to',
help_text = 'Tenant this belongs to',
null = True,
on_delete = models.CASCADE,
related_name = '+',
verbose_name = 'Organization'
verbose_name = 'Tenant'
)
user = models.ForeignKey(

6
app/core/models/ticket/ticket_linked_items.py
View File

@ -45,7 +45,7 @@ class TicketLinkedItem(TenancyObject):
SOFTWARE = 6, 'Software'
KB = 7, 'Knowledge Base'
ORGANIZATION = 8, 'Organization'
TENANT = 8, 'Tenant'
TEAM = 9, 'Team'
FEATURE_FLAG = 10, 'Feature Flag'
SOFTWARE_VERSION = 11, 'Software Version'
@ -152,9 +152,9 @@ class TicketLinkedItem(TenancyObject):
item_type = 'operating_system'
elif self.item_type == TicketLinkedItem.Modules.ORGANIZATION:
elif self.item_type == TicketLinkedItem.Modules.TENANT:
item_type = 'organization'
item_type = 'tenant'
elif self.item_type == TicketLinkedItem.Modules.SERVICE:

2
app/core/serializers/celery_log.py
View File

@ -5,7 +5,7 @@ from rest_framework import serializers
from django_celery_results.models import TaskResult
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from app.serializers.user import UserBaseSerializer

4
app/core/serializers/history.py
View File

@ -1,7 +1,7 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from app.serializers.user import UserBaseSerializer
@ -138,6 +138,6 @@ class HistoryModelSerializer(HistoryBaseSerializer):
class HistoryViewSerializer(HistoryModelSerializer):
organization = OrganizationBaseSerializer( read_only = True )
organization = TenantBaseSerializer( read_only = True )
user = UserBaseSerializer( read_only = True )

4
app/core/serializers/manufacturer.py
View File

@ -1,7 +1,7 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from app.serializers.user import UserBaseSerializer
@ -80,4 +80,4 @@ class ManufacturerModelSerializer(
class ManufacturerViewSerializer(ManufacturerModelSerializer):
organization = OrganizationBaseSerializer( read_only = True )
organization = TenantBaseSerializer( read_only = True )

6
app/core/serializers/model_notes.py
View File

@ -2,7 +2,7 @@ from django.contrib.auth.models import ContentType
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from api.serializers import common
@ -106,7 +106,7 @@ class ModelNoteModelSerializer(
attrs['model_id'] = int(self.fields.fields['model'].context['view'].kwargs['model_id'])
if str(related_model._meta.model_name).lower() == 'organization':
if str(related_model._meta.model_name).lower() == 'tenant':
attrs['organization'] = related_model.objects.get(
pk = int(self.fields.fields['model'].context['view'].kwargs['model_id'])
@ -142,7 +142,7 @@ class ModelNoteModelSerializer(
class ModelNoteViewSerializer(ModelNoteModelSerializer):
organization = OrganizationBaseSerializer( many = False, read_only = True )
organization = TenantBaseSerializer( many = False, read_only = True )
created_by = UserBaseSerializer( many = False, read_only = True )

4
app/core/serializers/ticket.py
View File

@ -4,7 +4,7 @@ from rest_framework.reverse import reverse
from drf_spectacular.utils import extend_schema_serializer
from access.serializers.entity import BaseSerializer as EntityBaseSerializer
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from api.serializers import common
@ -411,7 +411,7 @@ class ViewSerializer(ModelSerializer):
opened_by = UserBaseSerializer()
organization = OrganizationBaseSerializer(many=False, read_only=True)
organization = TenantBaseSerializer(many=False, read_only=True)
parent_ticket = BaseSerializer()

4
app/core/serializers/ticket_category.py
View File

@ -1,7 +1,7 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from api.serializers import common
@ -102,4 +102,4 @@ class TicketCategoryModelSerializer(
class TicketCategoryViewSerializer(TicketCategoryModelSerializer):
organization = OrganizationBaseSerializer(many=False, read_only=True)
organization = TenantBaseSerializer(many=False, read_only=True)

4
app/core/serializers/ticket_comment.py
View File

@ -7,7 +7,7 @@ from rest_framework import serializers
from drf_spectacular.utils import extend_schema_serializer
from access.serializers.entity import BaseSerializer as EntityBaseSerializer
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from api.serializers import common
from api.exceptions import UnknownTicketType
@ -319,7 +319,7 @@ class ViewSerializer(ModelSerializer):
category = TicketCommentCategoryBaseSerializer( many = False, read_only = True )
organization = OrganizationBaseSerializer( many = False )
organization = TenantBaseSerializer( many = False )
parent = BaseSerializer()

4
app/core/serializers/ticket_comment_category.py
View File

@ -1,7 +1,7 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from app.serializers.user import UserBaseSerializer
@ -117,4 +117,4 @@ class TicketCommentCategoryModelSerializer(
class TicketCommentCategoryViewSerializer(TicketCommentCategoryModelSerializer):
organization = OrganizationBaseSerializer( read_only = True )
organization = TenantBaseSerializer( read_only = True )

4
app/core/serializers/ticket_comment_depreciated.py
View File

@ -3,7 +3,7 @@ from rest_framework.reverse import reverse
from rest_framework import serializers
from rest_framework.fields import empty
from access.serializers.organization import Organization, OrganizationBaseSerializer
from access.serializers.organization import Organization, TenantBaseSerializer
from access.serializers.teams import TeamBaseSerializer
from api.serializers import common
@ -683,7 +683,7 @@ class TicketCommentImportModelSerializer(TicketCommentModelSerializer):
class TicketCommentViewSerializer(TicketCommentModelSerializer):
organization = OrganizationBaseSerializer( many = False )
organization = TenantBaseSerializer( many = False )
category = TicketCommentCategoryBaseSerializer( many = False, read_only = True )

4
app/core/serializers/ticket_depreciated.py
View File

@ -1,7 +1,7 @@
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from access.serializers.teams import TeamBaseSerializer
from app.serializers.user import UserBaseSerializer
@ -351,7 +351,7 @@ class TicketViewSerializer(TicketModelSerializer):
opened_by = UserBaseSerializer()
organization = OrganizationBaseSerializer(many=False, read_only=True)
organization = TenantBaseSerializer(many=False, read_only=True)
project = ProjectBaseSerializer(many=False, read_only=True)

10
app/core/serializers/ticket_linked_item.py
View File

@ -2,7 +2,7 @@ from rest_framework.fields import empty
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from assistance.serializers.request import TicketBaseSerializer
@ -157,7 +157,7 @@ class TicketLinkedItemModelSerializer(
class TicketLinkedItemViewSerializer(TicketLinkedItemModelSerializer):
organization = OrganizationBaseSerializer(many=False, read_only=True)
organization = TenantBaseSerializer(many=False, read_only=True)
item = serializers.SerializerMethodField('get_item')
@ -214,11 +214,11 @@ class TicketLinkedItemViewSerializer(TicketLinkedItemModelSerializer):
model = OperatingSystem
elif item.item_type == TicketLinkedItem.Modules.ORGANIZATION:
elif item.item_type == TicketLinkedItem.Modules.TENANT:
from access.serializers.organization import Organization, OrganizationBaseSerializer
from access.serializers.organization import Organization, TenantBaseSerializer
base_serializer = OrganizationBaseSerializer
base_serializer = TenantBaseSerializer
model = Organization

4
app/core/serializers/ticket_related.py
View File

@ -2,7 +2,7 @@ from rest_framework.fields import empty
from rest_framework.reverse import reverse
from rest_framework import serializers
from access.serializers.organization import OrganizationBaseSerializer
from access.serializers.organization import TenantBaseSerializer
from api.serializers import common
@ -151,6 +151,6 @@ class RelatedTicketViewSerializer(RelatedTicketModelSerializer):
from_ticket_id = TicketBaseSerializer()
organization = OrganizationBaseSerializer(many=False, read_only=True)
organization = TenantBaseSerializer(many=False, read_only=True)
to_ticket_id = TicketBaseSerializer()

2
app/core/tests/abstract/model_notes_api_fields.py
View File

@ -7,7 +7,7 @@ from django.test import Client, TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_functional_history.py
View File

@ -1,6 +1,6 @@
from django.contrib.auth.models import ContentType
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization

2
app/core/tests/abstract/test_functional_notes_viewset.py
View File

@ -3,7 +3,7 @@ import django
from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_item_ticket_api_v2.py
View File

@ -7,7 +7,7 @@ from django.test import TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_ticket_api_v2.py
View File

@ -7,7 +7,7 @@ from django.test import Client, TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_ticket_serializer.py
View File

@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.middleware.request import Tenancy
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_ticket_viewset.py
View File

@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_unit_model_history_api_v2.py
View File

@ -5,7 +5,7 @@ from django.test import Client
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/abstract/test_unit_model_notes_serializer.py
View File

@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.abstract.mock_view import MockView

2
app/core/tests/functional/manufacturer/test_manufacturer_serializer.py
View File

@ -4,7 +4,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from core.serializers.manufacturer import Manufacturer, ManufacturerModelSerializer

2
app/core/tests/functional/manufacturer/test_manufacturer_viewset.py
View File

@ -9,7 +9,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/related_ticket/test_related_ticket_serializer.py
View File

@ -5,7 +5,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.abstract.mock_view import MockView

2
app/core/tests/functional/related_ticket/test_related_ticket_viewset.py
View File

@ -10,7 +10,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/slash_commands/test_slash_command_related.py
View File

@ -5,7 +5,7 @@ import unittest
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.person import Person
from core.models.ticket.ticket import Ticket

2
app/core/tests/functional/test_history/test_functional_history_viewset.py
View File

@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/test_task_result/test_task_result_viewset.py
View File

@ -9,7 +9,7 @@ from django import urls
from django_celery_results.models import TaskResult
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.py
View File

@ -4,7 +4,7 @@ from django.contrib.auth.models import Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_base/test_functional_ticket_base_viewset.py
View File

@ -4,7 +4,7 @@ from django.contrib.auth.models import Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_category/test_ticket_category_serializer.py
View File

@ -4,7 +4,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.abstract.mock_view import MockView, User

2
app/core/tests/functional/ticket_category/test_ticket_category_viewset.py
View File

@ -9,7 +9,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_comment/test_ticket_comment_serializer.py
View File

@ -6,7 +6,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.middleware.request import Tenancy
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from core.serializers.ticket_comment_depreciated import (
Ticket,

2
app/core/tests/functional/ticket_comment/test_ticket_comment_viewset.py
View File

@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py
View File

@ -4,7 +4,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.abstract.mock_view import MockView, User

2
app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py
View File

@ -9,7 +9,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_serializer.py
View File

@ -5,7 +5,7 @@ from django.test import TestCase
from rest_framework.exceptions import ValidationError
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from core.serializers.ticket_linked_item import Ticket, TicketLinkedItem, TicketLinkedItemModelSerializer

2
app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_viewset.py
View File

@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py
View File

@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/manufacturer/test_manufacturer_permission.py
View File

@ -10,7 +10,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/model_notes/test_unit_model_notes_model.py
View File

@ -3,7 +3,7 @@ import django
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.unit.test_unit_models import TenancyObjectInheritedCases

2
app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py
View File

@ -7,7 +7,7 @@ from django.test import Client, TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/test_history/test_unit_history_model.py
View File

@ -3,7 +3,7 @@ import django
from django.contrib.auth.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.unit.test_unit_models import TenancyObjectInheritedCases

2
app/core/tests/unit/test_task_result/test_task_result.py
View File

@ -10,7 +10,7 @@ from django.test import TestCase
from celery import states
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/test_task_result/test_task_result_api_v2.py
View File

@ -11,7 +11,7 @@ from django_celery_results.models import TaskResult
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py
View File

@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_category/test_ticket_category_permission.py
View File

@ -10,7 +10,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_category/test_ticket_category_permission_api.py
View File

@ -7,7 +7,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment/test_ticket_comment_api_v2.py
View File

@ -8,7 +8,7 @@ from django.test import Client, TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py
View File

@ -11,7 +11,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.py
View File

@ -8,7 +8,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment/test_unit_ticket_comment_model.py
View File

@ -3,7 +3,7 @@ import pytest
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from app.tests.unit.test_unit_models import (
TenancyObjectInheritedCases

2
app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py
View File

@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
from django.shortcuts import reverse
from django.test import Client, TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py
View File

@ -9,7 +9,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.py
View File

@ -7,7 +7,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission.py
View File

@ -13,7 +13,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_depreciated/test_ticket_depreciated_permission_api.py
View File

@ -7,7 +7,7 @@ from django.contrib.auth.models import AnonymousUser, Permission
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py
View File

@ -7,7 +7,7 @@ from django.test import Client, TestCase
from rest_framework.relations import Hyperlink
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py
View File

@ -11,7 +11,7 @@ import pytest
import unittest
import requests
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from access.models.team import Team
from access.models.team_user import TeamUsers

2
app/core/tests/unit/ticket_linked_item/test_unit_ticket_linked_item_model.py
View File

@ -2,7 +2,7 @@ import django
from django.test import TestCase
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from assistance.models.knowledge_base import KnowledgeBase

2
app/core/viewsets/ticket_depreciated.py
View File

@ -1,7 +1,7 @@
from api.exceptions import UnknownTicketType
from api.viewsets.common import ModelViewSet
from access.models.organization import Organization
from access.models.tenant import Tenant as Organization
from assistance.serializers.request import (
RequestAddTicketModelSerializer,