@spytecgps/nova-orm 1.0.39 → 1.0.40

package/dist/repositories/liveLinks/getLiveLinkData.js

@@ -30,6 +30,8 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
             return result;
         }
         const filters = liveLink.deviceAccess === 'limited' ? { imeiList: devices } : { clientId: liveLink.clientId };
+        const pageSize = params.pagingOptions?.pageSize ?? 100;
+        const pageIndex = params.pagingOptions?.pageIndex ?? 0;
         const deviceStatuses = await deviceStatusRepository.getDeviceStatuses({
             filters: {
                 ...filters,
@@ -54,8 +56,8 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
                 ],
             },
             pagingOptions: {
-                limit: params.pagingOptions?.pageSize ?? 100,
-                offset: params.pagingOptions?.pageIndex ?? 0,
+                limit: pageSize,
+                offset: pageSize * pageIndex,
             },
         });
         result.trackersWithStatus.push(...deviceStatuses.map(deviceStatus => {

package/dist/repositories/liveLinks/getLiveLinkData.js.map

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

package/dist/repositories/liveLinks/getLiveLinks.js

@@ -29,9 +29,11 @@ export const getLiveLinks = async (novaDataSource, params, logger) => {
         const sortField = params.sortOptions?.sortField ?? 'createdAt';
         const sortOrder = params.sortOptions?.sortOrder ?? 'DESC';
         queryBuilder = queryBuilder.orderBy(`liveLink.${sortField}`, sortOrder);
+        const pageSize = params.pagingOptions?.pageSize ?? 100;
+        const pageIndex = params.pagingOptions?.pageIndex ?? 0;
         const result = await queryBuilder
-            .limit(params.pagingOptions?.pageSize ?? 100)
-            .offset(params.pagingOptions?.pageIndex ?? 0)
+            .limit(pageSize)
+            .offset(pageSize * pageIndex)
             .getMany();
         return result;
     }, 'LiveLinksRepository::getLiveLinks');

package/dist/repositories/liveLinks/getLiveLinks.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLiveLinks.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,cAA8B,EAC9B,MAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAClF,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,iEAAiE,CAAC,CAAA;QAC1F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QAChD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;QACxF,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAuB,EAAE;QACxF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,IAAI,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAErE,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACvB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;SACvE;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,sBAAsB,EAAE;gBAC3D,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE;gBACvD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAA;SACH;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,WAAW,CAAA;QAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAA;QAEzD,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,SAAS,EAAE,EAAE,SAAS,CAAC,CAAA;QAEvE,MAAM,MAAM,GAAG,MAAM,YAAY;aAC9B,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAC;aAC5C,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAC;aAC5C,OAAO,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,mCAAmC,CAAC,CAAA;AACzC,CAAC,CAAA"}
+{"version":3,"file":"getLiveLinks.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,cAA8B,EAC9B,MAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAClF,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,iEAAiE,CAAC,CAAA;QAC1F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QAChD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;QACxF,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAuB,EAAE;QACxF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,IAAI,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAErE,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACvB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;SACvE;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,sBAAsB,EAAE;gBAC3D,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE;gBACvD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAA;SACH;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,WAAW,CAAA;QAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAA;QAEzD,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,SAAS,EAAE,EAAE,SAAS,CAAC,CAAA;QAEvE,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,MAAM,MAAM,GAAG,MAAM,YAAY;aAC9B,KAAK,CAAC,QAAQ,CAAC;aACf,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;aAC5B,OAAO,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,mCAAmC,CAAC,CAAA;AACzC,CAAC,CAAA"}

package/dist/repositories/notificationRecipients/createNotificationRecipient.js

@@ -31,6 +31,7 @@ export const createNotificationRecipient = async (novaDataSource, params, logger
             dataSourceTypeId: params.dataSourceTypeId,
             createdAt: now,
             modifiedAt: now,
+            userAlertConfigurationId: params.userAlertConfigurationId,
         };
         return await notificationRecipientsRepository.save(newNotificationRecipient);
     }, 'NotificationRecipientsRepository::createNotificationRecipient');

package/dist/repositories/notificationRecipients/createNotificationRecipient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createNotificationRecipient.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/createNotificationRecipient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,cAA8B,EAC9B,MAAyC,EACzC,MAAc,EACkB,EAAE;IAClC,IACE,CAAC,MAAM,EAAE,QAAQ;QACjB,CAAC,MAAM,EAAE,MAAM;QACf,CAAC,MAAM,EAAE,gBAAgB;QACzB,CAAC,MAAM,EAAE,SAAS;QAClB,MAAM,EAAE,SAAS,IAAI,IAAI;QACzB,MAAM,EAAE,aAAa,IAAI,IAAI,EAC7B;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEnE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE;QAC/B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,gCAAgC,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;QAExF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QAEtB,MAAM,wBAAwB,GAAG;YAC/B,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,kBAAkB;YAC1B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,GAAG;SAChB,CAAA;QAED,OAAO,MAAM,gCAAgC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC9E,CAAC,EAAE,+DAA+D,CAAC,CAAA;AACrE,CAAC,CAAA"}
+{"version":3,"file":"createNotificationRecipient.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/createNotificationRecipient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,cAA8B,EAC9B,MAAyC,EACzC,MAAc,EACkB,EAAE;IAClC,IACE,CAAC,MAAM,EAAE,QAAQ;QACjB,CAAC,MAAM,EAAE,MAAM;QACf,CAAC,MAAM,EAAE,gBAAgB;QACzB,CAAC,MAAM,EAAE,SAAS;QAClB,MAAM,EAAE,SAAS,IAAI,IAAI;QACzB,MAAM,EAAE,aAAa,IAAI,IAAI,EAC7B;QACA,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEnE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE;QAC/B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,gGAAgG,CACjG,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,gCAAgC,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;QAExF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QAEtB,MAAM,wBAAwB,GAAG;YAC/B,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,kBAAkB;YAC1B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,GAAG;YACf,wBAAwB,EAAE,MAAM,CAAC,wBAAwB;SAC1D,CAAA;QAED,OAAO,MAAM,gCAAgC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC9E,CAAC,EAAE,+DAA+D,CAAC,CAAA;AACrE,CAAC,CAAA"}

package/dist/repositories/notificationRecipients/getNotificationRecipients.js

@@ -1,15 +1,29 @@
 import { NotificationRecipient } from '../../entities';
+import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
 export const getNotificationRecipients = async (novaDataSource, params, logger) => {
     if (!params?.filters?.clientId) {
         logger.warn({ params }, 'NotificationRecipientsRepository::getNotificationRecipients - missing required parameters');
         return [];
     }
+    const userIdBinaryBuffer = uuidStringToBinaryBuffer(params?.filters?.userId);
+    if (params?.filters?.userId != null && userIdBinaryBuffer == null) {
+        logger.warn({ params }, 'NotificationRecipientsRepository::getNotificationRecipients - userId should be a valid uuid');
+        return [];
+    }
     return novaDataSource.safeQuery(async (dataSource) => {
         const notificationRecipientsRepository = dataSource.getRepository(NotificationRecipient);
         let queryBuilder = notificationRecipientsRepository.createQueryBuilder('notificationRecipient');
         queryBuilder = queryBuilder.where(`notificationRecipient.clientId = :clientId`, {
             clientId: params.filters.clientId,
         });
+        if (userIdBinaryBuffer != null) {
+            queryBuilder = queryBuilder.andWhere(`notificationRecipient.userId = :userId`, {
+                userId: userIdBinaryBuffer,
+            });
+        }
+        if (params?.projectionOptions?.withUserAlertConfiguration) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('notificationRecipient.userAlertConfiguration', 'userAlertConfiguration');
+        }
         const result = await queryBuilder.getMany();
         return result;
     }, 'NotificationRecipientsRepository::getNotificationRecipients');

package/dist/repositories/notificationRecipients/getNotificationRecipients.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNotificationRecipients.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/getNotificationRecipients.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAKtD,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,cAA8B,EAC9B,MAAuC,EACvC,MAAc,EACoB,EAAE;IACpC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2FAA2F,CAC5F,CAAA;QAED,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,gCAAgC,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;QAExF,IAAI,YAAY,GAAG,gCAAgC,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAA;QAE/F,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,4CAA4C,EAAE;YAC9E,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,6DAA6D,CAAC,CAAA;AACnE,CAAC,CAAA"}
+{"version":3,"file":"getNotificationRecipients.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/getNotificationRecipients.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,cAA8B,EAC9B,MAAuC,EACvC,MAAc,EACoB,EAAE;IACpC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2FAA2F,CAC5F,CAAA;QAED,OAAO,EAAE,CAAA;KACV;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE5E,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,IAAI,IAAI,kBAAkB,IAAI,IAAI,EAAE;QACjE,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,gCAAgC,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;QAExF,IAAI,YAAY,GAAG,gCAAgC,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAA;QAE/F,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,4CAA4C,EAAE;YAC9E,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,kBAAkB,IAAI,IAAI,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBAC7E,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,0BAA0B,EAAE;YACzD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,8CAA8C,EAC9C,wBAAwB,CACzB,CAAA;SACF;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,6DAA6D,CAAC,CAAA;AACnE,CAAC,CAAA"}

package/dist/repositories/userConfigurations/getUserAlertConfigurations.js

@@ -18,6 +18,9 @@ export const getUserAlertConfigurations = async (novaDataSource, params, logger)
         queryBuilder = queryBuilder.where('userAlertConfiguration.userId = :userId', {
             userId: userIdBinaryBuffer,
         });
+        if (params?.projectionOptions?.withNotificationRecipients) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('userAlertConfiguration.notificationRecipients', 'notificationRecipient');
+        }
         queryBuilder = queryBuilder.orderBy('userAlertConfiguration.alertTypeId');
         const result = await queryBuilder.getMany();
         return result;

package/dist/repositories/userConfigurations/getUserAlertConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUserAlertConfigurations.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getUserAlertConfigurations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAIvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,cAA8B,EAC9B,MAAwC,EACxC,MAAc,EACqB,EAAE;IACrC,4BAA4B;IAC5B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,wFAAwF,CACzF,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE5E,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2FAA2F,CAC5F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,iCAAiC,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAA;QAE1F,IAAI,YAAY,GAAG,iCAAiC,CAAC,kBAAkB,CACrE,wBAAwB,CACzB,CAAA;QAED,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAC5C,kCAAkC,EAClC,WAAW,EACX,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CACrE,CAAA;QAED,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,yCAAyC,EAAE;YAC3E,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CAAA;QAEF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;QAEzE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,0DAA0D,CAAC,CAAA;AAChE,CAAC,CAAA"}
+{"version":3,"file":"getUserAlertConfigurations.js","sourceRoot":"","sources":["../../../src/repositories/userConfigurations/getUserAlertConfigurations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAIvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,cAA8B,EAC9B,MAAwC,EACxC,MAAc,EACqB,EAAE;IACrC,4BAA4B;IAC5B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,wFAAwF,CACzF,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE5E,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2FAA2F,CAC5F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAE/D,EAAE;QACF,MAAM,iCAAiC,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAA;QAE1F,IAAI,YAAY,GAAG,iCAAiC,CAAC,kBAAkB,CACrE,wBAAwB,CACzB,CAAA;QAED,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAC5C,kCAAkC,EAClC,WAAW,EACX,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CACrE,CAAA;QAED,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,yCAAyC,EAAE;YAC3E,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,iBAAiB,EAAE,0BAA0B,EAAE;YACzD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,+CAA+C,EAC/C,uBAAuB,CACxB,CAAA;SACF;QAED,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;QAEzE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,0DAA0D,CAAC,CAAA;AAChE,CAAC,CAAA"}

package/dist/types/notificationRecipients.d.ts

@@ -2,6 +2,10 @@ import { NotificationRecipientType } from './enums';
 export interface GetNotificationRecipientsParams {
     filters: {
         clientId: number;
+        userId?: string;
+    };
+    projectionOptions?: {
+        withUserAlertConfiguration?: boolean;
     };
 }
 export interface CreateNotificationRecipientParams {
@@ -15,6 +19,7 @@ export interface CreateNotificationRecipientParams {
     userId: string;
     dataSourceTypeId?: number;
     unsubscribedInfo?: string;
+    userAlertConfigurationId?: number;
 }
 export interface UpdateNotificationRecipientParams {
     filters: {

package/dist/types/userConfigurations.d.ts

@@ -45,6 +45,9 @@ export interface GetUserAlertConfigurationsParams {
         userId: string;
         includeBeta: boolean;
     };
+    projectionOptions?: {
+        withNotificationRecipients?: boolean;
+    };
 }
 export interface GetCustomUserAlertConfigurationParams extends OptionalReportPagination {
     filters: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",