froth-webdriverio-framework 1.0.91 → 1.0.93

package/commonMethods/Utils.js

@@ -7,7 +7,7 @@ let scrollToLeft = null;
 let scrollToRight = null;
 let scrollDownToView = null;
 let scrollRightToView = null;
-let verifyText = null;
+let assertText = null;
 let connectToDB = null;
 if (process.env.LOCATION == 'local') {
 
@@ -19,7 +19,7 @@ if (process.env.LOCATION == 'local') {
     scrollToRight = require('./scrollToRight');
     scrollDownToView = require('./scrollDownToView');
     scrollRightToView = require('./scrollRightToView');
-    verifyText = require('./verifyText');
+    assertText = require('./assertText');
     connectToDB = require('./connectToDB');
 } else {
     scrollToEnd = require('froth-webdriverio-framework/commonMethods/scrollToEnd');
@@ -30,7 +30,7 @@ if (process.env.LOCATION == 'local') {
     scrollToRight = require('froth-webdriverio-framework/commonMethods/scrollToRight');
     scrollDownToView = require('froth-webdriverio-framework/commonMethods/scrollDownToView');
     scrollRightToView = require('froth-webdriverio-framework/commonMethods/scrollRightToView');
-    verifyText = require('froth-webdriverio-framework/commonMethods/verifyText');
+    assertText = require('froth-webdriverio-framework/commonMethods/assertText');
     connectToDB = require('froth-webdriverio-framework/commonMethods/connectToDB');
 }
 //export the variabels
@@ -43,6 +43,6 @@ module.exports = {
     scrollToRight,
     scrollDownToView,
     scrollRightToView,
-    verifyText, 
+    assertText, 
     connectToDB
 };

package/commonMethods/{verifyText.js → assertText.js}

@@ -1,5 +1,5 @@
 // Function to verify text in Android app
-async function verifyText(driver, elementSelector, expectedText) {
+async function assertText(driver, elementSelector, expectedText) {
  // try {
     // Wait for the element to be visible
     await driver.waitUntil(async () => {
@@ -25,6 +25,6 @@ async function verifyText(driver, elementSelector, expectedText) {
   // }
 }
 
-module.exports = verifyText;
+module.exports = assertText;
 
 

package/commonMethods/connectToDB.js

@@ -1,6 +1,7 @@
 
 const dbinfo = require('../api/getDBdetails');
-const dbconnect = require('../db/dbconnections');
+const mysqlconnect = require('../db/mysqlOperations');
+const postgreSqlConnect = require('../db/postgresOperations');
 const getLoginToken = require('../api/loginapi');
 // const { LocalStorage } = require('node-localstorage');
 // global.BUFFER = new LocalStorage('./storage');
@@ -8,22 +9,24 @@ const getLoginToken = require('../api/loginapi');
 async function connectToDB(id, querytype, query) {
   try {
     const jsondata = await dbinfo.getDbDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("LOGIN_TOKEN"), id);
-    let connectionpool = await dbtype(jsondata.database_type, jsondata);
-    let result = await executeQuery(querytype, query, connectionpool);
+    let connectionpool = await dbtype(jsondata);
+    let result = await executeQuery(jsondata.database_type,querytype, query, connectionpool);
     return result;
   } catch (error) {
     console.error('Error connectToDB', error);
   }
 }
 
-async function dbtype(type, jsondata) {
+async function dbtype(jsondata) {
   let connectionpool;
   try {
-    switch (type) {
+    switch (jsondata.database_type) {
       case 'MySQL':
-        connectionpool = dbconnect.connectTomysql(jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
+        connectionpool = mysqlconnect.connectToMySQL(jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
+        break;
+      case 'PostgreSQL':
+        connectionpool = postgreSqlConnect.connectToPostgreSQL(jsondata.database_type,jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
         break;
-
       default:
         console.log('Unknown dbtype.');
 
@@ -34,18 +37,22 @@ async function dbtype(type, jsondata) {
 }
 
 
-async function executeQuery(querytype, query, connectionpool) {
+async function executeQuery(datatype,querytype, query, connectionpool) {
   let finalResult;
   try {
     switch (querytype) {
       case 'select':
-        finalResult = dbconnect.fetchDataFromDB(connectionpool, query);
+        if (datatype === 'MySQL') {
+          finalResult = mysqlconnect.fetchDataFromDB(connectionpool, query);
+        }else if(datatype === 'PostgreSQL'){
+          finalResult = postgreSqlConnect.fetchDataFromPostgresDB(connectionpool, query);
+        }
         break;
       case 'insert':
-        connectionpool = dbconnect.connectTomysql(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
+       // connectionpool = mysqlconnect.connectTomysql(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
         break;
       case 'update':
-        connectionpool = dbconnect.connectTomysql(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
+       // connectionpool = postgreSqlConnect.fetchDataFromPostgresDB(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
         break;
       default:
         console.log('Unknown querytype.');

package/db/mysqlOperations.js

@@ -0,0 +1,73 @@
+const mysql = require('mysql2/promise');
+const { Pool } = require('pg');
+
+// Function to establish connection to MySQL database
+async function connectToMySQL(hostname, username, password, dbname, portnumber) {
+    try {
+        const poolConfig = {
+            host: hostname,
+            user: username,
+            password: password,
+            database: dbname,
+            port: portnumber,
+            waitForConnections: true,
+            connectionLimit: 10,
+            queueLimit: 0
+        };
+
+
+        let pool = mysql.createPool(poolConfig);
+        console.log('MySQL connection pool created.');
+        return pool;
+    } catch (error) {
+        console.error('Error creating MySQL connection pool:', error);
+        throw error;
+    }
+}
+
+
+// Function to fetch data from the database
+async function fetchDataFromDB(connectionpool, query) {
+    let connection = null;
+    let finalResult = null;
+    try {
+        console.log("connectionpool" + connectionpool)
+        connection = await connectionpool.getConnection();
+
+        console.log('Connected to the MySQL database.' + connection);
+
+        const [rows] = await connection.execute(query);
+        const dataArray = rows;
+        finalResult = {
+            totalNumberOfRecords: dataArray.length,
+            records: dataArray
+        };
+        console.log(JSON.stringify(finalResult, null, 2));
+    } catch (error) {
+        console.error('Error fetching data:', error);
+    } finally {
+        if (connection) {
+            connection.release();
+        }
+    }
+    return finalResult;
+}
+
+// Main function to call the database connection and fetch data
+// async function main() {
+//     try {
+//         const connection = await connectToMySQL('10.0.0.6', 'root', 'password123', 'power_seraya_step', 3406);
+//         console.log('Connection pool created.' + connection);
+//         const query = 'SELECT id,EventID,NoPlate FROM store_images limit 2';
+//         await fetchDataFromDB(connection, query);
+//     } catch (err) {
+//         console.log('Error connecting to database:', err.stack);
+//     }
+// }
+
+// main();
+
+module.exports = {
+    connectToMySQL,
+    fetchDataFromDB
+};

package/db/postgresOperations.js

@@ -0,0 +1,71 @@
+const { Pool } = require('pg');
+
+// Function to establish connection to PostgreSQL database
+async function connectToPostgreSQL(hostname, username, password, dbname, portnumber) {
+    const poolConfig = {
+        host: hostname,
+        user: username,
+        password: password,
+        database: dbname,
+        port: portnumber,
+        max: 10,
+        idleTimeoutMillis: 60000,
+        connectionTimeoutMillis: 60000,
+    };
+
+    try {
+        const pool = new Pool(poolConfig);
+        console.log('PostgreSQL connection pool created.');
+        return pool;
+    } catch (error) {
+        console.error('Error creating PostgreSQL connection pool:', error);
+        throw error;
+    }
+}
+
+// Function to fetch data from the database
+async function fetchDataFromPostgresDB(connectionpool, query) {
+    let connection = null;
+    let finalResult = null;
+    try {
+
+        connection = await connectionpool.connect();
+        console.log('Connected to the PostgreSQL database.' + connection);
+        const result = await connection.query(query);
+        const dataArray = result.rows; // Adjust for MySQL and PostgreSQL response formats
+
+        finalResult = {
+            totalNumberOfRecords: dataArray.length,
+            records: dataArray
+        };
+        console.log(JSON.stringify(finalResult, null, 2));
+    } catch (error) {
+        console.error('Error fetching data:', error);
+    } finally {
+        if (connection) {
+
+            connection.release();
+
+        }
+    }
+    return finalResult;
+}
+
+// Main function to call the database connection and fetch data
+// async function main() {
+//     try {
+//         const connection = await connectToPostgreSQL('10.0.222.36', 'postgres', 'A6b1b/b%V9', 'testops', 5432);
+//         console.log('Connection pool created.' + connection);
+//         const query = 'SELECT planned_effort,project_type,project_name FROM public.account_project_details';
+//         await fetchDataFromPostgresDB(connection, query);
+//     } catch (err) {
+//         console.log('Error connecting to database:', err.stack);
+//     }
+// }
+
+// main();
+
+module.exports = {
+    connectToPostgreSQL,
+    fetchDataFromPostgresDB
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "1.0.91",
+  "version": "1.0.93",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",
@@ -39,6 +39,7 @@
     "mysql2": "^3.10.2",
     "node-fetch": "^3.3.2",
     "node-localstorage": "^3.0.5",
+    "pg": "^8.12.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   }

package/db/dbconnections.js

@@ -1,87 +0,0 @@
-const mysql = require('mysql2/promise');
-
-// Function to establish connection to MySQL database
-async function connectTomysql(hostname, username, password, dbname, portnumber) {
-    try {
-        const poolConfig = {
-            host: hostname,  // Replace with your database host
-            user: username,   // Replace with your database username
-            password: password, // Replace with your database password
-            database: dbname,
-            port: portnumber,
-            waitForConnections: true,
-            connectionLimit: 10,    // Adjust the number of connections in the pool
-            queueLimit: 0       // Replace with your database name
-        };
-
-        try {
-            const pool = mysql.createPool(poolConfig);
-            console.log('Connection pool created.');
-            return pool;
-        } catch (error) {
-            console.error('Error creating connection pool:', error);
-            throw error;
-        }
-
-    } catch (err) {
-        console.log('Error connecting to database:', err.stack);
-    }
-}
-
-async function fetchDataFromDB(connectionpool, query) {
-    let connection = null;
-    let finalResult = null;
-    try {
-        connection = await connectionpool.getConnection();
-        console.log('Connected to the MySQL database.');
-
-        // Execute the query to fetch all data
-        const [rows] = await connection.execute(query);
-
-        // Store the data into an array
-        const dataArray = rows;
-        let recordsArray = [];
-        console.log("data is " + JSON.stringify(dataArray, null, 2));
-        // Print the values for each column in each row
-        // dataArray.forEach(row => {
-        //     let record = {};
-        //     Object.keys(row).forEach(columnName => {
-        //         console.log(`${columnName}: ${row[columnName]}`);
-        //         record[columnName] = row[columnName];
-        //         // BUFFER.setItem(columnName, row[columnName]);
-        //     });
-        //     console.log('---'); // Separator for each row
-        // });
-
-        finalResult = {
-            totalNumberOfRecords: dataArray.length,
-            records: dataArray
-        };
-        console.log(JSON.stringify(finalResult, null, 2));
-
-    } catch (error) {
-        console.error('Error fetching data:', error);
-    } finally {
-        connection.release();
-
-    }
-    return finalResult;
-}
-
-// write main method to call the functions
-
-// async function main() {
-//     try {
-//         const connection = await connectTomysql('10.0.0.6', 'root', 'password123', 'power_seraya_step', 3406);
-//         const query = 'SELECT id,EventID,NoPlate FROM store_images limit 2';
-//         await fetchDataFromDB(connection, query);
-//     } catch (err) {
-//         console.log('Error connecting to database:', err.stack);
-//     }
-// }
-
-// main()
-module.exports = {
-    connectTomysql,
-    fetchDataFromDB
-};