CCD-6251 Add listElementCode to case view response

Jenkinsfile_CNP

@@ -11,7 +11,7 @@ properties(
     ]
 )
 
-@Library("Infrastructure@2.4.0")
+@Library("Infrastructure@2.4.4")
 
 import uk.gov.hmcts.contino.GradleBuilder
 def type = "java"

Jenkinsfile_nightly

@@ -6,7 +6,7 @@ properties([
     pipelineTriggers([cron('H 17 * * 1-5')])
 ])
 
-@Library("Infrastructure@2.4.0")
+@Library("Infrastructure@2.4.4")
 
 def type = "java"
 def product = "ccd"

api-docs/aggregated.swagger.yaml

@@ -457,6 +457,9 @@ definitions:
         type: object
         description: |
           Value of the field, type and structure depends on the field type
+      caseFieldSubfieldCode:
+        type: string
+        description: The optional CaseTypeTab case field or case field subfield path
     required:
       - id
       - label

api-docs/definition.yaml

@@ -192,6 +192,8 @@ definitions:
       order:
         type: integer
         format: int32
+      caseFieldSubfieldCode:
+        type: string
 
   WorkBasketResult:
     type: object

build.gradle

@@ -43,7 +43,7 @@ ext {
     testContainersVersion = '2.0.5'
     cucumber = '7.34.3'
     beftaFwVersion = '9.2.6'
-    ccdTestDefinitionVersion = '7.26.7'
+    ccdTestDefinitionVersion = '7.26.7_CCD-6251-SNAPSHOT2'
     limits = [
             'instruction': 90,
             'branch'     : 85,

charts/ccd-data-store-api/values.preview.template.yaml

@@ -94,7 +94,7 @@ ccd:
   ccd-definition-store-api:
     java:
       ingressHost: ccd-definition-store-${SERVICE_FQDN}
-      image: hmctsprod.azurecr.io/ccd/definition-store-api:latest
+      image: hmctsprod.azurecr.io/ccd/definition-store-api:pr-1825
       imagePullPolicy: Always
       devmemoryRequests: 2048Mi
       devcpuRequests: 2000m

src/aat/resources/features/F-065 - Get Case V2 Internal/F-065.feature

@@ -6,6 +6,38 @@
 Background: Load test data for the scenario
     Given an appropriate test context as detailed in the test data source
 
+#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+@S-166 # enable when CCD Definition Store emits CaseTypeTab ListElementCode
+Scenario: must return case view with CaseTypeTab ListElementCode as caseFieldSubfieldCode
+
+    Given a successful call [to create a token for case creation with CaseTypeTab ListElementCode] as in [S-166-Prerequisite],
+      And a case that has just been created as in [S-166-Prerequisite_Case_Creation],
+      And a user with [an active BEFTA Master caseworker profile in CCD],
+
+     When a request is prepared with appropriate values,
+      And the request [contains a case with CaseTypeTab ListElementCode configured],
+      And it is submitted to call the [Retrieve a case by ID for dynamic display] operation of [CCD Data Store],
+
+     Then a positive response is received,
+      And the response [contains caseFieldSubfieldCode for the MySchool tab field],
+      And the response has all other details as expected.
+
+#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+@S-167
+Scenario: must return case view with multiple CaseTypeTab ListElementCode values as caseFieldSubfieldCode
+
+    Given a successful call [to create a token for case creation with multiple CaseTypeTab ListElementCode values] as in [S-167-Prerequisite],
+      And a case that has just been created as in [S-167-Prerequisite_Case_Creation],
+      And a user with [an active BEFTA Master caseworker profile in CCD],
+
+     When a request is prepared with appropriate values,
+      And the request [contains a case with multiple CaseTypeTab ListElementCode values configured],
+      And it is submitted to call the [Retrieve a case by ID for dynamic display] operation of [CCD Data Store],
+
+     Then a positive response is received,
+      And the response [contains caseFieldSubfieldCode for both MySchool tab fields],
+      And the response has all other details as expected.
+
 #-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 @S-165 @Ignore
 Scenario: must return case view when the case reference exists
@@ -134,5 +166,3 @@ Scenario: must return the case view having only the respective fields with READ
       And a call [to get the same case by Solicitor 3] will get the expected response as in [F-065_Later_Case_Read_By_Solicitor_3_Generated_By_Solicitor_1].
 
 #-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-

src/aat/resources/features/F-065 - Get Case V2 Internal/S-166-Prerequisite.td.json

@@ -0,0 +1,29 @@
+{
+  "_guid_": "S-166-Prerequisite",
+  "_extends_": "Standard_Token_Creation_Data_For_Case_Creation",
+
+  "specs": [
+    "to create a token for case creation with CaseTypeTab ListElementCode"
+  ],
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaMasterCaseworker"
+    }
+  },
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_CTT_Subfield_Valid",
+      "etid": "createCase"
+    }
+  },
+
+  "expectedResponse": {
+    "body": {
+      "event_id": "createCase"
+    }
+  }
+}

src/aat/resources/features/F-065 - Get Case V2 Internal/S-166-Prerequisite_Case_Creation.td.json

@@ -0,0 +1,57 @@
+{
+  "_guid_": "S-166-Prerequisite_Case_Creation",
+  "_extends_": "Case_Creation_Base",
+
+  "user": {
+    "_extends_": "BeftaMasterCaseworker"
+  },
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_CTT_Subfield_Valid"
+    },
+    "body": {
+      "event_token": "${[scenarioContext][parentContext][childContexts][S-166-Prerequisite][testData][actualResponse][body][token]}",
+      "event": {
+        "id": "createCase",
+        "summary": "",
+        "description": ""
+      },
+      "data": {
+        "MySchool": {
+          "Name": "Springfield Elementary"
+        }
+      }
+    }
+  },
+
+  "expectedResponse": {
+    "_extends_": "Common_201_Response",
+    "body": {
+      "id": "[[ANYTHING_PRESENT]]",
+      "state": "CaseCreated",
+      "version": 0,
+      "jurisdiction": "BEFTA_MASTER",
+      "created_date": "[[ANYTHING_PRESENT]]",
+      "last_modified": "[[ANYTHING_PRESENT]]",
+      "last_state_modified_date": "[[ANYTHING_PRESENT]]",
+      "security_classification": "PUBLIC",
+      "case_type_id": "FT_CTT_Subfield_Valid",
+      "case_data": {
+        "MySchool": {
+          "Name": "Springfield Elementary"
+        }
+      },
+      "data_classification": {},
+      "supplementary_data": null,
+      "after_submit_callback_response": null,
+      "callback_response_status_code": null,
+      "callback_response_status": null,
+      "callback_error_message": null,
+      "delete_draft_response_status_code": null,
+      "delete_draft_response_status": null
+    }
+  }
+}

src/aat/resources/features/F-065 - Get Case V2 Internal/S-166.td.json

@@ -0,0 +1,99 @@
+{
+  "_guid_": "S-166",
+  "_extends_": "F-065_Test_Data_Base",
+  "title": "must return case view with CaseTypeTab ListElementCode as caseFieldSubfieldCode",
+
+  "specs": [
+    "an active BEFTA Master caseworker profile in CCD",
+    "contains a case with CaseTypeTab ListElementCode configured",
+    "contains caseFieldSubfieldCode for the MySchool tab field"
+  ],
+
+  "user": {
+    "_extends_": "BeftaMasterCaseworker"
+  },
+
+  "request": {
+    "pathVariables": {
+      "cid": "${[scenarioContext][childContexts][S-166-Prerequisite_Case_Creation][testData][actualResponse][body][id]}"
+    }
+  },
+
+  "expectedResponse": {
+    "_extends_": "Common_200_Response",
+    "headers": {
+      "Content-Type": "application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-case-view.v2+json;charset=UTF-8"
+    },
+    "body": {
+      "_links": {
+        "self": {
+          "href": "[[ANYTHING_PRESENT]]"
+        }
+      },
+      "case_id": "${}${[scenarioContext][childContexts][S-166-Prerequisite_Case_Creation][testData][actualResponse][body][id]}",
+      "case_type": {
+        "id": "FT_CTT_Subfield_Valid",
+        "name": "FT_CTT_Subfield_Valid",
+        "description": "CaseTypeTab valid direct complex subfield",
+        "jurisdiction": {
+          "id": "BEFTA_MASTER",
+          "name": "BEFTA Master",
+          "description": "Content for the BEFTA Master Jurisdiction."
+        },
+        "printEnabled": false
+      },
+      "tabs": [
+        {
+          "__operator__": "superset",
+          "__ordering__": "unordered",
+          "__elementId__": "id"
+        },
+        {
+          "id": "MySchoolDetails",
+          "label": "My School Details",
+          "order": 3,
+          "fields": [
+            {
+              "__operator__": "equivalent",
+              "__ordering__": "unordered",
+              "__elementId__": "id"
+            },
+            {
+              "id": "MySchool",
+              "label": "My School",
+              "hidden": false,
+              "value": {
+                "Name": "Springfield Elementary"
+              },
+              "metadata": false,
+              "hint_text": null,
+              "field_type": "[[ANYTHING_PRESENT]]",
+              "validation_expr": null,
+              "security_label": "PUBLIC",
+              "order": 1,
+              "formatted_value": {
+                "Name": "Springfield Elementary"
+              },
+              "display_context": null,
+              "display_context_parameter": null,
+              "show_condition": null,
+              "show_summary_change_option": null,
+              "show_summary_content_option": null,
+              "retain_hidden_value": null,
+              "publish": null,
+              "publish_as": null,
+              "acls": "[[ANYTHING_PRESENT]]",
+              "caseFieldSubfieldCode": "MySchool.Name"
+            }
+          ],
+          "show_condition": null,
+          "role": null
+        }
+      ],
+      "metadataFields": "[[ANYTHING_PRESENT]]",
+      "state": "[[ANYTHING_PRESENT]]",
+      "triggers": "[[ANYTHING_PRESENT]]",
+      "events": "[[ANYTHING_PRESENT]]"
+    }
+  }
+}

src/aat/resources/features/F-065 - Get Case V2 Internal/S-167-Prerequisite.td.json

@@ -0,0 +1,29 @@
+{
+  "_guid_": "S-167-Prerequisite",
+  "_extends_": "Standard_Token_Creation_Data_For_Case_Creation",
+
+  "specs": [
+    "to create a token for case creation with multiple CaseTypeTab ListElementCode values"
+  ],
+
+  "users": {
+    "invokingUser": {
+      "_extends_": "BeftaMasterCaseworker"
+    }
+  },
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_CTT_Subfield_Multiple",
+      "etid": "createCase"
+    }
+  },
+
+  "expectedResponse": {
+    "body": {
+      "event_id": "createCase"
+    }
+  }
+}

src/aat/resources/features/F-065 - Get Case V2 Internal/S-167-Prerequisite_Case_Creation.td.json

@@ -0,0 +1,59 @@
+{
+  "_guid_": "S-167-Prerequisite_Case_Creation",
+  "_extends_": "Case_Creation_Base",
+
+  "user": {
+    "_extends_": "BeftaMasterCaseworker"
+  },
+
+  "request": {
+    "pathVariables": {
+      "uid": "[[DEFAULT_AUTO_VALUE]]",
+      "jid": "BEFTA_MASTER",
+      "ctid": "FT_CTT_Subfield_Multiple"
+    },
+    "body": {
+      "event_token": "${[scenarioContext][parentContext][childContexts][S-167-Prerequisite][testData][actualResponse][body][token]}",
+      "event": {
+        "id": "createCase",
+        "summary": "",
+        "description": ""
+      },
+      "data": {
+        "MySchool": {
+          "Name": "Springfield Elementary",
+          "Number": 12345
+        }
+      }
+    }
+  },
+
+  "expectedResponse": {
+    "_extends_": "Common_201_Response",
+    "body": {
+      "id": "[[ANYTHING_PRESENT]]",
+      "state": "CaseCreated",
+      "version": 0,
+      "jurisdiction": "BEFTA_MASTER",
+      "created_date": "[[ANYTHING_PRESENT]]",
+      "last_modified": "[[ANYTHING_PRESENT]]",
+      "last_state_modified_date": "[[ANYTHING_PRESENT]]",
+      "security_classification": "PUBLIC",
+      "case_type_id": "FT_CTT_Subfield_Multiple",
+      "case_data": {
+        "MySchool": {
+          "Name": "Springfield Elementary",
+          "Number": 12345
+        }
+      },
+      "data_classification": {},
+      "supplementary_data": null,
+      "after_submit_callback_response": null,
+      "callback_response_status_code": null,
+      "callback_response_status": null,
+      "callback_error_message": null,
+      "delete_draft_response_status_code": null,
+      "delete_draft_response_status": null
+    }
+  }
+}