Updates

package-shared/utils/data-fetching/method-crud.ts

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import sqlGenerator from "../../functions/dsql/sql/sql-generator";
 import {
     DsqlCrudQueryObject,
@@ -52,22 +53,28 @@ export default async function dsqlMethodCrud<
         let OFFSET = (PAGE - 1) * LIMIT;
 
         if (finalQuery) {
-            Object.keys(finalQuery).forEach((key) => {
-                const value = finalQuery[key];
+            const newFinalQuery = _.cloneDeep(finalQuery);
+
+            Object.keys(newFinalQuery).forEach((key) => {
+                const value = newFinalQuery[key];
                 if (typeof value == "string" && value.match(/^\{|^\[/)) {
-                    finalQuery[key] = EJSON.stringify(value);
+                    newFinalQuery[key] = EJSON.stringify(value);
                 }
                 if (value == "true") {
-                    finalQuery[key] = true;
+                    newFinalQuery[key] = true;
                 }
                 if (value == "false") {
-                    finalQuery[key] = false;
+                    newFinalQuery[key] = false;
                 }
             });
 
-            if (finalQuery.limit) LIMIT = numberfy(finalQuery.limit);
-            if (finalQuery.page) PAGE = numberfy(finalQuery.page);
+            if (newFinalQuery.limit) LIMIT = numberfy(newFinalQuery.limit);
+            if (newFinalQuery.page) PAGE = numberfy(newFinalQuery.page);
             OFFSET = (PAGE - 1) * LIMIT;
+
+            finalQuery = newFinalQuery;
+        } else {
+            finalQuery = {};
         }
 
         let finalData = finalBody
@@ -75,21 +82,27 @@ export default async function dsqlMethodCrud<
                   ...finalBody,
                   ...extraData,
               } as T)
-            : undefined;
+            : ({} as T);
 
-        if (finalData && user?.id && addUser) {
+        if (user?.id && addUser) {
             finalData = {
                 ...finalData,
                 [addUser.field]: String(user.id),
-            };
+            } as T;
         }
 
-        if (transform && finalData) {
-            finalData = await transform({
+        if (transform) {
+            finalData = (await transform({
                 data: finalData,
                 existingData: existingData,
                 user,
                 reqMethod: method,
+            })) as T;
+
+            finalQuery = await transform({
+                query: finalQuery,
+                user,
+                reqMethod: method,
             });
         }