Merge pull request #2353 from uktrade/LTD-5899-Add-time-on-queue-sort…

…ing-option

LTD-5899: Add option in FE to sort based on when a queue is assigned to a case

caseworker/advice/constants.py

@@ -40,6 +40,26 @@
     NCSC_CASES_TO_REVIEW,
 )
 
+CASE_PROGRESSION_QUEUES = [
+    DESNZ_NUCLEAR_CASES_TO_REVIEW,
+    DESNZ_NUCLEAR_COUNTERSIGNING,
+    DESNZ_CHEMICAL_CASES_TO_REVIEW,
+    DESNZ_RUSSIA_SANCTIONS,
+    FCDO_CASES_TO_REVIEW_QUEUE,
+    FCDO_COUNTERSIGNING_QUEUE,
+    FCDO_CPACC_CASES_TO_REVIEW_QUEUE,
+    LU_POST_CIRC_FINALISE_QUEUE,
+    LU_LICENSING_MANAGER_QUEUE,
+    LU_SR_LICENSING_MANAGER_QUEUE,
+    MOD_CAPPROT_CASES_TO_REVIEW,
+    MOD_DI_DIRECT_CASES_TO_REVIEW,
+    MOD_DI_INDIRECT_CASES_TO_REVIEW,
+    MOD_DSR_CASES_TO_REVIEW,
+    MOD_DSTL_CASES_TO_REVIEW,
+    MOD_ECJU_REVIEW_AND_COMBINE,
+    NCSC_CASES_TO_REVIEW,
+]
+
 DECISION_TYPE_VERB_MAPPING = {
     "Approve": "approved",
     "Proviso": "approved",

caseworker/queues/views/forms.py

@@ -13,6 +13,8 @@
 
 from django import forms
 from django.urls import reverse
+
+from caseworker.advice.constants import CASE_PROGRESSION_QUEUES
 from core.constants import LicenceStatusEnum
 
 
@@ -142,6 +144,15 @@ def __init__(self, queue, filters_data, all_flags, all_cles, all_regimes, countr
             ("-submitted_at", "Submitted (newest to oldest)"),
             ("submitted_at", "Submitted (oldest to newest)"),
         ]
+
+        if queue["id"] in CASE_PROGRESSION_QUEUES:
+            sort_options.extend(
+                [
+                    ("-time_on_queue", "Time on queue (newest to oldest)"),
+                    ("time_on_queue", "Time on queue (oldest to newest)"),
+                ]
+            )
+
         self.fields["sort_by"] = forms.ChoiceField(
             choices=sort_options,
             label="Sort by",

unit_tests/caseworker/cases/views/test_case_filters.py

@@ -43,8 +43,10 @@ def setup(
         ({"field": "finalised_to", "params": {"finalised_to_0": "1", "finalised_to_1": "1", "finalised_to_2": "2022"}}),
         ({"params": {"export_type": "permanent", "assigned_queues": "fake-queue-id-1"}}),
         ({"params": {"case_type": "siel", "sub_status": "inform_letter_sent"}}),
-        ({"params": {"sort_by": "submitted_at"}}),
         ({"params": {"sort_by": "-submitted_at"}}),
+        ({"params": {"sort_by": "submitted_at"}}),
+        ({"params": {"sort_by": "-time_on_queue"}}),
+        ({"params": {"sort_by": "time_on_queue"}}),
     ],
 )
 def test_case_filters_and_sort(