From 2027f3fe9769e948af7cac5bf673142164051c04 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 16 Jun 2025 14:59:18 +0930 Subject: [PATCH] test: Add depreciated models to be excluded from coverage ref: #833 --- app/access/serializers/centurionaudit_team.py | 56 ------------ .../serializers/centurionaudit_teamusers.py | 56 ------------ .../serializers/centurionmodelnote_team.py | 87 ------------------- .../centurionmodelnote_teamusers.py | 87 ------------------- app/conftest.py | 10 ++- pyproject.toml | 30 +++++++ 6 files changed, 38 insertions(+), 288 deletions(-) delete mode 100644 app/access/serializers/centurionaudit_team.py delete mode 100644 app/access/serializers/centurionaudit_teamusers.py delete mode 100644 app/access/serializers/centurionmodelnote_team.py delete mode 100644 app/access/serializers/centurionmodelnote_teamusers.py diff --git a/app/access/serializers/centurionaudit_team.py b/app/access/serializers/centurionaudit_team.py deleted file mode 100644 index 8835ca77..00000000 --- a/app/access/serializers/centurionaudit_team.py +++ /dev/null @@ -1,56 +0,0 @@ -from rest_framework import serializers - -from drf_spectacular.utils import extend_schema_serializer - -from api.serializers import common - -from centurion.models.meta import TeamAuditHistory # pylint: disable=E0401:import-error disable=E0611:no-name-in-module - -from core.serializers.centurionaudit import ( - BaseSerializer, - ViewSerializer as AuditHistoryViewSerializer -) - - - - -@extend_schema_serializer(component_name = 'TeamAuditHistoryModelSerializer') -class ModelSerializer( - common.CommonModelSerializer, - BaseSerializer -): - """Git Group Audit History Base Model""" - - - _urls = serializers.SerializerMethodField('get_url') - - - class Meta: - - model = TeamAuditHistory - - fields = [ - 'id', - 'organization', - 'display_name', - 'content_type', - 'model', - 'before', - 'after', - 'action', - 'user', - 'created', - '_urls', - ] - - read_only_fields = fields - - - -@extend_schema_serializer(component_name = 'TeamAuditHistoryViewSerializer') -class ViewSerializer( - ModelSerializer, - AuditHistoryViewSerializer, -): - """Git Group Audit History Base View Model""" - pass diff --git a/app/access/serializers/centurionaudit_teamusers.py b/app/access/serializers/centurionaudit_teamusers.py deleted file mode 100644 index af2011a4..00000000 --- a/app/access/serializers/centurionaudit_teamusers.py +++ /dev/null @@ -1,56 +0,0 @@ -from rest_framework import serializers - -from drf_spectacular.utils import extend_schema_serializer - -from api.serializers import common - -from centurion.models.meta import TeamUsersAuditHistory # pylint: disable=E0401:import-error disable=E0611:no-name-in-module - -from core.serializers.centurionaudit import ( - BaseSerializer, - ViewSerializer as AuditHistoryViewSerializer -) - - - - -@extend_schema_serializer(component_name = 'TeamUsersAuditHistoryModelSerializer') -class ModelSerializer( - common.CommonModelSerializer, - BaseSerializer -): - """Git Group Audit History Base Model""" - - - _urls = serializers.SerializerMethodField('get_url') - - - class Meta: - - model = TeamUsersAuditHistory - - fields = [ - 'id', - 'organization', - 'display_name', - 'content_type', - 'model', - 'before', - 'after', - 'action', - 'user', - 'created', - '_urls', - ] - - read_only_fields = fields - - - -@extend_schema_serializer(component_name = 'TeamUsersAuditHistoryViewSerializer') -class ViewSerializer( - ModelSerializer, - AuditHistoryViewSerializer, -): - """Git Group Audit History Base View Model""" - pass diff --git a/app/access/serializers/centurionmodelnote_team.py b/app/access/serializers/centurionmodelnote_team.py deleted file mode 100644 index 461733b4..00000000 --- a/app/access/serializers/centurionmodelnote_team.py +++ /dev/null @@ -1,87 +0,0 @@ -from rest_framework import serializers - -from drf_spectacular.utils import extend_schema_serializer - -from access.serializers.organization import (TenantBaseSerializer) - -from centurion.models.meta import TeamCenturionModelNote # pylint: disable=E0401:import-error disable=E0611:no-name-in-module - -from core.serializers.centurionmodelnote import ( # pylint: disable=W0611:unused-import - BaseSerializer, - ModelSerializer as BaseModelModelSerializer, - ViewSerializer as BaseModelViewSerializer -) - - - -@extend_schema_serializer(component_name = 'TeamModelNoteModelSerializer') -class ModelSerializer( - BaseModelModelSerializer, -): - - - _urls = serializers.SerializerMethodField('get_url') - - def get_url(self, item) -> dict: - - return { - '_self': item.get_url( request = self._context['view'].request ), - } - - - class Meta: - - model = TeamCenturionModelNote - - fields = [ - 'id', - 'organization', - 'display_name', - 'body', - 'created_by', - 'modified_by', - 'content_type', - 'model', - 'created', - 'modified', - '_urls', - ] - - read_only_fields = [ - 'id', - 'display_name', - 'organization', - 'created_by', - 'modified_by', - 'content_type', - 'model', - 'created', - 'modified', - '_urls', - ] - - - - def validate(self, attrs): - - is_valid = False - - note_model = self.Meta.model.model.field.related_model - - attrs['model'] = note_model.objects.get( - id = int( self.context['view'].kwargs['model_id'] ) - ) - - - is_valid = super().validate(attrs) - - return is_valid - - -@extend_schema_serializer(component_name = 'TeamModelNoteViewSerializer') -class ViewSerializer( - ModelSerializer, - BaseModelViewSerializer, -): - - organization = TenantBaseSerializer( many = False, read_only = True ) diff --git a/app/access/serializers/centurionmodelnote_teamusers.py b/app/access/serializers/centurionmodelnote_teamusers.py deleted file mode 100644 index 067eb414..00000000 --- a/app/access/serializers/centurionmodelnote_teamusers.py +++ /dev/null @@ -1,87 +0,0 @@ -from rest_framework import serializers - -from drf_spectacular.utils import extend_schema_serializer - -from access.serializers.organization import (TenantBaseSerializer) - -from centurion.models.meta import TeamUsersCenturionModelNote # pylint: disable=E0401:import-error disable=E0611:no-name-in-module - -from core.serializers.centurionmodelnote import ( # pylint: disable=W0611:unused-import - BaseSerializer, - ModelSerializer as BaseModelModelSerializer, - ViewSerializer as BaseModelViewSerializer -) - - - -@extend_schema_serializer(component_name = 'TeamUsersModelNoteModelSerializer') -class ModelSerializer( - BaseModelModelSerializer, -): - - - _urls = serializers.SerializerMethodField('get_url') - - def get_url(self, item) -> dict: - - return { - '_self': item.get_url( request = self._context['view'].request ), - } - - - class Meta: - - model = TeamUsersCenturionModelNote - - fields = [ - 'id', - 'organization', - 'display_name', - 'body', - 'created_by', - 'modified_by', - 'content_type', - 'model', - 'created', - 'modified', - '_urls', - ] - - read_only_fields = [ - 'id', - 'display_name', - 'organization', - 'created_by', - 'modified_by', - 'content_type', - 'model', - 'created', - 'modified', - '_urls', - ] - - - - def validate(self, attrs): - - is_valid = False - - note_model = self.Meta.model.model.field.related_model - - attrs['model'] = note_model.objects.get( - id = int( self.context['view'].kwargs['model_id'] ) - ) - - - is_valid = super().validate(attrs) - - return is_valid - - -@extend_schema_serializer(component_name = 'TeamUsersModelNoteViewSerializer') -class ViewSerializer( - ModelSerializer, - BaseModelViewSerializer, -): - - organization = TenantBaseSerializer( many = False, read_only = True ) diff --git a/app/conftest.py b/app/conftest.py index e37da01b..631ad81b 100644 --- a/app/conftest.py +++ b/app/conftest.py @@ -576,7 +576,10 @@ def organization_two(django_db_blocker): with django_db_blocker.unblock(): - item.delete() + try: + item.delete() + except: + pass @@ -597,7 +600,10 @@ def organization_three(django_db_blocker): with django_db_blocker.unblock(): - item.delete() + try: + item.delete() + except: + pass diff --git a/pyproject.toml b/pyproject.toml index b18b3004..736d0005 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,36 @@ omit = [ "*wsgi*", "*admin.py", "*urls.py", + ############################################## + # Depreciated Code Scheduled to be removed + ############################################## + # + # Organization rename to Tenant + # + "app/access/models/organization.py", + # + # Old History Model + # + "app/core/models/model_history.py", + "/models/*_history.py", + # + # Old Notes model + # + "app/core/models/notes.py", + "/models/*_notes.py", + # + # Old Ticketing Model + # + "app/core/models/ticket/*", + "app/core/signal/ticket_linked_item_delete.py", + "app/core/serializers/ticket_depreciated.py", + "app/core/viewsets/ticket_depreciated.py", + # "app/core/serializers/ticket_related.py", + # "app/core/serializers/ticket_linked_item.py", + "app/core/viewsets/related_ticket.py", + "app/core/viewsets/ticket_linked_item.py", + "app/core/viewsets/ticket_comment_depreciated.py", + ]