From fda7e2ec3f15c090c11e99fd598d7150b18e7dcb Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Mon, 11 Nov 2024 11:46:30 +0530 Subject: [PATCH] Revert "Merge pull request #671 from pg-techno123/develop" This reverts commit 379c003daefd44d9544f605ce862684ffeb5ead6, reversing changes made to a3913da82d7a7498a5b92b249cf890a8d9058910. --- mosip-acceptance-tests/ivv-core/pom.xml | 4 +- mosip-acceptance-tests/ivv-dg/pom.xml | 8 +- .../ivv-orchestrator/pom.xml | 95 ++-- .../ivv/e2e/methods/GetResidentData.java | 20 +- .../ivv/orchestrator/PacketUtility.java | 4 +- .../src/main/resources/config/scenarios.json | 452 ++++++++-------- .../config/test-orchestrator_mz.properties | 4 +- mosip-acceptance-tests/ivv-parser/pom.xml | 6 +- mosip-acceptance-tests/pom.xml | 4 +- mosip-packet-creator/pom.xml | 8 +- .../controller/CertificateController.java | 191 +++---- .../controller/CommandsController.java | 297 ++++++----- .../controller/ContextController.java | 35 +- .../controller/PacketController.java | 213 ++------ .../controller/PartnerManagerController.java | 208 ++++---- .../controller/PersonaController.java | 126 ++--- .../controller/PolicyManagerController.java | 250 +++++---- .../controller/PrintController.java | 257 ++++----- .../controller/RestartController.java | 50 +- .../controller/SchemaManagerController.java | 143 ++--- .../controller/SimpleService.java | 27 +- .../controller/TestDataController.java | 490 ++++++++++++++---- .../controller/preRegController.java | 137 +---- .../service/PacketSyncService.java | 4 +- mosipTestDataProvider/pom.xml | 6 +- .../dataprovider/ResidentDataProvider.java | 8 +- .../preparation/MosipMasterData.java | 3 +- .../dataprovider/util/ResidentAttribute.java | 1 + 28 files changed, 1509 insertions(+), 1542 deletions(-) diff --git a/mosip-acceptance-tests/ivv-core/pom.xml b/mosip-acceptance-tests/ivv-core/pom.xml index dd88b8aea..da6705640 100644 --- a/mosip-acceptance-tests/ivv-core/pom.xml +++ b/mosip-acceptance-tests/ivv-core/pom.xml @@ -6,13 +6,13 @@ io.mosip.testrig.dslrig.ivv dslrig-ivv-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT 4.0.0 io.mosip.testrig.dslrig.ivv.core dslrig-ivv-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT 3.7.0.1746 diff --git a/mosip-acceptance-tests/ivv-dg/pom.xml b/mosip-acceptance-tests/ivv-dg/pom.xml index 551512122..ffddf6e65 100644 --- a/mosip-acceptance-tests/ivv-dg/pom.xml +++ b/mosip-acceptance-tests/ivv-dg/pom.xml @@ -5,10 +5,10 @@ io.mosip.testrig.dslrig.ivv dslrig-ivv-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT 4.0.0 - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT io.mosip.testrig.dslrig.ivv.dg dslrig-ivv-dg @@ -20,12 +20,12 @@ io.mosip.testrig.dslrig.ivv.core dslrig-ivv-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT io.mosip.testrig.dslrig.ivv.parser dslrig-ivv-parser - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT diff --git a/mosip-acceptance-tests/ivv-orchestrator/pom.xml b/mosip-acceptance-tests/ivv-orchestrator/pom.xml index 7d7dc549c..692547bd7 100644 --- a/mosip-acceptance-tests/ivv-orchestrator/pom.xml +++ b/mosip-acceptance-tests/ivv-orchestrator/pom.xml @@ -1,19 +1,15 @@ - + 4.0.0 - io.mosip.testrig.dslrig.ivv dslrig-ivv-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT io.mosip.testrig.dslrig.ivv.orchestrator dslrig-ivv-orchestrator mosip-dsl-test - 1.2.1-SNAPSHOT - + 1.2.1-java21-SNAPSHOT testng.xml 3.7.0.1746 @@ -34,14 +30,14 @@ - + + - maven-compiler-plugin 3.8.0 @@ -51,7 +47,6 @@ -Dfile.encoding=UTF-8 - org.apache.maven.plugins maven-shade-plugin @@ -62,15 +57,21 @@ shade - dslrig-ivv-orchestrator-1.2.1-SNAPSHOT-jar-with-dependencies + + dslrig-ivv-orchestrator-1.2.1-java21-SNAPSHOT-jar-with-dependencies - - - io.mosip.testrig.dslrig.ivv.orchestrator.TestRunner + + + + + + io.mosip.testrig.dslrig.ivv.orchestrator.TestRunner + *:* @@ -89,30 +90,28 @@ + org.apache.commons commons-lang3 - + io.mosip.testrig.dslrig.ivv.core dslrig-ivv-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT - io.mosip.testrig.dslrig.ivv.dg dslrig-ivv-dg - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT - com.aventstack extentreports 3.0.7 compile - io.mosip.testrig.apirig.apitest.commons apitest-commons @@ -128,37 +127,31 @@ - - io.mosip.idrepo - apitest-idrepo + io.mosip.authentication + apitest-auth 1.2.1-SNAPSHOT - - + io.mosip.esignet apitest-esignet 1.2.1-SNAPSHOT - - io.mosip.authentication - apitest-auth + io.mosip.masterdata + apitest-masterdata 1.2.1-SNAPSHOT - - io.mosip.masterdata - apitest-masterdata + io.mosip.idrepo + apitest-idrepo 1.2.1-SNAPSHOT - io.mosip.resident apitest-resident 1.2.1-SNAPSHOT - com.slack.api slack-api-client @@ -170,23 +163,20 @@ - com.fasterxml.jackson.core jackson-databind - io.mosip.kernel kernel-biometrics-api 1.2.1-SNAPSHOT - + javax.cache cache-api - org.ehcache jcache @@ -198,12 +188,10 @@ - com.fasterxml.jackson.core jackson-core - org.springframework.boot spring-boot-starter-batch @@ -214,12 +202,10 @@ - org.hibernate.validator hibernate-validator - com.jayway.jsonpath json-path @@ -248,12 +234,30 @@ sonar + + 5.0.6.RELEASE + 2.0.2.RELEASE 2.0.7.RELEASE 5.0.5.RELEASE - 2.0.1.RELEASE + 2.0.0.RELEASE + + 2.0.7 + 1.5.20 + 2.9.2 + + 3.6.2 + 3.7.0 + + . + src/main/java/**,src/main/resources/** + ${sonar.coverage.exclusions} + https://sonarcloud.io + + false + @@ -262,6 +266,7 @@ ${maven.sonar.plugin.version} + verify sonar diff --git a/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/GetResidentData.java b/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/GetResidentData.java index ac38d2643..0a42d6318 100644 --- a/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/GetResidentData.java +++ b/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/GetResidentData.java @@ -29,17 +29,19 @@ public class GetResidentData extends BaseTestCaseUtil implements StepInterface { @Override public void run() throws RigInternalError { + int nofResident = 1; String ageCategory = ""; Boolean bSkipGuardian = false; String missFields = null; String[] bioFlag = null; HashMap genderAndBioFlag = new HashMap(); - if (!step.getParameters().isEmpty() && step.getParameters().size() >= 3) { - ageCategory = step.getParameters().get(0); - bSkipGuardian = Boolean.parseBoolean(step.getParameters().get(1)); + if (!step.getParameters().isEmpty() && step.getParameters().size() > 3) { + nofResident = Integer.parseInt(step.getParameters().get(0)); + ageCategory = step.getParameters().get(1); + bSkipGuardian = Boolean.parseBoolean(step.getParameters().get(2)); - if (step.getParameters().get(2).contains("@@")) { - bioFlag = step.getParameters().get(2).split("@@"); + if (step.getParameters().get(3).contains("@@")) { + bioFlag = step.getParameters().get(3).split("@@"); genderAndBioFlag.put("Gender", bioFlag[0]); genderAndBioFlag.put("Iris", bioFlag[1]); genderAndBioFlag.put("Finger", bioFlag[2]); @@ -47,7 +49,7 @@ public void run() throws RigInternalError { } else { - genderAndBioFlag.put("Gender", step.getParameters().get(2)); + genderAndBioFlag.put("Gender", step.getParameters().get(3)); genderAndBioFlag.put("Iris", "true"); genderAndBioFlag.put("Finger", "true"); genderAndBioFlag.put("Face", "true"); @@ -56,8 +58,8 @@ public void run() throws RigInternalError { // Get Miss attrobutes list - if (step.getParameters().size() > 3) - missFields = step.getParameters().get(3).replaceAll("@@", ","); + if (step.getParameters().size() > 4) + missFields = step.getParameters().get(4).replaceAll("@@", ","); } else { logger.warn("Input parameter missing [nofResident/bAdult/bSkipGuardian/gender]"); @@ -67,7 +69,7 @@ public void run() throws RigInternalError { // Generate Resident for all ages cleanData(); - Response response = packetUtility.generateResident(ageCategory, bSkipGuardian, missFields, + Response response = packetUtility.generateResident(nofResident, ageCategory, bSkipGuardian, missFields, genderAndBioFlag, step); JSONObject jsonObject = new JSONObject(response.getBody().asString()); JSONArray resp = new JSONObject(response.getBody().asString()).getJSONArray("response"); diff --git a/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java b/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java index 96f6a9271..32d251a8c 100644 --- a/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java +++ b/mosip-acceptance-tests/ivv-orchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/orchestrator/PacketUtility.java @@ -173,10 +173,10 @@ public List generateResidents(int n, Boolean bAdult, Boolean bSkipGuardi } - public Response generateResident(String ageCategory, Boolean bSkipGuardian, String missFields, + public Response generateResident(int n, String ageCategory, Boolean bSkipGuardian, String missFields, HashMap genderAndBioFlag, Scenario.Step step) throws RigInternalError { - String url = baseUrl + props.getProperty("getResidentUrl"); + String url = baseUrl + props.getProperty("getResidentUrl") + n; JSONObject jsonwrapper = new JSONObject(); JSONObject jsonReq = new JSONObject(); JSONObject residentAttrib = new JSONObject(); diff --git a/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/scenarios.json b/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/scenarios.json index 36f7dafaa..c96692c4f 100644 --- a/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/scenarios.json +++ b/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/scenarios.json @@ -310,7 +310,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -413,7 +413,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -486,7 +486,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -631,7 +631,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(minor/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -692,13 +692,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -807,7 +807,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -880,7 +880,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,leftiris@@rightIris)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,leftiris@@rightIris)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1019,13 +1019,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male,gender)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male,gender)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -1116,7 +1116,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1219,7 +1219,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1328,7 +1328,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1473,7 +1473,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1582,7 +1582,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Male,face@@leftEye@@rightEye@@rightIndex@@rightLittle@@rightRing@@rightMiddle@@leftIndex@@leftLittle@@leftRing@@leftMiddle@@leftThumb@@rightThumb)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Male,face@@leftEye@@rightEye@@rightIndex@@rightLittle@@rightRing@@rightMiddle@@leftIndex@@leftLittle@@leftRing@@leftMiddle@@leftThumb@@rightThumb)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1655,7 +1655,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1794,7 +1794,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1867,7 +1867,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,POA@@POI@@POR@@POE@@POB)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,POA@@POI@@POR@@POE@@POB)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1928,7 +1928,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male@@false@@false@@false)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male@@false@@false@@false)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -1989,7 +1989,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -2098,7 +2098,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -2171,13 +2171,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true,Male)" + "Action": "$$childPersona=e2e_getResidentData(1,minor/*PERSONA_TYPE*/,true,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -2274,7 +2274,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -2431,7 +2431,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -2558,7 +2558,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Male,rightlittleFinger)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Male,rightlittleFinger)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -2679,7 +2679,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -2836,7 +2836,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -2993,7 +2993,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3150,7 +3150,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3283,7 +3283,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3446,7 +3446,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3537,7 +3537,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3628,7 +3628,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3761,7 +3761,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -3924,13 +3924,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true,Male)" + "Action": "$$childPersona=e2e_getResidentData(1,minor/*PERSONA_TYPE*/,true,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -4099,7 +4099,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4256,7 +4256,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,leftiris@@rightIris)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,leftiris@@rightIris)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4347,7 +4347,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4516,7 +4516,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4673,7 +4673,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4758,7 +4758,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4849,7 +4849,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -4940,7 +4940,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5031,7 +5031,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -5128,7 +5128,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5219,7 +5219,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5310,7 +5310,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5401,7 +5401,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Male,leftiris@@rightIris)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Male,leftiris@@rightIris)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5570,7 +5570,7 @@ "Description": "Generates persona data for operator", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-18": { "Description": "Generates packet template based on the persona data of operator", @@ -5612,7 +5612,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-25": { "Description": "Generates packet template based on the persona data", @@ -5715,7 +5715,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -5800,13 +5800,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true,Male)" + "Action": "$$childPersona=e2e_getResidentData(1,minor/*PERSONA_TYPE*/,true,Male)" }, "Step-5": { "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -5848,7 +5848,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -5951,13 +5951,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -6066,7 +6066,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -6187,7 +6187,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -6235,7 +6235,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -6326,7 +6326,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -6387,7 +6387,7 @@ "Description": "<<>>", "Input Parameters": "<<>>", "Return Value": "<<>>", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -6411,7 +6411,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-9": { "Description": "Updates persona with parent RID", @@ -6508,7 +6508,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -6575,7 +6575,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -6654,7 +6654,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -6745,7 +6745,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-3": { "Description": "Generates packet template based on the persona data", @@ -6854,7 +6854,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -6969,7 +6969,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7072,7 +7072,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7187,7 +7187,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7248,7 +7248,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7309,7 +7309,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7370,7 +7370,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7431,7 +7431,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7492,7 +7492,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7553,7 +7553,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7595,7 +7595,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-12": { "Description": "Generates packet template based on the persona data", @@ -7668,7 +7668,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -7710,7 +7710,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-12": { "Description": "Generates packet template based on the persona data", @@ -7861,7 +7861,7 @@ "Description": "Generates persona data for operator", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-18": { "Description": "Generates packet template based on the persona data of operator", @@ -7903,7 +7903,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-25": { "Description": "Generates packet template based on the persona data", @@ -8006,7 +8006,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -8121,7 +8121,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -8230,7 +8230,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -9323,7 +9323,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -9408,7 +9408,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -9493,7 +9493,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -9740,7 +9740,7 @@ "Description": "Generates persona data of operator", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-18": { "Description": "Generates packet template based on the persona data of operator", @@ -9782,7 +9782,7 @@ "Description": "<<>>", "Input Parameters": "<<>>", "Return Value": "<<>>", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-25": { "Description": "Generates packet template based on the persona data", @@ -9885,7 +9885,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -9940,7 +9940,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -9976,7 +9976,7 @@ "Description": "<<>>", "Input Parameters": "<<>>", "Return Value": "<<>>", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Generates packet template based on the persona data", @@ -10031,7 +10031,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-4": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10073,7 +10073,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath1=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Generates packet template based on the persona data", @@ -10152,7 +10152,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10200,7 +10200,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -10242,7 +10242,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath3=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath3=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-20": { "Description": "Generates packet template based on the persona data", @@ -10309,7 +10309,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10388,7 +10388,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10436,7 +10436,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -10478,7 +10478,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath3=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath3=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-20": { "Description": "Generates packet template based on the persona data", @@ -10551,7 +10551,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10599,7 +10599,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -10678,7 +10678,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -10726,7 +10726,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath2=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -10805,13 +10805,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true,Male)" + "Action": "$$childPersona=e2e_getResidentData(1,minor/*PERSONA_TYPE*/,true,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -10938,7 +10938,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -11029,7 +11029,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -11120,7 +11120,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11168,7 +11168,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-13": { "Description": "Generates packet template based on the persona data", @@ -11241,7 +11241,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -11307,7 +11307,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-16": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -11398,7 +11398,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11459,7 +11459,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GENERATE_PRIVATE_KEY*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GENERATE_PRIVATE_KEY*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11514,7 +11514,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11550,7 +11550,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -11623,7 +11623,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11659,7 +11659,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -11726,7 +11726,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11762,7 +11762,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -11829,7 +11829,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11865,7 +11865,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -11944,7 +11944,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -11980,7 +11980,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@false/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -12041,7 +12041,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12077,7 +12077,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -12204,7 +12204,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12240,7 +12240,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -12343,7 +12343,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12379,7 +12379,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -12500,7 +12500,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12609,13 +12609,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -12736,7 +12736,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12797,7 +12797,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12888,7 +12888,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -12924,7 +12924,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -13015,7 +13015,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -13051,7 +13051,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -13160,7 +13160,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -13335,7 +13335,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -13510,13 +13510,13 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -13685,7 +13685,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -13746,7 +13746,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with UIN", @@ -13813,7 +13813,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -13886,7 +13886,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -13928,7 +13928,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-12": { "Description": "Updates persona with Biometric exception", @@ -14007,7 +14007,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14043,7 +14043,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona with Biometric exception", @@ -14122,7 +14122,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -14195,7 +14195,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14231,7 +14231,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona with Biometric exception", @@ -14310,7 +14310,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -14352,7 +14352,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-12": { "Description": "Updates persona data with gaudian details", @@ -14431,7 +14431,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14540,7 +14540,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14643,7 +14643,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14679,7 +14679,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -14800,7 +14800,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -14836,7 +14836,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -14957,7 +14957,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -15102,7 +15102,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -15247,7 +15247,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -15380,7 +15380,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Female)" }, "Step-5": { "Description": "Get the block listed word>", @@ -15453,7 +15453,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -15526,7 +15526,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -15562,7 +15562,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -15641,7 +15641,7 @@ "Description": "<<>>", "Input Parameters": "<<>>", "Return Value": "<<>>", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -15677,7 +15677,7 @@ "Description": "<<>>", "Input Parameters": "<<>>", "Return Value": "<<>>", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -15762,7 +15762,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -15835,7 +15835,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -15902,7 +15902,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -16011,7 +16011,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16114,7 +16114,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -16223,7 +16223,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16296,7 +16296,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16363,7 +16363,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16418,7 +16418,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16575,7 +16575,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-15": { "Description": "Generates packet template based on the persona data", @@ -16714,7 +16714,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-15": { "Description": "Generates packet template based on the persona data", @@ -16793,7 +16793,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -16866,7 +16866,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(senior/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,senior/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -16933,7 +16933,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(senior/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,senior/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17000,7 +17000,7 @@ "Description": "Generates the persona data", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -17067,7 +17067,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17103,7 +17103,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -17206,7 +17206,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Female/*GENDER*/)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*AGE_CATEGORY*/,false/*GUARDIAN_FLAG*/,Female/*GENDER*/)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17261,7 +17261,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details can be found in the parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17322,7 +17322,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17425,7 +17425,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17528,7 +17528,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -17697,7 +17697,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-18": { "Description": "Generates packet template based on the persona data", @@ -17782,7 +17782,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -17915,7 +17915,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-16": { "Description": "Generates packet template based on the persona data", @@ -18000,7 +18000,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18055,7 +18055,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18146,7 +18146,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Male,rightlittleFinger)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Male,rightlittleFinger)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18273,7 +18273,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-6": { "Description": "Generates packet template based on the persona data", @@ -18322,7 +18322,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18413,7 +18413,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18480,7 +18480,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18541,7 +18541,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18638,7 +18638,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18729,7 +18729,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" + "Action": "$$personaFilePath=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male,rightlittleFinger)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18820,7 +18820,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18881,7 +18881,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath1=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -18917,7 +18917,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath2=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-11": { "Description": "Generates packet template based on the persona data", @@ -19026,7 +19026,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath1=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -19062,7 +19062,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath2=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath2=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-11": { "Description": "Generates packet template based on the persona data", @@ -19171,7 +19171,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -19207,7 +19207,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,minor/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -19255,7 +19255,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-19": { "Description": "Generates packet template based on the persona data", @@ -19364,7 +19364,7 @@ "Description": "Generates the persona file", "Input Parameters": "Details are in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$parentPersona=e2e_getResidentData(adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" + "Action": "$$parentPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,adult/*PERSONA_TYPE*/,false/*GUARDIAN_FLAG*/,Male)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -19400,7 +19400,7 @@ "Description": "Generates persona data", "Input Parameters": "Details in parameters in-line comments", "Return Value": "Persona file path", - "Action": "$$childPersona=e2e_getResidentData(infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" + "Action": "$$childPersona=e2e_getResidentData(1/*NUMBER_OF_RESIDENTS*/,infant/*PERSONA_TYPE*/,true/*GUARDIAN_FLAG*/,Male/*GENDER*/@@false/*FINGER_BIOMETRIC_FLAG*/@@false/*IRIS_BIOMETRIC_FLAG*/@@true/*FACE_BIOMETRIC_FLAG*/)" }, "Step-11": { "Description": "Updates persona data with gaudian details", @@ -19454,7 +19454,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-20": { "Description": "Generates packet template based on the persona data", @@ -19563,7 +19563,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Generates packet template based on the persona data", @@ -19630,7 +19630,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -19691,7 +19691,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -19727,7 +19727,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath1=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-11": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -19800,7 +19800,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-5": { "Description": "Updates persona with Biometric exception", @@ -19836,7 +19836,7 @@ "Description": "Generates persona data", "Input Parameters": "Details are in parameter in-line comments", "Return Value": "Persona file path", - "Action": "$$personaFilePath1=e2e_getResidentData(adult/*PERSONA_TYPE*/,false,Female)" + "Action": "$$personaFilePath1=e2e_getResidentData(1,adult/*PERSONA_TYPE*/,false,Female)" }, "Step-11": { "Description": "Updates Demo graphic details and biometric in the persona file", @@ -19990,4 +19990,4 @@ "Action": "e2e_WritePersonaData()" } } -] \ No newline at end of file +] diff --git a/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/test-orchestrator_mz.properties b/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/test-orchestrator_mz.properties index 2a78b0553..184a69b57 100644 --- a/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/test-orchestrator_mz.properties +++ b/mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/test-orchestrator_mz.properties @@ -20,7 +20,7 @@ discardAppoinment=/preregistration/v1/applications packetCretorUrl=/packetcreator ridsyncUrl=/ridsync packetsyncUrl=/packetsync -getResidentUrl=/persona/generate +getResidentUrl=/resident/ updateResidentUrl=/updateresident updatePersonaData=/persona/update getPersonaData=/persona @@ -54,7 +54,7 @@ getMachineToRemap=/v1/masterdata/machines/ getDeviceToRemap=/v1/masterdata/devices/search writeFile=/writeFile/ updatePreRegStatus=/prereg/application/status/ -deleteMockExpectation=persona/mock-abis-service/config/expectation +deleteMockExpectation=/mock-abis-service/config/expectation setMockMVExpectation=/v1/mockmv/config/expectationMockMv ridStatus=/resident/stages/ updatePersonabioexceptions=/persona/bioexceptions diff --git a/mosip-acceptance-tests/ivv-parser/pom.xml b/mosip-acceptance-tests/ivv-parser/pom.xml index 9424228a1..c39ed835b 100644 --- a/mosip-acceptance-tests/ivv-parser/pom.xml +++ b/mosip-acceptance-tests/ivv-parser/pom.xml @@ -5,19 +5,19 @@ io.mosip.testrig.dslrig.ivv dslrig-ivv-parent - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT 4.0.0 io.mosip.testrig.dslrig.ivv.parser dslrig-ivv-parser - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT io.mosip.testrig.dslrig.ivv.core dslrig-ivv-core - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT diff --git a/mosip-acceptance-tests/pom.xml b/mosip-acceptance-tests/pom.xml index 5335e37dc..4a8753ca6 100644 --- a/mosip-acceptance-tests/pom.xml +++ b/mosip-acceptance-tests/pom.xml @@ -5,7 +5,7 @@ io.mosip.testrig.dslrig.ivv dslrig-ivv-parent pom - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT MPL 2.0 @@ -203,7 +203,7 @@ io.mosip.kernel kernel-bom - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT pom import diff --git a/mosip-packet-creator/pom.xml b/mosip-packet-creator/pom.xml index 6f824dda6..8e24570b1 100644 --- a/mosip-packet-creator/pom.xml +++ b/mosip-packet-creator/pom.xml @@ -35,7 +35,7 @@ io.mosip.testrig.dslrig.packetcreator dslrig-packetcreator - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT dslrig-packetcreator dslrig-packetcreator @@ -43,7 +43,7 @@ 21 3.7.0.1746 2023.0.1 - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT @@ -136,7 +136,7 @@ io.mosip.testrig.dslrig.dataprovider dslrig-dataprovider - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT io.mosip.kernel @@ -236,7 +236,7 @@ io.mosip.kernel kernel-bom - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT pom import diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CertificateController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CertificateController.java index 579209936..8f879c076 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CertificateController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CertificateController.java @@ -3,8 +3,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Base64; import org.jobrunr.scheduling.cron.Cron; @@ -21,8 +19,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import io.mosip.mock.sbi.devicehelper.SBIDeviceHelper; -import io.mosip.testrig.dslrig.dataprovider.BiometricDataProvider; import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; import io.mosip.testrig.dslrig.packetcreator.dto.PreRegisterRequestDto; @@ -46,71 +42,52 @@ public class CertificateController { private static final Logger logger = LoggerFactory.getLogger(CertificateController.class); - /* - * @Operation(summary = "Generating and uploading the root certificate") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully updated the root certificate") }) - * - * @PutMapping(value = "/certificate/generate/root/{contextKey}") - * public @ResponseBody String generateAndUploadRootCertificate( - * - * @RequestParam(value = "issuer", defaultValue = - * "C=AU, O=The Legion of the Bouncy Castle, OU=Bouncy Primary Certificate") - * String issuer, - * - * @RequestParam(value = "alias", defaultValue = "Root CA") String alias, - * - * @RequestParam(value = "validYears", defaultValue = "3") int validYears, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } return - * certificateService.generateAndUploadRootCertificate(issuer, alias, - * validYears, contextKey); } catch (Exception ex) { - * logger.error("generateAndUploadCACertificate", ex); } - * - * return "failed"; - * - * } - */ - - /* - * @Operation(summary = "Generating and uploading the int certificate") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully updated the int certificate") }) - * - * @PutMapping(value = "/certificate/generate/int/{contextKey}") - * public @ResponseBody String generateAndUploadIntCertificate( - * - * @RequestParam(value = "issuer", defaultValue = - * "C=IN, O=EFG Company, OU=Certificate, E=abc@efg.com") String issuer, - * - * @RequestParam(value = "alias", defaultValue = "Int CA") String alias, - * - * @RequestParam(value = "validYears", defaultValue = "3") int validYears, - * - * @RequestParam(value = "RootAlias", defaultValue = "Root CA") String - * rootAlias, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } return - * certificateService.generateAndUploadIntCertificate(issuer, alias, validYears, - * rootAlias, contextKey); } catch (Exception ex) { - * logger.error("generateAndUploadCACertificate", ex); } - * - * return "failed"; } - */ - - @Operation(summary = "Upload a device PKCS#12 file") + @Operation(summary = "Generating and uploading the root certificate") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully updated the root certificate") }) + @PutMapping(value = "/certificate/generate/root/{contextKey}") + public @ResponseBody String generateAndUploadRootCertificate( + @RequestParam(value = "issuer", defaultValue = "C=AU, O=The Legion of the Bouncy Castle, OU=Bouncy Primary Certificate") String issuer, + @RequestParam(value = "alias", defaultValue = "Root CA") String alias, + @RequestParam(value = "validYears", defaultValue = "3") int validYears, + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return certificateService.generateAndUploadRootCertificate(issuer, alias, validYears, contextKey); + } catch (Exception ex) { + logger.error("generateAndUploadCACertificate", ex); + } + + return "failed"; + + } + + @Operation(summary = "Generating and uploading the int certificate") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully updated the int certificate") }) + @PutMapping(value = "/certificate/generate/int/{contextKey}") + public @ResponseBody String generateAndUploadIntCertificate( + @RequestParam(value = "issuer", defaultValue = "C=IN, O=EFG Company, OU=Certificate, E=abc@efg.com") String issuer, + @RequestParam(value = "alias", defaultValue = "Int CA") String alias, + @RequestParam(value = "validYears", defaultValue = "3") int validYears, + @RequestParam(value = "RootAlias", defaultValue = "Root CA") String rootAlias, + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return certificateService.generateAndUploadIntCertificate(issuer, alias, validYears, rootAlias, contextKey); + } catch (Exception ex) { + logger.error("generateAndUploadCACertificate", ex); + } + + return "failed"; + } + @PostMapping(value = "/uploadDeviceCert/{contextKey}") public @ResponseBody String uploadDeviceCert( @RequestBody String encodedDeviceCert,@PathVariable("contextKey") String contextKey) { try { @@ -130,65 +107,31 @@ public class CertificateController { return "{\"error\":\"" + e.getMessage() + "\"}"; } } - - @Operation(summary = "Clear the device certificate cache from mock mds") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Validation successful") }) - @GetMapping(value = "/clearDeviceCertCache/{contextKey}") - public @ResponseBody String clearDeviceCertCache(@PathVariable("contextKey") String contextKey) { - try { - Path p12path = null; - String certsDir = System.getenv(BiometricDataProvider.AUTHCERTSPATH) == null - ? VariableManager.getVariableValue(contextKey, BiometricDataProvider.AUTHCERTSPATH).toString() - : System.getenv(BiometricDataProvider.AUTHCERTSPATH); - if (certsDir == null || certsDir.length() == 0) { - certsDir = System.getProperty("java.io.tmpdir") + File.separator + "AUTHCERTS"; - } + @Operation(summary = "Generating and uploading the partner certificate") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully updated the partner certificate") }) + @PutMapping(value = "/certificate/generate/partner/{contextKey}") + public @ResponseBody String generateAndUploadPartnerCertificate( + @RequestParam(value = "issuer", defaultValue = "C=IN, O=ABC Bank,L=Bangalore,CN=ABC Bank, OU=Account Opening,E=bank@efg.com") String issuer, + @RequestParam(value = "alias", defaultValue = "ABC Bank") String alias, + @RequestParam(value = "validYears", defaultValue = "3") int validYears, + @RequestParam(value = "RootAlias", defaultValue = "Int CA") String rootAlias, + @RequestParam(value = "PartnerID", defaultValue = "9876") String partnerID, + @PathVariable("contextKey") String contextKey) { - p12path = Paths.get(certsDir, "DSL-IDA-" + VariableManager.getVariableValue(contextKey, "db-server")); - - SBIDeviceHelper.evictKeys(p12path.toString()); - return "{\"Success\"}"; + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return certificateService.generateAndUploadPartnerCertificate(issuer, alias, validYears, rootAlias, + partnerID, contextKey); } catch (Exception ex) { - logger.error("Clear device certificate cache ", ex); + logger.error("generateAndUploadCACertificate", ex); } - return "{\"Failed\"}"; - } - /* - * @Operation(summary = "Generating and uploading the partner certificate") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully updated the partner certificate") }) - * - * @PutMapping(value = "/certificate/generate/partner/{contextKey}") - * public @ResponseBody String generateAndUploadPartnerCertificate( - * - * @RequestParam(value = "issuer", defaultValue = - * "C=IN, O=ABC Bank,L=Bangalore,CN=ABC Bank, OU=Account Opening,E=bank@efg.com" - * ) String issuer, - * - * @RequestParam(value = "alias", defaultValue = "ABC Bank") String alias, - * - * @RequestParam(value = "validYears", defaultValue = "3") int validYears, - * - * @RequestParam(value = "RootAlias", defaultValue = "Int CA") String rootAlias, - * - * @RequestParam(value = "PartnerID", defaultValue = "9876") String partnerID, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } return - * certificateService.generateAndUploadPartnerCertificate(issuer, alias, - * validYears, rootAlias, partnerID, contextKey); } catch (Exception ex) { - * logger.error("generateAndUploadCACertificate", ex); } - * - * return "failed"; - * - * } - */ + return "failed"; + + } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CommandsController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CommandsController.java index f9ea4d014..0ce258b73 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CommandsController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/CommandsController.java @@ -1,149 +1,148 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * import java.io.IOException; import java.util.Optional; import - * java.util.Properties; - * - * import org.json.JSONObject; import org.slf4j.Logger; import - * org.slf4j.LoggerFactory; import - * org.springframework.beans.factory.annotation.Autowired; import - * org.springframework.web.bind.annotation.GetMapping; import - * org.springframework.web.bind.annotation.PathVariable; import - * org.springframework.web.bind.annotation.PostMapping; import - * org.springframework.web.bind.annotation.PutMapping; import - * org.springframework.web.bind.annotation.RequestBody; import - * org.springframework.web.bind.annotation.RequestParam; import - * org.springframework.web.bind.annotation.ResponseBody; import - * org.springframework.web.bind.annotation.RestController; import - * org.springframework.web.multipart.MultipartFile; - * - * import io.mosip.testrig.dslrig.dataprovider.util.CommonUtil; import - * io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; import - * io.mosip.testrig.dslrig.packetcreator.service.CommandsService; import - * io.swagger.v3.oas.annotations.tags.Tag; import - * io.swagger.v3.oas.annotations.Operation; import - * io.swagger.v3.oas.annotations.responses.ApiResponse; import - * io.swagger.v3.oas.annotations.responses.ApiResponses; - * - * @RestController - * - * @Tag(name = "CommandsController", description = - * "REST APIs for Command Center,x Kubernetes Control") public class - * CommandsController { private static final Logger logger = - * LoggerFactory.getLogger(CommandsController.class); - * - * @Autowired CommandsService commandsService; - * - * - * - * @GetMapping(value = "/exec/{testcaseId}/{IsSynchronous}/{contextKey}") - * - * @Operation(summary = "Executing the job") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Job executed successfully") }) public @ResponseBody String - * execJob(@PathVariable("testcaseId") String testcaseId, - * - * @PathVariable(name = "IsSynchronous", required = true) Optional - * isSync, - * - * @PathVariable("contextKey") String contextKey) { boolean bSync = false; if - * (isSync.isPresent()) bSync = isSync.get(); return - * commandsService.execute(testcaseId, bSync); - * - * } - * - * @PostMapping("/uploadFile/{contextKey}") - * - * @Operation(summary = - * "Upload a file to packet-utility configured folder. API Returns the Path", - * responses = { - * - * @ApiResponse(responseCode = "200", description = "Successfully uploaded") }) - * public @ResponseBody String uploadFile(@RequestParam("file") MultipartFile - * file, - * - * @PathVariable("contextKey") String contextKey) { - * - * String fileName = ""; try { fileName = commandsService.storeFile(file); } - * catch (IOException e) { logger.error(e.getMessage()); } return fileName; } - * - * @PutMapping("/status/{contextKey}") - * - * @Operation(summary = "Update Status of execution", description = - * "Update the status of an execution identified by the given key. The status can be 'inUse' or 'Free'." - * , responses = { - * - * @ApiResponse(responseCode = "200", description = - * "Status updated successfully") }) public @ResponseBody String - * updateStatus(@RequestParam("key") String key, @RequestParam("status") String - * status, - * - * @PathVariable("contextKey") String contextKey - * - * ) { - * - * String timeStamp = CommonUtil.getUTCDateTime(null); - * VariableManager.setVariableValue(contextKey, key, status); - * VariableManager.setVariableValue(contextKey, key + "_ts", timeStamp); - * - * return "{\"Success\"}"; } - * - * @GetMapping("/status/{contextKey}") - * - * @Operation(summary = "Get Status of execution", description = - * "Retrieve the status of an execution identified by the given key. The status can be 'inUse' or 'Free'." - * , responses = { - * - * @ApiResponse(responseCode = "200", description = - * "Status retrieved successfully") }) public @ResponseBody String - * getStatus(@RequestParam("key") String key, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { String ts = VariableManager.getVariableValue(contextKey, key + - * "_ts").toString(); String stsVal = - * VariableManager.getVariableValue(contextKey, key).toString(); JSONObject json - * = new JSONObject(); json.put(key, stsVal); json.put("ts", ts); return - * json.toString(); - * - * } catch (Exception e) { - * - * } return "{\"Free\"}"; } - * - * @PostMapping("/writeFile/{offset}/{contextKey}") - * - * @Operation(summary = "Creating the file") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "File created successfully") }) public @ResponseBody String writeToFile( - * // @RequestParam("offset") long offset, - * - * @PathVariable("offset") long offset, @RequestBody Properties reqestData, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { - * - * return commandsService.writeToFile(contextKey, reqestData, offset); - * - * } catch (IOException e) { logger.error(e.getMessage()); } return "{Failed}"; - * } - * - * - * - * @GetMapping(value = "/generatekey/{machineId}/{contextKey}") - * - * @Operation(summary = "Generate private key based on machineId", description = - * "Generate a private key based on the provided machine ID.", responses = { - * - * @ApiResponse(responseCode = "200", description = - * "Private key generated successfully") }) public String - * generatekey(@PathVariable String machineId, @PathVariable("contextKey") - * String contextKey) { try { return commandsService.generatekey(contextKey, - * machineId); } catch (Exception e) { - * - * logger.error(e.getMessage()); } return "{Failed}"; } - * - * } - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + +import java.io.IOException; +import java.util.Optional; +import java.util.Properties; + +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import io.mosip.testrig.dslrig.dataprovider.util.CommonUtil; +import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; +import io.mosip.testrig.dslrig.packetcreator.service.CommandsService; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +@RestController +@Tag(name = "CommandsController", description = "REST APIs for Command Center,x Kubernetes Control") +public class CommandsController { + private static final Logger logger = LoggerFactory.getLogger(CommandsController.class); + + @Autowired + CommandsService commandsService; + + @GetMapping(value = "/exec/{testcaseId}/{IsSynchronous}/{contextKey}") + @Operation(summary = "Executing the job") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Job executed successfully") }) + public @ResponseBody String execJob(@PathVariable("testcaseId") String testcaseId, + @PathVariable(name = "IsSynchronous", required = true) Optional isSync, + @PathVariable("contextKey") String contextKey) { + boolean bSync = false; + if (isSync.isPresent()) + bSync = isSync.get(); + return commandsService.execute(testcaseId, bSync); + + } + + @PostMapping("/uploadFile/{contextKey}") + @Operation(summary = "Upload a file to packet-utility configured folder. API Returns the Path", responses = { + @ApiResponse(responseCode = "200", description = "Successfully uploaded") }) + public @ResponseBody String uploadFile(@RequestParam("file") MultipartFile file, + @PathVariable("contextKey") String contextKey) { + + String fileName = ""; + try { + fileName = commandsService.storeFile(file); + } catch (IOException e) { + logger.error(e.getMessage()); + } + return fileName; + } + + @PutMapping("/status/{contextKey}") + @Operation(summary = "Update Status of execution", description = "Update the status of an execution identified by the given key. The status can be 'inUse' or 'Free'.", responses = { + @ApiResponse(responseCode = "200", description = "Status updated successfully") }) + public @ResponseBody String updateStatus(@RequestParam("key") String key, @RequestParam("status") String status, + @PathVariable("contextKey") String contextKey + + ) { + + String timeStamp = CommonUtil.getUTCDateTime(null); + VariableManager.setVariableValue(contextKey, key, status); + VariableManager.setVariableValue(contextKey, key + "_ts", timeStamp); + + return "{\"Success\"}"; + } + + @GetMapping("/status/{contextKey}") + @Operation(summary = "Get Status of execution", description = "Retrieve the status of an execution identified by the given key. The status can be 'inUse' or 'Free'.", responses = { + @ApiResponse(responseCode = "200", description = "Status retrieved successfully") }) + public @ResponseBody String getStatus(@RequestParam("key") String key, + @PathVariable("contextKey") String contextKey) { + + try { + String ts = VariableManager.getVariableValue(contextKey, key + "_ts").toString(); + String stsVal = VariableManager.getVariableValue(contextKey, key).toString(); + JSONObject json = new JSONObject(); + json.put(key, stsVal); + json.put("ts", ts); + return json.toString(); + + } catch (Exception e) { + + } + return "{\"Free\"}"; + } + + @PostMapping("/writeFile/{offset}/{contextKey}") + @Operation(summary = "Creating the file") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "File created successfully") }) + public @ResponseBody String writeToFile( + // @RequestParam("offset") long offset, + @PathVariable("offset") long offset, @RequestBody Properties reqestData, + @PathVariable("contextKey") String contextKey) { + + try { + + return commandsService.writeToFile(contextKey, reqestData, offset); + + } catch (IOException e) { + logger.error(e.getMessage()); + } + return "{Failed}"; + } + + @GetMapping("/ping/{eSignetDeployed}/{contextKey}") + @Operation(summary = "Verify target environment", description = "Verify if the target environment (context) is available.", responses = { + @ApiResponse(responseCode = "200", description = "Target environment verified successfully") }) + public @ResponseBody String checkContext(@RequestParam(name = "module", required = false) String module, + @PathVariable String eSignetDeployed, @PathVariable("contextKey") String contextKey) { + + try { + + return commandsService.checkContext(contextKey, module, eSignetDeployed); + + } catch (Exception e) { + + logger.error(e.getMessage()); + } + return "{Failed}"; + } + + @GetMapping(value = "/generatekey/{machineId}/{contextKey}") + @Operation(summary = "Generate private key based on machineId", description = "Generate a private key based on the provided machine ID.", responses = { + @ApiResponse(responseCode = "200", description = "Private key generated successfully") }) + public String generatekey(@PathVariable String machineId, @PathVariable("contextKey") String contextKey) { + try { + return commandsService.generatekey(contextKey, machineId); + } catch (Exception e) { + + logger.error(e.getMessage()); + } + return "{Failed}"; + } + +} diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/ContextController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/ContextController.java index 46215beeb..aca4d1372 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/ContextController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/ContextController.java @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -20,7 +19,6 @@ import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; import io.mosip.testrig.dslrig.dataprovider.util.RestClient; import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; -import io.mosip.testrig.dslrig.packetcreator.service.CommandsService; import io.mosip.testrig.dslrig.packetcreator.service.ContextUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -36,12 +34,9 @@ public class ContextController { @Value("${mosip.test.persona.configpath}") private String personaConfigPath; - @Autowired - CommandsService commandsService; - private static final Logger logger = LoggerFactory.getLogger(ContextController.class); - @Operation(summary = "Initialize the server context") + @Operation(summary = "Creating the server context") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully created the server context") }) @PostMapping(value = "/context/server/{contextKey}") @@ -54,7 +49,7 @@ public class ContextController { if (personaConfigPath != null && !personaConfigPath.equals("")) DataProviderConstants.RESOURCE = personaConfigPath; // VariableManager.Init(contextKey); - + /* * if (RestClient.isDebugEnabled(contextKey)) { OperatingSystemMXBean osBean = * ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class); logger. @@ -79,7 +74,7 @@ public class ContextController { * "Returns the total amount of swap space in bytes:" + * Long.toString(osBean.getTotalSwapSpaceSize())); } */ - + return contextUtils.createUpdateServerContext(contextProperties, contextKey); } catch (Exception ex) { logger.error("createServerContext", ex); @@ -87,27 +82,7 @@ public class ContextController { } } - @GetMapping("/ping/{eSignetDeployed}/{contextKey}") - - @Operation(summary = "Verify target environment", description = "Verify if the target environment (context) is available.", responses = { - - @ApiResponse(responseCode = "200", description = "Target environment verified successfully") }) - public @ResponseBody String checkContext(@RequestParam(name = "module", required = false) String module, - - @PathVariable String eSignetDeployed, @PathVariable("contextKey") String contextKey) { - - try { - - return commandsService.checkContext(contextKey, module, eSignetDeployed); - - } catch (Exception e) { - - logger.error(e.getMessage()); - } - return "{Failed}"; - } - - @Operation(summary = "Retrieve the server context") + @Operation(summary = "Getting the server context") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully retrieved the server context") }) @GetMapping(value = "/context/server/{contextKey}") @@ -121,7 +96,7 @@ public class ContextController { return bRet; } - @Operation(summary = "Reset the server context data") + @Operation(summary = "Reset the context data") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Context data reset successfully") }) @GetMapping(value = "/resetContextData/{contextKey}") public @ResponseBody String resetContextData(@PathVariable("contextKey") String contextKey) { diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PacketController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PacketController.java index 4f9d1a295..94ca9d4ac 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PacketController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PacketController.java @@ -19,13 +19,8 @@ import io.mosip.mock.sbi.devicehelper.SBIDeviceHelper; import io.mosip.testrig.dslrig.dataprovider.BiometricDataProvider; import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; -import io.mosip.testrig.dslrig.dataprovider.util.RestClient; import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; -import io.mosip.testrig.dslrig.packetcreator.dto.PacketCreateDto; import io.mosip.testrig.dslrig.packetcreator.dto.PreRegisterRequestDto; -import io.mosip.testrig.dslrig.packetcreator.dto.RidSyncReqRequestDto; -import io.mosip.testrig.dslrig.packetcreator.dto.RidSyncReqResponseDTO; -import io.mosip.testrig.dslrig.packetcreator.dto.SyncRidDto; import io.mosip.testrig.dslrig.packetcreator.service.PacketMakerService; import io.mosip.testrig.dslrig.packetcreator.service.PacketSyncService; import io.swagger.v3.oas.annotations.Operation; @@ -53,7 +48,7 @@ public PacketController(@Lazy PacketSyncService packetSyncService, @Lazy PacketM * Create a packet from Resident data for the target context requestDto may * contain PersonaRequestType.PR_Options */ - @Operation(summary = "Create a packet") + @Operation(summary = "Creating packet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Packet created successfully") }) @PostMapping(value = "/packet/create/{contextKey}") public @ResponseBody String createPacket(@RequestBody PreRegisterRequestDto requestDto, @@ -74,35 +69,33 @@ public PacketController(@Lazy PacketSyncService packetSyncService, @Lazy PacketM return "{\"Failed\"}"; } - /* - * @Operation(summary = "Pack the packet") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Packet packed successfully") }) - * - * @PostMapping(value = "/packet/pack/{contextKey}") public @ResponseBody String - * packPacket(@RequestBody PreRegisterRequestDto requestDto, - * - * @PathVariable("contextKey") String contextKey - * // @RequestParam(name="isValidChecksum",required = false) Boolean isValidcs ) - * { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } boolean isValidChecksum - * = true; - * - * if(isValidcs != null) isValidChecksum = isValidcs; - * - * return - * packetMakerService.packPacketContainer(requestDto.getPersonaFilePath().get(0) - * , null, null, contextKey, isValidChecksum); // return - * packetSyncService.createPackets(requestDto.,process,null, contextKey); - * - * } catch (Exception ex) { logger.error("createPackets", ex); } return - * "{\"Failed\"}"; } - */ + @Operation(summary = "Packing the packet") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Packet packed successfully") }) + @PostMapping(value = "/packet/pack/{contextKey}") + public @ResponseBody String packPacket(@RequestBody PreRegisterRequestDto requestDto, + @PathVariable("contextKey") String contextKey + // @RequestParam(name="isValidChecksum",required = false) Boolean isValidcs + ) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + boolean isValidChecksum = true; + /* + * if(isValidcs != null) isValidChecksum = isValidcs; + */ + return packetMakerService.packPacketContainer(requestDto.getPersonaFilePath().get(0), null, null, + contextKey, isValidChecksum); + // return packetSyncService.createPackets(requestDto.,process,null, contextKey); + + } catch (Exception ex) { + logger.error("createPackets", ex); + } + return "{\"Failed\"}"; + } - @Operation(summary = "Create the packet template for synchronization and upload") + @Operation(summary = "Create the CBEFF template for packet processing") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "CBEFF template created successfully") }) @PostMapping(value = "/packet/template/{process}/{qualityScore}/{genarateValidCbeff}/{contextKey}") public @ResponseBody String createTemplate(@RequestBody PreRegisterRequestDto requestDto, @@ -124,7 +117,7 @@ public PacketController(@Lazy PacketSyncService packetSyncService, @Lazy PacketM } } - @Operation(summary = "Bulk upload of packets") + @Operation(summary = "Bulk uploading of the packets") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Bulk upload of packet is successful") }) @PostMapping(value = "/packet/bulkupload/{contextKey}") public @ResponseBody String bulkUploadPackets(@RequestBody List packetPaths, @@ -143,46 +136,8 @@ public PacketController(@Lazy PacketSyncService packetSyncService, @Lazy PacketM return "{\"Failed\"}"; } - - @Operation(summary = "Make the packet and sync it") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Successfully retrived the packet and synced") }) - @GetMapping(value = "/makepacketandsync/{preregId}/{getRidFromSync}/{contextKey}") - public @ResponseBody String makePacketAndSync(@PathVariable("preregId") String preregId, - @PathVariable("getRidFromSync") boolean getRidFromSync, - - @PathVariable("contextKey") String contextKey) { - - try { - if (personaConfigPath != null && !personaConfigPath.equals("")) { - DataProviderConstants.RESOURCE = personaConfigPath; - } - - return packetSyncService.makePacketAndSync(preregId, null, null, contextKey, null, getRidFromSync, true) - .toString(); - - } catch (Exception ex) { - logger.error("makePacketAndSync", ex); - } - return "{Failed}"; - } - - @Operation(summary = "Create the packet for the context") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully created the packet") }) - @PostMapping(value = "/packetcreator/{contextKey}") - public @ResponseBody String createPacket(@RequestBody PacketCreateDto packetCreateDto, - @PathVariable("contextKey") String contextKey) { - try { - return packetMakerService.createContainer(packetCreateDto.getIdJsonPath(), packetCreateDto.getTemplatePath(), - packetCreateDto.getSource(), packetCreateDto.getProcess(), null, contextKey, true, - packetCreateDto.getAdditionalInfoReqId()); - } catch (Exception ex) { - logger.error("", ex); - } - return "Failed!"; - } - @Operation(summary = "Fetch the tags related to the packet") + @Operation(summary = "Get the tags of the packet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully retrieved the tags of the packet") }) @GetMapping(value = "/packet/getTags/{contextKey}") @@ -196,102 +151,48 @@ public PacketController(@Lazy PacketSyncService packetSyncService, @Lazy PacketM return "{\"Failed\"}"; } - @Operation(summary = "Synchronize the packet") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "RID synced successfully") }) - @PostMapping(value = "/ridsync/{contextKey}") - public @ResponseBody String syncRid(@RequestBody SyncRidDto syncRidDto, - @PathVariable("contextKey") String contextKey) throws Exception { + @Operation(summary = "Get the device certificate cache") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Validation successful") }) + @GetMapping(value = "/clearDeviceCertCache/{contextKey}") + public @ResponseBody String clearDeviceCertCache(@PathVariable("contextKey") String contextKey) { + try { + Path p12path = null; + String certsDir = System.getenv(BiometricDataProvider.AUTHCERTSPATH) == null + ? VariableManager.getVariableValue(contextKey, BiometricDataProvider.AUTHCERTSPATH).toString() + : System.getenv(BiometricDataProvider.AUTHCERTSPATH); - return packetSyncService.syncPacketRid(syncRidDto.getContainerPath(), syncRidDto.getName(), - syncRidDto.getSupervisorStatus(), syncRidDto.getSupervisorComment(), syncRidDto.getProcess(), - contextKey, syncRidDto.getAdditionalInfoReqId()); - } + if (certsDir == null || certsDir.length() == 0) { + certsDir = System.getProperty("java.io.tmpdir") + File.separator + "AUTHCERTS"; + } - @Operation(summary = "RID sync request response") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "RID successfully synced with request response") }) - @PostMapping(value = "/ridsyncreq/{contextKey}") - public @ResponseBody RidSyncReqResponseDTO syncRidRequest(@RequestBody RidSyncReqRequestDto syncRidDto, - @PathVariable("contextKey") String contextKey) throws Exception { - - return packetSyncService.syncPacketRidRequest(syncRidDto.getContainerPath(), syncRidDto.getName(), - syncRidDto.getSupervisorStatus(), syncRidDto.getSupervisorComment(), syncRidDto.getProcess(), - contextKey, syncRidDto.getAdditionalInfoReqId()); - } + p12path = Paths.get(certsDir, "DSL-IDA-" + VariableManager.getVariableValue(contextKey, "db-server")); - @Operation(summary = "Sync the packet") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully synced the packet") }) - @PostMapping(value = "/packetsync/{contextKey}") - public @ResponseBody String packetsync(@RequestBody PreRegisterRequestDto path, - @PathVariable("contextKey") String contextKey) throws Exception { - try { - return packetSyncService.uploadPacket(path.getPersonaFilePath().get(0), contextKey); - } catch (Exception e) { - // We need to explicitly catch the exception to handle negative scenarios , - // where packet sync is expected to fail - return e.getMessage(); + SBIDeviceHelper.evictKeys(p12path.toString()); + return "{\"Success\"}"; + } catch (Exception ex) { + logger.error("Clear device certificate cache ", ex); } + return "{\"Failed\"}"; } - - @Operation(summary = "Sync and upload the packet") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Successfully registered for pre-registration") }) - @PostMapping(value = "/packet/sync/{preregId}/{getRidFromSync}/{genarateValidCbeff}/{contextKey}") - public @ResponseBody String preRegToRegister(@RequestBody PreRegisterRequestDto preRegisterRequestDto, - @PathVariable("preregId") String preregId, @PathVariable("getRidFromSync") boolean getRidFromSync, - @PathVariable("genarateValidCbeff") boolean genarateValidCbeff, - @PathVariable("contextKey") String contextKey) { + + @Operation(summary = "Validate Identity Object as per ID Schema") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Validation successful") }) + @PostMapping(value = "/packet/validate/{process}/{contextKey}") + public @ResponseBody String validatePacket(@RequestBody PreRegisterRequestDto requestDto, + @PathVariable("process") String process, @PathVariable("contextKey") String contextKey) { try { if (personaConfigPath != null && !personaConfigPath.equals("")) { DataProviderConstants.RESOURCE = personaConfigPath; } - if (preRegisterRequestDto.getPersonaFilePath().size() == 0) { - return "{\"Missing Template\"}"; - } - String personaPath = null; - if (preRegisterRequestDto.getPersonaFilePath().size() > 1) { - personaPath = preRegisterRequestDto.getPersonaFilePath().get(1); - } - RestClient.logInfo(contextKey, "packet-Sync: personaPath=" + (personaPath == null ? "N/A" : personaPath)); - RestClient.logInfo(contextKey, - "packet-Sync: TemplatePath=" + preRegisterRequestDto.getPersonaFilePath().get(0)); - - return packetSyncService.preRegToRegister(preRegisterRequestDto.getPersonaFilePath().get(0), preregId, - personaPath, contextKey, preRegisterRequestDto.getAdditionalInfoReqId(), getRidFromSync, - genarateValidCbeff); + return packetSyncService.validatePacket(requestDto.getPersonaFilePath().get(0), process, contextKey); } catch (Exception ex) { - logger.error("createPacket", ex); - return ex.getMessage(); + logger.error("validatePacket", ex); } - } + return "{\"Failed\"}"; - /* - * @Operation(summary = "Validate Identity Object as per ID Schema") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Validation successful") }) - * - * @PostMapping(value = "/packet/validate/{process}/{contextKey}") - * public @ResponseBody String validatePacket(@RequestBody PreRegisterRequestDto - * requestDto, - * - * @PathVariable("process") String process, @PathVariable("contextKey") String - * contextKey) { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } - * - * return - * packetSyncService.validatePacket(requestDto.getPersonaFilePath().get(0), - * process, contextKey); - * - * } catch (Exception ex) { logger.error("validatePacket", ex); } return - * "{\"Failed\"}"; - * - * } - */ + } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PartnerManagerController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PartnerManagerController.java index 79c3d21d8..d6ac30eb2 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PartnerManagerController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PartnerManagerController.java @@ -1,106 +1,102 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * import org.slf4j.Logger; import org.slf4j.LoggerFactory; import - * org.springframework.beans.factory.annotation.Autowired; import - * org.springframework.beans.factory.annotation.Value; import - * org.springframework.web.bind.annotation.PathVariable; import - * org.springframework.web.bind.annotation.PostMapping; import - * org.springframework.web.bind.annotation.RequestBody; import - * org.springframework.web.bind.annotation.RequestParam; import - * org.springframework.web.bind.annotation.ResponseBody; import - * org.springframework.web.bind.annotation.RestController; - * - * import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; - * import io.mosip.testrig.dslrig.packetcreator.dto.SelfRegisterDto; import - * io.mosip.testrig.dslrig.packetcreator.service.PartnerService; import - * io.swagger.v3.oas.annotations.Operation; import - * io.swagger.v3.oas.annotations.responses.ApiResponse; import - * io.swagger.v3.oas.annotations.responses.ApiResponses; import - * io.swagger.v3.oas.annotations.tags.Tag; - * - * @Tag(name = "PartnerManagerController", description = - * "REST API for partner controls") - * - * @RestController public class PartnerManagerController { - * - * @Value("${mosip.test.partnerManager.configpath}") private String - * partnerConfigPath; - * - * @Autowired PartnerService partnerService; - * - * private static final Logger logger = - * LoggerFactory.getLogger(PartnerManagerController.class); - * - * @Operation(summary = "Self registration in patner management service") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Self registration is successfully") }) - * - * @PostMapping(value = "/partners/{contextKey}") public @ResponseBody String - * selfRegisterPartner(@RequestBody SelfRegisterDto selfRegister, - * - * @PathVariable("contextKey") String contextKey) { try { if (partnerConfigPath - * != null && !partnerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * partnerConfigPath; } return partnerService.selfRegister(selfRegister, - * contextKey); } catch (Exception e) { logger.error("selfRegisterPartner", e); - * return "{\"falied\"}"; } } - * - * @Operation(summary = - * "Updating the patner status in patner management service") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully updated the partner status") }) - * - * @PostMapping(value = "/partners/{partnerId}/{contextKey}") - * public @ResponseBody String updatePartnerStatus(@PathVariable(value = - * "partnerId") String partnerId, - * - * @RequestParam(value = "status") String status, @PathVariable("contextKey") - * String contextKey) { try { if (partnerConfigPath != null && - * !partnerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * partnerConfigPath; } return partnerService.updatePartnerStatus(contextKey, - * partnerId, status); } catch (Exception e) { - * logger.error("updatePartnerStatus", e); return "{\"falied\"}"; } } - * - * @Operation(summary = "Submiting API request in patner management service") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "API request is successfully") }) - * - * @PostMapping(value = "/partner/APIRequest/submit/{contextKey}") - * public @ResponseBody String submitAPIRequest(@RequestParam(value = - * "PartnerID") String partnerID, - * - * @RequestParam(value = "PolicyName") String policyName, - * - * @RequestParam(value = "useCaseDescription") String useCaseDesc, - * - * @PathVariable("contextKey") String contextKey) { try { if (partnerConfigPath - * != null && !partnerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * partnerConfigPath; } return - * partnerService.submitPartnerAPIKeyRequest(contextKey, partnerID, policyName, - * useCaseDesc); } catch (Exception e) { logger.error("submitApiRequest", e); - * return "{\"falied\"}"; } } - * - * @Operation(summary = "Approving API request in patner management service") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "API request is approved successfully") }) - * - * @PostMapping(value = "/partner/APIRequest/approve/{contextKey}") - * public @ResponseBody String approveAPIRequest(@RequestParam(value = - * "APIReqeustID") String ID, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (partnerConfigPath != null && !partnerConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = partnerConfigPath; } return - * partnerService.approvePartnerAPIKeyRequest(contextKey, ID); } catch - * (Exception e) { logger.error("approveAPIRequest", e); return "{\"falied\"}"; - * } } - * - * } - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; +import io.mosip.testrig.dslrig.packetcreator.dto.SelfRegisterDto; +import io.mosip.testrig.dslrig.packetcreator.service.PartnerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@Tag(name = "PartnerManagerController", description = "REST API for partner controls") +@RestController +public class PartnerManagerController { + + @Value("${mosip.test.partnerManager.configpath}") + private String partnerConfigPath; + + @Autowired + PartnerService partnerService; + + private static final Logger logger = LoggerFactory.getLogger(PartnerManagerController.class); + + @Operation(summary = "Self registration in patner management service") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Self registration is successfully") }) + @PostMapping(value = "/partners/{contextKey}") + public @ResponseBody String selfRegisterPartner(@RequestBody SelfRegisterDto selfRegister, + @PathVariable("contextKey") String contextKey) { + try { + if (partnerConfigPath != null && !partnerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = partnerConfigPath; + } + return partnerService.selfRegister(selfRegister, contextKey); + } catch (Exception e) { + logger.error("selfRegisterPartner", e); + return "{\"falied\"}"; + } + } + + @Operation(summary = "Updating the patner status in patner management service") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully updated the partner status") }) + @PostMapping(value = "/partners/{partnerId}/{contextKey}") + public @ResponseBody String updatePartnerStatus(@PathVariable(value = "partnerId") String partnerId, + @RequestParam(value = "status") String status, @PathVariable("contextKey") String contextKey) { + try { + if (partnerConfigPath != null && !partnerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = partnerConfigPath; + } + return partnerService.updatePartnerStatus(contextKey, partnerId, status); + } catch (Exception e) { + logger.error("updatePartnerStatus", e); + return "{\"falied\"}"; + } + } + + @Operation(summary = "Submiting API request in patner management service") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "API request is successfully") }) + @PostMapping(value = "/partner/APIRequest/submit/{contextKey}") + public @ResponseBody String submitAPIRequest(@RequestParam(value = "PartnerID") String partnerID, + @RequestParam(value = "PolicyName") String policyName, + @RequestParam(value = "useCaseDescription") String useCaseDesc, + @PathVariable("contextKey") String contextKey) { + try { + if (partnerConfigPath != null && !partnerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = partnerConfigPath; + } + return partnerService.submitPartnerAPIKeyRequest(contextKey, partnerID, policyName, useCaseDesc); + } catch (Exception e) { + logger.error("submitApiRequest", e); + return "{\"falied\"}"; + } + } + + @Operation(summary = "Approving API request in patner management service") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "API request is approved successfully") }) + @PostMapping(value = "/partner/APIRequest/approve/{contextKey}") + public @ResponseBody String approveAPIRequest(@RequestParam(value = "APIReqeustID") String ID, + @PathVariable("contextKey") String contextKey) { + + try { + if (partnerConfigPath != null && !partnerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = partnerConfigPath; + } + return partnerService.approvePartnerAPIKeyRequest(contextKey, ID); + } catch (Exception e) { + logger.error("approveAPIRequest", e); + return "{\"falied\"}"; + } + } + +} diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PersonaController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PersonaController.java index b0b9ff0fa..e2554d729 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PersonaController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PersonaController.java @@ -12,13 +12,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import io.mosip.testrig.dslrig.dataprovider.models.setup.MosipMachineModel; import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; -import io.mosip.testrig.dslrig.dataprovider.util.RestClient; import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; import io.mosip.testrig.dslrig.packetcreator.dto.BioExceptionDto; import io.mosip.testrig.dslrig.packetcreator.dto.MockABISExpectationsDto; @@ -48,7 +46,7 @@ public PersonaController(@Lazy PacketSyncService packetSyncService) { this.packetSyncService = packetSyncService; } - @Operation(summary = "Update the specified persona record with the provided attribute values") + @Operation(summary = "Update given persona record with the given list of attribute values") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully updated the persona record") }) @PutMapping(value = "/persona/{id}/{contextKey}") @@ -68,31 +66,8 @@ public PersonaController(@Lazy PacketSyncService packetSyncService) { return "{Failed}"; } - - @Operation(summary = "Update the persona data with UIN/RID") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Resident data is successfully updated") }) - @PostMapping(value = "/updateresident/{contextKey}") - public @ResponseBody String updateResidentData(@RequestBody PersonaRequestDto personaRequestDto, - // @PathVariable("id") int id, - @RequestParam(name = "UIN", required = false) String uin, - @RequestParam(name = "RID", required = false) String rid, @PathVariable("contextKey") String contextKey) { - try { - if (personaConfigPath != null && !personaConfigPath.equals("")) { - DataProviderConstants.RESOURCE = personaConfigPath; - } - // String uin = ""; - // String rid = "1234567890"; - return packetSyncService.updateResidentData(personaRequestDto.getRequests(), uin, rid, contextKey); - - } catch (Exception ex) { - logger.error("registerResident", ex); - } - return "{Failed}"; - - } - - @Operation(summary = "Update the specified persona record with the provided biometric exceptions") + @Operation(summary = "Update given persona record with the given list of biometric exceptions") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully updated the persona record") }) @PutMapping(value = "/persona/bioexceptions/{contextKey}") @@ -112,74 +87,39 @@ public PersonaController(@Lazy PacketSyncService packetSyncService) { } - /* - * @Operation(summary = - * "Create a persona record based on the provided specifications") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully created the persona record") }) - * - * @PostMapping(value = "/persona/{contextKey}") public @ResponseBody String - * generateResidentData(@RequestBody PersonaRequestDto residentRequestDto, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { logger.info("Persona Config Path=" + personaConfigPath); if - * (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } if (personaAnguliPath - * != null && !personaAnguliPath.equals("")) { DataProviderConstants.ANGULI_PATH - * = personaAnguliPath; } logger.info("personaAnguliPath =" + - * DataProviderConstants.ANGULI_PATH); - * - * logger.info("Resource Path=" + DataProviderConstants.RESOURCE); logger.info( - * "DOC_Template Path=" + DataProviderConstants.RESOURCE + - * DataProviderConstants.DOC_TEMPLATE_PATH); - * - * // clear all tokens // VariableManager.setVariableValue("urlSwitched", - * "true"); - * - * return packetSyncService.generateResidentData(residentRequestDto, - * contextKey).toString(); - * - * } catch (Exception ex) { logger.error("generateResidentData", ex); } return - * "{Failed}"; } - */ - - @Operation(summary = "Generate the resident data") + @Operation(summary = "Create persona record as per the given specification") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Successfully generated the resident data") }) - @PostMapping(value = "/persona/generate/{contextKey}") + @ApiResponse(responseCode = "200", description = "Successfully created the persona record") }) + @PostMapping(value = "/persona/{count}/{contextKey}") public @ResponseBody String generateResidentData(@RequestBody PersonaRequestDto residentRequestDto, - @PathVariable("contextKey") String contextKey) { + @PathVariable("count") int count, @PathVariable("contextKey") String contextKey) { try { - RestClient.logInfo(contextKey, "Persona Config Path=" + personaConfigPath); + logger.info("Persona Config Path=" + personaConfigPath); if (personaConfigPath != null && !personaConfigPath.equals("")) { DataProviderConstants.RESOURCE = personaConfigPath; } if (personaAnguliPath != null && !personaAnguliPath.equals("")) { DataProviderConstants.ANGULI_PATH = personaAnguliPath; } - RestClient.logInfo(contextKey, "personaAnguliPath =" + DataProviderConstants.ANGULI_PATH); + logger.info("personaAnguliPath =" + DataProviderConstants.ANGULI_PATH); - RestClient.logInfo(contextKey, "Resource Path=" + DataProviderConstants.RESOURCE); - // logger.info("DOC_Template Path="+ - // VariableManager.getVariableValue(contextKey,"mosip.test.persona.documentsdatapath").toString()); + logger.info("Resource Path=" + DataProviderConstants.RESOURCE); + logger.info( + "DOC_Template Path=" + DataProviderConstants.RESOURCE + DataProviderConstants.DOC_TEMPLATE_PATH); // clear all tokens // VariableManager.setVariableValue("urlSwitched", "true"); - return packetSyncService.generateResidentData(residentRequestDto, contextKey).toString(); + return packetSyncService.generateResidentData(count, residentRequestDto, contextKey).toString(); } catch (Exception ex) { logger.error("generateResidentData", ex); - return "{\"" + ex.getMessage() + "\"}"; } + return "{Failed}"; } - @Operation(summary = "Retrieve specified attribute values from the given persona record") + @Operation(summary = "Return from the given persona record , list of specified attribute values") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Persona record retrived successfully") }) @GetMapping(value = "/persona/{contextKey}") public @ResponseBody String getPersonaData(@RequestBody List personaRequestDto, @@ -219,31 +159,29 @@ public PersonaController(@Lazy PacketSyncService packetSyncService) { @Operation(summary = "Delete expectation for a given Id") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully deleted") }) - @DeleteMapping(value = "persona/mock-abis-service/config/expectation/{contextKey}") + @DeleteMapping(value = "/mock-abis-service/config/expectation/{contextKey}") public @ResponseBody String deleteExpectations(@PathVariable("contextKey") String contextKey) { return packetSyncService.deleteMockAbisExpectations(contextKey); } - /* - * @Operation(summary = "Update the machine details") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully updated the machine details") }) - * - * @PutMapping(value = "/updateMachine/{contextKey}") public @ResponseBody - * String updateMachine(@RequestBody MosipMachineModel machine, - * - * @PathVariable("contextKey") String contextKey) { try { if (personaConfigPath - * != null && !personaConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * personaConfigPath; } return packetSyncService.updateMachine(machine, - * contextKey); - * - * } catch (Exception ex) { logger.error("updateMachine", ex); } return - * "{Failed}"; } - */ + @Operation(summary = "Update the machine details") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully updated the machine details") }) + @PutMapping(value = "/updateMachine/{contextKey}") + public @ResponseBody String updateMachine(@RequestBody MosipMachineModel machine, + @PathVariable("contextKey") String contextKey) { + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.updateMachine(machine, contextKey); + + } catch (Exception ex) { + logger.error("updateMachine", ex); + } + return "{Failed}"; + } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PolicyManagerController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PolicyManagerController.java index c0e9314fe..e00e500a3 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PolicyManagerController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PolicyManagerController.java @@ -1,130 +1,120 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * import org.json.JSONObject; import org.slf4j.Logger; import - * org.slf4j.LoggerFactory; import - * org.springframework.beans.factory.annotation.Autowired; import - * org.springframework.beans.factory.annotation.Value; import - * org.springframework.web.bind.annotation.GetMapping; import - * org.springframework.web.bind.annotation.PathVariable; import - * org.springframework.web.bind.annotation.PostMapping; import - * org.springframework.web.bind.annotation.RequestBody; import - * org.springframework.web.bind.annotation.RequestParam; import - * org.springframework.web.bind.annotation.ResponseBody; import - * org.springframework.web.bind.annotation.RestController; - * - * import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; - * import io.mosip.testrig.dslrig.packetcreator.dto.PolicyCreateDto; import - * io.mosip.testrig.dslrig.packetcreator.service.PolicyManagerService; import - * io.swagger.v3.oas.annotations.Operation; import - * io.swagger.v3.oas.annotations.responses.ApiResponse; import - * io.swagger.v3.oas.annotations.responses.ApiResponses; import - * io.swagger.v3.oas.annotations.tags.Tag; - * - * @RestController - * - * @Tag(name = "Policy Management Controller", description = - * "REST Apis for policy management") public class PolicyManagerController { - * - * @Value("${mosip.test.persona.configpath}") private String - * policyManagerConfigPath; - * - * @Autowired PolicyManagerService policyManagerService; - * - * private static final Logger logger = - * LoggerFactory.getLogger(PolicyManagerController.class); - * - * @Operation(summary = "Create the new policy group") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Policy group is created successfully") }) - * - * @PostMapping("policies/group/new/{contextKey}") public @ResponseBody String - * createPolicyGroup(@RequestParam(value = "name") String name, - * - * @RequestParam(value = "desc") String desc, @PathVariable("contextKey") String - * contextKey) { - * - * try { if (policyManagerConfigPath != null && - * !policyManagerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * policyManagerConfigPath; } return - * policyManagerService.createPolicyGroup(name, desc, contextKey); } catch - * (Exception e) { // TODO: handle exception logger.error("createPolicyGroup", - * e); return "{\"Failed\"}"; } - * - * } - * - * @Operation(summary = "Retrieve the policies group") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully retrived the policies group") }) - * - * @GetMapping("policies/group/{contextKey}") public @ResponseBody String - * getPolicyGroup(@RequestParam(value = "grpname") String groupname, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (policyManagerConfigPath != null && - * !policyManagerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * policyManagerConfigPath; } return - * policyManagerService.getPolicyGroupID(groupname, contextKey); } catch - * (Exception e) { // TODO: handle exception logger.error("createPolicyGroup", - * e); return "{\"Failed\"}"; } - * - * } - * - * @Operation(summary = "Create the policy") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Successfully created the policy") }) - * - * @PostMapping("policies/{contextKey}") public @ResponseBody String - * createPolicyUnderGroup(@RequestBody PolicyCreateDto policyDetails, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (policyManagerConfigPath != null && - * !policyManagerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * policyManagerConfigPath; } JSONObject policiesJson = new JSONObject(); - * policiesJson.put("allowedAuthTypes", - * policyDetails.getPolicies().getAllowedAuthTypes()); - * policiesJson.put("allowedKycAttributes", - * policyDetails.getPolicies().getAllowedKycAttributes()); - * policiesJson.put("authTokenType", - * policyDetails.getPolicies().getAuthTokenType()); return - * policyManagerService.createPolicyUnderGroup(policyDetails.getPolicyGroupName( - * ), policyDetails.getName(), policyDetails.getDesc(), - * policyDetails.getPolicyType(), policiesJson, contextKey); } catch (Exception - * e) { // TODO: handle exception logger.error("createPolicyUnderGroup", e); - * return "{\"Failed\"}"; } - * - * } - * - * @Operation(summary = "Publish the policy group") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Policy group is published successfully") }) - * - * @PostMapping( - * "/policies/{policyId}/group/{policygroupId}/publish/{contextKey}") - * public @ResponseBody String publishPolicy(@PathVariable("policyId") String - * policyId, - * - * @PathVariable("policygroupId") String - * policygroupId, @PathVariable("contextKey") String contextKey) { - * - * try { if (policyManagerConfigPath != null && - * !policyManagerConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * policyManagerConfigPath; } return - * policyManagerService.publishPolicy(policyId, policygroupId, contextKey); } - * catch (Exception e) { // TODO: handle exception - * logger.error("createPolicyUnderGroup", e); return "{\"Failed\"}"; } - * - * } - * - * } - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; +import io.mosip.testrig.dslrig.packetcreator.dto.PolicyCreateDto; +import io.mosip.testrig.dslrig.packetcreator.service.PolicyManagerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@RestController +@Tag(name = "Policy Management Controller", description = "REST Apis for policy management") +public class PolicyManagerController { + + @Value("${mosip.test.persona.configpath}") + private String policyManagerConfigPath; + + @Autowired + PolicyManagerService policyManagerService; + + private static final Logger logger = LoggerFactory.getLogger(PolicyManagerController.class); + + @Operation(summary = "Create the new policy group") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Policy group is created successfully") }) + @PostMapping("policies/group/new/{contextKey}") + public @ResponseBody String createPolicyGroup(@RequestParam(value = "name") String name, + @RequestParam(value = "desc") String desc, @PathVariable("contextKey") String contextKey) { + + try { + if (policyManagerConfigPath != null && !policyManagerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = policyManagerConfigPath; + } + return policyManagerService.createPolicyGroup(name, desc, contextKey); + } catch (Exception e) { + // TODO: handle exception + logger.error("createPolicyGroup", e); + return "{\"Failed\"}"; + } + + } + + @Operation(summary = "Retrieve the policies group") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrived the policies group") }) + @GetMapping("policies/group/{contextKey}") + public @ResponseBody String getPolicyGroup(@RequestParam(value = "grpname") String groupname, + @PathVariable("contextKey") String contextKey) { + + try { + if (policyManagerConfigPath != null && !policyManagerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = policyManagerConfigPath; + } + return policyManagerService.getPolicyGroupID(groupname, contextKey); + } catch (Exception e) { + // TODO: handle exception + logger.error("createPolicyGroup", e); + return "{\"Failed\"}"; + } + + } + + @Operation(summary = "Create the policy") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully created the policy") }) + @PostMapping("policies/{contextKey}") + public @ResponseBody String createPolicyUnderGroup(@RequestBody PolicyCreateDto policyDetails, + @PathVariable("contextKey") String contextKey) { + + try { + if (policyManagerConfigPath != null && !policyManagerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = policyManagerConfigPath; + } + JSONObject policiesJson = new JSONObject(); + policiesJson.put("allowedAuthTypes", policyDetails.getPolicies().getAllowedAuthTypes()); + policiesJson.put("allowedKycAttributes", policyDetails.getPolicies().getAllowedKycAttributes()); + policiesJson.put("authTokenType", policyDetails.getPolicies().getAuthTokenType()); + return policyManagerService.createPolicyUnderGroup(policyDetails.getPolicyGroupName(), + policyDetails.getName(), policyDetails.getDesc(), policyDetails.getPolicyType(), policiesJson, + contextKey); + } catch (Exception e) { + // TODO: handle exception + logger.error("createPolicyUnderGroup", e); + return "{\"Failed\"}"; + } + + } + + @Operation(summary = "Publish the policy group") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Policy group is published successfully") }) + @PostMapping("/policies/{policyId}/group/{policygroupId}/publish/{contextKey}") + public @ResponseBody String publishPolicy(@PathVariable("policyId") String policyId, + @PathVariable("policygroupId") String policygroupId, @PathVariable("contextKey") String contextKey) { + + try { + if (policyManagerConfigPath != null && !policyManagerConfigPath.equals("")) { + DataProviderConstants.RESOURCE = policyManagerConfigPath; + } + return policyManagerService.publishPolicy(policyId, policygroupId, contextKey); + } catch (Exception e) { + // TODO: handle exception + logger.error("createPolicyUnderGroup", e); + return "{\"Failed\"}"; + } + + } + +} diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PrintController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PrintController.java index 08b37c1e9..695b92225 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PrintController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/PrintController.java @@ -1,128 +1,129 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * - * import java.io.BufferedWriter; import java.io.File; import - * java.io.FileWriter; import java.io.IOException; - * - * import org.json.JSONObject; import org.slf4j.Logger; import - * org.slf4j.LoggerFactory; - * - * //import java.io.ByteArrayInputStream; //import java.util.HashMap; //import - * java.util.Map; - * - * import org.springframework.beans.factory.annotation.Autowired; import - * org.springframework.beans.factory.annotation.Value; import - * org.springframework.http.HttpStatus; import - * org.springframework.http.MediaType; import - * org.springframework.http.ResponseEntity; import - * org.springframework.web.bind.annotation.PathVariable; //import - * org.springframework.core.io.InputStreamResource; import - * org.springframework.web.bind.annotation.PostMapping; import - * org.springframework.web.bind.annotation.RequestBody; import - * org.springframework.web.bind.annotation.RequestMapping; import - * org.springframework.web.bind.annotation.RequestParam; import - * org.springframework.web.bind.annotation.ResponseBody; import - * org.springframework.web.bind.annotation.RestController; - * - * import io.mosip.kernel.core.websub.spi.SubscriptionClient; import - * io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; - * //import - * io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; - * import io.mosip.kernel.websub.api.model.SubscriptionChangeRequest; import - * io.mosip.kernel.websub.api.model.SubscriptionChangeResponse; import - * io.mosip.kernel.websub.api.model.UnsubscriptionRequest; import - * io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; import - * io.mosip.testrig.dslrig.packetcreator.dto.webSubEventModel; import - * io.mosip.testrig.dslrig.packetcreator.service.CryptoCoreUtil; import - * io.swagger.v3.oas.annotations.tags.Tag; - * - * - * @RequestMapping(value = "/print") - * - * @RestController - * - * @Tag(name = "PrintController", description = - * "REST APIs for Websub subscription client") public class PrintController { - * - * SubscriptionClient sb; - * - * @Autowired CryptoCoreUtil cryptoCoreUtil; - * - * @Value("${mosip.test.print.topic}") private String topic; - * - * @Value("${mosip.test.print.event.secret}") private String websubSecret; - * - * //@Value("${mosip.test.temp}") private String tempPath; - * - * private static final Logger logger = - * LoggerFactory.getLogger(preRegController.class); - * - * @PostMapping(value = "/print/callback",consumes = - * MediaType.APPLICATION_JSON_VALUE, produces = - * MediaType.APPLICATION_JSON_VALUE) - * - * @PreAuthenticateContentAndVerifyIntent(secret = - * "${mosip.test.print.event.secret}", callback = "/print/print/callback",topic - * = "${mosip.test.print.topic}") public ResponseEntity - * printPost(@RequestBody webSubEventModel eventModel, - * - * @PathVariable("contextKey") String contextKey) throws Exception { - * - * logger.info("Print callback fired"); String credential = - * eventModel.getEvent().getData().get("credential").toString(); String - * ecryptionPin = - * eventModel.getEvent().getData().get("protectionKey").toString(); String - * decodedCrdential = cryptoCoreUtil.decrypt(credential); - * logger.info(decodedCrdential); saveCreds(decodedCrdential,contextKey); return - * new ResponseEntity<>("successfully printed", HttpStatus.OK); } - * - * private void saveCreds(String creds,String contextKey) { File credsPath = new - * File(VariableManager.getVariableValue(contextKey,"mountPath").toString()+ - * VariableManager.getVariableValue(contextKey,"mosip.test.temp").toString() + - * "/creds/"); if (!credsPath.exists()){ credsPath.mkdirs(); } JSONObject - * jsonCred = new JSONObject(creds); String fileName = - * credsPath.getAbsolutePath() + "/"+ - * jsonCred.getJSONObject("credentialSubject").getString("UIN") + ".cred"; - * - * - * try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileName))){ - * - * - * writer.write(creds); writer.close(); - * - * } catch (IOException e) { logger.error(e.getMessage()); } - * - * - * } private String getSignature(String sign, String crdential) { String - * signHeader = sign.split("\\.")[0]; String signData = sign.split("\\.")[2]; - * String signature = signHeader + "." + crdential + "." + signData; return - * signature; } - * - * - * @PostMapping(value = "/print/register/{callbackurl}") public @ResponseBody - * String registerPrintSubscription(@RequestBody String request, - * - * @RequestParam("callbackurl") String cbUrl, - * - * @RequestParam("webSubHubUrl") String webSubHubUrl) { - * - * //String websubSecret = - * "{cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5"; - * //String topic="mpartner-default-print/CREDENTIAL_ISSUED"; - * - * SubscriptionChangeRequest subscriptionRequest = new - * SubscriptionChangeRequest(); subscriptionRequest.setCallbackURL(cbUrl); - * subscriptionRequest.setHubURL(webSubHubUrl + "/hub"); - * subscriptionRequest.setSecret(websubSecret); - * subscriptionRequest.setTopic(topic); SubscriptionChangeResponse resp = - * sb.subscribe(subscriptionRequest); return resp.getTopic(); //return request; - * - * } - * - * - * } - * - * - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +//import java.io.ByteArrayInputStream; +//import java.util.HashMap; +//import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +//import org.springframework.core.io.InputStreamResource; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.kernel.core.websub.spi.SubscriptionClient; +import io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; +//import io.mosip.kernel.websub.api.annotation.PreAuthenticateContentAndVerifyIntent; +import io.mosip.kernel.websub.api.model.SubscriptionChangeRequest; +import io.mosip.kernel.websub.api.model.SubscriptionChangeResponse; +import io.mosip.kernel.websub.api.model.UnsubscriptionRequest; +import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; +import io.mosip.testrig.dslrig.packetcreator.dto.webSubEventModel; +import io.mosip.testrig.dslrig.packetcreator.service.CryptoCoreUtil; +import io.swagger.v3.oas.annotations.tags.Tag; + + +@RequestMapping(value = "/print") +@RestController +@Tag(name = "PrintController", description = "REST APIs for Websub subscription client") +public class PrintController { + + SubscriptionClient sb; + @Autowired + CryptoCoreUtil cryptoCoreUtil; + + @Value("${mosip.test.print.topic}") + private String topic; + + @Value("${mosip.test.print.event.secret}") + private String websubSecret; + + //@Value("${mosip.test.temp}") + private String tempPath; + + private static final Logger logger = LoggerFactory.getLogger(preRegController.class); + + @PostMapping(value = "/print/callback",consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @PreAuthenticateContentAndVerifyIntent(secret = "${mosip.test.print.event.secret}", + callback = "/print/print/callback",topic = "${mosip.test.print.topic}") + public ResponseEntity printPost(@RequestBody webSubEventModel eventModel, + @PathVariable("contextKey") String contextKey) throws Exception { + + logger.info("Print callback fired"); + String credential = eventModel.getEvent().getData().get("credential").toString(); + String ecryptionPin = eventModel.getEvent().getData().get("protectionKey").toString(); + String decodedCrdential = cryptoCoreUtil.decrypt(credential); + logger.info(decodedCrdential); + saveCreds(decodedCrdential,contextKey); + return new ResponseEntity<>("successfully printed", HttpStatus.OK); + } + + private void saveCreds(String creds,String contextKey) { + File credsPath = new File(VariableManager.getVariableValue(contextKey,"mountPath").toString()+VariableManager.getVariableValue(contextKey,"mosip.test.temp").toString() + "/creds/"); + if (!credsPath.exists()){ + credsPath.mkdirs(); + } + JSONObject jsonCred = new JSONObject(creds); + String fileName = credsPath.getAbsolutePath() + "/"+ jsonCred.getJSONObject("credentialSubject").getString("UIN") + ".cred"; + + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileName))){ + + + writer.write(creds); + writer.close(); + + } catch (IOException e) { + logger.error(e.getMessage()); + } + + + } + private String getSignature(String sign, String crdential) { + String signHeader = sign.split("\\.")[0]; + String signData = sign.split("\\.")[2]; + String signature = signHeader + "." + crdential + "." + signData; + return signature; + } + + + @PostMapping(value = "/print/register/{callbackurl}") + public @ResponseBody String registerPrintSubscription(@RequestBody String request, + @RequestParam("callbackurl") String cbUrl, + @RequestParam("webSubHubUrl") String webSubHubUrl) { + + //String websubSecret = "{cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5"; + //String topic="mpartner-default-print/CREDENTIAL_ISSUED"; + + SubscriptionChangeRequest subscriptionRequest = new SubscriptionChangeRequest(); + subscriptionRequest.setCallbackURL(cbUrl); + subscriptionRequest.setHubURL(webSubHubUrl + "/hub"); + subscriptionRequest.setSecret(websubSecret); + subscriptionRequest.setTopic(topic); + SubscriptionChangeResponse resp = sb.subscribe(subscriptionRequest); + return resp.getTopic(); + //return request; + + } + + +} + + diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/RestartController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/RestartController.java index 4194d1d29..f28dd1de1 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/RestartController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/RestartController.java @@ -1,27 +1,23 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * import org.springframework.web.bind.annotation.PostMapping; import - * org.springframework.web.bind.annotation.RestController; - * - * import io.mosip.testrig.dslrig.packetcreator.MosipPacketCreatorApplication; - * import io.swagger.v3.oas.annotations.Operation; import - * io.swagger.v3.oas.annotations.responses.ApiResponse; import - * io.swagger.v3.oas.annotations.responses.ApiResponses; import - * io.swagger.v3.oas.annotations.tags.Tag; - * - * @RestController - * - * @Tag(name = "preRegController", description = - * "REST APIs for Pre Registration") public class RestartController { - * - * @Operation(summary = "Restart the packet creator application") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully restarted the packet creator application") }) - * - * @PostMapping("/restart") public void restart() { - * MosipPacketCreatorApplication.restart(); } } - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.testrig.dslrig.packetcreator.MosipPacketCreatorApplication; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@RestController +@Tag(name = "preRegController", description = "REST APIs for Pre Registration") +public class RestartController { + + @Operation(summary = "Restart the packet creator application") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully restarted the packet creator application") }) + @PostMapping("/restart") + public void restart() { + MosipPacketCreatorApplication.restart(); + } +} diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SchemaManagerController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SchemaManagerController.java index 830462f21..1141e54db 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SchemaManagerController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SchemaManagerController.java @@ -1,70 +1,73 @@ -/* - * package io.mosip.testrig.dslrig.packetcreator.controller; - * - * import org.slf4j.Logger; import org.slf4j.LoggerFactory; import - * org.springframework.beans.factory.annotation.Autowired; import - * org.springframework.beans.factory.annotation.Value; import - * org.springframework.web.bind.annotation.GetMapping; import - * org.springframework.web.bind.annotation.PathVariable; import - * org.springframework.web.bind.annotation.PutMapping; import - * org.springframework.web.bind.annotation.RequestParam; import - * org.springframework.web.bind.annotation.ResponseBody; import - * org.springframework.web.bind.annotation.RestController; - * - * import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; - * import io.mosip.testrig.dslrig.packetcreator.service.SchemaManagerService; - * import io.swagger.v3.oas.annotations.Operation; import - * io.swagger.v3.oas.annotations.responses.ApiResponse; import - * io.swagger.v3.oas.annotations.responses.ApiResponses; import - * io.swagger.v3.oas.annotations.tags.Tag; - * - * @RestController - * - * @Tag(name = "SchemaManagerController", description = - * "REST API for managing IDschemas") public class SchemaManagerController { - * - * @Value("${mosip.test.persona.configpath}") private String personaConfigPath; - * - * @Autowired SchemaManagerService schemaManagerService; - * - * private static final Logger logger = - * LoggerFactory.getLogger(SchemaManagerController.class); - * - * @Operation(summary = "Modify the schema") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Successfully modified the schema") }) - * - * @PutMapping(value = "/schema/{id}/{contextKey}") public @ResponseBody String - * modifySchema(@PathVariable("id") String id, - * - * @RequestParam(value = "version", defaultValue = "1") String version, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } return - * schemaManagerService.modifySchema(1, id, contextKey); } catch (Exception ex) - * { logger.error("modifySchema", ex); } - * - * return "{\"Failed\"}"; } - * - * @Operation(summary = "Get the schema") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Successfully retrived the schema") }) - * - * @GetMapping(value = "/schema/{contextKey}") public @ResponseBody String - * getSchema(@PathVariable("contextKey") String contextKey) { - * - * int i; String schema; try { if (personaConfigPath != null && - * !personaConfigPath.equals("")) { DataProviderConstants.RESOURCE = - * personaConfigPath; } - * - * schema = schemaManagerService.getSchema(contextKey); return schema; - * - * } catch (Exception e) { logger.error("getSchema", e); return "{\"Failed\"}"; - * } } - * - * } - */ \ No newline at end of file +package io.mosip.testrig.dslrig.packetcreator.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; +import io.mosip.testrig.dslrig.packetcreator.service.SchemaManagerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@RestController +@Tag(name = "SchemaManagerController", description = "REST API for managing IDschemas") +public class SchemaManagerController { + + @Value("${mosip.test.persona.configpath}") + private String personaConfigPath; + + @Autowired + SchemaManagerService schemaManagerService; + + private static final Logger logger = LoggerFactory.getLogger(SchemaManagerController.class); + + @Operation(summary = "Modify the schema") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully modified the schema") }) + @PutMapping(value = "/schema/{id}/{contextKey}") + public @ResponseBody String modifySchema(@PathVariable("id") String id, + @RequestParam(value = "version", defaultValue = "1") String version, + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return schemaManagerService.modifySchema(1, id, contextKey); + } catch (Exception ex) { + logger.error("modifySchema", ex); + } + + return "{\"Failed\"}"; + } + + @Operation(summary = "Get the schema") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully retrived the schema") }) + @GetMapping(value = "/schema/{contextKey}") + public @ResponseBody String getSchema(@PathVariable("contextKey") String contextKey) { + + int i; + String schema; + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + + schema = schemaManagerService.getSchema(contextKey); + return schema; + + } catch (Exception e) { + logger.error("getSchema", e); + return "{\"Failed\"}"; + } + } + +} diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SimpleService.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SimpleService.java index c95048a67..0c59fd6bc 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SimpleService.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/SimpleService.java @@ -5,25 +5,26 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; + @Service public class SimpleService { - Logger logger = LoggerFactory.getLogger(SimpleService.class); + Logger logger = LoggerFactory.getLogger(SimpleService.class); - @Value("${mosip.test.regclient.store:/home/sasikumar/Documents/MOSIP/packetcreator}") - private String finalDestination; + @Value("${mosip.test.regclient.store:/home/sasikumar/Documents/MOSIP/packetcreator}") + private String finalDestination; - // @Value("${mosip.test.packet.template.location:/home/sasikumar/Documents/MOSIP/template}") - @Value("${mosip.test.welcome}") - private String templateFolder; + //@Value("${mosip.test.packet.template.location:/home/sasikumar/Documents/MOSIP/template}") + @Value("${mosip.test.welcome}") + private String templateFolder; - @Value("${mosip.test.packet.template.source:REGISTRATION_CLIENT}") - private String src; + @Value("${mosip.test.packet.template.source:REGISTRATION_CLIENT}") + private String src; - @Value("${mosip.test.packet.template.process:NEW}") - private String process; + @Value("${mosip.test.packet.template.process:NEW}") + private String process; - public String getWelcomeMessage() { + public String getWelcomeMessage(){ - return templateFolder; - } + return templateFolder; + } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/TestDataController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/TestDataController.java index e47cb7f59..9dcdda65f 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/TestDataController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/TestDataController.java @@ -1,13 +1,35 @@ package io.mosip.testrig.dslrig.packetcreator.controller; +import java.util.Base64; +import java.util.HashMap; +import java.util.Properties; + import org.jobrunr.scheduling.JobScheduler; +import org.jobrunr.scheduling.cron.Cron; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import io.mosip.testrig.dslrig.dataprovider.util.DataProviderConstants; +import io.mosip.testrig.dslrig.dataprovider.util.RestClient; +import io.mosip.testrig.dslrig.dataprovider.variables.VariableManager; +import io.mosip.testrig.dslrig.packetcreator.dto.PacketCreateDto; +import io.mosip.testrig.dslrig.packetcreator.dto.PersonaRequestDto; +import io.mosip.testrig.dslrig.packetcreator.dto.PreRegisterRequestDto; +import io.mosip.testrig.dslrig.packetcreator.dto.RidSyncReqRequestDto; +import io.mosip.testrig.dslrig.packetcreator.dto.RidSyncReqResponseDTO; +import io.mosip.testrig.dslrig.packetcreator.dto.SyncRidDto; import io.mosip.testrig.dslrig.packetcreator.service.APIRequestUtil; import io.mosip.testrig.dslrig.packetcreator.service.ContextUtils; import io.mosip.testrig.dslrig.packetcreator.service.CryptoUtil; @@ -15,6 +37,9 @@ import io.mosip.testrig.dslrig.packetcreator.service.PacketMakerService; import io.mosip.testrig.dslrig.packetcreator.service.PacketSyncService; import io.mosip.testrig.dslrig.packetcreator.service.PreregSyncService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; @RestController @@ -63,104 +88,322 @@ public TestDataController(@Lazy PacketSyncService packetSyncService, @Lazy Packe this.packetJobService = packetJobService; } - /* - * @Operation(summary = "Initialize the server context") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully created the server context") }) - * - * @PostMapping(value = "/servercontext/{contextKey}") public @ResponseBody - * String createServerContext(@RequestBody Properties contextProperties, - * - * @PathVariable("contextKey") String contextKey) { - * - * try { return contextUtils.createUpdateServerContext(contextProperties, - * contextKey); } catch (Exception ex) { logger.error("createServerContext", - * ex); return "{\"" + ex.getMessage() + "\"}"; } } - */ + @Operation(summary = "Create the server context") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully created the server context") }) + @PostMapping(value = "/servercontext/{contextKey}") + public @ResponseBody String createServerContext(@RequestBody Properties contextProperties, + @PathVariable("contextKey") String contextKey) { - /* - * @Operation(summary = "Get the API test data") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Successfully retrived the test data") }) - * - * @GetMapping(value = "/auth/{contextKey}") public @ResponseBody String - * getAPITestData(@PathVariable("contextKey") String contextKey) { return - * String.valueOf(apiUtil.initToken(contextKey)); } - */ + try { + return contextUtils.createUpdateServerContext(contextProperties, contextKey); + } catch (Exception ex) { + logger.error("createServerContext", ex); + return "{\"" + ex.getMessage() + "\"}"; + } + } - /* - * @Operation(summary = "Clear the token") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Token is cleared successfully") }) - * - * @GetMapping(value = "/clearToken/{contextKey}") public @ResponseBody String - * ClearToken(@PathVariable("contextKey") String contextKey) { - * VariableManager.setVariableValue(contextKey, "urlSwitched", true); return - * "Success"; // return String.valueOf(apiUtil.initToken()); } - */ + @Operation(summary = "Get the server context") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrived the server context") }) + @GetMapping(value = "/servercontext/{contextKey}") + public @ResponseBody Properties getServerContext(@PathVariable("contextKey") String contextKey) { + Properties bRet = null; + try { + bRet = contextUtils.loadServerContext(contextKey); + } catch (Exception ex) { + logger.error("createServerContext", ex); + } + return bRet; + } - /* - * @Operation(summary = "Sync the pre-registration data") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully synced the pre-registration data") }) - * - * @GetMapping(value = "/sync/{contextKey}") public @ResponseBody String - * syncPreregData(@PathVariable("contextKey") String contextKey) { try { - * pss.syncPrereg(contextKey); return "All Done!"; } catch (Exception exception) - * { logger.error("", exception); return exception.getMessage(); } } - */ + @Operation(summary = "Create the packet for the context") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully created the packet") }) + @PostMapping(value = "/packetcreator/{contextKey}") + public @ResponseBody String createPacket(@RequestBody PacketCreateDto packetCreateDto, + @PathVariable("contextKey") String contextKey) { + try { + return pkm.createContainer(packetCreateDto.getIdJsonPath(), packetCreateDto.getTemplatePath(), + packetCreateDto.getSource(), packetCreateDto.getProcess(), null, contextKey, true, + packetCreateDto.getAdditionalInfoReqId()); + } catch (Exception ex) { + logger.error("", ex); + } + return "Failed!"; + } - /* - * @Operation(summary = "Get the pre-registration data") - * - * @ApiResponses(value = { - * - * @ApiResponse(responseCode = "200", description = - * "Successfully retrived the pre-registration data") }) - * - * @GetMapping(value = "/sync/{preregId}/{contextKey}") public @ResponseBody - * String getPreregData(@PathVariable("preregId") String preregId, - * - * @PathVariable("contextKey") String contextKey) { try { return - * pss.downloadPreregPacket(preregId, contextKey); } catch (Exception exception) - * { logger.error("", exception); return "Failed"; } } - */ - /* - * @Operation(summary = "Encrypt the data") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Successfully encrypted the data") }) - * - * @GetMapping(value = "/encrypt/{contextKey}") public @ResponseBody String - * encryptData(@PathVariable("contextKey") String contextKey) throws Exception { - * return - * Base64.getUrlEncoder().encodeToString(cryptoUtil.encrypt("test".getBytes(), - * "referenceId", contextKey)); } - */ + @Operation(summary = "Get the API test data") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully retrived the test data") }) + @GetMapping(value = "/auth/{contextKey}") + public @ResponseBody String getAPITestData(@PathVariable("contextKey") String contextKey) { + return String.valueOf(apiUtil.initToken(contextKey)); + } + + @Operation(summary = "Clear the token") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Token is cleared successfully") }) + @GetMapping(value = "/clearToken/{contextKey}") + public @ResponseBody String ClearToken(@PathVariable("contextKey") String contextKey) { + VariableManager.setVariableValue(contextKey, "urlSwitched", true); + return "Success"; + // return String.valueOf(apiUtil.initToken()); + } + + @Operation(summary = "Sync the pre-registration data") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully synced the pre-registration data") }) + @GetMapping(value = "/sync/{contextKey}") + public @ResponseBody String syncPreregData(@PathVariable("contextKey") String contextKey) { + try { + pss.syncPrereg(contextKey); + return "All Done!"; + } catch (Exception exception) { + logger.error("", exception); + return exception.getMessage(); + } + } + + @Operation(summary = "Get the pre-registration data") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrived the pre-registration data") }) + @GetMapping(value = "/sync/{preregId}/{contextKey}") + public @ResponseBody String getPreregData(@PathVariable("preregId") String preregId, + @PathVariable("contextKey") String contextKey) { + try { + return pss.downloadPreregPacket(preregId, contextKey); + } catch (Exception exception) { + logger.error("", exception); + return "Failed"; + } + } + + @Operation(summary = "Encrypt the data") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully encrypted the data") }) + @GetMapping(value = "/encrypt/{contextKey}") + public @ResponseBody String encryptData(@PathVariable("contextKey") String contextKey) throws Exception { + return Base64.getUrlEncoder().encodeToString(cryptoUtil.encrypt("test".getBytes(), "referenceId", contextKey)); + } + + @Operation(summary = "Sync the RID") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "RID synced successfully") }) + @PostMapping(value = "/ridsync/{contextKey}") + public @ResponseBody String syncRid(@RequestBody SyncRidDto syncRidDto, + @PathVariable("contextKey") String contextKey) throws Exception { + + return packetSyncService.syncPacketRid(syncRidDto.getContainerPath(), syncRidDto.getName(), + syncRidDto.getSupervisorStatus(), syncRidDto.getSupervisorComment(), syncRidDto.getProcess(), + contextKey, syncRidDto.getAdditionalInfoReqId()); + } + + @Operation(summary = "RID sync request response") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "RID successfully synced with request response") }) + @PostMapping(value = "/ridsyncreq/{contextKey}") + public @ResponseBody RidSyncReqResponseDTO syncRidRequest(@RequestBody RidSyncReqRequestDto syncRidDto, + @PathVariable("contextKey") String contextKey) throws Exception { + + return packetSyncService.syncPacketRidRequest(syncRidDto.getContainerPath(), syncRidDto.getName(), + syncRidDto.getSupervisorStatus(), syncRidDto.getSupervisorComment(), syncRidDto.getProcess(), + contextKey, syncRidDto.getAdditionalInfoReqId()); + } + + @Operation(summary = "Sync the packet") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully synced the packet") }) + @PostMapping(value = "/packetsync/{contextKey}") + public @ResponseBody String packetsync(@RequestBody PreRegisterRequestDto path, + @PathVariable("contextKey") String contextKey) throws Exception { + try { + return packetSyncService.uploadPacket(path.getPersonaFilePath().get(0), contextKey); + } catch (Exception e) { + // We need to explicitly catch the exception to handle negative scenarios , + // where packet sync is expected to fail + return e.getMessage(); + } + } + + @Operation(summary = "Start the job") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Job is started successfully") }) + @GetMapping(value = "/startjob/{contextKey}") + public @ResponseBody String startJob(@PathVariable("contextKey") String contextKey) { + String response = jobScheduler.scheduleRecurrently(() -> packetJobService.execute(contextKey), + Cron.every5minutes()); + return response; + } + + @Operation(summary = "Make the packet and sync it") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrived the packet and synced") }) + @GetMapping(value = "/makepacketandsync/{preregId}/{getRidFromSync}/{contextKey}") + public @ResponseBody String makePacketAndSync(@PathVariable("preregId") String preregId, + @PathVariable("getRidFromSync") boolean getRidFromSync, + + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + + return packetSyncService.makePacketAndSync(preregId, null, null, contextKey, null, getRidFromSync, true) + .toString(); + + } catch (Exception ex) { + logger.error("makePacketAndSync", ex); + } + return "{Failed}"; + } + + @Operation(summary = "Generate the resident data") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully generated the resident data") }) + @PostMapping(value = "/resident/{count}/{contextKey}") + public @ResponseBody String generateResidentData(@RequestBody PersonaRequestDto residentRequestDto, + @PathVariable("count") int count, @PathVariable("contextKey") String contextKey) { + + try { + RestClient.logInfo(contextKey, "Persona Config Path=" + personaConfigPath); + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + if (personaAnguliPath != null && !personaAnguliPath.equals("")) { + DataProviderConstants.ANGULI_PATH = personaAnguliPath; + } + RestClient.logInfo(contextKey, "personaAnguliPath =" + DataProviderConstants.ANGULI_PATH); + + RestClient.logInfo(contextKey, "Resource Path=" + DataProviderConstants.RESOURCE); + // logger.info("DOC_Template Path="+ + // VariableManager.getVariableValue(contextKey,"mosip.test.persona.documentsdatapath").toString()); + + // clear all tokens + // VariableManager.setVariableValue("urlSwitched", "true"); + + return packetSyncService.generateResidentData(count, residentRequestDto, contextKey).toString(); + + } catch (Exception ex) { + logger.error("generateResidentData", ex); + return "{\"" + ex.getMessage() + "\"}"; + } + } + + @Operation(summary = "Update the resident data") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Resident data is successfully updated") }) + @PostMapping(value = "/updateresident/{contextKey}") + public @ResponseBody String updateResidentData(@RequestBody PersonaRequestDto personaRequestDto, + // @PathVariable("id") int id, + @RequestParam(name = "UIN", required = false) String uin, + @RequestParam(name = "RID", required = false) String rid, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + // String uin = ""; + // String rid = "1234567890"; + return packetSyncService.updateResidentData(personaRequestDto.getRequests(), uin, rid, contextKey); + + } catch (Exception ex) { + logger.error("registerResident", ex); + } + return "{Failed}"; + + } + + @Operation(summary = "Pre-registering the resident") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully pre-registered the resident") }) + @PostMapping(value = "/preregister/{contextKey}") + public @ResponseBody String preRegisterResident(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.preRegisterResident(preRegisterRequestDto.getPersonaFilePath(), contextKey); + + } catch (Exception ex) { + logger.error("registerResident", ex); + } + return "{Failed}"; + } /* - * @Operation(summary = "Start the job") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "Job is started successfully") }) - * - * @GetMapping(value = "/startjob/{contextKey}") public @ResponseBody String - * startJob(@PathVariable("contextKey") String contextKey) { String response = - * jobScheduler.scheduleRecurrently(() -> packetJobService.execute(contextKey), - * Cron.every5minutes()); return response; } + * to : email | mobile */ + @Operation(summary = "Requesting the OTP") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OTP requested successfully") }) + @PostMapping(value = "/requestotp/{to}/{contextKey}") + public @ResponseBody String requestOtp(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("to") String to, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.requestOtp(preRegisterRequestDto.getPersonaFilePath(), to, contextKey); + + } catch (Exception ex) { + logger.error("requestOtp", ex); + } + return "{Failed}"; + } + + @Operation(summary = "Verifying the OTP") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OTP verified successfully") }) + @PostMapping(value = "/verifyotp/{to}/{contextKey}") + public @ResponseBody String verifyOtp(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("to") String to, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.verifyOtp(preRegisterRequestDto.getPersonaFilePath().get(0), to, null, contextKey); + + } catch (Exception ex) { + logger.error("verifyOtp", ex); + } + return "{Failed}"; + } /* - * to : email | mobile + * Book first nn th available slot */ + @Operation(summary = "Booking the Appointment for a given pre-registration-Id") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Appointment booked successfully") }) + @PostMapping(value = "/bookappointment/{preregid}/{nthSlot}/{contextKey}") + public @ResponseBody String bookAppointment(@PathVariable("preregid") String preregId, + @PathVariable("nthSlot") int nthSlot, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.bookAppointment(preregId, nthSlot, contextKey); + + } catch (Exception ex) { + logger.error("bookAppointment", ex); + } + return "{\"Failed\"}"; + } + + @Operation(summary = "Uploading the document for a given pre-registration-Id") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Document uploaded successfully") }) + @PostMapping(value = "/documents/{preregid}/{contextKey}") + public @ResponseBody String uploadDocuments(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("preregid") String preregId, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.uploadDocuments(preRegisterRequestDto.getPersonaFilePath().get(0), preregId, + contextKey); + + } catch (Exception ex) { + logger.error("uploadDocuments", ex); + } + return "{\"Failed\"}"; + } // @PostMapping(value = "/packet/{process}/{outFolderPath}/{contextKey}") // public @ResponseBody String createPackets(@RequestBody PreRegisterRequestDto preRegisterRequestDto, @@ -184,5 +427,76 @@ public TestDataController(@Lazy PacketSyncService packetSyncService, @Lazy Packe * Download from pre-reg, merge with the given packet template and upload to * register */ + @Operation(summary = "Registering for a given pre-registration-Id") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully registered for pre-registration") }) + @PostMapping(value = "/packet/sync/{preregId}/{getRidFromSync}/{genarateValidCbeff}/{contextKey}") + public @ResponseBody String preRegToRegister(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("preregId") String preregId, @PathVariable("getRidFromSync") boolean getRidFromSync, + @PathVariable("genarateValidCbeff") boolean genarateValidCbeff, + @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + if (preRegisterRequestDto.getPersonaFilePath().size() == 0) { + return "{\"Missing Template\"}"; + } + String personaPath = null; + if (preRegisterRequestDto.getPersonaFilePath().size() > 1) { + personaPath = preRegisterRequestDto.getPersonaFilePath().get(1); + } + + RestClient.logInfo(contextKey, "packet-Sync: personaPath=" + (personaPath == null ? "N/A" : personaPath)); + RestClient.logInfo(contextKey, + "packet-Sync: TemplatePath=" + preRegisterRequestDto.getPersonaFilePath().get(0)); + + return packetSyncService.preRegToRegister(preRegisterRequestDto.getPersonaFilePath().get(0), preregId, + personaPath, contextKey, preRegisterRequestDto.getAdditionalInfoReqId(), getRidFromSync, + genarateValidCbeff); + + } catch (Exception ex) { + logger.error("createPacket", ex); + return ex.getMessage(); + } + } + + @Operation(summary = "Delete Booking appointment for a given pre-registration-Id") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully deleted the appointment") }) + @DeleteMapping(value = "/preregistration/v1/applications/appointment/{contextKey}") + public @ResponseBody String deleteAppointment(@RequestParam(name = "preRegistrationId") String preregId, + @PathVariable("contextKey") String contextKey) { + HashMap map = new HashMap(); + map.put("preRegistrationId", preregId); + return packetSyncService.discardBooking(map, contextKey); + + } + + @Operation(summary = "Update appointment for a given PreRegID") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully updated the appointment") }) + @PutMapping(value = "/preregistration/v1/applications/appointment/{preregid}/{contextKey}") + public @ResponseBody String updateAppointment(@PathVariable("preregid") String preregid, + @PathVariable("contextKey") String contextKey) { + try { + + return packetSyncService.updatePreRegAppointment(preregid, contextKey); + + } catch (Exception ex) { + logger.error("registerResident", ex); + } + return "{Failed}"; + } + + @Operation(summary = "Discard Applications for a given pre-registration-Id") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully discarded the application") }) + @DeleteMapping(value = "/preregistration/v1/applications/{preregid}/{contextKey}") + public @ResponseBody String discardApplication(@PathVariable("preregid") String preregId, + @PathVariable("contextKey") String contextKey) { + + return packetSyncService.deleteApplication(preregId, contextKey); + + } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/preRegController.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/preRegController.java index 027b36470..8fe5fd338 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/preRegController.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/controller/preRegController.java @@ -1,7 +1,5 @@ package io.mosip.testrig.dslrig.packetcreator.controller; -import java.util.HashMap; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -158,66 +156,6 @@ public preRegController(@Lazy PacketSyncService packetSyncService) { } return "{Failed}"; } - - /* - * @Operation(summary = "Requesting the OTP") - * - * @ApiResponses(value = { @ApiResponse(responseCode = "200", description = - * "OTP requested successfully") }) - * - * @PostMapping(value = "/requestotp/{to}/{contextKey}") public @ResponseBody - * String requestOtp(@RequestBody PreRegisterRequestDto preRegisterRequestDto, - * - * @PathVariable("to") String to, @PathVariable("contextKey") String contextKey) - * { - * - * try { if (personaConfigPath != null && !personaConfigPath.equals("")) { - * DataProviderConstants.RESOURCE = personaConfigPath; } return - * packetSyncService.requestOtp(preRegisterRequestDto.getPersonaFilePath(), to, - * contextKey); - * - * } catch (Exception ex) { logger.error("requestOtp", ex); } return "{Failed}"; - * } - */ - - @Operation(summary = "Verifying the OTP") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OTP verified successfully") }) - @PostMapping(value = "/verifyotp/{to}/{contextKey}") - public @ResponseBody String verifyOtp(@RequestBody PreRegisterRequestDto preRegisterRequestDto, - @PathVariable("to") String to, @PathVariable("contextKey") String contextKey) { - - try { - if (personaConfigPath != null && !personaConfigPath.equals("")) { - DataProviderConstants.RESOURCE = personaConfigPath; - } - return packetSyncService.verifyOtp(preRegisterRequestDto.getPersonaFilePath().get(0), to, null, contextKey); - - } catch (Exception ex) { - logger.error("verifyOtp", ex); - } - return "{Failed}"; - } - - /* - * Book first nn th available slot - */ - @Operation(summary = "Booking the Appointment for a given pre-registration-Id") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Appointment booked successfully") }) - @PostMapping(value = "/bookappointment/{preregid}/{nthSlot}/{contextKey}") - public @ResponseBody String bookAppointment1(@PathVariable("preregid") String preregId, - @PathVariable("nthSlot") int nthSlot, @PathVariable("contextKey") String contextKey) { - - try { - if (personaConfigPath != null && !personaConfigPath.equals("")) { - DataProviderConstants.RESOURCE = personaConfigPath; - } - return packetSyncService.bookAppointment(preregId, nthSlot, contextKey); - - } catch (Exception ex) { - logger.error("bookAppointment", ex); - } - return "{\"Failed\"}"; - } /* * Book first nn th available slot @@ -301,6 +239,25 @@ public preRegController(@Lazy PacketSyncService packetSyncService) { return "{\"Failed\"}"; } + @Operation(summary = "Upload documents for a given pre-registration-Id from specified persona") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully uploaded the documents") }) + @PostMapping(value = "/documents/{preregid}/{contextKey}") + public @ResponseBody String uploadDocuments(@RequestBody PreRegisterRequestDto preRegisterRequestDto, + @PathVariable("preregid") String preregId, @PathVariable("contextKey") String contextKey) { + + try { + if (personaConfigPath != null && !personaConfigPath.equals("")) { + DataProviderConstants.RESOURCE = personaConfigPath; + } + return packetSyncService.uploadDocuments(preRegisterRequestDto.getPersonaFilePath().get(0), preregId, + contextKey); + + } catch (Exception ex) { + logger.error("uploadDocuments", ex); + } + return "{\"Failed\"}"; + } + @Operation(summary = "Cancel appointment for a given pre-registration-Id") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully cancelled the appointment") }) @@ -348,61 +305,5 @@ public preRegController(@Lazy PacketSyncService packetSyncService) { } return "{Failed}"; } - - @Operation(summary = "Uploading the document for a given pre-registration-Id") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Document uploaded successfully") }) - @PostMapping(value = "/documents/{preregid}/{contextKey}") - public @ResponseBody String uploadDocuments(@RequestBody PreRegisterRequestDto preRegisterRequestDto, - @PathVariable("preregid") String preregId, @PathVariable("contextKey") String contextKey) { - - try { - if (personaConfigPath != null && !personaConfigPath.equals("")) { - DataProviderConstants.RESOURCE = personaConfigPath; - } - return packetSyncService.uploadDocuments(preRegisterRequestDto.getPersonaFilePath().get(0), preregId, - contextKey); - - } catch (Exception ex) { - logger.error("uploadDocuments", ex); - } - return "{\"Failed\"}"; - } - - @Operation(summary = "Delete Booking appointment for a given pre-registration-Id") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully deleted the appointment") }) - @DeleteMapping(value = "/preregistration/v1/applications/appointment/{contextKey}") - public @ResponseBody String deleteAppointment(@RequestParam(name = "preRegistrationId") String preregId, - @PathVariable("contextKey") String contextKey) { - HashMap map = new HashMap(); - map.put("preRegistrationId", preregId); - return packetSyncService.discardBooking(map, contextKey); - - } - - @Operation(summary = "Update appointment for a given PreRegID") - @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successfully updated the appointment") }) - @PutMapping(value = "/preregistration/v1/applications/appointment/{preregid}/{contextKey}") - public @ResponseBody String updateAppointment(@PathVariable("preregid") String preregid, - @PathVariable("contextKey") String contextKey) { - try { - - return packetSyncService.updatePreRegAppointment(preregid, contextKey); - - } catch (Exception ex) { - logger.error("registerResident", ex); - } - return "{Failed}"; - } - - @Operation(summary = "Discard Applications for a given pre-registration-Id") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Successfully discarded the application") }) - @DeleteMapping(value = "/preregistration/v1/applications/{preregid}/{contextKey}") - public @ResponseBody String discardApplication(@PathVariable("preregid") String preregId, - @PathVariable("contextKey") String contextKey) { - - return packetSyncService.deleteApplication(preregId, contextKey); - - } } diff --git a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/service/PacketSyncService.java b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/service/PacketSyncService.java index ec41dbc0a..51a9102a3 100644 --- a/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/service/PacketSyncService.java +++ b/mosip-packet-creator/src/main/java/io/mosip/testrig/dslrig/packetcreator/service/PacketSyncService.java @@ -166,7 +166,7 @@ void loadServerContextProperties(String contextKey) { } } - public String generateResidentData( PersonaRequestDto residentRequestDto, String contextKey) { + public String generateResidentData(int count, PersonaRequestDto residentRequestDto, String contextKey) { logger.info(" Entered Persona generation at time: " + System.currentTimeMillis()); // TO do --Check why we need to load the context here // loadServerContextProperties(contextKey); @@ -177,7 +177,7 @@ public String generateResidentData( PersonaRequestDto residentRequestDto, String if (props.containsKey("Gender")) { enumGender = Gender.valueOf(props.get("Gender").toString()); // Gender.valueOf(residentRequestDto.getGender()); } -// provider.addCondition(ResidentAttribute.RA_Count, count); + provider.addCondition(ResidentAttribute.RA_Count, count); if (props.containsKey("Age")) { diff --git a/mosipTestDataProvider/pom.xml b/mosipTestDataProvider/pom.xml index 86816c765..7569ddd8d 100644 --- a/mosipTestDataProvider/pom.xml +++ b/mosipTestDataProvider/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.testrig.dslrig.dataprovider dslrig-dataprovider - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT 3.7.0.1746 @@ -49,7 +49,7 @@ io.mosip.kernel kernel-bom - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT pom import @@ -243,7 +243,7 @@ io.mosip.biometric.util biometrics-util - 1.2.1-SNAPSHOT + 1.2.1-java21-SNAPSHOT org.openpnp diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/ResidentDataProvider.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/ResidentDataProvider.java index 3cc572d9f..8e086e1bc 100644 --- a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/ResidentDataProvider.java +++ b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/ResidentDataProvider.java @@ -58,7 +58,7 @@ public class ResidentDataProvider { public ResidentDataProvider() { attributeList = new Properties(); - //attributeList.put(ResidentAttribute.RA_Count, 1); + attributeList.put(ResidentAttribute.RA_Count, 1); //attributeList.put(ResidentAttribute.RA_PRIMARAY_LANG, DataProviderConstants.LANG_CODE_ENGLISH); //attributeList.put(ResidentAttribute.RA_Country, "PHIL"); RestClient.clearToken(); @@ -73,7 +73,7 @@ public static ResidentModel genGuardian(Properties attributes,String contextKey) attributes.forEach( (k,v) ->{ attributeList.put(k, v); }); - //attributeList.put(ResidentAttribute.RA_Count, 1); + attributeList.put(ResidentAttribute.RA_Count, 1); attributeList.put(ResidentAttribute.RA_Age, ResidentAttribute.RA_Adult); attributeList.put(ResidentAttribute.RA_Gender, Gender.Any); @@ -209,7 +209,7 @@ public List generate(String contextKey) { List residents = new ArrayList(); - int count = 1; + int count = (int) attributeList.get(ResidentAttribute.RA_Count); Gender gender = (Gender) attributeList.get(ResidentAttribute.RA_Gender); String primary_lang = (String) attributeList.get(ResidentAttribute.RA_PRIMARAY_LANG); String sec_lang = (String) attributeList.get(ResidentAttribute.RA_SECONDARY_LANG); @@ -518,7 +518,7 @@ else if(age == ResidentAttribute.RA_Infant ) { public static void main(String[] args) throws Exception { ResidentDataProvider residentProvider = new ResidentDataProvider(); - residentProvider + residentProvider.addCondition(ResidentAttribute.RA_Count, 1) .addCondition(ResidentAttribute.RA_SECONDARY_LANG, "ara") .addCondition(ResidentAttribute.RA_Gender, Gender.Any) .addCondition(ResidentAttribute.RA_Age, ResidentAttribute.RA_Adult); diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/preparation/MosipMasterData.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/preparation/MosipMasterData.java index 14794cc27..8f21ea1c7 100644 --- a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/preparation/MosipMasterData.java +++ b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/preparation/MosipMasterData.java @@ -1129,7 +1129,8 @@ static Boolean validateCondn(String cndnexpr, Object inputObject) { static void testSchemaRule(String contextKey) { ResidentDataProvider residentProvider = new ResidentDataProvider(); - residentProvider.addCondition(ResidentAttribute.RA_SECONDARY_LANG, "ara") + residentProvider.addCondition(ResidentAttribute.RA_Count, 1) + .addCondition(ResidentAttribute.RA_SECONDARY_LANG, "ara") .addCondition(ResidentAttribute.RA_Gender, Gender.Any) .addCondition(ResidentAttribute.RA_Age, ResidentAttribute.RA_Adult) .addCondition(ResidentAttribute.RA_Finger, false); diff --git a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/util/ResidentAttribute.java b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/util/ResidentAttribute.java index 646afe0cc..12c1a560a 100644 --- a/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/util/ResidentAttribute.java +++ b/mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/util/ResidentAttribute.java @@ -1,6 +1,7 @@ package io.mosip.testrig.dslrig.dataprovider.util; public enum ResidentAttribute { + RA_Count , RA_PRIMARAY_LANG, RA_SECONDARY_LANG, RA_THIRD_LANG,