From f45c455ce55be44f86377aea7340f1dae8b294e6 Mon Sep 17 00:00:00 2001 From: kameshsr Date: Tue, 13 Dec 2022 10:57:19 +0530 Subject: [PATCH 1/2] Fixed service history issue. --- .../java/io/mosip/resident/validator/RequestValidator.java | 4 ---- .../mosip/resident/test/validator/RequestValidatorTest.java | 5 ----- 2 files changed, 9 deletions(-) diff --git a/resident/resident-service/src/main/java/io/mosip/resident/validator/RequestValidator.java b/resident/resident-service/src/main/java/io/mosip/resident/validator/RequestValidator.java index 7cdf01d807e..42660123e98 100644 --- a/resident/resident-service/src/main/java/io/mosip/resident/validator/RequestValidator.java +++ b/resident/resident-service/src/main/java/io/mosip/resident/validator/RequestValidator.java @@ -879,10 +879,6 @@ public void validateFromDateTimeToDateTime(LocalDateTime fromDateTime, LocalDate audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.INPUT_INVALID, ResidentConstants.TO_DATE_TIME, request_service_history_api)); throw new InvalidInputException(ResidentConstants.TO_DATE_TIME); - } else if(fromDateTime == null && toDateTime == null) { - audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.INPUT_INVALID, ResidentConstants.TO_DATE_TIME, - request_service_history_api)); - throw new InvalidInputException(ResidentConstants.TO_DATE_TIME); } } diff --git a/resident/resident-service/src/test/java/io/mosip/resident/test/validator/RequestValidatorTest.java b/resident/resident-service/src/test/java/io/mosip/resident/test/validator/RequestValidatorTest.java index 4c0fcd43596..5459957332f 100644 --- a/resident/resident-service/src/test/java/io/mosip/resident/test/validator/RequestValidatorTest.java +++ b/resident/resident-service/src/test/java/io/mosip/resident/test/validator/RequestValidatorTest.java @@ -2008,11 +2008,6 @@ public void testValidateStatusFilter(){ ReflectionTestUtils.invokeMethod(requestValidator, "validateStatusFilter", "", "sortType"); } - @Test(expected = InvalidInputException.class) - public void testValidateFromDateTimeToDateTime(){ - requestValidator.validateFromDateTimeToDateTime(null, null, "fromDate"); - } - @Test(expected = InvalidInputException.class) public void testValidateFromDateTimeToDateTimeFromDateTimeNull(){ requestValidator.validateFromDateTimeToDateTime(null, LocalDateTime.MAX, "fromDate"); From abe5e7cd2d5475eb59dd603f3c250d7e493cf96c Mon Sep 17 00:00:00 2001 From: kameshsr Date: Mon, 10 Apr 2023 11:23:10 +0530 Subject: [PATCH 2/2] Fixed download card using vid. --- .../io/mosip/resident/service/impl/DownloadCardServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/DownloadCardServiceImpl.java b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/DownloadCardServiceImpl.java index b2e485deeff..3a29e866b2f 100644 --- a/resident/resident-service/src/main/java/io/mosip/resident/service/impl/DownloadCardServiceImpl.java +++ b/resident/resident-service/src/main/java/io/mosip/resident/service/impl/DownloadCardServiceImpl.java @@ -502,7 +502,7 @@ private String getFullName(String uin) throws IOException, ApisResourceAccessExc */ private String getIndividualIdForAid(String individualId) { String idType = identityService.getIndividualIdType(individualId); - if(idType.equalsIgnoreCase(IdType.UIN.toString()) || idType.equalsIgnoreCase(IdType.VID.toString())){ + if(idType.equalsIgnoreCase(IdType.UIN.toString())){ return individualId; } else { try {