diff --git a/api/cases/models.py b/api/cases/models.py index 4be108c39..b731c541c 100644 --- a/api/cases/models.py +++ b/api/cases/models.py @@ -249,7 +249,7 @@ class CaseAssignmentSla(models.Model): case = models.ForeignKey(Case, related_name="slas", on_delete=models.CASCADE) -class DepartmentSLA(models.Model): +class DepartmentSla(models.Model): sla_days = models.IntegerField() department = models.ForeignKey(Department, on_delete=models.CASCADE, related_name="department_slas") case = models.ForeignKey(Case, on_delete=models.CASCADE, related_name="department_slas") diff --git a/api/cases/serializers.py b/api/cases/serializers.py index 715784af3..1e1b6bb08 100644 --- a/api/cases/serializers.py +++ b/api/cases/serializers.py @@ -28,7 +28,7 @@ GoodCountryDecision, CaseType, CaseReviewDate, - DepartmentSLA, + DepartmentSla, ) from api.compliance.models import ComplianceSiteCase, ComplianceVisitCase from api.compliance.serializers.ComplianceSiteCaseSerializers import ComplianceSiteViewSerializer @@ -96,7 +96,7 @@ class Meta: class CaseDepartmentSerializer(serializers.ModelSerializer): class Meta: - model = DepartmentSLA + model = DepartmentSla fields = "__all__" diff --git a/api/cases/tasks.py b/api/cases/tasks.py index 8f4684cd7..9ef05714a 100644 --- a/api/cases/tasks.py +++ b/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 @@ -117,11 +117,11 @@ def update_cases_sla(): 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, diff --git a/api/cases/tests/test_sla.py b/api/cases/tests/test_sla.py index f1ab957ce..2337c6eeb 100644 --- a/api/cases/tests/test_sla.py +++ b/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 @@ -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) diff --git a/api/data_workspace/case_views.py b/api/data_workspace/case_views.py index 0e7a8225a..9613beec0 100644 --- a/api/data_workspace/case_views.py +++ b/api/data_workspace/case_views.py @@ -2,7 +2,7 @@ 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, CaseTypeSerializer, @@ -47,7 +47,7 @@ class CaseDepartmentList(viewsets.ReadOnlyModelViewSet): authentication_classes = (DataWorkspaceOnlyAuthentication,) serializer_class = CaseDepartmentSerializer pagination_class = LimitOffsetPagination - queryset = DepartmentSLA.objects.all() + queryset = DepartmentSla.objects.all() class EcjuQueryList(viewsets.ReadOnlyModelViewSet):