Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LTD-5739] Ensure MOD-DI advice is shown at consolidation regardless of MOD-ECJU advice #2268

Merged
merged 2 commits into from
Dec 18, 2024
Merged

[LTD-5739] Ensure MOD-DI advice is shown at consolidation regardless of MOD-ECJU advice #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b4a548
Ensure MOD-DI advice is shown at consolidation regardless of MOD-ECJU…
currycoder Dec 13, 2024
bd7ffa7
Lock chrome version to ensure E2E enforcement unit download tests pass
currycoder Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ commands:
default: auto
type: string
steps:
- browser-tools/install-chrome
- browser-tools/install-chrome:
chrome-version: "125.0.6422.112"
replace-existing: true
- browser-tools/install-chromedriver
- run:
name: "Install dependencies"
Expand Down
15 changes: 11 additions & 4 deletions caseworker/advice/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions caseworker/advice/tests/test_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
},
],
},
),
),
Expand Down
Loading