using a refactored code instead of a stub implementation

Author: ORybak5

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendControllerTest.java

@@ -14,6 +14,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskDispatcher;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
@@ -42,13 +43,17 @@ public class EhrResendControllerTest {
     private static final Instant FIVE_DAYS_AGO = NOW.minus(Duration.ofDays(5));
     private static final String URI_TYPE = "https://fhir.nhs.uk/STU3/StructureDefinition/GPConnect-OperationOutcome-1";
     private static final String CONVERSATION_ID = "123-456";
+    public static final String NHS_NUMBER = "12345";
 
     @Autowired
     private EhrExtractStatusRepository ehrExtractStatusRepository;
 
     @Autowired
     private EhrResendController ehrResendController;
 
+    @MockBean
+    private RandomIdGeneratorService randomIdGeneratorService;
+
     @MockBean
     private TaskDispatcher taskDispatcher;
 
@@ -70,6 +75,7 @@ public void When_AnEhrExtractHasFailed_Expect_RespondsWith202() {
                                         .received(FIVE_DAYS_AGO)
                                         .rootId(generateRandomUppercaseUUID())
                                         .build());
+        ehrExtractStatus.setEhrRequest(EhrExtractStatus.EhrRequest.builder().nhsNumber(NHS_NUMBER).build());
 
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
@@ -97,12 +103,14 @@ public void When_AnEhrExtractHasFailed_Expect_GetGpcStructuredTaskScheduled() {
                                                            .received(FIVE_DAYS_AGO)
                                                            .rootId(generateRandomUppercaseUUID())
                                                            .build());
+        ehrExtractStatus.setEhrRequest(EhrExtractStatus.EhrRequest.builder().nhsNumber(NHS_NUMBER).build());
 
         ehrExtractStatusRepository.save(ehrExtractStatus);
 
         ehrResendController.scheduleEhrExtractResend(CONVERSATION_ID);
 
-        var taskDefinition = GetGpcStructuredTaskDefinition.builder().build();
+        var taskDefinition = GetGpcStructuredTaskDefinition.getGetGpcStructuredTaskDefinition(randomIdGeneratorService,
+                                                                                              ehrExtractStatus);
         verify(taskDispatcher, times(1)).createTask(taskDefinition);
 
     }

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrResendController.java

@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.task.TaskDispatcher;
 import uk.nhs.adaptors.gp2gp.ehr.model.EhrExtractStatus;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
@@ -30,6 +31,7 @@ public class EhrResendController {
 
     private EhrExtractStatusRepository ehrExtractStatusRepository;
     private TaskDispatcher taskDispatcher;
+    private RandomIdGeneratorService randomIdGeneratorService;
 
     @PostMapping("/{conversationId}")
     public ResponseEntity<OperationOutcome> scheduleEhrExtractResend(@PathVariable String conversationId) {
@@ -51,7 +53,8 @@ public ResponseEntity<OperationOutcome> scheduleEhrExtractResend(@PathVariable S
             return new ResponseEntity<>(operationOutcome, HttpStatus.NOT_FOUND);
         }
 
-        var taskDefinition = GetGpcStructuredTaskDefinition.builder().build();
+        var taskDefinition = GetGpcStructuredTaskDefinition.getGetGpcStructuredTaskDefinition(randomIdGeneratorService,
+                                                                                              ehrExtractStatus.get());
         taskDispatcher.createTask(taskDefinition);
 
         return new ResponseEntity<>(HttpStatus.ACCEPTED);