From fed7c28539e8721f0edd7de483177614ae4af0ca Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Thu, 21 Dec 2023 12:40:03 +0530
Subject: [PATCH] MOSIP-30831 Removed transactionId for generate and revoke vid
 new API. (#1185)

* MOSIP-30831 Removed transactionId for generate and revoke vid new API.

Signed-off-by: kameshsr <kameshsr1338@gmail.com>

* Fixed test case Failure

Signed-off-by: kameshsr <kameshsr1338@gmail.com>

---------

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 .../resident/validator/RequestValidator.java  |  4 +--
 .../validator/RequestValidatorTest.java       | 29 -------------------
 2 files changed, 2 insertions(+), 31 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 4f110e9558a..4e0bf17d3b8 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
@@ -385,7 +385,7 @@ public void validateVidCreateV2Request(IVidRequestDto<? extends BaseVidRequestDt
 			}
 		}
 
-		if (StringUtils.isEmpty(requestDto.getRequest().getTransactionID())) {
+		if (otpValidationRequired && StringUtils.isEmpty(requestDto.getRequest().getTransactionID())) {
 			audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.INPUT_INVALID, "transactionId",
 					"Request to generate VID"));
 
@@ -739,7 +739,7 @@ public void validateVidRevokeV2Request(RequestWrapper<? extends BaseVidRevokeReq
 			}
 		}
 
-		if (StringUtils.isEmpty(requestDto.getRequest().getTransactionID())) {
+		if (isOtpValidationRequired && StringUtils.isEmpty(requestDto.getRequest().getTransactionID())) {
 			audit.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.INPUT_INVALID, "transactionId", "Request to revoke VID"));
 			throw new InvalidInputException("transactionId");
 		}
diff --git a/resident/resident-service/src/test/java/io/mosip/resident/validator/RequestValidatorTest.java b/resident/resident-service/src/test/java/io/mosip/resident/validator/RequestValidatorTest.java
index 6e16689cac6..1f786878df8 100644
--- a/resident/resident-service/src/test/java/io/mosip/resident/validator/RequestValidatorTest.java
+++ b/resident/resident-service/src/test/java/io/mosip/resident/validator/RequestValidatorTest.java
@@ -2018,21 +2018,6 @@ public void testValidateVidCreateV2RequestInvalidIndividualId() {
                 false, null);
     }
 
-    @Test(expected = InvalidInputException.class)
-    public void testValidateVidCreateV2RequestInvalidTransactionId() {
-        ReflectionTestUtils.setField(requestValidator, "generateId", "generate");
-        ReflectionTestUtils.setField(requestValidator, "newVersion", "newVersion");
-        ResidentVidRequestDtoV2 requestDto = new ResidentVidRequestDtoV2();
-        requestDto.setId("generate");
-        requestDto.setVersion("newVersion");
-        VidRequestDtoV2 vidRequestDtoV2 = new VidRequestDtoV2();
-        vidRequestDtoV2.setVidType("PERPETUAL");
-        requestDto.setRequest(vidRequestDtoV2);
-        requestDto.setRequesttime(String.valueOf(LocalDateTime.now()));
-        requestValidator.validateVidCreateV2Request(requestDto,
-                false, "123");
-    }
-
     @Test(expected = InvalidInputException.class)
     public void testValidateVidCreateV2RequestInvalidRequestDto() {
         ReflectionTestUtils.setField(requestValidator, "generateId", "generate");
@@ -2330,20 +2315,6 @@ public void testValidateVidRevokeV2RequestEmptyRequestIdEmptyVidStatus() throws
         requestValidator.validateVidRevokeV2Request(requestDto, false, "3956038419");
     }
 
-    @Test(expected = InvalidInputException.class)
-    public void testValidateVidRevokeV2RequestEmptyRequestIdEmptyVidStatusRevoked() throws Exception {
-        ReflectionTestUtils.setField(requestValidator, "revokeVidIdNew", "1.0");
-        ReflectionTestUtils.setField(requestValidator, "revokeVidVersion", "1.0");
-        RequestWrapper<VidRevokeRequestDTOV2> requestDto = new RequestWrapper<>();
-        requestDto.setId("1.0");
-        requestDto.setVersion("1.0");
-        VidRevokeRequestDTOV2 vidRevokeRequestDTO = new VidRevokeRequestDTOV2();
-        vidRevokeRequestDTO.setVidStatus("REVOKED");
-        requestDto.setRequest(vidRevokeRequestDTO);
-        requestDto.setRequesttime(LocalDateTime.now().toString());
-        requestValidator.validateVidRevokeV2Request(requestDto, false, "3956038419");
-    }
-
     @Test
     public void testValidateVidRevokeV2RequestEmptyRequestIdEmptyVidStatusSuccess() throws Exception {
         ReflectionTestUtils.setField(requestValidator, "revokeVidIdNew", "1.0");