From cb54238e5df11ddc7406d5b2b0f2b6d6928f7825 Mon Sep 17 00:00:00 2001
From: Mano <manossef@gmail.com>
Date: Wed, 29 Sep 2021 11:59:17 +0100
Subject: [PATCH] Move DW serializers to data_workspace.serializers

---
 api/cases/serializers.py          |  7 -------
 api/data_workspace/case_views.py  |  4 ++--
 api/data_workspace/serializers.py | 15 ++++++++++++++-
 api/data_workspace/views.py       |  3 ++-
 api/teams/serializers.py          |  8 +-------
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/api/cases/serializers.py b/api/cases/serializers.py
index 1e1b6bb08..65c4a0654 100644
--- a/api/cases/serializers.py
+++ b/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
diff --git a/api/data_workspace/case_views.py b/api/data_workspace/case_views.py
index 9613beec0..504e12480 100644
--- a/api/data_workspace/case_views.py
+++ b/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()
 
diff --git a/api/data_workspace/serializers.py b/api/data_workspace/serializers.py
index e6fe8a405..35a5f034c 100644
--- a/api/data_workspace/serializers.py
+++ b/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."""
 
diff --git a/api/data_workspace/views.py b/api/data_workspace/views.py
index d2e084dfa..e66cb334f 100644
--- a/api/data_workspace/views.py
+++ b/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):
diff --git a/api/teams/serializers.py b/api/teams/serializers.py
index 24c193c13..fbe1285c4 100644
--- a/api/teams/serializers.py
+++ b/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__"