Skip to content

Combined SRT changes #2545

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 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4c15256
implement apply access control to /validate endpoints
aktaskaan Apr 9, 2024
af029cb
Merge branch 'master' into ccd_5344
aktaskaan Apr 12, 2024
0a44089
add case creation support
aktaskaan Apr 15, 2024
7d5631f
Merge remote-tracking branch 'origin/ccd_5344' into ccd_5344
aktaskaan Apr 15, 2024
462c063
add case creation support and fix functional tests
aktaskaan Apr 15, 2024
af9ff7a
Merge branch 'master' into ccd_5344
aktaskaan Apr 24, 2024
72bf595
Merge branch 'master' into ccd_5344
danlysiak Apr 25, 2024
5884397
implement Classified to /validate endpoints
aktaskaan May 2, 2024
304102f
Merge branch 'master' into ccd_5344
mwallaceHMCTS Jul 8, 2024
e566de4
Merge branch 'master' into ccd_5344
aktaskaan Aug 15, 2024
4279d05
Implement permission and value checks to prevent unnecessary overwrit…
aktaskaan Dec 4, 2024
0eba145
Merge branch 'master' into ccd_6022
velimd Dec 9, 2024
12b3de6
Trigger build with empty commit
aktaskaan Dec 11, 2024
c224d6f
sonar fixes
aktaskaan Dec 12, 2024
3b34e67
Merge branch 'master' into ccd_6022
aktaskaan Dec 16, 2024
9e92797
add integration tests
aktaskaan Dec 18, 2024
2ae709a
Merge branch 'master' into ccd_6022
aktaskaan Dec 18, 2024
8e0ac82
add F-038 functional test scenarios
aktaskaan Dec 20, 2024
2c74cc6
update ccd-test-definitions to 7.24.2
aktaskaan Dec 30, 2024
011daa8
Merge branch 'master' into ccd_6022
RebeccaBaker Jan 7, 2025
eee45f1
Add handling for nested structures to ensure compatibility with compl…
aktaskaan Jan 24, 2025
eaafdbf
Merge branch 'master' into ccd_6022
aktaskaan Jan 24, 2025
e67c603
Merge branch 'master' into ccd_6022
aktaskaan Jan 27, 2025
f855b82
Add handling for nested structures to ensure compatibility with compl…
aktaskaan Jan 27, 2025
1486ce0
Merge branch 'master' into ccd_6022
aktaskaan Jan 29, 2025
eac6fb2
Add handling for nested structures to ensure compatibility with compl…
aktaskaan Jan 29, 2025
4bbb1dc
Merge branch 'master' into ccd_6022
pats-john Feb 10, 2025
f81dbed
revert
aktaskaan Feb 17, 2025
c94132b
Merge branch 'master' into ccd_6022
aktaskaan Feb 21, 2025
3bd1b81
Merge branch 'master' into ccd_6022
aktaskaan Feb 28, 2025
189231a
Merge branch 'master' into ccd_5344
aktaskaan Mar 12, 2025
4b247db
fix unit test
aktaskaan Mar 12, 2025
32d6815
Merge branch 'ccd_5344' into combined_srt_changes
aktaskaan Mar 12, 2025
aa164fa
update net.bytebuddy version to 1.17.2
aktaskaan Mar 12, 2025
df1f4d2
stop treating null fields as missing fields in conditional field rest…
aktaskaan Apr 1, 2025
e6199a9
Merge branch 'master' into combined_srt_changes
aktaskaan Apr 1, 2025
751c5fe
Merge branch 'master' into combined_srt_changes
bharatkumarpatel1 Apr 17, 2025
918ad80
Merge branch 'master' into combined_srt_changes
bharatkumarpatel1 Apr 25, 2025
12243e5
fix contactTest
aktaskaan Apr 25, 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
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ configurations {
}

dependencyUpdates.resolutionStrategy = {

componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
Expand All @@ -56,6 +55,10 @@ dependencyUpdates.resolutionStrategy = {
}
}
}

resolutionStrategy {
force 'net.bytebuddy:byte-buddy:1.17.2'
}
}

dependencyCheck {
Expand Down Expand Up @@ -298,6 +301,7 @@ dependencies {
}
testImplementation group: 'org.json', name: 'json', version: '20211205'

implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.2'
testImplementation "org.flywaydb:flyway-core:8.5.13"
testImplementation('org.springframework.boot:spring-boot-starter-test')
testImplementation('org.springframework.cloud:spring-cloud-starter-contract-stub-runner')
Expand All @@ -315,6 +319,7 @@ dependencies {
testRuntimeOnly "org.junit.platform:junit-platform-commons:1.8.1"
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.6.0'
testImplementation group:'org.mockito', name: 'mockito-junit-jupiter', version:'3.6.0'
testImplementation 'org.mockito:mockito-inline:4.11.0'
testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: powermockVersion
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
testImplementation group: 'com.xebialabs.restito', name: 'restito', version: '0.9.3'
Expand Down
44 changes: 44 additions & 0 deletions src/aat/resources/features/F-038/F-038-Base-Prerequisite.td.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"_guid_": "F-038-Base-Prerequisite",
"title": "should create an event token for correct inputs",

"productName": "CCD Data Store",
"operationName": "Retrieve a create token",

"method": "GET",
"uri": "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases/{cid}/event-triggers/{etid}/token",

"specs": [
"to get an event token for the case just created"
],

"user": {
"_extends_": "Common_User_For_Request"
},

"request": {
"headers": {
"_extends_": "Common_Request_Headers"
},
"pathVariables": {
"uid": "[[DEFAULT_AUTO_VALUE]]",
"jid": "AUTOTEST1",
"ctid": "AAT_AUTH_15",
"cid": "${[scenarioContext][parentContext][childContexts][Standard_Full_Case_Creation_Data][testData][actualResponse][body][id]}",
"etid": "UPDATE"
}
},

"expectedResponse": {
"_extends_": "Common_200_Response",
"headers": {
"Content-Encoding": "gzip",
"Content-Length": "[[ANYTHING_PRESENT]]"
},
"body": {
"token": "[[ANYTHING_PRESENT]]",
"case_details": "[[ANYTHING_PRESENT]]",
"event_id": "UPDATE"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"_guid_": "F-038-Base-PrivateCaseWorker-Prerequisite",
"title": "should create an event token for correct inputs",

"productName": "CCD Data Store",
"operationName": "Retrieve a create token",

"method": "GET",
"uri": "/caseworkers/{uid}/jurisdictions/{jid}/case-types/{ctid}/cases/{cid}/event-triggers/{etid}/token",

"specs": [
"to get an event token for the case just created"
],

"user": {
"_extends_": "Common_User_For_Request"
},

"request": {
"headers": {
"_extends_": "Common_Request_Headers"
},
"pathVariables": {
"uid": "[[DEFAULT_AUTO_VALUE]]",
"jid": "AUTOTEST1",
"ctid": "AAT_AUTH_15",
"cid": "${[scenarioContext][parentContext][childContexts][F-038-Case-Creation-Data][testData][actualResponse][body][id]}",
"etid": "UPDATE"
}
},

"expectedResponse": {
"_extends_": "Common_200_Response",
"headers": {
"Content-Encoding": "gzip",
"Content-Length": "[[ANYTHING_PRESENT]]"
},
"body": {
"token": "[[ANYTHING_PRESENT]]",
"case_details": "[[ANYTHING_PRESENT]]",
"event_id": "UPDATE"
}
}
}
100 changes: 100 additions & 0 deletions src/aat/resources/features/F-038/F-038-Case-Creation-Data.td.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"_guid_": "F-038-Case-Creation-Data",
"_extends_": "Case_Creation_Data_Base",

"users": {
"invokingUser": {
"_extends_": "PrivateCaseworker"
}
},

"request": {
"pathVariables": {
"jid": "AUTOTEST1",
"ctid": "AAT_AUTH_15"
},
"body": {
"data": {
"_extends_": "F-038-Full-Case-Data"
}
}
},

"expectedResponse": {
"body": {
"jurisdiction": "AUTOTEST1",
"case_type_id": "AAT_AUTH_15",
"case_data": {
"_extends_": "F-038-Full-Case-Data"
},
"data_classification": {
"MoneyGBPField": "PUBLIC",
"FixedListField": "PUBLIC",
"AddressUKField": {
"classification": "PUBLIC",
"value": {
"AddressLine1": "PUBLIC",
"AddressLine2": "PUBLIC",
"AddressLine3": "PUBLIC",
"PostTown": "PUBLIC",
"County": "PUBLIC",
"PostCode": "PUBLIC",
"Country": "PUBLIC"
}
},
"AddressForeignField": {
"classification": "PUBLIC",
"value": {
"AddressLine1": "PUBLIC",
"AddressLine2": "PUBLIC",
"AddressLine3": "PUBLIC",
"PostTown": "PUBLIC",
"County": "PUBLIC",
"PostCode": "PUBLIC",
"Country": "PUBLIC"
}
},
"DateTimeField": "PUBLIC",
"PhoneUKField": "PUBLIC",
"NumberField": "PUBLIC",
"MultiSelectListField": "PUBLIC",
"YesOrNoField": "PUBLIC",
"EmailField": "PUBLIC",
"TextField": "PUBLIC",
"DateField": "PUBLIC",
"TextAreaField": "PUBLIC",
"CollectionField": {
"classification": "PUBLIC",
"value": [
{
"id": "CollectionField1",
"classification": "PUBLIC"
},
{
"id": "CollectionField2",
"classification": "PUBLIC"
}
]
},
"CollectionPermissionField": {
"classification": "PUBLIC",
"value": [
{
"id": "CollectionPermissionField1",
"classification": "PUBLIC"
},
{
"id": "CollectionPermissionField2",
"classification": "PUBLIC"
},
{
"id": "CollectionPermissionField3",
"classification": "PUBLIC"
}
]
}
},
"supplementary_data": null
}
}
}
64 changes: 64 additions & 0 deletions src/aat/resources/features/F-038/F-038-Full-Case-Data.td.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"_guid_": "F-038-Full-Case-Data",

"TextField": "Some Text",
"NumberField": "164528",
"YesOrNoField": "Yes",
"PhoneUKField": "07123456789",
"EmailField": "[email protected]",
"MoneyGBPField": "4200",
"DateField": "2017-02-13",
"DateTimeField": "1988-07-07T22:20:00",
"TextAreaField": "Line1\nLine2",
"FixedListField": "VALUE3",
"MultiSelectListField": [
"OPTION2",
"OPTION4"
],
"CollectionField": [
{
"id": "CollectionField1",
"value": "Alias 1"
},
{
"id": "CollectionField2",
"value": "Alias 2"
}
],
"CollectionPermissionField": [
{
"id": "CollectionPermissionField1",
"value": "Alias 1"
},
{
"id": "CollectionPermissionField2",
"value": "Alias 2"
},
{
"id": "CollectionPermissionField3",
"value": "Alias 3"
}
],
"ComplexField": {
"ComplexTextField": "Nested text",
"ComplexFixedListField": "VALUE2"
},
"AddressUKField": {
"AddressLine1": "102 Petty France",
"AddressLine2": "CCD",
"AddressLine3": "c/o HMCTS Reform",
"PostTown": "Westminster",
"County": "Greater London",
"PostCode": "SW1H 9AJ",
"Country": "UK"
},
"AddressForeignField": {
"AddressLine1": "102 Petty France",
"AddressLine2": "CCD",
"AddressLine3": "c/o HMCTS Reform",
"PostTown": "Westminster",
"County": "Paris",
"PostCode": "SW1H 9AJ",
"Country": "France"
}
}
Loading