@spytecgps/nova-orm 1.0.58 → 1.0.59
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/trip.js +1 -0
- package/dist/entities/trip.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/repositories/trips/getTrips.js +8 -8
- package/dist/repositories/trips/getTrips.js.map +1 -1
- package/dist/repositories/trips/index.js +1 -1
- package/dist/repositories/trips/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -26,22 +26,22 @@ export const getTrips = async (novaDataSource, params, logger) => {
|
|
|
26
26
|
const tripsRepository = safeDataSource.getRepository(Trip);
|
|
27
27
|
const queryBuilder = tripsRepository
|
|
28
28
|
.createQueryBuilder('trip')
|
|
29
|
-
.innerJoin(Device, 'device', 'device.
|
|
29
|
+
.innerJoin(Device, 'device', 'device.clientId = trip.clientId AND device.imei = trip.imei');
|
|
30
30
|
const { filters, pagingOptions, sortOptions } = params;
|
|
31
|
-
queryBuilder.where('trip.
|
|
31
|
+
queryBuilder.where('trip.clientId = :clientId', { clientId: filters.clientId });
|
|
32
|
+
if (filters.imeis?.length) {
|
|
33
|
+
queryBuilder.andWhere('trip.imei IN (:imeiList)', {
|
|
34
|
+
imeiList: filters.imeis,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
queryBuilder.andWhere('trip.startDate between :from and :to', {
|
|
32
38
|
from: filters.from,
|
|
33
39
|
to: filters.to,
|
|
34
40
|
});
|
|
35
|
-
addAndWhere(queryBuilder, filters, 'trip.clientId', '=', 'clientId');
|
|
36
41
|
if (!filters.deviceStatus) {
|
|
37
42
|
filters.deviceStatus = 'A';
|
|
38
43
|
}
|
|
39
44
|
addAndWhere(queryBuilder, filters, 'device.status', '=', 'deviceStatus');
|
|
40
|
-
if (filters.imeis?.length) {
|
|
41
|
-
queryBuilder.andWhere('trip.imei IN (:imeiList)', {
|
|
42
|
-
imeiList: filters.imeis,
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
45
|
addAndWhere(queryBuilder, filters, 'device.name', '=', 'deviceName');
|
|
46
46
|
addAndWhere(queryBuilder, filters, 'trip.tripCompletionStatusId', '=', 'completionStatus');
|
|
47
47
|
addAndWhere(queryBuilder, filters, 'trip.tripType', '=', 'tripType');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTrips.js","sourceRoot":"","sources":["../../../src/repositories/trips/getTrips.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAG7C,OAAO,EAIL,gCAAgC,GAEjC,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,MAAM,WAAW,GAAG,CAClB,YAAsC,EACtC,MAAW,EACX,mBAA2B,EAC3B,SAAiB,EACjB,UAAkB,EAClB,EAAE;IACF,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE;QAC9B,MAAM,SAAS,GAAG,EAAE,CAAA;QACpB,SAAS,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;QAE1C,YAAY,CAAC,QAAQ,CAAC,GAAG,mBAAmB,IAAI,SAAS,KAAK,UAAU,EAAE,EAAE,SAAS,CAAC,CAAA;KACvF;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,YAAsC,EAAE,WAA+B,EAAE,EAAE;IAC7F,IAAI,iBAAiB,GAAG,MAAM,CAAA;IAC9B,IAAI,oBAAoB,GAAW,WAAW,EAAE,SAAS,IAAI,WAAW,CAAA;IACxE,IAAI,oBAAoB,KAAK,YAAY,EAAE;QACzC,iBAAiB,GAAG,QAAQ,CAAA;QAC5B,oBAAoB,GAAG,MAAM,CAAA;KAC9B;IACD,YAAY,CAAC,OAAO,CAClB,GAAG,iBAAiB,IAAI,oBAAoB,EAAE,EAC9C,WAAW,EAAE,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAClD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,cAA8B,EAC9B,MAAsB,EACtB,MAAc,EACW,EAAE;IAC3B,IAAI,kBAAkB,CAAiB,MAAM,EAAE,gCAAgC,CAAC,EAAE;QAChF,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,cAA8B,EAEnE,EAAE;QACF,MAAM,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAE1D,MAAM,YAAY,GAAG,eAAe;aACjC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,6DAA6D,CAAC,CAAA;QAE7F,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAEtD,YAAY,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"getTrips.js","sourceRoot":"","sources":["../../../src/repositories/trips/getTrips.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export class TripRepository extends BaseRepository {
|
|
|
51
51
|
this.logger.trace({}, `TripRepository::this.getTrips started with params`);
|
|
52
52
|
const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
|
|
53
53
|
const result = await getTrips(novaDataSource, params, this.logger);
|
|
54
|
-
this.logger.trace(result, 'TripRepository::getTrips result');
|
|
54
|
+
this.logger.trace({ totalCount: result?.totalCount ?? 0 }, 'TripRepository::getTrips result.totalCount');
|
|
55
55
|
return result;
|
|
56
56
|
}
|
|
57
57
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/trips/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAOrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,OAAO,cAAe,SAAQ,cAAc;IAChD;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,MAAwB;QACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,qDAAqD,CAAC,CAAA;QAEhF,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAA;QAE9D,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,MAAiC;QACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,8DAA8D,CAAC,CAAA;QAEzF,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE7E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,4CAA4C,CAAC,CAAA;QAE3E,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,EAAU;QAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,sDAAsD,CAAC,CAAA;QAE7E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAA;QAE/D,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,MAAsB;QACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,mDAAmD,CAAC,CAAA;QAE1E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAElE,IAAI,CAAC,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/trips/index.ts"],"names":[],"mappings":"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"}
|