pangea-server 3.3.158 → 3.3.160

package/dist/database/db.class.js

@@ -120,10 +120,7 @@ class Db {
             const searchWords = search.split(/\s+/).filter(Boolean);
             searchWhere = {
                 [_1.Ops.and]: searchWords.map((word) => ({
-                    [_1.Ops.or]: searchFields.map((field) => {
-                        const finalField = field.includes('.') ? `$${field}$` : field;
-                        return { [finalField]: { [_1.Ops.like]: `%${word}%` } };
-                    }),
+                    [_1.Ops.or]: searchFields.map((field) => getSearchFieldCondition(model, field, word)),
                 })),
             };
         }
@@ -231,6 +228,32 @@ function formatField(modelName, field) {
     }
     return `${modelName}.${(0, pangea_helpers_1.camelToSnake)(field)}`;
 }
+function getSearchCorrelation(association, parentAlias, childAlias) {
+    if (association.associationType === 'BelongsTo') {
+        return `${childAlias}.\`${association.targetKeyField || 'id'}\` = ${parentAlias}.\`${association.identifierField}\``;
+    }
+    return `${childAlias}.\`${association.identifierField}\` = ${parentAlias}.\`${association.sourceKeyField || 'id'}\``;
+}
+function buildSearchExists(parentModel, parentAlias, segments, escapedWord, depth) {
+    const [relName, ...rest] = segments;
+    const association = parentModel.associations[relName];
+    const childModel = association.target;
+    const childAlias = `\`__search_${relName}_${depth}\``;
+    const conditions = [getSearchCorrelation(association, parentAlias, childAlias)];
+    if (parentModel.Relations[relName]?.paranoid)
+        conditions.push(`${childAlias}.\`deleted_at\` IS NULL`);
+    if (rest.length === 1)
+        conditions.push(`${childAlias}.\`${(0, pangea_helpers_1.camelToSnake)(rest[0])}\` LIKE ${escapedWord}`);
+    else
+        conditions.push(buildSearchExists(childModel, childAlias, rest, escapedWord, depth + 1));
+    return `EXISTS (SELECT 1 FROM \`${childModel.tableName}\` AS ${childAlias} WHERE ${conditions.join(' AND ')})`;
+}
+function getSearchFieldCondition(model, field, word) {
+    if (!field.includes('.'))
+        return { [field]: { [_1.Ops.like]: `%${word}%` } };
+    const escapedWord = (0, db_client_1.getDbClient)().escape(`%${word}%`);
+    return (0, sequelize_1.literal)(buildSearchExists(model, `\`${model.name}\``, field.split('.'), escapedWord, 0));
+}
 function getFinalAttributes(model, attributes) {
     if (!attributes)
         return;
@@ -251,7 +274,7 @@ function convertWhereKeys(obj) {
         !(obj instanceof RegExp) &&
         !(obj instanceof Map) &&
         !(obj instanceof Set) &&
-        !(obj instanceof utils_1.Where) &&
+        !(obj instanceof utils_1.SequelizeMethod) &&
         !(typeof obj === 'function')) {
         const newObj = {};
         for (const key of Reflect.ownKeys(obj)) {

package/dist/database/index.d.ts

@@ -13,3 +13,4 @@ export * from './database.types';
 export * from './db-client';
 export * from './db.class';
 export * from './seed.helpers';
+export * from './use-auto-commit';

package/dist/database/index.js

@@ -26,3 +26,4 @@ __exportStar(require("./database.types"), exports);
 __exportStar(require("./db-client"), exports);
 __exportStar(require("./db.class"), exports);
 __exportStar(require("./seed.helpers"), exports);
+__exportStar(require("./use-auto-commit"), exports);

package/dist/database/seed.helpers.js

@@ -5,7 +5,7 @@ exports.emptyTables = emptyTables;
 exports.syncTables = syncTables;
 exports.seedTables = seedTables;
 const db_client_1 = require("./db-client");
-const db_class_1 = require("./db.class");
+const use_auto_commit_1 = require("./use-auto-commit");
 // helpers
 const helpers_1 = require("../helpers");
 async function dropTables() {
@@ -30,18 +30,14 @@ async function seedTables(models, seeds) {
         .filter(() => (0, helpers_1.getEnvBool)('DB_INCLUDE_TESTING_SEEDS'))
         .map((model) => model.name);
     const modelsWithData = modelsToSeed.filter((modelName) => seeds[modelName]?.length);
-    const tx = await (0, db_client_1.getDbClient)().transaction();
-    const db = new db_class_1.Db(tx);
-    try {
-        await db.disableForeignKeyChecks();
-        await Promise.all(modelsWithData.map((modelName) => db.insertMany(models[modelName], seeds[modelName])));
-        await db.enableForeignKeyChecks();
-        await tx.commit();
-    }
-    catch (err) {
-        await db.enableForeignKeyChecks();
-        await tx.rollback();
-        throw err;
-    }
+    await (0, use_auto_commit_1.useAutoCommit)(async (db) => {
+        try {
+            await db.disableForeignKeyChecks();
+            await Promise.all(modelsWithData.map((modelName) => db.insertMany(models[modelName], seeds[modelName])));
+        }
+        finally {
+            await db.enableForeignKeyChecks();
+        }
+    });
     (0, helpers_1.printSuccess)('database', 'tables seeded');
 }

package/dist/database/use-auto-commit.d.ts

@@ -0,0 +1,2 @@
+import { Db } from './db.class';
+export declare function useAutoCommit<T>(cb: (db: Db) => Promise<T>): Promise<T>;

package/dist/database/use-auto-commit.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useAutoCommit = useAutoCommit;
+const db_client_1 = require("./db-client");
+const db_class_1 = require("./db.class");
+async function useAutoCommit(cb) {
+    const tx = await (0, db_client_1.getDbClient)().transaction();
+    const db = new db_class_1.Db(tx);
+    try {
+        const result = await cb(db);
+        await tx.commit();
+        return result;
+    }
+    catch (err) {
+        await tx.rollback();
+        throw err;
+    }
+}

package/dist/helpers/job.helpers.d.ts

@@ -1,4 +1,3 @@
-import { Db } from '../database';
 type Now = {
     year: number;
     yearStr: string;

package/dist/helpers/job.helpers.js

@@ -12,17 +12,8 @@ class Job {
         node_cron_1.default.schedule(expression, () => this.__Run(timezone, task), { timezone, runOnInit });
     }
     static async __Run(timezone, task) {
-        const tx = await (0, database_1.getDbClient)().transaction();
-        const db = new database_1.Db(tx);
         const now = this.__GetNow(timezone);
-        try {
-            await task(db, now);
-            await tx.commit();
-        }
-        catch (err) {
-            await tx.rollback();
-            throw err;
-        }
+        await (0, database_1.useAutoCommit)((db) => task(db, now));
     }
     static __GetNow(timezone) {
         const today = new Date();

package/dist/router/call-controller.js

@@ -20,20 +20,12 @@ function callController(controller, validate, appVersion, authConfig) {
         }
         const inputs = (0, validate_request_1.validateRequest)(validate, req);
         const ctx = { headers, ...inputs, file: req.file, files: req.files };
-        const tx = await (0, database_1.getDbClient)().transaction();
-        const db = new database_1.Db(tx);
-        let result;
-        try {
+        const result = await (0, database_1.useAutoCommit)(async (db) => {
             const authUsers = await (0, auth_1.getUsersFromToken)(headers.authorization, db, accessToken, authMap);
             const initRes = initAuthCtor ? await initAuthCtor(db, headers) : undefined;
             const auth = new authCtor(authUsers, initRes);
-            result = await controller(ctx, db, auth);
-            await tx.commit();
-        }
-        catch (err) {
-            await tx.rollback();
-            throw err;
-        }
+            return controller(ctx, db, auth);
+        });
         let data = result;
         let totalCount;
         if (hasInstancesAndTotalCount(result)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.158",
+  "version": "3.3.160",
   "engines": {
     "node": "22.14.0"
   },