@spytecgps/nova-orm 1.0.5 → 1.0.7
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/svrPairingRequest.d.ts +3 -1
- package/dist/entities/svrPairingRequest.js +33 -3
- package/dist/index.js +1 -1
- package/dist/repositories/tasks/completeTask.js +1 -1
- package/dist/repositories/tasks/getTaskSchedules.js +3 -3
- package/dist/repositories/tasks/getTaskSchedulesCount.js +3 -3
- package/dist/types/tasks.d.ts +2 -1
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@ export const completeTask = async (novaDataSource, params, logger) => {
|
|
|
13
13
|
.set({
|
|
14
14
|
status: 'completed',
|
|
15
15
|
completedBy: params.completedBy,
|
|
16
|
-
completedAt: now,
|
|
16
|
+
completedAt: params.completedAt ?? now,
|
|
17
17
|
completionNotes: params.completionNotes,
|
|
18
18
|
completionOdometer: params.completionOdometer,
|
|
19
19
|
completionActiveHours: params.completionActiveHours,
|
|
@@ -50,11 +50,11 @@ export const getTaskSchedules = async (novaDataSource, params, logger) => {
|
|
|
50
50
|
return novaDataSource.safeQuery(async (dataSource) => {
|
|
51
51
|
const taskScheduleRepository = dataSource.getRepository(TaskSchedule);
|
|
52
52
|
let queryBuilder = taskScheduleRepository.createQueryBuilder('taskSchedule');
|
|
53
|
-
if (params.filters.
|
|
53
|
+
if (params.filters.imeiList?.length) {
|
|
54
54
|
queryBuilder = queryBuilder
|
|
55
55
|
.innerJoin(DeviceTask, 'dt', 'taskSchedule.id = dt.taskScheduleId')
|
|
56
|
-
.andWhere('dt.imei
|
|
57
|
-
|
|
56
|
+
.andWhere('dt.imei IN (:imeiList)', {
|
|
57
|
+
imeiList: params.filters.imeiList,
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
queryBuilder = addFilters(queryBuilder, params.filters, getTaskSchedulesFilterMapping, 'taskSchedule');
|
|
@@ -9,11 +9,11 @@ export const getTaskSchedulesCount = async (novaDataSource, params, logger) => {
|
|
|
9
9
|
return novaDataSource.safeQuery(async (dataSource) => {
|
|
10
10
|
const taskScheduleRepository = dataSource.getRepository(TaskSchedule);
|
|
11
11
|
let queryBuilder = taskScheduleRepository.createQueryBuilder('taskSchedule');
|
|
12
|
-
if (params.filters.
|
|
12
|
+
if (params.filters.imeiList) {
|
|
13
13
|
queryBuilder = queryBuilder
|
|
14
14
|
.innerJoin(DeviceTask, 'dt', 'taskSchedule.id = dt.taskScheduleId')
|
|
15
|
-
.andWhere('dt.imei
|
|
16
|
-
|
|
15
|
+
.andWhere('dt.imei IN(:imeiList)', {
|
|
16
|
+
imeiList: params.filters.imeiList,
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
queryBuilder = addFilters(queryBuilder, params.filters, getTaskSchedulesFilterMapping, 'taskSchedule');
|
package/dist/types/tasks.d.ts
CHANGED
|
@@ -56,7 +56,7 @@ export interface RangeFilter<T> {
|
|
|
56
56
|
}
|
|
57
57
|
export type TaskScheduleStatus = 'active' | 'deleted';
|
|
58
58
|
export interface GetTaskSchedulesFilters {
|
|
59
|
-
|
|
59
|
+
imeiList?: string[];
|
|
60
60
|
clientId?: number;
|
|
61
61
|
title?: string;
|
|
62
62
|
description?: string;
|
|
@@ -194,6 +194,7 @@ export interface UpdateTaskParams {
|
|
|
194
194
|
export interface CompleteTaskParams {
|
|
195
195
|
id: number;
|
|
196
196
|
completedBy: string;
|
|
197
|
+
completedAt?: Date;
|
|
197
198
|
completionNotes?: string;
|
|
198
199
|
completionOdometer?: number;
|
|
199
200
|
completionActiveHours?: number;
|