@spytecgps/nova-orm 1.0.118 → 1.0.119
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.
|
@@ -10,9 +10,15 @@ export const getDeviceBLEMeshes = async (novaDataSource, params, logger) => {
|
|
|
10
10
|
if (queryRunner) {
|
|
11
11
|
queryBuilder.setQueryRunner(queryRunner);
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
queryBuilder = queryBuilder.andWhere('deviceBLEMesh.clientId = :clientId', {
|
|
14
|
+
clientId: params.filters.clientId,
|
|
15
|
+
});
|
|
16
|
+
if (params.filters.imeis || params?.projectionOptions?.withDevice) {
|
|
17
|
+
queryBuilder = queryBuilder.leftJoinAndSelect('deviceBLEMesh.device', 'device');
|
|
18
|
+
}
|
|
19
|
+
if (params.filters.imeis) {
|
|
20
|
+
queryBuilder = queryBuilder.andWhere('device.imei IN (:...imeis)', {
|
|
21
|
+
imeis: params.filters.imeis,
|
|
16
22
|
});
|
|
17
23
|
}
|
|
18
24
|
if (params.filters.status) {
|
|
@@ -26,9 +32,6 @@ export const getDeviceBLEMeshes = async (novaDataSource, params, logger) => {
|
|
|
26
32
|
if (params?.projectionOptions?.withBeacons) {
|
|
27
33
|
queryBuilder = queryBuilder.leftJoinAndSelect('bleMesh.beacons', 'beacon');
|
|
28
34
|
}
|
|
29
|
-
if (params?.projectionOptions?.withDevice) {
|
|
30
|
-
queryBuilder = queryBuilder.leftJoinAndSelect('deviceBLEMesh.device', 'device');
|
|
31
|
-
}
|
|
32
35
|
const pageSize = params.pagingOptions?.pageSize ?? 100;
|
|
33
36
|
const pageIndex = params.pagingOptions?.pageIndex ?? 0;
|
|
34
37
|
queryBuilder = queryBuilder.limit(pageSize).offset(pageSize * pageIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeviceBLEMeshes.js","sourceRoot":"","sources":["../../../src/repositories/bleMesh/getDeviceBLEMeshes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAK9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACqB,EAAE;IACrC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,mEAAmE,CAAC,CAAA;QAC5F,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACU,EAAE;QACrC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAEjE,IAAI,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAExE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,
|
|
1
|
+
{"version":3,"file":"getDeviceBLEMeshes.js","sourceRoot":"","sources":["../../../src/repositories/bleMesh/getDeviceBLEMeshes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAK9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,MAAgC,EAChC,MAAc,EACqB,EAAE;IACrC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,mEAAmE,CAAC,CAAA;QAC5F,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAC7B,KAAK,EACH,UAA0B,EAC1B,WAAyB,EACU,EAAE;QACrC,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAA;QAEjE,IAAI,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAExE,IAAI,WAAW,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;SACzC;QAED,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,oCAAoC,EAAE;YACzE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;SAClC,CAAC,CAAA;QAEF,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE;YACjE,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAA;SAChF;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE;YACxB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,4BAA4B,EAAE;gBACjE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;aAC5B,CAAC,CAAA;SACH;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACzB,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,6CAA6C,EAAE;gBAClF,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC3C,CAAC,CAAA;SACH;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,aAAa,IAAI,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE;YACtF,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAA;SAClF;QAED,IAAI,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE;YAC1C,YAAY,GAAG,YAAY,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;SAC3E;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC,CAAA;QAEtD,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;QAExE,IAAI,eAAgC,CAAA;QACpC,IAAI,KAAK,GAAW,SAAS,CAAA;QAC7B,IAAI,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE;YAC7C,CAAC;YAAA,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;SACjE;aAAM;YACL,eAAe,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAA;SAC/C;QAED,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;IAChE,CAAC,EACD,uCAAuC,CACxC,CAAA;AACH,CAAC,CAAA"}
|
package/dist/types/bleMesh.d.ts
CHANGED