pangea-server 3.3.157 → 3.3.159

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/helpers/google.helpers.js

@@ -39,48 +39,66 @@ class Google {
         return (response.data.items || []).map(convertEvent);
     }
     async createEvent(options) {
-        const response = await this.__calendar.events.insert({
-            calendarId: 'primary',
-            requestBody: {
-                summary: options.title,
-                description: options.description,
-                location: options.location,
-                start: { dateTime: options.start.toISOString() },
-                end: { dateTime: options.end.toISOString() },
-                attendees: options.attendees?.map((email) => ({ email })),
-                conferenceData: options.meet
-                    ? {
-                        createRequest: {
-                            requestId: `meet-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`,
-                            conferenceSolutionKey: { type: 'hangoutsMeet' },
-                        },
-                    }
-                    : undefined,
-            },
-            conferenceDataVersion: options.meet ? 1 : undefined,
-        });
-        return convertEvent(response.data);
+        try {
+            const response = await this.__calendar.events.insert({
+                calendarId: 'primary',
+                requestBody: {
+                    summary: options.title,
+                    description: options.description,
+                    location: options.location,
+                    start: { dateTime: options.start.toISOString() },
+                    end: { dateTime: options.end.toISOString() },
+                    attendees: options.attendees?.map((email) => ({ email })),
+                    conferenceData: options.meet
+                        ? {
+                            createRequest: {
+                                requestId: `meet-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`,
+                                conferenceSolutionKey: { type: 'hangoutsMeet' },
+                            },
+                        }
+                        : undefined,
+                },
+                conferenceDataVersion: options.meet ? 1 : undefined,
+            });
+            return convertEvent(response.data);
+        }
+        catch (err) {
+            (0, helpers_1.printDanger)('google', err);
+            throw err;
+        }
     }
     async updateEvent(eventId, options) {
-        const { title, description, location, start, end, attendees } = options;
-        const requestBody = {};
-        if (title !== undefined)
-            requestBody.summary = title;
-        if (description !== undefined)
-            requestBody.description = description;
-        if (location !== undefined)
-            requestBody.location = location;
-        if (start !== undefined)
-            requestBody.start = { dateTime: start.toISOString() };
-        if (end !== undefined)
-            requestBody.end = { dateTime: end.toISOString() };
-        if (attendees !== undefined)
-            requestBody.attendees = attendees.map((email) => ({ email }));
-        const response = await this.__calendar.events.patch({ calendarId: 'primary', eventId, requestBody });
-        return convertEvent(response.data);
+        try {
+            const { title, description, location, start, end, attendees } = options;
+            const requestBody = {};
+            if (title !== undefined)
+                requestBody.summary = title;
+            if (description !== undefined)
+                requestBody.description = description;
+            if (location !== undefined)
+                requestBody.location = location;
+            if (start !== undefined)
+                requestBody.start = { dateTime: start.toISOString() };
+            if (end !== undefined)
+                requestBody.end = { dateTime: end.toISOString() };
+            if (attendees !== undefined)
+                requestBody.attendees = attendees.map((email) => ({ email }));
+            const response = await this.__calendar.events.patch({ calendarId: 'primary', eventId, requestBody });
+            return convertEvent(response.data);
+        }
+        catch (err) {
+            (0, helpers_1.printDanger)('google', err);
+            throw err;
+        }
     }
     async deleteEvent(eventId) {
-        await this.__calendar.events.delete({ calendarId: 'primary', eventId });
+        try {
+            await this.__calendar.events.delete({ calendarId: 'primary', eventId });
+        }
+        catch (err) {
+            (0, helpers_1.printDanger)('google', err);
+            throw err;
+        }
     }
 }
 exports.Google = Google;

package/package.json

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