MOSIP-39301 updated kernel file and dbManager

uitest-pmp/src/main/java/io/mosip/testrig/pmpui/dbaccess/DBManager.java

@@ -1,5 +1,9 @@
 package io.mosip.testrig.pmpui.dbaccess;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -22,83 +26,78 @@
 
 import io.mosip.testrig.pmpui.kernel.util.ConfigManager;
 import io.mosip.testrig.pmpui.utility.BaseClass;
+import io.mosip.testrig.pmpui.utility.TestRunner;
 
 public class DBManager extends BaseClass {
-
 	private static Logger logger = Logger.getLogger(DBManager.class);
-
-	public static void clearPMSDbData() {
+	
+	public static void executeDBQueries(String dbURL, String dbUser, String dbPassword, String dbSchema, String dbQueryFile) {
 		Session session = null;
 		try {
-
-			logger.info("DB URL:: " + ConfigManager.getPMSDbUrl());
-			logger.info("DbUser:: " + ConfigManager.getPMSDbUser());
-			logger.info("DbPass:: " + ConfigManager.getPMSDbPass());
-			logger.info("DbSchema:: " + ConfigManager.getPMSDbSchema());
-			session = getDataBaseConnection(ConfigManager.getPMSDbUrl(), ConfigManager.getPMSDbUser(),
-					ConfigManager.getPMSDbPass(), ConfigManager.getPMSDbSchema());
+			session = getDataBaseConnection(dbURL, dbUser, dbPassword, dbSchema);
+			executeQueries(session, dbQueryFile);		
+		} catch (Exception e) {
+			logger.error("Error:: While executing DB Quiries." + e.getMessage());
+		} finally {
 			if (session != null) {
-				session.doWork((Work) new Work() {
-
+				session.close();
+			}
+		}
+	}
+
+	public static void executeQueries(Session session, String strQueriesFilePath) throws Exception {
+		if (session != null) {
+				session.doWork(new Work() {
 					@Override
 					public void execute(Connection connection) throws SQLException {
 						Statement statement = connection.createStatement();
-						// To Do --- Read the delete queries from a file and iterate
+						// Read the delete queries from a file and iterate
 						try {
-							;
-							statement.addBatch("delete from partner_policy_request where part_id like 'auth_v4%'");
-							statement.addBatch("delete from partner_policy  where part_id like 'auth_v4%'");
-							statement.addBatch("delete from partner  where name ='AUTH_V4'");
-							statement.addBatch("delete from partner_policy_request where part_id like 'credential_v1%'");
-							statement.addBatch("delete from partner_policy  where part_id like'credential_v1%'");
-							statement.addBatch("delete from partner  where name ='CREDENTIAL_V1'");
+							File file = new File(strQueriesFilePath);
+							FileReader fileReader = null;
+							BufferedReader bufferedReader = null;
+							try {
+								fileReader = new FileReader(file);
+								bufferedReader = new BufferedReader(fileReader);
+								String line;
+								while ((line = bufferedReader.readLine()) != null) {
+									if (line.trim().equals("") || line.trim().startsWith("#"))
+										continue;
+									statement.addBatch(line);
+								}
+							} catch (IOException e) {
+								logger.error("Error while executing db queries for ::" + e.getMessage());
+							} finally {
+								closeBufferedReader(bufferedReader);
+								closeFileReader(fileReader);
+							}
 							int[] result = statement.executeBatch();
-							logger.info("Success:: Executed PMS DB quiries successfully.");
+							System.out.println("Success:: Executed DB quiries successfully.");
 							for (int i : result) {
-								logger.info("PMS db deleted records: " + i);
+								System.out.println("deleted records: " + i);
 							}
 						} finally {
 							statement.close();
 						}
-
 					}
-
 				});
 			}
-		} catch (Exception e) {
-			logger.error("Error:: While executing MASTER DB Quiries." + e.getMessage());
-		} finally {
-			if (session != null) {
-				session.close();
-			}
-		}
-
 	}
-
-	private static Session getDataBaseConnection(String dburl, String userName, String password, String schema) {
+	public static Session getDataBaseConnection(String dburl, String userName, String password, String schema) {
 		SessionFactory factory = null;
 		Session session = null;
-
-		logger.info("dburl is" + dburl);
-		logger.info("userName is" + userName);
-		logger.info("password is" + password);
-
-
+		logger.info("dburl : " + dburl + " userName : " + userName + " password : " + password);
 		try {
 			Configuration config = new Configuration();
 			config.setProperty(Environment.DRIVER, ConfigManager.getDbDriverClass());
 			config.setProperty(Environment.URL, dburl);
-			logger.info("dburl is" + dburl);
 			config.setProperty(Environment.USER, userName);
-			logger.info("userName is" + userName);
 			config.setProperty(Environment.PASS, password);
-			logger.info("password is" + password);
 			config.setProperty(Environment.DEFAULT_SCHEMA, schema);
 			config.setProperty(Environment.POOL_SIZE, ConfigManager.getDbConnectionPoolSize());
 			config.setProperty(Environment.DIALECT, ConfigManager.getDbDialect());
 			config.setProperty(Environment.SHOW_SQL, ConfigManager.getShowSql());
 			config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, ConfigManager.getDbSessionContext());
-
 			factory = config.buildSessionFactory();
 			session = factory.getCurrentSession();
 			session.beginTransaction();
@@ -107,6 +106,32 @@ private static Session getDataBaseConnection(String dburl, String userName, Stri
 		}
 		return session;
 	}
-
+
+	public static void closeBufferedReader(BufferedReader bufferedReader) {
+		if (bufferedReader != null) {
+			try {
+				bufferedReader.close();
+			} catch (IOException e) {
+				logger.error("Exception " + e.getMessage());
+			}
+		}
+	}
+
+	public static void closeFileReader(FileReader fileReader) {
+		if (fileReader != null) {
+			try {
+				fileReader.close();
+			} catch (IOException e) {
+				logger.error("Exception " + e.getMessage());
+			}
+		}
+	}
+
+
+	 public static void ClearPmsDbData() {
+			DBManager.executeDBQueries(ConfigManager.getPMSDbUrl(), ConfigManager.getPMSDbUser(),
+					ConfigManager.getPMSDbPass(), ConfigManager.getPMSDbSchema(),
+					TestRunner.getResourcePath() + "\\" + "config\\partnerRevampDataDeleteQueries.txt");
+	 }
 }
 

uitest-pmp/src/main/java/io/mosip/testrig/pmpui/fw/util/AdminTestUtil.java

@@ -20,6 +20,7 @@
 
 import io.mosip.testrig.pmpui.authentication.fw.precon.JsonPrecondtion;
 import io.mosip.testrig.pmpui.authentication.fw.util.RestClient;
+import io.mosip.testrig.pmpui.dbaccess.DBManager;
 import io.mosip.testrig.pmpui.kernel.util.ConfigManager;
 import io.mosip.testrig.pmpui.kernel.util.KernelAuthentication;
 import io.mosip.testrig.pmpui.kernel.util.KeycloakUserManager;
@@ -302,6 +303,7 @@ public static String UserMapping() {
 //			
 //	    	return "";
 //	    }
+
 	 public static void initialize() {
 		 String adminuser="";
 	    	if (initialized == false) {

uitest-pmp/src/main/java/io/mosip/testrig/pmpui/kernel/util/ConfigManager.java

@@ -143,9 +143,9 @@ public static void setProperty(String key, String value) {
 			propsKernel.setProperty(key, value);
 		}
 	}
-
+	
 	public static String getValueForKey(String key) {
-		String value = System.getenv(key) == null ? propsKernel.getProperty(key) : System.getenv(key);
+		String value = System.getProperty(key) == null ? propsKernel.getProperty(key) : System.getProperty(key);
 		setProperty(key, value);
 
 		return value;

uitest-pmp/src/main/java/io/mosip/testrig/pmpui/utility/TestRunner.java

@@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception {
 
 
 		AdminTestUtil.initialize();
-		DBManager.clearPMSDbData();
+		DBManager.ClearPmsDbData();
 
 		startTestRunner();
 	}
@@ -193,7 +193,7 @@ public static void startTestRunner() throws Exception {
 				+ "-run-" + System.currentTimeMillis() + "-report.html");
 
 		runner.run();
-		DBManager.clearPMSDbData();
+		DBManager.ClearPmsDbData();
 		System.exit(0);
 	}
 

uitest-pmp/src/main/resources/config/Kernel.properties

@@ -123,15 +123,15 @@ pmpscenariosToExecute=
 holidayDateCenter=27/12/2022
 holidayDate=12/27/2022
 preappend=00
-splitdigit=7
+splitdigit=8
 jsonObjName=identity
 bulkwait=10000
 sbivalidDate=12/27/2022
-sbiexpiryDate=12/27/2026
+sbiexpiryDate=12/27/2024
 policyData={\"authTokenType\":\"policy\",\"allowedKycAttributes\":[{\"attributeName\":\"fullName\"},{\"attributeName\":\"gender\"},{\"attributeName\":\"residenceStatus\"},{\"attributeName\":\"dateOfBirth\"},{\"attributeName\":\"photo\"},{\"attributeName\":\"civilRegistryNumber\"},{\"attributeName\":\"birthCertificateNumber\"},{\"attributeName\":\"flagidcs\"},{\"attributeName\":\"listCountry\"},{\"attributeName\":\"placeOfBirth\"},{\"attributeName\":\"flagb\"},{\"attributeName\":\"passportNumber\"},{\"attributeName\":\"referenceResidencyNumber\"},{\"attributeName\":\"resOuPass\"}],\"allowedAuthTypes\":[{\"authSubType\":\"IRIS\",\"authType\":\"bio\",\"mandatory\":false},{\"authSubType\":\"FINGER\",\"authType\":\"bio\",\"mandatory\":false},{\"authSubType\":\"\",\"authType\":\"otp\",\"mandatory\":false},{\"authSubType\":\"FACE\",\"authType\":\"bio\",\"mandatory\":false},{\"authSubType\":\"\",\"authType\":\"otp-request\",\"mandatory\":false},{\"authSubType\":\"\",\"authType\":\"kyc\",\"mandatory\":false},{\"authSubType\":\"\",\"authType\":\"demo\",\"mandatory\":false}]}
 dataSharepolicyData={\"shareableAttributes\":[{\"attributeName\":\"fullName\",\"source\":[{\"attribute\":\"fullName\"}],\"encrypted\":true},{\"attributeName\":\"dateOfBirth\",\"source\":[{\"attribute\":\"dateOfBirth\"}],\"encrypted\":true},{\"attributeName\":\"gender\",\"source\":[{\"attribute\":\"gender\"}],\"encrypted\":true},{\"attributeName\":\"residenceStatus\",\"source\":[{\"attribute\":\"residenceStatus\"}],\"encrypted\":true},{\"attributeName\":\"phone\",\"source\":[{\"attribute\":\"phone\"}],\"encrypted\":true},{\"attributeName\":\"email\",\"source\":[{\"attribute\":\"email\"}],\"encrypted\":true},{\"attributeName\":\"dualCitizenshipAvailability\",\"source\":[{\"attribute\":\"dualCitizenshipAvailability\"}],\"encrypted\":true},{\"attributeName\":\"fatherName\",\"source\":[{\"attribute\":\"fatherName\"}],\"encrypted\":true},{\"attributeName\":\"shortenedPrintedName\",\"source\":[{\"attribute\":\"shortenedPrintedName\"}],\"encrypted\":true},{\"attributeName\":\"layName\",\"source\":[{\"attribute\":\"layName\"}],\"encrypted\":true},{\"attributeName\":\"nationalIdentityNumber\",\"source\":[{\"attribute\":\"nationalIdentityNumber\"}],\"encrypted\":true},{\"attributeName\":\"permanentAddress\",\"source\":[{\"attribute\":\"permanentAddress\"}],\"encrypted\":true},{\"attributeName\":\"temporaryAddress\",\"source\":[{\"attribute\":\"temporaryAddress\"}],\"encrypted\":true},{\"attributeName\":\"addressLine1\",\"source\":[{\"attribute\":\"addressLine1\"}],\"encrypted\":true},{\"attributeName\":\"addressLine2\",\"source\":[{\"attribute\":\"addressLine2\"}],\"encrypted\":true},{\"attributeName\":\"addressLine3\",\"source\":[{\"attribute\":\"addressLine3\"}],\"encrypted\":true},{\"attributeName\":\"region\",\"source\":[{\"attribute\":\"region\"}],\"encrypted\":true},{\"attributeName\":\"province\",\"source\":[{\"attribute\":\"province\"}],\"encrypted\":true},{\"attributeName\":\"profession\",\"source\":[{\"attribute\":\"profession\"}],\"encrypted\":true},{\"attributeName\":\"city\",\"source\":[{\"attribute\":\"city\"}],\"encrypted\":true},{\"attributeName\":\"postalCode\",\"source\":[{\"attribute\":\"postalCode\"}],\"encrypted\":true},{\"attributeName\":\"zone\",\"source\":[{\"attribute\":\"zone\"}],\"encrypted\":true},{\"attributeName\":\"preferredLang\",\"source\":[{\"attribute\":\"preferredLang\"}],\"encrypted\":false},{\"attributeName\":\"individualBiometrics\",\"group\":\"CBEFF\",\"source\":[{\"attribute\":\"individualBiometrics\"}],\"encrypted\":true,\"format\":\"extraction\"}],\"dataSharePolicies\":{\"typeOfShare\":\"Data Share\",\"validForInMinutes\":\"30\",\"transactionsAllowed\":\"2\",\"encryptionType\":\"Partner Based\",\"shareDomain\":\"datashare.datashare\",\"source\":\"IDRepository\"}}
 publicKey=ZAEACwACAHIAIINxl2dEhLP4GpDMjUal1yT9UtduBlILZPKh2hszFGmqABAAFwALCAAAAQABAQDCHegKJ3vRn__8h1knXKiLA8qfO5LebzBlRO2tAcI3HvLyL9rPkVrXWYQ6wAn4VQk015C1hViU-7k752dYE5WUAUbgsxOHvvDPH1t72CNHNj9dyE86wGqR9AtK3yz0yf1IP_xgtWpiaQ2V9t2d3LtgPYWnRuPJbcl97nLXXL6PGfh1mRwsQUi94coEBPMZ9YLLOAFckPuDZt-lEcXIMkj8r0uNwAZUSEvGifTNWbLjC5BRlJBmvScIlptXqIwBaq2kSMVK2X1KbQ6TM8zkA_co4LEAIZfcpMgPn6RdW0yFtcx24HqrCY8v0DHregwoCPPpw8HvB-r5aR09mXG64zsJ
 signPublicKey=AAZABAAEAHIAAAAQABQACwgAAAEAAQEAr93rKokeZGIzcCtFX3iyCvwpmfnd9jz0nF__0bxWr0mH8Zs0rhlG6vKRagx31I4CdrLAECOwMZ0r7Y3utTqHqelQE3MJLtboKITOqYRpBkqHSm1jGaEb8a1E9yoJri3tZrBCrAShimrN_SbtS1uKbJUG3cuVuE0gtGLI1d5wMfS_4PSz3RwvZtGHisEb3zbV6SLcJkgcDeMbUD7P25SVJd1xrJybuGIgyeSZxOgLzy1P-qHCiOXiAO9o06fwyIhIYbeZYz5th4rq7Rb6mRK9EWFpLrLvBL0F6USiidl8qNCxxZZFUp3W5xFANVYfRvgLKI33zBYniZ7aTE8PgrYa2w
 headless=yes
 docker=yes
-langcode=[{"language":"tam","value":"தமிழà¯\uFFFD"},{"language":"kan","value":"à²\u2022ನà³\uFFFDನಡ"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Français"},{"language":"ara","value":"Arabic"}]
+langcode=[{"language":"tam","value":"\u0BA4\u0BAE\u0BBF\u0BB4\uFFFD\uFFFD"},{"language":"kan","value":"\uFFFD\u2022\u0CA8\uFFFD\uFFFD\u0CA8\u0CA1"},{"language":"hin","value":"hin"},{"language":"eng1","value":"English"},{"language":"eng","value":"English"},{"language":"fra","value":"Fran�ais"},{"language":"ara","value":"Arabic"}]

uitest-pmp/src/main/resources/config/partnerRevampDataDeleteQueries.txt

@@ -0,0 +1,12 @@
+#####  DB queries to be executed to tear down the data used and generated during the test rig run for partnerRevamp APIs
+
+delete from partner_policy_request where part_id like 'auth_v4%';
+delete from partner_policy  where part_id like 'auth_v4%';
+delete from pms.partner_policy where cr_by='pmpui-auto11';
+delete from pms.partner_policy_request where cr_by='pmpui-auto11';
+delete from pms.auth_policy where cr_by='pmpui-auto11';
+delete from pms.policy_group where cr_by='pmpui-auto11';
+delete from partner  where name ='AUTH_V4';
+delete from partner_policy_request where part_id like 'credential_v1%';
+delete from partner_policy  where part_id like'credential_v1%';
+delete from partner  where name ='CREDENTIAL_V1';

uitest-pmprevamp/entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 java --version
-java -jar pmprevampui-*-jar-with-dependencies.jar
+java -jar pmprevampui-*-jar-with-dependencies.jar