From 0afdf9a911199eaaa3c1bfa736863477795d18bc Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Tue, 5 Nov 2024 13:28:21 +0530
Subject: [PATCH 1/4] MOSIP-37137 | changed package name

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 67d343e776951bfefc1c0cac7ed0c8ade5fcf7f8 Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Mon, 2 Dec 2024 12:16:26 +0530
Subject: [PATCH 2/4] MOSIP-35404

Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
---
 api-test/pom.xml                                 |  6 +++---
 .../apirig/prereg/testscripts/CreatePreReg.java  |  1 -
 .../prereg/testscripts/DeleteWithParam.java      |  1 -
 .../apirig/prereg/testscripts/GetWithParam.java  |  1 -
 .../testscripts/GetWithParamForAutoGenId.java    |  1 -
 .../apirig/prereg/testscripts/SimplePost.java    |  1 -
 .../testrig/apirig/prereg/utils/PreRegUtil.java  | 16 ++++++++++++++++
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/api-test/pom.xml b/api-test/pom.xml
index 9f04c77530..ff425504f2 100644
--- a/api-test/pom.xml
+++ b/api-test/pom.xml
@@ -8,7 +8,7 @@
 	<name>apitest-prereg</name>
 	<description>Parent project of MOSIP Pre-Registration apitests</description>
 	<url>/~https://github.com/mosip/pre-registration</url>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-cleanup-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -49,14 +49,14 @@
 		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
 
 		<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
-		<fileName>apitest-prereg-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-prereg-1.2.1-cleanup-SNAPSHOT-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2-cleanup-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
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 58572f9587..991f6e1862 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,6 @@ 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) {
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
index d2f04d5d38..437a11f253 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/DeleteWithParam.java
@@ -78,7 +78,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
index b6efe465ea..0503deb831 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParam.java
@@ -81,7 +81,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
index 208d0516d0..5cab7c0b3e 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/GetWithParamForAutoGenId.java
@@ -83,7 +83,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
index ad939d8095..1766abc328 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/testscripts/SimplePost.java
@@ -81,7 +81,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = PreRegUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		auditLogCheck = testCaseDTO.isAuditLogCheck();
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		if (HealthChecker.signalTerminateExecution) {
diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
index ac78a949df..921629356f 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/prereg/utils/PreRegUtil.java
@@ -1,6 +1,7 @@
 package io.mosip.testrig.apirig.prereg.utils;
 
 import org.apache.log4j.Logger;
+import org.json.JSONArray;
 import org.testng.SkipException;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
@@ -15,9 +16,24 @@ public class PreRegUtil extends AdminTestUtil {
 	public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
 		String testCaseName = testCaseDTO.getTestCaseName();
 		
+		int indexof = testCaseName.indexOf("_");
+		String modifiedTestCaseName = testCaseName.substring(indexof + 1);
+
+		addTestCaseDetailsToMap(modifiedTestCaseName, testCaseDTO.getUniqueIdentifier());
+
 		if (SkipTestCaseHandler.isTestCaseInSkippedList(testCaseName)) {
 			throw new SkipException(GlobalConstants.KNOWN_ISSUES);
 		}
+		
+		JSONArray postalCodeArray = new JSONArray(getValueFromAuthActuator("json-property", "postal_code"));
+
+		if (testCaseName.startsWith("Prereg_")
+				&& (testCaseName.contains("_Invalid_PostalCode_")
+						|| testCaseName.contains("_SpacialCharacter_PostalCode_"))
+				&& (globalRequiredFields != null && !globalRequiredFields.toList().contains(postalCodeArray))) {
+			throw new SkipException(GlobalConstants.FEATURE_NOT_SUPPORTED_MESSAGE);
+		}
+
 		return testCaseName;
 	}
 	

From d4b97e67403327877434ebe9b1fd21d3480a24a4 Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Mon, 6 Jan 2025 16:03:32 +0530
Subject: [PATCH 3/4] MOSIP-35404

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 ff425504f2..7a97a00d3d 100644
--- a/api-test/pom.xml
+++ b/api-test/pom.xml
@@ -54,7 +54,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
+			<groupId>io.mosip.testrig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
 			<version>1.2.2-cleanup-SNAPSHOT</version>
 		</dependency>

From 3651f375ade40679c6389afde45e15b841e63d29 Mon Sep 17 00:00:00 2001
From: Nandhukumar <nandhukumare@gmail.com>
Date: Wed, 8 Jan 2025 13:31:45 +0530
Subject: [PATCH 4/4] MOSIP-35404

Signed-off-by: Nandhukumar <nandhukumare@gmail.com>
---
 api-test/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api-test/pom.xml b/api-test/pom.xml
index 7a97a00d3d..ae790c2ea7 100644
--- a/api-test/pom.xml
+++ b/api-test/pom.xml
@@ -8,7 +8,7 @@
 	<name>apitest-prereg</name>
 	<description>Parent project of MOSIP Pre-Registration apitests</description>
 	<url>/~https://github.com/mosip/pre-registration</url>
-	<version>1.2.1-cleanup-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -49,14 +49,14 @@
 		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
 
 		<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
-		<fileName>apitest-prereg-1.2.1-cleanup-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-prereg-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>io.mosip.testrig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.2.2-cleanup-SNAPSHOT</version>
+			<version>1.3.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>