@spytecgps/nova-orm 1.2.29-rc7 → 1.2.29-rc8

package/dist/repositories/users/getUserById.js

@@ -1,22 +1,37 @@
 import { User } from '../../entities';
+import { oneRequiredGetUserByIdParams } from '../../types/user';
+import { allAttributesAreNull } from '../../utils/paramsValidators';
 import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
 export const getUserById = async (novaDataSource, params, logger) => {
-    if (!params?.filters?.id) {
+    if (allAttributesAreNull(params, oneRequiredGetUserByIdParams)) {
         logger.warn({ params }, 'UsersRepository::getUserById - missing required parameters');
         return null;
     }
-    const binaryBuffer = uuidStringToBinaryBuffer(params?.filters?.id);
-    if (!binaryBuffer?.length) {
-        logger.warn({ params }, 'UsersRepository::getUserById - user id should be a valid UUID');
-        return null;
-    }
-    return novaDataSource.safeQuery(async (dataSource) => {
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository.createQueryBuilder('user');
-        queryBuilder = queryBuilder.where('user.id = :id', {
-            id: binaryBuffer,
-        });
+        if (queryRunner) {
+            queryBuilder = queryBuilder.setQueryRunner(queryRunner);
+        }
+        if (params.filters.id) {
+            const binaryBuffer = uuidStringToBinaryBuffer(params?.filters?.id);
+            if (!binaryBuffer?.length) {
+                logger.warn({ params }, 'UsersRepository::getUserById - user id should be a valid UUID');
+                return null;
+            }
+            queryBuilder = queryBuilder.where('user.id = :id', {
+                id: binaryBuffer,
+            });
+        }
+        if (params.filters.numberId) {
+            queryBuilder = queryBuilder.andWhere('user.numberId = :numberId', {
+                numberId: params.filters.numberId,
+            });
+        }
         const result = await queryBuilder.getOne();
         return result;
-    }, 'UsersRepository::getUserById');
+    }, 'UsersRepository::getUserById', dbQueryRunner);
 };
+//# sourceMappingURL=getUserById.js.map

package/dist/repositories/users/getUserById.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUserById.js","sourceRoot":"","sources":["../../../src/repositories/users/getUserById.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAGrC,OAAO,EAAqB,4BAA4B,EAAE,MAAM,kBAAkB,CAAA;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,cAA8B,EAC9B,MAAyB,EACzB,MAAc,EACC,EAAE;IACjB,IAAI,oBAAoB,CAAC,MAAM,EAAE,4BAA4B,CAAC,EAAE;QAC9D,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,4DAA4D,CAAC,CAAA;QACrF,OAAO,IAAI,CAAA;KACZ;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAiB,EAAE;QAC7E,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,IAAI,YAAY,GAAG,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QAE7D,IAAI,WAAW,EAAE;YACf,YAAY,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACxD;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE;YACrB,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;YAElE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;gBACxF,OAAO,IAAI,CAAA;aACZ;YAED,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,eAAe,EAAE;gBACjD,EAAE,EAAE,YAAY;aACjB,CAAC,CAAA;SACH;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,2BAA2B,EAAE;gBAChE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAE1C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,8BAA8B,EAC9B,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUserClientRelatedEntitiesCount.js

@@ -0,0 +1,64 @@
+import { Client } from '../../entities';
+import { BoundaryStatus, DeviceStatus, UserStatus } from '../../types/enums';
+import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
+export const getUserClientRelatedEntitiesCount = async (novaDataSource, params, logger) => {
+    if (!params.filters.userId) {
+        logger.warn({ params }, 'UsersRepository::getUserClientRelatedEntitiesCount - missing required parameters');
+        return null;
+    }
+    const binaryBuffer = uuidStringToBinaryBuffer(params?.filters?.userId);
+    if (!binaryBuffer?.length) {
+        logger.warn({ params }, 'UsersRepository::getUserClientRelatedEntitiesCount - user id should be a valid UUID');
+        return null;
+    }
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+        const clientsRepository = dataSource.getRepository(Client);
+        const queryBuilder = clientsRepository
+            .createQueryBuilder('client')
+            .select('client.id', 'clientId');
+        if (queryRunner) {
+            queryBuilder.setQueryRunner(queryRunner);
+        }
+        if (params.projectionOptions?.withDevicesCount) {
+            queryBuilder.addSelect(subQuery => {
+                return subQuery
+                    .select('COUNT(*)', 'devicesCount')
+                    .from('device', 'd')
+                    .where('client.id = d.clientId')
+                    .andWhere('d.status = :deviceStatus', { deviceStatus: DeviceStatus.Active });
+            }, 'devicesCount');
+        }
+        if (params.projectionOptions?.withBoundariesCount) {
+            queryBuilder.addSelect(subQuery => {
+                return subQuery
+                    .select('COUNT(*)', 'boundariesCount')
+                    .from('boundary', 'b')
+                    .where('client.id = b.clientId')
+                    .andWhere('b.status = :boundaryStatus', { boundaryStatus: BoundaryStatus.Active });
+            }, 'boundariesCount');
+        }
+        if (params.projectionOptions?.withUsersCount) {
+            queryBuilder.addSelect(subQuery => {
+                return subQuery
+                    .select('COUNT(*)', 'usersCount')
+                    .from('user', 'u')
+                    .where('client.id = u.clientId')
+                    .andWhere('u.status = :userStatus', { userStatus: UserStatus.Active });
+            }, 'usersCount');
+        }
+        queryBuilder.where(`EXISTS (
+          SELECT 1
+          FROM user u2
+          WHERE client.id = u2.clientId
+          AND u2.id = :userId
+          LIMIT 1
+        )`, {
+            userId: binaryBuffer,
+        });
+        const result = await queryBuilder.getRawOne();
+        return result;
+    }, 'UsersRepository::getUserClientRelatedEntitiesCount', dbQueryRunner);
+};
+//# sourceMappingURL=getUserClientRelatedEntitiesCount.js.map

package/dist/repositories/users/getUserClientRelatedEntitiesCount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUserClientRelatedEntitiesCount.js","sourceRoot":"","sources":["../../../src/repositories/users/getUserClientRelatedEntitiesCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEvC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAM5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,EACpD,cAA8B,EAC9B,MAA+C,EAC/C,MAAc,EACwC,EAAE;IACxD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;QAC1B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,kFAAkF,CACnF,CAAA;QAED,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAEtE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,qFAAqF,CACtF,CAAA;QAED,OAAO,IAAI,CAAA;KACZ;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EAC6B,EAAE;QACxD,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE1D,MAAM,YAAY,GAAG,iBAAiB;aACnC,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAElC,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE;YAC9C,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAChC,OAAO,QAAQ;qBACZ,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC;qBAClC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;qBACnB,KAAK,CAAC,wBAAwB,CAAC;qBAC/B,QAAQ,CAAC,0BAA0B,EAAE,EAAE,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAA;YAChF,CAAC,EAAE,cAAc,CAAC,CAAA;SACnB;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,EAAE;YACjD,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAChC,OAAO,QAAQ;qBACZ,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC;qBACrC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC;qBACrB,KAAK,CAAC,wBAAwB,CAAC;qBAC/B,QAAQ,CAAC,4BAA4B,EAAE,EAAE,cAAc,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,CAAA;YACtF,CAAC,EAAE,iBAAiB,CAAC,CAAA;SACtB;QAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,cAAc,EAAE;YAC5C,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAChC,OAAO,QAAQ;qBACZ,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC;qBAChC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;qBACjB,KAAK,CAAC,wBAAwB,CAAC;qBAC/B,QAAQ,CAAC,wBAAwB,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;YAC1E,CAAC,EAAE,YAAY,CAAC,CAAA;SACjB;QAED,YAAY,CAAC,KAAK,CAChB;;;;;;UAME,EACF;YACE,MAAM,EAAE,YAAY;SACrB,CACF,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,CAAA;QAE7C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,oDAAoD,EACpD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUserData.js

@@ -1,15 +1,16 @@
-import { User } from '../../entities';
 import { binaryBufferToUuidString } from '../../utils/uuidHelpers';
 export const getUsersData = async (novaDataSource, params, logger) => {
     if (!params?.filters?.imei) {
         logger.warn({ params }, 'UsersRepository::getUsersData - missing required parameters');
         return [];
     }
-    return novaDataSource.safeQuery(async (dataSource) => {
-        const usersRepository = dataSource.getRepository(User);
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (_dataSource, queryRunner) => {
         const query = `SELECT U.id as userId, U.telephone, U.email
                   , UC.isMetric, coalesce (UC.timezone, '')  as timezone, UC.alertsNotificationsOn, UC.speedUnits , UC.distanceUnits
                   , AC.alertTypeId, AC.smsNotification, AC.emailNotification, AC.alertValue, AC.pushNotification , AC.appNotification , AC.alertMetadata
+                  , AC.id as userAlertConfigurationId, AC.name as alertName, AC.filter, AC.enabled
                   , D.name as deviceName, D.deviceTypeId
                   , C.id as clientId
                   , U.isAdmin
@@ -21,9 +22,10 @@ export const getUsersData = async (novaDataSource, params, logger) => {
                     from notificationRecipient as NR
                     where NR.clientId = C.id
                     and NR.userId = U.id
-                    and  NR.notificationType = 2
+                    and NR.notificationType = 2
                     and NR.isEnabled = true
-                    and NR.unsubscribed = false ) as phoneNumbers
+                    and NR.unsubscribed = false 
+                    and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id )) as phoneNumbers
                   , ( SELECT  CONCAT('[',
                     GROUP_CONCAT( distinct case when  NR.isUserProfile = true
                     then CONCAT('"', U.email, '"') else CONCAT('"', NR.recipient, '"') end SEPARATOR ','),
@@ -33,7 +35,8 @@ export const getUsersData = async (novaDataSource, params, logger) => {
                     and NR.userId = U.id
                     and  NR.notificationType = 1
                     and NR.isEnabled = true
-                    and NR.unsubscribed = false ) as emailAddresses
+                    and NR.unsubscribed = false
+                    and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id )  ) as emailAddresses
                   FROM device AS D
                   JOIN client AS C
                   ON D.clientId = C.id
@@ -48,7 +51,7 @@ export const getUsersData = async (novaDataSource, params, logger) => {
                   JOIN country AS CO
                   ON CO.id = CASE WHEN(U.countryId IS NULL OR U.countryId = 0) THEN 236 ELSE U.countryId END
                   WHERE D.imei = ?`;
-        const result = await usersRepository.query(query, [params.filters.imei]);
+        const result = await queryRunner.query(query, [params.filters.imei]);
         return result.map(item => ({
             ...item,
             userId: binaryBufferToUuidString(item.userId),
@@ -62,5 +65,6 @@ export const getUsersData = async (novaDataSource, params, logger) => {
             phoneNumbers: item.phoneNumbers ? JSON.parse(item.phoneNumbers) : [],
             emailAddresses: item.emailAddresses ? JSON.parse(item.emailAddresses) : [],
         }));
-    }, 'UsersRepository::getUsersData');
+    }, 'UsersRepository::getUsersData', dbQueryRunner);
 };
+//# sourceMappingURL=getUserData.js.map

package/dist/repositories/users/getUserData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUserData.js","sourceRoot":"","sources":["../../../src/repositories/users/getUserData.ts"],"names":[],"mappings":"AAKA,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,IAAI,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,6DAA6D,CAAC,CAAA;QACtF,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,WAA2B,EAAE,WAAyB,EAAuB,EAAE;QACpF,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA2Ce,CAAA;QAE7B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QAEpE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzB,GAAG,IAAI;YACP,MAAM,EAAE,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC;YAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,CAAC;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,KAAK,CAAC;YAC7B,oBAAoB,EAAE,IAAI,CAAC,qBAAqB,KAAK,CAAC;YACtD,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,CAAC;YAC3C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,KAAK,CAAC;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,KAAK,CAAC;YAC7C,eAAe,EAAE,IAAI,CAAC,eAAe,KAAK,CAAC;YAC3C,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;YACpE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;SAC3E,CAAC,CAAC,CAAA;IACL,CAAC,EACD,+BAA+B,EAC/B,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUserInfoWithAmazonDevicesInfo.js

@@ -0,0 +1,88 @@
+import { AcumaticaImeiIccidData, AcumaticaShipment, Client, Device, DeviceType, User, } from '../../entities';
+import { Enums } from '../../types';
+import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
+export const getUserInfoWithAmazonDevicesInfo = async (novaDataSource, params, logger) => {
+    if (!params?.filters?.userId) {
+        logger.warn({ params }, 'UsersRepository::getUserInfoWithAmazonDevicesInfo - missing required parameters');
+        return null;
+    }
+    const userIdBinaryBuffer = uuidStringToBinaryBuffer(params.filters.userId);
+    if (!userIdBinaryBuffer) {
+        logger.warn({ params }, 'UsersRepository::getUserInfoWithAmazonDevicesInfo - invalid user ID');
+        return null;
+    }
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+        const usersRepository = dataSource.getRepository(User);
+        const queryBuilder = usersRepository
+            .createQueryBuilder('user')
+            .innerJoin(Client, 'client', 'client.id = user.clientId')
+            .innerJoin(Device, 'device', 'device.clientId = user.clientId and device.status = :deviceStatus', {
+            deviceStatus: Enums.DeviceStatus.Active,
+        })
+            .innerJoin(DeviceType, 'deviceType', 'device.deviceTypeId = deviceType.id')
+            .leftJoin(AcumaticaImeiIccidData, 'acumaticaImeiIccidData', 'device.imei = acumaticaImeiIccidData.imei')
+            .leftJoin(AcumaticaShipment, 'acumaticaShipment', `acumaticaImeiIccidData.amazonShipmentId = acumaticaShipment.shipmentId and 
+           acumaticaShipment.location IS NOT NULL and acumaticaShipment.location <> ''`)
+            .where('user.id = :userId and user.status = :userStatus', {
+            userId: userIdBinaryBuffer,
+            userStatus: Enums.UserStatus.Active,
+        })
+            .distinct(true)
+            .select([
+            'user.id as userId',
+            'user.email as email',
+            'client.id as clientId',
+            'client.useType as useType',
+            'client.clientTypeId as clientTypeId',
+            'device.imei as imei',
+            'device.name as deviceName',
+            'device.status as deviceStatus',
+            'device.createdAt as deviceCreatedAt',
+            'deviceType.id as deviceTypeId',
+            'deviceType.brand as deviceBrand',
+            'deviceType.model as deviceModel',
+            'deviceType.name as deviceTypeName',
+            'deviceType.supported as deviceTypeSupported',
+            'deviceType.modelFamily as deviceTypeModelFamily',
+            'acumaticaShipment.location as amazonShipment',
+            `case when acumaticaShipment.location is not null and acumaticaShipment.location <> '' then true else false end as isAmazonDevice`,
+        ]);
+        if (queryRunner) {
+            queryBuilder.setQueryRunner(queryRunner);
+        }
+        const queryResult = await queryBuilder.getRawMany();
+        let result;
+        queryResult.forEach(row => {
+            if (!result) {
+                result = {
+                    userId: params.filters.userId,
+                    email: row.email,
+                    clientId: row.clientId,
+                    useType: row.useType,
+                    clientTypeId: row.clientTypeId,
+                    devices: [],
+                };
+            }
+            result.devices.push({
+                imei: row.imei,
+                name: row.deviceName,
+                status: row.deviceStatus,
+                createdAt: row.deviceCreatedAt,
+                amazonShipment: row.amazonShipment,
+                isAmazonDevice: row.isAmazonDevice == 1 ? true : false,
+                deviceType: {
+                    id: row.deviceTypeId,
+                    brand: row.deviceBrand,
+                    model: row.deviceModel,
+                    name: row.deviceTypeName,
+                    supported: row.deviceTypeSupported == 1 ? true : false,
+                    modelFamily: row.deviceTypeModelFamily,
+                },
+            });
+        });
+        return result;
+    }, 'UsersRepository::getUserInfoWithAmazonDevicesInfo', dbQueryRunner);
+};
+//# sourceMappingURL=getUserInfoWithAmazonDevicesInfo.js.map

package/dist/repositories/users/getUserInfoWithAmazonDevicesInfo.js.map

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

package/dist/repositories/users/getUsers.js

@@ -1,17 +1,23 @@
-import { User } from '../../entities';
+import { EntityTag, Tag, User } from '../../entities';
 import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
 export const getUsers = async (novaDataSource, params, logger) => {
     if (!params?.filters?.emailList?.length &&
         !params?.filters?.userName &&
         !params?.filters?.clientId &&
         !params?.filters?.search &&
-        !params?.filters?.status) {
+        !params?.filters?.status &&
+        !params?.filters?.tagIdList?.length) {
         logger.warn({ params }, 'UsersRepository::getUsers - missing required parameters');
         return [];
     }
-    return novaDataSource.safeQuery(async (dataSource) => {
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository.createQueryBuilder('user');
+        if (queryRunner) {
+            queryBuilder = queryBuilder.setQueryRunner(queryRunner);
+        }
         if (params.filters.emailList?.length) {
             queryBuilder = queryBuilder.where('LOWER(user.email) IN (:...emailList)', {
                 emailList: params.filters.emailList.map(email => email.trim().toLowerCase()),
@@ -42,8 +48,55 @@ export const getUsers = async (novaDataSource, params, logger) => {
                 status: params.filters.status,
             });
         }
+        if (params.filters.tagIdList?.length) {
+            queryBuilder.innerJoin(EntityTag, 'entityTag', `entityTag.entityId = user.numberId 
+           AND entityTag.entityType = 'User'
+           AND entityTag.tagId IN (:...tagIdList)`, {
+                tagIdList: params.filters.tagIdList,
+            });
+        }
         queryBuilder = queryBuilder.orderBy('user.lastname', 'DESC');
-        const result = await queryBuilder.getMany();
-        return result;
-    }, 'UsersRepository::getUsers');
+        if (params.projectionOptions?.withSecurityRole) {
+            queryBuilder = queryBuilder
+                .leftJoinAndSelect('user.userSecurityRoles', 'userSecurityRoles')
+                .leftJoinAndSelect('userSecurityRoles.securityRole', 'securityRole');
+        }
+        if (params.projectionOptions?.withCountryInfo) {
+            queryBuilder = queryBuilder
+                .leftJoinAndSelect('user.telephoneCountry', 'telephoneCountry')
+                .leftJoinAndSelect('user.country', 'country');
+        }
+        if (params.projectionOptions?.withUserConfiguration) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('user.userConfiguration', 'userConfiguration');
+        }
+        if (params.projectionOptions?.withClientAlertNotificationOverride) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('user.clientAlertNotificationOverride', 'clientAlertNotificationOverride');
+        }
+        let users = await queryBuilder.getMany();
+        if (params.projectionOptions?.withSecurityGroupTag) {
+            //TODO: Refactor this to a common function,
+            // change the approach to get the security group tags for all the users in one query,
+            // then map them to the users. Target methods: getDevices, getBoundariesByClientId
+            const entityTagRepo = dataSource.getRepository(EntityTag);
+            users = await Promise.all(users.map(async (user) => {
+                const entityTagQueryBuilder = entityTagRepo.createQueryBuilder('entityTag');
+                if (queryRunner) {
+                    entityTagQueryBuilder.setQueryRunner(queryRunner);
+                }
+                const securityGroupEntityTags = await entityTagQueryBuilder
+                    .where('entityTag.entityId = :entityId AND entityTag.entityType = :entityType', {
+                    entityId: user.numberId,
+                    entityType: 'User',
+                })
+                    .innerJoin(Tag, 'tag', `tag.id = entityTag.tagId AND JSON_CONTAINS(tag.metadata, :metadata)`, { metadata: JSON.stringify({ isSecurityGroup: true }) })
+                    .getMany();
+                return {
+                    ...user,
+                    securityGroupEntityTags,
+                };
+            }));
+        }
+        return users;
+    }, 'UsersRepository::getUsers', dbQueryRunner);
 };
+//# sourceMappingURL=getUsers.js.map

package/dist/repositories/users/getUsers.js.map

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

package/dist/repositories/users/getUsersConfigurationByImei.js

@@ -5,11 +5,19 @@ import { User } from '../../entities';
 //Device (name)
 //Country (international dialing code)
 export const getUsersConfigurationByImei = async (novaDataSource, params, logger) => {
-    try {
-        await novaDataSource.connect();
-        const usersRepository = novaDataSource.getRepository(User);
-        const userConfiguration = usersRepository
-            .createQueryBuilder('user')
+    if (!params?.filters?.imei) {
+        logger.warn({ params }, 'UsersRepository::getUsersConfigurationByImei - missing required parameters');
+        return [];
+    }
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+        const usersRepository = dataSource.getRepository(User);
+        const queryBuilder = usersRepository.createQueryBuilder('user');
+        if (queryRunner) {
+            queryBuilder.setQueryRunner(queryRunner);
+        }
+        const userConfiguration = queryBuilder
             .innerJoin('user.client', 'client')
             .innerJoinAndSelect('client.devices', 'device')
             .innerJoinAndSelect('user.userConfiguration', 'userConfiguration')
@@ -18,12 +26,6 @@ export const getUsersConfigurationByImei = async (novaDataSource, params, logger
             .where('device.imei = :imei', { imei: params.filters.imei })
             .getMany();
         return userConfiguration;
-    }
-    catch (error) {
-        logger.error({ error }, 'UsersRepository::getUsersConfigurationByImei error');
-        throw error;
-    }
-    finally {
-        await novaDataSource.disconnect();
-    }
+    }, 'UsersRepository::getUsersConfigurationByImei', dbQueryRunner);
 };
+//# sourceMappingURL=getUsersConfigurationByImei.js.map

package/dist/repositories/users/getUsersConfigurationByImei.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUsersConfigurationByImei.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsersConfigurationByImei.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAKrC,MAAM;AACN,oBAAoB;AACpB,qBAAqB;AACrB,eAAe;AACf,sCAAsC;AAEtC,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,cAA8B,EAC9B,MAAyC,EACzC,MAAc,EACG,EAAE;IACnB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,4EAA4E,CAC7E,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAmB,EAAE;QAC/E,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,MAAM,YAAY,GAAG,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QAE/D,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,iBAAiB,GAAG,YAAY;aACnC,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC;aAClC,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,CAAC;aAC9C,kBAAkB,CAAC,wBAAwB,EAAE,mBAAmB,CAAC;aACjE,kBAAkB,CAAC,6BAA6B,EAAE,wBAAwB,CAAC;aAC3E,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC;aAC7C,KAAK,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aAC3D,OAAO,EAAE,CAAA;QAEZ,OAAO,iBAAiB,CAAA;IAC1B,CAAC,EACD,8CAA8C,EAC9C,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUsersIdByPhoneAndCountryCode.js

@@ -5,7 +5,9 @@ export const getUsersIdsByPhoneAndCountryCode = async (novaDataSource, params, l
         logger.warn({ params }, 'UsersRepository::getUsersIdsByPhoneAndCountryCode - missing required parameters');
         return [];
     }
-    return novaDataSource.safeQuery(async (dataSource) => {
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository
             .createQueryBuilder('user')
@@ -14,8 +16,12 @@ export const getUsersIdsByPhoneAndCountryCode = async (novaDataSource, params, l
             .andWhere(`user.telephone = REPLACE(:phone, country.internationalDirectDialing, '')`, {
             phone: params.filters.phone,
         });
+        if (queryRunner) {
+            queryBuilder = queryBuilder.setQueryRunner(queryRunner);
+        }
         queryBuilder = queryBuilder.select('user.id as id');
         const result = await queryBuilder.getRawMany();
         return result?.map(item => binaryBufferToUuidString(item.id));
-    }, 'UsersRepository::getUsersIdsByPhoneAndCountryCode');
+    }, 'UsersRepository::getUsersIdsByPhoneAndCountryCode', dbQueryRunner);
 };
+//# sourceMappingURL=getUsersIdByPhoneAndCountryCode.js.map

package/dist/repositories/users/getUsersIdByPhoneAndCountryCode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUsersIdByPhoneAndCountryCode.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsersIdByPhoneAndCountryCode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAI9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EACnD,cAA8B,EAC9B,MAA8C,EAC9C,MAAc,EACK,EAAE;IACrB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE;QAC5D,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,iFAAiF,CAClF,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAqB,EAAE;QACjF,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,IAAI,YAAY,GAAG,eAAe;aAC/B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,6BAA6B,CAAC;aAC5D,KAAK,CAAC,mCAAmC,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;aACvF,QAAQ,CAAC,0EAA0E,EAAE;YACpF,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;SAC5B,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACxD;QAED,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;QAE9C,OAAO,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/D,CAAC,EACD,mDAAmD,EACnD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUsersInfoWithActivationInfo.js

@@ -0,0 +1,101 @@
+export const getUsersInfoWithActivationInfo = async (novaDataSource, params, logger) => {
+    if (!params?.filters?.userId) {
+        logger.warn({ params }, 'UsersRepository::getUsersInfoWithActivationInfo - missing required parameters');
+        return null;
+    }
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (_dataSource, queryRunner) => {
+        const query = `
+        SELECT 
+            subQuery.*,
+            CASE WHEN asd.location = 'FBA-US' THEN TRUE ELSE FALSE END AS amazonUSA,
+            CASE WHEN asd.location = 'FBA-CA' THEN TRUE ELSE FALSE END AS amazonCanada,
+            CASE WHEN asd.location = 'FBA-MX' THEN TRUE ELSE FALSE END AS amazonMexico
+        FROM (
+            SELECT DISTINCT
+                BIN_TO_UUID(u.id) as userId,
+                c.id as clientId,
+                c.useType,
+                c.clientTypeId,
+                ct.name AS clientType,
+                usr.securityRoleId AS userRoleId,
+                sr.name AS userRole,
+                u.email,
+                u.firstName,
+                u.lastName,
+                u.companyName,
+                COALESCE(ui.spyInvitesPending, 0) AS spyInvitesPending,
+                COALESCE(ui.spyInvitesRedeemed, 0) AS spyInvitesRedeemed,
+                COALESCE(ui.spyInvitesCancelled, 0) AS spyInvitesCancelled,
+                uam.firstName AS activationFirstName,
+                uam.lastName AS activationLastName,
+                uam.email AS activationEmail,
+                uam.phone AS activationPhone,
+                uam.trackingReason AS activationTrackingReason,
+                uam.companyName AS activationCompanyName,
+                uam.role AS activationRole,
+                uam.industry AS activationIndustry,
+                uam.devicesActivatingCategory AS activationDevicesActivatingCategory,
+                uam.devicesActivatingCount AS activationDevicesActivatingCount,
+                uam.plan AS activationPlan,
+                uam.usersInvitedCount AS activationUsersInvitedCount,
+                uam.meetingScheduled AS activationMeetingScheduled,
+                uam.assetsCountRange AS activationAssetsCountRange,
+                uam.createdAt AS activationCreated,
+                uam.modifiedAt AS activationModified,
+                uam.planAnnual AS activationPlanAnnual,
+                uam.planId AS activationPlanId,
+                d.devicesCount,
+                u.status
+            FROM user u       
+            JOIN client c ON c.id = u.clientId
+            LEFT JOIN userActivationMetric uam ON uam.userId = u.id
+            LEFT JOIN clientType ct ON ct.id = c.clientTypeId
+            LEFT JOIN userSecurityRole usr ON usr.userId = u.id
+            LEFT JOIN securityRole sr ON sr.id = usr.securityRoleId
+            LEFT JOIN (
+                SELECT c.id as clientId, COUNT(*) AS devicesCount
+                FROM device d
+                JOIN client c ON c.id = d.clientId
+                WHERE d.status = 'A'
+                GROUP BY c.id
+            ) d ON d.clientId = c.id
+            LEFT JOIN (
+                SELECT 
+                    ui.inviterUserId,
+                    SUM(CASE WHEN ui.statusId = 1 THEN 1 ELSE 0 END) AS spyInvitesPending,
+                    SUM(CASE WHEN ui.statusId = 2 THEN 1 ELSE 0 END) AS spyInvitesRedeemed,
+                    SUM(CASE WHEN ui.statusId = 3 THEN 1 ELSE 0 END) AS spyInvitesCancelled
+                FROM userInvitation ui
+                GROUP BY ui.inviterUserId
+            ) ui ON ui.inviterUserId = u.id
+            WHERE BIN_TO_UUID(u.id) = ?
+        ) AS subQuery
+        LEFT JOIN (
+            SELECT DISTINCT
+                d.clientId,
+                as1.location
+            FROM device d
+            JOIN acumaticaImeiIccidData aiid ON aiid.imei = d.imei
+            JOIN acumaticaShipment as1 ON aiid.amazonShipmentId = as1.shipmentId
+            WHERE as1.location IS NOT NULL AND as1.location <> '' AND d.status = 'A'
+            GROUP BY as1.location, d.clientId
+        ) AS asd ON asd.clientId = subQuery.clientId
+      `;
+        const queryResult = await queryRunner.query(query, [params.filters.userId]);
+        if (!queryResult?.length) {
+            return null;
+        }
+        const result = {
+            ...queryResult[0],
+            userId: queryResult[0].userId,
+            activationMeetingScheduled: queryResult[0].activationMeetingScheduled === 1,
+            amazonUSA: queryResult[0].amazonUSA === 1,
+            amazonCanada: queryResult[0].amazonCanada === 1,
+            amazonMexico: queryResult[0].amazonMexico === 1,
+        };
+        return result;
+    }, 'UsersRepository::getUsersInfoWithActivationInfo', dbQueryRunner);
+};
+//# sourceMappingURL=getUsersInfoWithActivationInfo.js.map

package/dist/repositories/users/getUsersInfoWithActivationInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUsersInfoWithActivationInfo.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsersInfoWithActivationInfo.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,cAA8B,EAC9B,MAA2C,EAC3C,MAAc,EACuB,EAAE;IACvC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,+EAA+E,CAChF,CAAA;QACD,OAAO,IAAI,CAAA;KACZ;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,WAA2B,EAC3B,WAAyB,EACY,EAAE;QACvC,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4Eb,CAAA;QAED,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAE3E,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE;YACxB,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,MAAM,GAAG;YACb,GAAG,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM;YAC7B,0BAA0B,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,0BAA0B,KAAK,CAAC;YAC3E,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC;YACzC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC;YAC/C,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC;SAChD,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC,EACD,iDAAiD,EACjD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}

package/dist/repositories/users/getUsersInfoWithDevicesInfo.js

@@ -0,0 +1,59 @@
+import { Device, User } from '../../entities';
+import { Enums } from '../../types';
+import { binaryBufferToUuidString } from '../../utils/uuidHelpers';
+export const getUsersInfoWithDevicesInfo = async (novaDataSource, params, logger) => {
+    if (!params?.filters?.userName) {
+        logger.warn({ params }, 'UsersRepository::getUsersInfoWithDevicesInfo - missing required parameters');
+        return [];
+    }
+    // Force the query to run on master or slave
+    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
+    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+        const usersRepository = dataSource.getRepository(User);
+        const queryBuilder = usersRepository
+            .createQueryBuilder('user')
+            .innerJoin(Device, 'device', 'device.clientId = user.clientId and device.status = :status', {
+            status: Enums.DeviceStatus.Active,
+        })
+            .where('LOWER(user.userName) = LOWER(:userName)', {
+            userName: params.filters.userName.trim(),
+        })
+            .orderBy('user.email', 'ASC')
+            .select([
+            'user.id as userId',
+            'user.firstName as firstName',
+            'user.lastName as lastName',
+            'user.email as email',
+            'user.userName as userName',
+            'device.imei as imei',
+            'device.name as deviceName',
+        ]);
+        if (queryRunner) {
+            queryBuilder.setQueryRunner(queryRunner);
+        }
+        const queryResult = await queryBuilder.getRawMany();
+        const result = [];
+        const userIds = [];
+        queryResult.forEach(row => {
+            const userId = binaryBufferToUuidString(row.userId);
+            if (!userIds.includes(userId)) {
+                userIds.push(userId);
+                result.push({
+                    userId,
+                    firstName: row.firstName,
+                    lastName: row.lastName,
+                    email: row.email,
+                    userName: row.userName,
+                    devices: [],
+                });
+            }
+            const userIndex = result.findIndex(user => user.userId === userId);
+            result[userIndex].devices.push({
+                imei: row.imei,
+                name: row.deviceName,
+            });
+        });
+        return result;
+    }, 'UsersRepository::getUsersInfoWithDevicesInfo', dbQueryRunner);
+};
+//# sourceMappingURL=getUsersInfoWithDevicesInfo.js.map

package/dist/repositories/users/getUsersInfoWithDevicesInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUsersInfoWithDevicesInfo.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsersInfoWithDevicesInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,cAA8B,EAC9B,MAAyC,EACzC,MAAc,EACsB,EAAE;IACtC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,4EAA4E,CAC7E,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACW,EAAE;QACtC,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAEtD,MAAM,YAAY,GAAG,eAAe;aACjC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CACR,MAAM,EACN,QAAQ,EACR,6DAA6D,EAC7D;YACE,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;SAClC,CACF;aACA,KAAK,CAAC,yCAAyC,EAAE;YAChD,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;SACzC,CAAC;aACD,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;aAC5B,MAAM,CAAC;YACN,mBAAmB;YACnB,6BAA6B;YAC7B,2BAA2B;YAC3B,qBAAqB;YACrB,2BAA2B;YAC3B,qBAAqB;YACrB,2BAA2B;SAC5B,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;QAEnD,MAAM,MAAM,GAA8B,EAAE,CAAA;QAE5C,MAAM,OAAO,GAAa,EAAE,CAAA;QAE5B,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACxB,MAAM,MAAM,GAAG,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAEnD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAEpB,MAAM,CAAC,IAAI,CAAC;oBACV,MAAM;oBACN,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,OAAO,EAAE,EAAE;iBACZ,CAAC,CAAA;aACH;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAA;YAElE,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,GAAG,CAAC,UAAU;aACrB,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC,EACD,8CAA8C,EAC9C,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}