Ensure MOD-DI advice is shown at consolidation regardless of MOD-ECJU…

… advice
uktrade · Dec 13, 2024 · b556830 · b556830
1 parent ff1a080
commit b556830
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/caseworker/advice/services.py b/caseworker/advice/services.py
@@ -54,13 +54,20 @@
 NCSC_TEAM = "NCSC"
 OGD_TEAMS_EXCLUDING_MOD = [
     *DESNZ_TEAMS,
+    # MOD-DI team present here to ensure that advice given in MOD-DI Direct is consolidated by LU
+    MOD_DI_TEAM,
     FCDO_TEAM,
     NCSC_TEAM,
 ]
-OGD_TEAMS = [
-    *OGD_TEAMS_EXCLUDING_MOD,
-    *MOD_TEAMS,
-]
+# Make OGD_TEAMS a set to avoid having duplicate entries for MOD-DI - advice from them should appear unconditionally
+OGD_TEAMS = list(
+    set(
+        [
+            *OGD_TEAMS_EXCLUDING_MOD,
+            *MOD_TEAMS,
+        ]
+    )
+)
 
 # Flags
 LU_COUNTERSIGN_REQUIRED_ID = "bbf29b42-0aae-4ebc-b77a-e502ddea30a8"  # /PS-IGNORE

diff --git a/caseworker/advice/tests/test_services.py b/caseworker/advice/tests/test_services.py
@@ -244,6 +244,28 @@ def test_get_advice_to_consolidate_unrecognized_team_raises_exception():
                         "team": {"alias": MOD_ECJU_TEAM, "id": "id-mod-ecju"},
                     },
                 ],
+                "id-mod-di-approve": [
+                    {
+                        "id": "advice-3",
+                        "level": "team",
+                        "type": {"key": "approve"},
+                        "team": {"alias": MOD_DI_TEAM, "id": "id-mod-di"},
+                    },
+                    {
+                        "id": "advice-4",
+                        "level": "user",
+                        "type": {"key": "approve"},
+                        "team": {"alias": MOD_DI_TEAM, "id": "id-mod-di"},
+                    },
+                ],
+                "id-mod-di-refuse": [
+                    {
+                        "id": "advice-4",
+                        "level": "user",
+                        "type": {"key": "refuse"},
+                        "team": {"alias": MOD_DI_TEAM, "id": "id-mod-di"},
+                    },
+                ],
             },
         ),
     ),