Skip to content

Commit

Permalink
Push Master changes to cafcass api feature branch (#5554)
Browse files Browse the repository at this point in the history
* DFPL-2517: Increase core pool size for async task executor (#5543)

* Increase core pool size for async task executor

* Fix check style

* DFPL-2257: Add updated court seals (#5533)

* Add updated court seals

* Add updated court seals

* Change seal to be Welsh rather than bilingual and update sealed document for tests.

* Update docmosis to use new court seal imgages in rdo docmosis.

* Fix test failures

* Rename seal files to be consistent with their names in docmosis.

* DFPL-2488: Use the correct court code + fix caseManagementLocation when transferring LAs (#5527)

* DFPL-2488: Use the correct court code + fix caseManagementLocation when transferring LAs

* checkstyle

* introduce constants for test

---------

Co-authored-by: Braimah101 <[email protected]>

* Update UploadTranslationsSubmittedControllerTest.java (#5551)

* DFPL-2325: Add 4 New Details Boxes for C43 (#5499)

* DFPL-2325: Add 4 New Details Boxes for C43

* add to order object through question block and fix generator test

* add missing fields to test

* add additional check

* add to object so it persists through to the casedata for MI

* fix persisting

* fix generator test

* checkstyle

* fix scoped field test

* change to append rather than concat

* remove further directions

* hide directions in child arrangement flow

* fix test

* remove very flakey test (for now)

* unflakey

---------

Co-authored-by: Braimah101 <[email protected]>

* DFPL-2491: Migrate out of sync caseManagementLocation fields (#5553)

* DFPL-2491: Fix caseManagementLocation after bug

* correct migration ID

* Add populate case - returned event (#5552)

---------

Co-authored-by: jamesrferguson1 <[email protected]>
Co-authored-by: Daniel Catchpole <[email protected]>
Co-authored-by: Braimah101 <[email protected]>
Co-authored-by: Chak Shing Lo <[email protected]>
  • Loading branch information
5 people committed Aug 28, 2024
1 parent 18b5f9f commit 3515ecf
Show file tree
Hide file tree
Showing 50 changed files with 652 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,24 @@
"CRUD": "R"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseEventID": "populateCase-RETURNED",
"AccessControl": [
{
"UserRoles": ["caseworker-publiclaw-systemupdate"],
"CRUD": "CR"
},
{
"UserRoles": [
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-solicitor"
],
"CRUD": "R"
}
]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -3667,6 +3667,34 @@
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsLiveWithDetails",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsContactWithDetails",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersSpecificIssueOrderDetails",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersProhibitedStepsOrderDetails",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3681,6 +3681,34 @@
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsLiveWithDetails",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsContactWithDetails",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersSpecificIssueOrderDetails",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersProhibitedStepsOrderDetails",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3947,6 +3947,34 @@
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsLiveWithDetails",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsContactWithDetails",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersSpecificIssueOrderDetails",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersProhibitedStepsOrderDetails",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2506,6 +2506,34 @@
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsLiveWithDetails",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersChildArrangementsContactWithDetails",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersSpecificIssueOrderDetails",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageOrdersProhibitedStepsOrderDetails",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1183,5 +1183,153 @@
"CRUD": "R"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "orderCollection",
"ListElementCode": "childArrangementsLiveWithDetails",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"[BARRISTER]",
"[CAFCASSSOLICITOR]",
"[EPSMANAGING]",
"[LABARRISTER]",
"[LAMANAGING]",
"[LASHARED]",
"[LASOLICITOR]",
"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",
"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-magistrate"
],
"CRUD": "R"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "orderCollection",
"ListElementCode": "childArrangementsContactWithDetails",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"[BARRISTER]",
"[CAFCASSSOLICITOR]",
"[EPSMANAGING]",
"[LABARRISTER]",
"[LAMANAGING]",
"[LASHARED]",
"[LASOLICITOR]",
"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",
"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-magistrate"
],
"CRUD": "R"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "orderCollection",
"ListElementCode": "specificIssueOrderDetails",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"[BARRISTER]",
"[CAFCASSSOLICITOR]",
"[EPSMANAGING]",
"[LABARRISTER]",
"[LAMANAGING]",
"[LASHARED]",
"[LASOLICITOR]",
"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",
"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-magistrate"
],
"CRUD": "R"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "orderCollection",
"ListElementCode": "prohibitedStepsOrderDetails",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"[BARRISTER]",
"[CAFCASSSOLICITOR]",
"[EPSMANAGING]",
"[LABARRISTER]",
"[LAMANAGING]",
"[LASHARED]",
"[LASOLICITOR]",
"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",
"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-magistrate"
],
"CRUD": "R"
}
]
}
]
9 changes: 9 additions & 0 deletions ccd-definition/CaseEvent/CareSupervision/StateChange.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,14 @@
"PreConditionState(s)": "*",
"PostConditionState": "PREPARE_FOR_HEARING",
"SecurityClassification": "Public"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"ID": "populateCase-RETURNED",
"Name": "Populate - Returned",
"PreConditionState(s)": "*",
"PostConditionState": "RETURNED",
"SecurityClassification": "Public"
}
]
Loading

0 comments on commit 3515ecf

Please sign in to comment.