Updates

package-shared/functions/backend/parseDbResults.ts

@@ -1,11 +1,10 @@
-// @ts-check
-
+import { DSQL_TableSchemaType } from "../../types";
 import decrypt from "../dsql/decrypt";
 import defaultFieldsRegexp from "../dsql/default-fields-regexp";
 
 type Param = {
     unparsedResults: any[];
-    tableSchema?: import("../../types").DSQL_TableSchemaType;
+    tableSchema?: DSQL_TableSchemaType;
 };
 
 /**
@@ -15,23 +14,13 @@ type Param = {
  * function, decrypts encrypted fields, and returns an updated array with no encrypted
  * fields
  */
-export default async function parseDbResults({
+export default function parseDbResults({
     unparsedResults,
     tableSchema,
-}: Param): Promise<any[] | null> {
-    /**
-     * Declare variables
-     *
-     * @description Declare "results" variable
-     */
+}: Param): any[] | null {
     let parsedResults = [];
 
     try {
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
         for (let pr = 0; pr < unparsedResults.length; pr++) {
             let result = unparsedResults[pr];
 
@@ -39,7 +28,9 @@ export default async function parseDbResults({
 
             for (let i = 0; i < resultFieldNames.length; i++) {
                 const resultFieldName = resultFieldNames[i];
-                let resultFieldSchema = tableSchema?.fields[i];
+                let resultFieldSchema = tableSchema?.fields.find(
+                    (fld) => fld.fieldName == resultFieldName
+                );
 
                 if (resultFieldName?.match(defaultFieldsRegexp)) {
                     continue;
@@ -48,7 +39,6 @@ export default async function parseDbResults({
                 let value = result[resultFieldName];
 
                 if (typeof value !== "number" && !value) {
-                    // parsedResults.push(result);
                     continue;
                 }
 
@@ -64,14 +54,8 @@ export default async function parseDbResults({
             parsedResults.push(result);
         }
 
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
         return parsedResults;
-    } catch (/** @type {any} */ error: any) {
-        console.log("ERROR in parseDbResults Function =>", error.message);
+    } catch (error: any) {
         return unparsedResults;
     }
 }