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