Move few changes dev to dev3 (#809)

* Updated Test cases for ResidentServiceResUpdate class (#788) * [MOSIP-24670] Updated API correction id and version * [MOSIP-24670] Updated API body correction * [MOSIP-22640] Fixed Sonar Bugs * updated PR * updated PR * updated review code * [MOSIP-22640] Fixed sonar bugs * updated PR * updated PR * [MOSIP-22639] Resolved security hotspots in code * [MOSIP-24630] Fixed Security Vulnerability in code * added error for isValidUrl method * renamed vaildateURL method * updated PR * updated PR * [MOSIP-24670] Made corrections in id and version * resolved conflicts * updated PR * updated PR * [MOSIP-24670] Made corrections n API body, response code * updated PR * updated PR * updated dateTime * updated PR * [MOSIP-25539] Made corrections in API body, response code * [MOSIP-25539] made corrections in API body * updated error message * updated error code * updated trasactionid dto change * added equals * [MOSIP-25539] made corrections in api body * [MOSIP-25539] Corrected API response body Task 5 * resolved build failure * [MOSIP-25539] Task 2 Added error code for vaildateOtp API * updated PR * updated PR * updated PR * updated PR * [MOSIP-25539] Updated validateotp method * updated PR * [MOSIP-25798] Added validations * updated PR * updated PR * updated PR * updated PR * updated PR * [MOSIP-25791] Added purpose as mandatory * Added error * Added Audit logs * updated test cases * [MOSIP-22913],[MOSIP-22914],[MOSIP-24653],[MOSIP-24796] Added Audit logs * updated logs * updated auditlog code * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * [MOSIP-25268] Fixed Sonar vulnerability * [MOSIP-25268] Fixed Sonar vulnerability * [MOSIP-26272] Added validation for /update-uin API * updated PR * updated update-uin PR * Fixed build issue * Updated transactionId error message * Updated Test cases ResidentServiceResUpdateTest class * MOSIP-25536 Added online verification partner id in jpa repo view history. (#790) * Fixed service history issue. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-25854 Fixed vid card issue. * MOSIP-25854 Fixed vid card issue. * MOSIP-25854 Fixed vid card issue. * MOSIP-25536 Added online verification partner id in jpa repo view history. * MOSIP-25536 Fixed test case failure. * Fix for setting read status to false (#791) Co-authored-by: Loganathan Sekar <[email protected]> * Revert mosip 26314 fix for read status for auth lock status (#800) * Fix for setting read status to false * Revert "Fix for setting read status to false (#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 --------- Co-authored-by: Loganathan Sekar <[email protected]> * 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 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 (#791) Co-authored-by: Loganathan Sekar <[email protected]> --------- Co-authored-by: Loganathan Sekar <[email protected]> * Mosip 26350 fix share cred req (#802) * Fix for setting read status to false * Revert "Fix for setting read status to false (#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 (#791) Co-authored-by: Loganathan Sekar <[email protected]> * Fix for share credential request to cred req service * fix for is masked false * Fix for isMasked --------- Co-authored-by: Loganathan Sekar <[email protected]> * [MOSIP-26343] Created module specific audits (#803) * [MOSIP-24670] Updated API correction id and version * [MOSIP-24670] Updated API body correction * [MOSIP-22640] Fixed Sonar Bugs * updated PR * updated PR * updated review code * [MOSIP-22640] Fixed sonar bugs * updated PR * updated PR * [MOSIP-22639] Resolved security hotspots in code * [MOSIP-24630] Fixed Security Vulnerability in code * added error for isValidUrl method * renamed vaildateURL method * updated PR * updated PR * [MOSIP-24670] Made corrections in id and version * resolved conflicts * updated PR * updated PR * [MOSIP-24670] Made corrections n API body, response code * updated PR * updated PR * updated dateTime * updated PR * [MOSIP-25539] Made corrections in API body, response code * [MOSIP-25539] made corrections in API body * updated error message * updated error code * updated trasactionid dto change * added equals * [MOSIP-25539] made corrections in api body * [MOSIP-25539] Corrected API response body Task 5 * resolved build failure * [MOSIP-25539] Task 2 Added error code for vaildateOtp API * updated PR * updated PR * updated PR * updated PR * [MOSIP-25539] Updated validateotp method * updated PR * [MOSIP-25798] Added validations * updated PR * updated PR * updated PR * updated PR * updated PR * [MOSIP-25791] Added purpose as mandatory * Added error * Added Audit logs * updated test cases * [MOSIP-22913],[MOSIP-22914],[MOSIP-24653],[MOSIP-24796] Added Audit logs * updated logs * updated auditlog code * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * updated enum name for audit logs * [MOSIP-25268] Fixed Sonar vulnerability * [MOSIP-25268] Fixed Sonar vulnerability * [MOSIP-26272] Added validation for /update-uin API * updated PR * updated update-uin PR * Fixed build issue * Updated transactionId error message * Updated Test cases ResidentServiceResUpdateTest class * [MOSIP-26343] Created module specific audits * updated PR * updated PR * added log for number of entries (#804) Co-authored-by: Ritik Jain <[email protected]> * Mosip 26515 format fixing (#806) * added log for number of entries * fix batch job individual id null * added notification for vid card download * rename the method to get individual id from session * update websub notification --------- Co-authored-by: Ritik Jain <[email protected]> * MOSIP-24939 Fixed service history issue. (#807) * Fixed service history issue. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-24939 Improved code coverage. * MOSIP-25854 Fixed vid card issue. * MOSIP-25854 Fixed vid card issue. * MOSIP-25854 Fixed vid card issue. * MOSIP-25536 Added online verification partner id in jpa repo view history. * MOSIP-25536 Fixed test case failure. * MOSIP-24939 Improved sonar coverage. * MOSIP-24939 Improved sonar coverage. * MOSIP-24939 Fixed service history issue. * MOSIP-24939 Fixed service history issue. * MOSIP-24939 Fixed service history issue. * Fix merge issue --------- Co-authored-by: Aiham Hasan <[email protected]> Co-authored-by: kameshsr <[email protected]> Co-authored-by: Loganathan Sekar <[email protected]> Co-authored-by: RitikJain4108 <[email protected]> Co-authored-by: Ritik Jain <[email protected]>
mosip · Mar 17, 2023 · d48206a · d48206a
1 parent a0775d1
commit d48206a
Show file tree

Hide file tree

Showing 40 changed files with 685 additions and 548 deletions.
diff --git a/...esident-service/src/main/java/io/mosip/resident/batch/CredentialStatusUpdateBatchJob.java b/...esident-service/src/main/java/io/mosip/resident/batch/CredentialStatusUpdateBatchJob.java
@@ -147,8 +147,14 @@ private void logErrorForBatchJob(Exception e) {
 	public void scheduleCredentialStatusUpdateJob() throws ResidentServiceCheckedException {
 		List<ResidentTransactionEntity> residentTxnList = repo.findByStatusCodeInAndRequestTypeCodeInOrderByCrDtimesAsc(
 				List.of(statusCodes.split(",")), List.of(requestTypeCodes.split(",")));
+		logger.info("Total records picked from resident_transaction table for processing is " + residentTxnList.size());
 		for (ResidentTransactionEntity txn : residentTxnList) {
 			logger.info("Processing event:" + txn.getEventId());
+			if (txn.getIndividualId() == null) {
+				txn.setStatusCode(FAILED.name());
+				txn.setStatusComment("individualId is null");
+				repo.save(txn);
+			}
 			handleWithTryCatch(() -> updateVidCardDownloadTxnStatus(txn));
 			handleWithTryCatch(() -> updateOrderPhysicalCardTxnStatus(txn));
 			handleWithTryCatch(() -> updateShareCredentialWithPartnerTxnStatus(txn));

diff --git a/resident/resident-service/src/main/java/io/mosip/resident/constant/ResidentConstants.java b/resident/resident-service/src/main/java/io/mosip/resident/constant/ResidentConstants.java
@@ -226,4 +226,5 @@ private ResidentConstants() {
     public static final String IMAGE = "mosip.resident.photo.token.claim-photo";
     public static final String VID = "vid";
     public static final String NAME = "name";
+    public static final String ONLINE_VERIFICATION_PARTNER_ID = "ida.online-verification-partner-id";
 }
diff --git a/resident/resident-service/src/main/java/io/mosip/resident/controller/IdentityController.java b/resident/resident-service/src/main/java/io/mosip/resident/controller/IdentityController.java
@@ -90,7 +90,7 @@ public ResponseWrapper<Object> getInputAttributeValues(@PathVariable("schemaType
 	}
 
 	private String getIdFromUser() throws ApisResourceAccessException {
-		return idServiceImpl.getResidentIndvidualId();
+		return idServiceImpl.getResidentIndvidualIdFromSession();
 	}
 
 

diff --git a/...dent/resident-service/src/main/java/io/mosip/resident/controller/OrderCardController.java b/...dent/resident-service/src/main/java/io/mosip/resident/controller/OrderCardController.java
@@ -94,7 +94,7 @@ public ResponseEntity<Object> physicalCardOrder(@RequestParam(name = "partnerId"
 			@RequestParam(name = "redirectUri") String redirectUri )
 			throws ResidentServiceCheckedException, ApisResourceAccessException {
 		logger.debug("OrderCardController::getphysicalCardOrder()::entry");
-		String individualId = identityServiceImpl.getResidentIndvidualId();
+		String individualId = identityServiceImpl.getResidentIndvidualIdFromSession();
 		String redirectURL = orderCardService.getRedirectUrl(partnerId,individualId);
 		logger.debug("OrderCardController::getphysicalCardOrder()::exit");
         return ResponseEntity.status(HttpStatus.FOUND).location(URI.create(redirectURL)).build();
@@ -117,7 +117,7 @@ public ResponseEntity<Object> physicalCardOrderRedirect(@RequestParam(name = "re
 			@RequestParam(name = "error_message",required = false) String errorMessage)
 			throws ResidentServiceCheckedException, ApisResourceAccessException {
 		logger.debug("OrderCardController::physicalCardOrderRedirect()::entry");
-		String individualId = identityServiceImpl.getResidentIndvidualId();
+		String individualId = identityServiceImpl.getResidentIndvidualIdFromSession();
 		String response = orderCardService.physicalCardOrder(redirectUrl, paymentTransactionId, eventId,
 				residentFullAddress,individualId,errorCode,errorMessage);
 		logger.debug("OrderCardController::physicalCardOrderRedirect()::exit");

diff --git a/...ent/resident-service/src/main/java/io/mosip/resident/controller/ProxyAuditController.java b/...ent/resident-service/src/main/java/io/mosip/resident/controller/ProxyAuditController.java
@@ -77,7 +77,7 @@ public ResponseEntity<?> authAuditLog(@RequestBody AuthenticatedAuditRequestDto
 		auditRequestDto.setApplicationName(requestDto.getApplicationName());
 		auditRequestDto.setSessionUserId(requestDto.getSessionUserId());
 		auditRequestDto.setSessionUserName(requestDto.getSessionUserName());
-		String individualId = identityService.getResidentIndvidualId();
+		String individualId = identityService.getResidentIndvidualIdFromSession();
 		auditRequestDto.setId(utility.getRefIdHash(individualId));
 		auditRequestDto.setIdType(identityService.getIndividualIdType(individualId));
 		auditRequestDto.setCreatedBy(requestDto.getCreatedBy());

diff --git a/resident/resident-service/src/main/java/io/mosip/resident/controller/ResidentController.java b/resident/resident-service/src/main/java/io/mosip/resident/controller/ResidentController.java
@@ -260,7 +260,7 @@ public ResponseEntity<Object> reqAauthTypeStatusUpdateV2(
 			throws ResidentServiceCheckedException, ApisResourceAccessException {
 		audit.setAuditRequestDto(
 				EventEnum.getEventEnumWithValue(EventEnum.VALIDATE_REQUEST, "update auth Type status API"));
-		String individualId = identityServiceImpl.getResidentIndvidualId();
+		String individualId = identityServiceImpl.getResidentIndvidualIdFromSession();
 		validator.validateAuthLockOrUnlockRequestV2(requestDTO);
 		audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.REQ_AUTH_LOCK, individualId));
 		ResponseWrapper<ResponseDTO> response = new ResponseWrapper<>();
@@ -392,7 +392,7 @@ public ResponseEntity<Object> updateUinDemographics(
 		RequestWrapper<ResidentUpdateRequestDto> requestWrapper = JsonUtil.convertValue(requestDTO,
 				new TypeReference<RequestWrapper<ResidentUpdateRequestDto>>() {
 				});
-		String individualId = identityServiceImpl.getResidentIndvidualId();
+		String individualId = identityServiceImpl.getResidentIndvidualIdFromSession();
 		ResidentUpdateRequestDto request = requestWrapper.getRequest();
 		if (request != null) {
 			request.setIndividualId(individualId);
@@ -420,7 +420,7 @@ public ResponseWrapper<AuthLockOrUnLockRequestDtoV2> getAuthLockStatus() throws
 		audit.setAuditRequestDto(
 				EventEnum.getEventEnumWithValue(EventEnum.VALIDATE_REQUEST, "request auth lock status  API"));
 		ResponseWrapper<AuthLockOrUnLockRequestDtoV2> responseWrapper = new ResponseWrapper<>();
-		String individualId = identityServiceImpl.getResidentIndvidualId();
+		String individualId = identityServiceImpl.getResidentIndvidualIdFromSession();
 		try {
 			audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.REQ_AUTH_LOCK_STATUS, individualId));
 			responseWrapper = residentService.getAuthLockStatus(individualId);

diff --git a/...dent-service/src/main/java/io/mosip/resident/controller/ResidentCredentialController.java b/...dent-service/src/main/java/io/mosip/resident/controller/ResidentCredentialController.java
@@ -38,6 +38,7 @@
 import io.mosip.resident.dto.ResidentCredentialRequestDto;
 import io.mosip.resident.dto.ResidentCredentialResponseDto;
 import io.mosip.resident.dto.ResidentCredentialResponseDtoV2;
+import io.mosip.resident.dto.SharableAttributesDTO;
 import io.mosip.resident.dto.ShareCredentialRequestDto;
 import io.mosip.resident.exception.ApisResourceAccessException;
 import io.mosip.resident.exception.ResidentServiceCheckedException;
@@ -221,11 +222,17 @@ private void buildAdditionalMetadata(RequestWrapper<ShareCredentialRequestDto> r
 				requestDTO.getRequest().getSharableAttributes(), UISchemaTypes.SHARE_CREDENTIAL.getFileIdentifier());
 		if (Objects.nonNull(requestDTO.getRequest().getSharableAttributes())) {
 			request.getRequest().setSharableAttributes(sharableAttr);
+			Map<String, String> formattingAttributes = requestDTO.getRequest().getSharableAttributes()
+															.stream()
+															.filter(attrib -> attrib.getFormat() != null && !attrib.getFormat().isEmpty())
+															.collect(Collectors.toMap(SharableAttributesDTO::getAttributeName, SharableAttributesDTO::getFormat));
 			request.getRequest()
-					.setAdditionalData(Map.of("formatingAttributes", requestDTO.getRequest().getSharableAttributes(),
+					.setAdditionalData(Map.of("formatingAttributes", formattingAttributes,
 							"maskingAttributes",
-							requestDTO.getRequest().getSharableAttributes().stream().filter(attr -> attr.isMasked())
-									.map(attr -> attr.getAttributeName()).collect(Collectors.toList())));
+							requestDTO.getRequest().getSharableAttributes().stream()
+									.filter(attr -> attr.isMasked())
+									.map(attr -> attr.getAttributeName())
+									.collect(Collectors.toList())));
 
 		}
 	}

diff --git a/...nt/resident-service/src/main/java/io/mosip/resident/controller/ResidentVidController.java b/...nt/resident-service/src/main/java/io/mosip/resident/controller/ResidentVidController.java
@@ -252,7 +252,7 @@ private ResponseEntity<Object> revokeVidV2Version(RequestWrapper<? extends BaseV
 	}
 
 	private String getResidentIndividualId() throws ApisResourceAccessException {
-		return identityServiceImpl.getResidentIndvidualId();
+		return identityServiceImpl.getResidentIndvidualIdFromSession();
 	}
 
 	@PreAuthorize("@scopeValidator.hasAllScopes("

diff --git a/resident/resident-service/src/main/java/io/mosip/resident/dto/SharableAttributesDTO.java b/resident/resident-service/src/main/java/io/mosip/resident/dto/SharableAttributesDTO.java
@@ -1,5 +1,7 @@
 package io.mosip.resident.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.Data;
 
 /**
@@ -13,5 +15,6 @@ public class SharableAttributesDTO {
 
 	private String format;
 
+	@JsonProperty("isMasked")
 	private boolean isMasked;
 }
diff --git a/...ent-service/src/main/java/io/mosip/resident/repository/ResidentTransactionRepository.java b/...ent-service/src/main/java/io/mosip/resident/repository/ResidentTransactionRepository.java
@@ -100,58 +100,58 @@ List<ResidentTransactionEntity> findByTokenWithoutServiceTypeAndDate(@Param("tok
 	@Query("update ResidentTransactionEntity set read_status='true' where event_id=:eventId")
 	int updateReadStatus(@Param("eventId") String eventId);
 
-	Page<ResidentTransactionEntity> findByTokenId(String tokenId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndOlvPartnerIdIsNullOrOlvPartnerId(String tokenId, String olvPartnerId,Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndStatusCodeInAndEventIdLike(
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndStatusCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
 			String tokenId,
 			LocalDateTime startDate,
 			LocalDateTime endDate,
 			List<String> requestTypeCodes,
 			List<String> statusCodes,
 			String eventId,
-			Pageable pageable
+			String onlineVerificationPartnerId, Pageable pageable
 	);
 
-	Page<ResidentTransactionEntity> findByEventIdLike(String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndStatusCodeIn(
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndStatusCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(
 			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> requestTypeCodes,
-			List<String> statusCodes, Pageable pageable);
+			List<String> statusCodes, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndEventIdLike(
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
 			String tokenId, LocalDateTime startDate,
 			LocalDateTime endDate,
-			List<String> requestTypeCodes, String eventId, Pageable pageable);
+			List<String> requestTypeCodes, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndStatusCodeInAndEventIdLike(
-			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> statusCodes, String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndStatusCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> statusCodes, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndStatusCodeInAndEventIdLike(
-			String tokenId, List<String> requestTypeCodes, List<String> statusCodes, String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndStatusCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, List<String> requestTypeCodes, List<String> statusCodes, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndStatusCodeIn(
-			String tokenId, List<String> requestTypeCodes, List<String> statusCodes, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndStatusCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, List<String> requestTypeCodes, List<String> statusCodes, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndEventIdLike(
-			String tokenId, List<String> requestTypeCodes, String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, List<String> requestTypeCodes, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndStatusCodeInAndEventIdLike(
-			String tokenId, List<String> statusCodes, String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndStatusCodeInAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, List<String> statusCodes, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndEventIdLike(
-			String tokenId, LocalDateTime startDate, LocalDateTime endDate, String eventId, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndEventIdLikeAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, LocalDateTime startDate, LocalDateTime endDate, String eventId, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndStatusCodeIn(
-			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> statusCodes, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndStatusCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> statusCodes, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeIn(
-			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> requestTypeCodes, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndRequestTypeCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, LocalDateTime startDate, LocalDateTime endDate, List<String> requestTypeCodes, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetween(
-			String tokenId, LocalDateTime startDate, LocalDateTime endDate, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndCrDtimesBetweenAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, LocalDateTime startDate, LocalDateTime endDate, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeIn(
-			String tokenId, List<String> requestTypeCodes, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndRequestTypeCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(
+			String tokenId, List<String> requestTypeCodes, String onlineVerificationPartnerId, Pageable pageable);
 
-	Page<ResidentTransactionEntity> findByTokenIdAndStatusCodeIn(String tokenId, List<String> statusCodes, Pageable pageable);
+	Page<ResidentTransactionEntity> findByTokenIdAndStatusCodeInAndOlvPartnerIdIsNullOrOlvPartnerId(String tokenId, List<String> statusCodes, String onlineVerificationPartnerId, Pageable pageable);
 }
diff --git a/resident/resident-service/src/main/java/io/mosip/resident/service/IdentityService.java b/resident/resident-service/src/main/java/io/mosip/resident/service/IdentityService.java
@@ -53,7 +53,7 @@ public interface IdentityService {
 	 */
 	Map<String, Object> getIdentityAttributes(String id, String schemaType) throws ResidentServiceCheckedException, IOException;
 
-	public String getResidentIndvidualId() throws ApisResourceAccessException;
+	public String getResidentIndvidualIdFromSession() throws ApisResourceAccessException;
 
 	Map<String, Object> getIdentityAttributes(String id, String schemaType,
 			List<String> additionalAttributes) throws ResidentServiceCheckedException;
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	private String getIdFromUser() throws ApisResourceAccessException {
-    		return idServiceImpl.getResidentIndvidualId();
+    		return idServiceImpl.getResidentIndvidualIdFromSession();
     	}
@@ Expand Down @@