Move list conversion into sample service (#209)

* refactor * auto patch increment Co-authored-by: ras-rm-pr-bot <[email protected]>
ONSdigital · Sep 22, 2021 · ab8a8ff · ab8a8ff
1 parent b7e5d52
commit ab8a8ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/_infra/helm/sample/Chart.yaml b/_infra/helm/sample/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 12.1.3
+version: 12.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 12.1.3
+appVersion: 12.1.4
diff --git a/src/main/java/uk/gov/ons/ctp/response/sample/endpoint/SampleEndpoint.java b/src/main/java/uk/gov/ons/ctp/response/sample/endpoint/SampleEndpoint.java
@@ -8,7 +8,6 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
 import javax.validation.Valid;
 import libs.common.error.CTPException;
 import libs.common.error.InvalidRequestException;
@@ -21,8 +20,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -126,7 +123,6 @@ public ResponseEntity<SampleUnitDTO> requestSampleUnit(
     return ResponseEntity.ok(result);
   }
 
-  @Transactional(propagation = Propagation.REQUIRED)
   @RequestMapping(value = "{sampleSummaryId}/sampleunits", method = RequestMethod.GET)
   public ResponseEntity<SampleUnitDTO[]> requestSampleUnitsForSampleSummary(
       @PathVariable("sampleSummaryId") final UUID sampleSummaryId,
@@ -135,10 +131,7 @@ public ResponseEntity<SampleUnitDTO[]> requestSampleUnitsForSampleSummary(
 
     List<SampleUnit> sampleUnits;
     if (Strings.isEmpty(state)) {
-      sampleUnits =
-          sampleService
-              .findSampleUnitsBySampleSummary(sampleSummaryId)
-              .collect(Collectors.toList());
+      sampleUnits = sampleService.findSampleUnitsBySampleSummaryAsList(sampleSummaryId);
       List<SampleUnitDTO> result = mapperFacade.mapAsList(sampleUnits, SampleUnitDTO.class);
 
       if (!sampleUnits.isEmpty()) {
@@ -155,9 +148,8 @@ public ResponseEntity<SampleUnitDTO[]> requestSampleUnitsForSampleSummary(
         SampleUnitDTO.SampleUnitState sampleUnitState =
             SampleUnitDTO.SampleUnitState.valueOf(state);
         sampleUnits =
-            sampleService
-                .findSampleUnitsBySampleSummaryAndState(sampleSummaryId, sampleUnitState)
-                .collect(Collectors.toList());
+            sampleService.findSampleUnitsBySampleSummaryAndStateAsList(
+                sampleSummaryId, sampleUnitState);
         log.info(
             "found samples with state",
             kv("sampleSummaryId", sampleSummaryId),

diff --git a/src/main/java/uk/gov/ons/ctp/response/sample/service/SampleService.java b/src/main/java/uk/gov/ons/ctp/response/sample/service/SampleService.java
@@ -3,6 +3,7 @@
 import static net.logstash.logback.argument.StructuredArguments.kv;
 
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import libs.common.error.CTPException;
 import libs.common.state.StateTransitionManager;
@@ -225,6 +226,11 @@ public SampleUnit findSampleUnit(UUID id) {
     return sampleUnitRepository.findById(id).orElse(null);
   }
 
+  @Transactional(propagation = Propagation.REQUIRED)
+  public List<SampleUnit> findSampleUnitsBySampleSummaryAsList(UUID sampleSummaryId) {
+    return this.findSampleUnitsBySampleSummary(sampleSummaryId).collect(Collectors.toList());
+  }
+
   @Transactional(propagation = Propagation.REQUIRED)
   public Stream<SampleUnit> findSampleUnitsBySampleSummary(UUID sampleSummaryId) {
     try {
@@ -236,7 +242,14 @@ public Stream<SampleUnit> findSampleUnitsBySampleSummary(UUID sampleSummaryId) {
     }
   }
 
-  @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
+  @Transactional(propagation = Propagation.REQUIRED)
+  public List<SampleUnit> findSampleUnitsBySampleSummaryAndStateAsList(
+      UUID sampleSummaryId, SampleUnitState state) {
+    return this.findSampleUnitsBySampleSummaryAndState(sampleSummaryId, state)
+        .collect(Collectors.toList());
+  }
+
+  @Transactional(propagation = Propagation.REQUIRED)
   public Stream<SampleUnit> findSampleUnitsBySampleSummaryAndState(
       UUID sampleSummaryId, SampleUnitState state) {
     try {