From 7d2046f4c7bca9d43bb938e7f04d23f4bc42b100 Mon Sep 17 00:00:00 2001 From: ymahtat-dev Date: Thu, 10 Oct 2024 12:19:31 +0100 Subject: [PATCH] MOSIP-36033 fix bug in discard entire application feature Signed-off-by: ymahtat-dev --- .../application/service/DemographicService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/DemographicService.java b/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/DemographicService.java index afdb2ad191..4a8e919bd6 100644 --- a/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/DemographicService.java +++ b/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/DemographicService.java @@ -668,14 +668,13 @@ public MainResponseDTO deleteIndividual(String preregI if ((demographicEntity.getStatusCode().equals(StatusCodes.BOOKED.getCode()))) { getBookingServiceToDeleteAllByPreId(preregId); } - int isDeletedDemo = demographicRepository.deleteByPreRegistrationId(preregId); - serviceUtil.deleteApplicationFromApplications(preregId); - if (isDeletedDemo > 0) { + try { + this.demographicRepository.delete(demographicEntity); + serviceUtil.deleteApplicationFromApplications(preregId); deleteDto.setPreRegistrationId(preregId); deleteDto.setDeletedBy(userId); deleteDto.setDeletedDateTime(new Date(System.currentTimeMillis())); - - } else { + } catch (Exception e) { throw new RecordFailedToDeleteException(DemographicErrorCodes.PRG_PAM_APP_004.getCode(), DemographicErrorMessages.FAILED_TO_DELETE_THE_PRE_REGISTRATION_RECORD .getMessage());