Skip to content

CCD-5332 new_case in supplementary data #2520

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.

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

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
254cc02
new_case in supplementary data
patelila Jan 22, 2025
f0b00c2
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Jan 22, 2025
ac319a7
unit test changes
patelila Jan 23, 2025
0486cf2
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Jan 23, 2025
d5c5574
checkstyle error
patelila Jan 23, 2025
9d3d19c
checkstyle error
patelila Jan 23, 2025
a699fcf
checkstyle error
patelila Jan 23, 2025
879033c
Unit test improvements
patelila Jan 24, 2025
2db5193
Submit event creation changes
patelila Jan 24, 2025
bbf1892
checkstyle * error
patelila Jan 24, 2025
1df5284
nullpointer exception fix
patelila Jan 24, 2025
4faf75c
sonarque gate errors
patelila Jan 24, 2025
aa0057d
Handle newCase as YesOrNo field
patelila Jan 27, 2025
a036e11
empty commit to trigger build
patelila Jan 27, 2025
5081a9e
empty commit to trigger build
patelila Jan 27, 2025
fb7bd09
Added new version for ccd-test-definition and added FT's for testing …
patelila Jan 28, 2025
3447b3b
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Jan 28, 2025
9eafeb6
empty commit to trigger build
patelila Jan 28, 2025
0059db4
Merge remote-tracking branch 'origin/CCD-5332_update_supplementary_da…
patelila Jan 28, 2025
4eff7a9
empty commit to trigger build
patelila Jan 28, 2025
d596118
Use Definition-store api pr-1529 and data-store pr-2520
patelila Jan 28, 2025
2737a36
empty commit to trigger build
patelila Jan 28, 2025
748cfef
empty commit to trigger build
patelila Jan 28, 2025
9dc2729
empty commit to trigger build
patelila Jan 29, 2025
c84c23d
added to top of file for easier access
patelila Jan 29, 2025
007fdb3
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Jan 29, 2025
e6ca90d
changes to new_case from array to JsonNode elements
patelila Jan 30, 2025
26e171f
Merge remote-tracking branch 'origin/CCD-5332_update_supplementary_da…
patelila Jan 30, 2025
d8bdf68
empty commit to trigger build
patelila Jan 30, 2025
494a0da
empty commit to trigger build
patelila Feb 3, 2025
7859d40
AddressForeignField added to expected result
patelila Feb 3, 2025
8fe09f4
CollectionPermissionField added to expected result
patelila Feb 3, 2025
c7cdf6a
CollectionPermissionField added to expected case_fields result
patelila Feb 3, 2025
d6bbe96
CollectionPermissionField added to expected case_fields result
patelila Feb 3, 2025
1a0021d
empty commit to trigger build
patelila Feb 4, 2025
02ab7df
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Feb 4, 2025
48485db
using newly build jitpack version of ccd-test-definition
patelila Feb 4, 2025
90c2018
empty commit to trigger build
patelila Feb 5, 2025
4f04ab8
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Feb 6, 2025
a0af60c
empty commit to trigger build
patelila Feb 6, 2025
189058f
DEBUG logging commented out
patelila Feb 6, 2025
65c893f
empty commit to trigger build
patelila Feb 6, 2025
51d2a27
empty commit to trigger build
patelila Feb 6, 2025
c2a4522
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Feb 10, 2025
9c7d280
sonarQube issues
patelila Feb 17, 2025
ead8080
sonarQube issues
patelila Feb 17, 2025
a0d2042
sonarQube issues
patelila Feb 17, 2025
6e3cd57
sonarQube issues
patelila Feb 17, 2025
9d36479
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Feb 24, 2025
e357dd1
Version of java helm chart below 5.3.0 is deprecated
patelila Feb 24, 2025
edffc83
Bumping chart version/ fixing aliases
hmcts-jenkins-a-to-c[bot] Feb 24, 2025
67352a1
using oci://hmctspublic.azurecr.io/helm
patelila Feb 25, 2025
d3b3e2b
empty commit to trigger build
patelila Feb 25, 2025
5763c01
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Feb 28, 2025
a6ac588
CCD-5333 UC : Clear the new cases supplementary data for an organisat…
patelila Mar 7, 2025
fcd4328
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Apr 1, 2025
6825394
use ccd-test-definition - 7.26.1-prerelease-CCD-5329
patelila Apr 1, 2025
a38abfe
correct reaponse for BEFTA_CASETYPE_NO_READ
patelila Apr 1, 2025
78c8dc6
correct response for BEFTA_CASETYPE_NO_READ
patelila Apr 1, 2025
cbd048b
correct response for BEFTA_CASETYPE_NO_READ
patelila Apr 1, 2025
98c6777
correct response for BEFTA_CASETYPE_NO_READ F-102 S-580
patelila Apr 2, 2025
7c409c5
correct response for BEFTA_CASETYPE_NO_READ F-1024 S-1024.3
patelila Apr 2, 2025
c9e9d4b
fix FT 1024.3
patelila Apr 2, 2025
65eefac
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Apr 4, 2025
adbb610
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Apr 28, 2025
78ad3db
fix for inconsistent behaviour mentioned in https://tools.hmcts.net/j…
patelila Apr 30, 2025
5d253a5
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila Apr 30, 2025
e80fd28
empty commit to trigger build
patelila May 1, 2025
342a78e
sonarQube suggestions
patelila May 1, 2025
d8b1b9c
check style error
patelila May 1, 2025
a3c1a84
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila May 1, 2025
6447f85
empty commit to trigger build
patelila May 1, 2025
20fa83d
empty commit to trigger build
patelila May 1, 2025
a085ae2
Update build.gradle
patelila May 8, 2025
2a8ee8c
fix for supression build errors
patelila May 8, 2025
3f43d6c
fix F-028 - S-044 errors
patelila May 9, 2025
ad67777
resolving conflicts
patelila May 9, 2025
397b9e0
Merge branch 'master' into CCD-5332_update_supplementary_data_new_case
patelila May 9, 2025
75ebdc0
resolving conflicts
patelila May 9, 2025
321ecf3
resolving conflicts
patelila May 9, 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
4 changes: 2 additions & 2 deletions Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ def branchesToSync = ['demo', 'ithc', 'perftest', 'develop']

// Variables to switch pipeline logic and wiring per type of build

def definitionStoreDevelopPr = "PR-575" // This doesn't change frequently, but when it does, only change this value.
def dataStoreApiDevelopPr = "PR-1260" // This doesn't change frequently, but when it does, only change this value.
def definitionStoreDevelopPr = "PR-1529" // This doesn't change frequently, but when it does, only change this value.
def dataStoreApiDevelopPr = "PR-2520" // This doesn't change frequently, but when it does, only change this value.
def prsToUseAat = "PR-1793,PR-1888" // Set this value to a PR number, or add it as a comma-separated value, if it's to follow CI/CD.

def secrets = [
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ext['spring-framework.version'] = '5.3.27'
ext['jackson.version'] = '2.16.0'
//overriding for easy access to the version for FT testing
ext['beftaFwVersion'] = '9.2.3'
ext['ccdTestDefinitionVersion'] = '7.25.2'
ext['ccdTestDefinitionVersion'] = '7.26.2-prerelease-CCD-5329'

configurations {
compileClasspath {
Expand Down
2 changes: 1 addition & 1 deletion charts/ccd-data-store-api/values.preview.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ java:
DATA_STORE_DB_PASSWORD: "{{ .Values.postgresql.auth.password}}"
DATA_STORE_DB_OPTIONS: "?stringtype=unspecified"
DATA_STORE_DB_MAX_POOL_SIZE: 10
DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-575-java/
DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-1529-java/
USER_PROFILE_HOST: http://ccd-user-profile-api-pr-399-java/
ELASTIC_SEARCH_ENABLED: true # enable whenever ES required on a particular PR
ELASTIC_SEARCH_NODES_DISCOVERY_ENABLED: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,58 @@
"delete": true
}
]
},
{
"id" : "CollectionPermissionField",
"label" : "A `Collection` of `Text` fields",
"hidden" : false,
"value" : null,
"metadata" : false,
"hint_text" : "Zero to many items, here of type `Text`",
"field_type" : {
"id" : "[[ANYTHING_PRESENT]]",
"type" : "Collection",
"min" : null,
"max" : null,
"regular_expression" : null,
"fixed_list_items" : [ ],
"complex_fields" : [ ],
"collection_field_type" : {
"id" : "Text",
"type" : "Text",
"min" : null,
"max" : null,
"regular_expression" : null,
"fixed_list_items" : [ ],
"complex_fields" : [ ],
"collection_field_type" : null
}
},
"validation_expr" : null,
"security_label" : "PUBLIC",
"order" : null,
"formatted_value" : null,
"display_context" : "OPTIONAL",
"display_context_parameter" : "#COLLECTION(allowDelete,allowInsert,allowUpdate)",
"show_condition" : null,
"show_summary_change_option" : false,
"show_summary_content_option" : null,
"retain_hidden_value" : null,
"publish" : false,
"publish_as" : null,
"acls" : [ {
"create" : true,
"read" : false,
"update" : true,
"delete" : true,
"role" : "caseworker-autotest1"
}, {
"create" : true,
"read" : true,
"update" : true,
"delete" : true,
"role" : "caseworker-autotest1-private"
} ]
}
],
"event_token": "[[ANYTHING_PRESENT]]",
Expand Down Expand Up @@ -1576,6 +1628,12 @@
"__ordering__": "unordered",
"__elementId__": "case_field_id"
},
{
"case_field_id" : "CollectionPermissionField",
"order" : 6,
"page_column_no" : null,
"complex_field_overrides" : [ ]
},
{
"case_field_id": "CollectionField",
"order": 2,
Expand Down
64 changes: 1 addition & 63 deletions src/aat/resources/features/F-051 - Get Profile/S-105.td.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,69 +354,7 @@
"name" : "BEFTA Case Type No Read",
"jurisdiction": null,
"events": [],
"states": [
{
"__ordering__": "unordered",
"__elementId__": "id"
},
{
"id": "TODO",
"name": "To do",
"description": null,
"order": 1,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
},
{
"id": "IN_PROGRESS",
"name": "In progress",
"description": null,
"order": 2,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
},
{
"id": "DONE",
"name": "Done",
"description": null,
"order": 3,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
}
],
"states": [],
"searchAliasFields": [],
"searchParties" : [],
"searchCriterias" : [],
Expand Down
64 changes: 1 addition & 63 deletions src/aat/resources/features/F-051 - Get Profile/S-109.td.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,69 +354,7 @@
"name" : "BEFTA Case Type No Read",
"jurisdiction": null,
"events": [],
"states": [
{
"__ordering__": "unordered",
"__elementId__": "id"
},
{
"id": "TODO",
"name": "To do",
"description": null,
"order": 1,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
},
{
"id": "IN_PROGRESS",
"name": "In progress",
"description": null,
"order": 2,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
},
{
"id": "DONE",
"name": "Done",
"description": null,
"order": 3,
"title_display": null,
"acls": [
{
"__ordering__": "unordered",
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
}
]
}
],
"states": [],
"searchAliasFields": [],
"searchParties" : [],
"searchCriterias" : [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,10 +575,10 @@
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
"_extends_": "CaseworkerBeftaJurisdiction1NoReadAccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
"_extends_": "CaseworkerCaaNoReadAccessControlList"
}
]
},
Expand All @@ -594,10 +594,10 @@
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
"_extends_": "CaseworkerBeftaJurisdiction1NoReadAccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
"_extends_": "CaseworkerCaaNoReadAccessControlList"
}
]
},
Expand All @@ -613,10 +613,10 @@
"__elementId__": "role"
},
{
"_extends_": "CaseworkerBeftaJurisdiction1AccessControlList"
"_extends_": "CaseworkerBeftaJurisdiction1NoReadAccessControlList"
},
{
"_extends_": "CaseworkerCaaAccessControlList"
"_extends_": "CaseworkerCaaNoReadAccessControlList"
}
]
}
Expand Down
Loading