Rename all models *Sla -> *SLA

api/cases/models.py

@@ -243,7 +243,7 @@ class Meta:
         db_table = "cases_case_queues"
 
 
-class CaseAssignmentSla(models.Model):
+class CaseAssignmentSLA(models.Model):
     """
     Keeps track of days passed since case assigned to a team
     """
@@ -253,7 +253,7 @@ class CaseAssignmentSla(models.Model):
     case = models.ForeignKey(Case, related_name="slas", on_delete=models.CASCADE)
 
 
-class DepartmentSla(models.Model):
+class DepartmentSLA(models.Model):
     """
     Keeps track of days passed since application received in department
     """

api/cases/serializers.py

@@ -19,7 +19,7 @@
     Case,
     CaseNote,
     CaseAssignment,
-    CaseAssignmentSla,
+    CaseAssignmentSLA,
     CaseDocument,
     CaseQueue,
     EcjuQuery,
@@ -81,9 +81,9 @@ class Meta:
         )
 
 
-class CaseAssignmentSlaSerializer(serializers.ModelSerializer):
+class CaseAssignmentSLASerializer(serializers.ModelSerializer):
     class Meta:
-        model = CaseAssignmentSla
+        model = CaseAssignmentSLA
         fields = "__all__"
 
 

api/cases/tasks.py

@@ -10,7 +10,7 @@
 from pytz import timezone as tz
 
 from api.cases.enums import CaseTypeSubTypeEnum
-from api.cases.models import Case, CaseAssignmentSla, CaseQueue, DepartmentSla
+from api.cases.models import Case, CaseAssignmentSLA, CaseQueue, DepartmentSLA
 from api.cases.models import EcjuQuery
 from api.common.dates import is_weekend, is_bank_holiday
 from api.staticdata.statuses.enums import CaseStatusEnum
@@ -108,20 +108,20 @@ def update_cases_sla():
                 for assignment in CaseQueue.objects.filter(case__in=cases):
                     # Update team SLAs
                     try:
-                        assignment_sla = CaseAssignmentSla.objects.get(queue=assignment.queue, case=assignment.case)
+                        assignment_sla = CaseAssignmentSLA.objects.get(queue=assignment.queue, case=assignment.case)
                         assignment_sla.sla_days += 1
                         assignment_sla.save()
-                    except CaseAssignmentSla.DoesNotExist:
-                        CaseAssignmentSla.objects.create(queue=assignment.queue, case=assignment.case, sla_days=1)
+                    except CaseAssignmentSLA.DoesNotExist:
+                        CaseAssignmentSLA.objects.create(queue=assignment.queue, case=assignment.case, sla_days=1)
                     # Update department SLAs
                     department = assignment.queue.team.department
                     if department is not None:
                         try:
-                            department_sla = DepartmentSla.objects.get(department=department, case=assignment.case)
+                            department_sla = DepartmentSLA.objects.get(department=department, case=assignment.case)
                             department_sla.sla_days += 1
                             department_sla.save()
-                        except DepartmentSla.DoesNotExist:
-                            DepartmentSla.objects.create(department=department, case=assignment.case, sla_days=1)
+                        except DepartmentSLA.DoesNotExist:
+                            DepartmentSLA.objects.create(department=department, case=assignment.case, sla_days=1)
 
                 results = cases.select_for_update().update(
                     sla_days=F("sla_days") + 1, sla_remaining_days=F("sla_remaining_days") - 1, sla_updated_at=date,

api/cases/tests/factories.py

@@ -9,7 +9,7 @@
     CaseType,
     EcjuQuery,
     GoodCountryDecision,
-    DepartmentSla,
+    DepartmentSLA,
 )
 from api.queues.tests.factories import QueueFactory
 from api.organisations.tests.factories import OrganisationFactory
@@ -67,13 +67,13 @@ class Meta:
         model = Case
 
 
-class DepartmentSlaFactory(factory.django.DjangoModelFactory):
+class DepartmentSLAFactory(factory.django.DjangoModelFactory):
     sla_days = factory.Faker("pyint", min_value=0, max_value=30)
     case = factory.SubFactory(CaseFactory)
     department = factory.SubFactory(DepartmentFactory)
 
     class Meta:
-        model = DepartmentSla
+        model = DepartmentSLA
 
 
 class CaseAssignmentFactory(factory.django.DjangoModelFactory):

api/cases/tests/test_sla.py

@@ -19,7 +19,7 @@
     SLA_UPDATE_CUTOFF_TIME,
     HMRC_QUERY_TARGET_DAYS,
 )
-from api.cases.models import CaseAssignmentSla, CaseQueue, DepartmentSla
+from api.cases.models import CaseAssignmentSLA, CaseQueue, DepartmentSLA
 from api.staticdata.statuses.enums import CaseStatusEnum
 from api.staticdata.statuses.libraries.get_case_status import get_case_status_by_status
 from api.teams.models import Department
@@ -138,7 +138,7 @@ def test_sla_update_exhibition_mod(
             case=application.case_ptr, queue=self.queue,
         )
         results = update_cases_sla.now()
-        sla = CaseAssignmentSla.objects.get()
+        sla = CaseAssignmentSLA.objects.get()
         case.refresh_from_db()
 
         self.assertEqual(sla.sla_days, 1)
@@ -163,7 +163,7 @@ def test_sla_update_F680_mod(
         CaseQueue.objects.create(
             queue=self.queue, case=application.case_ptr,
         )
-        sla = CaseAssignmentSla.objects.create(sla_days=4, queue=self.queue, case=application.case_ptr,)
+        sla = CaseAssignmentSLA.objects.create(sla_days=4, queue=self.queue, case=application.case_ptr,)
         results = update_cases_sla.now()
 
         case.refresh_from_db()
@@ -574,7 +574,7 @@ def test_sla_not_update_for_terminal(
             self.assertEqual(case.sla_remaining_days, STANDARD_APPLICATION_TARGET_DAYS - 1)
 
 
-class DepartmentSlaTests(DataTestClient):
+class DepartmentSLATests(DataTestClient):
     @mock.patch("api.cases.tasks.is_weekend")
     @mock.patch("api.cases.tasks.is_bank_holiday")
     def test_department_sla_updated(
@@ -598,5 +598,5 @@ def test_department_sla_updated(
         self.team.department = test_department
         self.team.save()
         update_cases_sla.now()
-        department_sla = DepartmentSla.objects.get(department=test_department)
+        department_sla = DepartmentSLA.objects.get(department=test_department)
         self.assertEqual(department_sla.sla_days, 1)

api/data_workspace/case_views.py

@@ -2,16 +2,16 @@
 from rest_framework.pagination import LimitOffsetPagination
 
 from api.core.authentication import DataWorkspaceOnlyAuthentication
-from api.cases.models import CaseAssignment, CaseAssignmentSla, CaseType, CaseQueue, EcjuQuery, DepartmentSla
+from api.cases.models import CaseAssignment, CaseAssignmentSLA, CaseType, CaseQueue, EcjuQuery, DepartmentSLA
 from api.cases.serializers import (
-    CaseAssignmentSlaSerializer,
+    CaseAssignmentSLASerializer,
     CaseTypeSerializer,
     CaseQueueSerializer,
 )
 from api.data_workspace.serializers import (
     EcjuQuerySerializer,
     CaseAssignmentSerializer,
-    DepartmentSlaSerializer,
+    DepartmentSLASerializer,
 )
 
 
@@ -22,11 +22,11 @@ class CaseAssignmentList(viewsets.ReadOnlyModelViewSet):
     queryset = CaseAssignment.objects.all().order_by("id")
 
 
-class CaseAssignmentSlaList(viewsets.ReadOnlyModelViewSet):
+class CaseAssignmentSLAList(viewsets.ReadOnlyModelViewSet):
     authentication_classes = (DataWorkspaceOnlyAuthentication,)
-    serializer_class = CaseAssignmentSlaSerializer
+    serializer_class = CaseAssignmentSLASerializer
     pagination_class = LimitOffsetPagination
-    queryset = CaseAssignmentSla.objects.all()
+    queryset = CaseAssignmentSLA.objects.all()
 
 
 class CaseTypeList(viewsets.ReadOnlyModelViewSet):
@@ -45,9 +45,9 @@ class CaseQueueList(viewsets.ReadOnlyModelViewSet):
 
 class CaseDepartmentList(viewsets.ReadOnlyModelViewSet):
     authentication_classes = (DataWorkspaceOnlyAuthentication,)
-    serializer_class = DepartmentSlaSerializer
+    serializer_class = DepartmentSLASerializer
     pagination_class = LimitOffsetPagination
-    queryset = DepartmentSla.objects.all()
+    queryset = DepartmentSLA.objects.all()
 
 
 class EcjuQueryList(viewsets.ReadOnlyModelViewSet):

api/data_workspace/serializers.py

@@ -1,6 +1,6 @@
 from api.audit_trail.models import Audit
 from api.teams.models import Department
-from api.cases.models import CaseAssignment, EcjuQuery, DepartmentSla
+from api.cases.models import CaseAssignment, EcjuQuery, DepartmentSLA
 from api.queues.models import Queue
 
 from rest_framework import serializers
@@ -26,9 +26,9 @@ class Meta:
         fields = "__all__"
 
 
-class DepartmentSlaSerializer(serializers.ModelSerializer):
+class DepartmentSLASerializer(serializers.ModelSerializer):
     class Meta:
-        model = DepartmentSla
+        model = DepartmentSLA
         fields = "__all__"
 
 

api/data_workspace/tests/test_case_views.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 from rest_framework import status
 
-from api.cases.models import CaseAssignmentSla, CaseAssignment
+from api.cases.models import CaseAssignmentSLA, CaseAssignment
 from test_helpers.clients import DataTestClient
 from test_helpers.assertions import is_uuid_as_string
 from api.users.tests.factories import GovUserFactory
@@ -13,7 +13,7 @@ def setUp(self):
         super().setUp()
         self.case = self.create_standard_application_case(self.organisation, "Example Application")
         self.queue.cases.add(self.case)
-        CaseAssignmentSla.objects.create(sla_days=4, queue=self.queue, case=self.case)
+        CaseAssignmentSLA.objects.create(sla_days=4, queue=self.queue, case=self.case)
 
         # Create CaseAssignment
         user = GovUserFactory(

api/data_workspace/tests/test_views.py

@@ -4,7 +4,7 @@
 from api.parties.enums import PartyType
 from test_helpers.clients import DataTestClient
 from api.teams.tests.factories import TeamFactory
-from api.cases.tests.factories import DepartmentSlaFactory
+from api.cases.tests.factories import DepartmentSLAFactory
 from api.teams.models import Department
 
 
@@ -124,7 +124,7 @@ def test_departments(self):
         assert set(payload["results"][0].keys()) == expected_fields
 
     def test_case_department_slas(self):
-        department_sla = DepartmentSlaFactory()
+        department_sla = DepartmentSLAFactory()
         url = reverse("data_workspace:dw-case-department-sla-list")
         response = self.client.get(url)
         payload = response.json()

api/data_workspace/urls.py

@@ -56,7 +56,7 @@
 router_v1.register("teams", views.TeamListView, basename="dw-teams")
 router_v1.register("departments", views.DepartmentListView, basename="dw-departments")
 router_v1.register("case-assignment", case_views.CaseAssignmentList, basename="dw-case-assignment")
-router_v1.register("case-assignment-slas", case_views.CaseAssignmentSlaList, basename="dw-case-assignment-sla")
+router_v1.register("case-assignment-slas", case_views.CaseAssignmentSLAList, basename="dw-case-assignment-sla")
 router_v1.register("case-types", case_views.CaseTypeList, basename="dw-case-type")
 router_v1.register("case-queues", case_views.CaseQueueList, basename="dw-case-queue")
 router_v1.register("case-department-slas", case_views.CaseDepartmentList, basename="dw-case-department-sla")