[AB2D-5918] Add Null Attestation Handling (#1308)

* add logs to contractserviceimpl * fixed whitespace issues * remove log for attestationDate * add null check for attestedOn * revert logs in ContractServiceImpl * indent line for eventlogger to match others * update event_logger status message for null attestation * update unit test to handle new logic * some cleanup * temporary sonarqube workaround * temporary - comment out failing integreation tests * Revert "temporary - comment out failing integreation tests" This reverts commit 74c1913. * Revert "temporary sonarqube workaround" This reverts commit 7416721. * commented out failed integration tests and switched steps in github actions * Revert "commented out failed integration tests and switched steps in github actions" This reverts commit 68479e0. --------- Co-authored-by: smirnovaae <[email protected]>
CMSgov · Feb 15, 2024 · 1966b85 · 1966b85
1 parent 1ecb93e
commit 1966b85
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 9 deletions.
diff --git a/worker/src/main/java/gov/cms/ab2d/worker/processor/JobPreProcessorImpl.java b/worker/src/main/java/gov/cms/ab2d/worker/processor/JobPreProcessorImpl.java
@@ -26,6 +26,7 @@
 import static gov.cms.ab2d.eventclient.config.Ab2dEnvironment.PUBLIC_LIST;
 import static gov.cms.ab2d.eventclient.events.SlackEvents.EOB_JOB_COVERAGE_ISSUE;
 import static gov.cms.ab2d.eventclient.events.SlackEvents.EOB_JOB_STARTED;
+import static gov.cms.ab2d.eventclient.events.SlackEvents.EOB_JOB_FAILURE;
 import static gov.cms.ab2d.job.model.JobStatus.FAILED;
 import static gov.cms.ab2d.job.model.JobStatus.IN_PROGRESS;
 import static gov.cms.ab2d.job.model.JobStatus.SUBMITTED;
@@ -72,6 +73,20 @@ public Job preprocess(String jobUuid) {
         if (contract == null) {
             throw new IllegalArgumentException("A job must always have a contract.");
         }
+
+        if (contract.getAttestedOn() == null) {
+            log.warn("JobPreProcessorImpl > preprocess: job FAILED because the contract attestation date is null.");
+
+            eventLogger.logAndAlert(job.buildJobStatusChangeEvent(FAILED, EOB_JOB_FAILURE + " Job " + jobUuid
+                + "failed for contract: " + contract.getContractNumber() + " because contract attestation date is null"), PUBLIC_LIST);
+
+            job.setStatus(FAILED);
+            job.setStatusMessage("failed because contract attestation date is null.");
+
+            jobRepository.save(job);
+            return job;
+        }
+
         Optional<OffsetDateTime> sinceValue = Optional.ofNullable(job.getSince());
         if (sinceValue.isPresent()) {
             // If the user provided a 'since' value

diff --git a/worker/src/test/java/gov/cms/ab2d/worker/processor/JobPreProcessorUnitTest.java b/worker/src/test/java/gov/cms/ab2d/worker/processor/JobPreProcessorUnitTest.java
@@ -10,7 +10,7 @@
 import gov.cms.ab2d.job.model.JobStatus;
 import gov.cms.ab2d.job.repository.JobRepository;
 import gov.cms.ab2d.worker.processor.coverage.CoverageDriver;
-import gov.cms.ab2d.worker.util.ContractWorkerClientMock;
+import gov.cms.ab2d.worker.service.ContractWorkerClient;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -53,8 +53,8 @@ class JobPreProcessorUnitTest {
 
     private static final String JOB_UUID = "6d08bf08-f926-4e19-8d89-ad67ef89f17e";
 
-    private final ContractWorkerClientMock contractWorkerClient = new ContractWorkerClientMock();
-
+    @Mock
+    private ContractWorkerClient contractWorkerClient;
     @Mock
     private JobRepository jobRepository;
     @Mock
@@ -67,7 +67,7 @@ class JobPreProcessorUnitTest {
 
     @BeforeEach
     void setUp() {
-        contract = new ContractDTO(null, "JPP5678", "JPP5678", null, null, 0, 0);
+        contract = new ContractDTO(null, "JPP5678", "JPP5678", OffsetDateTime.now(), Contract.ContractType.NORMAL, 0, 0);
         cut = new JobPreProcessorImpl(contractWorkerClient, jobRepository, eventLogger, coverageDriver);
         job = createJob();
     }
@@ -123,6 +123,7 @@ void whenJobIsInSubmittedStatus_ThenJobShouldBePutInProgress() throws Interrupte
 
         when(jobRepository.save(Mockito.any())).thenReturn(job);
         when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         when(coverageDriver.isCoverageAvailable(any(Job.class), any(ContractDTO.class))).thenReturn(true);
 
         var processedJob = cut.preprocess(job.getJobUuid());
@@ -131,12 +132,30 @@ void whenJobIsInSubmittedStatus_ThenJobShouldBePutInProgress() throws Interrupte
         verify(jobRepository).save(Mockito.any());
     }
 
+    @DisplayName("Job is FAILED if contract is not attested")
+    @Test
+    void jobFailedIfContractNotAttested() {
+
+        contract.setAttestedOn(null);
+
+        job.setContractNumber(contract.getContractNumber());
+        job.setStatus(JobStatus.SUBMITTED);
+
+        when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
+
+        job = cut.preprocess(job.getJobUuid());
+
+        assertEquals(JobStatus.FAILED, job.getStatus());
+    }
+
     @DisplayName("Job is not started if coverage is not available")
     @Test
     void proccessingNotTriggeredIfCoverageNotAvailable() throws InterruptedException {
 
         job.setStatus(JobStatus.SUBMITTED);
         when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         when(coverageDriver.isCoverageAvailable(any(Job.class), any(ContractDTO.class))).thenReturn(false);
 
         Job result = cut.preprocess(job.getJobUuid());
@@ -149,6 +168,7 @@ void proccessingNotTriggeredIfCoverageCheckInterrupted() throws InterruptedExcep
 
         job.setStatus(JobStatus.SUBMITTED);
         when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         when(coverageDriver.isCoverageAvailable(any(Job.class), any(ContractDTO.class))).thenThrow(InterruptedException.class);
 
         var exceptionThrown = assertThrows(RuntimeException.class,
@@ -165,6 +185,7 @@ void testDefaultSinceSTU3() {
         job.setStatus(JobStatus.SUBMITTED);
         job.setContractNumber(contract.getContractNumber());
         when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         cut.preprocess(job.getJobUuid());
         assertNull(job.getSince());
         verify(jobRepository, never()).findByContractNumberEqualsAndStatusInAndStartedByOrderByCompletedAtDesc(anyString(), any(), any());
@@ -178,8 +199,10 @@ void testDefaultSinceR4FirstRun() {
         job.setFhirVersion(R4);
         job.setStatus(JobStatus.SUBMITTED);
         when(jobRepository.findByJobUuid(job.getJobUuid())).thenReturn(job);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         when(jobRepository.findByContractNumberEqualsAndStatusInAndStartedByOrderByCompletedAtDesc(anyString(), any(), any())).thenReturn(Collections.emptyList());
         cut.preprocess(job.getJobUuid());
+
         assertNull(job.getSince());
         assertEquals(SinceSource.FIRST_RUN, job.getSinceSource());
     }
@@ -200,6 +223,7 @@ void testDefaultSinceR4FirstRunByPdp() {
         oldJob.setCreatedAt(oldJobTime);
 
         when(jobRepository.findByJobUuid(newJob.getJobUuid())).thenReturn(newJob);
+        when(contractWorkerClient.getContractByContractNumber(newJob.getContractNumber())).thenReturn(contract);
         when(jobRepository.findByContractNumberEqualsAndStatusInAndStartedByOrderByCompletedAtDesc(anyString(), any(), any())).thenReturn(List.of(oldJob));
 
         cut.preprocess(newJob.getJobUuid());
@@ -225,6 +249,7 @@ void testDefaultSinceR4SuppliedSince() {
         oldJob.setJobUuid(oldJob.getJobUuid() + "-2");
 
         when(jobRepository.findByJobUuid(newJob.getJobUuid())).thenReturn(newJob);
+        when(contractWorkerClient.getContractByContractNumber(newJob.getContractNumber())).thenReturn(contract);
 
         cut.preprocess(newJob.getJobUuid());
 
@@ -240,24 +265,22 @@ void testDifferentSinceConditions() {
         newJob.setStatus(JobStatus.SUBMITTED);
         newJob.setCreatedAt(OffsetDateTime.now());
 
-        ContractDTO contract = new ContractDTO(null, "contractNum", null, null, Contract.ContractType.CLASSIC_TEST, 0, 0);
-        newJob.setContractNumber(contract.getContractNumber());
-
         Job oldJob = createJob();
         oldJob.setStatus(SUCCESSFUL);
         oldJob.setJobUuid(oldJob.getJobUuid() + "-2");
         OffsetDateTime oldJobTime = OffsetDateTime.parse("2021-01-01T00:00:00.000-05:00", DateTimeFormatter.ISO_DATE_TIME);
         oldJob.setCreatedAt(oldJobTime);
 
         when(jobRepository.findByJobUuid(newJob.getJobUuid())).thenReturn(newJob);
+        when(contractWorkerClient.getContractByContractNumber(newJob.getContractNumber())).thenReturn(contract);
 
-        cut.preprocess(newJob.getJobUuid());
+        newJob = cut.preprocess(newJob.getJobUuid());
 
         assertNull(newJob.getSince());
         // No longer allow null contracts so things get flagged as first run now.
         assertEquals(SinceSource.FIRST_RUN, newJob.getSinceSource());
 
-        contract = new ContractDTO(null, "contractNum", null, null, Contract.ContractType.SYNTHEA, 0, 0);
+        contract = new ContractDTO(null, "contractNum", null, OffsetDateTime.now(), Contract.ContractType.SYNTHEA, 0, 0);
 
         when(jobRepository.findByContractNumberEqualsAndStatusInAndStartedByOrderByCompletedAtDesc(anyString(), any(), any())).thenReturn(List.of(oldJob));
 
@@ -303,6 +326,7 @@ void testGetLatestFullySuccessfulJob() {
         assertTrue(impl.getLastSuccessfulJobWithDownloads(List.of(job3)).isEmpty());
 
         when(jobRepository.findByJobUuid(newJob.getJobUuid())).thenReturn(newJob);
+        when(contractWorkerClient.getContractByContractNumber(job.getContractNumber())).thenReturn(contract);
         when(jobRepository.findByContractNumberEqualsAndStatusInAndStartedByOrderByCompletedAtDesc(anyString(), any(), any())).thenReturn(List.of(job1, job2, job3, job4));
         cut.preprocess(newJob.getJobUuid());
         assertEquals(newJob.getSince().getNano(), job4.getCreatedAt().getNano());