Fix for CCD-4702 (#1478)

* Fix for CCD-4702 Possible regression in /search-inputs endpoint in ccd-data-api * CCD-4702 update functional tests * empty commit to trigger build * empty commit to trigger build --------- Co-authored-by: RebeccaBaker <38425793+RebeccaBaker@users.noreply.github.com> Co-authored-by: rebeccabaker <rebecca.baker@hmcts.net> Co-authored-by: shahir-ali <133034938+shahir-ali@users.noreply.github.com> Co-authored-by: bharatkumarpatel1 <Bharatkumar.Patel1@HMCTS.NET> Co-authored-by: Dinesh Patel <dinesh1.patel@btinternet.com>
hmcts · Nov 14, 2024 · 99d2147 · 99d2147
1 parent 7c9ff69
commit 99d2147
Show file tree

Hide file tree

Showing 12 changed files with 2,322 additions and 23 deletions.
diff --git a/aat/src/aat/resources/features/F-079/S-508.td.json b/aat/src/aat/resources/features/F-079/S-508.td.json
@@ -427,19 +427,19 @@
             "type": "FixedList",
             "fixed_list_items": [
               {
-                "code": "DONE",
-                "label": "Done",
-                "order": null
+                "code": "TODO",
+                "label": "To do",
+                "order": 1
               },
               {
                 "code": "IN_PROGRESS",
                 "label": "In progress",
-                "order": null
+                "order": 2
               },
               {
-                "code": "TODO",
-                "label": "To do",
-                "order": null
+                "code": "DONE",
+                "label": "Done",
+                "order": 3
               }
             ]
           },

diff --git a/aat/src/aat/resources/features/F-080/S-080.1.td.json b/aat/src/aat/resources/features/F-080/S-080.1.td.json
@@ -629,12 +629,12 @@
               {
                 "code": "CaseUpdated",
                 "label": "Update case",
-                "order": null
+                "order": 1
               },
               {
                 "code": "CaseCreated",
                 "label": "Create case",
-                "order": null
+                "order": 1
               }
             ],
             "complex_fields": [],

diff --git a/aat/src/aat/resources/features/F-089/S-089.2.td.json b/aat/src/aat/resources/features/F-089/S-089.2.td.json
@@ -1766,12 +1766,12 @@
               {
                 "code": "CaseCreated",
                 "label": "Create case",
-                "order": null
+                "order": 1
               },
               {
                 "code": "CaseUpdated",
                 "label": "Updated case",
-                "order": null
+                "order": 1
               }
             ],
             "complex_fields": [],

diff --git a/aat/src/aat/resources/features/F-090/S-090.3.td.json b/aat/src/aat/resources/features/F-090/S-090.3.td.json
@@ -1669,11 +1669,11 @@
           "fixed_list_items" : [ {
             "code" : "CaseCreated",
             "label" : "Create case",
-            "order" : null
+            "order" : 1
           }, {
             "code" : "CaseUpdated",
             "label" : "Updated case",
-            "order" : null
+            "order" : 1
           } ],
           "complex_fields" : [ ],
           "collection_field_type" : null

diff --git a/...src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json b/...src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json
@@ -594,12 +594,12 @@
               {
                 "code": "CaseCreated",
                 "label": "Create case",
-                "order": null
+                "order": 1
               },
               {
                 "code": "CaseUpdated",
                 "label": "Updated case",
-                "order": null
+                "order": 1
               }
             ],
             "complex_fields": [],

diff --git a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json
@@ -230,12 +230,12 @@
 							{
 								"code": "extraDetailsAdded",
 								"label": "Extra Details Added",
-								"order": null
+								"order": 1
 							},
 							{
 								"code": "CaseCreated",
 								"label": "Create case",
-								"order": null
+								"order": 1
 							}
 						],
 						"complex_fields": [],

diff --git a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.3_Get_CaseType.td.json b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.3_Get_CaseType.td.json
@@ -115,7 +115,7 @@
 					"fixed_list_items" : [ {
 						"code" : "CaseCreated",
 						"label" : "Create case",
-						"order" : null
+						"order" : 1
 					} ],
 					"complex_fields" : [ ],
 					"collection_field_type" : null

diff --git a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.8_Get_CaseType.td.json b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.8_Get_CaseType.td.json
@@ -186,11 +186,11 @@
 					"fixed_list_items" : [ {
 						"code" : "extraDetailsAdded",
 						"label" : "Extra Details Added",
-						"order" : null
+						"order" : 1
 					}, {
 						"code" : "CaseCreated",
 						"label" : "Create case",
-						"order" : null
+						"order" : 1
 					} ],
 					"complex_fields" : [ ],
 					"collection_field_type" : null

diff --git a/aat/src/aat/resources/features/F-106 New CategoryID Column/S-106.3.td.json b/aat/src/aat/resources/features/F-106 New CategoryID Column/S-106.3.td.json
@@ -378,7 +378,7 @@
           "fixed_list_items" : [ {
             "code" : "CaseCreated",
             "label" : "Create case",
-            "order" : null
+            "order" : 1
           } ],
           "complex_fields" : [ ],
           "collection_field_type" : null

diff --git a/...tion/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java b/...tion/src/test/java/uk/gov/hmcts/net/ccd/definition/store/excel/SpreadSheetImportTest.java
@@ -70,7 +70,7 @@ public class SpreadSheetImportTest extends BaseTest {
 
     private static final String GET_CASE_TYPES_COUNT_QUERY = "SELECT COUNT(*) FROM case_type";
 
-    private static final String RESPONSE_JSON_V45 = "GetCaseTypesResponseForCCD_TestDefinition_V45.json";
+    private static final String RESPONSE_JSON_V55 = "GetCaseTypesResponseForCCD_TestDefinition_V55.json";
 
     private static final String EXPECTED_USER_PROFILES = "[{\"id\":\"user1@hmcts.net\","
         + "\"work_basket_default_jurisdiction\":\"TEST\","
@@ -346,7 +346,7 @@ public static Matcher<Map<String, Object>> hasColumn(String key, Object value) {
     }
 
     private void assertBody(String contentAsString) throws IOException, URISyntaxException, JSONException {
-        assertBody(contentAsString, RESPONSE_JSON_V45);
+        assertBody(contentAsString, RESPONSE_JSON_V55);
     }
 
     private void assertBody(String contentAsString, String fileName)