Move DW serializers to data_workspace.serializers

api/cases/serializers.py

@@ -28,7 +28,6 @@
     GoodCountryDecision,
     CaseType,
     CaseReviewDate,
-    DepartmentSla,
 )
 from api.compliance.models import ComplianceSiteCase, ComplianceVisitCase
 from api.compliance.serializers.ComplianceSiteCaseSerializers import ComplianceSiteViewSerializer
@@ -94,12 +93,6 @@ class Meta:
         fields = "__all__"
 
 
-class CaseDepartmentSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = DepartmentSla
-        fields = "__all__"
-
-
 class QueueCaseAssignmentUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = GovUser

api/data_workspace/case_views.py

@@ -7,11 +7,11 @@
     CaseAssignmentSlaSerializer,
     CaseTypeSerializer,
     CaseQueueSerializer,
-    CaseDepartmentSerializer,
 )
 from api.data_workspace.serializers import (
     EcjuQuerySerializer,
     CaseAssignmentSerializer,
+    DepartmentSlaSerializer,
 )
 
 
@@ -45,7 +45,7 @@ class CaseQueueList(viewsets.ReadOnlyModelViewSet):
 
 class CaseDepartmentList(viewsets.ReadOnlyModelViewSet):
     authentication_classes = (DataWorkspaceOnlyAuthentication,)
-    serializer_class = CaseDepartmentSerializer
+    serializer_class = DepartmentSlaSerializer
     pagination_class = LimitOffsetPagination
     queryset = DepartmentSla.objects.all()
 

api/data_workspace/serializers.py

@@ -1,5 +1,6 @@
 from api.audit_trail.models import Audit
-from api.cases.models import CaseAssignment, EcjuQuery
+from api.teams.models import Department
+from api.cases.models import CaseAssignment, EcjuQuery, DepartmentSla
 from api.queues.models import Queue
 
 from rest_framework import serializers
@@ -19,6 +20,18 @@ class Meta:
         fields = "__all__"
 
 
+class DepartmentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Department
+        fields = "__all__"
+
+
+class DepartmentSlaSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DepartmentSla
+        fields = "__all__"
+
+
 class AuditMoveCaseSerializer(serializers.ModelSerializer):
     """Serializer for serializing 'move case' audit events."""
 

api/data_workspace/views.py

@@ -9,7 +9,8 @@
 from api.queues.models import Queue
 from api.queues.serializers import QueueListSerializer
 from api.teams.models import Team, Department
-from api.teams.serializers import TeamReadOnlySerializer, DepartmentSerializer
+from api.teams.serializers import TeamReadOnlySerializer
+from api.data_workspace.serializers import DepartmentSerializer
 
 
 class OrganisationListView(viewsets.ReadOnlyModelViewSet):

api/teams/serializers.py

@@ -2,7 +2,7 @@
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
 
-from api.teams.models import Team, Department
+from api.teams.models import Team
 
 
 class TeamReadOnlySerializer(serializers.Serializer):
@@ -48,9 +48,3 @@ def validate(self, attrs):
             raise serializers.ValidationError({"is_ogd": "Select yes if the team is an OGD"})
 
         return validated_data
-
-
-class DepartmentSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Department
-        fields = "__all__"