Updates

package-shared/functions/backend/varDatabaseDbHandler.ts

@@ -1,8 +1,7 @@
 import parseDbResults from "./parseDbResults";
 import serverError from "./serverError";
-import DB_HANDLER from "../../utils/backend/global-db/DB_HANDLER";
-import DSQL_USER_DB_HANDLER from "../../utils/backend/global-db/DSQL_USER_DB_HANDLER";
-import LOCAL_DB_HANDLER from "../../utils/backend/global-db/LOCAL_DB_HANDLER";
+import grabDSQLConnection from "../../utils/grab-dsql-connection";
+import connDbHandler from "../../utils/db/conn-db-handler";
 
 type Param = {
     queryString: string;
@@ -10,6 +9,7 @@ type Param = {
     database?: string;
     tableSchema?: import("../../types").DSQL_TableSchemaType;
     useLocal?: boolean;
+    debug?: boolean;
 };
 
 /**
@@ -21,66 +21,27 @@ export default async function varDatabaseDbHandler({
     database,
     tableSchema,
     useLocal,
+    debug,
 }: Param): Promise<any> {
-    /**
-     * Declare variables
-     *
-     * @description Declare "results" variable
-     */
-    const isMaster = useLocal
-        ? true
-        : database?.match(/^datasquirel$/)
-        ? true
-        : false;
+    let CONNECTION = grabDSQLConnection({ fa: true });
+    if (useLocal) CONNECTION = grabDSQLConnection({ local: true });
+    if (database?.match(/^datasquirel$/)) CONNECTION = grabDSQLConnection();
 
-    const FINAL_DB_HANDLER: any = useLocal
-        ? LOCAL_DB_HANDLER
-        : isMaster
-        ? DB_HANDLER
-        : DSQL_USER_DB_HANDLER;
+    if (debug) {
+        console.log(`varDatabaseDbHandler:query:`, queryString);
+        console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
+    }
 
-    let results;
+    let results = await connDbHandler(
+        CONNECTION,
+        queryString,
+        queryValuesArray
+    );
 
-    /**
-     * Fetch from db
-     *
-     * @description Fetch data from db if no cache
-     */
-    try {
-        if (
-            queryString &&
-            queryValuesArray &&
-            Array.isArray(queryValuesArray) &&
-            queryValuesArray[0]
-        ) {
-            results = isMaster
-                ? await FINAL_DB_HANDLER(queryString, queryValuesArray)
-                : await FINAL_DB_HANDLER({
-                      paradigm: "Full Access",
-                      queryString,
-                      queryValues: queryValuesArray,
-                  });
-        } else {
-            results = isMaster
-                ? await FINAL_DB_HANDLER(queryString)
-                : await FINAL_DB_HANDLER({
-                      paradigm: "Full Access",
-                      queryString,
-                  });
-        }
-    } catch (error: any) {
-        console.log(`varDatabaseDbHandler Error: ${error.message}`);
-        serverError({
-            component: "varDatabaseDbHandler/lines-29-32",
-            message: error.message,
-        });
+    if (debug) {
+        console.log(`varDatabaseDbHandler:results:`, results);
     }
 
-    /**
-     * Return results
-     *
-     * @description Return results add to cache if "req" param is passed
-     */
     if (results && tableSchema) {
         try {
             const unparsedResults = results;