Merge pull request #2404 from ashok-ksharma/MOSIP-draft-pending-fixes-2

[Fixes:#2402] Remove redundant draft discard for unmatched LOST packets; workflow manager already discards REJECTED packets

Author: ckm007

registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeProcessor.java

@@ -635,13 +635,7 @@ private void lostPacketPostAbisIdentification(InternalRegistrationStatusDto regi
 			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
 					registrationStatusDto.getRegistrationId(),
 					BioDedupeConstants.NO_MATCH_FOUND_FOR_LOST + registrationId);
-			// Discard the draft since this LOST packet has no biometric match.
-			try {
-				idrepoDraftService.idrepoDiscardDraft(registrationId);
-			} catch (IdrepoDraftException | IdrepoDraftReprocessableException | ApisResourceAccessException e) {
-				regProcLogger.warn(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
-						registrationId, "Failed to discard draft on LOST no-match (non-fatal): " + e.getMessage());
-			}
+			// Draft discard is handled by WorkflowInternalActionVerticle.processCompleteAsRejected()
 
 		} else if (matchedRegIds.size() == 1) {
 

registration-processor/core-processor/registration-processor-bio-dedupe-stage/src/test/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeProcessorTest.java

@@ -524,27 +524,8 @@ public void testLostPacketValidationMatchedIdEmpty() throws ApisResourceAccessEx
 		MessageDTO messageDto = bioDedupeProcessor.process(dto, stageName);
 		assertFalse(messageDto.getIsValid());
 		assertFalse(messageDto.getInternalError());
-        Mockito.verify(idrepoDraftService, Mockito.times(1)).idrepoDiscardDraft("reg1234");
-	}
-
-	@Test
-	public void testLostPacketNoMatch_DiscardThrows_StillRejectsWithoutInternalError() throws Exception {
-		registrationStatusDto.setRegistrationId("reg1234");
-		registrationStatusDto.setRegistrationType("LOST");
-		Mockito.when(registrationStatusService.getRegistrationStatus(any(), any(), any(), any())).thenReturn(registrationStatusDto);
-		Mockito.when(abisHandlerUtil.getPacketStatus(any())).thenReturn(AbisConstant.POST_ABIS_IDENTIFICATION);
-		ProcessedMatchedResult processedMatchedResult = new ProcessedMatchedResult();
-		processedMatchedResult.setMatchedResults(new HashSet<>());
-		Mockito.when(abisHandlerUtil.getProcessedMatchedResult(any(), any(), anyInt(), any(), any()))
-				.thenReturn(processedMatchedResult);
-		Mockito.when(idrepoDraftService.idrepoDiscardDraft(anyString()))
-				.thenThrow(new IdrepoDraftException("IDR-IDC-005", "discard failed"));
-
-		MessageDTO messageDto = bioDedupeProcessor.process(dto, stageName);
-
-		assertFalse(messageDto.getIsValid());
-		assertFalse(messageDto.getInternalError());
-		Mockito.verify(idrepoDraftService, Mockito.times(1)).idrepoDiscardDraft("reg1234");
+		// Draft discard is handled by WorkflowInternalActionVerticle.processCompleteAsRejected()
+		Mockito.verify(idrepoDraftService, Mockito.never()).idrepoDiscardDraft(anyString());
 	}
 
 	@Test