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

package/dist/repositories/devices/deleteDevice.js

@@ -4,7 +4,7 @@ export const deleteDevice = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::deleteDevice - missing required parameters');
         return false;
     }
-    return novaDataSource.safeQuery2(async (dataSource) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const devicesRepository = dataSource.getRepository(Device);
         const result = await devicesRepository
             .createQueryBuilder()
@@ -14,4 +14,3 @@ export const deleteDevice = async (novaDataSource, params, logger) => {
         return result.affected > 0;
     }, 'DevicesRepository::deleteDevice');
 };
-//# sourceMappingURL=deleteDevice.js.map

package/dist/repositories/devices/generateDeviceIdentifierKey.js

@@ -4,7 +4,7 @@ export const generateDeviceIdentifierKey = async (novaDataSource, params, logger
         logger.warn({ params }, 'DevicesRepository::generateDeviceIdentifierKey missing required parameters');
         return null;
     }
-    return novaDataSource.safeQuery2(async (dataSource) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const deviceTypesRepository = dataSource.getRepository(DeviceType);
         const deviceType = await deviceTypesRepository
             .createQueryBuilder()
@@ -16,4 +16,3 @@ export const generateDeviceIdentifierKey = async (novaDataSource, params, logger
         return `${deviceType.identifierType}#${params.deviceIdentifier}`;
     }, 'DevicesRepository::generateDeviceIdentifierKey');
 };
-//# sourceMappingURL=generateDeviceIdentifierKey.js.map

package/dist/repositories/devices/getCanceledDevicesWithActiveSimCards.js

@@ -4,15 +4,9 @@ export const getCanceledDevicesWithActiveSimCards = async (novaDataSource, param
         logger.warn({ params }, 'DevicesRepository::getCanceledDevicesWithActiveSimCards missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const serviceProviderRepository = dataSource.getRepository(ServiceProvider);
-        const serviceProviderQueryBuilder = serviceProviderRepository.createQueryBuilder('serviceProvider');
-        if (queryRunner) {
-            serviceProviderQueryBuilder.setQueryRunner(queryRunner);
-        }
-        const serviceProviders = await serviceProviderQueryBuilder.getMany();
+        const serviceProviders = await serviceProviderRepository.find();
         const deviceRepository = dataSource.getRepository(Device);
         const queryBuilder = deviceRepository
             .createQueryBuilder('device')
@@ -34,9 +28,6 @@ export const getCanceledDevicesWithActiveSimCards = async (novaDataSource, param
         ])
             .orderBy('device.id', 'ASC')
             .limit(params.pagingOptions.limit);
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getRawMany();
         return result.map(row => ({
             imei: row.imei,
@@ -45,6 +36,5 @@ export const getCanceledDevicesWithActiveSimCards = async (novaDataSource, param
             carrier: serviceProviders?.find(sp => sp.id === row.carrierId)?.name || 'Unknown Carrier',
             deviceId: row.deviceId,
         }));
-    }, 'DevicesRepository::getCanceledDevicesWithActiveSimCards', dbQueryRunner);
+    }, 'DevicesRepository::getCanceledDevicesWithActiveSimCards');
 };
-//# sourceMappingURL=getCanceledDevicesWithActiveSimCards.js.map

package/dist/repositories/devices/getCarrierStatusUpdatedBefore.js

@@ -4,9 +4,7 @@ export const getCarrierStatusUpdatedBefore = async (novaDataSource, params, logg
         logger.warn({ params }, 'DevicesRepository::getCarrierStatusUpdatedBefore missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const iccidStatusRepository = dataSource.getRepository(IccidStatus);
         const queryBuilder = iccidStatusRepository
             .createQueryBuilder('iccidStatus')
@@ -29,9 +27,6 @@ export const getCarrierStatusUpdatedBefore = async (novaDataSource, params, logg
             .orderBy('iccidStatus.modifiedAt', 'ASC')
             .addOrderBy('iccidStatus.iccid', 'ASC')
             .limit(params.pagingOptions.limit);
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getRawMany();
         return result.map(row => ({
             carrier: row.carrier,
@@ -41,6 +36,5 @@ export const getCarrierStatusUpdatedBefore = async (novaDataSource, params, logg
             carrierFound: row.carrierFound,
             modifiedAt: row.modifiedAt,
         }));
-    }, 'DevicesRepository::getCarrierStatusUpdatedBefore', dbQueryRunner);
+    }, 'DevicesRepository::getCarrierStatusUpdatedBefore');
 };
-//# sourceMappingURL=getCarrierStatusUpdatedBefore.js.map

package/dist/repositories/devices/getClientDeviceSetting.js

@@ -4,9 +4,7 @@ export const getClientDeviceSetting = async (novaDataSource, params, logger) =>
         logger.warn({ params }, 'DevicesRepository::getClientDeviceSetting missing required parameters');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const clientDeviceSettingRepository = dataSource.getRepository(ClientDeviceSetting);
         const queryBuilder = clientDeviceSettingRepository
             .createQueryBuilder('clientDeviceSetting')
@@ -16,11 +14,7 @@ export const getClientDeviceSetting = async (novaDataSource, params, logger) =>
             .andWhere('clientDeviceSetting.clientId = :clientId', {
             clientId: params.filters.clientId,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getOne();
         return result;
-    }, 'DevicesRepository::getClientDeviceSetting', dbQueryRunner);
+    }, 'DevicesRepository::getClientDeviceSetting');
 };
-//# sourceMappingURL=getClientDeviceSetting.js.map

package/dist/repositories/devices/getClientDeviceSettings.js

@@ -4,20 +4,14 @@ export const getClientDeviceSettings = async (novaDataSource, params, logger) =>
         logger.warn({ params }, 'DevicesRepository::getClientDeviceSettings missing required parameters');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const clientDeviceSettingRepository = dataSource.getRepository(ClientDeviceSetting);
         const queryBuilder = clientDeviceSettingRepository
             .createQueryBuilder('clientDeviceSetting')
             .where('clientDeviceSetting.clientId = :clientId', {
             clientId: params.filters.clientId,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getMany();
         return result;
-    }, 'DevicesRepository::getClientDeviceSettings', dbQueryRunner);
+    }, 'DevicesRepository::getClientDeviceSettings');
 };
-//# sourceMappingURL=getClientDeviceSettings.js.map

package/dist/repositories/devices/getDevice.js

@@ -4,14 +4,9 @@ export const getDevice = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::getDevice missing required parameters');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const devicesRepository = dataSource.getRepository(Device);
         let queryBuilder = devicesRepository.createQueryBuilder('device');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params.filters.id) {
             queryBuilder = queryBuilder.where('device.id = :id', {
                 id: params.filters.id,
@@ -34,6 +29,5 @@ export const getDevice = async (novaDataSource, params, logger) => {
         }
         const device = await queryBuilder.getOne();
         return device;
-    }, 'DevicesRepository::getDevice', dbQueryRunner);
+    }, 'DevicesRepository::getDevice');
 };
-//# sourceMappingURL=getDevice.js.map

package/dist/repositories/devices/getDeviceCustomConfig.js

@@ -4,14 +4,9 @@ export const getDeviceCustomConfigs = async (novaDataSource, params, logger) =>
         logger.warn({ params }, 'DevicesRepository::getDeviceCustomConfig missing required params');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const deviceCustomConfigRepository = dataSource.getRepository(DeviceCustomConfiguration);
         let queryBuilder = deviceCustomConfigRepository.createQueryBuilder('deviceCustomConfiguration');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params?.filters?.imei) {
             queryBuilder = queryBuilder.orWhere(`(LOWER(deviceCustomConfiguration.imei) = LOWER(:imei) AND deviceCustomConfiguration.clientId IS NULL AND (deviceCustomConfiguration.po IS NULL OR deviceCustomConfiguration.po = ''))`, {
                 imei: params.filters.imei,
@@ -38,6 +33,5 @@ export const getDeviceCustomConfigs = async (novaDataSource, params, logger) =>
         queryBuilder = queryBuilder.orderBy('deviceCustomConfiguration.id');
         const result = await queryBuilder.getMany();
         return result;
-    }, 'DevicesRepository::getDeviceCustomConfig', dbQueryRunner);
+    }, 'DevicesRepository::getDeviceCustomConfig');
 };
-//# sourceMappingURL=getDeviceCustomConfig.js.map

package/dist/repositories/devices/getDeviceTypeByImei.js

@@ -4,9 +4,7 @@ export const getDeviceTypeByImei = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::getDeviceTypeByImei - missing imei parameter');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const imeiIccidCarrierRepository = dataSource.getRepository(DeviceType);
         const queryBuilder = imeiIccidCarrierRepository
             .createQueryBuilder('deviceType')
@@ -14,11 +12,7 @@ export const getDeviceTypeByImei = async (novaDataSource, params, logger) => {
             .where(`imeiIccidCarrier.imei = :imei`, {
             imei: params.filters.imei,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getOne();
         return result;
-    }, 'DevicesRepository::getDeviceTypeByImei', dbQueryRunner);
+    }, 'DevicesRepository::getDeviceTypeByImei');
 };
-//# sourceMappingURL=getDeviceTypeByImei.js.map

package/dist/repositories/devices/getDeviceTypes.js

@@ -1,53 +1,30 @@
 import { DeviceType, ImeiIccidCarrier } from '../../entities';
 export const getDeviceTypes = async (novaDataSource, params) => {
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const deviceTypesRepository = dataSource.getRepository(DeviceType);
         let queryBuilder = deviceTypesRepository.createQueryBuilder('deviceType');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
+        if (params?.filters?.deviceTypeIdList?.length) {
+            queryBuilder = queryBuilder.where('deviceType.id IN (:...deviceTypeIdList)', {
+                deviceTypeIdList: params.filters.deviceTypeIdList,
+            });
+        }
+        if (params?.filters?.brand) {
+            queryBuilder = queryBuilder.andWhere('LOWER(deviceType.brand) = LOWER(:brand)', {
+                brand: params.filters.brand,
+            });
         }
-        if (params?.filters?.modelFamily) {
-            queryBuilder = queryBuilder.where('deviceType.modelFamily = UPPER(:modelFamily)', {
-                modelFamily: params.filters.modelFamily,
+        if (params?.filters?.model) {
+            queryBuilder = queryBuilder.andWhere('LOWER(deviceType.model) = LOWER(:model)', {
+                model: params.filters.model,
             });
-            if (params?.filters?.supported) {
-                queryBuilder = queryBuilder.andWhere('deviceType.supported = :supported', {
-                    supported: true,
-                });
-            }
-            if (params?.filters?.activatable) {
-                queryBuilder = queryBuilder.andWhere('deviceType.activatable = :activatable', {
-                    activatable: true,
-                });
-            }
         }
-        else {
-            if (params?.filters?.deviceTypeIdList?.length) {
-                queryBuilder = queryBuilder.where('deviceType.id IN (:...deviceTypeIdList)', {
-                    deviceTypeIdList: params.filters.deviceTypeIdList,
-                });
-            }
-            if (params?.filters?.brand) {
-                queryBuilder = queryBuilder.andWhere('LOWER(deviceType.brand) = LOWER(:brand)', {
-                    brand: params.filters.brand,
-                });
-            }
-            if (params?.filters?.model) {
-                queryBuilder = queryBuilder.andWhere('LOWER(deviceType.model) = LOWER(:model)', {
-                    model: params.filters.model,
-                });
-            }
-            if (params?.filters?.onlyWithRelatedIccidCarrier) {
-                queryBuilder = queryBuilder
-                    .innerJoin(ImeiIccidCarrier, 'iccidCarrier', 'deviceType.id = iccidCarrier.deviceTypeId')
-                    .groupBy('deviceType.id');
-            }
+        if (params?.filters?.onlyWithRelatedIccidCarrier) {
+            queryBuilder = queryBuilder
+                .innerJoin(ImeiIccidCarrier, 'iccidCarrier', 'deviceType.id = iccidCarrier.deviceTypeId')
+                .groupBy('deviceType.id');
         }
         queryBuilder = queryBuilder.orderBy('deviceType.id');
         const result = await queryBuilder.getMany();
         return result;
-    }, 'DevicesRepository::getDeviceTypes', dbQueryRunner);
+    }, 'DevicesRepository::getDeviceTypes');
 };
-//# sourceMappingURL=getDeviceTypes.js.map

package/dist/repositories/devices/getDeviceTypesModelsOrderedByDeviceCount.js

@@ -1,8 +1,6 @@
 import { Device, DeviceType } from '../../entities';
 export const getDeviceTypesModelsOrderedByDeviceCount = async (novaDataSource, params) => {
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const deviceTypesRepository = dataSource.getRepository(DeviceType);
         let queryBuilder = deviceTypesRepository
             .createQueryBuilder('dt')
@@ -14,9 +12,6 @@ export const getDeviceTypesModelsOrderedByDeviceCount = async (novaDataSource, p
             'dt.protocolMatch as protocolMatch',
         ])
             .addSelect('COUNT(d.id)', 'deviceCount');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params?.filters?.deviceStatus) {
             queryBuilder = queryBuilder.where('d.status = :deviceStatus', {
                 deviceStatus: params.filters.deviceStatus,
@@ -28,6 +23,5 @@ export const getDeviceTypesModelsOrderedByDeviceCount = async (novaDataSource, p
             ...item,
             deviceCount: parseInt(item.deviceCount, 10),
         }));
-    }, 'DevicesRepository::getDeviceTypesModelsOrderedByDeviceCount', dbQueryRunner);
+    }, 'DevicesRepository::getDeviceTypesModelsOrderedByDeviceCount');
 };
-//# sourceMappingURL=getDeviceTypesModelsOrderedByDeviceCount.js.map

package/dist/repositories/devices/getDeviceWithUsersInfo.js

@@ -4,9 +4,7 @@ export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) =>
         logger.warn({ params }, 'DevicesRepository::getDeviceWithUsersInfo missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const devicesRepository = dataSource.getRepository(Device);
         const queryBuilder = devicesRepository
             .createQueryBuilder('device')
@@ -46,9 +44,6 @@ export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) =>
             'securityRole.name as roleName',
             'billing.subscriptionId as subscriptionId',
         ]);
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getRawMany();
         return result.map(item => ({
             ...item,
@@ -60,6 +55,5 @@ export const getDeviceWithUsersInfo = async (novaDataSource, params, logger) =>
             smsNotification: item.smsNotification === 1,
             emailNotification: item.emailNotification === 1,
         }));
-    }, 'DevicesRepository::getDeviceWithUsersInfo', dbQueryRunner);
+    }, 'DevicesRepository::getDeviceWithUsersInfo');
 };
-//# sourceMappingURL=getDeviceWithUsersInfo.js.map

package/dist/repositories/devices/getDevices.js

@@ -1,21 +1,15 @@
-import { ClientDeviceSetting, Device, DevicePairing, EntityTag, ImeiIccidCarrier, ServiceProvider, Tag, } from '../../entities';
+import { ClientDeviceSetting, Device, ImeiIccidCarrier, ServiceProvider } from '../../entities';
 export const getDevices = async (novaDataSource, params, logger) => {
     if (!params?.filters?.deviceTypeId &&
         !params?.filters?.clientId &&
         !params?.filters?.imeiList?.length &&
-        !params?.filters?.tagIdList?.length &&
         !params?.filters?.status) {
         logger.warn({ params }, 'DevicesRepository::getDevices missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const devicesRepository = dataSource.getRepository(Device);
         let queryBuilder = devicesRepository.createQueryBuilder('device');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params.filters.clientId) {
             queryBuilder = queryBuilder.where('device.clientId = :clientId', {
                 clientId: params.filters.clientId,
@@ -36,60 +30,17 @@ export const getDevices = async (novaDataSource, params, logger) => {
                 imeiList: params.filters.imeiList,
             });
         }
-        if (params.filters.tagIdList?.length) {
-            queryBuilder = queryBuilder.innerJoin(EntityTag, 'entityTag', `entityTag.entityId = device.id 
-           AND entityTag.entityType = 'Device'
-           AND entityTag.tagId IN (:...tagIdList)`, {
-                tagIdList: params.filters.tagIdList,
-            });
-        }
-        if (params.projectionOptions?.withDeviceType) {
+        if (params.projectionOptions.withDeviceType) {
             queryBuilder = queryBuilder.leftJoinAndSelect('device.deviceType', 'deviceType');
         }
-        if (params.projectionOptions?.withIccidCarrier) {
+        if (params.projectionOptions.withIccidCarrier) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('device.iccidCarrier', ImeiIccidCarrier, 'iccidCarrier', 'device.imei = iccidCarrier.imei');
             queryBuilder = queryBuilder.leftJoinAndMapOne('iccidCarrier.serviceProvider', ServiceProvider, 'serviceProvider', 'iccidCarrier.carrier = serviceProvider.id');
         }
-        if (params.projectionOptions?.withClientDeviceSettings) {
+        if (params.projectionOptions.withClientDeviceSettings) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('device.clientDeviceSetting', ClientDeviceSetting, 'clientDeviceSetting', 'device.imei = clientDeviceSetting.imei and device.clientId = clientDeviceSetting.clientId');
         }
-        if (params.projectionOptions?.withDevicePairing) {
-            queryBuilder = queryBuilder.leftJoinAndMapOne('device.devicePairing', DevicePairing, 'devicePairing', 'device.imei = devicePairing.imeiMain or device.imei = devicePairing.imeiSecondary');
-        }
-        if (params?.sortOptions?.sortField) {
-            queryBuilder = queryBuilder.orderBy(`device.${params.sortOptions.sortField}`, params?.sortOptions?.sortOrder ?? 'ASC');
-        }
-        if (params?.pagingOptions?.pageIndex) {
-            const pageSize = params?.pagingOptions?.pageSize ?? 1000;
-            const realPageIndex = (params?.pagingOptions?.pageIndex ?? 1) - 1;
-            queryBuilder = queryBuilder.offset(realPageIndex * pageSize);
-            queryBuilder = queryBuilder.limit(pageSize);
-        }
-        let devices = 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: getUsers, getBoundariesByClientId
-            const entityTagRepo = dataSource.getRepository(EntityTag);
-            devices = await Promise.all(devices.map(async (device) => {
-                const entityTagQueryBuilder = entityTagRepo.createQueryBuilder('entityTag');
-                if (queryRunner) {
-                    entityTagQueryBuilder.setQueryRunner(queryRunner);
-                }
-                const securityGroupEntityTags = await entityTagQueryBuilder
-                    .where('entityTag.entityId = :entityId AND entityTag.entityType = :entityType', {
-                    entityId: device.id,
-                    entityType: 'Device',
-                })
-                    .innerJoin(Tag, 'tag', `tag.id = entityTag.tagId AND JSON_CONTAINS(tag.metadata, :metadata)`, { metadata: JSON.stringify({ isSecurityGroup: true }) })
-                    .getMany();
-                return {
-                    ...device,
-                    securityGroupEntityTags,
-                };
-            }));
-        }
+        const devices = await queryBuilder.getMany();
         return devices;
-    }, 'DevicesRepository::getDevices', dbQueryRunner);
+    }, 'DevicesRepository::getDevices');
 };
-//# sourceMappingURL=getDevices.js.map

package/dist/repositories/devices/getFilteredImeisWithStatus.js

@@ -4,9 +4,7 @@ export const getFilteredImeisWithStatus = async (novaDataSource, params, logger)
         logger.warn({ params }, 'DevicesRepository::getFilteredImeisWithStatus missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const devicesRepository = dataSource.getRepository(Device);
         const queryBuilder = devicesRepository
             .createQueryBuilder('device')
@@ -16,11 +14,7 @@ export const getFilteredImeisWithStatus = async (novaDataSource, params, logger)
             .andWhere('status = :status', {
             status: params.filters.status,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const imeiList = await queryBuilder.select('imei').getRawMany();
         return imeiList.map(x => x.imei);
-    }, 'DevicesRepository::getFilteredImeisWithStatus', dbQueryRunner);
+    }, 'DevicesRepository::getFilteredImeisWithStatus');
 };
-//# sourceMappingURL=getFilteredImeisWithStatus.js.map

package/dist/repositories/devices/getIccidStatus.js

@@ -4,20 +4,14 @@ export const getIccidStatus = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::getIccidStatus missing required parameters');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const iccidStatusRepository = dataSource.getRepository(IccidStatus);
         const queryBuilder = iccidStatusRepository
             .createQueryBuilder('iccidStatus')
             .where('iccidStatus.iccid = :iccid', {
             iccid: params.filters.iccid,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getOne();
         return result;
-    }, 'DevicesRepository::getIccidStatus', dbQueryRunner);
+    }, 'DevicesRepository::getIccidStatus');
 };
-//# sourceMappingURL=getIccidStatus.js.map

package/dist/repositories/devices/getImeiIccidCarrier.js

@@ -4,14 +4,9 @@ export const getImeiIccidCarrier = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::getImeiIccidCarrier missing required parameters');
         return null;
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const imeiIccidCarrierRepository = dataSource.getRepository(ImeiIccidCarrier);
         let queryBuilder = imeiIccidCarrierRepository.createQueryBuilder('imeiIccidCarrier');
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         if (params?.filters?.imei) {
             queryBuilder = queryBuilder.where('imeiIccidCarrier.imei = :imei', {
                 imei: params.filters.imei,
@@ -24,6 +19,5 @@ export const getImeiIccidCarrier = async (novaDataSource, params, logger) => {
         }
         const result = await queryBuilder.getOne();
         return result;
-    }, 'DevicesRepository::getImeiIccidCarrier', dbQueryRunner);
+    }, 'DevicesRepository::getImeiIccidCarrier');
 };
-//# sourceMappingURL=getImeiIccidCarrier.js.map

package/dist/repositories/devices/getImeiIccidCarriers.js

@@ -4,20 +4,14 @@ export const getImeiIccidCarriers = async (novaDataSource, params, logger) => {
         logger.warn({ params }, 'DevicesRepository::getImeiIccidCarriers missing required parameters');
         return [];
     }
-    // Force the query to run on master or slave
-    const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
-    return novaDataSource.safeQuery2(async (dataSource, queryRunner) => {
+    return novaDataSource.safeQuery(async (dataSource) => {
         const imeiIccidCarrierRepository = dataSource.getRepository(ImeiIccidCarrier);
         const queryBuilder = imeiIccidCarrierRepository
             .createQueryBuilder('imeiIccidCarrier')
             .where('imeiIccidCarrier.imei IN (:...imeiList)', {
             imeiList: params.filters.imeiList,
         });
-        if (queryRunner) {
-            queryBuilder.setQueryRunner(queryRunner);
-        }
         const result = await queryBuilder.getMany();
         return result;
-    }, 'DevicesRepository::getImeiIccidCarriers', dbQueryRunner);
+    }, 'DevicesRepository::getImeiIccidCarriers');
 };
-//# sourceMappingURL=getImeiIccidCarriers.js.map