@spytecgps/nova-orm 1.0.24 → 1.0.26
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/index.js +1 -1
- package/dist/repositories/tasks/getTaskSchedules.js +6 -4
- package/dist/repositories/tasks/getTaskSchedules.js.map +1 -1
- package/dist/repositories/tasks/getTaskSchedulesCount.js +1 -1
- package/dist/repositories/tasks/getTaskSchedulesCount.js.map +1 -1
- package/package.json +1 -1
|
@@ -50,11 +50,10 @@ 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.imeiList?.length || params.filters.authorizedImeis?.length) {
|
|
54
|
-
queryBuilder = queryBuilder.innerJoin(DeviceTask, 'dt', 'taskSchedule.id = dt.taskScheduleId');
|
|
55
|
-
}
|
|
56
53
|
if (params.filters.imeiList?.length) {
|
|
57
|
-
queryBuilder = queryBuilder
|
|
54
|
+
queryBuilder = queryBuilder
|
|
55
|
+
.innerJoin(DeviceTask, 'dt', 'taskSchedule.id = dt.taskScheduleId')
|
|
56
|
+
.andWhere('dt.imei IN (:imeiList)', {
|
|
58
57
|
imeiList: params.filters.imeiList,
|
|
59
58
|
});
|
|
60
59
|
}
|
|
@@ -71,6 +70,9 @@ export const getTaskSchedules = async (novaDataSource, params, logger) => {
|
|
|
71
70
|
authorizedDevices: params.filters.authorizedImeis,
|
|
72
71
|
});
|
|
73
72
|
}
|
|
73
|
+
if (params.filters.imeiList?.length) {
|
|
74
|
+
queryBuilder = queryBuilder.groupBy('taskSchedule.id');
|
|
75
|
+
}
|
|
74
76
|
const sortField = params.sortOptions?.sortField ?? 'id';
|
|
75
77
|
const sortOrder = params.sortOptions?.sortOrder ?? 'DESC';
|
|
76
78
|
queryBuilder = queryBuilder.orderBy(`taskSchedule.${sortField}`, sortOrder);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTaskSchedules.js","sourceRoot":"","sources":["../../../src/repositories/tasks/getTaskSchedules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAA;AAEnF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,gBAA0B,EAC1B,oBAA4B,EAC5B,UAA0B,EAC0B,EAAE;IACtD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC5B,OAAO,EAAE,CAAA;KACV;IAED,MAAM,MAAM,GAA8C,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACpF,EAAE;QACF,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,CAAC;KACf,CAAC,CAAC,CAAA;IAEH,MAAM,oBAAoB,GAAG,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IAEjE,MAAM,sBAAsB,GAAG,oBAAoB;SAChD,kBAAkB,CAAC,YAAY,CAAC;SAChC,KAAK,CAAC,qDAAqD,EAAE;QAC5D,gBAAgB;KACjB,CAAC;SACD,QAAQ,CACP;;;;;;kCAM4B,oBAAoB;UAC5C,CACL,CAAA;IAEH,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,CAAA;IAE1D,0BAA0B;IAC1B,MAAM,YAAY,GAAG,MAAM,oBAAoB;SAC5C,kBAAkB,CAAC,YAAY,CAAC;SAChC,MAAM,CAAC,6CAA6C,CAAC;SACrD,SAAS,CAAC,kCAAkC,EAAE,aAAa,CAAC;SAC5D,KAAK,CAAC,qDAAqD,EAAE;QAC5D,gBAAgB;KACjB,CAAC;SACD,OAAO,CAAC,2BAA2B,CAAC;SACpC,UAAU,EAAE,CAAA;IAEf,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,KAAK,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1F,IAAI,CAAC,WAAW;YACd,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,KAAK,IAAI,CAAC,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,CAAA;KAC/F;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAQD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAA8B,EAC9B,MAA8B,EAC9B,MAAc,EACW,EAAE;IAC3B,IAAI,CAAC,oBAAoB,CAA0B,MAAM,EAAE,OAAO,CAAC,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,+DAA+D,CAAC,CAAA;QACxF,OAAO,EAAE,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAA2B,EAAE;QAC5F,MAAM,sBAAsB,GAAG,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAErE,IAAI,YAAY,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAE5E,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"getTaskSchedules.js","sourceRoot":"","sources":["../../../src/repositories/tasks/getTaskSchedules.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ 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.imeiList?.length
|
|
12
|
+
if (params.filters.imeiList?.length) {
|
|
13
13
|
queryBuilder = queryBuilder.innerJoin(DeviceTask, 'dt', 'taskSchedule.id = dt.taskScheduleId');
|
|
14
14
|
}
|
|
15
15
|
if (params.filters.imeiList?.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTaskSchedulesCount.js","sourceRoot":"","sources":["../../../src/repositories/tasks/getTaskSchedulesCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAA;AAEnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,cAA8B,EAC9B,MAAmC,EACnC,MAAc,EACG,EAAE;IACnB,IAAI,CAAC,oBAAoB,CAA0B,MAAM,EAAE,OAAO,CAAC,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,CAAC,CAAC,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAmB,EAAE;QACpF,MAAM,sBAAsB,GAAG,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAErE,IAAI,YAAY,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAE5E,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"getTaskSchedulesCount.js","sourceRoot":"","sources":["../../../src/repositories/tasks/getTaskSchedulesCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAA;AAEnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,cAA8B,EAC9B,MAAmC,EACnC,MAAc,EACG,EAAE;IACnB,IAAI,CAAC,oBAAoB,CAA0B,MAAM,EAAE,OAAO,CAAC,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,CAAC,CAAC,CAAA;KACV;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAmB,EAAE;QACpF,MAAM,sBAAsB,GAAG,UAAU,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;QAErE,IAAI,YAAY,GAAG,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAE5E,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;YACnC,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,qCAAqC,CAAC,CAAA;SAC/F;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;YACnC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAwB,EAAE;gBAC7D,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAA;SACH;QAED,YAAY,GAAG,UAAU,CACvB,YAAY,EACZ,MAAM,CAAC,OAAO,EACd,6BAA6B,EAC7B,cAAc,CACf,CAAA;QAED,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,EAAE;YAC1C,YAAY,GAAG,YAAY,CAAC,QAAQ,CAClC;;;;;;;SAOC,EACD;gBACE,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,eAAe;aAClD,CACF,CAAA;SACF;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,EAAE,CAAA;QAE5C,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,wCAAwC,CAAC,CAAA;AAC9C,CAAC,CAAA"}
|