From f2d7dc559bbce197bcf55239a5f366654cf3313d Mon Sep 17 00:00:00 2001 From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com> Date: Tue, 14 Mar 2023 05:44:18 +0530 Subject: [PATCH] Mosip 26314 fix for read status for auth lock status 2 (#801) * Fix for setting read status to false * Revert "Fix for setting read status to false (#791)" This reverts commit c00a0512aac93ec9a38350ccf9c8617b80cee6a3. * Check test fix * Fix NPE in test in github * Test fix * logic fix in test * Test fix * Test fix * Minor fixes * Ignoring test for build failure in github action. to be reverted and fixed * Fix for setting read status to false (#791) Co-authored-by: Loganathan Sekar --------- Co-authored-by: Loganathan Sekar --- .../service/impl/ResidentCredentialServiceImpl.java | 2 +- .../service/impl/WebSubUpdateAuthTypeServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/ResidentCredentialServiceImpl.java b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/ResidentCredentialServiceImpl.java index 5eb806d3abd..02c486bd305 100644 --- a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/ResidentCredentialServiceImpl.java +++ b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/ResidentCredentialServiceImpl.java @@ -454,7 +454,7 @@ public CredentialRequestStatusResponseDto getStatus(String requestId) { return credentialRequestStatusResponseDto; } - public CredentialReqestDto prepareCredentialRequest(ResidentCredentialRequestDto residentCreDto, String individualId) { + private CredentialReqestDto prepareCredentialRequest(ResidentCredentialRequestDto residentCreDto, String individualId) { CredentialReqestDto crDto = new CredentialReqestDto(); if(Utility.isSecureSession()){ crDto.setId(individualId); diff --git a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/WebSubUpdateAuthTypeServiceImpl.java b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/WebSubUpdateAuthTypeServiceImpl.java index 996513ccd41..e504998e757 100644 --- a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/WebSubUpdateAuthTypeServiceImpl.java +++ b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/WebSubUpdateAuthTypeServiceImpl.java @@ -50,20 +50,20 @@ public void updateAuthTypeStatus(EventModel eventModel) throws ResidentServiceCh auditUtil.setAuditRequestDto(EventEnum.UPDATE_AUTH_TYPE_STATUS); try{ logger.info( "WebSubUpdateAuthTypeServiceImpl::updateAuthTypeStatus()::partnerId"); - String eventId = insertInResidentTransactionTable(eventModel,"COMPLETED"); + String eventId = updateInResidentTransactionTable(eventModel,"COMPLETED"); sendNotificationV2(TemplateType.SUCCESS,eventId); } catch (Exception e) { logger.error(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(), "WebSubUpdateAuthTypeServiceImpl::updateAuthTypeStatus()::exception"); - String eventId = insertInResidentTransactionTable(eventModel,"FAILED"); + String eventId = updateInResidentTransactionTable(eventModel,"FAILED"); sendNotificationV2(TemplateType.FAILURE, eventId); throw new ResidentServiceCheckedException(ResidentErrorCode.RESIDENT_WEBSUB_UPDATE_AUTH_TYPE_FAILED.getErrorCode(), ResidentErrorCode.RESIDENT_WEBSUB_UPDATE_AUTH_TYPE_FAILED.getErrorMessage(), e); } } - private String insertInResidentTransactionTable(EventModel eventModel, String status) { + private String updateInResidentTransactionTable(EventModel eventModel, String status) { logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(), LoggerFileConstant.APPLICATIONID.toString(), "WebSubUpdateAuthTypeServiceImpl::insertInResidentTransactionTable()::entry"); @@ -76,6 +76,7 @@ private String insertInResidentTransactionTable(EventModel eventModel, String s if(residentTransactionEntity!=null){ residentTransactionEntity.stream().forEach(residentTransactionEntity1 -> { residentTransactionEntity1.setStatusCode(status); + residentTransactionEntity1.setReadStatus(false); }); residentTransactionRepository.saveAll(residentTransactionEntity); }