From 535e826fa7ad707ce53ca1e820a46aa70bbdf04c Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Fri, 17 Jan 2025 15:36:49 +0530 Subject: [PATCH 1/4] MOSIP-38871 - Fixed the DOB hardcording for infants in getApplicantType api Signed-off-by: Mohanachandran S --- .../masterdata/testrunner/MosipTestRunner.java | 2 +- .../apirig/masterdata/testscripts/SimplePost.java | 2 ++ .../apirig/masterdata/utils/MasterDataUtil.java | 14 ++++++++++++++ .../GetApplicantType/GetApplicantType.yml | 14 +++++++------- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java index debc111cf82..273e5f5c0c5 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java @@ -178,7 +178,7 @@ public static void startTestRunner() { TestNG runner = new TestNG(); List suitefiles = new ArrayList<>(); if (file.getName().toLowerCase().contains("mastertestsuite")) { - BaseTestCase.setReportName(GlobalConstants.MASTERDATA); + //BaseTestCase.setReportName(GlobalConstants.MASTERDATA); suitefiles.add(file.getAbsolutePath()); runner.setTestSuites(suitefiles); System.getProperties().setProperty("testng.outpur.dir", "testng-report"); diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testscripts/SimplePost.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testscripts/SimplePost.java index 535b62d9524..b3dbf5c4e05 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testscripts/SimplePost.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testscripts/SimplePost.java @@ -35,6 +35,7 @@ public class SimplePost extends AdminTestUtil implements ITest { private static final Logger logger = Logger.getLogger(SimplePost.class); + private MasterDataUtil masterDataUtil = new MasterDataUtil(); protected String testCaseName = ""; public Response response = null; public boolean auditLogCheck = false; @@ -88,6 +89,7 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad } String inputJson = getJsonFromTemplate(testCaseDTO.getInput(), testCaseDTO.getInputTemplate()); + inputJson = masterDataUtil.inputJsonKeyWordHandeler(inputJson, testCaseName); if (testCaseDTO.getTemplateFields() != null && templateFields.length > 0) { ArrayList inputtestCases = AdminTestUtil.getInputTestCase(testCaseDTO); diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java index c00871e4874..4052d787185 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java @@ -1,5 +1,8 @@ package io.mosip.testrig.apirig.masterdata.utils; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + import org.apache.log4j.Logger; import org.testng.SkipException; @@ -11,6 +14,8 @@ public class MasterDataUtil extends AdminTestUtil { private static final Logger logger = Logger.getLogger(MasterDataUtil.class); + public static DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd"); + public static String infantDob = LocalDateTime.now().minusYears(5).format(dateFormatter); public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) { String testCaseName = testCaseDTO.getTestCaseName(); @@ -21,4 +26,13 @@ public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) { return testCaseName; } + public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) { + + if (jsonString.contains("$INFANT$")) { + jsonString = replaceKeywordWithValue(jsonString, "$INFANT$", infantDob); + } + + return jsonString; + } + } \ No newline at end of file diff --git a/api-test/src/main/resources/masterdata/GetApplicantType/GetApplicantType.yml b/api-test/src/main/resources/masterdata/GetApplicantType/GetApplicantType.yml index 858d61a0caa..7386c060ef5 100644 --- a/api-test/src/main/resources/masterdata/GetApplicantType/GetApplicantType.yml +++ b/api-test/src/main/resources/masterdata/GetApplicantType/GetApplicantType.yml @@ -45,7 +45,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -76,7 +76,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -169,7 +169,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -428,7 +428,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -459,7 +459,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -552,7 +552,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", @@ -583,7 +583,7 @@ GetApplicantType: }, { "attribute": "dateOfBirth", - "value": "2019/01/01" + "value": "$INFANT$" }, { "attribute": "gender", From cf0bd0adaa5f694c419d55f41e0a940c18fa707e Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Fri, 17 Jan 2025 15:45:21 +0530 Subject: [PATCH 2/4] Corrected the report naming Signed-off-by: Mohanachandran S --- .../testrig/apirig/masterdata/testrunner/MosipTestRunner.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java index 273e5f5c0c5..aa1cca62407 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/testrunner/MosipTestRunner.java @@ -178,7 +178,6 @@ public static void startTestRunner() { TestNG runner = new TestNG(); List suitefiles = new ArrayList<>(); if (file.getName().toLowerCase().contains("mastertestsuite")) { - //BaseTestCase.setReportName(GlobalConstants.MASTERDATA); suitefiles.add(file.getAbsolutePath()); runner.setTestSuites(suitefiles); System.getProperties().setProperty("testng.outpur.dir", "testng-report"); From 662935969362b07ef2056ad17de0bc6126ab4e79 Mon Sep 17 00:00:00 2001 From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com> Date: Fri, 17 Jan 2025 18:04:53 +0530 Subject: [PATCH 3/4] Update push-trigger.yml Signed-off-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com> --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index bb85d20a5d1..0f389e8e2ff 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -158,7 +158,7 @@ jobs: - name: Upload the springboot jars if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_ARTIFACT }} path: ${{ env.BUILD_ARTIFACT }}.zip From 8916493d3e70ac721a2e43af0d52a26883e84c33 Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Thu, 23 Jan 2025 18:43:20 +0530 Subject: [PATCH 4/4] MOSIP-38871 - Fixed the DOB hardcording for infants in getApplicantType API Signed-off-by: Mohanachandran S --- .../masterdata/utils/MasterDataUtil.java | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java index 4052d787185..b50181f2c04 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/masterdata/utils/MasterDataUtil.java @@ -2,10 +2,14 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.HashMap; import org.apache.log4j.Logger; import org.testng.SkipException; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import io.mosip.testrig.apirig.dto.TestCaseDTO; import io.mosip.testrig.apirig.utils.AdminTestUtil; import io.mosip.testrig.apirig.utils.GlobalConstants; @@ -15,24 +19,43 @@ public class MasterDataUtil extends AdminTestUtil { private static final Logger logger = Logger.getLogger(MasterDataUtil.class); public static DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd"); - public static String infantDob = LocalDateTime.now().minusYears(5).format(dateFormatter); - + public static String infantDob = LocalDateTime.now().minusYears(getInfantMaxAge()).format(dateFormatter); + public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) { String testCaseName = testCaseDTO.getTestCaseName(); - + if (SkipTestCaseHandler.isTestCaseInSkippedList(testCaseName)) { throw new SkipException(GlobalConstants.KNOWN_ISSUES); } return testCaseName; } - + public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) { - + if (jsonString.contains("$INFANT$")) { jsonString = replaceKeywordWithValue(jsonString, "$INFANT$", infantDob); } - + return jsonString; } - + + private static int getInfantMaxAge() { + HashMap map = null; + String ageGroup = getValueFromRegprocActuator("systemProperties", + "mosip.regproc.packet.classifier.tagging.agegroup.ranges"); + + try { + map = new Gson().fromJson(ageGroup, new TypeToken>() { + }.getType()); + } catch (Exception e) { + logger.error( + GlobalConstants.ERROR_STRING_1 + ageGroup + GlobalConstants.EXCEPTION_STRING_1 + e.getMessage()); + } + + String infantAgeGroup = map.get("INFANT").toString(); + + String[] parts = infantAgeGroup.split("-"); + return Integer.parseInt(parts[1]); + } + } \ No newline at end of file