From 97fc8f42c29ff192cc873674807a13d0cd17350d Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Sun, 26 Jan 2025 07:36:41 +0100
Subject: [PATCH] Bugfix

---
 .../utils/data-fetching/method-crud.js            | 15 +++++++--------
 package-shared/utils/data-fetching/method-crud.ts | 10 +++++-----
 package.json                                      |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dist/package-shared/utils/data-fetching/method-crud.js b/dist/package-shared/utils/data-fetching/method-crud.js
index 54e8d0b..30cdad6 100644
--- a/dist/package-shared/utils/data-fetching/method-crud.js
+++ b/dist/package-shared/utils/data-fetching/method-crud.js
@@ -19,7 +19,6 @@ 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,
         };
@@ -68,13 +67,13 @@ function dsqlMethodCrud(_a) {
                         action: "get",
                         table: tableName,
                         query: finalQuery
-                            ? 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 })
+                            ? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser
+                                    ? {
+                                        [addUser.field]: {
+                                            value: String(user.id),
+                                        },
+                                    }
+                                    : undefined)), limit: LIMIT, offset: OFFSET })
                             : undefined,
                         sanitize,
                     });
diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts
index e739308..004ee24 100644
--- a/package-shared/utils/data-fetching/method-crud.ts
+++ b/package-shared/utils/data-fetching/method-crud.ts
@@ -103,13 +103,13 @@ export default async function dsqlMethodCrud<
                               ...finalQuery,
                               query: {
                                   ...finalQuery.query,
-                                  user_id: finalQuery.query?.user_id
-                                      ? finalQuery.query.user_id
-                                      : user && addUser
+                                  ...(user?.id && addUser
                                       ? {
-                                            value: String(user.id),
+                                            [addUser.field]: {
+                                                value: String(user.id),
+                                            },
                                         }
-                                      : undefined,
+                                      : undefined),
                               },
                               limit: LIMIT,
                               offset: OFFSET,
diff --git a/package.json b/package.json
index b4eda88..181a7c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "3.9.4",
+    "version": "3.9.5",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {