@spytecgps/nova-orm 1.0.65 → 1.0.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entities/airflow/acumaticaExportImeiIccidData copy.d.ts +28 -0
- package/dist/entities/airflow/acumaticaExportImeiIccidData copy.js +147 -0
- package/dist/entities/airflow/acumaticaExportImeiIccidData copy.js.map +1 -0
- package/dist/entities/airflow/acumaticaExportImeiIccidData.d.ts +15 -0
- package/dist/entities/airflow/acumaticaExportImeiIccidData.js +82 -0
- package/dist/entities/airflow/acumaticaExportImeiIccidData.js.map +1 -0
- package/dist/index.js +1 -1
- package/dist/novaDataSource.d.ts +2 -2
- package/dist/novaDataSource.js +1 -1
- package/dist/novaDataSource.js.map +1 -1
- package/dist/repositories/acumatica/getAcumaticaImeiIccidData.js +7 -2
- package/dist/repositories/acumatica/getAcumaticaImeiIccidData.js.map +1 -1
- package/dist/repositories/acumatica/getAcumaticaShipmentDetails.js +8 -3
- package/dist/repositories/acumatica/getAcumaticaShipmentDetails.js.map +1 -1
- package/dist/repositories/acumatica/getLastAcumaticaShipmentDetails.js +7 -2
- package/dist/repositories/acumatica/getLastAcumaticaShipmentDetails.js.map +1 -1
- package/dist/repositories/aempToken/getAempTokens.js +10 -3
- package/dist/repositories/aempToken/getAempTokens.js.map +1 -1
- package/dist/repositories/alertTypes/getAlertTypes.js +7 -2
- package/dist/repositories/alertTypes/getAlertTypes.js.map +1 -1
- package/dist/repositories/alerts/getAlertsReportByClient.js +4 -0
- package/dist/repositories/alerts/getAlertsReportByClient.js.map +1 -1
- package/dist/repositories/alerts/getAlertsReportByUser.js +4 -0
- package/dist/repositories/alerts/getAlertsReportByUser.js.map +1 -1
- package/dist/repositories/appFeatures/getClientAppFeatures.js +7 -2
- package/dist/repositories/appFeatures/getClientAppFeatures.js.map +1 -1
- package/dist/repositories/assetCategories/getAssetCategories.d.ts +1 -1
- package/dist/repositories/assetCategories/getAssetCategories.js +14 -4
- package/dist/repositories/assetCategories/getAssetCategories.js.map +1 -1
- package/dist/repositories/assetCategories/index.d.ts +1 -1
- package/dist/repositories/assetCategories/index.js +2 -2
- package/dist/repositories/assetCategories/index.js.map +1 -1
- package/dist/repositories/billing/getBillingCustomerBraintreeById.js +7 -2
- package/dist/repositories/billing/getBillingCustomerBraintreeById.js.map +1 -1
- package/dist/repositories/billing/getBillingDeviceTypePlans.js +9 -4
- package/dist/repositories/billing/getBillingDeviceTypePlans.js.map +1 -1
- package/dist/repositories/billing/getBillingKlarnaOrderByImei.js +7 -2
- package/dist/repositories/billing/getBillingKlarnaOrderByImei.js.map +1 -1
- package/dist/repositories/billing/getBillingPlans.js +7 -2
- package/dist/repositories/billing/getBillingPlans.js.map +1 -1
- package/dist/repositories/billing/getBillingSubscriptionBraintreeByImei.js +7 -2
- package/dist/repositories/billing/getBillingSubscriptionBraintreeByImei.js.map +1 -1
- package/dist/repositories/billing/getBillingSubscriptionsBraintree.js +7 -2
- package/dist/repositories/billing/getBillingSubscriptionsBraintree.js.map +1 -1
- package/dist/repositories/billing/getBillings.js +7 -2
- package/dist/repositories/billing/getBillings.js.map +1 -1
- package/dist/repositories/billing/getCanceledImeis.js +7 -2
- package/dist/repositories/billing/getCanceledImeis.js.map +1 -1
- package/dist/repositories/billing/getCanceledImeisMatchingMagentoData.js +17 -8
- package/dist/repositories/billing/getCanceledImeisMatchingMagentoData.js.map +1 -1
- package/dist/repositories/billing/getChurnStatusByClientId.js +7 -2
- package/dist/repositories/billing/getChurnStatusByClientId.js.map +1 -1
- package/dist/repositories/billing/getClientIdFromBraintreeCustomer.js +7 -2
- package/dist/repositories/billing/getClientIdFromBraintreeCustomer.js.map +1 -1
- package/dist/repositories/billing/getMagentoPlan.js +7 -2
- package/dist/repositories/billing/getMagentoPlan.js.map +1 -1
- package/dist/repositories/billing/getUserByBraintreeCustomerId.js +7 -2
- package/dist/repositories/billing/getUserByBraintreeCustomerId.js.map +1 -1
- package/dist/repositories/blacklist/getBlacklists.js +7 -2
- package/dist/repositories/blacklist/getBlacklists.js.map +1 -1
- package/dist/repositories/bleMeshConfiguration/getBLEMeshConfiguration.js +7 -2
- package/dist/repositories/bleMeshConfiguration/getBLEMeshConfiguration.js.map +1 -1
- package/dist/repositories/boundaries/getBoundariesByClientId.js +13 -7
- package/dist/repositories/boundaries/getBoundariesByClientId.js.map +1 -1
- package/dist/repositories/boundaries/getBoundariesIdsByClientId.js +11 -7
- package/dist/repositories/boundaries/getBoundariesIdsByClientId.js.map +1 -1
- package/dist/repositories/boundaries/getBoundariesReport.js +7 -2
- package/dist/repositories/boundaries/getBoundariesReport.js.map +1 -1
- package/dist/repositories/boundaries/getBoundaryById.js +10 -2
- package/dist/repositories/boundaries/getBoundaryById.js.map +1 -1
- package/dist/repositories/clients/getClient.js +7 -2
- package/dist/repositories/clients/getClient.js.map +1 -1
- package/dist/repositories/clients/getClientConfiguration.js +12 -4
- package/dist/repositories/clients/getClientConfiguration.js.map +1 -1
- package/dist/repositories/clients/getClients.js +7 -2
- package/dist/repositories/clients/getClients.js.map +1 -1
- package/dist/repositories/clients/getCustomerAttribute.js +12 -4
- package/dist/repositories/clients/getCustomerAttribute.js.map +1 -1
- package/dist/repositories/countries/getCountries.js +7 -2
- package/dist/repositories/countries/getCountries.js.map +1 -1
- package/dist/repositories/countries/getCountry.js +7 -2
- package/dist/repositories/countries/getCountry.js.map +1 -1
- package/dist/repositories/deactivations/getDeactivationReasons.js +7 -2
- package/dist/repositories/deactivations/getDeactivationReasons.js.map +1 -1
- package/dist/repositories/deactivations/getLatestDeactivationByImei.js +7 -2
- package/dist/repositories/deactivations/getLatestDeactivationByImei.js.map +1 -1
- package/dist/repositories/deviceBehaviors/getDeviceBehaviorTasks.js +7 -2
- package/dist/repositories/deviceBehaviors/getDeviceBehaviorTasks.js.map +1 -1
- package/dist/repositories/deviceBehaviors/getDeviceBehaviors.js +7 -2
- package/dist/repositories/deviceBehaviors/getDeviceBehaviors.js.map +1 -1
- package/dist/repositories/deviceBehaviors/getDeviceBehaviorsByIds.js +7 -2
- package/dist/repositories/deviceBehaviors/getDeviceBehaviorsByIds.js.map +1 -1
- package/dist/repositories/deviceBehaviors/getDevicesLastBehaviorTask.js +7 -2
- package/dist/repositories/deviceBehaviors/getDevicesLastBehaviorTask.js.map +1 -1
- package/dist/repositories/deviceBehaviors/getLatestDeviceBehaviorTasks.js +15 -7
- package/dist/repositories/deviceBehaviors/getLatestDeviceBehaviorTasks.js.map +1 -1
- package/dist/repositories/devicePairings/getDevicePairings.js +7 -2
- package/dist/repositories/devicePairings/getDevicePairings.js.map +1 -1
- package/dist/repositories/devicePairings/getDevicePairingsByClientId.js +7 -2
- package/dist/repositories/devicePairings/getDevicePairingsByClientId.js.map +1 -1
- package/dist/repositories/devicePairings/getDevicePairingsByImei.js +7 -2
- package/dist/repositories/devicePairings/getDevicePairingsByImei.js.map +1 -1
- package/dist/repositories/deviceStatus/getDeviceStatuses.js +7 -2
- package/dist/repositories/deviceStatus/getDeviceStatuses.js.map +1 -1
- package/dist/repositories/deviceStatus/getDeviceStatusesCount.js +7 -2
- package/dist/repositories/deviceStatus/getDeviceStatusesCount.js.map +1 -1
- package/dist/repositories/devices/allImeisAreActiveForClient.js +7 -2
- package/dist/repositories/devices/allImeisAreActiveForClient.js.map +1 -1
- package/dist/repositories/devices/getCanceledDevicesWithActiveSimCards.js +7 -2
- package/dist/repositories/devices/getCanceledDevicesWithActiveSimCards.js.map +1 -1
- package/dist/repositories/devices/getCarrierStatusUpdatedBefore.js +7 -2
- package/dist/repositories/devices/getCarrierStatusUpdatedBefore.js.map +1 -1
- package/dist/repositories/devices/getClientDeviceSetting.js +7 -2
- package/dist/repositories/devices/getClientDeviceSetting.js.map +1 -1
- package/dist/repositories/devices/getClientDeviceSettings.js +7 -2
- package/dist/repositories/devices/getClientDeviceSettings.js.map +1 -1
- package/dist/repositories/devices/getDevice.js +7 -2
- package/dist/repositories/devices/getDevice.js.map +1 -1
- package/dist/repositories/devices/getDeviceCustomConfig.js +7 -2
- package/dist/repositories/devices/getDeviceCustomConfig.js.map +1 -1
- package/dist/repositories/devices/getDeviceTypeByImei.js +7 -2
- package/dist/repositories/devices/getDeviceTypeByImei.js.map +1 -1
- package/dist/repositories/devices/getDeviceTypes.js +7 -2
- package/dist/repositories/devices/getDeviceTypes.js.map +1 -1
- package/dist/repositories/devices/getDeviceTypesModelsOrderedByDeviceCount.js +7 -2
- package/dist/repositories/devices/getDeviceTypesModelsOrderedByDeviceCount.js.map +1 -1
- package/dist/repositories/devices/getDeviceWithUsersInfo.js +7 -2
- package/dist/repositories/devices/getDeviceWithUsersInfo.js.map +1 -1
- package/dist/repositories/devices/getDevices.js +7 -2
- package/dist/repositories/devices/getDevices.js.map +1 -1
- package/dist/repositories/devices/getDevicesCountByStatus.js +7 -2
- package/dist/repositories/devices/getDevicesCountByStatus.js.map +1 -1
- package/dist/repositories/devices/getFilteredImeisWithStatus.js +7 -2
- package/dist/repositories/devices/getFilteredImeisWithStatus.js.map +1 -1
- package/dist/repositories/devices/getIccidStatus.js +7 -2
- package/dist/repositories/devices/getIccidStatus.js.map +1 -1
- package/dist/repositories/devices/getImeiIccidCarrier.js +7 -2
- package/dist/repositories/devices/getImeiIccidCarrier.js.map +1 -1
- package/dist/repositories/devices/getImeiIccidCarriers.js +7 -2
- package/dist/repositories/devices/getImeiIccidCarriers.js.map +1 -1
- package/dist/repositories/entityTags/searchEntityTags.js +7 -2
- package/dist/repositories/entityTags/searchEntityTags.js.map +1 -1
- package/dist/repositories/firmwares/getDeviceFirmwares.js +27 -20
- package/dist/repositories/firmwares/getDeviceFirmwares.js.map +1 -1
- package/dist/repositories/firmwares/getFirmwareAutoUpgradeBlacklist.js +7 -2
- package/dist/repositories/firmwares/getFirmwareAutoUpgradeBlacklist.js.map +1 -1
- package/dist/repositories/firmwares/getFirmwareUpgradeTasks.js +7 -2
- package/dist/repositories/firmwares/getFirmwareUpgradeTasks.js.map +1 -1
- package/dist/repositories/firmwares/getFirmwareUpgradeTasksCount.js +7 -2
- package/dist/repositories/firmwares/getFirmwareUpgradeTasksCount.js.map +1 -1
- package/dist/repositories/latestUserAppInfo/getLatestUserAppInfo.js +9 -4
- package/dist/repositories/latestUserAppInfo/getLatestUserAppInfo.js.map +1 -1
- package/dist/repositories/liveLinks/getLiveLinkData.js +13 -3
- package/dist/repositories/liveLinks/getLiveLinkData.js.map +1 -1
- package/dist/repositories/liveLinks/getLiveLinkDataCount.js +13 -3
- package/dist/repositories/liveLinks/getLiveLinkDataCount.js.map +1 -1
- package/dist/repositories/liveLinks/getLiveLinks.js +7 -2
- package/dist/repositories/liveLinks/getLiveLinks.js.map +1 -1
- package/dist/repositories/liveLinks/getLiveLinksCount.js +7 -2
- package/dist/repositories/liveLinks/getLiveLinksCount.js.map +1 -1
- package/dist/repositories/notificationRecipients/getNotificationRecipients.js +7 -2
- package/dist/repositories/notificationRecipients/getNotificationRecipients.js.map +1 -1
- package/dist/repositories/positions/getLatestPositionByImei.js +8 -2
- package/dist/repositories/positions/getLatestPositionByImei.js.map +1 -1
- package/dist/repositories/positions/getPositionsByImei.js +8 -2
- package/dist/repositories/positions/getPositionsByImei.js.map +1 -1
- package/dist/repositories/positions/getPositionsReportByClient.js +4 -0
- package/dist/repositories/positions/getPositionsReportByClient.js.map +1 -1
- package/dist/repositories/security/getAllRoles.d.ts +1 -1
- package/dist/repositories/security/getAllRoles.js +14 -4
- package/dist/repositories/security/getAllRoles.js.map +1 -1
- package/dist/repositories/security/getUserRoles.js +13 -5
- package/dist/repositories/security/getUserRoles.js.map +1 -1
- package/dist/repositories/security/getUserRolesByClientId.js +16 -8
- package/dist/repositories/security/getUserRolesByClientId.js.map +1 -1
- package/dist/repositories/security/index.d.ts +1 -1
- package/dist/repositories/security/index.js +2 -2
- package/dist/repositories/security/index.js.map +1 -1
- package/dist/repositories/security/userIsAdminOrOwner.js +14 -9
- package/dist/repositories/security/userIsAdminOrOwner.js.map +1 -1
- package/dist/repositories/security/userIsInRole.js +12 -8
- package/dist/repositories/security/userIsInRole.js.map +1 -1
- package/dist/repositories/tags/searchTags.js +7 -2
- package/dist/repositories/tags/searchTags.js.map +1 -1
- package/dist/repositories/trips/getTripById.d.ts +1 -1
- package/dist/repositories/trips/getTripById.js +12 -6
- package/dist/repositories/trips/getTripById.js.map +1 -1
- package/dist/repositories/trips/getTrips.js +7 -2
- package/dist/repositories/trips/getTrips.js.map +1 -1
- package/dist/repositories/trips/index.d.ts +1 -1
- package/dist/repositories/trips/index.js +2 -2
- package/dist/repositories/trips/index.js.map +1 -1
- package/dist/repositories/userActivations/getLastActivationDevice.js +7 -2
- package/dist/repositories/userActivations/getLastActivationDevice.js.map +1 -1
- package/dist/repositories/userActivations/getUserActivationDevices.js +7 -2
- package/dist/repositories/userActivations/getUserActivationDevices.js.map +1 -1
- package/dist/repositories/userActivations/getUserActivationDevicesByClientId.js +7 -3
- package/dist/repositories/userActivations/getUserActivationDevicesByClientId.js.map +1 -1
- package/dist/repositories/userActivations/getUserActivationMetrics.js +7 -2
- package/dist/repositories/userActivations/getUserActivationMetrics.js.map +1 -1
- package/dist/repositories/userActivations/getUserActivations.js +7 -2
- package/dist/repositories/userActivations/getUserActivations.js.map +1 -1
- package/dist/repositories/userAppIncidents/getUserAppIncidents.js +7 -2
- package/dist/repositories/userAppIncidents/getUserAppIncidents.js.map +1 -1
- package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.d.ts +2 -1
- package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js +7 -2
- package/dist/repositories/userConfigurations/getCustomUserAlertConfiguration.js.map +1 -1
- package/dist/repositories/userConfigurations/getCustomUserAlertConfigurationCount.js +9 -4
- package/dist/repositories/userConfigurations/getCustomUserAlertConfigurationCount.js.map +1 -1
- package/dist/repositories/userConfigurations/getUserAlertConfigurations.js +7 -2
- package/dist/repositories/userConfigurations/getUserAlertConfigurations.js.map +1 -1
- package/dist/repositories/userConfigurations/getUserConfigurations.js +7 -2
- package/dist/repositories/userConfigurations/getUserConfigurations.js.map +1 -1
- package/dist/repositories/userDataDeletionRequests/getUserDataDeletionRequest.js +7 -2
- package/dist/repositories/userDataDeletionRequests/getUserDataDeletionRequest.js.map +1 -1
- package/dist/repositories/userInvitations/getUserInvitationById.js +7 -2
- package/dist/repositories/userInvitations/getUserInvitationById.js.map +1 -1
- package/dist/repositories/userInvitations/getUserInvitations.js +7 -2
- package/dist/repositories/userInvitations/getUserInvitations.js.map +1 -1
- package/dist/repositories/userRatingRequests/getUserRatingRequests.js +7 -2
- package/dist/repositories/userRatingRequests/getUserRatingRequests.js.map +1 -1
- package/dist/repositories/userRegistrationAttempts/getUserRegistrationAttempts.js +7 -2
- package/dist/repositories/userRegistrationAttempts/getUserRegistrationAttempts.js.map +1 -1
- package/dist/types/acumatica.d.ts +4 -3
- package/dist/types/aempToken.d.ts +2 -1
- package/dist/types/alertTypes.d.ts +2 -1
- package/dist/types/appFeatures.d.ts +2 -1
- package/dist/types/billing.d.ts +12 -11
- package/dist/types/blacklist.d.ts +2 -1
- package/dist/types/bleMeshConfiguration.d.ts +2 -1
- package/dist/types/boundaries.d.ts +3 -3
- package/dist/types/clients.d.ts +5 -4
- package/dist/types/clients.js.map +1 -1
- package/dist/types/common.d.ts +3 -3
- package/dist/types/countries.d.ts +3 -2
- package/dist/types/deactivations.d.ts +3 -2
- package/dist/types/deviceBehaviors.d.ts +6 -5
- package/dist/types/devicePairings.d.ts +4 -3
- package/dist/types/deviceStatus.d.ts +3 -2
- package/dist/types/devices.d.ts +17 -17
- package/dist/types/firmwares.d.ts +5 -4
- package/dist/types/firmwares.js.map +1 -1
- package/dist/types/latestUserAppInfo.d.ts +2 -1
- package/dist/types/liveLinks.d.ts +4 -4
- package/dist/types/notificationRecipients.d.ts +2 -1
- package/dist/types/position.d.ts +3 -3
- package/dist/types/security.d.ts +5 -4
- package/dist/types/tasks.d.ts +7 -7
- package/dist/types/user.d.ts +9 -9
- package/dist/types/userActivations.d.ts +6 -5
- package/dist/types/userAppIncidents.d.ts +2 -1
- package/dist/types/userConfigurations.d.ts +3 -3
- package/dist/types/userDataDeletionRequests.d.ts +2 -1
- package/dist/types/userInvitations.d.ts +3 -2
- package/dist/types/userRatingRequests.d.ts +2 -1
- package/dist/types/userRegistrationAttempts.d.ts +2 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getImeiIccidCarriers.js","sourceRoot":"","sources":["../../../src/repositories/devices/getImeiIccidCarriers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getImeiIccidCarriers.js","sourceRoot":"","sources":["../../../src/repositories/devices/getImeiIccidCarriers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAKjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,cAA8B,EAC9B,MAAkC,EAClC,MAAc,EACe,EAAE;IAC/B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE;QACtC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,qEAAqE,CAAC,CAAA;QAC9F,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,EAA+B,EAAE;QAC3F,MAAM,0BAA0B,GAAG,UAAU,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAA;QAE7E,MAAM,YAAY,GAAG,0BAA0B;aAC5C,kBAAkB,CAAC,kBAAkB,CAAC;aACtC,KAAK,CAAC,yCAAyC,EAAE;YAChD,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,yCAAyC,EACzC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -6,12 +6,17 @@ export const searchEntityTags = async (novaDataSource, params, logger) => {
|
|
|
6
6
|
logger.warn({ params }, 'EntityTagsRepository::searchEntityTags missing required parameters');
|
|
7
7
|
return { entitiesTags: [], totalCount: 0 };
|
|
8
8
|
}
|
|
9
|
-
|
|
9
|
+
// Force the query to run on master or slave
|
|
10
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
11
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
10
12
|
const tagsRepository = dataSource.getRepository(EntityTag);
|
|
11
13
|
const { filters, pagingOptions } = params;
|
|
12
14
|
let queryBuilder = tagsRepository
|
|
13
15
|
.createQueryBuilder()
|
|
14
16
|
.where('clientId = :clientId', { clientId: filters.clientId });
|
|
17
|
+
if (queryRunner) {
|
|
18
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
19
|
+
}
|
|
15
20
|
if (filters.entityIds?.length) {
|
|
16
21
|
queryBuilder = queryBuilder.andWhere('entityId IN (:...entityIds)', {
|
|
17
22
|
entityIds: filters.entityIds,
|
|
@@ -36,6 +41,6 @@ export const searchEntityTags = async (novaDataSource, params, logger) => {
|
|
|
36
41
|
entitiesTags,
|
|
37
42
|
totalCount: tagCount,
|
|
38
43
|
};
|
|
39
|
-
}, 'EntityTagsRepository::searchEntityTags');
|
|
44
|
+
}, 'EntityTagsRepository::searchEntityTags', dbQueryRunner);
|
|
40
45
|
};
|
|
41
46
|
//# sourceMappingURL=searchEntityTags.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchEntityTags.js","sourceRoot":"","sources":["../../../src/repositories/entityTags/searchEntityTags.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"searchEntityTags.js","sourceRoot":"","sources":["../../../src/repositories/entityTags/searchEntityTags.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAEL,wCAAwC,GAEzC,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAA8B,EAC9B,MAA8B,EAC9B,MAAc,EACgB,EAAE;IAChC,IACE,kBAAkB,CAAyB,MAAM,EAAE,wCAAwC,CAAC,EAC5F;QACA,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,CAAA;KAC3C;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAgC,EAAE;QAC5F,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAE1D,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;QACzC,IAAI,YAAY,GAAG,cAAc;aAC9B,kBAAkB,EAAE;aACpB,KAAK,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEhE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,6BAA6B,EAAE;gBAClE,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE;YAC1B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1F;QAED,IAAI,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE;YAC/B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,iCAAiC,EAAE;gBACtE,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAA;SACH;QAED,sCAAsC;QACtC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAA;QAE9C,MAAM,KAAK,GAAG,aAAa,EAAE,QAAQ,IAAI,EAAE,CAAA;QAC3C,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAEzB,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAC,GAAG,KAAK,CAAA;QAC3D,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAEhC,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAEjD,OAAO;YACL,YAAY;YACZ,UAAU,EAAE,QAAQ;SACE,CAAA;IAC1B,CAAC,EACD,wCAAwC,EACxC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -1,22 +1,29 @@
|
|
|
1
1
|
import { DeviceTypeFirmware } from '../../entities';
|
|
2
|
-
export const getDeviceFirmwares = async (novaDataSource, params) =>
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
2
|
+
export const getDeviceFirmwares = async (novaDataSource, params) => {
|
|
3
|
+
// Force the query to run on master or slave
|
|
4
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
5
|
+
return novaDataSource.safeQuery(async (ds, queryRunner) => {
|
|
6
|
+
const devicesFirmwaresRepository = ds.getRepository(DeviceTypeFirmware);
|
|
7
|
+
let queryBuilder = devicesFirmwaresRepository.createQueryBuilder('deviceTypeFirmware');
|
|
8
|
+
if (queryRunner) {
|
|
9
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
10
|
+
}
|
|
11
|
+
if (params?.filters?.deviceTypeId) {
|
|
12
|
+
queryBuilder = queryBuilder.andWhere('deviceTypeFirmware.deviceTypeId = :deviceTypeId', {
|
|
13
|
+
deviceTypeId: params.filters.deviceTypeId,
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
if (params?.filters?.firmwareId) {
|
|
17
|
+
queryBuilder = queryBuilder.andWhere('deviceTypeFirmware.id = :firmwareId', {
|
|
18
|
+
firmwareId: params.filters.firmwareId,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
if (params?.projectionOptions?.withDeviceType) {
|
|
22
|
+
queryBuilder = queryBuilder.leftJoinAndSelect('deviceTypeFirmware.deviceType', 'deviceType');
|
|
23
|
+
}
|
|
24
|
+
queryBuilder = queryBuilder.orderBy('deviceTypeFirmware.releaseDate', 'DESC');
|
|
25
|
+
const devicesFirmwares = await queryBuilder.getMany();
|
|
26
|
+
return devicesFirmwares;
|
|
27
|
+
}, 'FirmwaresRepository::getDeviceFirmwares', dbQueryRunner);
|
|
28
|
+
};
|
|
22
29
|
//# sourceMappingURL=getDeviceFirmwares.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceFirmwares.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getDeviceFirmwares.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getDeviceFirmwares.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getDeviceFirmwares.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAInD,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EACD,EAAE;IACjC,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,EAAkB,EAAE,WAAyB,EAAiC,EAAE;QACrF,MAAM,0BAA0B,GAAG,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;QAEvE,IAAI,YAAY,GAAG,0BAA0B,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAA;QAEtF,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE;YACjC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,iDAAiD,EAAE;gBACtF,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY;aAC1C,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;YAC/B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,qCAAqC,EAAE;gBAC1E,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;aACtC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE;YAC7C,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAA;SAC7F;QAED,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,gCAAgC,EAAE,MAAM,CAAC,CAAA;QAE7E,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAErD,OAAO,gBAAgB,CAAA;IACzB,CAAC,EACD,yCAAyC,EACzC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -7,9 +7,14 @@ export const getFirmwareAutoUpgradeBlacklist = async (novaDataSource, params, lo
|
|
|
7
7
|
logger.warn({ params }, 'FirmwaresRepository::getFirmwareAutoUpgradeBlacklist incorrect params');
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
|
-
|
|
10
|
+
// Force the query to run on master or slave
|
|
11
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
12
|
+
return await novaDataSource.safeQuery(async (ds, queryRunner) => {
|
|
11
13
|
const devicesFirmwaresRepository = ds.getRepository(FirmwareAutoUpgradeBlacklist);
|
|
12
14
|
let queryBuilder = devicesFirmwaresRepository.createQueryBuilder('firmwareAutoUpgradeBlacklist');
|
|
15
|
+
if (queryRunner) {
|
|
16
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
17
|
+
}
|
|
13
18
|
queryBuilder = queryBuilder.andWhere('firmwareAutoUpgradeBlacklist.clientId = :clientId', {
|
|
14
19
|
clientId: params.filters.clientId,
|
|
15
20
|
});
|
|
@@ -19,6 +24,6 @@ export const getFirmwareAutoUpgradeBlacklist = async (novaDataSource, params, lo
|
|
|
19
24
|
queryBuilder = queryBuilder.limit(params?.pagingOptions?.limit ?? 100);
|
|
20
25
|
const firmwaresUpgradeTasks = await queryBuilder.getMany();
|
|
21
26
|
return firmwaresUpgradeTasks;
|
|
22
|
-
}, 'FirmwaresRepository::getFirmwareAutoUpgradeBlacklist');
|
|
27
|
+
}, 'FirmwaresRepository::getFirmwareAutoUpgradeBlacklist', dbQueryRunner);
|
|
23
28
|
};
|
|
24
29
|
//# sourceMappingURL=getFirmwareAutoUpgradeBlacklist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFirmwareAutoUpgradeBlacklist.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareAutoUpgradeBlacklist.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getFirmwareAutoUpgradeBlacklist.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareAutoUpgradeBlacklist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAK7D,MAAM,aAAa,GAAG,CAAC,MAA6C,EAAW,EAAE;IAC/E,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,cAA8B,EAC9B,MAA6C,EAC7C,MAAc,EAC2B,EAAE;IAC3C,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,uEAAuE,CAAC,CAAA;QAChG,OAAO,IAAI,CAAA;KACZ;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,MAAM,cAAc,CAAC,SAAS,CACnC,KAAK,EACH,EAAkB,EAClB,WAAyB,EACgB,EAAE;QAC3C,MAAM,0BAA0B,GAAG,EAAE,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAA;QAEjF,IAAI,YAAY,GAAG,0BAA0B,CAAC,kBAAkB,CAC9D,8BAA8B,CAC/B,CAAA;QAED,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,mDAAmD,EAAE;YACxF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE;YACjC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;SAClE;QAED,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,IAAI,GAAG,CAAC,CAAA;QAEtE,MAAM,qBAAqB,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE1D,OAAO,qBAAqB,CAAA;IAC9B,CAAC,EACD,sDAAsD,EACtD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -83,9 +83,14 @@ export const getFirmwareUpgradeTasks = async (novaDataSource, params, logger) =>
|
|
|
83
83
|
logger.warn({ params }, 'FirmwaresRepository::getFirmwareUpgradeTasks incorrect params');
|
|
84
84
|
return null;
|
|
85
85
|
}
|
|
86
|
-
|
|
86
|
+
// Force the query to run on master or slave
|
|
87
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
88
|
+
return await novaDataSource.safeQuery(async (ds, queryRunner) => {
|
|
87
89
|
const devicesFirmwaresRepository = ds.getRepository(FirmwareUpgradeTask);
|
|
88
90
|
let queryBuilder = devicesFirmwaresRepository.createQueryBuilder('firmwareUpgradeTask');
|
|
91
|
+
if (queryRunner) {
|
|
92
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
93
|
+
}
|
|
89
94
|
queryBuilder = await checkAndAddImeisFilter(params, queryBuilder);
|
|
90
95
|
queryBuilder = checkAndAddStatusesFilter(params, queryBuilder);
|
|
91
96
|
queryBuilder = checkAndAddFirmwareIdFilter(params, queryBuilder);
|
|
@@ -101,6 +106,6 @@ export const getFirmwareUpgradeTasks = async (novaDataSource, params, logger) =>
|
|
|
101
106
|
queryBuilder = queryBuilder.limit(params?.pagingOptions?.limit ?? 100);
|
|
102
107
|
const firmwaresUpgradeTasks = await queryBuilder.getMany();
|
|
103
108
|
return firmwaresUpgradeTasks;
|
|
104
|
-
}, 'FirmwaresRepository::getFirmwareUpgradeTasks');
|
|
109
|
+
}, 'FirmwaresRepository::getFirmwareUpgradeTasks', dbQueryRunner);
|
|
105
110
|
};
|
|
106
111
|
//# sourceMappingURL=getFirmwareUpgradeTasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFirmwareUpgradeTasks.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareUpgradeTasks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getFirmwareUpgradeTasks.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareUpgradeTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,15 +43,20 @@ export const getFirmwareUpgradeTasksCount = async (novaDataSource, params, logge
|
|
|
43
43
|
logger.warn({ params }, 'FirmwaresRepository::getFirmwareUpgradeTasksCount incorrect params');
|
|
44
44
|
return 0;
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
// Force the query to run on master or slave
|
|
47
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
48
|
+
return await novaDataSource.safeQuery(async (ds, queryRunner) => {
|
|
47
49
|
const devicesFirmwaresRepository = ds.getRepository(FirmwareUpgradeTask);
|
|
48
50
|
let queryBuilder = devicesFirmwaresRepository.createQueryBuilder('firmwareUpgradeTask');
|
|
51
|
+
if (queryRunner) {
|
|
52
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
53
|
+
}
|
|
49
54
|
queryBuilder = await checkAndAddImeisFilter(params, queryBuilder);
|
|
50
55
|
queryBuilder = checkAndAddStatusesFilter(params, queryBuilder);
|
|
51
56
|
queryBuilder = checkAndAddFirmwareIdFilter(params, queryBuilder);
|
|
52
57
|
queryBuilder = checkAndAddTaskIdFilter(params, queryBuilder);
|
|
53
58
|
const firmwaresUpgradeTasksCount = await queryBuilder.getCount();
|
|
54
59
|
return firmwaresUpgradeTasksCount;
|
|
55
|
-
}, 'FirmwaresRepository::getFirmwareUpgradeTasksCount');
|
|
60
|
+
}, 'FirmwaresRepository::getFirmwareUpgradeTasksCount', dbQueryRunner);
|
|
56
61
|
};
|
|
57
62
|
//# sourceMappingURL=getFirmwareUpgradeTasksCount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFirmwareUpgradeTasksCount.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareUpgradeTasksCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,aAAa,GAAG,CAAC,MAA0C,EAAW,EAAE;IAC5E,OAAO,CACL,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU;QAC5B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM;QACxB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;QAClC,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAChC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,KAAK,EAClC,MAA0C,EAC1C,YAAqD,EACH,EAAE;IACpD,IAAI,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE;QAClC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,yCAAyC,EAAE;YAC9E,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;SAC5B,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,8CAA8C,EAAE;YACnF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAClC,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;QAC/B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,kEAAkE,EAClE;YACE,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;SAChD,CACF,CAAA;KACF;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAC9B,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,8BAA8B,EAAE;YACnE,EAAE,EAAE,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACpD,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,cAA8B,EAC9B,MAA0C,EAC1C,MAAc,EACG,EAAE;IACnB,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,CAAC,CAAA;KACT;IAED,OAAO,MAAM,cAAc,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"getFirmwareUpgradeTasksCount.js","sourceRoot":"","sources":["../../../src/repositories/firmwares/getFirmwareUpgradeTasksCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAIpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,aAAa,GAAG,CAAC,MAA0C,EAAW,EAAE;IAC5E,OAAO,CACL,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU;QAC5B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM;QACxB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;QAClC,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAChC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,KAAK,EAClC,MAA0C,EAC1C,YAAqD,EACH,EAAE;IACpD,IAAI,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE;QAClC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,yCAAyC,EAAE;YAC9E,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;SAC5B,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,8CAA8C,EAAE;YACnF,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,CAClC,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;QAC/B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC,kEAAkE,EAClE;YACE,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;SAChD,CACF,CAAA;KACF;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAC9B,MAA0C,EAC1C,YAAqD,EACZ,EAAE;IAC3C,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,8BAA8B,EAAE;YACnE,EAAE,EAAE,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACpD,CAAC,CAAA;KACH;IACD,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,cAA8B,EAC9B,MAA0C,EAC1C,MAAc,EACG,EAAE;IACnB,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,CAAC,CAAA;KACT;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,MAAM,cAAc,CAAC,SAAS,CACnC,KAAK,EAAE,EAAkB,EAAE,WAAyB,EAAmB,EAAE;QACvE,MAAM,0BAA0B,GAAG,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAA;QAExE,IAAI,YAAY,GAAG,0BAA0B,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA;QAEvF,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAEjE,YAAY,GAAG,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAE9D,YAAY,GAAG,2BAA2B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAEhE,YAAY,GAAG,uBAAuB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAE5D,MAAM,0BAA0B,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAA;QAEhE,OAAO,0BAA0B,CAAA;IACnC,CAAC,EACD,mDAAmD,EACnD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -10,13 +10,18 @@ export const getLatestUserAppInfo = async (novaDataSource, params, logger) => {
|
|
|
10
10
|
logger.warn({ params }, 'LatestUserAppInfoRepository::getLatestUserAppInfo - user id should be a valid UUID');
|
|
11
11
|
return null;
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
// Force the query to run on master or slave
|
|
14
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
15
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
14
16
|
const latestUserAppInfoRepository = dataSource.getRepository(LatestUserAppInfo);
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
+
const queryBuilder = latestUserAppInfoRepository.createQueryBuilder('latestUserAppInfo');
|
|
18
|
+
if (queryRunner) {
|
|
19
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
20
|
+
}
|
|
21
|
+
const result = await queryBuilder
|
|
17
22
|
.where('latestUserAppInfo.userId = :userId', { userId: binaryBuffer })
|
|
18
23
|
.getOne();
|
|
19
24
|
return result;
|
|
20
|
-
}, 'LatestUserAppInfoRepository::upsertLatestUserAppInfo');
|
|
25
|
+
}, 'LatestUserAppInfoRepository::upsertLatestUserAppInfo', dbQueryRunner);
|
|
21
26
|
};
|
|
22
27
|
//# sourceMappingURL=getLatestUserAppInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLatestUserAppInfo.js","sourceRoot":"","sources":["../../../src/repositories/latestUserAppInfo/getLatestUserAppInfo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLatestUserAppInfo.js","sourceRoot":"","sources":["../../../src/repositories/latestUserAppInfo/getLatestUserAppInfo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAIlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,cAA8B,EAC9B,MAAkC,EAClC,MAAc,EACc,EAAE;IAC9B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,iFAAiF,CAClF,CAAA;QACD,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,oFAAoF,CACrF,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,EAAE,UAA0B,EAAE,WAAyB,EAA8B,EAAE;QAC1F,MAAM,2BAA2B,GAAG,UAAU,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAA;QAE/E,MAAM,YAAY,GAAG,2BAA2B,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAA;QAExF,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY;aAC9B,KAAK,CAAC,oCAAoC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;aACrE,MAAM,EAAE,CAAA;QAEX,OAAO,MAAM,CAAA;IACf,CAAC,EACD,sDAAsD,EACtD,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -12,12 +12,17 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
12
12
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinkData - id should be a valid UUID');
|
|
13
13
|
return { trackersWithStatus: [] };
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
// Force the query to run on master or slave
|
|
16
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
17
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
16
18
|
const liveLinksRepository = dataSource.getRepository(LiveLink);
|
|
17
19
|
const queryBuilder = liveLinksRepository
|
|
18
20
|
.createQueryBuilder('liveLink')
|
|
19
21
|
.andWhere('id = :id', { id: binaryBuffer })
|
|
20
22
|
.andWhere('clientId = :clientId', { clientId: params.filters.clientId });
|
|
23
|
+
if (queryRunner) {
|
|
24
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
25
|
+
}
|
|
21
26
|
const liveLink = await queryBuilder.getOne();
|
|
22
27
|
if (!liveLink) {
|
|
23
28
|
return { trackersWithStatus: [] };
|
|
@@ -29,7 +34,9 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
29
34
|
if (liveLink.deviceAccess === 'limited' && !devices?.length) {
|
|
30
35
|
return result;
|
|
31
36
|
}
|
|
32
|
-
const filters = liveLink.deviceAccess === 'limited'
|
|
37
|
+
const filters = liveLink.deviceAccess === 'limited'
|
|
38
|
+
? { imeiList: devices }
|
|
39
|
+
: { clientId: liveLink.clientId };
|
|
33
40
|
const pageSize = params.pagingOptions?.pageSize ?? 100;
|
|
34
41
|
const pageIndex = params.pagingOptions?.pageIndex ?? 0;
|
|
35
42
|
const deviceStatuses = await deviceStatusRepository.getDeviceStatuses({
|
|
@@ -59,6 +66,9 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
59
66
|
limit: pageSize,
|
|
60
67
|
offset: pageSize * pageIndex,
|
|
61
68
|
},
|
|
69
|
+
options: {
|
|
70
|
+
forceUseReplica: params.options?.forceUseReplica,
|
|
71
|
+
},
|
|
62
72
|
});
|
|
63
73
|
result.trackersWithStatus.push(...deviceStatuses.map(deviceStatus => {
|
|
64
74
|
const data = deviceStatus?.data;
|
|
@@ -85,6 +95,6 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
85
95
|
};
|
|
86
96
|
}));
|
|
87
97
|
return result;
|
|
88
|
-
}, 'LiveLinksRepository::getLiveLinkData');
|
|
98
|
+
}, 'LiveLinksRepository::getLiveLinkData', dbQueryRunner);
|
|
89
99
|
};
|
|
90
100
|
//# sourceMappingURL=getLiveLinkData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,cAA8B,EAC9B,MAA6B,EAC7B,MAAc,EACd,sBAA8C,EACvB,EAAE;IACzB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACtD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,kEAAkE,CAAC,CAAA;QAC3F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAyB,EAAE;QACrF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,MAAM,YAAY,GAAG,mBAAmB;aACrC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aAC1C,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE1E,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAE5C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;SAClC;QAED,MAAM,MAAM,GAAiB;YAC3B,kBAAkB,EAAE,EAAE;SACvB,CAAA;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAmB,CAAA;QAE5C,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC3D,OAAO,MAAM,CAAA;SACd;QAED,MAAM,OAAO,GACX,QAAQ,CAAC,YAAY,KAAK,SAAS;YACjC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;YACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAA;QAErC,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,iBAAiB,CAAC;YACpE,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;gBACvC,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;aACxC;YACD,iBAAiB,EAAE;gBACjB,UAAU,EAAE,IAAI;gBAChB,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC;gBAClF,sBAAsB,EAAE;oBACtB,UAAU;oBACV,WAAW;oBACX,SAAS;oBACT,UAAU;oBACV,YAAY;oBACZ,mBAAmB;oBACnB,OAAO;oBACP,kBAAkB;oBAClB,gBAAgB;oBAChB,sBAAsB;oBACtB,YAAY;iBACb;aACF;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,QAAQ,GAAG,SAAS;aAC7B;YACD,OAAO,EAAE;gBACP,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe;aACjD;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAC5B,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACnC,MAAM,IAAI,GAAG,YAAY,EAAE,IAAW,CAAA;YAEtC,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,WAAW,EAAE,YAAY,CAAC,MAAM,EAAE,WAAW;gBAC7C,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY;gBAC/C,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK;gBACjC,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,MAAM,EAAE;oBACN,QAAQ,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACpD,SAAS,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,SAAS;oBACtD,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,SAAS;oBACnC,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACnD,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;oBACxD,iBAAiB,EAAE,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,SAAS;oBACtE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,SAAS;oBAC9C,gBAAgB,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,SAAS;oBACpE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,SAAS;oBAChE,oBAAoB,EAAE,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,SAAS;oBAC5E,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;iBACzD;aACF,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC,EACD,sCAAsC,EACtC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -11,12 +11,17 @@ export const getLiveLinkDataCount = async (novaDataSource, params, logger, devic
|
|
|
11
11
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinkDataCount - id should be a valid UUID');
|
|
12
12
|
return 0;
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
// Force the query to run on master or slave
|
|
15
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
16
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
15
17
|
const liveLinksRepository = dataSource.getRepository(LiveLink);
|
|
16
18
|
const queryBuilder = liveLinksRepository
|
|
17
19
|
.createQueryBuilder('liveLink')
|
|
18
20
|
.andWhere('id = :id', { id: binaryBuffer })
|
|
19
21
|
.andWhere('clientId = :clientId', { clientId: params.filters.clientId });
|
|
22
|
+
if (queryRunner) {
|
|
23
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
24
|
+
}
|
|
20
25
|
const liveLink = await queryBuilder.getOne();
|
|
21
26
|
if (!liveLink) {
|
|
22
27
|
return 0;
|
|
@@ -25,15 +30,20 @@ export const getLiveLinkDataCount = async (novaDataSource, params, logger, devic
|
|
|
25
30
|
if (liveLink.deviceAccess === 'limited' && !devices?.length) {
|
|
26
31
|
return 0;
|
|
27
32
|
}
|
|
28
|
-
const filters = liveLink.deviceAccess === 'limited'
|
|
33
|
+
const filters = liveLink.deviceAccess === 'limited'
|
|
34
|
+
? { imeiList: devices }
|
|
35
|
+
: { clientId: liveLink.clientId };
|
|
29
36
|
const result = await deviceStatusRepository.getDeviceStatusesCount({
|
|
30
37
|
filters: {
|
|
31
38
|
...filters,
|
|
32
39
|
minSendTime: params.filters.minSendTime,
|
|
33
40
|
deviceStatus: Enums.DeviceStatus.Active,
|
|
34
41
|
},
|
|
42
|
+
options: {
|
|
43
|
+
forceUseReplica: params.options?.forceUseReplica,
|
|
44
|
+
},
|
|
35
45
|
});
|
|
36
46
|
return result;
|
|
37
|
-
}, 'LiveLinksRepository::getLiveLinkDataCount');
|
|
47
|
+
}, 'LiveLinksRepository::getLiveLinkDataCount', dbQueryRunner);
|
|
38
48
|
};
|
|
39
49
|
//# sourceMappingURL=getLiveLinkDataCount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLiveLinkDataCount.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkDataCount.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLiveLinkDataCount.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkDataCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,cAA8B,EAC9B,MAAkC,EAClC,MAAc,EACd,sBAA8C,EAC7B,EAAE;IACnB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACtD,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,yEAAyE,CAC1E,CAAA;QACD,OAAO,CAAC,CAAA;KACT;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,uEAAuE,CAAC,CAAA;QAChG,OAAO,CAAC,CAAA;KACT;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,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,MAAM,YAAY,GAAG,mBAAmB;aACrC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aAC1C,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE1E,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAE5C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,CAAC,CAAA;SACT;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAmB,CAAA;QAE5C,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC3D,OAAO,CAAC,CAAA;SACT;QAED,MAAM,OAAO,GACX,QAAQ,CAAC,YAAY,KAAK,SAAS;YACjC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE;YACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAA;QAErC,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,sBAAsB,CAAC;YACjE,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;gBACvC,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;aACxC;YACD,OAAO,EAAE;gBACP,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe;aACjD;SACF,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC,EACD,2CAA2C,EAC3C,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -10,9 +10,14 @@ export const getLiveLinks = async (novaDataSource, params, logger) => {
|
|
|
10
10
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinks - id should be a valid UUID');
|
|
11
11
|
return [];
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
// Force the query to run on master or slave
|
|
14
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
15
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
14
16
|
const liveLinksRepository = dataSource.getRepository(LiveLink);
|
|
15
17
|
let queryBuilder = liveLinksRepository.createQueryBuilder('liveLink');
|
|
18
|
+
if (queryRunner) {
|
|
19
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
20
|
+
}
|
|
16
21
|
if (params?.filters?.id) {
|
|
17
22
|
queryBuilder = queryBuilder.andWhere('id = :id', { id: binaryBuffer });
|
|
18
23
|
}
|
|
@@ -36,6 +41,6 @@ export const getLiveLinks = async (novaDataSource, params, logger) => {
|
|
|
36
41
|
.offset(pageSize * pageIndex)
|
|
37
42
|
.getMany();
|
|
38
43
|
return result;
|
|
39
|
-
}, 'LiveLinksRepository::getLiveLinks');
|
|
44
|
+
}, 'LiveLinksRepository::getLiveLinks', dbQueryRunner);
|
|
40
45
|
};
|
|
41
46
|
//# sourceMappingURL=getLiveLinks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLiveLinks.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLiveLinks.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,cAA8B,EAC9B,MAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAClF,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,iEAAiE,CAAC,CAAA;QAC1F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QAChD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;QACxF,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EAAE,UAA0B,EAAE,WAAyB,EAAuB,EAAE;QACnF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,IAAI,YAAY,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAErE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACvB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;SACvE;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC7B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,sBAAsB,EAAE;gBAC3D,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE;gBACvD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAA;SACH;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,WAAW,CAAA;QAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAA;QAEzD,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,SAAS,EAAE,EAAE,SAAS,CAAC,CAAA;QAEvE,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,MAAM,MAAM,GAAG,MAAM,YAAY;aAC9B,KAAK,CAAC,QAAQ,CAAC;aACf,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;aAC5B,OAAO,EAAE,CAAA;QAEZ,OAAO,MAAM,CAAA;IACf,CAAC,EACD,mCAAmC,EACnC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -4,13 +4,18 @@ export const getLiveLinksCount = async (novaDataSource, params, logger) => {
|
|
|
4
4
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinksCount - missing required parameters');
|
|
5
5
|
return 0;
|
|
6
6
|
}
|
|
7
|
-
|
|
7
|
+
// Force the query to run on master or slave
|
|
8
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
9
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
8
10
|
const liveLinksRepository = dataSource.getRepository(LiveLink);
|
|
9
11
|
let queryBuilder = liveLinksRepository
|
|
10
12
|
.createQueryBuilder('liveLink')
|
|
11
13
|
.where('clientId = :clientId', {
|
|
12
14
|
clientId: params.filters.clientId,
|
|
13
15
|
});
|
|
16
|
+
if (queryRunner) {
|
|
17
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
18
|
+
}
|
|
14
19
|
if (params?.filters?.status) {
|
|
15
20
|
queryBuilder = queryBuilder.andWhere('status = :status', {
|
|
16
21
|
status: params.filters.status,
|
|
@@ -18,6 +23,6 @@ export const getLiveLinksCount = async (novaDataSource, params, logger) => {
|
|
|
18
23
|
}
|
|
19
24
|
const result = await queryBuilder.getCount();
|
|
20
25
|
return result;
|
|
21
|
-
}, 'LiveLinksRepository::getLiveLinksCount');
|
|
26
|
+
}, 'LiveLinksRepository::getLiveLinksCount', dbQueryRunner);
|
|
22
27
|
};
|
|
23
28
|
//# sourceMappingURL=getLiveLinksCount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLiveLinksCount.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinksCount.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLiveLinksCount.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinksCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAKlD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,cAA8B,EAC9B,MAA+B,EAC/B,MAAc,EACG,EAAE;IACnB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,sEAAsE,CAAC,CAAA;QAC/F,OAAO,CAAC,CAAA;KACT;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,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,IAAI,YAAY,GAAG,mBAAmB;aACnC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,KAAK,CAAC,sBAAsB,EAAE;YAC7B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEJ,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,kBAAkB,EAAE;gBACvD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC9B,CAAC,CAAA;SACH;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAA;QAE5C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,wCAAwC,EACxC,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -10,9 +10,14 @@ export const getNotificationRecipients = async (novaDataSource, params, logger)
|
|
|
10
10
|
logger.warn({ params }, 'NotificationRecipientsRepository::getNotificationRecipients - userId should be a valid uuid');
|
|
11
11
|
return [];
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
// Force the query to run on master or slave
|
|
14
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
15
|
+
return novaDataSource.safeQuery(async (dataSource, queryRunner) => {
|
|
14
16
|
const notificationRecipientsRepository = dataSource.getRepository(NotificationRecipient);
|
|
15
17
|
let queryBuilder = notificationRecipientsRepository.createQueryBuilder('notificationRecipient');
|
|
18
|
+
if (queryRunner) {
|
|
19
|
+
queryBuilder.setQueryRunner(queryRunner);
|
|
20
|
+
}
|
|
16
21
|
queryBuilder = queryBuilder.where(`notificationRecipient.clientId = :clientId`, {
|
|
17
22
|
clientId: params.filters.clientId,
|
|
18
23
|
});
|
|
@@ -26,6 +31,6 @@ export const getNotificationRecipients = async (novaDataSource, params, logger)
|
|
|
26
31
|
}
|
|
27
32
|
const result = await queryBuilder.getMany();
|
|
28
33
|
return result;
|
|
29
|
-
}, 'NotificationRecipientsRepository::getNotificationRecipients');
|
|
34
|
+
}, 'NotificationRecipientsRepository::getNotificationRecipients', dbQueryRunner);
|
|
30
35
|
};
|
|
31
36
|
//# sourceMappingURL=getNotificationRecipients.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNotificationRecipients.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/getNotificationRecipients.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getNotificationRecipients.js","sourceRoot":"","sources":["../../../src/repositories/notificationRecipients/getNotificationRecipients.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,cAA8B,EAC9B,MAAuC,EACvC,MAAc,EACoB,EAAE;IACpC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,2FAA2F,CAC5F,CAAA;QAED,OAAO,EAAE,CAAA;KACV;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE5E,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,IAAI,IAAI,kBAAkB,IAAI,IAAI,EAAE;QACjE,MAAM,CAAC,IAAI,CACT,EAAE,MAAM,EAAE,EACV,6FAA6F,CAC9F,CAAA;QACD,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACS,EAAE;QACpC,MAAM,gCAAgC,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;QAExF,IAAI,YAAY,GAAG,gCAAgC,CAAC,kBAAkB,CACpE,uBAAuB,CACxB,CAAA;QAED,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,4CAA4C,EAAE;YAC9E,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,kBAAkB,IAAI,IAAI,EAAE;YAC9B,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBAC7E,MAAM,EAAE,kBAAkB;aAC3B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,0BAA0B,EAAE;YACzD,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAC3C,8CAA8C,EAC9C,wBAAwB,CACzB,CAAA;SACF;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,MAAM,CAAA;IACf,CAAC,EACD,6DAA6D,EAC7D,aAAa,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -3,11 +3,16 @@ export const getLatestPositionByImei = async (novaDataSource, params, logger) =>
|
|
|
3
3
|
if (!params?.filters?.imei) {
|
|
4
4
|
return null;
|
|
5
5
|
}
|
|
6
|
+
// Force the query to run on master or slave
|
|
7
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
6
8
|
try {
|
|
7
9
|
await novaDataSource.connect();
|
|
8
10
|
const latestPositionsRepository = novaDataSource.getRepository(LatestPosition);
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
+
const result = await latestPositionsRepository
|
|
12
|
+
.createQueryBuilder('latestPosition')
|
|
13
|
+
.setQueryRunner(dbQueryRunner)
|
|
14
|
+
.where('latestPosition.imei = :imei', { imei: params.filters.imei })
|
|
15
|
+
.getOne();
|
|
11
16
|
if (!result) {
|
|
12
17
|
return null;
|
|
13
18
|
}
|
|
@@ -21,6 +26,7 @@ export const getLatestPositionByImei = async (novaDataSource, params, logger) =>
|
|
|
21
26
|
throw error;
|
|
22
27
|
}
|
|
23
28
|
finally {
|
|
29
|
+
await dbQueryRunner.release();
|
|
24
30
|
await novaDataSource.disconnect();
|
|
25
31
|
}
|
|
26
32
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLatestPositionByImei.js","sourceRoot":"","sources":["../../../src/repositories/positions/getLatestPositionByImei.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAK/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,cAA8B,EAC9B,MAAqC,EACrC,MAAc,EACW,EAAE;IAC3B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,OAAO,IAAI,CAAA;KACZ;IAED,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,MAAM,yBAAyB,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;QAE9E,MAAM,
|
|
1
|
+
{"version":3,"file":"getLatestPositionByImei.js","sourceRoot":"","sources":["../../../src/repositories/positions/getLatestPositionByImei.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAK/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,cAA8B,EAC9B,MAAqC,EACrC,MAAc,EACW,EAAE;IAC3B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,OAAO,IAAI,CAAA;KACZ;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,MAAM,yBAAyB,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;QAE9E,MAAM,MAAM,GAAG,MAAM,yBAAyB;aAC3C,kBAAkB,CAAC,gBAAgB,CAAC;aACpC,cAAc,CAAC,aAAa,CAAC;aAC7B,KAAK,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aACnE,MAAM,EAAE,CAAA;QAEX,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAA;SACZ;QAED,OAAO;YACL,GAAG,MAAM;YACT,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SACtC,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,qDAAqD,CAAC,CAAA;QAC9E,MAAM,KAAK,CAAA;KACZ;YAAS;QACR,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;QAC7B,MAAM,cAAc,CAAC,UAAU,EAAE,CAAA;KAClC;AACH,CAAC,CAAA"}
|
|
@@ -3,11 +3,16 @@ export const getPositionsByImei = async (novaDataSource, params, logger) => {
|
|
|
3
3
|
if (!params?.filters?.imei) {
|
|
4
4
|
return [];
|
|
5
5
|
}
|
|
6
|
+
// Force the query to run on master or slave
|
|
7
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
6
8
|
try {
|
|
7
9
|
await novaDataSource.connect();
|
|
8
10
|
const positionsRepository = novaDataSource.getRepository(Position);
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
+
const positions = await positionsRepository
|
|
12
|
+
.createQueryBuilder('position')
|
|
13
|
+
.setQueryRunner(dbQueryRunner)
|
|
14
|
+
.where('position.imei = :imei', { imei: params.filters.imei })
|
|
15
|
+
.getMany();
|
|
11
16
|
return (positions?.map(p => ({
|
|
12
17
|
...p,
|
|
13
18
|
id: Number(p.id),
|
|
@@ -18,6 +23,7 @@ export const getPositionsByImei = async (novaDataSource, params, logger) => {
|
|
|
18
23
|
throw error;
|
|
19
24
|
}
|
|
20
25
|
finally {
|
|
26
|
+
await dbQueryRunner.release();
|
|
21
27
|
await novaDataSource.disconnect();
|
|
22
28
|
}
|
|
23
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPositionsByImei.js","sourceRoot":"","sources":["../../../src/repositories/positions/getPositionsByImei.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAKzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,OAAO,EAAE,CAAA;KACV;IAED,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,MAAM,mBAAmB,GAAG,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAElE,MAAM,
|
|
1
|
+
{"version":3,"file":"getPositionsByImei.js","sourceRoot":"","sources":["../../../src/repositories/positions/getPositionsByImei.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAKzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACO,EAAE;IACvB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QAC1B,OAAO,EAAE,CAAA;KACV;IAED,4CAA4C;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAExE,IAAI;QACF,MAAM,cAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,MAAM,mBAAmB,GAAG,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAElE,MAAM,SAAS,GAAG,MAAM,mBAAmB;aACxC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,cAAc,CAAC,aAAa,CAAC;aAC7B,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aAC7D,OAAO,EAAE,CAAA;QAEZ,OAAO,CACL,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnB,GAAG,CAAC;YACJ,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;SACjB,CAAC,CAAC,IAAI,EAAE,CACV,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,+CAA+C,CAAC,CAAA;QACxE,MAAM,KAAK,CAAA;KACZ;YAAS;QACR,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;QAC7B,MAAM,cAAc,CAAC,UAAU,EAAE,CAAA;KAClC;AACH,CAAC,CAAA"}
|
|
@@ -4,11 +4,14 @@ export const getPositionsReportByClient = async (novaDataSource, params, logger)
|
|
|
4
4
|
if (!params.filters.clientId) {
|
|
5
5
|
return [];
|
|
6
6
|
}
|
|
7
|
+
// Force the query to run on master or slave
|
|
8
|
+
const dbQueryRunner = novaDataSource.createQueryRunnerFromParams(params);
|
|
7
9
|
try {
|
|
8
10
|
await novaDataSource.connect();
|
|
9
11
|
const positionsRepository = novaDataSource.getRepository(Position);
|
|
10
12
|
let positionsQuery = positionsRepository
|
|
11
13
|
.createQueryBuilder('p')
|
|
14
|
+
.setQueryRunner(dbQueryRunner)
|
|
12
15
|
.where('p.clientId = :clientId', { clientId: params.filters.clientId });
|
|
13
16
|
if (params.filters.imeis) {
|
|
14
17
|
positionsQuery = positionsQuery.andWhere('p.imei IN (:...imeis)', {
|
|
@@ -86,6 +89,7 @@ export const getPositionsReportByClient = async (novaDataSource, params, logger)
|
|
|
86
89
|
throw error;
|
|
87
90
|
}
|
|
88
91
|
finally {
|
|
92
|
+
await dbQueryRunner.release();
|
|
89
93
|
await novaDataSource.disconnect();
|
|
90
94
|
}
|
|
91
95
|
};
|