@tmscloud/tbt-knex 0.0.28 → 0.0.30

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.
Files changed (33) hide show
  1. package/dist/dao/driver-tracking/driver-tracking.dao.js +23 -2
  2. package/dist/dao/driver-tracking/driver-tracking.dao.js.map +1 -1
  3. package/dist/dao/duty/duty.dao.d.ts +16 -0
  4. package/dist/dao/duty/duty.dao.js +115 -26
  5. package/dist/dao/duty/duty.dao.js.map +1 -1
  6. package/dist/dao/duty-feedback/duty-feedback.dao.d.ts +7 -0
  7. package/dist/dao/duty-feedback/duty-feedback.dao.js +58 -0
  8. package/dist/dao/duty-feedback/duty-feedback.dao.js.map +1 -0
  9. package/dist/dao/duty-item-progress/duty-item-progress.dao.d.ts +45 -0
  10. package/dist/dao/duty-item-progress/duty-item-progress.dao.js +178 -2
  11. package/dist/dao/duty-item-progress/duty-item-progress.dao.js.map +1 -1
  12. package/dist/dao/duty-stop-event/duty-stop-event.dao.d.ts +1 -0
  13. package/dist/dao/duty-stop-event/duty-stop-event.dao.js +11 -0
  14. package/dist/dao/duty-stop-event/duty-stop-event.dao.js.map +1 -1
  15. package/dist/dao/route/route.dao.d.ts +6 -0
  16. package/dist/dao/route/route.dao.js +22 -0
  17. package/dist/dao/route/route.dao.js.map +1 -1
  18. package/dist/dao/stats/stats.dao.d.ts +7 -0
  19. package/dist/dao/stats/stats.dao.js +122 -0
  20. package/dist/dao/stats/stats.dao.js.map +1 -0
  21. package/dist/index.d.ts +7 -1
  22. package/dist/index.js +7 -1
  23. package/dist/index.js.map +1 -1
  24. package/dist/interfaces/driver-tracking/driver-tracking.interfaces.d.ts +1 -0
  25. package/dist/interfaces/duty/duty.interfaces.d.ts +2 -0
  26. package/dist/interfaces/duty-feedback/duty-feedback.interfaces.d.ts +18 -0
  27. package/dist/interfaces/duty-feedback/duty-feedback.interfaces.js +3 -0
  28. package/dist/interfaces/duty-feedback/duty-feedback.interfaces.js.map +1 -0
  29. package/dist/interfaces/duty-item-progress/duty-item-progress.interfaces.d.ts +7 -0
  30. package/dist/interfaces/stats/stats.interfaces.d.ts +24 -0
  31. package/dist/interfaces/stats/stats.interfaces.js +3 -0
  32. package/dist/interfaces/stats/stats.interfaces.js.map +1 -0
  33. package/package.json +1 -1
package/dist/dao/driver-tracking/driver-tracking.dao.js CHANGED
@@ -158,7 +158,27 @@ class DriverTrackingDAO {
158
158
  ) dip ON TRUE`)
159
159
  .leftJoin("duty_template_items as dti", "dti.id", "dip.template_item_id")
160
160
  .leftJoin("routes as r", "r.id", this.knex.raw("COALESCE(dip.route_id, dti.route_id)"))
161
- .select("latest_dt.session_id", "latest_dt.latitude", "latest_dt.longitude", "latest_dt.heading", "latest_dt.speed", "latest_dt.metadata", "latest_dt.recorded_at", this.knex.raw("d.uuid as duty_uuid"), this.knex.raw("e.uuid as event_uuid"), this.knex.raw("r.uuid as route_uuid"), this.knex.raw("r.name as route_name"), this.knex.raw("r.code as route_code"), this.knex.raw("dip.uuid as progress_uuid"), this.knex.raw("dip.item_order"), this.knex.raw("dip.loop_count"), this.knex.raw("dip.started_at"), this.knex.raw("dip.route_id as injected_route_id"), this.knex.raw("dti.item_type"), this.knex.raw("dti.stop_name"), this.knex.raw("dti.is_repeating"), this.knex.raw(`jsonb_build_object(
161
+ // All routes the duty may drive: its template's route items UNION any
162
+ // mid-duty code-injected routes. Built from the schema (segments/items
163
+ // and duty_item_progress.route_id) rather than from progress rows, so
164
+ // not-yet-reached and adhoc routes are still matched by the route filter.
165
+ .joinRaw(`LEFT JOIN LATERAL (
166
+ SELECT array_agg(DISTINCT route_uuid) AS route_uuids
167
+ FROM (
168
+ SELECT r2.uuid AS route_uuid
169
+ FROM duty_template_segments seg
170
+ JOIN duty_template_items dti2 ON dti2.segment_id = seg.id
171
+ JOIN routes r2 ON r2.id = dti2.route_id
172
+ WHERE seg.duty_template_id = d.duty_template_id
173
+ AND dti2.item_type = 'route'
174
+ UNION
175
+ SELECT r3.uuid AS route_uuid
176
+ FROM duty_item_progress dip2
177
+ JOIN routes r3 ON r3.id = dip2.route_id
178
+ WHERE dip2.duty_id = d.id
179
+ ) duty_route_set
180
+ ) duty_routes ON TRUE`)
181
+ .select("latest_dt.session_id", "latest_dt.latitude", "latest_dt.longitude", "latest_dt.heading", "latest_dt.speed", "latest_dt.metadata", "latest_dt.recorded_at", this.knex.raw("d.uuid as duty_uuid"), this.knex.raw("e.uuid as event_uuid"), this.knex.raw("r.uuid as route_uuid"), this.knex.raw("r.name as route_name"), this.knex.raw("r.code as route_code"), this.knex.raw("duty_routes.route_uuids as duty_route_uuids"), this.knex.raw("dip.uuid as progress_uuid"), this.knex.raw("dip.item_order"), this.knex.raw("dip.loop_count"), this.knex.raw("dip.started_at"), this.knex.raw("dip.route_id as injected_route_id"), this.knex.raw("dti.item_type"), this.knex.raw("dti.stop_name"), this.knex.raw("dti.is_repeating"), this.knex.raw(`jsonb_build_object(
162
182
  'uuid', u.uuid,
163
183
  'email', u.email,
164
184
  'username', u.username,
@@ -166,7 +186,7 @@ class DriverTrackingDAO {
166
186
  'last_name', u.last_name
167
187
  ) as user`));
168
188
  return results.map((row) => {
169
- var _a;
189
+ var _a, _b;
170
190
  return ({
171
191
  user: row.user,
172
192
  session_id: row.session_id,
@@ -182,6 +202,7 @@ class DriverTrackingDAO {
182
202
  },
183
203
  current_route: this.buildCurrentRoute(row),
184
204
  current_item: this.buildCurrentItem(row),
205
+ duty_route_uuids: (_b = row.duty_route_uuids) !== null && _b !== void 0 ? _b : [],
185
206
  });
186
207
  });
187
208
  });
package/dist/dao/driver-tracking/driver-tracking.dao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver-tracking.dao.js","sourceRoot":"","sources":["../../../src/dao/driver-tracking/driver-tracking.dao.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver-tracking.dao.js","sourceRoot":"","sources":["../../../src/dao/driver-tracking/driver-tracking.dao.ts"],"names":[],"mappings":"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"}
package/dist/dao/duty/duty.dao.d.ts CHANGED
@@ -7,14 +7,18 @@ export declare class DutyDAO implements IBaseDAO<IDuty> {
7
7
  private get knex();
8
8
  private get dutyTrackDAO();
9
9
  private parseDutyJson;
10
+ private applyDutyFilters;
10
11
  private baseQuery;
11
12
  getAll(page?: number, limit?: number): Promise<IDataPaginator<IDuty>>;
12
13
  getById(id: number): Promise<IDuty | null>;
13
14
  getByUuid(uuid: string): Promise<IDuty | null>;
14
15
  getByUserId(userId: number, page?: number, limit?: number, filters?: IDutyFilters): Promise<IDataPaginator<IDuty>>;
15
16
  getByEventId(eventId: number, page?: number, limit?: number, filters?: IDutyFilters): Promise<IDataPaginator<IDuty>>;
17
+ getAllByEventId(eventId: number, filters?: IDutyFilters): Promise<IDuty[]>;
18
+ countByEventId(eventId: number, filters?: IDutyFilters): Promise<number>;
16
19
  getActiveByUserId(userId: number): Promise<IDuty[]>;
17
20
  getTodayByUserId(userId: number, clientDate?: string): Promise<IDuty[]>;
21
+ getByUserIdAndDateRange(userId: number, startDate: string, endDate: string): Promise<IDuty[]>;
18
22
  getByUserIdEventIdAndDate(userId: number, eventId: number, dutyDate: string): Promise<IDuty | null>;
19
23
  getByStatus(status: string, page?: number, limit?: number): Promise<IDataPaginator<IDuty>>;
20
24
  create(data: IDutyCreate): Promise<IDuty>;
@@ -28,6 +32,18 @@ export declare class DutyDAO implements IBaseDAO<IDuty> {
28
32
  updateTrackingStatus(id: number, trackingStatus: "none" | "tracking" | "syncing" | "consolidated"): Promise<IDuty | null>;
29
33
  startDuty(id: number, trackingSessionId?: string, trx?: Knex.Transaction): Promise<IDuty | null>;
30
34
  completeDuty(id: number): Promise<IDuty | null>;
35
+ /**
36
+ * Complete the duty iff every progress item is terminal. Runs under a
37
+ * FOR UPDATE lock on the duty row so concurrent skip/complete/inject calls
38
+ * serialize — without it, two "skip the last item" requests can each see
39
+ * the other's item as still pending and neither completes the duty.
40
+ *
41
+ * The tracking_status flip to 'syncing' happens in the SAME transaction:
42
+ * a duty observed as completed+'tracking'/'none' makes the driver's next
43
+ * GPS batch a hard 400 that mobile treats as "duty gone" and answers by
44
+ * deleting its queued points.
45
+ */
46
+ completeIfNoRemainingItems(id: number): Promise<IDuty | null>;
31
47
  cancelDuty(id: number): Promise<IDuty | null>;
32
48
  restartDuty(id: number): Promise<IDuty | null>;
33
49
  /**
package/dist/dao/duty/duty.dao.js CHANGED
@@ -56,6 +56,28 @@ class DutyDAO {
56
56
  }
57
57
  return duty;
58
58
  }
59
+ applyDutyFilters(query, filters) {
60
+ if (filters === null || filters === void 0 ? void 0 : filters.search) {
61
+ const searchTerm = `%${filters.search}%`;
62
+ query.where(function () {
63
+ this.whereRaw("u.email ILIKE ?", [searchTerm])
64
+ .orWhereRaw("u.username ILIKE ?", [searchTerm])
65
+ .orWhereRaw("u.first_name ILIKE ?", [searchTerm])
66
+ .orWhereRaw("u.last_name ILIKE ?", [searchTerm])
67
+ .orWhereRaw("dt.name ILIKE ?", [searchTerm]);
68
+ });
69
+ }
70
+ if (filters === null || filters === void 0 ? void 0 : filters.status) {
71
+ query.where("d.status", filters.status);
72
+ }
73
+ const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
74
+ if ((filters === null || filters === void 0 ? void 0 : filters.from) && dateRegex.test(filters.from)) {
75
+ query.where("d.duty_date", ">=", filters.from);
76
+ }
77
+ if ((filters === null || filters === void 0 ? void 0 : filters.to) && dateRegex.test(filters.to)) {
78
+ query.where("d.duty_date", "<=", filters.to);
79
+ }
80
+ }
59
81
  baseQuery() {
60
82
  return this.knex("duties as d")
61
83
  .leftJoin("duty_templates as dt", "d.duty_template_id", "dt.id")
@@ -129,19 +151,7 @@ class DutyDAO {
129
151
  const query = this.baseQuery()
130
152
  .where("d.user_id", userId)
131
153
  .where("d.is_active", true);
132
- if (filters === null || filters === void 0 ? void 0 : filters.search) {
133
- const searchTerm = `%${filters.search}%`;
134
- query.where(function () {
135
- this.whereRaw("u.email ILIKE ?", [searchTerm])
136
- .orWhereRaw("u.username ILIKE ?", [searchTerm])
137
- .orWhereRaw("u.first_name ILIKE ?", [searchTerm])
138
- .orWhereRaw("u.last_name ILIKE ?", [searchTerm])
139
- .orWhereRaw("dt.name ILIKE ?", [searchTerm]);
140
- });
141
- }
142
- if (filters === null || filters === void 0 ? void 0 : filters.status) {
143
- query.where("d.status", filters.status);
144
- }
154
+ this.applyDutyFilters(query, filters);
145
155
  const countResult = yield query
146
156
  .clone()
147
157
  .clearSelect()
@@ -166,19 +176,7 @@ class DutyDAO {
166
176
  const query = this.baseQuery()
167
177
  .where("d.event_id", eventId)
168
178
  .where("d.is_active", true);
169
- if (filters === null || filters === void 0 ? void 0 : filters.search) {
170
- const searchTerm = `%${filters.search}%`;
171
- query.where(function () {
172
- this.whereRaw("u.email ILIKE ?", [searchTerm])
173
- .orWhereRaw("u.username ILIKE ?", [searchTerm])
174
- .orWhereRaw("u.first_name ILIKE ?", [searchTerm])
175
- .orWhereRaw("u.last_name ILIKE ?", [searchTerm])
176
- .orWhereRaw("dt.name ILIKE ?", [searchTerm]);
177
- });
178
- }
179
- if (filters === null || filters === void 0 ? void 0 : filters.status) {
180
- query.where("d.status", filters.status);
181
- }
179
+ this.applyDutyFilters(query, filters);
182
180
  const countResult = yield query
183
181
  .clone()
184
182
  .clearSelect()
@@ -197,6 +195,31 @@ class DutyDAO {
197
195
  return { success: true, data, page, limit, count, totalCount, totalPages };
198
196
  });
199
197
  }
198
+ getAllByEventId(eventId, filters) {
199
+ return __awaiter(this, void 0, void 0, function* () {
200
+ const query = this.baseQuery()
201
+ .where("d.event_id", eventId)
202
+ .where("d.is_active", true);
203
+ this.applyDutyFilters(query, filters);
204
+ const rawData = yield query
205
+ .orderBy("d.duty_date", "asc")
206
+ .orderBy("d.user_id", "asc")
207
+ .orderBy("d.created_at", "asc");
208
+ return rawData.map((duty) => this.parseDutyJson(duty));
209
+ });
210
+ }
211
+ countByEventId(eventId, filters) {
212
+ return __awaiter(this, void 0, void 0, function* () {
213
+ const query = this.knex("duties as d")
214
+ .leftJoin("users as u", "d.user_id", "u.id")
215
+ .leftJoin("duty_templates as dt", "d.duty_template_id", "dt.id")
216
+ .where("d.event_id", eventId)
217
+ .where("d.is_active", true);
218
+ this.applyDutyFilters(query, filters);
219
+ const result = yield query.count("d.id as count").first();
220
+ return Number((result === null || result === void 0 ? void 0 : result.count) || 0);
221
+ });
222
+ }
200
223
  getActiveByUserId(userId) {
201
224
  return __awaiter(this, void 0, void 0, function* () {
202
225
  const today = toLocalDateString(new Date());
@@ -223,6 +246,21 @@ class DutyDAO {
223
246
  return rawData.map((duty) => this.parseDutyJson(duty));
224
247
  });
225
248
  }
249
+ getByUserIdAndDateRange(userId, startDate, endDate) {
250
+ return __awaiter(this, void 0, void 0, function* () {
251
+ const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
252
+ if (!dateRegex.test(startDate) || !dateRegex.test(endDate)) {
253
+ throw new Error("Invalid date format, expected YYYY-MM-DD");
254
+ }
255
+ const rawData = yield this.baseQuery()
256
+ .where("d.user_id", userId)
257
+ .where("d.is_active", true)
258
+ .whereBetween("d.duty_date", [startDate, endDate])
259
+ .orderBy("d.duty_date", "asc")
260
+ .orderBy("d.created_at", "asc");
261
+ return rawData.map((duty) => this.parseDutyJson(duty));
262
+ });
263
+ }
226
264
  getByUserIdEventIdAndDate(userId, eventId, dutyDate) {
227
265
  return __awaiter(this, void 0, void 0, function* () {
228
266
  const result = yield this.baseQuery()
@@ -368,6 +406,57 @@ class DutyDAO {
368
406
  return result ? this.getById(result.id) : null;
369
407
  });
370
408
  }
409
+ /**
410
+ * Complete the duty iff every progress item is terminal. Runs under a
411
+ * FOR UPDATE lock on the duty row so concurrent skip/complete/inject calls
412
+ * serialize — without it, two "skip the last item" requests can each see
413
+ * the other's item as still pending and neither completes the duty.
414
+ *
415
+ * The tracking_status flip to 'syncing' happens in the SAME transaction:
416
+ * a duty observed as completed+'tracking'/'none' makes the driver's next
417
+ * GPS batch a hard 400 that mobile treats as "duty gone" and answers by
418
+ * deleting its queued points.
419
+ */
420
+ completeIfNoRemainingItems(id) {
421
+ return __awaiter(this, void 0, void 0, function* () {
422
+ const result = yield this.knex.transaction((trx) => __awaiter(this, void 0, void 0, function* () {
423
+ const duty = yield trx("duties")
424
+ .where("id", id)
425
+ .forUpdate()
426
+ .select("status", "tracking_status")
427
+ .first();
428
+ if (!duty || duty.status !== "in_progress")
429
+ return null;
430
+ const remaining = yield trx("duty_item_progress")
431
+ .where("duty_id", id)
432
+ .whereIn("status", ["pending", "in_progress"])
433
+ .count("* as count")
434
+ .first();
435
+ if (Number((remaining === null || remaining === void 0 ? void 0 : remaining.count) || 0) > 0)
436
+ return null;
437
+ const [updated] = yield trx("duties")
438
+ .where("id", id)
439
+ .update({
440
+ status: "completed",
441
+ actual_end: new Date(),
442
+ tracking_status: trx.raw("CASE WHEN tracking_status IN ('tracking', 'none') THEN 'syncing' ELSE tracking_status END"),
443
+ updated_at: new Date(),
444
+ })
445
+ .returning("*");
446
+ if (!updated)
447
+ return null;
448
+ yield trx("driver_tracking")
449
+ .where("duty_id", id)
450
+ .where("is_navigating", true)
451
+ .update({
452
+ is_navigating: false,
453
+ updated_at: new Date(),
454
+ });
455
+ return updated;
456
+ }));
457
+ return result ? this.getById(result.id) : null;
458
+ });
459
+ }
371
460
  // Single atomic update to avoid TOCTOU race.
372
461
  cancelDuty(id) {
373
462
  return __awaiter(this, void 0, void 0, function* () {
package/dist/dao/duty/duty.dao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"duty.dao.js","sourceRoot":"","sources":["../../../src/dao/duty/duty.dao.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"duty.dao.js","sourceRoot":"","sources":["../../../src/dao/duty/duty.dao.ts"],"names":[],"mappings":"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"}
package/dist/dao/duty-feedback/duty-feedback.dao.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { IDutyFeedback, IDutyFeedbackCreate } from "../../interfaces/duty-feedback/duty-feedback.interfaces";
2
+ export declare class DutyFeedbackDAO {
3
+ private _knex?;
4
+ private get knex();
5
+ upsert(data: IDutyFeedbackCreate): Promise<IDutyFeedback>;
6
+ getByDutyId(dutyId: number): Promise<IDutyFeedback | null>;
7
+ }
package/dist/dao/duty-feedback/duty-feedback.dao.js ADDED
@@ -0,0 +1,58 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.DutyFeedbackDAO = void 0;
16
+ const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
17
+ class DutyFeedbackDAO {
18
+ get knex() {
19
+ if (!this._knex) {
20
+ this._knex = KnexConnection_1.default.getConnection();
21
+ }
22
+ return this._knex;
23
+ }
24
+ upsert(data) {
25
+ return __awaiter(this, void 0, void 0, function* () {
26
+ var _a, _b;
27
+ const submittedAt = (_a = data.submitted_at) !== null && _a !== void 0 ? _a : new Date();
28
+ const comment = (_b = data.comment) !== null && _b !== void 0 ? _b : null;
29
+ const [result] = yield this.knex("duty_feedback")
30
+ .insert({
31
+ duty_id: data.duty_id,
32
+ user_id: data.user_id,
33
+ had_issue: data.had_issue,
34
+ comment,
35
+ submitted_at: submittedAt,
36
+ })
37
+ .onConflict("duty_id")
38
+ .merge({
39
+ had_issue: data.had_issue,
40
+ comment,
41
+ submitted_at: submittedAt,
42
+ updated_at: new Date(),
43
+ })
44
+ .returning("*");
45
+ return result;
46
+ });
47
+ }
48
+ getByDutyId(dutyId) {
49
+ return __awaiter(this, void 0, void 0, function* () {
50
+ const result = yield this.knex("duty_feedback")
51
+ .where("duty_id", dutyId)
52
+ .first();
53
+ return result || null;
54
+ });
55
+ }
56
+ }
57
+ exports.DutyFeedbackDAO = DutyFeedbackDAO;
58
+ //# sourceMappingURL=duty-feedback.dao.js.map
package/dist/dao/duty-feedback/duty-feedback.dao.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"duty-feedback.dao.js","sourceRoot":"","sources":["../../../src/dao/duty-feedback/duty-feedback.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0EAA+C;AAM/C,MAAa,eAAe;IAG1B,IAAY,IAAI;QACd,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,wBAAW,CAAC,aAAa,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEK,MAAM,CAAC,IAAyB;;;YACpC,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,YAAY,mCAAI,IAAI,IAAI,EAAE,CAAC;YACpD,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,IAAI,CAAC;YAErC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;iBAC9C,MAAM,CAAC;gBACN,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO;gBACP,YAAY,EAAE,WAAW;aAC1B,CAAC;iBACD,UAAU,CAAC,SAAS,CAAC;iBACrB,KAAK,CAAC;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO;gBACP,YAAY,EAAE,WAAW;gBACzB,UAAU,EAAE,IAAI,IAAI,EAAE;aACvB,CAAC;iBACD,SAAS,CAAC,GAAG,CAAC,CAAC;YAElB,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAEK,WAAW,CAAC,MAAc;;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;iBAC5C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC;iBACxB,KAAK,EAAE,CAAC;YAEX,OAAO,MAAM,IAAI,IAAI,CAAC;QACxB,CAAC;KAAA;CACF;AAzCD,0CAyCC"}
package/dist/dao/duty-item-progress/duty-item-progress.dao.d.ts CHANGED
@@ -7,7 +7,27 @@ export declare class DutyItemProgressDAO {
7
7
  template_item_id: number;
8
8
  item_order: number;
9
9
  }[], trx?: Knex.Transaction): Promise<IDutyItemProgress[]>;
10
+ /**
11
+ * Includes the joined route row for code-injected items (template_item_id
12
+ * NULL, route_id set). Template items resolve their route through the duty
13
+ * template instead, so the join stays NULL for them — without it, clients
14
+ * rebuilding state from this endpoint lose injected routes entirely.
15
+ */
10
16
  getByDutyId(dutyId: number): Promise<IDutyItemProgress[]>;
17
+ getByDutyIds(dutyIds: number[]): Promise<IDutyItemProgress[]>;
18
+ private parseProgressJson;
19
+ /**
20
+ * Newest NON-driver progress mutation for a duty, used as the staleness
21
+ * anchor for mobile sync. Driver-sourced rows are excluded on purpose:
22
+ * the driver's own writes can carry timestamps newer than a concurrent
23
+ * admin change, and a scalar max that included them would mask that admin
24
+ * change forever. Excluding them also keeps the driver's routine progress
25
+ * writes from flagging the driver's own client as stale on every item.
26
+ *
27
+ * The pg driver truncates timestamptz to ms, matching what clients can
28
+ * echo back — compare with getTime(), never raw DB values.
29
+ */
30
+ getProgressRevision(dutyId: number): Promise<Date | null>;
11
31
  getByUuid(uuid: string): Promise<IDutyItemProgress | null>;
12
32
  getById(id: number): Promise<IDutyItemProgress | null>;
13
33
  updateItemStatus(id: number, data: IDutyItemProgressUpdate): Promise<IDutyItemProgress | null>;
@@ -25,5 +45,30 @@ export declare class DutyItemProgressDAO {
25
45
  * shifting item orders, and inserting the new item — all in a transaction.
26
46
  */
27
47
  injectRouteItem(dutyId: number, routeId: number, trx?: Knex.Transaction): Promise<IDutyItemProgress>;
48
+ /**
49
+ * Append a route as a new pending item at the end of the duty's list
50
+ * (item_order = max + 1), tagged admin-sourced so it advances the sync
51
+ * revision. Unlike injectRouteItem (driver, by code) it does NOT revert the
52
+ * in-progress item or drop prior injections — dispatch is adding upcoming
53
+ * work, not redirecting the driver's current item. Returns null when the
54
+ * duty is not in_progress, checked under the same row lock that serializes
55
+ * completeIfNoRemainingItems (so a route can't land on a just-completed duty).
56
+ */
57
+ addAdminRouteItem(dutyId: number, routeId: number, adminUserId: number | null, trx?: Knex.Transaction): Promise<IDutyItemProgress | null>;
58
+ /**
59
+ * Reorder the upcoming (pending) items of an in-progress duty. Only items
60
+ * strictly after the cursor — the highest item_order among started/finished
61
+ * items — may move; anything the driver has reached or passed stays put.
62
+ * `orderedUuids` must be EXACTLY that reorderable set (optimistic
63
+ * concurrency: a mismatch means the driver advanced or the set changed, so
64
+ * the caller should refetch). New orders are packed contiguously right after
65
+ * the cursor, which never collides with the frozen prefix (all <= cursor).
66
+ * Returns a result the controller maps to an HTTP status. Runs under the
67
+ * duty row lock to serialize against completeIfNoRemainingItems.
68
+ */
69
+ reorderUpcomingItems(dutyId: number, orderedUuids: string[], trx?: Knex.Transaction): Promise<{
70
+ ok: boolean;
71
+ reason?: "not_in_progress" | "stale_set" | "duplicate";
72
+ }>;
28
73
  deleteByDutyId(dutyId: number): Promise<number>;
29
74
  }