From f449140ede317fd767d0e2571ba4250f04bc6777 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:44:19 +0530
Subject: [PATCH 1/9] MOSIP-36404 - Added admin role to GetPRIDByDate api
 (#752)

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>
---
 .../GetPRIDByDateRange/GetPRIDByDateRange.yml | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/api-test/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml b/api-test/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml
index c788176365..8fed1dd614 100644
--- a/api-test/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml
+++ b/api-test/src/main/resources/preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml
@@ -3,7 +3,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_01
       description: Retrieve the PRID within the given date range
-      role: regproc
+      role: admin
       checkErrorsOnlyInResponse: true
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
@@ -23,7 +23,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_02
       description: Retrieve the PRID within the specified date range for the Invalid ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -46,7 +46,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_03
       description: Retrieve the PRID within the specified date range for the blank ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -69,7 +69,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_04
       description: Retrieve the PRID within the specified date range for the missing ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -92,7 +92,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_05
       description: Retrieve the PRID within the specified date range for the invalid version
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -115,7 +115,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_06
       description: Retrieve the PRID within the specified date range for the missing version
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -138,7 +138,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_07
       description: Retrieve the PRID within the specified date range for the blank version
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -161,7 +161,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_08
       description: Retrieve the PRID within the specified date range for the request time that is blank 
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -184,7 +184,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_09
       description: Retrieve the PRID within the specified date range for the missing request time 
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -207,7 +207,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_10
       description: Retrieve the PRID within the specified date range for the invalid request time
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -230,7 +230,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_11
       description: Retrieve the PRID within the specified date range for the invalid registration center ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -253,7 +253,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_12
       description: Retrieve the PRID within the specified date range for the blank registration center ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -276,7 +276,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_13
       description:  Retrieve the PRID within the specified date range for the missing registration center ID
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -299,7 +299,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_14
       description: Retrieve the PRID within the specified date range where the fromDate is missing
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -322,7 +322,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_15
       description: Retrieve the PRID within the specified date range where the fromDate is missing
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -345,7 +345,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_16
       description: Retrieve the PRID within the specified date range where the fromDate field is blank
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -368,7 +368,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_17
       description: Retrieve the PRID within the specified date range where the toDate field is blank
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -391,7 +391,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_18
       description: Retrieve the PRID within the specified date range where the toDate field is missing 
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error
@@ -414,7 +414,7 @@ GetPRIDByDateRange:
       endPoint: /preregistration/v1/sync
       uniqueIdentifier: TC_prereg_GetPRIDByDateRange_19
       description: Retrieve the PRID within the specified date range where the 'toDate' field is invalid
-      role: regproc
+      role: admin
       restMethod: post
       inputTemplate: preReg/GetPRIDByDateRange/getPRIDByDateRange
       outputTemplate: preReg/error

From 3b9719c14c5599f4c2e4802e989d45d3b76aa40a Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Mon, 4 Nov 2024 16:54:03 +0530
Subject: [PATCH 2/9] MOSIP-37137

Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
---
 .../apirig/{ => prereg}/testrunner/MosipTestRunner.java   | 8 ++++++--
 .../apirig/{ => prereg}/testscripts/BookAppoinment.java   | 6 +++---
 .../{ => prereg}/testscripts/BookAppoinmentByPrid.java    | 6 +++---
 .../apirig/{ => prereg}/testscripts/CreatePreReg.java     | 6 +++---
 .../apirig/{ => prereg}/testscripts/DeleteWithParam.java  | 6 +++---
 .../apirig/{ => prereg}/testscripts/GetWithParam.java     | 6 +++---
 .../testscripts/GetWithParamForAutoGenId.java             | 6 +++---
 .../PostWithFormDataAndFileForNotificationAPI.java        | 6 +++---
 .../testscripts/PostWithFormPathParamAndFile.java         | 6 +++---
 .../testscripts/PostWithPathParamsAndBody.java            | 6 +++---
 .../{ => prereg}/testscripts/PreregAuditValidator.java    | 6 +++---
 .../apirig/{ => prereg}/testscripts/PutWithPathParam.java | 6 +++---
 .../apirig/{ => prereg}/testscripts/SimplePost.java       | 6 +++---
 .../apirig/{ => prereg}/testscripts/UpdatePrereg.java     | 6 +++---
 .../apirig/{ => prereg}/utils/PreRegConfigManager.java    | 5 +++--
 .../testrig/apirig/{ => prereg}/utils/PreRegUtil.java     | 5 ++++-
 16 files changed, 52 insertions(+), 44 deletions(-)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testrunner/MosipTestRunner.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/BookAppoinment.java (97%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/BookAppoinmentByPrid.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/CreatePreReg.java (97%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/DeleteWithParam.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/GetWithParam.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/GetWithParamForAutoGenId.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/PostWithFormDataAndFileForNotificationAPI.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/PostWithFormPathParamAndFile.java (95%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/PostWithPathParamsAndBody.java (95%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/PreregAuditValidator.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/PutWithPathParam.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/SimplePost.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/testscripts/UpdatePrereg.java (96%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/utils/PreRegConfigManager.java (84%)
 rename api-test/src/main/java/io/mosip/testrig/apirig/{ => prereg}/utils/PreRegUtil.java (71%)

diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
index d8a3d5485c..385d57d457 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testrunner;
+package io.mosip.testrig.apirig.prereg.testrunner;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -22,6 +22,11 @@
 import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.jwk.RSAKey;
 
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.testrunner.BaseTestCase;
+import io.mosip.testrig.apirig.testrunner.ExtractResource;
+import io.mosip.testrig.apirig.testrunner.HealthChecker;
+import io.mosip.testrig.apirig.testrunner.OTPListener;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.AuthTestsUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
@@ -33,7 +38,6 @@
 import io.mosip.testrig.apirig.utils.MispPartnerAndLicenseKeyGeneration;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
 import io.mosip.testrig.apirig.utils.PartnerRegistration;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
 import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
 
 /**
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinment.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinment.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinment.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinment.java
index f6a488a51b..f833cd48b5 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinment.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinment.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -23,6 +23,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -31,8 +33,6 @@
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.mosip.testrig.apirig.utils.RestClient;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinmentByPrid.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinmentByPrid.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinmentByPrid.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinmentByPrid.java
index ef563921d6..c01a250d8c 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/BookAppoinmentByPrid.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/BookAppoinmentByPrid.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -23,6 +23,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -31,8 +33,6 @@
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.KernelAuthentication;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.mosip.testrig.apirig.utils.RestClient;
 import io.restassured.response.Response;
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/CreatePreReg.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
similarity index 97%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/CreatePreReg.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
index 0246c30bfa..9a3560b302 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/CreatePreReg.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.security.NoSuchAlgorithmException;
@@ -24,6 +24,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -32,8 +34,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DeleteWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DeleteWithParam.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
index ef87e0c054..d2f04d5d38 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/DeleteWithParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
index 65757bb2d6..b6efe465ea 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
index 378ea41190..208d0516d0 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/GetWithParamForAutoGenId.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormDataAndFileForNotificationAPI.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormDataAndFileForNotificationAPI.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormDataAndFileForNotificationAPI.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormDataAndFileForNotificationAPI.java
index 6a6c485bca..cc70330177 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormDataAndFileForNotificationAPI.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormDataAndFileForNotificationAPI.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -20,6 +20,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -27,8 +29,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormPathParamAndFile.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormPathParamAndFile.java
similarity index 95%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormPathParamAndFile.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormPathParamAndFile.java
index f3fc0b6439..3b95c04144 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithFormPathParamAndFile.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithFormPathParamAndFile.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -20,6 +20,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -27,8 +29,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithPathParamsAndBody.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithPathParamsAndBody.java
similarity index 95%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithPathParamsAndBody.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithPathParamsAndBody.java
index 5d59bbdf84..a539f703be 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PostWithPathParamsAndBody.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PostWithPathParamsAndBody.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -20,6 +20,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -27,8 +29,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PreregAuditValidator.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PreregAuditValidator.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PreregAuditValidator.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PreregAuditValidator.java
index f7be19fa19..ecf99f0e8c 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PreregAuditValidator.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PreregAuditValidator.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -24,6 +24,8 @@
 import io.mosip.testrig.apirig.dbaccess.AuditDBManager;
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
@@ -32,8 +34,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.restassured.response.Response;
 
 public class PreregAuditValidator extends AdminTestUtil implements ITest {
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PutWithPathParam.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParam.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PutWithPathParam.java
index 5930fecebd..0d9a09b795 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/PutWithPathParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/PutWithPathParam.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
index ea0480aec3..ad939d8095 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/SimplePost.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdatePrereg.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/UpdatePrereg.java
similarity index 96%
rename from api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdatePrereg.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/UpdatePrereg.java
index 8546d4a625..0bf8286a9d 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testscripts/UpdatePrereg.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/UpdatePrereg.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.testscripts;
+package io.mosip.testrig.apirig.prereg.testscripts;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import io.mosip.testrig.apirig.dto.OutputValidationDto;
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.prereg.utils.PreRegConfigManager;
+import io.mosip.testrig.apirig.prereg.utils.PreRegUtil;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;
 import io.mosip.testrig.apirig.utils.AdminTestException;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
@@ -29,8 +31,6 @@
 import io.mosip.testrig.apirig.utils.ConfigManager;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
 import io.mosip.testrig.apirig.utils.OutputValidationUtil;
-import io.mosip.testrig.apirig.utils.PreRegConfigManager;
-import io.mosip.testrig.apirig.utils.PreRegUtil;
 import io.mosip.testrig.apirig.utils.ReportUtil;
 import io.restassured.response.Response;
 
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegConfigManager.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegConfigManager.java
similarity index 84%
rename from api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegConfigManager.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegConfigManager.java
index 2821c6e0c2..103a03162a 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegConfigManager.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegConfigManager.java
@@ -1,4 +1,4 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.prereg.utils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,7 +6,8 @@
 
 import org.apache.log4j.Logger;
 
-import io.mosip.testrig.apirig.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.prereg.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.utils.ConfigManager;
 
 public class PreRegConfigManager extends ConfigManager{
 	private static final Logger LOGGER = Logger.getLogger(PreRegConfigManager.class);
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
similarity index 71%
rename from api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegUtil.java
rename to api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
index 4e712707d4..ac78a949df 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/utils/PreRegUtil.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
@@ -1,9 +1,12 @@
-package io.mosip.testrig.apirig.utils;
+package io.mosip.testrig.apirig.prereg.utils;
 
 import org.apache.log4j.Logger;
 import org.testng.SkipException;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
+import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.GlobalConstants;
+import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
 
 public class PreRegUtil extends AdminTestUtil {
 

From 62ef3790f4ba4a13133ce3e83c02725dfdab3b38 Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Mon, 4 Nov 2024 17:16:01 +0530
Subject: [PATCH 3/9] MOSIP-37137

Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
---
 api-test/testNgXmlFiles/preregApi.xml | 82 +++++++++++++--------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/api-test/testNgXmlFiles/preregApi.xml b/api-test/testNgXmlFiles/preregApi.xml
index d3f2e03e4c..8f6b7d17e2 100644
--- a/api-test/testNgXmlFiles/preregApi.xml
+++ b/api-test/testNgXmlFiles/preregApi.xml
@@ -14,7 +14,7 @@
 			value="preReg/createPrereg/createPrereg.yml" />
 			<parameter name="idKeyName"	value="preRegistrationId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.CreatePreReg" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.CreatePreReg" />
 		</classes>
 	</test>
 	
@@ -25,7 +25,7 @@
 			value="preReg/UpdatePreregistration/UpdatePreregistration.yml" />
 			<parameter name="pathParams"	value="preRegistrationId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.UpdatePrereg" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.UpdatePrereg" />
 		</classes>
 	</test>
 	
@@ -34,7 +34,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetApplicationWithPrId/GetApplicationWithPrId.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -42,7 +42,7 @@
 		<parameter name="ymlFile"
 			value="preReg/FetchApplicationByPrid/FetchApplicationByPrid.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -50,7 +50,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetApplicationStatusWithPrId/GetApplicationStatusWithPrId.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="Uploaddocument">
@@ -58,7 +58,7 @@
 			value="preReg/uploadDocument/uploadDocument.yml" />
 			<parameter name="idKeyName"	value="docId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithFormPathParamAndFile" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PostWithFormPathParamAndFile" />
 		</classes>
 	</test>
 	
@@ -66,7 +66,7 @@
 		<parameter name="ymlFile"
 			value="preReg/UpdateDocRefID/UpdateDocRefID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PutWithPathParam" />
 		</classes>
 	</test> 
 	
@@ -74,7 +74,7 @@
 		<parameter name="ymlFile"
 			value="preReg/CopyDocument/CopyDocument.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PutWithPathParam" />
 		</classes>
 	</test> 
 	
@@ -84,7 +84,7 @@
 			value="preReg/UpdatePreRegStatus/updatePreRegStatus.yml" />
 			<parameter name="pathParams"	value="preRegistrationId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PutWithPathParam" />
 		</classes>
 	</test>
 	
@@ -93,21 +93,21 @@
 		<parameter name="ymlFile"
 			value="preReg/GetAllDocForPrId/GetAllDocForPrId.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="GetSpecificDocumentforaPRID">
 		<parameter name="ymlFile"
 			value="preReg/GetSpecificDocumentforaPRID/GetSpecificDocumentforaPRID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	<test name="GetPRIDByDateRange">
 		<parameter name="ymlFile"
 			value="preReg/GetPRIDByDateRange/GetPRIDByDateRange.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test> 
 	 <test name="BookAppointment">
@@ -115,7 +115,7 @@
 			value="preReg/bookAppointment/bookAppointment.yml" />
 		<parameter name="pathParams" value="preRegistrationId" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BookAppoinment" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.BookAppoinment" />
 		</classes>
 	</test>
 	
@@ -125,7 +125,7 @@
 		<parameter name="ymlFile"
 			value="preReg/FetchAppointmentDetailsByPrid/FetchAppointmentDetailsByPrid.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	
@@ -133,7 +133,7 @@
 		<parameter name="ymlFile"
 			value="preReg/bookAppointmentByPRID/bookAppointmentByPRID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.BookAppoinmentByPrid" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.BookAppoinmentByPrid" />
 		</classes>
 	</test>
 	
@@ -144,7 +144,7 @@
 			value="preReg/GetAppointmentDetails/GetAppointmentDetails.yml" />
 		<parameter name="idKeyName" value="appointment_date,time_slot_from" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParamForAutoGenId" />  
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParamForAutoGenId" />  
 		</classes>
 	</test> 
 	
@@ -152,7 +152,7 @@
 		<parameter name="ymlFile"
 			value="preReg/CancelAppointment/CancelAppointment.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PutWithPathParam" />
 		</classes>
 	</test>
 	
@@ -161,7 +161,7 @@
 		<parameter name="ymlFile"
 			value="preReg/CancelApplicationsAppointment/CancelApplicationsAppointment.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PutWithPathParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PutWithPathParam" />
 		</classes>
 	</test>
 	
@@ -171,7 +171,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetAvailableSlotForRegCentreId/GetAvailableSlotForRegCentreId.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -179,7 +179,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetBookingsForRegCenter/GetBookingsForRegCenter.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -187,7 +187,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetPRIDForRegCent/GetPRIDForRegCent.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -196,7 +196,7 @@
 		<parameter name="ymlFile"
 			value="preReg/SendNotifications/SendNotifications.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.PostWithFormDataAndFileForNotificationAPI" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.PostWithFormDataAndFileForNotificationAPI" />
 		</classes>
 	</test>
 	
@@ -204,7 +204,7 @@
 		<parameter name="ymlFile"
 			value="preReg/DeleteSpecificDocForaPRID/DeleteSpecificDocForaPRID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -214,7 +214,7 @@
 		<parameter name="ymlFile"
 			value="preReg/DeleteAllDocForaPRID/DeleteAllDocForaPRID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -224,7 +224,7 @@
 		<parameter name="ymlFile"
 			value="preReg/DeleteBooking/DeleteBooking.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -234,21 +234,21 @@
 		<parameter name="ymlFile"
 			value="preReg/InvalidateToken/InvalidateToken.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test> 
 	<test name="Transliteration">
 		<parameter name="ymlFile"
 			value="preReg/Transliteration/Translate.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test> 
 	<test name="GetAllApplications">
 		<parameter name="ymlFile"
 			value="preReg/GetAllApplications/GetAllApplications.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	
@@ -256,14 +256,14 @@
 		<parameter name="ymlFile"
 			value="preReg/GetAllApplicationsWithapplicationId/GetAllApplicationsWithapplicationId.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test> 
 	<test name="GetUpdatedDateTimeByPrid">
 		<parameter name="ymlFile"
 			value="preReg/GetUpdatedDateTimeByPrid/GetUpdatedDateTimeByPrid.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -271,14 +271,14 @@
 		<parameter name="ymlFile"
 			value="preReg/AddUpdateRegistration/AddUpdateRegistration.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="AddLostUinApplication">
 		<parameter name="ymlFile"
 			value="preReg/AddLostUinApplication/AddLostUinApplication.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test>
 	
@@ -286,7 +286,7 @@
 		<parameter name="ymlFile"
 			value="preReg/DeleteLostUinApplication/DeleteLostUinApplication.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -296,7 +296,7 @@
 		<parameter name="ymlFile"
 			value="preReg/DeletePreRegistration/DeletePreRegistration.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.DeleteWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.DeleteWithParam" />
 		</classes>
 	</test>
 	
@@ -305,7 +305,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetPreRegInfoByPrid/GetPreRegInfoByPrid.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -313,7 +313,7 @@
 		<parameter name="ymlFile"
 			value="preReg/GetAllPreRegApplications/GetAllPreRegApplications.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	
@@ -322,35 +322,35 @@
 		<parameter name="ymlFile"
 			value="preReg/SendOtp/SendOtp.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test>
 	<test name="ValidateOtp">
 		<parameter name="ymlFile"
 			value="preReg/ValidateOtp/ValidateOtp.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.SimplePost" />
 		</classes>
 	</test> 
 	<test name="FetchAvailabilityData">
 		<parameter name="ymlFile"
 			value="preReg/FetchAvailabilityData/FetchAvailabilityData.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 		 <test name="GetPreRegDemographicDataByPrid">
 		<parameter name="ymlFile"
 			value="preReg/GetPreRegDemographicDataByPrid/GetPreRegDemographicDataByPrid.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 	 <test name="GetApplicationStatusByApplicationID">
 		<parameter name="ymlFile"
 			value="preReg/GetApplicationStatusByApplicationID/GetApplicationStatusByApplicationID.yml" />
 		<classes>
-			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
+			<class name="io.mosip.testrig.apirig.prereg.testscripts.GetWithParam" />
 		</classes>
 	</test>
 </suite>

From 9a4ecce58a7f2786c94ee4aba030dd0da614e568 Mon Sep 17 00:00:00 2001
From: Nandhukumar <100744358+nandhu-kumar@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:14:10 +0530
Subject: [PATCH 4/9] MOSIP-37137 | changed package name (#755)

Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
---
 api-test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api-test/pom.xml b/api-test/pom.xml
index 2e5aa737c5..9f04c77530 100644
--- a/api-test/pom.xml
+++ b/api-test/pom.xml
@@ -163,7 +163,7 @@
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>
-										io.mosip.testrig.apirig.testrunner.MosipTestRunner</mainClass>
+										io.mosip.testrig.apirig.prereg.testrunner.MosipTestRunner</mainClass>
 								</transformer>
 							</transformers>
 							<!-- add this to prevent some security issues when

From 0836bacdcc8b6430164b5a6be22561651085e916 Mon Sep 17 00:00:00 2001
From: ymahtat-dev <71645850+ymahtat-dev@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:40:17 +0100
Subject: [PATCH 5/9] MOSIP-36852 - fix scenario3
 (Prereg_BookAppointmentByPRID_blank_preRegistrationId) (#754)

Signed-off-by: ymahtat-dev <youssef.mahtat.as.developer@gmail.com>
Signed-off-by: Youssef MAHTAT <youssef.mahtat.as.developer@gmail.com>
---
 .../application/service/AppointmentServiceImpl.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java b/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java
index 069a8553b7..921bf7167b 100644
--- a/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java
+++ b/pre-registration/pre-registration-application-service/src/main/java/io/mosip/preregistration/application/service/AppointmentServiceImpl.java
@@ -147,6 +147,7 @@ public MainResponseDTO<BookingRegistrationDTO> getAppointmentDetails(String preR
 	}
 
 	private void userValidation(String applicationId) {
+		this.applicationIdValidation(applicationId);
 		String authUserId = authUserDetails().getUserId();
 		List<String> list = listAuth(authUserDetails().getAuthorities());
 		if (list.contains("ROLE_INDIVIDUAL")) {
@@ -155,7 +156,7 @@ private void userValidation(String applicationId) {
 							+ " and userID " + authUserId);
 			ApplicationEntity applicationEntity = null;
 			try {
-				applicationEntity = applicationRepostiory.findByApplicationId(applicationId);
+				applicationEntity = applicationRepostiory.findById(applicationId).orElseThrow();
 			} catch (Exception ex) {
 				log.error(LOGGER_SESSIONID, LOGGER_IDTYPE, LOGGER_ID,
 						"Invaid applicationId/Not Record Found for the ID : " + applicationId);
@@ -169,6 +170,15 @@ private void userValidation(String applicationId) {
 		}
 	}
 
+	private void applicationIdValidation(String applicationId) {
+		if (applicationId == null || applicationId.trim().isEmpty()) {
+			throw new AppointmentExecption(
+					ApplicationErrorCodes.PRG_APP_013.getCode(),
+					"preRegistrationId cannot be empty."
+			);
+		}
+	}
+
 	/**
 	 * This method is used to get the list of authorization role
 	 * 

From dfbb33530ffa8544468badabd1b8a74392fb9e89 Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:01:16 +0530
Subject: [PATCH 6/9] Merge pull request #756 from GOKULRAJ136/doc-1.3.x

MOSIP-37256 : Updated ReadMe files for Java 21
Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 README.md                                     | 15 +++++---
 docs/configuration.md                         |  4 +-
 .../README.md                                 | 34 ++++++++++-------
 .../README.md                                 | 38 ++++++++++---------
 4 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index ae351ed11a..966892e1c6 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Pre-registration module consists of the following services:
 5. Capthca
 
 ## Database
-See [DB guide](db_scripts/README.md)
+See [DB guide](db_scripts)
 
 ## Config-Server
 To run Pre-registration services, run [Config Server](https://docs.mosip.io/1.2.0/modules/module-configuration#config-server)
@@ -20,13 +20,13 @@ To run Pre-registration services, run [Config Server](https://docs.mosip.io/1.2.
 ## Build & run (for developers)
 Prerequisites:
 1. [Config Server](https://docs.mosip.io/1.2.0/modules/module-configuration#config-server)
-1. JDK 21 and Java21 Artifactory Jars [here](https://oss.sonatype.org/content/repositories/snapshots/io/mosip/)  
-1. Build and install:
+2. The project requires JDK 21.0.3 and mvn version - 3.9.6
+3. Build and install:
     ```
     $ cd kernel
     $ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
     ```
-1. Build Docker for a service:
+4. Build Docker for a service:
     ```
     $ cd <service folder>
     $ docker build -f Dockerfile
@@ -54,14 +54,17 @@ Prerequisites:
     $ ./restart.sh
    ```
 
+## Deploy
+To deploy services on Kubernetes cluster using Dockers refer to [Sandbox Deployment](https://docs.mosip.io/1.2.0/deploymentnew/v3-installation).
+
 ## Configuration
 Refer to the [configuration guide](docs/configuration.md).
 
 ## Test
-Automated functional tests available in [Functional Tests repo](https://github.com/mosip/mosip-functional-tests).
+Automated functional tests available in [Functional Tests repo](api-test).
 
 ## APIs
-API documentation is available [here](https://mosip.github.io/documentation/).
+API documentation is available [here](https://mosip.github.io/documentation/1.2.0/1.2.0.html).
 
 ## License
 This project is licensed under the terms of [Mozilla Public License 2.0](LICENSE).
diff --git a/docs/configuration.md b/docs/configuration.md
index 72b1c3048c..20afab1dab 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1,7 +1,9 @@
 # Pre-registration Configuration Guide
 
 ## Property files
-The configuration of the services is controlled by the following property files:
+The configuration of the services is controlled by the following property files that are accessible in this [repository](https://github.com/mosip/mosip-config/tree/master).
+Please refer to the required released tagged version for configuration
+:
 * `application-default.propertes`
 * `pre-registration-default.propertes`
 
diff --git a/pre-registration/pre-registration-application-service/README.md b/pre-registration/pre-registration-application-service/README.md
index e9250ee2c9..fa5c847a4c 100644
--- a/pre-registration/pre-registration-application-service/README.md
+++ b/pre-registration/pre-registration-application-service/README.md
@@ -9,20 +9,26 @@ This service manages to provide the following service to the Pre-registration ap
   * Notification- This service details used by Pre-Registration portal to trigger notification via SMS or email.
   * Login - This service details used by Pre-Registration portal to authenticate user by sending OTP to the user, validating  with userid and OTP. 
 
-## Default Port and Context Path
-
-  * server.port=9092
-  * server.servlet.context-path=/preregistration/v1
-
-## Swagger URL
-* https://{dns-name}:9092/preregistration/v1/application-service/swagger-ui.html
-
-## Roles to Access the URL
-
-* INDIVIDUAL
-* REGISTRATION_OFFICER
-* REGISTRATION_SUPERVISOR
-* REGISTRATION_ADMIN
+## Build & run (for developers)
+Prerequisites:
+1. [Config Server](https://docs.mosip.io/1.2.0/modules/module-configuration#config-server)
+2. The project requires JDK 21.0.3 and mvn version - 3.9.6
+3. Build and install:
+    ```
+    $ cd kernel
+    $ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
+    ```
+4. Build Docker for a service:
+    ```
+    $ cd <service folder>
+    $ docker build -f Dockerfile
+
+## Configuration
+The configuration of the services is controlled by the following property files that are accessible in this [repository](https://github.com/mosip/mosip-config/tree/master).
+Please refer to the required released tagged version for configuration
+:
+1. [Configuration-Application](https://github.com/mosip/mosip-config/blob/master/application-default.properties)
+2. [Configuration-Pre-Registration](https://github.com/mosip/mosip-config/blob/master/pre-registration-default.properties)
 
 ## API Dependencies
 	
diff --git a/pre-registration/pre-registration-datasync-service/README.md b/pre-registration/pre-registration-datasync-service/README.md
index 99094224a4..fe921af4c5 100644
--- a/pre-registration/pre-registration-datasync-service/README.md
+++ b/pre-registration/pre-registration-datasync-service/README.md
@@ -8,27 +8,31 @@ This service enables Pre-Registration to a registration client, request to retri
 
 [Design](https://github.com/mosip/pre-registration/blob/master/design/pre-registration/pre-registration-data-sync-service.md)
 
+## Build & run (for developers)
+Prerequisites:
+1. [Config Server](https://docs.mosip.io/1.2.0/modules/module-configuration#config-server)
+2. The project requires JDK 21.0.3 and mvn version - 3.9.6
+3. Build and install:
+    ```
+    $ cd kernel
+    $ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
+    ```
+4. Build Docker for a service:
+    ```
+    $ cd <service folder>
+    $ docker build -f Dockerfile
  
 
-## Default Port and Context Path
+## Configuration
+The configuration of the services is controlled by the following property files that are accessible in this [repository](https://github.com/mosip/mosip-config/tree/master).
+Please refer to the required released tagged version for configuration
+:
+1. [Configuration-Application](https://github.com/mosip/mosip-config/blob/master/application-default.properties)
+2. [Configuration-Pre-Registration](https://github.com/mosip/mosip-config/blob/master/pre-registration-default.properties)
 
-  * server.port=9094
-  * server.servlet.context-path=/preregistration/v1
-
-
-
-## URL
-
-* https://{dns-name}:9094/preregistration/v1/sync/swagger-ui.html
- 
-
-## Roles to Access the URL
-
-* REGISTRATION_OFFICER
-* REGISTRATION_SUPERVISOR
-* REGISTRATION_ ADMIN
-* REGISTRATION_PROCESSOR
 
+## APIs
+API documentation is available [here](https://mosip.github.io/documentation/1.2.0/pre-registration-datasync-service.html).
 
 ## API Dependencies
 

From 40ad3ca96703924233edcfc19a764570712a5963 Mon Sep 17 00:00:00 2001
From: Sohan Kumar Dey <72375959+Sohandey@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:39:49 +0530
Subject: [PATCH 7/9] MOSIP-37475

Signed-off-by: Sohan Kumar Dey <72375959+Sohandey@users.noreply.github.com>
---
 .../mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java | 1 +
 .../mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
index 385d57d457..330beb9863 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testrunner/MosipTestRunner.java
@@ -79,6 +79,7 @@ public static void main(String[] arg) {
 			suiteSetup(getRunType());
 			SkipTestCaseHandler.loadTestcaseToBeSkippedList("testCaseSkippedList.txt");
 			setLogLevels();
+			AdminTestUtil.getRequiredField();
 
 			// For now we are not doing health check for qa-115.
 			if (BaseTestCase.isTargetEnvLTS()) {
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
index 9a3560b302..58572f9587 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/CreatePreReg.java
@@ -95,7 +95,7 @@ public void test(TestCaseDTO testCaseDTO)
 		String[] templateFields = testCaseDTO.getTemplateFields();
 
 		String jsonInput = testCaseDTO.getInput();
-
+		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String inputJson = getJsonFromTemplate(jsonInput, testCaseDTO.getInputTemplate(), false);
 		String outputJson = getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate());
 		if (testCaseDTO.getTemplateFields() != null && templateFields.length > 0) {

From a7f9ca152803a722650fc4e195bf78a64a7aa5a3 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:03:58 +0530
Subject: [PATCH 8/9] MOSIP-37476 - updated the docker file for jdk version

Signed-off-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
---
 api-test/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-test/Dockerfile b/api-test/Dockerfile
index 62956aef0a..fc29f293e2 100644
--- a/api-test/Dockerfile
+++ b/api-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM mosipdev/openjdk-21-jre:latest
+FROM mosipid/openjdk-21-jre:21.0.4
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -54,4 +54,4 @@ ENV ENV_USER=
 ENV ENV_ENDPOINT=
 ENV ENV_TESTLEVEL=smokeAndRegression
 
-ENTRYPOINT ["./entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["./entrypoint.sh"]

From a8d44e612b1854f860c4fe5b21c9cd752f2c2a98 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:28:26 +0530
Subject: [PATCH 9/9] MOSIP-34532 - Updated the ReadMe file (#762)

Signed-off-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
---
 api-test/README.md | 153 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 151 insertions(+), 2 deletions(-)

diff --git a/api-test/README.md b/api-test/README.md
index 51b6226796..d2bf349c1c 100644
--- a/api-test/README.md
+++ b/api-test/README.md
@@ -1,3 +1,152 @@
-# Automation test
+# Pre Registration API Test Rig
 
-All automation test code. 
+## Overview
+
+The **Pre Registration API Test Rig** is designed for the execution of module-wise automation API tests for the pre-registration services. This test rig utilizes **Java REST Assured** and **TestNG** frameworks to automate testing of the pre-registration API functionalities. The key focus is to validate the pre-registration creation, appointment booking and related functionalities provided by the pre-registration module.
+
+## Test Categories
+
+- **Smoke**: Contains only positive test scenarios for quick verification.
+- **Regression**: Includes all test scenarios, covering both positive and negative cases.
+
+## Coverage
+
+This test rig covers only **external API endpoints** exposed by the admin services module.
+
+## Pre-requisites
+
+Before running the automation tests, ensure the following software is installed on the machine:
+
+- **Java 21** (or a compatible version)
+- **Maven 3.9.6** (or higher)
+- **Lombok** (Refer to [Lombok Project](https://projectlombok.org/))
+
+### For Windows
+
+- **Git Bash 2.18.0** or higher
+- Ensure the `settings.xml` file is present in the `.m2` folder.
+
+### For Linux
+
+- The `settings.xml` file should be present in two places:
+  - In the regular Maven configuration folder (`/conf`)
+  - Under `/usr/local/maven/conf/`
+
+## Access Test Automation Code
+
+You can access the test automation code using either of the following methods:
+
+### From Browser
+
+1. Clone or download the repository as a zip file from [GitHub](https://github.com/mosip/pre-registration).
+2. Unzip the contents to your local machine.
+3. Open a terminal (Linux) or command prompt (Windows) and continue with the following steps.
+
+### From Git Bash
+
+1. Copy the Git repository URL: `https://github.com/mosip/pre-registration`
+2. Open **Git Bash** on your local machine.
+3. Run the following command to clone the repository:
+   ```sh
+   git clone https://github.com/mosip/pre-registration
+   ```
+
+## Build Test Automation Code
+
+Once the repository is cloned or downloaded, follow these steps to build and install the test automation code:
+
+1. Navigate to the project directory:
+   ```sh
+   cd api-test
+   ```
+
+2. Build the project using Maven:
+   ```sh
+   mvn clean install -Dgpg.skip=true -Dmaven.gitcommitid.skip=true
+   ```
+
+This will download the required dependencies and prepare the test suite for execution.
+
+## Execute Test Automation Suite
+
+You can execute the test automation code using either of the following methods:
+
+### Using Jar
+
+To execute the tests using Jar, use the following steps:
+
+1. Navigate to the `target` directory where the JAR file is generated:
+   ```sh
+   cd target/
+   ```
+
+2. Run the automation test suite JAR file:
+   ```
+   java -jar -Dmodules=prereg -Denv.user=api-internal.<env_name> -Denv.endpoint=<base_env> -Denv.testLevel=smokeAndRegression -jar apitest-prereg-1.3.0-SNAPSHOT-jar-with-dependencies.jar
+   ```
+   
+# Using Eclipse IDE
+
+To execute the tests using Eclipse IDE, use the following steps:
+
+## 1. **Install Eclipse (Latest Version)**
+   - Download and install the latest version of Eclipse IDE from the [Eclipse Downloads](https://www.eclipse.org/downloads/).
+
+## 2. **Import the Maven Project**
+
+   After Eclipse is installed, follow these steps to import the Maven project:
+
+   - Open Eclipse IDE.
+   - Go to `File` > `Import`.
+   - In the **Import** wizard, select `Maven` > `Existing Maven Projects`, then click **Next**.
+   - Browse to the location where the `api-test` folder is saved (either from the cloned Git repository or downloaded zip).
+   - Select the folder, and Eclipse will automatically detect the Maven project. Click **Finish** to import the project.
+
+## 3. **Build the Project**
+
+   - Right-click on the project in the **Project Explorer** and select `Maven` > `Update Project`.
+   - This will download the required dependencies as defined in the `pom.xml` and ensure everything is correctly set up.
+
+## 4. **Run the Tests**
+
+   To execute the test automation suite, you need to configure the run parameters in Eclipse:
+
+   - Go to `Run` > `Run Configurations`.
+   - In the **Run Configurations** window, create a new configuration for your tests:
+     - Right-click on **Java Application** and select **New**.
+     - In the **Main** tab, select the project by browsing the location where the `api-test` folder is saved, and select the **Main class** as `io.mosip.testrig.apirig.esignet.testrunner.MosipTestRunner`.
+   - In the **Arguments** tab, add the necessary **VM arguments**:
+     - **VM Arguments**:
+       ```
+       -Dmodules=prereg -Denv.user=api-internal.<env_name> -Denv.endpoint=<base_env> -Denv.testLevel=smokeAndRegression```
+
+## 5. **Run the Configuration**
+
+   - Once the configuration is set up, click **Run** to execute the test suite.
+   - The tests will run, and the results will be shown in the **Console** tab of Eclipse.
+
+   **Note**: You can also run in **Debug Mode** to troubleshoot issues by setting breakpoints in your code and choosing `Debug` instead of `Run`.
+
+## 6. **View Test Results**
+
+   - After the tests are executed, you can view the detailed results in the `api-test\testng-report` directory.
+
+
+   
+### Details of Arguments Used
+
+- **env.user**: Replace `<env_name>` with the appropriate environment name (e.g., `dev`, `qa`, etc.).
+- **env.endpoint**: The environment where the application under test is deployed. Replace `<base_env>` with the correct base URL for the environment (e.g., `https://api-internal.<env_name>.mosip.net`).
+- **env.testLevel**: Set this to `smoke` to run only smoke test cases, or `smokeAndRegression` to run both smoke and regression tests.
+- **jar**: Specify the name of the JAR file to execute. The version will change according to the development code version. For example, the current version may look like `apitest-prereg-1.3.0-SNAPSHOT-jar-with-dependencies.jar`.
+
+## Build and Run
+
+To run the tests for both **Smoke** and **Regression**:
+
+1. Ensure the correct environment and test level parameters are set.
+2. Execute the tests as shown in the command above to validate admin services API functionalities.
+
+## License
+
+This project is licensed under the terms of the [Mozilla Public License 2.0]