From 38abc55870a444f524274dc11c8eb77b89d1e675 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Sun, 26 Jan 2025 07:12:19 +0100
Subject: [PATCH] Bugfix

---
 .../utils/data-fetching/method-crud.d.ts           |  2 ++
 .../utils/data-fetching/method-crud.js             | 14 +++++++++-----
 package-shared/utils/data-fetching/method-crud.ts  |  9 +++++++--
 package.json                                       |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/dist/package-shared/utils/data-fetching/method-crud.d.ts b/dist/package-shared/utils/data-fetching/method-crud.d.ts
index 5479a30..87984e5 100644
--- a/dist/package-shared/utils/data-fetching/method-crud.d.ts
+++ b/dist/package-shared/utils/data-fetching/method-crud.d.ts
@@ -1,3 +1,4 @@
+import sqlGenerator from "../../functions/dsql/sql/sql-generator";
 import { DsqlMethodCrudParam, ServerQueryParam } from "../../types";
 export type APIDataCrudQuery = ServerQueryParam & {
     page?: number;
@@ -7,6 +8,7 @@ export type CRUDResponseObject<P extends any = any> = {
     payload?: P;
     msg?: string;
     error?: string;
+    queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
 };
 export default function dsqlMethodCrud<T extends {
     [key: string]: any;
diff --git a/dist/package-shared/utils/data-fetching/method-crud.js b/dist/package-shared/utils/data-fetching/method-crud.js
index 22e4fd0..54e8d0b 100644
--- a/dist/package-shared/utils/data-fetching/method-crud.js
+++ b/dist/package-shared/utils/data-fetching/method-crud.js
@@ -19,6 +19,7 @@ const numberfy_1 = __importDefault(require("../numberfy"));
 const crud_1 = __importDefault(require("./crud"));
 function dsqlMethodCrud(_a) {
     return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transform, existingData, body, query, targetId, sanitize, }) {
+        var _b;
         let result = {
             success: false,
         };
@@ -67,11 +68,13 @@ function dsqlMethodCrud(_a) {
                         action: "get",
                         table: tableName,
                         query: finalQuery
-                            ? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), { user_id: user
-                                        ? {
-                                            value: String(user.id),
-                                        }
-                                        : undefined }), limit: LIMIT, offset: OFFSET || undefined })
+                            ? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), { user_id: ((_b = finalQuery.query) === null || _b === void 0 ? void 0 : _b.user_id)
+                                        ? finalQuery.query.user_id
+                                        : user && addUser
+                                            ? {
+                                                value: String(user.id),
+                                            }
+                                            : undefined }), limit: LIMIT, offset: OFFSET })
                             : undefined,
                         sanitize,
                     });
@@ -80,6 +83,7 @@ function dsqlMethodCrud(_a) {
                         payload: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.payload,
                         msg: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.msg,
                         error: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.error,
+                        queryObject: GET_RESULT === null || GET_RESULT === void 0 ? void 0 : GET_RESULT.queryObject,
                     };
                     break;
                 case "POST":
diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts
index e7c4ce3..e739308 100644
--- a/package-shared/utils/data-fetching/method-crud.ts
+++ b/package-shared/utils/data-fetching/method-crud.ts
@@ -1,3 +1,4 @@
+import sqlGenerator from "../../functions/dsql/sql/sql-generator";
 import {
     DsqlCrudQueryObject,
     DsqlMethodCrudParam,
@@ -17,6 +18,7 @@ export type CRUDResponseObject<P extends any = any> = {
     payload?: P;
     msg?: string;
     error?: string;
+    queryObject?: ReturnType<Awaited<typeof sqlGenerator>>;
 };
 
 export default async function dsqlMethodCrud<
@@ -101,14 +103,16 @@ export default async function dsqlMethodCrud<
                               ...finalQuery,
                               query: {
                                   ...finalQuery.query,
-                                  user_id: user
+                                  user_id: finalQuery.query?.user_id
+                                      ? finalQuery.query.user_id
+                                      : user && addUser
                                       ? {
                                             value: String(user.id),
                                         }
                                       : undefined,
                               },
                               limit: LIMIT,
-                              offset: OFFSET || undefined,
+                              offset: OFFSET,
                           } as any)
                         : undefined,
                     sanitize,
@@ -119,6 +123,7 @@ export default async function dsqlMethodCrud<
                     payload: GET_RESULT?.payload,
                     msg: GET_RESULT?.msg,
                     error: GET_RESULT?.error,
+                    queryObject: GET_RESULT?.queryObject,
                 };
                 break;
 
diff --git a/package.json b/package.json
index 588912c..b4eda88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "3.9.3",
+    "version": "3.9.4",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {