Review comments

hmcts · Dec 12, 2024 · 388dd00 · 388dd00
1 parent 0aa9547
commit 388dd00
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/...tionTest/java/uk/gov/hmcts/darts/task/service/UnstructuredToArmBatchProcessorIntTest.java b/...tionTest/java/uk/gov/hmcts/darts/task/service/UnstructuredToArmBatchProcessorIntTest.java
@@ -11,6 +11,7 @@
 import uk.gov.hmcts.darts.arm.component.ArchiveRecordFileGenerator;
 import uk.gov.hmcts.darts.arm.config.ArmDataManagementConfiguration;
 import uk.gov.hmcts.darts.arm.config.UnstructuredToArmProcessorConfiguration;
+import uk.gov.hmcts.darts.arm.helper.DataStoreToArmHelper;
 import uk.gov.hmcts.darts.arm.mapper.MediaArchiveRecordMapper;
 import uk.gov.hmcts.darts.arm.service.ArchiveRecordService;
 import uk.gov.hmcts.darts.arm.service.ExternalObjectDirectoryService;
@@ -83,7 +84,6 @@ class UnstructuredToArmBatchProcessorIntTest extends IntegrationBase {
     private UserIdentity userIdentity;
     @Autowired
     private ArmDataManagementConfiguration armDataManagementConfiguration;
-    @Autowired
     @SpyBean
     private FileOperationService fileOperationService;
     @SpyBean
@@ -98,6 +98,8 @@ class UnstructuredToArmBatchProcessorIntTest extends IntegrationBase {
     private ExternalObjectDirectoryRepository eodRepository;
     @SpyBean
     private MediaArchiveRecordMapper mediaArchiveRecordMapper;
+    @SpyBean
+    private DataStoreToArmHelper dataStoreToArmHelper;
 
     @MockBean
     private UnstructuredToArmProcessorConfiguration unstructuredToArmProcessorConfiguration;
@@ -309,7 +311,7 @@ void testBatchedQueryWhereSomeFailedToPush() throws IOException {
         assertThat(failedMediaList.size()).isEqualTo(2);
 
         ArgumentCaptor<String> manifestFileContentCaptor = ArgumentCaptor.forClass(String.class);
-        verify(fileOperationService).convertStringToBinaryData(manifestFileContentCaptor.capture());
+        verify(dataStoreToArmHelper).convertStringToBinaryData(manifestFileContentCaptor.capture());
         String manifestFileContents = manifestFileContentCaptor.getValue();
 
         int expectedNumberOfRows = 6;
@@ -369,7 +371,7 @@ void movePendingMediaDataFromUnstructuredToArmStorage() throws IOException {
 
 
         ArgumentCaptor<String> manifestFileContentCaptor = ArgumentCaptor.forClass(String.class);
-        verify(fileOperationService).convertStringToBinaryData(manifestFileContentCaptor.capture());
+        verify(dataStoreToArmHelper).convertStringToBinaryData(manifestFileContentCaptor.capture());
         String manifestFileContent = manifestFileContentCaptor.getValue();
 
         assertThat(manifestFileContent.lines().count()).isEqualTo(4);
@@ -426,7 +428,7 @@ void movePreviousArmFailedFromUnstructuredToArmStorage() throws IOException {
         assertThat(armDropzoneEodsMedia1.get(0).getManifestFile()).isEqualTo(manifestFileName);
 
         ArgumentCaptor<String> manifestFileContentCaptor = ArgumentCaptor.forClass(String.class);
-        verify(fileOperationService).convertStringToBinaryData(manifestFileContentCaptor.capture());
+        verify(dataStoreToArmHelper).convertStringToBinaryData(manifestFileContentCaptor.capture());
         String manifestFileContent = manifestFileContentCaptor.getValue();
         assertThat(manifestFileContent.lines().count()).isEqualTo(4);
         assertThat(manifestFileContent).contains(
@@ -459,7 +461,7 @@ void movePreviousArmFailedWithNoCorrespondingUnstructuredFailsAndProcessingConti
         verify(archiveRecordFileGenerator).generateArchiveRecords(manifestFileNameCaptor.capture(), any());
 
         ArgumentCaptor<String> manifestFileContentCaptor = ArgumentCaptor.forClass(String.class);
-        verify(fileOperationService).convertStringToBinaryData(manifestFileContentCaptor.capture());
+        verify(dataStoreToArmHelper).convertStringToBinaryData(manifestFileContentCaptor.capture());
         String manifestFileContent = manifestFileContentCaptor.getValue();
 
         assertThat(manifestFileContent.lines().count()).isEqualTo(2);

diff --git a/src/main/java/uk/gov/hmcts/darts/arm/component/ArchiveRecordFileGenerator.java b/src/main/java/uk/gov/hmcts/darts/arm/component/ArchiveRecordFileGenerator.java
@@ -9,5 +9,5 @@
 public interface ArchiveRecordFileGenerator {
     boolean generateArchiveRecord(ArchiveRecord archiveRecord, File archiveRecordFile, ArchiveRecordType archiveRecordType);
 
-    String generateArchiveRecords(String archvieFileName, List<ArchiveRecord> archiveRecords);
+    String generateArchiveRecords(String archiveFileName, List<ArchiveRecord> archiveRecords);
 }
diff --git a/src/main/java/uk/gov/hmcts/darts/arm/component/impl/ArchiveRecordFileGeneratorImpl.java b/src/main/java/uk/gov/hmcts/darts/arm/component/impl/ArchiveRecordFileGeneratorImpl.java
@@ -48,7 +48,7 @@ public boolean generateArchiveRecord(ArchiveRecord archiveRecord, File archiveRe
     }
 
     @Override
-    public String generateArchiveRecords(String archvieFileName, List<ArchiveRecord> archiveRecords) {
+    public String generateArchiveRecords(String archiveFileName, List<ArchiveRecord> archiveRecords) {
         StringBuilder archiveRecordsStringBuilder = new StringBuilder();
         String archiveRecordsString = null;
         if (!archiveRecords.isEmpty()) {
@@ -66,7 +66,7 @@ public String generateArchiveRecords(String archvieFileName, List<ArchiveRecord>
             }
             archiveRecordsString = archiveRecordsStringBuilder.toString();
             log.info("Contents of manifest file {} for EOD {}\n{}",
-                     archvieFileName,
+                     archiveFileName,
                      archiveRecords.get(0).getArchiveRecordOperation().getRelationId(),
                      archiveRecordsString);
         }

diff --git a/src/main/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelper.java b/src/main/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelper.java
@@ -294,7 +294,7 @@ public Long getFileSize(int externalObjectDirectoryId) {
 
     public void copyMetadataToArm(String manifestFileContents, String archiveRecordsFileName) {
         try {
-            BinaryData metadataFileBinary = fileOperationService.convertStringToBinaryData(Optional.ofNullable(manifestFileContents).orElse(""));
+            BinaryData metadataFileBinary = convertStringToBinaryData(Optional.ofNullable(manifestFileContents).orElse(""));
             armDataManagementApi.saveBlobDataToArm(archiveRecordsFileName, metadataFileBinary);
         } catch (BlobStorageException e) {
             if (e.getStatusCode() == BLOB_ALREADY_EXISTS_STATUS_CODE) {
@@ -308,4 +308,8 @@ public void copyMetadataToArm(String manifestFileContents, String archiveRecords
             throw e;
         }
     }
+
+    public BinaryData convertStringToBinaryData(String manifestFileContents) {
+        return BinaryData.fromString(manifestFileContents);
+    }
 }
diff --git a/src/main/java/uk/gov/hmcts/darts/common/service/FileOperationService.java b/src/main/java/uk/gov/hmcts/darts/common/service/FileOperationService.java
@@ -19,6 +19,4 @@ Path saveFileToTempWorkspace(InputStream inputStream, String fileName,
     Path saveBinaryDataToSpecifiedWorkspace(BinaryData binaryData, String fileName, String workspace, boolean appendUuidToWorkspace) throws IOException;
 
     BinaryData convertFileToBinaryData(String fileName);
-
-    BinaryData convertStringToBinaryData(String manifestFileContents);
 }
diff --git a/src/main/java/uk/gov/hmcts/darts/common/service/impl/FileOperationServiceImpl.java b/src/main/java/uk/gov/hmcts/darts/common/service/impl/FileOperationServiceImpl.java
@@ -87,10 +87,4 @@ public Path saveBinaryDataToSpecifiedWorkspace(BinaryData binaryData, String fil
     public BinaryData convertFileToBinaryData(String fileName) {
         return BinaryData.fromFile(Path.of(fileName));
     }
-
-    @Override
-    public BinaryData convertStringToBinaryData(String manifestFileContents) {
-        return BinaryData.fromString(manifestFileContents);
-    }
-
 }