Skip to content

DMP-5333 Update dets to arm logging #3234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephenokeefe wants to merge 1 commit into
base: master
Choose a base branch
from
+68 −4
Open

DMP-5333 Update dets to arm logging #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions ...tegrationTest/java/uk/gov/hmcts/darts/arm/service/DetsToArmBatchPushProcessorIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import uk.gov.hmcts.darts.arm.api.ArmDataManagementApi;
import uk.gov.hmcts.darts.arm.helper.DataStoreToArmHelper;
import uk.gov.hmcts.darts.authorisation.component.UserIdentity;
import uk.gov.hmcts.darts.common.entity.ExternalObjectDirectoryEntity;
import uk.gov.hmcts.darts.common.entity.HearingEntity;
Expand All @@ -28,6 +30,8 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static uk.gov.hmcts.darts.common.enums.ExternalLocationTypeEnum.DETS;
import static uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum.ARM_MANIFEST_FAILED;
Expand All @@ -44,6 +48,8 @@ class DetsToArmBatchPushProcessorIntTest extends IntegrationBase {
private UserIdentity userIdentity;
@MockitoBean
private ArmDataManagementApi armDataManagementApi;
@MockitoSpyBean
private DataStoreToArmHelper dataStoreToArmHelper;

@Autowired
private DetsToArmBatchPushProcessor detsToArmBatchPushProcessor;
Expand Down Expand Up @@ -407,4 +413,66 @@ private ObjectStateRecordEntity createObjectStateRecordEntity(Long uuid) {
objectStateRecordEntity.setUuid(uuid);
return objectStateRecordEntity;
}

@Test
void processDetsToArm_StopsIncrementingTransferAttempts_WhenProcessDetsToArmFails() {
// given
ObjectStateRecordEntity objectStateRecordEntity = dartsDatabase.getObjectStateRecordRepository()
.save(createObjectStateRecordEntity(111L));
dartsDatabase.getObjectStateRecordRepository().save(objectStateRecordEntity);

ExternalObjectDirectoryEntity detsEod = dartsDatabase.getExternalObjectDirectoryStub().createExternalObjectDirectory(
savedMedia,
STORED,
DETS,
UUID.randomUUID().toString()
);
OffsetDateTime latestDateTime = OffsetDateTime.of(2023, 10, 27, 22, 0, 0, 0, ZoneOffset.UTC);

detsEod.setLastModifiedDateTime(latestDateTime);
detsEod.setTransferAttempts(1);
detsEod.setResponseCleaned(false);
detsEod.setOsrUuid(objectStateRecordEntity.getUuid());
detsEod = dartsDatabase.save(detsEod);

objectStateRecordEntity.setEodId(detsEod.getId());
dartsDatabase.getObjectStateRecordRepository().save(objectStateRecordEntity);

String rawFilename = String.format("%s_%s_%s", detsEod.getId(), savedMedia.getId(), detsEod.getTransferAttempts());
doNothing().when(armDataManagementApi).copyDetsBlobDataToArm(detsEod.getExternalLocation(), rawFilename);
when(armDataManagementApi.saveBlobDataToArm(any(), any())).thenThrow(new BlobStorageException("Error", null, 500));

// when
detsToArmBatchPushProcessor.processDetsToArm(5);
detsToArmBatchPushProcessor.processDetsToArm(5);
detsToArmBatchPushProcessor.processDetsToArm(5);
detsToArmBatchPushProcessor.processDetsToArm(5);
detsToArmBatchPushProcessor.processDetsToArm(5);

// then
Optional<ExternalObjectDirectoryEntity> foundArmEodOptional = dartsDatabase.getExternalObjectDirectoryRepository()
.findMatchingExternalObjectDirectoryEntityByLocation(
EodHelper.failedArmManifestFileStatus(),
EodHelper.armLocation(),
savedMedia,
null,
null,
null
);
assertTrue(foundArmEodOptional.isPresent());
ExternalObjectDirectoryEntity foundArmEod = foundArmEodOptional.get();
assertEquals(EodHelper.failedArmManifestFileStatus().getId(), foundArmEod.getStatus().getId());
assertNotNull(foundArmEod.getOsrUuid());

ObjectStateRecordEntity objectStateRecord = dartsDatabase.getObjectStateRecordRepository()
.findById(objectStateRecordEntity.getUuid()).orElseThrow();
verifyObjectStateRecordFailed(foundArmEod, detsEod, objectStateRecord);

// verify transfer attempts stops after 4
assertEquals(4, foundArmEod.getTransferAttempts());
// verify recoverByUpdatingEodToFailedArmStatus called 4 times
verify(dataStoreToArmHelper, times(4))
.recoverByUpdatingEodToFailedArmStatus(any(), any());

}
}
3 changes: 0 additions & 3 deletions src/main/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ public void incrementTransferAttempts(ExternalObjectDirectoryEntity externalObje
externalObjectDirectoryEntity.getId()
);
externalObjectDirectoryEntity.setTransferAttempts(newNumberOfAttempts);
if (newNumberOfAttempts > armDataManagementConfiguration.getMaxRetryAttempts()) {
logApi.armPushFailed(externalObjectDirectoryEntity.getId());
}
}

public void updateExternalObjectDirectoryStatus(ExternalObjectDirectoryEntity armExternalObjectDirectory, ObjectRecordStatusEntity armStatus,
Expand Down
1 change: 0 additions & 1 deletion src/test/java/uk/gov/hmcts/darts/arm/helper/DataStoreToArmHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ void updateExternalObjectDirectoryFailedTransferAttempts_ShouldSucceed() {

// then
verify(externalObjectDirectoryRepository).saveAndFlush(externalObjectDirectoryEntity);
verify(logApi).armPushFailed(123L);
}

@Test
Expand Down
Loading