@trafficgroup/knex-rel 0.1.0 → 0.1.2

package/src/dao/folder/folder.dao.ts

@@ -16,7 +16,12 @@ export class FolderDAO implements IBaseDAO<IFolder> {
   async getById(id: number): Promise<IFolder | null> {
     const folder = await this._knex("folders as f")
       .innerJoin("study as s", "f.studyId", "s.id")
-      .select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
+      .leftJoin("cameras as c", "f.cameraId", "c.id")
+      .select(
+        "f.*",
+        this._knex.raw("to_jsonb(s.*) as study"),
+        this._knex.raw("to_jsonb(c.*) as camera"),
+      )
       .where("f.id", id)
       .first();
     return folder || null;
@@ -25,7 +30,12 @@ export class FolderDAO implements IBaseDAO<IFolder> {
   async getByUuid(uuid: string): Promise<IFolder | null> {
     const folder = await this._knex("folders as f")
       .innerJoin("study as s", "f.studyId", "s.id")
-      .select("f.*", this._knex.raw("to_jsonb(s.*) as study"))
+      .leftJoin("cameras as c", "f.cameraId", "c.id")
+      .select(
+        "f.*",
+        this._knex.raw("to_jsonb(s.*) as study"),
+        this._knex.raw("to_jsonb(c.*) as camera"),
+      )
       .where("f.uuid", uuid)
       .first();
     return folder || null;
@@ -53,7 +63,12 @@ export class FolderDAO implements IBaseDAO<IFolder> {
 
     const query = this._knex("folders as f")
       .innerJoin("study as s", "f.studyId", "s.id")
-      .select("f.*", this._knex.raw("to_jsonb(s.*) as study"));
+      .leftJoin("cameras as c", "f.cameraId", "c.id")
+      .select(
+        "f.*",
+        this._knex.raw("to_jsonb(s.*) as study"),
+        this._knex.raw("to_jsonb(c.*) as camera"),
+      );
     if (studyId !== undefined && studyId !== null) {
       query.where("f.studyId", studyId);
     }

package/src/dao/video/video.dao.ts

@@ -196,4 +196,53 @@ export class VideoDAO implements IBaseDAO<IVideo> {
       totalPages: Math.ceil(totalCount / limit),
     };
   }
+
+  /**
+   * Get videos from same folder with same type that have metadata and are COMPLETED
+   * Suitable for use as lane annotation templates
+   */
+  async getTemplateVideos(
+    folderId: number,
+    videoType: string,
+  ): Promise<IVideo[]> {
+    try {
+      let query = this._knex("video")
+        .where("folderId", folderId)
+        .where("videoType", videoType)
+        .where("status", "COMPLETED")
+        .whereNotNull("metadata")
+        .whereRaw("metadata != '{}'");
+
+      // Apply video type specific metadata validation
+      if (videoType === "ATR") {
+        // ATR videos use lanes array structure
+        query = query.whereRaw("jsonb_array_length(metadata->'lanes') > 0");
+      } else {
+        // TMC/JUNCTION/ROUNDABOUT/PATHWAY videos use objects with pt1/pt2 structure
+        // Check if metadata has at least one key with pt1 and pt2 properties
+        query = query.whereRaw(`
+                    EXISTS (
+                        SELECT 1 
+                        FROM jsonb_each(metadata) as entry(key, value)
+                        WHERE key != 'lanes' 
+                        AND key != 'finish_line'
+                        AND jsonb_typeof(value) = 'object'
+                        AND value ? 'pt1' 
+                        AND value ? 'pt2'
+                        AND jsonb_typeof(value->'pt1') = 'array'
+                        AND jsonb_typeof(value->'pt2') = 'array'
+                        AND jsonb_array_length(value->'pt1') = 2
+                        AND jsonb_array_length(value->'pt2') = 2
+                    )
+                `);
+      }
+
+      const videos = await query.orderBy("updated_at", "desc").select("*");
+
+      return videos;
+    } catch (error) {
+      console.error("Error fetching template videos:", error);
+      throw error;
+    }
+  }
 }

package/src/index.ts

@@ -1,32 +1,34 @@
 // DAOs
-export { UserDAO } from "./dao/user/user.dao";
-export { StudyDAO } from "./dao/study/study.dao";
-export { FolderDAO } from "./dao/folder/folder.dao";
-export { VideoDAO } from "./dao/video/video.dao";
 export { AuthDAO } from "./dao/auth/auth.dao";
-export { UserPushNotificationTokenDAO } from "./dao/user-push-notification-token/user-push-notification-token.dao";
+export { CameraDAO } from "./dao/camera/camera.dao";
 export { ChatDAO } from "./dao/chat/chat.dao";
+export { FolderDAO } from "./dao/folder/folder.dao";
 export { MessageDAO } from "./dao/message/message.dao";
+export { StudyDAO } from "./dao/study/study.dao";
+export { UserDAO } from "./dao/user/user.dao";
+export { UserPushNotificationTokenDAO } from "./dao/user-push-notification-token/user-push-notification-token.dao";
+export { VideoDAO } from "./dao/video/video.dao";
 export { VideoMinuteResultDAO } from "./dao/VideoMinuteResultDAO";
 
 // Interfaces
 export { IDataPaginator } from "./d.types";
-export { IUser } from "./interfaces/user/user.interfaces";
-export { IStudy } from "./interfaces/study/study.interfaces";
-export { IFolder } from "./interfaces/folder/folder.interfaces";
-export { IVideo } from "./interfaces/video/video.interfaces";
 export { IAuth } from "./interfaces/auth/auth.interfaces";
-export { IUserPushNotificationToken } from "./interfaces/user-push-notification-token/user-push-notification-token.interfaces";
+export { ICamera } from "./interfaces/camera/camera.interfaces";
 export {
   IChat,
   IChatCreate,
   IChatUpdate,
 } from "./interfaces/chat/chat.interfaces";
+export { IFolder } from "./interfaces/folder/folder.interfaces";
 export {
   IMessage,
   IMessageCreate,
   IMessageUpdate,
 } from "./interfaces/message/message.interfaces";
+export { IStudy } from "./interfaces/study/study.interfaces";
+export { IUser } from "./interfaces/user/user.interfaces";
+export { IUserPushNotificationToken } from "./interfaces/user-push-notification-token/user-push-notification-token.interfaces";
+export { IVideo } from "./interfaces/video/video.interfaces";
 export {
   IVideoMinuteResult,
   IVideoMinuteResultInput,

package/src/interfaces/camera/camera.interfaces.ts

@@ -0,0 +1,9 @@
+export interface ICamera {
+  id: number;
+  uuid: string;
+  name: string;
+  longitude: number;
+  latitude: number;
+  created_at: string;
+  updated_at: string;
+}

package/src/interfaces/folder/folder.interfaces.ts

@@ -1,4 +1,5 @@
 import type { IStudy } from "../study/study.interfaces";
+import type { ICamera } from "../camera/camera.interfaces";
 
 export interface IFolder {
   id: number;
@@ -7,7 +8,9 @@ export interface IFolder {
   createdBy: number; // user.id
   status: "UPLOADING" | "COMPLETE";
   studyId: number; // study.id
+  cameraId?: number; // camera.id
   created_at: string;
   updated_at: string;
   study?: IStudy;
+  camera?: ICamera;
 }

package/src/interfaces/video/video.interfaces.ts

@@ -1,9 +1,12 @@
 import type { IFolder } from "../folder/folder.interfaces";
+import type { ICamera } from "../camera/camera.interfaces";
 
 export interface IVideo {
   id: number;
   uuid: string;
   folderId: number;
+  cameraId?: number;
+  annotationSourceId?: number;
   name: string;
   videoLocation: string;
   videoOutputLocation: string | null;
@@ -28,4 +31,5 @@ export interface IVideo {
   created_at: string;
   updated_at: string;
   folder?: IFolder;
+  camera?: ICamera;
 }