@trafficgroup/knex-rel 0.1.11 → 0.1.12
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/.claude/settings.local.json +2 -5
- package/CLAUDE.md +11 -2
- package/dist/constants/folder.constants.d.ts +12 -0
- package/dist/constants/folder.constants.js +28 -0
- package/dist/constants/folder.constants.js.map +1 -0
- package/dist/constants/video.constants.d.ts +2 -2
- package/dist/constants/video.constants.js +9 -5
- package/dist/constants/video.constants.js.map +1 -1
- package/dist/dao/VideoMinuteResultDAO.d.ts +1 -1
- package/dist/dao/VideoMinuteResultDAO.js +29 -23
- package/dist/dao/VideoMinuteResultDAO.js.map +1 -1
- package/dist/dao/auth/auth.dao.js +4 -1
- package/dist/dao/auth/auth.dao.js.map +1 -1
- package/dist/dao/batch/batch.dao.js +13 -14
- package/dist/dao/batch/batch.dao.js.map +1 -1
- package/dist/dao/camera/camera.dao.js +10 -7
- package/dist/dao/camera/camera.dao.js.map +1 -1
- package/dist/dao/chat/chat.dao.d.ts +1 -1
- package/dist/dao/chat/chat.dao.js +27 -40
- package/dist/dao/chat/chat.dao.js.map +1 -1
- package/dist/dao/folder/folder.dao.d.ts +10 -1
- package/dist/dao/folder/folder.dao.js +44 -6
- package/dist/dao/folder/folder.dao.js.map +1 -1
- package/dist/dao/location/location.dao.js +16 -9
- package/dist/dao/location/location.dao.js.map +1 -1
- package/dist/dao/message/message.dao.d.ts +1 -1
- package/dist/dao/message/message.dao.js +18 -26
- package/dist/dao/message/message.dao.js.map +1 -1
- package/dist/dao/report-configuration/report-configuration.dao.js +32 -31
- package/dist/dao/report-configuration/report-configuration.dao.js.map +1 -1
- package/dist/dao/study/study.dao.js +7 -2
- package/dist/dao/study/study.dao.js.map +1 -1
- package/dist/dao/user/user.dao.js +4 -1
- package/dist/dao/user/user.dao.js.map +1 -1
- package/dist/dao/user-push-notification-token/user-push-notification-token.dao.js +26 -8
- package/dist/dao/user-push-notification-token/user-push-notification-token.dao.js.map +1 -1
- package/dist/dao/video/video.dao.js +30 -28
- package/dist/dao/video/video.dao.js.map +1 -1
- package/dist/index.d.ts +8 -5
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces/batch/batch.interfaces.d.ts +1 -1
- package/dist/interfaces/camera/camera.interfaces.d.ts +1 -1
- package/dist/interfaces/chat/chat.interfaces.d.ts +3 -3
- package/dist/interfaces/folder/folder.interfaces.d.ts +1 -1
- package/dist/interfaces/message/message.interfaces.d.ts +2 -2
- package/dist/interfaces/study/study.interfaces.d.ts +2 -2
- package/dist/interfaces/user/user.interfaces.d.ts +1 -1
- package/dist/interfaces/user-push-notification-token/user-push-notification-token.interfaces.d.ts +1 -1
- package/dist/interfaces/video/video.interfaces.d.ts +2 -2
- package/migrations/20250717160737_migration.ts +1 -1
- package/migrations/20250717160908_migration.ts +5 -2
- package/migrations/20250717161310_migration.ts +1 -1
- package/migrations/20250717161406_migration.ts +3 -3
- package/migrations/20250717162431_migration.ts +1 -1
- package/migrations/20250717173228_migration.ts +2 -2
- package/migrations/20250717204731_migration.ts +1 -1
- package/migrations/20250722210109_migration.ts +8 -4
- package/migrations/20250722211019_migration.ts +1 -1
- package/migrations/20250723153852_migration.ts +13 -10
- package/migrations/20250723162257_migration.ts +4 -7
- package/migrations/20250723171109_migration.ts +4 -7
- package/migrations/20250723205331_migration.ts +6 -9
- package/migrations/20250724191345_migration.ts +8 -11
- package/migrations/20250730180932_migration.ts +14 -13
- package/migrations/20250730213625_migration.ts +8 -11
- package/migrations/20250804124509_migration.ts +26 -21
- package/migrations/20250804132053_migration.ts +5 -8
- package/migrations/20250804164518_migration.ts +7 -7
- package/migrations/20250823223016_migration.ts +32 -21
- package/migrations/20250910015452_migration.ts +18 -6
- package/migrations/20250911000000_migration.ts +18 -4
- package/migrations/20250917144153_migration.ts +14 -7
- package/migrations/20250930200521_migration.ts +8 -4
- package/migrations/20251010143500_migration.ts +27 -6
- package/migrations/20251020225758_migration.ts +51 -15
- package/migrations/20251112120000_migration.ts +10 -2
- package/migrations/20251112120200_migration.ts +19 -7
- package/migrations/20251112120300_migration.ts +7 -2
- package/package.json +1 -1
- package/src/constants/folder.constants.ts +29 -0
- package/src/constants/video.constants.ts +11 -7
- package/src/d.types.ts +18 -14
- package/src/dao/VideoMinuteResultDAO.ts +72 -49
- package/src/dao/auth/auth.dao.ts +58 -55
- package/src/dao/batch/batch.dao.ts +101 -98
- package/src/dao/camera/camera.dao.ts +124 -121
- package/src/dao/chat/chat.dao.ts +45 -45
- package/src/dao/folder/folder.dao.ts +112 -55
- package/src/dao/location/location.dao.ts +109 -87
- package/src/dao/message/message.dao.ts +32 -32
- package/src/dao/report-configuration/report-configuration.dao.ts +370 -342
- package/src/dao/study/study.dao.ts +88 -63
- package/src/dao/user/user.dao.ts +52 -50
- package/src/dao/user-push-notification-token/user-push-notification-token.dao.ts +80 -48
- package/src/dao/video/video.dao.ts +385 -334
- package/src/entities/BaseEntity.ts +1 -1
- package/src/index.ts +42 -17
- package/src/interfaces/auth/auth.interfaces.ts +10 -10
- package/src/interfaces/batch/batch.interfaces.ts +1 -1
- package/src/interfaces/camera/camera.interfaces.ts +9 -9
- package/src/interfaces/chat/chat.interfaces.ts +4 -4
- package/src/interfaces/folder/folder.interfaces.ts +2 -2
- package/src/interfaces/location/location.interfaces.ts +7 -7
- package/src/interfaces/message/message.interfaces.ts +3 -3
- package/src/interfaces/report-configuration/report-configuration.interfaces.ts +16 -16
- package/src/interfaces/study/study.interfaces.ts +3 -3
- package/src/interfaces/user/user.interfaces.ts +9 -9
- package/src/interfaces/user-push-notification-token/user-push-notification-token.interfaces.ts +9 -9
- package/src/interfaces/video/video.interfaces.ts +34 -34
package/CLAUDE.md
CHANGED
|
@@ -9,18 +9,21 @@ This is `@trafficgroup/knex-rel` - a TypeScript-based Knex.js module for databas
|
|
|
9
9
|
## Development Commands
|
|
10
10
|
|
|
11
11
|
### Building and Formatting
|
|
12
|
+
|
|
12
13
|
- `npm run build` - Compile TypeScript to JavaScript in dist/
|
|
13
14
|
- `npm run format` - Format code with Prettier
|
|
14
15
|
- `npm run clean` - Clean dist/, format, and rebuild
|
|
15
16
|
- `npm test` - Run Jest tests
|
|
16
17
|
|
|
17
18
|
### Database Operations
|
|
19
|
+
|
|
18
20
|
- `npm run migrate:create` - Create a new TypeScript migration file
|
|
19
21
|
- `npm run migrate:deploy` - Run all pending migrations
|
|
20
|
-
- `npm run seed:create` - Create a new TypeScript seed file
|
|
22
|
+
- `npm run seed:create` - Create a new TypeScript seed file
|
|
21
23
|
- `npm run seed:run` - Execute all seed files
|
|
22
24
|
|
|
23
25
|
### Publishing
|
|
26
|
+
|
|
24
27
|
- `npm run npm:publish` - Clean, build, and publish to npm
|
|
25
28
|
|
|
26
29
|
## Architecture
|
|
@@ -28,21 +31,25 @@ This is `@trafficgroup/knex-rel` - a TypeScript-based Knex.js module for databas
|
|
|
28
31
|
### Core Components
|
|
29
32
|
|
|
30
33
|
**KnexManager** (`src/KnexConnection.ts`): Singleton connection manager
|
|
34
|
+
|
|
31
35
|
- `connect(config?, connections?)` - Establish database connection
|
|
32
36
|
- `getConnection()` - Get active connection instance
|
|
33
37
|
- `disconnect()` - Close connection and cleanup
|
|
34
38
|
|
|
35
39
|
**DAO Pattern**: All data access follows the `IBaseDAO<T>` interface with standard CRUD operations:
|
|
40
|
+
|
|
36
41
|
- `create(item)`, `getById(id)`, `getByUuid(uuid)`, `getAll(page, limit)`, `update(id, item)`, `delete(id)`
|
|
37
42
|
- Returns `IDataPaginator<T>` for paginated results
|
|
38
43
|
|
|
39
44
|
**AuthDAO Additional Methods**:
|
|
45
|
+
|
|
40
46
|
- `getByUserId(userId: number)` - Find auth record by user ID
|
|
41
47
|
- `getByEmailToken(emailToken: string)` - Find auth record by email verification/reset token
|
|
42
48
|
|
|
43
49
|
### Entity Structure
|
|
44
50
|
|
|
45
51
|
Each entity has:
|
|
52
|
+
|
|
46
53
|
- Interface in `src/interfaces/[entity]/[entity].interfaces.ts`
|
|
47
54
|
- DAO implementation in `src/dao/[entity]/[entity].dao.ts`
|
|
48
55
|
|
|
@@ -51,13 +58,15 @@ Current entities: User, Study, Folder, Video
|
|
|
51
58
|
### Database Configuration
|
|
52
59
|
|
|
53
60
|
Environment variables (for development):
|
|
61
|
+
|
|
54
62
|
- `SQL_HOST`, `SQL_USER`, `SQL_PASSWORD`, `SQL_DB_NAME`, `SQL_PORT`
|
|
55
63
|
|
|
56
64
|
Environment variables (for staging/production):
|
|
65
|
+
|
|
57
66
|
- `PG_HOST`, `PG_USER`, `PG_PASSWORD`, `PG_DB`, `PG_PORT`
|
|
58
67
|
|
|
59
68
|
Knex configuration supports development, staging, and production environments in `knexfile.ts`.
|
|
60
69
|
|
|
61
70
|
### Migrations
|
|
62
71
|
|
|
63
|
-
Located in `migrations/` directory. Use TypeScript format with timestamp prefixes. Database uses `knex_migrations` table for tracking.
|
|
72
|
+
Located in `migrations/` directory. Use TypeScript format with timestamp prefixes. Database uses `knex_migrations` table for tracking.
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Folder sorting and filtering constants
|
|
3
|
+
* Shared between DAO and API controller to ensure validation consistency
|
|
4
|
+
*/
|
|
5
|
+
export declare const VALID_FOLDER_SORT_FIELDS: readonly ["created_at", "name", "status", "updated_at"];
|
|
6
|
+
export type FolderSortField = (typeof VALID_FOLDER_SORT_FIELDS)[number];
|
|
7
|
+
export declare const VALID_FOLDER_STATUSES: readonly ["UPLOADING", "COMPLETED", "FAILED"];
|
|
8
|
+
export type FolderStatus = (typeof VALID_FOLDER_STATUSES)[number];
|
|
9
|
+
/**
|
|
10
|
+
* Maps API sort field names to database column names with table aliases
|
|
11
|
+
*/
|
|
12
|
+
export declare const FOLDER_SORT_COLUMN_MAP: Record<FolderSortField, string>;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Folder sorting and filtering constants
|
|
4
|
+
* Shared between DAO and API controller to ensure validation consistency
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.FOLDER_SORT_COLUMN_MAP = exports.VALID_FOLDER_STATUSES = exports.VALID_FOLDER_SORT_FIELDS = void 0;
|
|
8
|
+
exports.VALID_FOLDER_SORT_FIELDS = [
|
|
9
|
+
"created_at",
|
|
10
|
+
"name",
|
|
11
|
+
"status",
|
|
12
|
+
"updated_at",
|
|
13
|
+
];
|
|
14
|
+
exports.VALID_FOLDER_STATUSES = [
|
|
15
|
+
"UPLOADING",
|
|
16
|
+
"COMPLETED",
|
|
17
|
+
"FAILED",
|
|
18
|
+
];
|
|
19
|
+
/**
|
|
20
|
+
* Maps API sort field names to database column names with table aliases
|
|
21
|
+
*/
|
|
22
|
+
exports.FOLDER_SORT_COLUMN_MAP = {
|
|
23
|
+
created_at: "f.created_at",
|
|
24
|
+
name: "f.name",
|
|
25
|
+
status: "f.status",
|
|
26
|
+
updated_at: "f.updated_at",
|
|
27
|
+
};
|
|
28
|
+
//# sourceMappingURL=folder.constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"folder.constants.js","sourceRoot":"","sources":["../../src/constants/folder.constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,wBAAwB,GAAG;IACtC,YAAY;IACZ,MAAM;IACN,QAAQ;IACR,YAAY;CACJ,CAAC;AAGE,QAAA,qBAAqB,GAAG;IACnC,WAAW;IACX,WAAW;IACX,QAAQ;CACA,CAAC;AAGX;;GAEG;AACU,QAAA,sBAAsB,GAAoC;IACrE,UAAU,EAAE,cAAc;IAC1B,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,cAAc;CAC3B,CAAC"}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* Shared between DAO and API controller to ensure validation consistency
|
|
4
4
|
*/
|
|
5
5
|
export declare const VALID_VIDEO_SORT_FIELDS: readonly ["created_at", "name", "status"];
|
|
6
|
-
export type VideoSortField = typeof VALID_VIDEO_SORT_FIELDS[number];
|
|
6
|
+
export type VideoSortField = (typeof VALID_VIDEO_SORT_FIELDS)[number];
|
|
7
7
|
export declare const VALID_SORT_ORDERS: readonly ["ASC", "DESC"];
|
|
8
|
-
export type SortOrder = typeof VALID_SORT_ORDERS[number];
|
|
8
|
+
export type SortOrder = (typeof VALID_SORT_ORDERS)[number];
|
|
9
9
|
/**
|
|
10
10
|
* Maps API sort field names to database column names with table aliases
|
|
11
11
|
*/
|
|
@@ -5,14 +5,18 @@
|
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.VIDEO_SORT_COLUMN_MAP = exports.VALID_SORT_ORDERS = exports.VALID_VIDEO_SORT_FIELDS = void 0;
|
|
8
|
-
exports.VALID_VIDEO_SORT_FIELDS = [
|
|
9
|
-
|
|
8
|
+
exports.VALID_VIDEO_SORT_FIELDS = [
|
|
9
|
+
"created_at",
|
|
10
|
+
"name",
|
|
11
|
+
"status",
|
|
12
|
+
];
|
|
13
|
+
exports.VALID_SORT_ORDERS = ["ASC", "DESC"];
|
|
10
14
|
/**
|
|
11
15
|
* Maps API sort field names to database column names with table aliases
|
|
12
16
|
*/
|
|
13
17
|
exports.VIDEO_SORT_COLUMN_MAP = {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
18
|
+
created_at: "v.created_at",
|
|
19
|
+
name: "v.name",
|
|
20
|
+
status: "v.status",
|
|
17
21
|
};
|
|
18
22
|
//# sourceMappingURL=video.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video.constants.js","sourceRoot":"","sources":["../../src/constants/video.constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"video.constants.js","sourceRoot":"","sources":["../../src/constants/video.constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,uBAAuB,GAAG;IACrC,YAAY;IACZ,MAAM;IACN,QAAQ;CACA,CAAC;AAGE,QAAA,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,CAAU,CAAC;AAG1D;;GAEG;AACU,QAAA,qBAAqB,GAAmC;IACnE,UAAU,EAAE,cAAc;IAC1B,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;CACnB,CAAC"}
|
|
@@ -280,25 +280,27 @@ class VideoMinuteResultDAO {
|
|
|
280
280
|
}
|
|
281
281
|
// Use Knex query builder for safe parameter binding
|
|
282
282
|
const groupingQuery = this.knex(this.tableName)
|
|
283
|
-
.select(this.knex.raw(
|
|
284
|
-
|
|
283
|
+
.select(this.knex.raw("FLOOR(minute_number / ?) as group_index", [
|
|
284
|
+
groupingMinutes,
|
|
285
|
+
]), this.knex.raw("MIN(minute_number) as start_minute"), this.knex.raw("MAX(minute_number) as end_minute"), this.knex.raw("COUNT(*) as minute_count"), this.knex.raw("array_agg(results ORDER BY minute_number) as all_results"))
|
|
286
|
+
.where("video_id", video.id);
|
|
285
287
|
if (startMinute !== undefined) {
|
|
286
|
-
groupingQuery.where(
|
|
288
|
+
groupingQuery.where("minute_number", ">=", startMinute);
|
|
287
289
|
}
|
|
288
290
|
if (endMinute !== undefined) {
|
|
289
|
-
groupingQuery.where(
|
|
291
|
+
groupingQuery.where("minute_number", "<=", endMinute);
|
|
290
292
|
}
|
|
291
293
|
const rows = yield groupingQuery
|
|
292
|
-
.groupBy(
|
|
293
|
-
.orderBy(
|
|
294
|
+
.groupBy("group_index")
|
|
295
|
+
.orderBy("group_index");
|
|
294
296
|
// Aggregate the results in TypeScript based on video type
|
|
295
297
|
const aggregatedGroups = rows.map((row) => {
|
|
296
|
-
if (!row || typeof row !==
|
|
297
|
-
throw new Error(
|
|
298
|
+
if (!row || typeof row !== "object") {
|
|
299
|
+
throw new Error("Invalid row data received from database query");
|
|
298
300
|
}
|
|
299
301
|
const allResults = Array.isArray(row.all_results) ? row.all_results : [];
|
|
300
302
|
// Determine video type based on multiple factors
|
|
301
|
-
let studyType = video.videoType ||
|
|
303
|
+
let studyType = video.videoType || "ATR"; // Default fallback to ATR
|
|
302
304
|
// Check if minute data has study_type field (ATR usually does)
|
|
303
305
|
if (allResults.length > 0 && allResults[0].study_type) {
|
|
304
306
|
studyType = allResults[0].study_type;
|
|
@@ -311,11 +313,13 @@ class VideoMinuteResultDAO {
|
|
|
311
313
|
const vehicleKeys = Object.keys(sampleResult.vehicles);
|
|
312
314
|
if (vehicleKeys.length > 0) {
|
|
313
315
|
const firstVehicleType = sampleResult.vehicles[vehicleKeys[0]];
|
|
314
|
-
if (firstVehicleType && typeof firstVehicleType ===
|
|
316
|
+
if (firstVehicleType && typeof firstVehicleType === "object") {
|
|
315
317
|
const directions = Object.keys(firstVehicleType);
|
|
316
|
-
if (directions.includes(
|
|
317
|
-
directions.includes(
|
|
318
|
-
|
|
318
|
+
if (directions.includes("NORTH") ||
|
|
319
|
+
directions.includes("SOUTH") ||
|
|
320
|
+
directions.includes("EAST") ||
|
|
321
|
+
directions.includes("WEST")) {
|
|
322
|
+
studyType = "TMC";
|
|
319
323
|
}
|
|
320
324
|
}
|
|
321
325
|
}
|
|
@@ -323,7 +327,7 @@ class VideoMinuteResultDAO {
|
|
|
323
327
|
}
|
|
324
328
|
// Aggregate based on determined video type
|
|
325
329
|
let aggregatedResult;
|
|
326
|
-
if (studyType ===
|
|
330
|
+
if (studyType === "TMC") {
|
|
327
331
|
aggregatedResult = this.aggregateTMCResults(allResults);
|
|
328
332
|
}
|
|
329
333
|
else {
|
|
@@ -446,7 +450,7 @@ class VideoMinuteResultDAO {
|
|
|
446
450
|
.sort((a, b) => a.groupIndex - b.groupIndex)
|
|
447
451
|
.map((bucket) => {
|
|
448
452
|
let aggregatedResult;
|
|
449
|
-
if (study.type ===
|
|
453
|
+
if (study.type === "TMC") {
|
|
450
454
|
aggregatedResult = this.aggregateTMCResults(bucket.results);
|
|
451
455
|
}
|
|
452
456
|
else {
|
|
@@ -514,20 +518,20 @@ class VideoMinuteResultDAO {
|
|
|
514
518
|
vehicles: {},
|
|
515
519
|
counts: {
|
|
516
520
|
total_vehicles: 0,
|
|
517
|
-
entry_vehicles: 0
|
|
521
|
+
entry_vehicles: 0,
|
|
518
522
|
},
|
|
519
523
|
total: 0,
|
|
520
524
|
totalcount: 0,
|
|
521
525
|
detected_classes: {},
|
|
522
|
-
study_type: "TMC"
|
|
526
|
+
study_type: "TMC",
|
|
523
527
|
};
|
|
524
528
|
for (const minute of minutes) {
|
|
525
529
|
const results = minute; // minute is already the results object from array_agg
|
|
526
530
|
// Aggregate vehicle movements by class and direction
|
|
527
|
-
if (results.vehicles && typeof results.vehicles ===
|
|
531
|
+
if (results.vehicles && typeof results.vehicles === "object") {
|
|
528
532
|
for (const [vehicleClass, directions] of Object.entries(results.vehicles)) {
|
|
529
533
|
// Skip the 'total' pseudo vehicle class - validate it's actually aggregate data
|
|
530
|
-
if (vehicleClass ===
|
|
534
|
+
if (vehicleClass === "total" && typeof directions === "number") {
|
|
531
535
|
continue; // This is aggregate total data, not a vehicle class
|
|
532
536
|
}
|
|
533
537
|
if (!aggregated.vehicles[vehicleClass]) {
|
|
@@ -549,7 +553,8 @@ class VideoMinuteResultDAO {
|
|
|
549
553
|
for (const [turnType, count] of Object.entries(turns)) {
|
|
550
554
|
const turnCount = count || 0;
|
|
551
555
|
aggregated.vehicles[vehicleClass][direction][turnType] =
|
|
552
|
-
(aggregated.vehicles[vehicleClass][direction][turnType] ||
|
|
556
|
+
(aggregated.vehicles[vehicleClass][direction][turnType] ||
|
|
557
|
+
0) + turnCount;
|
|
553
558
|
// Add to detected_classes count for this vehicle type
|
|
554
559
|
aggregated.detected_classes[vehicleClass] += turnCount;
|
|
555
560
|
// Add to total counts
|
|
@@ -573,7 +578,8 @@ class VideoMinuteResultDAO {
|
|
|
573
578
|
}
|
|
574
579
|
}
|
|
575
580
|
// Set entry_vehicles same as total_vehicles for TMC
|
|
576
|
-
aggregated.counts.entry_vehicles =
|
|
581
|
+
aggregated.counts.entry_vehicles =
|
|
582
|
+
aggregated.counts.total_vehicles || aggregated.total;
|
|
577
583
|
return aggregated;
|
|
578
584
|
}
|
|
579
585
|
/**
|
|
@@ -593,14 +599,14 @@ class VideoMinuteResultDAO {
|
|
|
593
599
|
if (results.vehicles) {
|
|
594
600
|
for (const [vehicleClass, lanes] of Object.entries(results.vehicles)) {
|
|
595
601
|
// Skip 'total' pseudo-class if present
|
|
596
|
-
if (vehicleClass ===
|
|
602
|
+
if (vehicleClass === "total") {
|
|
597
603
|
continue;
|
|
598
604
|
}
|
|
599
605
|
if (!aggregated.vehicles[vehicleClass]) {
|
|
600
606
|
aggregated.vehicles[vehicleClass] = {};
|
|
601
607
|
}
|
|
602
608
|
for (const [laneId, count] of Object.entries(lanes)) {
|
|
603
|
-
const numericCount = typeof count ===
|
|
609
|
+
const numericCount = typeof count === "number" ? count : parseInt(String(count)) || 0;
|
|
604
610
|
aggregated.vehicles[vehicleClass][laneId] =
|
|
605
611
|
(aggregated.vehicles[vehicleClass][laneId] || 0) + numericCount;
|
|
606
612
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VideoMinuteResultDAO.js","sourceRoot":"","sources":["../../src/dao/VideoMinuteResultDAO.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"VideoMinuteResultDAO.js","sourceRoot":"","sources":["../../src/dao/VideoMinuteResultDAO.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,10 @@ class AuthDAO {
|
|
|
50
50
|
}
|
|
51
51
|
update(id, item) {
|
|
52
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
const [updatedAuth] = yield this._knex("auth")
|
|
53
|
+
const [updatedAuth] = yield this._knex("auth")
|
|
54
|
+
.where({ id })
|
|
55
|
+
.update(item)
|
|
56
|
+
.returning("*");
|
|
54
57
|
return updatedAuth || null;
|
|
55
58
|
});
|
|
56
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.dao.js","sourceRoot":"","sources":["../../../src/dao/auth/auth.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,OAAO;IAApB;
|
|
1
|
+
{"version":3,"file":"auth.dao.js","sourceRoot":"","sources":["../../../src/dao/auth/auth.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,OAAO;IAApB;QACU,UAAK,GAAyB,wBAAW,CAAC,aAAa,EAAE,CAAC;IAyDpE,CAAC;IAvDO,MAAM,CAAC,IAAW;;YACtB,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAC3E,OAAO,WAAW,CAAC;QACrB,CAAC;KAAA;IAEK,OAAO,CAAC,EAAU;;YACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAC5D,OAAO,IAAI,IAAI,IAAI,CAAC;QACtB,CAAC;KAAA;IAEK,SAAS,CAAC,IAAY;;YAC1B,oEAAoE;YACpE,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,WAAW,CAAC,MAAc;;YAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAChE,OAAO,IAAI,IAAI,IAAI,CAAC;QACtB,CAAC;KAAA;IAEK,eAAe,CAAC,UAAkB;;YACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YACpE,OAAO,IAAI,IAAI,IAAI,CAAC;QACtB,CAAC;KAAA;IAEK,MAAM,CAAC,EAAU,EAAE,IAAoB;;YAC3C,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;iBAC3C,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;iBACb,MAAM,CAAC,IAAI,CAAC;iBACZ,SAAS,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,WAAW,IAAI,IAAI,CAAC;QAC7B,CAAC;KAAA;IAEK,MAAM,CAAC,EAAU;;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YAC5D,OAAO,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC;KAAA;IAEK,MAAM,CAAC,IAAY,EAAE,KAAa;;YACtC,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YAElC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACnE,MAAM,UAAU,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEnE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK;gBACX,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;aAC1C,CAAC;QACJ,CAAC;KAAA;CACF;AA1DD,0BA0DC"}
|
|
@@ -20,7 +20,9 @@ class BatchDAO {
|
|
|
20
20
|
}
|
|
21
21
|
create(item) {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const [createdBatch] = yield this._knex("video_batch")
|
|
23
|
+
const [createdBatch] = yield this._knex("video_batch")
|
|
24
|
+
.insert(item)
|
|
25
|
+
.returning("*");
|
|
24
26
|
return createdBatch;
|
|
25
27
|
});
|
|
26
28
|
}
|
|
@@ -46,7 +48,10 @@ class BatchDAO {
|
|
|
46
48
|
}
|
|
47
49
|
update(id, item) {
|
|
48
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
const [updatedBatch] = yield this._knex("video_batch")
|
|
51
|
+
const [updatedBatch] = yield this._knex("video_batch")
|
|
52
|
+
.where({ id })
|
|
53
|
+
.update(item)
|
|
54
|
+
.returning("*");
|
|
50
55
|
return updatedBatch || null;
|
|
51
56
|
});
|
|
52
57
|
}
|
|
@@ -96,12 +101,10 @@ class BatchDAO {
|
|
|
96
101
|
*/
|
|
97
102
|
updateProgress(id, completedVideos, failedVideos) {
|
|
98
103
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
-
yield this._knex("video_batch")
|
|
100
|
-
.where({ id })
|
|
101
|
-
.update({
|
|
104
|
+
yield this._knex("video_batch").where({ id }).update({
|
|
102
105
|
completedVideos,
|
|
103
106
|
failedVideos,
|
|
104
|
-
updated_at: this._knex.fn.now()
|
|
107
|
+
updated_at: this._knex.fn.now(),
|
|
105
108
|
});
|
|
106
109
|
});
|
|
107
110
|
}
|
|
@@ -110,11 +113,9 @@ class BatchDAO {
|
|
|
110
113
|
*/
|
|
111
114
|
markCompleted(id) {
|
|
112
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
yield this._knex("video_batch")
|
|
114
|
-
.where({ id })
|
|
115
|
-
.update({
|
|
116
|
+
yield this._knex("video_batch").where({ id }).update({
|
|
116
117
|
status: "COMPLETED",
|
|
117
|
-
updated_at: this._knex.fn.now()
|
|
118
|
+
updated_at: this._knex.fn.now(),
|
|
118
119
|
});
|
|
119
120
|
});
|
|
120
121
|
}
|
|
@@ -123,11 +124,9 @@ class BatchDAO {
|
|
|
123
124
|
*/
|
|
124
125
|
markFailed(id) {
|
|
125
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
126
|
-
yield this._knex("video_batch")
|
|
127
|
-
.where({ id })
|
|
128
|
-
.update({
|
|
127
|
+
yield this._knex("video_batch").where({ id }).update({
|
|
129
128
|
status: "FAILED",
|
|
130
|
-
updated_at: this._knex.fn.now()
|
|
129
|
+
updated_at: this._knex.fn.now(),
|
|
131
130
|
});
|
|
132
131
|
});
|
|
133
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.dao.js","sourceRoot":"","sources":["../../../src/dao/batch/batch.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,QAAQ;IAArB;
|
|
1
|
+
{"version":3,"file":"batch.dao.js","sourceRoot":"","sources":["../../../src/dao/batch/batch.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,QAAQ;IAArB;QACU,UAAK,GAAyB,wBAAW,CAAC,aAAa,EAAE,CAAC;IAkHpE,CAAC;IAhHO,MAAM,CAAC,IAAY;;YACvB,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;iBACnD,MAAM,CAAC,IAAI,CAAC;iBACZ,SAAS,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;IAEK,OAAO,CAAC,EAAU;;YACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;iBAC/C,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC;iBAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;iBACxD,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;iBACjB,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,IAAI,IAAI,CAAC;QACvB,CAAC;KAAA;IAEK,SAAS,CAAC,IAAY;;YAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;iBAC/C,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC;iBAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;iBACxD,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC;iBACrB,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,IAAI,IAAI,CAAC;QACvB,CAAC;KAAA;IAEK,MAAM,CAAC,EAAU,EAAE,IAAqB;;YAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;iBACnD,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;iBACb,MAAM,CAAC,IAAI,CAAC;iBACZ,SAAS,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,YAAY,IAAI,IAAI,CAAC;QAC9B,CAAC;KAAA;IAEK,MAAM,CAAC,EAAU;;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YACnE,OAAO,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC;KAAA;IAEK,MAAM,CACV,IAAY,EACZ,KAAa,EACb,QAAwB;;YAExB,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YAElC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;iBACzC,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC;iBAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC;YAC5D,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAChD,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;YACtC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEhE,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,OAAO;gBACb,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,OAAO,CAAC,MAAM;gBACrB,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;aAC1C,CAAC;QACJ,CAAC;KAAA;IAED;;OAEG;IACG,aAAa,CAAC,QAAgB;;YAClC,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;iBAClC,SAAS,CAAC,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC;iBAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;iBACxD,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC;iBAC7B,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;KAAA;IAED;;OAEG;IACG,cAAc,CAClB,EAAU,EACV,eAAuB,EACvB,YAAoB;;YAEpB,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC;gBACnD,eAAe;gBACf,YAAY;gBACZ,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE;aAChC,CAAC,CAAC;QACL,CAAC;KAAA;IAED;;OAEG;IACG,aAAa,CAAC,EAAU;;YAC5B,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC;gBACnD,MAAM,EAAE,WAAW;gBACnB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE;aAChC,CAAC,CAAC;QACL,CAAC;KAAA;IAED;;OAEG;IACG,UAAU,CAAC,EAAU;;YACzB,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC;gBACnD,MAAM,EAAE,QAAQ;gBAChB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE;aAChC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAnHD,4BAmHC"}
|
|
@@ -20,7 +20,9 @@ class CameraDAO {
|
|
|
20
20
|
}
|
|
21
21
|
create(item) {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const [createdCamera] = yield this._knex("cameras")
|
|
23
|
+
const [createdCamera] = yield this._knex("cameras")
|
|
24
|
+
.insert(item)
|
|
25
|
+
.returning("*");
|
|
24
26
|
return createdCamera;
|
|
25
27
|
});
|
|
26
28
|
}
|
|
@@ -38,7 +40,10 @@ class CameraDAO {
|
|
|
38
40
|
}
|
|
39
41
|
update(id, item) {
|
|
40
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
-
const [updatedCamera] = yield this._knex("cameras")
|
|
43
|
+
const [updatedCamera] = yield this._knex("cameras")
|
|
44
|
+
.where({ id })
|
|
45
|
+
.update(item)
|
|
46
|
+
.returning("*");
|
|
42
47
|
return updatedCamera || null;
|
|
43
48
|
});
|
|
44
49
|
}
|
|
@@ -72,8 +77,7 @@ class CameraDAO {
|
|
|
72
77
|
*/
|
|
73
78
|
getCamerasByLocationId(locationId, status) {
|
|
74
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
-
let query = this._knex("cameras")
|
|
76
|
-
.where("locationId", locationId);
|
|
80
|
+
let query = this._knex("cameras").where("locationId", locationId);
|
|
77
81
|
if (status) {
|
|
78
82
|
query = query.where("status", status);
|
|
79
83
|
}
|
|
@@ -90,8 +94,7 @@ class CameraDAO {
|
|
|
90
94
|
getCamerasByLocationIdPaginated(locationId, page, limit, status) {
|
|
91
95
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
96
|
const offset = (page - 1) * limit;
|
|
93
|
-
let query = this._knex("cameras")
|
|
94
|
-
.where("locationId", locationId);
|
|
97
|
+
let query = this._knex("cameras").where("locationId", locationId);
|
|
95
98
|
if (status) {
|
|
96
99
|
query = query.where("status", status);
|
|
97
100
|
}
|
|
@@ -109,7 +112,7 @@ class CameraDAO {
|
|
|
109
112
|
limit,
|
|
110
113
|
count: cameras.length,
|
|
111
114
|
totalCount,
|
|
112
|
-
totalPages: Math.ceil(totalCount / limit)
|
|
115
|
+
totalPages: Math.ceil(totalCount / limit),
|
|
113
116
|
};
|
|
114
117
|
});
|
|
115
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera.dao.js","sourceRoot":"","sources":["../../../src/dao/camera/camera.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,0EAA+C;AAE/C,MAAa,SAAS;IAAtB;
|
|
1
|
+
{"version":3,"file":"camera.dao.js","sourceRoot":"","sources":["../../../src/dao/camera/camera.dao.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IBaseDAO, IDataPaginator } from "../../d.types";
|
|
2
|
-
import { IChat, IChatCreate, IChatUpdate } from
|
|
2
|
+
import { IChat, IChatCreate, IChatUpdate } from "../../interfaces/chat/chat.interfaces";
|
|
3
3
|
export interface IChatPaginatorResponse extends IDataPaginator<IChat> {
|
|
4
4
|
hasMore: boolean;
|
|
5
5
|
}
|