froth-webdriverio-framework 1.0.85 → 1.0.87

package/api/getDBdetails.js

@@ -1,12 +1,6 @@
 
 // Function to get data from the API using the Bearer token
-async function connectToDB(id, querytype, query) {
-    try {
-      const jsondata =  await getDbDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"),BUFFER.getItem("LOGIN_TOKEN"),id);
-    } catch (error) {
-        console.error('Error connectToDB', error);
-    }
-}
+
 async function getDbDetails(frothUrl,token,id) {
 
     let jsondata = {};
@@ -72,4 +66,4 @@ async function getDbDetails(frothUrl,token,id) {
 // }
 
 // main();
-module.exports = { connectToDB, getDbDetails }
+module.exports = { getDbDetails }

package/api/getexecutionDetails.js

@@ -55,7 +55,7 @@ async function getExecuitonDetails(frothUrl, token, id) {
 
 async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_id) {
     let id;
-    const url = `https://${frothUrl}/api/execution-script-mapping/?execution_id=${execution_id}&automation_script_id=${script_id}/`;
+    const url = `https://${frothUrl}/api/execution-script-mapping/?execution_id=${execution_id}&automation_script_id=${script_id}`;
 
     try {
         console.log("URL: " + url)
@@ -70,9 +70,9 @@ async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_i
         });
         if (response.ok) {
             const data = await response.json();
-            //  console.log(data)
+            console.log(data)
             id = data[0].id;
-
+            console.log("ID is :" + id)
             // console.log("json data :" + JSON.stringify(jsondata));
 
             return id;
@@ -154,7 +154,7 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, status) {
 
     if (scriptid != 0) {
         try {
-            id = await getExecuitonScriptDetails(frothUrl, token, BUFFER.getItem("EXECUTION_ID"), scriptid)
+            const id = await getExecuitonScriptDetails(frothUrl, token, BUFFER.getItem("EXECUTION_ID"), scriptid)
             const url = `https://${frothUrl}/api/script-status-percentage/${id}/`;
             const formData = new FormData();
 
@@ -220,7 +220,7 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, status) {
 //         const duration = "31355ms"
 //         resultdetails.excution_status = resultdata === 'Pass' ? 'PASSED' : 'FAILED'
 //         //resultdetails.excution_time = convertMillisecondsToTime(duration)
-//         await updateExecuitonDetails(frothUrl, token, id, resultdetails);
+//         await getExecuitonScriptDetails(frothUrl, token, 449, 130);
 //     } catch (error) {
 //         console.error('Error in main function:', error);
 //     }

package/{mobile/commonMethods → commonMethods}/Utils.js

@@ -8,7 +8,7 @@ let scrollToRight = null;
 let scrollDownToView = null;
 let scrollRightToView = null;
 let verifyText = null;
-
+let connectToDB=null;
 if (process.env.LOCATION == 'local') {
 
     scrollToEnd = require("./scrollToEnd");
@@ -20,16 +20,18 @@ if (process.env.LOCATION == 'local') {
     scrollDownToView = require('./scrollDownToView');
     scrollRightToView = require('./scrollRightToView');
     verifyText = require('./verifyText');
+    connectToDB=require('./connectToDB');
 } else {
-    scrollToEnd = require('froth-webdriverio-framework/mobile/commonMethods/scrollToEnd');
-    clickIfVisible = require('froth-webdriverio-framework/mobile/commonMethods/clickIfVisible');
-    verifyTextInFieldAttribute = require('froth-webdriverio-framework/mobile/commonMethods/verifyTextInFieldAttribute');
-    scrollToBeginning = require('froth-webdriverio-framework/mobile/commonMethods/scrollToBeginning');
-    scrollToLeft = require('froth-webdriverio-framework/mobile/commonMethods/scrollToLeft');
-    scrollToRight = require('froth-webdriverio-framework/mobile/commonMethods/scrollToRight');
-    scrollDownToView = require('froth-webdriverio-framework/mobile/commonMethods/scrollDownToView');
-    scrollRightToView = require('froth-webdriverio-framework/mobile/commonMethods/scrollRightToView');
-    verifyText = require('froth-webdriverio-framework/mobile/commonMethods/verifyText');
+    scrollToEnd = require('froth-webdriverio-framework/commonMethods/scrollToEnd');
+    clickIfVisible = require('froth-webdriverio-framework/commonMethods/clickIfVisible');
+    verifyTextInFieldAttribute = require('froth-webdriverio-framework/commonMethods/verifyTextInFieldAttribute');
+    scrollToBeginning = require('froth-webdriverio-framework/commonMethods/scrollToBeginning');
+    scrollToLeft = require('froth-webdriverio-framework/commonMethods/scrollToLeft');
+    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');
+    connectToDB=require('froth-webdriverio-framework/commonMethods/connectToDB');
 }
 //export the variabels
 module.exports= {

package/commonMethods/connectToDB.js

@@ -0,0 +1,54 @@
+
+const dbinfo = require('../api/getDBdetails');
+const dbconnect = require('../db/dbconnections');
+
+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.dbtype, jsondata);
+    let result = await executeQuery(querytype, query, connectionpool);
+    return result;
+  } catch (error) {
+    console.error('Error connectToDB', error);
+  }
+}
+
+async function dbtype(type, jsondata) {
+  let connectionpool;
+  try {
+    switch (type) {
+      case 'mysql':
+        connectionpool = dbconnect.connectTomysql(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
+        break;
+
+      default:
+        console.log('Unknown dbtype.');
+
+    }
+    return connectionpool;
+
+  } catch (error) { console.error('Error dbtype', error); }
+}
+
+
+async function executeQuery(querytype, query, connectionpool) {
+  let finalResult;
+  try {
+    switch (querytype) {
+      case 'select':
+        finalResult = dbconnect.fetchDataFromDB(connectionpool, query);
+        break;
+      case 'insert':
+        connectionpool = dbconnect.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);
+        break;
+      default:
+        console.log('Unknown querytype.');
+    }
+    return finalResult;
+  } catch (error) { console.error('Error querytype', error); }
+}
+
+module.exports = connectToDB;

package/{mobile/commonMethods → commonMethods}/getdata.js

@@ -33,6 +33,6 @@ module.exports = getdata;
 // Example usage:
 // specify your file name
 
-console.log(getdata('data1.env'));
+//console.log(getdata('data1.env'));
 
 

package/db/dbconnections.js

@@ -2,7 +2,6 @@ const mysql = require('mysql2/promise');
 
 // Function to establish connection to MySQL database
 async function connectTomysql(hostname, username, password, dbname, portnumber) {
-    let connection = null;
     try {
         const poolConfig = {
             host: hostname,  // Replace with your database host
@@ -27,11 +26,11 @@ async function connectTomysql(hostname, username, password, dbname, portnumber)
     } catch (err) {
         console.log('Error connecting to database:', err.stack);
     }
-    return connection;
 }
 
-async function fetchDataFromSQLDB(connectionpool, query) {
+async function fetchDataFromDB(connectionpool, query) {
     let connection = null;
+    let finalResult = null;
     try {
         connection = await connectionpool.getConnection();
         console.log('Connected to the MySQL database.');
@@ -41,15 +40,24 @@ async function fetchDataFromSQLDB(connectionpool, 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 => {
-            Object.keys(row).forEach(columnName => {
-                console.log(`${columnName}: ${row[columnName]}`);
-                // BUFFER.setItem(columnName, row[columnName]);
-            });
-            console.log('---'); // Separator for 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);
@@ -57,7 +65,7 @@ async function fetchDataFromSQLDB(connectionpool, query) {
         connection.release();
 
     }
-    
+    return finalResult;
 }
 
 // write main method to call the functions
@@ -65,15 +73,15 @@ async function fetchDataFromSQLDB(connectionpool, query) {
 async function main() {
     try {
         const connection = await connectTomysql('10.0.0.6', 'root', 'password123', 'power_seraya_step', 3406);
-        const query = 'SELECT EventID,NoPlate FROM store_images limit 1';
-        await fetchDataFromSQLDB(connection, query);
+        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,
-//     fetchDataFromSQLDB
-// };
+module.exports = {
+    connectTomysql,
+    fetchDataFromDB
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "1.0.85",
+  "version": "1.0.87",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",