@trafficgroup/knex-rel 0.1.19 → 0.1.21
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 +2 -2
- package/dist/constants/folder.constants.js +15 -6
- package/dist/constants/folder.constants.js.map +1 -1
- package/dist/constants/study.constants.d.ts +2 -2
- package/dist/constants/study.constants.js +11 -6
- package/dist/constants/study.constants.js.map +1 -1
- 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.d.ts +10 -0
- package/dist/dao/batch/batch.dao.js +51 -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.js +18 -7
- 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.d.ts +1 -8
- package/dist/dao/study/study.dao.js +15 -20
- package/dist/dao/study/study.dao.js.map +1 -1
- package/dist/dao/systemConfiguration/SystemConfigurationDAO.d.ts +2 -2
- package/dist/dao/systemConfiguration/SystemConfigurationDAO.js +26 -26
- package/dist/dao/systemConfiguration/SystemConfigurationDAO.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 +9 -10
- package/dist/index.js +4 -4
- 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 +8 -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/migrations/20260109140000_migration.ts +7 -2
- package/package.json +1 -1
- package/src/constants/folder.constants.ts +17 -8
- package/src/constants/study.constants.ts +12 -7
- package/src/constants/video.constants.ts +11 -7
- package/src/d.types.ts +18 -14
- package/src/dao/VideoMinuteResultDAO.ts +83 -52
- package/src/dao/auth/auth.dao.ts +58 -55
- package/src/dao/batch/batch.dao.ts +145 -100
- 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 +105 -90
- package/src/dao/location/location.dao.ts +109 -87
- package/src/dao/message/message.dao.ts +32 -32
- package/src/dao/reconciliation-log/reconciliation-log.dao.ts +1 -1
- package/src/dao/report-configuration/report-configuration.dao.ts +370 -342
- package/src/dao/study/study.dao.ts +94 -83
- package/src/dao/systemConfiguration/SystemConfigurationDAO.ts +41 -35
- 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 +396 -345
- package/src/entities/BaseEntity.ts +1 -1
- package/src/index.ts +43 -29
- 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 +10 -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
|
@@ -2,210 +2,264 @@ import { Knex } from "knex";
|
|
|
2
2
|
import { IBaseDAO, IDataPaginator } from "../../d.types";
|
|
3
3
|
import { IVideo } from "../../interfaces/video/video.interfaces";
|
|
4
4
|
import KnexManager from "../../KnexConnection";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
VALID_VIDEO_SORT_FIELDS,
|
|
7
|
+
VALID_SORT_ORDERS,
|
|
8
|
+
VIDEO_SORT_COLUMN_MAP,
|
|
9
|
+
VideoSortField,
|
|
10
|
+
SortOrder,
|
|
11
|
+
} from "../../constants/video.constants";
|
|
6
12
|
|
|
7
13
|
export class VideoDAO implements IBaseDAO<IVideo> {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
14
|
+
private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
|
|
15
|
+
|
|
16
|
+
static getInstance(): Knex<any, unknown[]> {
|
|
17
|
+
return KnexManager.getConnection();
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
async create(item: IVideo): Promise<IVideo> {
|
|
21
|
+
const [createdVideo] = await this._knex("video")
|
|
22
|
+
.insert(item)
|
|
23
|
+
.returning("*");
|
|
24
|
+
return createdVideo;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
async getById(id: number): Promise<IVideo | null> {
|
|
28
|
+
const video = await this._knex("video as v")
|
|
29
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
30
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
31
|
+
.where("v.id", id)
|
|
32
|
+
.first();
|
|
33
|
+
return video || null;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
async getByUuid(uuid: string): Promise<IVideo | null> {
|
|
37
|
+
const video = await this._knex("video as v")
|
|
38
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
39
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
40
|
+
.where("v.uuid", uuid)
|
|
41
|
+
.first();
|
|
42
|
+
return video || null;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
async update(id: number, item: Partial<IVideo>): Promise<IVideo | null> {
|
|
46
|
+
const [updatedVideo] = await this._knex("video")
|
|
47
|
+
.where({ id })
|
|
48
|
+
.update(item)
|
|
49
|
+
.returning("*");
|
|
50
|
+
return updatedVideo || null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
async delete(id: number): Promise<boolean> {
|
|
54
|
+
const result = await this._knex("video").where({ id }).del();
|
|
55
|
+
return result > 0;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
// entityId corresponde al id del folder al que pertenece el video
|
|
59
|
+
async getAll(
|
|
60
|
+
page: number,
|
|
61
|
+
limit: number,
|
|
62
|
+
folderId?: number | null,
|
|
63
|
+
sortBy?: VideoSortField,
|
|
64
|
+
sortOrder?: SortOrder,
|
|
65
|
+
): Promise<IDataPaginator<IVideo>> {
|
|
66
|
+
const offset = (page - 1) * limit;
|
|
67
|
+
|
|
68
|
+
// Validate and set defaults for sorting (defensive programming)
|
|
69
|
+
const sortField = (sortBy || "name") as VideoSortField;
|
|
70
|
+
|
|
71
|
+
if (!VALID_VIDEO_SORT_FIELDS.includes(sortField as any)) {
|
|
72
|
+
throw new Error(
|
|
73
|
+
`Invalid sortBy value: ${sortField}. Must be one of: ${VALID_VIDEO_SORT_FIELDS.join(", ")}`,
|
|
74
|
+
);
|
|
12
75
|
}
|
|
13
76
|
|
|
14
|
-
|
|
15
|
-
const [createdVideo] = await this._knex("video").insert(item).returning("*");
|
|
16
|
-
return createdVideo;
|
|
17
|
-
}
|
|
77
|
+
const sortDirection = (sortOrder || "DESC").toUpperCase() as SortOrder;
|
|
18
78
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
.where("v.id", id)
|
|
24
|
-
.first();
|
|
25
|
-
return video || null;
|
|
79
|
+
if (!VALID_SORT_ORDERS.includes(sortDirection as any)) {
|
|
80
|
+
throw new Error(
|
|
81
|
+
`Invalid sortOrder value: ${sortOrder}. Must be one of: ${VALID_SORT_ORDERS.join(", ")}`,
|
|
82
|
+
);
|
|
26
83
|
}
|
|
27
84
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
85
|
+
// Map sortBy to database column with table alias
|
|
86
|
+
const sortColumn = VIDEO_SORT_COLUMN_MAP[sortField];
|
|
87
|
+
|
|
88
|
+
const query = this._knex("video as v")
|
|
89
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
90
|
+
.leftJoin("cameras as c", "v.cameraId", "c.id")
|
|
91
|
+
.select(
|
|
92
|
+
"v.*",
|
|
93
|
+
this._knex.raw("to_jsonb(f.*) as folder"),
|
|
94
|
+
"c.name as cameraName",
|
|
95
|
+
"c.uuid as cameraUuid",
|
|
96
|
+
);
|
|
97
|
+
if (folderId !== undefined && folderId !== null) {
|
|
98
|
+
query.where("v.folderId", folderId);
|
|
35
99
|
}
|
|
36
100
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
101
|
+
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
102
|
+
const totalCount = +countResult.count;
|
|
103
|
+
const videos = await query
|
|
104
|
+
.clone()
|
|
105
|
+
.orderBy(sortColumn, sortDirection.toLowerCase() as "asc" | "desc")
|
|
106
|
+
.limit(limit)
|
|
107
|
+
.offset(offset);
|
|
108
|
+
|
|
109
|
+
return {
|
|
110
|
+
success: true,
|
|
111
|
+
data: videos,
|
|
112
|
+
page,
|
|
113
|
+
limit,
|
|
114
|
+
count: videos.length,
|
|
115
|
+
totalCount,
|
|
116
|
+
totalPages: Math.ceil(totalCount / limit),
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
async getVideoStatsByFolderIds(folderIds: number[]): Promise<{
|
|
121
|
+
total_videos: number;
|
|
122
|
+
completed_videos: number;
|
|
123
|
+
failed_videos: number;
|
|
124
|
+
processing_videos: number;
|
|
125
|
+
}> {
|
|
126
|
+
if (!folderIds || folderIds.length === 0) {
|
|
127
|
+
return {
|
|
128
|
+
total_videos: 0,
|
|
129
|
+
completed_videos: 0,
|
|
130
|
+
failed_videos: 0,
|
|
131
|
+
processing_videos: 0,
|
|
132
|
+
};
|
|
40
133
|
}
|
|
41
134
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
135
|
+
const result = (await this._knex("video")
|
|
136
|
+
.whereIn("folderId", folderIds)
|
|
137
|
+
.select(
|
|
138
|
+
this._knex.raw("COUNT(*) as total_videos"),
|
|
139
|
+
this._knex.raw(
|
|
140
|
+
"COUNT(CASE WHEN status = ? THEN 1 END) as completed_videos",
|
|
141
|
+
["COMPLETED"],
|
|
142
|
+
),
|
|
143
|
+
this._knex.raw(
|
|
144
|
+
"COUNT(CASE WHEN status = ? THEN 1 END) as failed_videos",
|
|
145
|
+
["FAILED"],
|
|
146
|
+
),
|
|
147
|
+
this._knex.raw(
|
|
148
|
+
"COUNT(CASE WHEN status = ? THEN 1 END) as processing_videos",
|
|
149
|
+
["PROCESSING"],
|
|
150
|
+
),
|
|
151
|
+
)
|
|
152
|
+
.first()) as any;
|
|
153
|
+
|
|
154
|
+
return {
|
|
155
|
+
total_videos: parseInt(result?.total_videos) || 0,
|
|
156
|
+
completed_videos: parseInt(result?.completed_videos) || 0,
|
|
157
|
+
failed_videos: parseInt(result?.failed_videos) || 0,
|
|
158
|
+
processing_videos: parseInt(result?.processing_videos) || 0,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
async getCompletedVideosByFolderIds(
|
|
163
|
+
folderIds: number[],
|
|
164
|
+
videoType?: string,
|
|
165
|
+
): Promise<IVideo[]> {
|
|
166
|
+
if (!folderIds || folderIds.length === 0) {
|
|
167
|
+
return [];
|
|
45
168
|
}
|
|
46
169
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
// Validate and set defaults for sorting (defensive programming)
|
|
52
|
-
const sortField = (sortBy || 'name') as VideoSortField;
|
|
53
|
-
|
|
54
|
-
if (!VALID_VIDEO_SORT_FIELDS.includes(sortField as any)) {
|
|
55
|
-
throw new Error(`Invalid sortBy value: ${sortField}. Must be one of: ${VALID_VIDEO_SORT_FIELDS.join(', ')}`);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
const sortDirection = ((sortOrder || 'DESC').toUpperCase()) as SortOrder;
|
|
59
|
-
|
|
60
|
-
if (!VALID_SORT_ORDERS.includes(sortDirection as any)) {
|
|
61
|
-
throw new Error(`Invalid sortOrder value: ${sortOrder}. Must be one of: ${VALID_SORT_ORDERS.join(', ')}`);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
// Map sortBy to database column with table alias
|
|
65
|
-
const sortColumn = VIDEO_SORT_COLUMN_MAP[sortField];
|
|
66
|
-
|
|
67
|
-
const query = this._knex("video as v")
|
|
68
|
-
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
69
|
-
.leftJoin("cameras as c", "v.cameraId", "c.id")
|
|
70
|
-
.select(
|
|
71
|
-
"v.*",
|
|
72
|
-
this._knex.raw("to_jsonb(f.*) as folder"),
|
|
73
|
-
"c.name as cameraName",
|
|
74
|
-
"c.uuid as cameraUuid"
|
|
75
|
-
);
|
|
76
|
-
if (folderId !== undefined && folderId !== null) {
|
|
77
|
-
query.where("v.folderId", folderId);
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
81
|
-
const totalCount = +countResult.count;
|
|
82
|
-
const videos = await query
|
|
83
|
-
.clone()
|
|
84
|
-
.orderBy(sortColumn, sortDirection.toLowerCase() as 'asc' | 'desc')
|
|
85
|
-
.limit(limit)
|
|
86
|
-
.offset(offset);
|
|
87
|
-
|
|
88
|
-
return {
|
|
89
|
-
success: true,
|
|
90
|
-
data: videos,
|
|
91
|
-
page,
|
|
92
|
-
limit,
|
|
93
|
-
count: videos.length,
|
|
94
|
-
totalCount,
|
|
95
|
-
totalPages: Math.ceil(totalCount / limit),
|
|
96
|
-
};
|
|
97
|
-
}
|
|
170
|
+
const query = this._knex("video")
|
|
171
|
+
.whereIn("folderId", folderIds)
|
|
172
|
+
.where("status", "COMPLETED");
|
|
98
173
|
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
completed_videos: number;
|
|
102
|
-
failed_videos: number;
|
|
103
|
-
processing_videos: number;
|
|
104
|
-
}> {
|
|
105
|
-
if (!folderIds || folderIds.length === 0) {
|
|
106
|
-
return {
|
|
107
|
-
total_videos: 0,
|
|
108
|
-
completed_videos: 0,
|
|
109
|
-
failed_videos: 0,
|
|
110
|
-
processing_videos: 0
|
|
111
|
-
};
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
const result = await this._knex("video")
|
|
115
|
-
.whereIn("folderId", folderIds)
|
|
116
|
-
.select(
|
|
117
|
-
this._knex.raw('COUNT(*) as total_videos'),
|
|
118
|
-
this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as completed_videos", ['COMPLETED']),
|
|
119
|
-
this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as failed_videos", ['FAILED']),
|
|
120
|
-
this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as processing_videos", ['PROCESSING'])
|
|
121
|
-
)
|
|
122
|
-
.first() as any;
|
|
123
|
-
|
|
124
|
-
return {
|
|
125
|
-
total_videos: parseInt(result?.total_videos) || 0,
|
|
126
|
-
completed_videos: parseInt(result?.completed_videos) || 0,
|
|
127
|
-
failed_videos: parseInt(result?.failed_videos) || 0,
|
|
128
|
-
processing_videos: parseInt(result?.processing_videos) || 0
|
|
129
|
-
};
|
|
174
|
+
if (videoType) {
|
|
175
|
+
query.where("videoType", videoType);
|
|
130
176
|
}
|
|
131
177
|
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
178
|
+
return await query.select(
|
|
179
|
+
"id",
|
|
180
|
+
"name",
|
|
181
|
+
"metadata",
|
|
182
|
+
"results",
|
|
183
|
+
"created_at",
|
|
184
|
+
this._knex.raw(
|
|
185
|
+
"EXTRACT(EPOCH FROM (updated_at - created_at)) as duration",
|
|
186
|
+
),
|
|
187
|
+
);
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/**
|
|
191
|
+
* Update the duration in seconds for a video
|
|
192
|
+
*/
|
|
193
|
+
async updateDuration(
|
|
194
|
+
id: number,
|
|
195
|
+
durationSeconds: number,
|
|
196
|
+
): Promise<IVideo | null> {
|
|
197
|
+
const [updatedVideo] = await this._knex("video")
|
|
198
|
+
.where({ id })
|
|
199
|
+
.update({
|
|
200
|
+
duration_seconds: durationSeconds,
|
|
201
|
+
updated_at: this._knex.fn.now(),
|
|
202
|
+
})
|
|
203
|
+
.returning("*");
|
|
204
|
+
return updatedVideo || null;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/**
|
|
208
|
+
* Get videos that don't have minute-by-minute data yet
|
|
209
|
+
*/
|
|
210
|
+
async getVideosWithoutMinuteData(
|
|
211
|
+
page: number,
|
|
212
|
+
limit: number,
|
|
213
|
+
): Promise<IDataPaginator<IVideo>> {
|
|
214
|
+
const offset = (page - 1) * limit;
|
|
215
|
+
|
|
216
|
+
const query = this._knex("video as v")
|
|
217
|
+
.leftJoin("video_minute_results as vmr", "v.id", "vmr.video_id")
|
|
218
|
+
.whereNull("vmr.video_id")
|
|
219
|
+
.where("v.status", "COMPLETED")
|
|
220
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
221
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
222
|
+
.groupBy("v.id", "f.id");
|
|
223
|
+
|
|
224
|
+
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
225
|
+
const totalCount = +countResult.count;
|
|
226
|
+
const videos = await query.clone().limit(limit).offset(offset);
|
|
227
|
+
|
|
228
|
+
return {
|
|
229
|
+
success: true,
|
|
230
|
+
data: videos,
|
|
231
|
+
page,
|
|
232
|
+
limit,
|
|
233
|
+
count: videos.length,
|
|
234
|
+
totalCount,
|
|
235
|
+
totalPages: Math.ceil(totalCount / limit),
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
/**
|
|
240
|
+
* Get videos from same folder with same type that have metadata and are COMPLETED
|
|
241
|
+
* Suitable for use as lane annotation templates
|
|
242
|
+
*/
|
|
243
|
+
async getTemplateVideos(
|
|
244
|
+
folderId: number,
|
|
245
|
+
videoType: string,
|
|
246
|
+
): Promise<IVideo[]> {
|
|
247
|
+
try {
|
|
248
|
+
let query = this._knex("video")
|
|
249
|
+
.where("folderId", folderId)
|
|
250
|
+
.where("videoType", videoType)
|
|
251
|
+
.where("status", "COMPLETED")
|
|
252
|
+
.whereNotNull("metadata")
|
|
253
|
+
.whereRaw("metadata != '{}'");
|
|
254
|
+
|
|
255
|
+
// Apply video type specific metadata validation
|
|
256
|
+
if (videoType === "ATR") {
|
|
257
|
+
// ATR videos use lanes array structure
|
|
258
|
+
query = query.whereRaw("jsonb_array_length(metadata->'lanes') > 0");
|
|
259
|
+
} else {
|
|
260
|
+
// TMC/JUNCTION/ROUNDABOUT/PATHWAY videos use objects with pt1/pt2 structure
|
|
261
|
+
// Check if metadata has at least one key with pt1 and pt2 properties
|
|
262
|
+
query = query.whereRaw(`
|
|
209
263
|
EXISTS (
|
|
210
264
|
SELECT 1
|
|
211
265
|
FROM jsonb_each(metadata) as entry(key, value)
|
|
@@ -220,168 +274,165 @@ export class VideoDAO implements IBaseDAO<IVideo> {
|
|
|
220
274
|
AND jsonb_array_length(value->'pt2') = 2
|
|
221
275
|
)
|
|
222
276
|
`);
|
|
223
|
-
|
|
277
|
+
}
|
|
224
278
|
|
|
225
|
-
|
|
226
|
-
.orderBy("updated_at", "desc")
|
|
227
|
-
.select("*");
|
|
279
|
+
const videos = await query.orderBy("updated_at", "desc").select("*");
|
|
228
280
|
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
}
|
|
281
|
+
return videos;
|
|
282
|
+
} catch (error) {
|
|
283
|
+
console.error("Error fetching template videos:", error);
|
|
284
|
+
throw error;
|
|
234
285
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
/**
|
|
289
|
+
* Get all videos for a specific folder (used for S3 cleanup on folder deletion)
|
|
290
|
+
*/
|
|
291
|
+
async getByFolderId(folderId: number): Promise<IVideo[]> {
|
|
292
|
+
return this._knex("video as v")
|
|
293
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
294
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
295
|
+
.where("v.folderId", folderId)
|
|
296
|
+
.orderBy("v.id", "asc");
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
/**
|
|
300
|
+
* Get all video IDs for a specific folder (used for cascade operations)
|
|
301
|
+
*/
|
|
302
|
+
async getVideoIdsByFolderId(folderId: number): Promise<number[]> {
|
|
303
|
+
const rows = await this._knex("video")
|
|
304
|
+
.where({ folderId })
|
|
305
|
+
.select("id")
|
|
306
|
+
.orderBy("id", "asc");
|
|
307
|
+
|
|
308
|
+
return rows.map((row) => row.id);
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
/**
|
|
312
|
+
* Get videos by batch ID
|
|
313
|
+
*/
|
|
314
|
+
async getByBatchId(batchId: number): Promise<IVideo[]> {
|
|
315
|
+
return this._knex("video as v")
|
|
316
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
317
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
318
|
+
.where("v.batchId", batchId)
|
|
319
|
+
.orderBy("v.created_at", "asc");
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
/**
|
|
323
|
+
* Get videos sorted chronologically by recording start time for a study
|
|
324
|
+
*/
|
|
325
|
+
async getChronologicalVideos(
|
|
326
|
+
studyId: number,
|
|
327
|
+
startDate?: Date,
|
|
328
|
+
endDate?: Date,
|
|
329
|
+
): Promise<IDataPaginator<IVideo>> {
|
|
330
|
+
let query = this._knex("video as v")
|
|
331
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
332
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
333
|
+
.where("f.studyId", studyId)
|
|
334
|
+
.whereNotNull("v.recordingStartedAt");
|
|
335
|
+
|
|
336
|
+
if (startDate) {
|
|
337
|
+
query = query.where("v.recordingStartedAt", ">=", startDate);
|
|
245
338
|
}
|
|
246
339
|
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
*/
|
|
250
|
-
async getVideoIdsByFolderId(folderId: number): Promise<number[]> {
|
|
251
|
-
const rows = await this._knex('video')
|
|
252
|
-
.where({ folderId })
|
|
253
|
-
.select('id')
|
|
254
|
-
.orderBy('id', 'asc');
|
|
255
|
-
|
|
256
|
-
return rows.map(row => row.id);
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
/**
|
|
260
|
-
* Get videos by batch ID
|
|
261
|
-
*/
|
|
262
|
-
async getByBatchId(batchId: number): Promise<IVideo[]> {
|
|
263
|
-
return this._knex("video as v")
|
|
264
|
-
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
265
|
-
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
266
|
-
.where("v.batchId", batchId)
|
|
267
|
-
.orderBy("v.created_at", "asc");
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
/**
|
|
271
|
-
* Get videos sorted chronologically by recording start time for a study
|
|
272
|
-
*/
|
|
273
|
-
async getChronologicalVideos(
|
|
274
|
-
studyId: number,
|
|
275
|
-
startDate?: Date,
|
|
276
|
-
endDate?: Date
|
|
277
|
-
): Promise<IDataPaginator<IVideo>> {
|
|
278
|
-
let query = this._knex("video as v")
|
|
279
|
-
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
280
|
-
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
281
|
-
.where("f.studyId", studyId)
|
|
282
|
-
.whereNotNull("v.recordingStartedAt");
|
|
283
|
-
|
|
284
|
-
if (startDate) {
|
|
285
|
-
query = query.where("v.recordingStartedAt", ">=", startDate);
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
if (endDate) {
|
|
289
|
-
query = query.where("v.recordingStartedAt", "<=", endDate);
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
293
|
-
const totalCount = +countResult.count;
|
|
294
|
-
const videos = await query.clone().orderBy("v.recordingStartedAt", "asc");
|
|
295
|
-
|
|
296
|
-
return {
|
|
297
|
-
success: true,
|
|
298
|
-
data: videos,
|
|
299
|
-
page: 1,
|
|
300
|
-
limit: totalCount,
|
|
301
|
-
count: videos.length,
|
|
302
|
-
totalCount,
|
|
303
|
-
totalPages: 1,
|
|
304
|
-
};
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
/**
|
|
308
|
-
* Update recording start time for a video
|
|
309
|
-
*/
|
|
310
|
-
async updateRecordingStartTime(id: number, recordingStartedAt: Date): Promise<void> {
|
|
311
|
-
await this._knex("video")
|
|
312
|
-
.where({ id })
|
|
313
|
-
.update({
|
|
314
|
-
recordingStartedAt,
|
|
315
|
-
updated_at: this._knex.fn.now()
|
|
316
|
-
});
|
|
317
|
-
}
|
|
318
|
-
|
|
319
|
-
/**
|
|
320
|
-
* Update trim settings for a video
|
|
321
|
-
*/
|
|
322
|
-
async updateTrimSettings(
|
|
323
|
-
id: number,
|
|
324
|
-
trimEnabled: boolean,
|
|
325
|
-
trimPeriods: { startTime: string; endTime: string }[] | null
|
|
326
|
-
): Promise<void> {
|
|
327
|
-
await this._knex("video")
|
|
328
|
-
.where({ id })
|
|
329
|
-
.update({
|
|
330
|
-
trimEnabled,
|
|
331
|
-
trimPeriods: trimPeriods ? JSON.stringify(trimPeriods) : null,
|
|
332
|
-
updated_at: this._knex.fn.now()
|
|
333
|
-
});
|
|
340
|
+
if (endDate) {
|
|
341
|
+
query = query.where("v.recordingStartedAt", "<=", endDate);
|
|
334
342
|
}
|
|
335
343
|
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
)
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
344
|
+
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
345
|
+
const totalCount = +countResult.count;
|
|
346
|
+
const videos = await query.clone().orderBy("v.recordingStartedAt", "asc");
|
|
347
|
+
|
|
348
|
+
return {
|
|
349
|
+
success: true,
|
|
350
|
+
data: videos,
|
|
351
|
+
page: 1,
|
|
352
|
+
limit: totalCount,
|
|
353
|
+
count: videos.length,
|
|
354
|
+
totalCount,
|
|
355
|
+
totalPages: 1,
|
|
356
|
+
};
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
/**
|
|
360
|
+
* Update recording start time for a video
|
|
361
|
+
*/
|
|
362
|
+
async updateRecordingStartTime(
|
|
363
|
+
id: number,
|
|
364
|
+
recordingStartedAt: Date,
|
|
365
|
+
): Promise<void> {
|
|
366
|
+
await this._knex("video").where({ id }).update({
|
|
367
|
+
recordingStartedAt,
|
|
368
|
+
updated_at: this._knex.fn.now(),
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
/**
|
|
373
|
+
* Update trim settings for a video
|
|
374
|
+
*/
|
|
375
|
+
async updateTrimSettings(
|
|
376
|
+
id: number,
|
|
377
|
+
trimEnabled: boolean,
|
|
378
|
+
trimPeriods: { startTime: string; endTime: string }[] | null,
|
|
379
|
+
): Promise<void> {
|
|
380
|
+
await this._knex("video")
|
|
381
|
+
.where({ id })
|
|
382
|
+
.update({
|
|
383
|
+
trimEnabled,
|
|
384
|
+
trimPeriods: trimPeriods ? JSON.stringify(trimPeriods) : null,
|
|
385
|
+
updated_at: this._knex.fn.now(),
|
|
386
|
+
});
|
|
387
|
+
}
|
|
388
|
+
|
|
389
|
+
/**
|
|
390
|
+
* Get videos with trimming enabled for a folder
|
|
391
|
+
*/
|
|
392
|
+
async getVideosWithTrimming(folderId: number): Promise<IVideo[]> {
|
|
393
|
+
return this._knex("video as v")
|
|
394
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
395
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
396
|
+
.where("v.folderId", folderId)
|
|
397
|
+
.where("v.trimEnabled", true)
|
|
398
|
+
.orderBy("v.recordingStartedAt", "asc");
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
/**
|
|
402
|
+
* Get paginated videos for a specific camera
|
|
403
|
+
* @param cameraId - The camera ID
|
|
404
|
+
* @param page - Page number
|
|
405
|
+
* @param limit - Items per page
|
|
406
|
+
*/
|
|
407
|
+
async getVideosByCameraId(
|
|
408
|
+
cameraId: number,
|
|
409
|
+
page: number,
|
|
410
|
+
limit: number,
|
|
411
|
+
): Promise<IDataPaginator<IVideo>> {
|
|
412
|
+
const offset = (page - 1) * limit;
|
|
413
|
+
|
|
414
|
+
const query = this._knex("video as v")
|
|
415
|
+
.innerJoin("folders as f", "v.folderId", "f.id")
|
|
416
|
+
.select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
|
|
417
|
+
.where("v.cameraId", cameraId);
|
|
418
|
+
|
|
419
|
+
const [countResult] = await query.clone().clearSelect().count("* as count");
|
|
420
|
+
const totalCount = +countResult.count;
|
|
421
|
+
|
|
422
|
+
const videos = await query
|
|
423
|
+
.clone()
|
|
424
|
+
.limit(limit)
|
|
425
|
+
.offset(offset)
|
|
426
|
+
.orderBy("v.created_at", "desc");
|
|
427
|
+
|
|
428
|
+
return {
|
|
429
|
+
success: true,
|
|
430
|
+
data: videos,
|
|
431
|
+
page,
|
|
432
|
+
limit,
|
|
433
|
+
count: videos.length,
|
|
434
|
+
totalCount,
|
|
435
|
+
totalPages: Math.ceil(totalCount / limit),
|
|
436
|
+
};
|
|
437
|
+
}
|
|
387
438
|
}
|