@spytecgps/nova-orm 1.2.29-rc2 → 1.2.29-rc4

package/dist/repositories/userInvitations/index.js

@@ -13,7 +13,7 @@ export class UserInvitationsRepository extends BaseRepository {
      */
     async getUserInvitationById(params) {
         this.logger.trace(params, 'UserInvitationsRepository::getUserInvitationById started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await getUserInvitationById(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserInvitationsRepository::getUserInvitationById result');
         return result;
@@ -28,7 +28,7 @@ export class UserInvitationsRepository extends BaseRepository {
      */
     async getUserInvitations(params) {
         this.logger.trace(params, 'UserInvitationsRepository::getUserInvitations started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await getUserInvitations(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserInvitationsRepository::getUserInvitations result');
         return result;
@@ -51,7 +51,7 @@ export class UserInvitationsRepository extends BaseRepository {
      */
     async updateUserInvitation(params) {
         this.logger.trace(params, 'UserInvitationsRepository::updateUserInvitation started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await updateUserInvitation(novaDataSource, params, this.logger);
         this.logger.trace({ result }, 'UserInvitationsRepository::updateUserInvitation result');
         return result;
@@ -74,10 +74,9 @@ export class UserInvitationsRepository extends BaseRepository {
      */
     async createUserInvitation(params) {
         this.logger.trace(params, 'UserInvitationsRepository::createUserInvitation started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await createUserInvitation(novaDataSource, params, this.logger);
         this.logger.trace({ result }, 'UserInvitationsRepository::createUserInvitation result');
         return result;
     }
 }
-//# sourceMappingURL=index.js.map

package/dist/repositories/userInvitations/updateUserInvitation.js

@@ -21,8 +21,7 @@ export const updateUserInvitation = async (novaDataSource, params, logger) => {
         !params?.values?.trackerAccess &&
         !params?.values?.minAccessDate &&
         !params?.values?.boundaries &&
-        !params?.values?.boundaryAccess &&
-        !params?.values?.tasksAccess) {
+        !params?.values?.boundaryAccess) {
         logger.warn({ params }, 'UsersRepository::updateUserInvitation - missing required parameters');
         return false;
     }
@@ -42,7 +41,6 @@ export const updateUserInvitation = async (novaDataSource, params, logger) => {
             minAccessDate: params?.values?.minAccessDate,
             boundaries: params?.values?.boundaries,
             boundaryAccess: params?.values?.boundaryAccess,
-            tasksAccess: params?.values?.tasksAccess,
             modifiedAt: now,
         });
         queryBuilder = queryBuilder.where('id = :id', { id: invitationIdBinaryBuffer });
@@ -50,4 +48,3 @@ export const updateUserInvitation = async (novaDataSource, params, logger) => {
         return result.affected > 0;
     }, 'UsersRepository::updateUserInvitation');
 };
-//# sourceMappingURL=updateUserInvitation.js.map

package/dist/repositories/userRatingRequests/createUserRatingRequest.js

@@ -32,4 +32,3 @@ export const createUserRatingRequest = async (novaDataSource, params, logger) =>
         return await userRatingRequestsRepository.save(newUserRatingRequest);
     }, 'UserRatingRequestsRepository::createUserRatingRequest');
 };
-//# sourceMappingURL=createUserRatingRequest.js.map

package/dist/repositories/userRatingRequests/getUserRatingRequests.js

@@ -10,20 +10,14 @@ export const getUserRatingRequests = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'UserRatingRequestsRepository::getUserRatingRequests - user id should be a valid UUID');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const userRatingRequestsRepository = dataSource.getRepository(UserRatingRequest);
         let queryBuilder = userRatingRequestsRepository.createQueryBuilder('userRatingRequest');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         queryBuilder = queryBuilder.where('userRatingRequest.userId = :userId', {
             userId: binaryBuffer,
         });
         queryBuilder = queryBuilder.orderBy('userRatingRequest.requestDate', 'DESC');
         const result = await queryBuilder.getMany();
         return result;
-    }, 'UserRatingRequestsRepository::getUserRatingRequests', dbQueryRunner);
+    }, 'UserRatingRequestsRepository::getUserRatingRequests');
 };
-//# sourceMappingURL=getUserRatingRequests.js.map

package/dist/repositories/userRatingRequests/index.js

@@ -11,7 +11,7 @@ export class UserRatingRequestsRepository extends BaseRepository {
      */
     async getUserRatingRequests(params) {
         this.logger.trace(params, 'UserRatingRequestsRepository::getUserRatingRequests started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await getUserRatingRequests(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserRatingRequestsRepository::getUserRatingRequests result');
         return result;
@@ -33,10 +33,9 @@ export class UserRatingRequestsRepository extends BaseRepository {
      */
     async createUserRatingRequest(params) {
         this.logger.trace(params, 'UserRatingRequestsRepository::createUserRatingRequest started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await createUserRatingRequest(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserRatingRequestsRepository::createUserRatingRequest result');
         return result;
     }
 }
-//# sourceMappingURL=index.js.map

package/dist/repositories/userRegistrationAttempts/createUserRegistrationAttempt.js

@@ -38,4 +38,3 @@ export const createUserRegistrationAttempt = async (novaDataSource, params, logg
         return await userRegistrationAttemptsRepository.save(newUserRegistrationAttempt);
     }, 'UserRegistrationAttemptsRepository::createUserRegistrationAttempt');
 };
-//# sourceMappingURL=createUserRegistrationAttempt.js.map

package/dist/repositories/userRegistrationAttempts/getUserRegistrationAttempts.js

@@ -10,26 +10,20 @@ export const getUserRegistrationAttempts = async (novaDataSource, params, logger
         logger.warn({ params }, 'UserRegistrationAttemptsRepository::getUserRegistrationAttempts - temp user id should be a valid UUID');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const userRegistrationAttemptsRepository = dataSource.getRepository(UserRegistrationAttempt);
         let queryBuilder = userRegistrationAttemptsRepository.createQueryBuilder('userRegistrationAttempt');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params?.filters?.id) {
-            queryBuilder = queryBuilder.andWhere('userRegistrationAttempt.id = :id', {
+            queryBuilder = queryBuilder.where('userRegistrationAttempt.id = :id', {
                 id: params?.filters?.id,
             });
         }
         if (params?.filters?.tempUserId) {
-            queryBuilder = queryBuilder.andWhere('userRegistrationAttempt.tempUserId = :tempUserId', {
+            queryBuilder = queryBuilder.where('userRegistrationAttempt.tempUserId = :tempUserId', {
                 tempUserId: tempUserIdBinaryBuffer,
             });
         }
         const result = await queryBuilder.getMany();
         return result;
-    }, 'UserRegistrationAttemptsRepository::getUserRegistrationAttempts', dbQueryRunner);
+    }, 'UserRegistrationAttemptsRepository::getUserRegistrationAttempts');
 };
-//# sourceMappingURL=getUserRegistrationAttempts.js.map

package/dist/repositories/userRegistrationAttempts/index.js

@@ -14,7 +14,7 @@ export class UserRegistrationAttemptsRepository extends BaseRepository {
      */
     async getUserRegistrationAttempts(params) {
         this.logger.trace(params, 'UserRegistrationAttemptsRepository::getUserRegistrationAttempts started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await getUserRegistrationAttempts(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserRegistrationAttemptsRepository::getUserRegistrationAttempts result');
         return result;
@@ -38,7 +38,7 @@ export class UserRegistrationAttemptsRepository extends BaseRepository {
      */
     async createUserRegistrationAttempt(params) {
         this.logger.trace(params, 'UserRegistrationAttemptsRepository::createUserRegistrationAttempt started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await createUserRegistrationAttempt(novaDataSource, params, this.logger);
         this.logger.trace(result, 'UserRegistrationAttemptsRepository::createUserRegistrationAttempt result');
         return result;
@@ -62,10 +62,9 @@ export class UserRegistrationAttemptsRepository extends BaseRepository {
      */
     async updateUserRegistrationAttempt(params) {
         this.logger.trace(params, 'UserRegistrationAttemptsRepository::updateUserRegistrationAttempt started with params');
-        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger, this.replicaNovaDataSourceConfig);
+        const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
         const result = await updateUserRegistrationAttempt(novaDataSource, params, this.logger);
         this.logger.trace({ result }, 'UserRegistrationAttemptsRepository::updateUserRegistrationAttempt result');
         return result;
     }
 }
-//# sourceMappingURL=index.js.map

package/dist/repositories/userRegistrationAttempts/updateUserRegistrationAttempt.js

@@ -38,4 +38,3 @@ export const updateUserRegistrationAttempt = async (novaDataSource, params, logg
         return result.affected > 0;
     }, 'UserRegistrationAttemptsRepository::updateUserRegistrationAttempt');
 };
-//# sourceMappingURL=updateUserRegistrationAttempt.js.map

package/dist/repositories/users/createUser.js

@@ -45,4 +45,3 @@ export const createUser = async (novaDataSource, params, logger) => {
         return await usersRepository.save(newUser);
     }, 'UsersRepository::createUser');
 };
-//# sourceMappingURL=createUser.js.map

package/dist/repositories/users/deleteAccount.js

@@ -96,4 +96,3 @@ export const deleteAccount = async (novaDataSource, params, logger) => {
         await novaDataSource.disconnect();
     }
 };
-//# sourceMappingURL=deleteAccount.js.map

package/dist/repositories/users/deleteUser.js

@@ -20,4 +20,3 @@ export const deleteUser = async (novaDataSource, params, logger) => {
         return result.affected > 0;
     }, 'UsersRepository::deleteUser');
 };
-//# sourceMappingURL=deleteUser.js.map

package/dist/repositories/users/getUserById.js

@@ -1,37 +1,22 @@
 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 (allAttributesAreNull(params, oneRequiredGetUserByIdParams)) {
+    if (!params?.filters?.id) {
         logger.warn({ params }, 'UsersRepository::getUserById - 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 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) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository.createQueryBuilder('user');
-        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,
-            });
-        }
+        queryBuilder = queryBuilder.where('user.id = :id', {
+            id: binaryBuffer,
+        });
         const result = await queryBuilder.getOne();
         return result;
-    }, 'UsersRepository::getUserById', dbQueryRunner);
+    }, 'UsersRepository::getUserById');
 };
-//# sourceMappingURL=getUserById.js.map

package/dist/repositories/users/getUserData.js

@@ -1,16 +1,15 @@
+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 [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (_dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
+        const usersRepository = dataSource.getRepository(User);
         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
@@ -22,10 +21,9 @@ 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 
-                    and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id )) as phoneNumbers
+                    and NR.unsubscribed = false ) as phoneNumbers
                   , ( SELECT  CONCAT('[',
                     GROUP_CONCAT( distinct case when  NR.isUserProfile = true
                     then CONCAT('"', U.email, '"') else CONCAT('"', NR.recipient, '"') end SEPARATOR ','),
@@ -35,8 +33,7 @@ export const getUsersData = async (novaDataSource, params, logger) => {
                     and NR.userId = U.id
                     and  NR.notificationType = 1
                     and NR.isEnabled = true
-                    and NR.unsubscribed = false
-                    and (NR.userAlertConfigurationId IS NULL or NR.userAlertConfigurationId = AC.id )  ) as emailAddresses
+                    and NR.unsubscribed = false ) as emailAddresses
                   FROM device AS D
                   JOIN client AS C
                   ON D.clientId = C.id
@@ -51,7 +48,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 queryRunner.query(query, [params.filters.imei]);
+        const result = await usersRepository.query(query, [params.filters.imei]);
         return result.map(item => ({
             ...item,
             userId: binaryBufferToUuidString(item.userId),
@@ -65,6 +62,5 @@ export const getUsersData = async (novaDataSource, params, logger) => {
             phoneNumbers: item.phoneNumbers ? JSON.parse(item.phoneNumbers) : [],
             emailAddresses: item.emailAddresses ? JSON.parse(item.emailAddresses) : [],
         }));
-    }, 'UsersRepository::getUsersData', dbQueryRunner);
+    }, 'UsersRepository::getUsersData');
 };
-//# sourceMappingURL=getUserData.js.map

package/dist/repositories/users/getUsers.js

@@ -1,23 +1,17 @@
-import { EntityTag, Tag, User } from '../../entities';
+import { 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?.tagIdList?.length) {
+        !params?.filters?.status) {
         logger.warn({ params }, 'UsersRepository::getUsers - missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         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()),
@@ -48,55 +42,8 @@ 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');
-        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);
+        const result = await queryBuilder.getMany();
+        return result;
+    }, 'UsersRepository::getUsers');
 };
-//# sourceMappingURL=getUsers.js.map

package/dist/repositories/users/getUsersConfigurationByImei.js

@@ -5,19 +5,11 @@ import { User } from '../../entities';
 //Device (name)
 //Country (international dialing code)
 export const getUsersConfigurationByImei = async (novaDataSource, params, logger) => {
-    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
+    try {
+        await novaDataSource.connect();
+        const usersRepository = novaDataSource.getRepository(User);
+        const userConfiguration = usersRepository
+            .createQueryBuilder('user')
             .innerJoin('user.client', 'client')
             .innerJoinAndSelect('client.devices', 'device')
             .innerJoinAndSelect('user.userConfiguration', 'userConfiguration')
@@ -26,6 +18,12 @@ export const getUsersConfigurationByImei = async (novaDataSource, params, logger
             .where('device.imei = :imei', { imei: params.filters.imei })
             .getMany();
         return userConfiguration;
-    }, 'UsersRepository::getUsersConfigurationByImei', dbQueryRunner);
+    }
+    catch (error) {
+        logger.error({ error }, 'UsersRepository::getUsersConfigurationByImei error');
+        throw error;
+    }
+    finally {
+        await novaDataSource.disconnect();
+    }
 };
-//# sourceMappingURL=getUsersConfigurationByImei.js.map

package/dist/repositories/users/getUsersIdByPhoneAndCountryCode.js

@@ -5,9 +5,7 @@ export const getUsersIdsByPhoneAndCountryCode = async (novaDataSource, params, l
         logger.warn({ params }, 'UsersRepository::getUsersIdsByPhoneAndCountryCode - missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository
             .createQueryBuilder('user')
@@ -16,12 +14,8 @@ 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', dbQueryRunner);
+    }, 'UsersRepository::getUsersIdsByPhoneAndCountryCode');
 };
-//# sourceMappingURL=getUsersIdByPhoneAndCountryCode.js.map

package/dist/repositories/users/getUsersWithRoles.js

@@ -5,9 +5,7 @@ export const getUsersWithRoles = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'UsersRepository::getUsersWithRoles - missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const usersRepository = dataSource.getRepository(User);
         let queryBuilder = usersRepository
             .createQueryBuilder('user')
@@ -16,9 +14,6 @@ export const getUsersWithRoles = async (novaDataSource, params, logger) => {
             .where('user.clientId = :clientId', {
             clientId: params.filters.clientId,
         });
-        if (queryRunner) {
-            queryBuilder = queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params.filters.roleId) {
             queryBuilder = queryBuilder.andWhere('securityRole.id = :roleId', {
                 roleId: params.filters.roleId,
@@ -29,12 +24,9 @@ export const getUsersWithRoles = async (novaDataSource, params, logger) => {
                 status: params.filters.status,
             });
         }
-        queryBuilder = queryBuilder
-            .addSelect('securityRole.name', 'role')
-            .addSelect('securityRole.id', 'roleId');
+        queryBuilder = queryBuilder.addSelect('securityRole.name', 'role');
         const usersWithRole = await queryBuilder.getRawMany();
         const result = usersWithRole.map(item => mapRawEntityToEntity(item, 'user_'));
         return result;
-    }, 'UsersRepository::getUsersWithRoles', dbQueryRunner);
+    }, 'UsersRepository::getUsersWithRoles');
 };
-//# sourceMappingURL=getUsersWithRoles.js.map