@spytecgps/nova-orm 1.0.57 → 1.0.58
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.
|
@@ -51,14 +51,67 @@ export const getTrips = async (novaDataSource, params, logger) => {
|
|
|
51
51
|
addAndWhere(queryBuilder, filters, 'trip.distance', '<=', 'distanceMax');
|
|
52
52
|
addOrderBy(queryBuilder, sortOptions);
|
|
53
53
|
// counting before applying pagination
|
|
54
|
-
const
|
|
54
|
+
const fetchTripCount = queryBuilder.getCount();
|
|
55
55
|
const limit = pagingOptions.pageSize ?? 50;
|
|
56
56
|
queryBuilder.limit(limit);
|
|
57
57
|
const globalIndex = (pagingOptions.pageIndex ?? 0) * limit;
|
|
58
58
|
queryBuilder.offset(globalIndex);
|
|
59
|
-
const
|
|
59
|
+
const fetchRows = queryBuilder
|
|
60
|
+
.select([
|
|
61
|
+
'trip.id as id',
|
|
62
|
+
'trip.tripGuid as tripGuid',
|
|
63
|
+
'trip.startDate as startDate',
|
|
64
|
+
'trip.endDate as endDate',
|
|
65
|
+
'trip.clientId as clientId',
|
|
66
|
+
'trip.imei as imei',
|
|
67
|
+
'trip.startLat as startLat',
|
|
68
|
+
'trip.startLon as startLon',
|
|
69
|
+
'trip.endLat as endLat',
|
|
70
|
+
'trip.endLon as endLon',
|
|
71
|
+
'trip.startAddress as startAddress',
|
|
72
|
+
'trip.endAddress as endAddress',
|
|
73
|
+
'trip.positionStart as positionStart',
|
|
74
|
+
'trip.positionEnd as positionEnd',
|
|
75
|
+
'trip.startMessageId as startMessageId',
|
|
76
|
+
'trip.endMessageId as endMessageId',
|
|
77
|
+
'trip.startSendTimeMessage as startSendTimeMessage',
|
|
78
|
+
'trip.endSendTimeMessage as endSendTimeMessage',
|
|
79
|
+
'trip.createdAt as createdAt',
|
|
80
|
+
'trip.distance as distance',
|
|
81
|
+
'trip.duration as duration',
|
|
82
|
+
'trip.tripType as tripType',
|
|
83
|
+
'trip.tripCompletionStatusId as tripCompletionStatusId',
|
|
84
|
+
'device.name as deviceName',
|
|
85
|
+
])
|
|
86
|
+
.getRawMany();
|
|
87
|
+
const [tripCount, rows] = await Promise.all([fetchTripCount, fetchRows]);
|
|
60
88
|
return {
|
|
61
|
-
trips
|
|
89
|
+
trips: rows.map(row => ({
|
|
90
|
+
id: row.id,
|
|
91
|
+
tripGuid: row.tripGuid,
|
|
92
|
+
startDate: row.startDate,
|
|
93
|
+
endDate: row.endDate,
|
|
94
|
+
clientId: row.clientId,
|
|
95
|
+
imei: row.imei,
|
|
96
|
+
startLat: row.startLat,
|
|
97
|
+
startLon: row.startLon,
|
|
98
|
+
endLat: row.endLat,
|
|
99
|
+
endLon: row.endLon,
|
|
100
|
+
startAddress: row.startAddress,
|
|
101
|
+
endAddress: row.endAddress,
|
|
102
|
+
positionStart: row.positionStart,
|
|
103
|
+
positionEnd: row.positionEnd,
|
|
104
|
+
startMessageId: row.startMessageId,
|
|
105
|
+
endMessageId: row.endMessageId,
|
|
106
|
+
startSendTimeMessage: row.startSendTimeMessage,
|
|
107
|
+
endSendTimeMessage: row.endSendTimeMessage,
|
|
108
|
+
createdAt: row.createdAt,
|
|
109
|
+
distance: row.distance,
|
|
110
|
+
duration: row.duration,
|
|
111
|
+
tripType: row.tripType,
|
|
112
|
+
tripCompletionStatusId: row.tripCompletionStatusId,
|
|
113
|
+
deviceName: row.deviceName,
|
|
114
|
+
})),
|
|
62
115
|
totalCount: tripCount,
|
|
63
116
|
};
|
|
64
117
|
}, 'TripRepository::getTrips error');
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"getTrips.js","sourceRoot":"","sources":["../../../src/repositories/trips/getTrips.ts"],"names":[],"mappings":"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"}
|
package/dist/types/trip.d.ts
CHANGED
|
@@ -67,7 +67,10 @@ export interface GetTripsParams extends ReportPagination {
|
|
|
67
67
|
};
|
|
68
68
|
sortOptions?: GetTripSortParams;
|
|
69
69
|
}
|
|
70
|
+
export interface TripWithDevice extends Trip {
|
|
71
|
+
deviceName: string;
|
|
72
|
+
}
|
|
70
73
|
export interface GetTripsResult {
|
|
71
|
-
trips:
|
|
74
|
+
trips: TripWithDevice[];
|
|
72
75
|
totalCount: number;
|
|
73
76
|
}
|