Mosip 26314 fix for read status for auth lock status 2 (mosip#801)

* Fix for setting read status to false * Revert "Fix for setting read status to false (mosip#791)" This reverts commit c00a051. * 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 (mosip#791) Co-authored-by: Loganathan Sekar <[email protected]> --------- Co-authored-by: Loganathan Sekar <[email protected]> Signed-off-by: Ritik Jain <[email protected]>
RitikJain4108 · Oct 31, 2023 · 762829a · 762829a
1 parent 26367a6
commit 762829a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...t-service/src/main/java/io/mosip/resident/service/impl/ResidentCredentialServiceImpl.java b/...t-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/...service/src/main/java/io/mosip/resident/service/impl/WebSubUpdateAuthTypeServiceImpl.java b/...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);
                 }