rez_core 2.2.187 → 2.2.188

package/dist/module/notification/service/notification.service.js

@@ -42,14 +42,9 @@ let NotificationsService = class NotificationsService {
             return { error: 'No token found for user' };
         return this.sendToDevice(token, title, body);
     }
-    async getAllNotifications(loggedInUser, filterQuery) {
+    async getAllNotifications(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        let isReadFilter = undefined;
-        if (filterQuery && filterQuery.is_read !== undefined) {
-            const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
-            isReadFilter = isReadBool ? 1 : 0;
-        }
-        let query = `
+        const notifications = await this.dataSource.query(`
     SELECT
       n.*,
       u.name AS user_name,
@@ -57,17 +52,11 @@ let NotificationsService = class NotificationsService {
     FROM cr_notification n
     LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
     WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
-  `;
-        const params = [id, level_id, level_type];
-        if (isReadFilter !== undefined) {
-            query += ` AND n.is_read = ?`;
-            params.push(isReadFilter);
-        }
-        query += ` ORDER BY n.created_date DESC`;
-        const notifications = await this.dataSource.query(query, params);
+    ORDER BY n.created_date DESC
+    `, [id, level_id, 'SCH']);
         const mediaCache = new Map();
         for (const notification of notifications) {
-            notification.is_read = !!notification.is_read;
+            notification.is_read = true;
             if (notification.user_profile) {
                 if (!mediaCache.has(notification.user_profile)) {
                     const url = await this.mediaDataService.getMediaDownloadUrl(notification.user_profile, loggedInUser);
@@ -79,19 +68,15 @@ let NotificationsService = class NotificationsService {
                 notification.user_profile = null;
             }
         }
+        if (notifications.length > 0) {
+            await this.dataSource.query(`
+      UPDATE cr_notification
+      SET is_read = 1
+      WHERE user_id = ? AND level_id = ? AND level_type = ?
+      `, [id, level_id, level_type]);
+        }
         return notifications;
     }
-    async markAllAsRead(loggedInUser) {
-        const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE cr_notification
-    SET is_read = 1
-    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
-  `;
-        const params = [id, level_id, level_type];
-        const result = await this.dataSource.query(query, params);
-        return { success: true, affectedRows: result.affectedRows || 0 };
-    }
 };
 exports.NotificationsService = NotificationsService;
 exports.NotificationsService = NotificationsService = __decorate([

package/dist/module/notification/service/notification.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"notification.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/notification.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notification.service.js","sourceRoot":"","sources":["../../../../src/module/notification/service/notification.service.ts"],"names":[],"mappings":"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"}

package/dist/module/workflow/service/task.service.js

@@ -310,7 +310,7 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
 };
 exports.TaskService = TaskService;
 __decorate([
-    (0, schedule_1.Cron)(schedule_1.CronExpression.EVERY_30_MINUTES),
+    (0, schedule_1.Cron)(schedule_1.CronExpression.EVERY_30_SECONDS),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)