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

DFPL-2563: Initial Retain and Dispose CCD config TEST BRANCH #5737

Closed
wants to merge 46 commits into from
Closed

DFPL-2563: Initial Retain and Dispose CCD config TEST BRANCH #5737

Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
299f0d8
DFPL-2563: Initial Retain and Dispose CCD config
AlistairEdwinOsborne Nov 26, 2024
c1f1bbf
add increment to orders and directions rather than creation
AlistairEdwinOsborne Nov 27, 2024
c87c21c
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Nov 28, 2024
1f61206
change increments to 6575 and add local profile
AlistairEdwinOsborne Nov 28, 2024
f4cafd4
Merge remote-tracking branch 'origin/DFPL-2563' into DFPL-2563
AlistairEdwinOsborne Nov 28, 2024
9e6f5cf
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Nov 28, 2024
6ff3872
add dummy event for TTL increment on case creation
AlistairEdwinOsborne Nov 28, 2024
475c20c
Merge remote-tracking branch 'origin/DFPL-2563' into DFPL-2563
AlistairEdwinOsborne Nov 28, 2024
a0c3f01
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Nov 28, 2024
94a7366
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Dec 9, 2024
e3b210e
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Dec 13, 2024
b8388e2
checkstyle
AlistairEdwinOsborne Dec 13, 2024
2e7c8d4
DFPL-2563: Initial Retain and Dispose CCD config
AlistairEdwinOsborne Nov 26, 2024
fadc432
add increment to orders and directions rather than creation
AlistairEdwinOsborne Nov 27, 2024
e70e821
change increments to 6575 and add local profile
AlistairEdwinOsborne Nov 28, 2024
71be98f
add dummy event for TTL increment on case creation
AlistairEdwinOsborne Nov 28, 2024
2b4869d
add field permissions for systemupdate user
AlistairEdwinOsborne Dec 13, 2024
86ef01b
checkstyle
AlistairEdwinOsborne Dec 13, 2024
e69acd6
Merge remote-tracking branch 'origin/DFPL-2563' into DFPL-2563
AlistairEdwinOsborne Dec 13, 2024
ce506c5
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Dec 17, 2024
8f77987
DFPL-2563: Initial Retain and Dispose CCD config
AlistairEdwinOsborne Nov 26, 2024
13893ef
add increment to orders and directions rather than creation
AlistairEdwinOsborne Nov 27, 2024
50a5df1
change increments to 6575 and add local profile
AlistairEdwinOsborne Nov 28, 2024
ea7a0e4
add dummy event for TTL increment on case creation
AlistairEdwinOsborne Nov 28, 2024
436a881
add field permissions for systemupdate user
AlistairEdwinOsborne Dec 13, 2024
c942f66
DFPL-2563: Initial Retain and Dispose CCD config
AlistairEdwinOsborne Nov 26, 2024
1c13870
add increment to orders and directions rather than creation
AlistairEdwinOsborne Nov 27, 2024
1e42522
change increments to 6575 and add local profile
AlistairEdwinOsborne Nov 28, 2024
19fd693
add dummy event for TTL increment on case creation
AlistairEdwinOsborne Nov 28, 2024
fda4cf7
checkstyle
AlistairEdwinOsborne Dec 13, 2024
16b20d4
remove create case workaround
AlistairEdwinOsborne Dec 17, 2024
62e53ce
Merge remote-tracking branch 'origin/DFPL-2563' into DFPL-2563
AlistairEdwinOsborne Dec 17, 2024
2b3ddce
remove create case workaround
AlistairEdwinOsborne Dec 17, 2024
df663df
add back record final decision TTL
AlistairEdwinOsborne Dec 18, 2024
a1a28b0
add TTL increment back after failed merge
AlistairEdwinOsborne Dec 18, 2024
ef7716d
fix duplicated role
AlistairEdwinOsborne Dec 19, 2024
91be3f6
add delete to system update user to be safe
AlistairEdwinOsborne Dec 19, 2024
0d0ca19
add preview image of open case fix and increment
AlistairEdwinOsborne Dec 19, 2024
292c5ef
Merge branch 'master' into DFPL-2563
prabhamuthu15 Dec 20, 2024
877ec00
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Jan 3, 2025
1488898
remove data store image as fix has been pushed
AlistairEdwinOsborne Jan 6, 2025
4bcca2c
Merge branch 'master' into DFPL-2563
prabhamuthu15 Jan 7, 2025
bcd0a85
Merge branch 'master' into DFPL-2563
AlistairEdwinOsborne Jan 10, 2025
ba47150
remove caseworker and superuser perms for TTL
AlistairEdwinOsborne Jan 13, 2025
3fecaf5
add team leader back for deleted case testing
AlistairEdwinOsborne Jan 13, 2025
acedb63
remove spacing
AlistairEdwinOsborne Jan 13, 2025
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
1 change: 1 addition & 0 deletions bin/add-ccd-user-roles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ ${dir}/utils/ccd-add-role.sh "caseworker-wa-task-configuration"
${dir}/utils/ccd-add-role.sh "GS_profile"
${dir}/utils/ccd-add-role.sh "ctsc"
${dir}/utils/ccd-add-role.sh "hearing-centre-admin"
${dir}/utils/ccd-add-role.sh "TTL_profile"
22 changes: 21 additions & 1 deletion ccd-definition/AuthorisationCaseEvent/CareSupervision/AuthorisationCaseEvent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@
"CRUD": "CRUD"
}
]
},
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down Expand Up @@ -1747,5 +1747,25 @@
"CRUD": "CR"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseEventID": "manageCaseTTL",
"AccessControl": [
{
"UserRoles": [
"TTL_profile",
"caseworker-publiclaw-superuser"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRUD"
}
]
}
]
7 changes: 7 additions & 0 deletions ccd-definition/AuthorisationCaseField/CareSupervision/system-update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4318,5 +4318,12 @@
"CaseFieldID": "extendTimelineHearingDate",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRUD"
}
]
9 changes: 9 additions & 0 deletions ccd-definition/AuthorisationCaseField/CareSupervision/ttl_profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"UserRole": "TTL_profile",
"CRUD": "CRU"
}
]
3 changes: 2 additions & 1 deletion ccd-definition/AuthorisationCaseType/AuthorisationCaseType-nonshuttered.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
"caseworker-wa-task-configuration",
"TTL_profile"
],
"CRUD": "CRU"
},
Expand Down
32 changes: 32 additions & 0 deletions ccd-definition/AuthorisationComplexType/AuthorisationComplexType.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,37 @@
"ListElementCode": "judgeFullName",
"UserRole":"[BARRISTER]",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"ListElementCode": "SystemTTL",
"UserRole": "TTL_profile",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"ListElementCode": "SystemTTL",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"ListElementCode": "Suspended",
"UserRole": "TTL_profile",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "TTL",
"ListElementCode": "OverrideTTL",
"UserRole": "TTL_profile",
"CRUD": "CRU"
}
]
18 changes: 18 additions & 0 deletions ccd-definition/CaseEvent/CareSupervision/MultiState.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"DisplayOrder": 10,
"PreConditionState(s)": "Submitted;Gatekeeping;GATEKEEPING_LISTING;PREPARE_FOR_HEARING;FINAL_HEARING;CLOSED",
"PostConditionState": "*",
"TTLIncrement": 6575,
"SecurityClassification": "Public",
"ShowSummary": "Y",
"ShowEventNotes": "N",
Expand Down Expand Up @@ -744,6 +745,7 @@
"ID": "changeState",
"Name": "Change case state",
"Description": "Change the state of the case",
"TTLIncrement": 6575,
"PreConditionState(s)": "Gatekeeping;GATEKEEPING_LISTING;PREPARE_FOR_HEARING;FINAL_HEARING;CLOSED",
"PostConditionState": "*",
"SecurityClassification": "Public",
Expand Down Expand Up @@ -795,6 +797,7 @@
"Name": "Approve orders",
"Description": "Review draft case management orders and C21 orders uploaded by the local authority",
"DisplayOrder": 7,
"TTLIncrement": 6575,
"PreConditionState(s)": "GATEKEEPING_LISTING;Gatekeeping;PREPARE_FOR_HEARING;FINAL_HEARING;CLOSED",
"PostConditionState": "*",
"SecurityClassification": "Public",
Expand Down Expand Up @@ -917,6 +920,7 @@
"CaseTypeID": "CARE_SUPERVISION_EPO",
"ID": "recordFinalDecisions",
"Name": "Record final decisions",
"TTLIncrement": 6575,
"Description": "Record final decisions",
"DisplayOrder": 31,
"PreConditionState(s)": "Submitted;RETURNED;Gatekeeping;GATEKEEPING_LISTING;PREPARE_FOR_HEARING;FINAL_HEARING",
Expand Down Expand Up @@ -1108,6 +1112,20 @@
"CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/manage-documentsv2/about-to-submit",
"CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/manage-documentsv2/submitted"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"ID": "manageCaseTTL",
"Name": "Manage Case TTL",
"Description": "Manage Case TTL",
"DisplayOrder": 15,
"PreConditionState(s)": "*",
"PostConditionState": "*",
"SecurityClassification": "Public",
"ShowSummary": "Y",
"ShowEventNotes": "Y",
"EndButtonLabel": "Save and continue"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
1 change: 1 addition & 0 deletions ccd-definition/CaseEvent/CareSupervision/StateChange.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"ID": "submitApplication",
"Name": "Submit application",
"Description": "Check and send application",
"TTLIncrement": 6575,
"DisplayOrder": 18,
"PreConditionState(s)": "Open;RETURNED",
"PostConditionState": "Submitted",
Expand Down
32 changes: 32 additions & 0 deletions ccd-definition/CaseEventToComplexTypes/ManageCaseTTL/manageCaseTTL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"LiveFrom": "01/01/2017",
"ID": "manageCaseTTL",
"CaseEventID": "manageCaseTTL",
"CaseFieldID": "TTL",
"ListElementCode": "SystemTTL",
"EventElementLabel": "System TTL",
"FieldDisplayOrder": 1,
"DisplayContext": "READONLY"
},
{
"LiveFrom": "01/01/2017",
"ID": "manageCaseTTL",
"CaseEventID": "manageCaseTTL",
"CaseFieldID": "TTL",
"ListElementCode": "OverrideTTL",
"EventElementLabel": "Override TTL",
"FieldDisplayOrder": 2,
"DisplayContext": "OPTIONAL"
},
{
"LiveFrom": "01/01/2017",
"ID": "manageCaseTTL",
"CaseEventID": "manageCaseTTL",
"CaseFieldID": "TTL",
"ListElementCode": "Suspended",
"EventElementLabel": "Suspend Deletion",
"FieldDisplayOrder": 3,
"DisplayContext": "OPTIONAL"
}
]
13 changes: 13 additions & 0 deletions ccd-definition/CaseEventToFields/CareSupervision/manageCaseTTL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseEventID": "manageCaseTTL",
"CaseFieldID": "TTL",
"PageFieldDisplayOrder": 1,
"DisplayContext": "COMPLEX",
"PageID": "ManageCaseTTL",
"PageDisplayOrder": 1,
"PageColumnNumber": 1
}
]
9 changes: 9 additions & 0 deletions ccd-definition/CaseField/CareSupervision/caseField.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2719,5 +2719,14 @@
"FieldType": "Date",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"ID": "TTL",
"Label": "Set up TTL",
"FieldType": "TTL",
"SecurityClassification": "Public",
"Searchable": "N"
}
]
11 changes: 9 additions & 2 deletions ccd-definition/RoleToAccessProfiles/RoleToAccessProfiles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"CaseTypeID": "CARE_SUPERVISION_EPO",
"RoleName": "idam:caseworker-publiclaw-systemupdate",
"ReadOnly": "N",
"AccessProfiles": "caseworker-publiclaw-systemupdate,GS_profile"
"AccessProfiles": "caseworker-publiclaw-systemupdate,GS_profile,TTL_profile"
},
{
"LiveFrom": "01/01/2017",
Expand Down Expand Up @@ -382,7 +382,7 @@
"CaseTypeID": "CARE_SUPERVISION_EPO",
"RoleName": "ctsc-team-leader",
"ReadOnly": "N",
"AccessProfiles": "caseworker-publiclaw-superuser,caseworker-publiclaw-courtadmin,caseworker-publiclaw-bulkscan"
"AccessProfiles": "caseworker-publiclaw-superuser,caseworker-publiclaw-courtadmin,caseworker-publiclaw-bulkscan,TTL_profile"
},
{
"LiveFrom": "01/01/2017",
Expand Down Expand Up @@ -467,5 +467,12 @@
"RoleName": "idam:caseworker-publiclaw-judiciary",
"ReadOnly": "N",
"AccessProfiles": "caseworker-publiclaw-judiciary"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"RoleName": "idam:cft-ttl-manager",
"ReadOnly": "N",
"AccessProfiles": "TTL_profile"
}
]
1 change: 1 addition & 0 deletions service/src/cftlib/java/uk/gov/hmcts/reform/fpl/CftlibConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public void configure(CFTLib lib) throws Exception {
"caseworker-ras-validation",
"GS_profile",
"caseworker-wa-task-configuration",
"TTL_profile",
"ctsc",
"hearing-centre-admin"
};
Expand Down
Loading