@spytecgps/nova-orm 1.0.93 → 1.0.95
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/entityTag.d.ts +1 -1
- package/dist/entities/entityTag.js +1 -1
- package/dist/entities/entityTag.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/repositories/devices/getDevices.js +9 -1
- package/dist/repositories/devices/getDevices.js.map +1 -1
- package/dist/types/devices.d.ts +1 -0
- package/dist/types/entitiesTags.d.ts +1 -1
- package/dist/types/index.d.ts +3 -1
- package/dist/types/index.js +3 -1
- package/dist/types/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { ClientDeviceSetting, Device, ImeiIccidCarrier, ServiceProvider } from '../../entities';
|
|
1
|
+
import { ClientDeviceSetting, Device, EntityTag, ImeiIccidCarrier, ServiceProvider, } from '../../entities';
|
|
2
2
|
export const getDevices = async (novaDataSource, params, logger) => {
|
|
3
3
|
if (!params?.filters?.deviceTypeId &&
|
|
4
4
|
!params?.filters?.clientId &&
|
|
5
5
|
!params?.filters?.imeiList?.length &&
|
|
6
|
+
!params?.filters?.tagIdList?.length &&
|
|
6
7
|
!params?.filters?.status) {
|
|
7
8
|
logger.warn({ params }, 'DevicesRepository::getDevices missing required parameters');
|
|
8
9
|
return [];
|
|
@@ -35,6 +36,13 @@ export const getDevices = async (novaDataSource, params, logger) => {
|
|
|
35
36
|
imeiList: params.filters.imeiList,
|
|
36
37
|
});
|
|
37
38
|
}
|
|
39
|
+
if (params.filters.tagIdList?.length) {
|
|
40
|
+
queryBuilder = queryBuilder.innerJoin(EntityTag, 'entityTag', `entityTag.entityId = device.id
|
|
41
|
+
AND entityTag.entityType = 'Device'
|
|
42
|
+
AND entityTag.tagId IN (:...tagIdList)`, {
|
|
43
|
+
tagIdList: params.filters.tagIdList,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
38
46
|
if (params.projectionOptions?.withDeviceType) {
|
|
39
47
|
queryBuilder = queryBuilder.leftJoinAndSelect('device.deviceType', 'deviceType');
|
|
40
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDevices.js","sourceRoot":"","sources":["../../../src/repositories/devices/getDevices.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"getDevices.js","sourceRoot":"","sources":["../../../src/repositories/devices/getDevices.ts"],"names":[],"mappings":"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"}
|
package/dist/types/devices.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EntityTag } from '../entities';
|
|
2
2
|
import { OptionalReportPagination } from './common';
|
|
3
|
-
export type EntityType = 'Device' | 'Boundary';
|
|
3
|
+
export type EntityType = 'Device' | 'Boundary' | 'User';
|
|
4
4
|
export declare const requiredCreateEntityTagParamsAttributes: string[];
|
|
5
5
|
export interface CreateEntityTagParams {
|
|
6
6
|
clientId: number;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ import * as Deactivations from './deactivations';
|
|
|
12
12
|
import * as DeviceBehaviors from './deviceBehaviors';
|
|
13
13
|
import * as DevicePairings from './devicePairings';
|
|
14
14
|
import * as Devices from './devices';
|
|
15
|
+
import * as EntitiesTags from './entitiesTags';
|
|
15
16
|
import * as Enums from './enums';
|
|
16
17
|
import * as Firmwares from './firmwares';
|
|
17
18
|
import * as LatestUserAppInfo from './latestUserAppInfo';
|
|
@@ -20,6 +21,7 @@ import * as Logger from './logger';
|
|
|
20
21
|
import * as NotificationRecipients from './notificationRecipients';
|
|
21
22
|
import * as Positions from './position';
|
|
22
23
|
import * as Security from './security';
|
|
24
|
+
import * as Tags from './tag';
|
|
23
25
|
import * as Trips from './trip';
|
|
24
26
|
import * as Users from './user';
|
|
25
27
|
import * as UserActivations from './userActivations';
|
|
@@ -30,4 +32,4 @@ import * as UserDataDeletionRequests from './userDataDeletionRequests';
|
|
|
30
32
|
import * as UserInvitations from './userInvitations';
|
|
31
33
|
import * as UserRatingRequests from './userRatingRequests';
|
|
32
34
|
import * as UserRegistrationAttempts from './userRegistrationAttempts';
|
|
33
|
-
export { Acumatica, Alerts, AlertTypes, AppFeatures, Billing, Blacklist, BLEMeshConfiguration, Boundaries, Clients, Countries, Deactivations, DeviceBehaviors, DevicePairings, Devices, Firmwares, LatestUserAppInfo, LiveLinks, Logger, NotificationRecipients, Positions, Security, Trips, Users, UserActivations, UserAppFeedback, UserAppIncidents, UserConfigurations, UserDataDeletionRequests, UserInvitations, UserRatingRequests, UserRegistrationAttempts, Enums, };
|
|
35
|
+
export { Acumatica, Alerts, AlertTypes, AppFeatures, Billing, Blacklist, BLEMeshConfiguration, Boundaries, Clients, Countries, Deactivations, DeviceBehaviors, DevicePairings, Devices, EntitiesTags, Firmwares, LatestUserAppInfo, LiveLinks, Logger, NotificationRecipients, Positions, Security, Tags, Trips, Users, UserActivations, UserAppFeedback, UserAppIncidents, UserConfigurations, UserDataDeletionRequests, UserInvitations, UserRatingRequests, UserRegistrationAttempts, Enums, };
|
package/dist/types/index.js
CHANGED
|
@@ -12,6 +12,7 @@ import * as Deactivations from './deactivations';
|
|
|
12
12
|
import * as DeviceBehaviors from './deviceBehaviors';
|
|
13
13
|
import * as DevicePairings from './devicePairings';
|
|
14
14
|
import * as Devices from './devices';
|
|
15
|
+
import * as EntitiesTags from './entitiesTags';
|
|
15
16
|
import * as Enums from './enums';
|
|
16
17
|
import * as Firmwares from './firmwares';
|
|
17
18
|
import * as LatestUserAppInfo from './latestUserAppInfo';
|
|
@@ -20,6 +21,7 @@ import * as Logger from './logger';
|
|
|
20
21
|
import * as NotificationRecipients from './notificationRecipients';
|
|
21
22
|
import * as Positions from './position';
|
|
22
23
|
import * as Security from './security';
|
|
24
|
+
import * as Tags from './tag';
|
|
23
25
|
import * as Trips from './trip';
|
|
24
26
|
import * as Users from './user';
|
|
25
27
|
import * as UserActivations from './userActivations';
|
|
@@ -30,5 +32,5 @@ import * as UserDataDeletionRequests from './userDataDeletionRequests';
|
|
|
30
32
|
import * as UserInvitations from './userInvitations';
|
|
31
33
|
import * as UserRatingRequests from './userRatingRequests';
|
|
32
34
|
import * as UserRegistrationAttempts from './userRegistrationAttempts';
|
|
33
|
-
export { Acumatica, Alerts, AlertTypes, AppFeatures, Billing, Blacklist, BLEMeshConfiguration, Boundaries, Clients, Countries, Deactivations, DeviceBehaviors, DevicePairings, Devices, Firmwares, LatestUserAppInfo, LiveLinks, Logger, NotificationRecipients, Positions, Security, Trips, Users, UserActivations, UserAppFeedback, UserAppIncidents, UserConfigurations, UserDataDeletionRequests, UserInvitations, UserRatingRequests, UserRegistrationAttempts, Enums, };
|
|
35
|
+
export { Acumatica, Alerts, AlertTypes, AppFeatures, Billing, Blacklist, BLEMeshConfiguration, Boundaries, Clients, Countries, Deactivations, DeviceBehaviors, DevicePairings, Devices, EntitiesTags, Firmwares, LatestUserAppInfo, LiveLinks, Logger, NotificationRecipients, Positions, Security, Tags, Trips, Users, UserActivations, UserAppFeedback, UserAppIncidents, UserConfigurations, UserDataDeletionRequests, UserInvitations, UserRatingRequests, UserRegistrationAttempts, Enums, };
|
|
34
36
|
//# sourceMappingURL=index.js.map
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,SAAS,CAAA;AACjC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,WAAW,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,oBAAoB,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,sBAAsB,MAAM,0BAA0B,CAAA;AAClE,OAAO,KAAK,SAAS,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,kBAAkB,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,wBAAwB,MAAM,4BAA4B,CAAA;AACtE,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,kBAAkB,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,wBAAwB,MAAM,4BAA4B,CAAA;AAEtE,OAAO,EACL,SAAS,EACT,MAAM,EACN,UAAU,EACV,WAAW,EACX,OAAO,EACP,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,SAAS,EACT,aAAa,EACb,eAAe,EACf,cAAc,EACd,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,sBAAsB,EACtB,SAAS,EACT,QAAQ,EACR,KAAK,EACL,KAAK,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,GACN,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,SAAS,CAAA;AACjC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,WAAW,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,oBAAoB,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,YAAY,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,iBAAiB,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,sBAAsB,MAAM,0BAA0B,CAAA;AAClE,OAAO,KAAK,SAAS,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,OAAO,CAAA;AAC7B,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,gBAAgB,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,kBAAkB,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,wBAAwB,MAAM,4BAA4B,CAAA;AACtE,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,kBAAkB,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,wBAAwB,MAAM,4BAA4B,CAAA;AAEtE,OAAO,EACL,SAAS,EACT,MAAM,EACN,UAAU,EACV,WAAW,EACX,OAAO,EACP,SAAS,EACT,oBAAoB,EACpB,UAAU,EACV,OAAO,EACP,SAAS,EACT,aAAa,EACb,eAAe,EACf,cAAc,EACd,OAAO,EACP,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,sBAAsB,EACtB,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,KAAK,EACL,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,GACN,CAAA"}
|