Started all over after a re-think. Created cases needed for linking.

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/F-1019.feature

@@ -288,17 +288,29 @@ Feature: F-1019: Submit Case Creation Handle Case Links
 
   @S-1019.23
   Scenario: Simulate concurrent updates to linked cases
-    //And case A is linked to case B
-    //And case B is linked to case A
-    //When both cases are updated at the same time
-    //Then a deadlock may occur
-    Given   a user with [an active profile in CCD]
-    And     a successful call [to create parent and child case] as in [F-1019_CreateChildParentCasesCaseworker]
+  //And case A is linked to case B
+  //And case B is linked to case A
+  //When both cases are updated at the same time
+  //Then a deadlock may occur
+    Given a user with [an active profile in CCD]
+    # Create cases needed for linking
+    And   a successful call [to create a case] as in [F-1019_CreateCasePreRequisiteCaseworkerBase]
+
+    # Create cases needed for linking
+    And   a successful call [to create a case with a different case_type] as in [F-1019_CreateThirdCaseDifferentCaseTypePreRequisiteCaseworkerBase]
+
+    # Create case linking one way
+    And     a successful call [create case to case link] as in [F-1019_Create_Case_Link]
+
+    #Create case linking the other way
+    #And     a successful call [create case to case link] as in [F-1019_Create_Case_Link_To_Case_Link]
+
     When    a request is prepared with appropriate values
     And     the request [contains the standard CaseLinks field with Case Reference values]
-    And     it is submitted to call the [Submit case creation as Case worker (V2)] operation of [CCD Data Store]
+    #And     it is submitted to call the [Submit case creation as Case worker (V2)] operation of [CCD Data Store]
+    And     it is submitted to call the [submit event for an existing case (V2)] operation of [CCD data store],
     Then    a positive response is received
     And     the response has all other details as expected
-    And     a successful call [to verify that the Case Links have been created in the CASE_LINK table with correct values] as in [F-1019-VerifyMultipleCaseLinksUsingStandardLinkFieldA]
-    And     a successful call [create link from Child to Parent] as in [F-1019_Create_Child_Link_To_Parent]
-    And     a successful call [to verify that the Case Links have been created in the CASE_LINK table with correct values] as in [F-1019-VerifyMultipleCaseLinksUsingStandardLinkFieldB]
+    And     a successful call [to verify that the Case Links have been created in the CASE_LINK table with correct values] as in [F-1019-VerifyMultipleCaseLinksUsingStandardLinkField]
+
+

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/F-1019_Create_Child_Link_To_Parent.td.json → src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/F-1019_Create_Case_Link.td.json

@@ -1,22 +1,24 @@
 {
-  "_guid_": "F-1019_Create_Child_Link_To_Parent",
-  "_extends_": "F-1019_Test_Data_Base_Case_type_V2",
+  "_guid_": "F-1019_Create_Case_Link",
+  "_extends_": "F-1019_Test_Data_Base_V2",
 
   "title": "Standard CaseLinks field should generate caseLink records with StandardLink set to true when Submit Case Creation Event is invoked on v2_external#/case-controller/createCaseUsingPOST",
 
   "prerequisites" : [{
-    "Token_Creation": "S-1019_GetCreateToken_DifferentCaseType"
+    "Token_Creation": "S-1019_GetCreateToken"
   }],
 
   "specs": [
     "an active profile in CCD",
-    "create link from Child to Parent"
+    "create case to case link",
+    "contains the standard CaseLinks field with Case Reference values",
+    "As a prerequisite"
   ],
 
   "request": {
     "body": {
       "data": {
-        "_extends_": "F-1019-CaseDataWithStandardCaseLinksB"
+        "_extends_": "F-1019-CaseDataCaseLinks"
       },
       "event": {
         "id": "createCaseCaseLinks",
@@ -32,10 +34,10 @@
   "expectedResponse": {
     "body" : {
       "data" : {
-        "_extends_": "F-1019-CaseDataWithStandardCaseLinksB"
+        "_extends_": "F-1019-CaseDataCaseLinks"
       },
       "data_classification" : {
-        "_extends_": "F-1019-ClassificationsForCaseDataWithStandardCaseLinksB"
+        "_extends_": "F-1019-ClassificationsForCaseDataWithStandardCaseLinksC"
       }
     }
   }

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/F-1019_Create_Case_Link_To_Case_Link.td.json

@@ -0,0 +1,47 @@
+{
+  "_guid_": "F-1019_Create_Case_Link_To_Case_Link",
+  "_extends_": "F-1019_Test_Data_Base_V2",
+
+  "title": "Standard CaseLinks field should generate caseLink records with StandardLink set to true when Submit Case Creation Event is invoked on v2_external#/case-controller/createCaseUsingPOST",
+
+  "prerequisites" : [{
+    "Token_Creation": "S-1019_GetCreateToken"
+  }],
+
+  "specs": [
+    "an active profile in CCD",
+    "create case to case link",
+    "contains the standard CaseLinks field with Case Reference values",
+    "As a prerequisite"
+  ],
+
+  "request": {
+    "pathVariables": {
+      "cid": "${[scenarioContext][childContexts][F-1019_Create_Case_Link][testData][actualResponse][body][id]}"
+    },
+    "body": {
+      "data": {
+        "_extends_": "F-1019-CaseDataCaseLinkToCaseLink"
+      },
+      "event": {
+        "id": "createCaseCaseLinks",
+        "summary": "",
+        "description": ""
+      },
+      "security_classification": "PUBLIC",
+      "event_token" : "${[scenarioContext][childContexts][Token_Creation][testData][actualResponse][body][token]}",
+      "ignore_warning": true
+    }
+  },
+
+  "expectedResponse": {
+    "body" : {
+      "data" : {
+        "_extends_": "F-1019-CaseDataCaseLinkToCaseLink"
+      },
+      "data_classification" : {
+        "_extends_": "F-1019-ClassificationsForCaseDataWithStandardCaseLinksC"
+      }
+    }
+  }
+}

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/F-1019_Update_Case_Link_To_Case_Link.td.json

@@ -0,0 +1,55 @@
+{
+	"_guid_": "F-1019_Update_Case_Link_To_Case_Link",
+
+	"productName": "CCD Data Store",
+	"operationName": "submit event for an existing case (V2)",
+
+	"method": "POST",
+	"uri": "/cases/{cid}/events",
+
+	"user": {
+		"_extends_": "Common_User_For_Request"
+	},
+
+	"request": {
+		"headers": {
+			"_extends_": "Common_Request_Headers",
+			"Content-Type": "application/vnd.uk.gov.hmcts.ccd-data-store-api.create-event.v2+json",
+			"experimental": true
+		},
+    "pathVariables": {
+        "cid": "${[scenarioContext][childContexts][F-1019_Create_Case_Link][testData][actualResponse][body][id]}"
+    },
+    "body": {
+        "data": {
+          "_extends_": "F-1019-CaseDataCaseLinkToCaseLink"
+        },
+        "event": {
+          "id": "createCaseCaseLinks",
+          "summary": "",
+          "description": ""
+        },
+        "security_classification": "PUBLIC",
+        "event_token" : "${[scenarioContext][childContexts][Token_Creation][testData][actualResponse][body][token]}",
+        "ignore_warning": true
+      }
+    },
+
+    "expectedResponse": {
+      "body" : {
+        "data" : {
+          "_extends_": "F-1019-CaseDataCaseLinkToCaseLink"
+        },
+        "data_classification" : {
+          "_extends_": "F-1019-ClassificationsForCaseDataWithStandardCaseLinksC"
+        }
+      }
+    },
+
+	"expectedResponse": {
+		"headers": {
+			"_extends_": "Common_Response_Headers",
+			"Content-Length": "[[ANYTHING_PRESENT]]"
+		}
+	}
+}

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/S-1019.23.td.json

@@ -1,42 +1,13 @@
 {
   "_guid_": "S-1019.23",
-  "_extends_": "F-1019_Test_Data_Base_V2",
+  "_extends_": "F-1019_Update_Case_Link_To_Case_Link",
 
   "title": "Standard CaseLinks field should generate caseLink records with StandardLink set to true when Submit Case Creation Event is invoked on v2_external#/case-controller/createCaseUsingPOST",
 
-  "prerequisites" : [{
-    "Token_Creation": "S-1019_GetCreateToken"
-  }],
-
   "specs": [
     "an active profile in CCD",
-    "contains the standard CaseLinks field with Case Reference values"
-  ],
-
-  "request": {
-    "body": {
-      "data": {
-        "_extends_": "F-1019-CaseDataWithStandardCaseLinksA"
-      },
-      "event": {
-        "id": "createCaseCaseLinks",
-        "summary": "",
-        "description": ""
-      },
-      "security_classification": "PUBLIC",
-      "event_token" : "${[scenarioContext][childContexts][Token_Creation][testData][actualResponse][body][token]}",
-      "ignore_warning": true
-    }
-  },
-
-  "expectedResponse": {
-    "body" : {
-      "data" : {
-        "_extends_": "F-1019-CaseDataWithStandardCaseLinksA"
-      },
-      "data_classification" : {
-        "_extends_": "F-1019-ClassificationsForCaseDataWithStandardCaseLinksA"
-      }
-    }
-  }
+    "create case to case link",
+    "contains the standard CaseLinks field with Case Reference values",
+    "As a prerequisite"
+  ]
 }

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/Snippets/F-1019-CaseDataCaseLinkToCaseLink.td.json

@@ -0,0 +1,21 @@
+{
+  "_guid_": "F-1019-CaseDataCaseLinkToCaseLink",
+
+  "CaseLinkField": {
+    "CaseReference":  "${[scenarioContext][childContexts][F-1019_Create_Case_Link][testData][actualResponse][body][id]}"
+  },
+  "caseLinks": [
+    {
+      "id": "d7e67a81-0000-CaseLinkedViaStandardCaseLinksFieldChild",
+      "value": {
+        "CaseReference": "${}${[scenarioContext][childContexts][F-1019_CreateCasePreRequisiteCaseworkerBase][testData][actualResponse][body][id]}"
+      }
+    },
+    {
+      "id": "d7e67a81-0000-CaseLinkedViaStandardCaseLinksField",
+      "value": {
+        "CaseReference": "${}${[scenarioContext][childContexts][F-1019_CreateThirdCaseDifferentCaseTypePreRequisiteCaseworkerBase][testData][actualResponse][body][id]}"
+      }
+    }
+  ]
+}

src/aat/resources/features/F-1019 - Submit Case Creation Handle Case Links/Snippets/F-1019-CaseDataCaseLinks.td.json

@@ -0,0 +1,22 @@
+{
+  "_guid_": "F-1019-CaseDataCaseLinks",
+
+  "CaseLinkField": {
+    "CaseReference":  "${[scenarioContext][parentContext][childContexts][testData][actualResponse][body][id]}"
+
+  },
+  "caseLinks": [
+    {
+      "id": "d7e67a81-0000-CaseLinkedViaStandardCaseLinksFieldChild",
+      "value": {
+        "CaseReference": "${}${[scenarioContext][parentContext][childContexts][F-1019_CreateCasePreRequisiteCaseworkerBase][testData][actualResponse][body][id]}"
+      }
+    },
+    {
+      "id": "d7e67a81-0000-CaseLinkedViaStandardCaseLinksField",
+      "value": {
+        "CaseReference": "${}${[scenarioContext][parentContext][childContexts][F-1019_CreateThirdCaseDifferentCaseTypePreRequisiteCaseworkerBase][testData][actualResponse][body][id]}"
+      }
+    }
+  ]
+}