introducing a factory method to create instances of GetGpcStructuredTaskDefinition class (#991)

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/request/EhrExtractRequestHandler.java

@@ -97,19 +97,13 @@ private EhrExtractStatus saveExtractStatusDocument(EhrExtractStatus ehrExtractSt
     }
 
     private void createGetGpcStructuredTask(EhrExtractStatus ehrExtractStatus) {
-        var getGpcStructuredTaskDefinition = GetGpcStructuredTaskDefinition.builder()
-            .nhsNumber(ehrExtractStatus.getEhrRequest().getNhsNumber())
-            .taskId(randomIdGeneratorService.createNewId())
-            .conversationId(ehrExtractStatus.getConversationId())
-            .requestId(ehrExtractStatus.getEhrRequest().getRequestId())
-            .toAsid(ehrExtractStatus.getEhrRequest().getToAsid())
-            .fromAsid(ehrExtractStatus.getEhrRequest().getFromAsid())
-            .toOdsCode(ehrExtractStatus.getEhrRequest().getToOdsCode())
-            .fromOdsCode(ehrExtractStatus.getEhrRequest().getFromOdsCode())
-            .build();
+        var getGpcStructuredTaskDefinition = GetGpcStructuredTaskDefinition.getGetGpcStructuredTaskDefinition(randomIdGeneratorService,
+                                                                                                              ehrExtractStatus);
         taskDispatcher.createTask(getGpcStructuredTaskDefinition);
     }
 
+
+
     private EhrExtractStatus.EhrRequest prepareMinimalEhrRequest(Document header, Document payload) {
         return EhrExtractStatus.EhrRequest.builder()
             .messageId(getRequiredValue(header, MESSAGE_ID_PATH))

service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/GetGpcStructuredTaskDefinition.java

@@ -6,8 +6,10 @@
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
+import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskDefinition;
 import uk.nhs.adaptors.gp2gp.common.task.TaskType;
+import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
 
 /**
  * Task definition for downloading Structured Record from GCP
@@ -26,4 +28,19 @@ public class GetGpcStructuredTaskDefinition extends TaskDefinition {
     public TaskType getTaskType() {
         return GET_GPC_STRUCTURED;
     }
+
+    public static GetGpcStructuredTaskDefinition getGetGpcStructuredTaskDefinition(RandomIdGeneratorService randomIdGeneratorService,
+                                                                                   EhrExtractStatus ehrExtractStatus) {
+        var getGpcStructuredTaskDefinition = GetGpcStructuredTaskDefinition.builder()
+            .nhsNumber(ehrExtractStatus.getEhrRequest().getNhsNumber())
+            .taskId(randomIdGeneratorService.createNewId())
+            .conversationId(ehrExtractStatus.getConversationId())
+            .requestId(ehrExtractStatus.getEhrRequest().getRequestId())
+            .toAsid(ehrExtractStatus.getEhrRequest().getToAsid())
+            .fromAsid(ehrExtractStatus.getEhrRequest().getFromAsid())
+            .toOdsCode(ehrExtractStatus.getEhrRequest().getToOdsCode())
+            .fromOdsCode(ehrExtractStatus.getEhrRequest().getFromOdsCode())
+            .build();
+        return getGpcStructuredTaskDefinition;
+    }
 }