@trafficgroup/knex-rel 0.0.28 → 0.1.0

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

@@ -1,120 +1,199 @@
-import { Knex } from "knex";
-import { IBaseDAO, IDataPaginator } from "../../d.types";
-import { IVideo } from "../../interfaces/video/video.interfaces";
-import KnexManager from "../../KnexConnection";
-
-export class VideoDAO implements IBaseDAO<IVideo> {
-    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
-
-    static getInstance(): Knex<any, unknown[]> {
-        return KnexManager.getConnection();
-    }
-
-    async create(item: IVideo): Promise<IVideo> {
-        const [createdVideo] = await this._knex("video").insert(item).returning("*");
-        return createdVideo;
-    }
-
-    async getById(id: number): Promise<IVideo | null> {
-        const video = await this._knex("video as v")
-            .innerJoin("folders as f", "v.folderId", "f.id")
-            .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
-            .where("v.id", id)
-            .first();
-        return video || null;
-    }
-
-    async getByUuid(uuid: string): Promise<IVideo | null> {
-        const video = await this._knex("video as v")
-            .innerJoin("folders as f", "v.folderId", "f.id")
-            .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
-            .where("v.uuid", uuid)
-            .first();
-        return video || null;
-    }
-
-    async update(id: number, item: Partial<IVideo>): Promise<IVideo | null> {
-        const [updatedVideo] = await this._knex("video").where({ id }).update(item).returning("*");
-        return updatedVideo || null;
-    }
-
-    async delete(id: number): Promise<boolean> {
-        const result = await this._knex("video").where({ id }).del();
-        return result > 0;
-    }
-
-    // entityId corresponde al id del folder al que pertenece el video
-    async getAll(page: number, limit: number, folderId?: number | null): Promise<IDataPaginator<IVideo>> {
-        const offset = (page - 1) * limit;
-
-        const query = this._knex("video as v")
-            .innerJoin("folders as f", "v.folderId", "f.id")
-            .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"));
-        if (folderId !== undefined && folderId !== null) {
-            query.where("v.folderId", folderId);
-        }
-
-        const [countResult] = await query.clone().clearSelect().count("* as count");
-        const totalCount = +countResult.count;
-        const videos = await query.clone().limit(limit).offset(offset);
-
-        return {
-            success: true,
-            data: videos,
-            page,
-            limit,
-            count: videos.length,
-            totalCount,
-            totalPages: Math.ceil(totalCount / limit),
-        };
-    }
-
-    async getVideoStatsByFolderIds(folderIds: number[]): Promise<{
-        total_videos: number;
-        completed_videos: number;
-        failed_videos: number;
-        processing_videos: number;
-    }> {
-        if (!folderIds || folderIds.length === 0) {
-            return {
-                total_videos: 0,
-                completed_videos: 0,
-                failed_videos: 0,
-                processing_videos: 0
-            };
-        }
-
-        const result = await this._knex("video")
-            .whereIn("folderId", folderIds)
-            .select(
-                this._knex.raw('COUNT(*) as total_videos'),
-                this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as completed_videos", ['COMPLETED']),
-                this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as failed_videos", ['FAILED']),
-                this._knex.raw("COUNT(CASE WHEN status = ? THEN 1 END) as processing_videos", ['PROCESSING'])
-            )
-            .first() as any;
-
-        return {
-            total_videos: parseInt(result?.total_videos) || 0,
-            completed_videos: parseInt(result?.completed_videos) || 0,
-            failed_videos: parseInt(result?.failed_videos) || 0,
-            processing_videos: parseInt(result?.processing_videos) || 0
-        };
-    }
-
-    async getCompletedVideosByFolderIds(folderIds: number[], videoType?: string): Promise<IVideo[]> {
-        if (!folderIds || folderIds.length === 0) {
-            return [];
-        }
-
-        const query = this._knex("video")
-            .whereIn("folderId", folderIds)
-            .where("status", "COMPLETED");
-
-        if (videoType) {
-            query.where("videoType", videoType);
-        }
-
-        return await query.select("id", "name", "metadata", "results", "created_at", this._knex.raw("EXTRACT(EPOCH FROM (updated_at - created_at)) as duration"));
-    }
-}
+import { Knex } from "knex";
+import { IBaseDAO, IDataPaginator } from "../../d.types";
+import { IVideo } from "../../interfaces/video/video.interfaces";
+import KnexManager from "../../KnexConnection";
+
+export class VideoDAO implements IBaseDAO<IVideo> {
+  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+
+  static getInstance(): Knex<any, unknown[]> {
+    return KnexManager.getConnection();
+  }
+
+  async create(item: IVideo): Promise<IVideo> {
+    const [createdVideo] = await this._knex("video")
+      .insert(item)
+      .returning("*");
+    return createdVideo;
+  }
+
+  async getById(id: number): Promise<IVideo | null> {
+    const video = await this._knex("video as v")
+      .innerJoin("folders as f", "v.folderId", "f.id")
+      .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
+      .where("v.id", id)
+      .first();
+    return video || null;
+  }
+
+  async getByUuid(uuid: string): Promise<IVideo | null> {
+    const video = await this._knex("video as v")
+      .innerJoin("folders as f", "v.folderId", "f.id")
+      .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
+      .where("v.uuid", uuid)
+      .first();
+    return video || null;
+  }
+
+  async update(id: number, item: Partial<IVideo>): Promise<IVideo | null> {
+    const [updatedVideo] = await this._knex("video")
+      .where({ id })
+      .update(item)
+      .returning("*");
+    return updatedVideo || null;
+  }
+
+  async delete(id: number): Promise<boolean> {
+    const result = await this._knex("video").where({ id }).del();
+    return result > 0;
+  }
+
+  // entityId corresponde al id del folder al que pertenece el video
+  async getAll(
+    page: number,
+    limit: number,
+    folderId?: number | null,
+  ): Promise<IDataPaginator<IVideo>> {
+    const offset = (page - 1) * limit;
+
+    const query = this._knex("video as v")
+      .innerJoin("folders as f", "v.folderId", "f.id")
+      .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"));
+    if (folderId !== undefined && folderId !== null) {
+      query.where("v.folderId", folderId);
+    }
+
+    const [countResult] = await query.clone().clearSelect().count("* as count");
+    const totalCount = +countResult.count;
+    const videos = await query.clone().limit(limit).offset(offset);
+
+    return {
+      success: true,
+      data: videos,
+      page,
+      limit,
+      count: videos.length,
+      totalCount,
+      totalPages: Math.ceil(totalCount / limit),
+    };
+  }
+
+  async getVideoStatsByFolderIds(folderIds: number[]): Promise<{
+    total_videos: number;
+    completed_videos: number;
+    failed_videos: number;
+    processing_videos: number;
+  }> {
+    if (!folderIds || folderIds.length === 0) {
+      return {
+        total_videos: 0,
+        completed_videos: 0,
+        failed_videos: 0,
+        processing_videos: 0,
+      };
+    }
+
+    const result = (await this._knex("video")
+      .whereIn("folderId", folderIds)
+      .select(
+        this._knex.raw("COUNT(*) as total_videos"),
+        this._knex.raw(
+          "COUNT(CASE WHEN status = ? THEN 1 END) as completed_videos",
+          ["COMPLETED"],
+        ),
+        this._knex.raw(
+          "COUNT(CASE WHEN status = ? THEN 1 END) as failed_videos",
+          ["FAILED"],
+        ),
+        this._knex.raw(
+          "COUNT(CASE WHEN status = ? THEN 1 END) as processing_videos",
+          ["PROCESSING"],
+        ),
+      )
+      .first()) as any;
+
+    return {
+      total_videos: parseInt(result?.total_videos) || 0,
+      completed_videos: parseInt(result?.completed_videos) || 0,
+      failed_videos: parseInt(result?.failed_videos) || 0,
+      processing_videos: parseInt(result?.processing_videos) || 0,
+    };
+  }
+
+  async getCompletedVideosByFolderIds(
+    folderIds: number[],
+    videoType?: string,
+  ): Promise<IVideo[]> {
+    if (!folderIds || folderIds.length === 0) {
+      return [];
+    }
+
+    const query = this._knex("video")
+      .whereIn("folderId", folderIds)
+      .where("status", "COMPLETED");
+
+    if (videoType) {
+      query.where("videoType", videoType);
+    }
+
+    return await query.select(
+      "id",
+      "name",
+      "metadata",
+      "results",
+      "created_at",
+      this._knex.raw(
+        "EXTRACT(EPOCH FROM (updated_at - created_at)) as duration",
+      ),
+    );
+  }
+
+  /**
+   * Update the duration in seconds for a video
+   */
+  async updateDuration(
+    id: number,
+    durationSeconds: number,
+  ): Promise<IVideo | null> {
+    const [updatedVideo] = await this._knex("video")
+      .where({ id })
+      .update({
+        duration_seconds: durationSeconds,
+        updated_at: this._knex.fn.now(),
+      })
+      .returning("*");
+    return updatedVideo || null;
+  }
+
+  /**
+   * Get videos that don't have minute-by-minute data yet
+   */
+  async getVideosWithoutMinuteData(
+    page: number,
+    limit: number,
+  ): Promise<IDataPaginator<IVideo>> {
+    const offset = (page - 1) * limit;
+
+    const query = this._knex("video as v")
+      .leftJoin("video_minute_results as vmr", "v.id", "vmr.video_id")
+      .whereNull("vmr.video_id")
+      .where("v.status", "COMPLETED")
+      .innerJoin("folders as f", "v.folderId", "f.id")
+      .select("v.*", this._knex.raw("to_jsonb(f.*) as folder"))
+      .groupBy("v.id", "f.id");
+
+    const [countResult] = await query.clone().clearSelect().count("* as count");
+    const totalCount = +countResult.count;
+    const videos = await query.clone().limit(limit).offset(offset);
+
+    return {
+      success: true,
+      data: videos,
+      page,
+      limit,
+      count: videos.length,
+      totalCount,
+      totalPages: Math.ceil(totalCount / limit),
+    };
+  }
+}

package/src/entities/BaseEntity.ts

@@ -0,0 +1,4 @@
+export interface IBaseEntity {
+  id: number;
+  uuid: string;
+}

package/src/entities/VideoMinuteResult.ts

@@ -0,0 +1,24 @@
+import { IBaseEntity } from "./BaseEntity";
+
+export interface IVideoMinuteResult extends IBaseEntity {
+  id: number;
+  uuid: string;
+  videoId: number;
+  minuteNumber: number; // Renamed from 'minute' for clarity
+  results: Record<string, any>; // JSONB field for minute-specific results
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface IVideoMinuteResultInput {
+  videoId: number;
+  minuteNumber: number;
+  results: Record<string, any>;
+}
+
+export interface IVideoMinuteBatch {
+  videoId: number;
+  startMinute: number;
+  endMinute: number;
+  minuteResults: IVideoMinuteResultInput[];
+}

package/src/index.ts

@@ -1,23 +1,37 @@
-// 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 { ChatDAO } from "./dao/chat/chat.dao";
-export { MessageDAO } from "./dao/message/message.dao";
-
-// 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 { IChat, IChatCreate, IChatUpdate } from "./interfaces/chat/chat.interfaces";
-export { IMessage, IMessageCreate, IMessageUpdate } from "./interfaces/message/message.interfaces";
-
-import KnexManager from "./KnexConnection";
-export { KnexManager };
+// 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 { ChatDAO } from "./dao/chat/chat.dao";
+export { MessageDAO } from "./dao/message/message.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 {
+  IChat,
+  IChatCreate,
+  IChatUpdate,
+} from "./interfaces/chat/chat.interfaces";
+export {
+  IMessage,
+  IMessageCreate,
+  IMessageUpdate,
+} from "./interfaces/message/message.interfaces";
+export {
+  IVideoMinuteResult,
+  IVideoMinuteResultInput,
+  IVideoMinuteBatch,
+} from "./entities/VideoMinuteResult";
+
+import KnexManager from "./KnexConnection";
+export { KnexManager };

package/src/interfaces/auth/auth.interfaces.ts

@@ -1,11 +1,11 @@
 export interface IAuth {
-    id: number;
-    userId: number;
-    password: string;
-    twofaEnabled: boolean;
-    twofaSecret: string | null;
-    emailToken: string | null;
-    emailVerified: boolean;
-    created_at: string;
-    updated_at: string;
-}
+  id: number;
+  userId: number;
+  password: string;
+  twofaEnabled: boolean;
+  twofaSecret: string | null;
+  emailToken: string | null;
+  emailVerified: boolean;
+  created_at: string;
+  updated_at: string;
+}

package/src/interfaces/chat/chat.interfaces.ts

@@ -3,7 +3,7 @@ export interface IChat {
   uuid?: string;
   userId: number;
   title: string;
-  status?: 'active' | 'archived';
+  status?: "active" | "archived";
   created_at?: Date;
   updated_at?: Date;
 }
@@ -11,10 +11,10 @@ export interface IChat {
 export interface IChatCreate {
   userId: number;
   title: string;
-  status?: 'active' | 'archived';
+  status?: "active" | "archived";
 }
 
 export interface IChatUpdate {
   title?: string;
-  status?: 'active' | 'archived';
-}
+  status?: "active" | "archived";
+}

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

@@ -1,13 +1,13 @@
-import type { IStudy } from "../study/study.interfaces";
-
-export interface IFolder {
-  id: number;
-  uuid: string;
-  name: string;
-  createdBy: number; // user.id
-  status: 'UPLOADING' | 'COMPLETE';
-  studyId: number; // study.id
-  created_at: string;
-  updated_at: string;
-  study?: IStudy;
-}
+import type { IStudy } from "../study/study.interfaces";
+
+export interface IFolder {
+  id: number;
+  uuid: string;
+  name: string;
+  createdBy: number; // user.id
+  status: "UPLOADING" | "COMPLETE";
+  studyId: number; // study.id
+  created_at: string;
+  updated_at: string;
+  study?: IStudy;
+}

package/src/interfaces/message/message.interfaces.ts

@@ -1,7 +1,7 @@
 export interface IMessage {
   id?: number;
   chatId: number;
-  role: 'user' | 'assistant';
+  role: "user" | "assistant";
   content: string;
   created_at?: Date;
   updated_at?: Date;
@@ -9,10 +9,10 @@ export interface IMessage {
 
 export interface IMessageCreate {
   chatId: number;
-  role: 'user' | 'assistant';
+  role: "user" | "assistant";
   content: string;
 }
 
 export interface IMessageUpdate {
   content?: string;
-}
+}

package/src/interfaces/study/study.interfaces.ts

@@ -1,12 +1,12 @@
-import type { IUser } from "../user/user.interfaces";
-
-export interface IStudy {
-  id: number;
-  uuid: string;
-  name: string;
-  createdBy: number;
-  status: 'COMPLETE' | 'IN PROGRESS' | 'FAILED';
-  created_at: string;
-  updated_at: string;
-  user?: IUser;
-}
+import type { IUser } from "../user/user.interfaces";
+
+export interface IStudy {
+  id: number;
+  uuid: string;
+  name: string;
+  createdBy: number;
+  status: "COMPLETE" | "IN PROGRESS" | "FAILED";
+  created_at: string;
+  updated_at: string;
+  user?: IUser;
+}

package/src/interfaces/user/user.interfaces.ts

@@ -1,11 +1,11 @@
-export interface IUser {
-    id: number;
-    uuid: string;
-    email: string;
-    nombre: string;
-    role: 'ADMIN' | 'USER';
-    profilePhoto?: string;
-    company?: string;
-    created_at: string;
-    updated_at: string;
-}
+export interface IUser {
+  id: number;
+  uuid: string;
+  email: string;
+  nombre: string;
+  role: "ADMIN" | "USER";
+  profilePhoto?: string;
+  company?: string;
+  created_at: string;
+  updated_at: string;
+}

package/src/interfaces/user-push-notification-token/user-push-notification-token.interfaces.ts

@@ -1,10 +1,10 @@
 export interface IUserPushNotificationToken {
-    id: number;
-    userId: number;
-    token: string;
-    available: boolean;
-    token_type: 'expo' | 'native';
-    device_type?: string;
-    created_at: string;
-    updated_at: string;
-}
+  id: number;
+  userId: number;
+  token: string;
+  available: boolean;
+  token_type: "expo" | "native";
+  device_type?: string;
+  created_at: string;
+  updated_at: string;
+}

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

@@ -1,21 +1,31 @@
-import type { IFolder } from "../folder/folder.interfaces";
-
-export interface IVideo {
-    id: number;
-    uuid: string;
-    folderId: number;
-    name: string;
-    videoLocation: string;
-    videoOutputLocation: string | null;
-    generateVideoOutput: boolean;
-    videoRate: number;
-    videoType: 'TMC' | 'ATR' | 'JUNCTION' | 'ROUNDABOUT' | 'PATHWAY';
-    metadata: Record<string, any>;
-    status: 'QUEUED' | 'PROCESSING' | 'COMPLETED' | 'FAILED' | 'PENDING';
-    progress: number;
-    remainingTime: string;
-    results: Record<string, any>;
-    created_at: string;
-    updated_at: string;
-    folder?: IFolder;
-}
+import type { IFolder } from "../folder/folder.interfaces";
+
+export interface IVideo {
+  id: number;
+  uuid: string;
+  folderId: number;
+  name: string;
+  videoLocation: string;
+  videoOutputLocation: string | null;
+  generateVideoOutput: boolean;
+  videoRate: number;
+  videoType: "TMC" | "ATR" | "JUNCTION" | "ROUNDABOUT" | "PATHWAY";
+  metadata: Record<string, any>;
+  status: "QUEUED" | "PROCESSING" | "COMPLETED" | "FAILED" | "PENDING";
+  progress: number;
+  remainingTime: string;
+  results: Record<string, any>;
+  durationSeconds?: number; // Add optional duration field
+
+  // HLS streaming support
+  isHlsEnabled: boolean;
+  hlsPlaylist: string | null;
+  videoSizeMB: number | null;
+
+  // Enhanced metadata for hybrid streaming
+  streamingMetadata: Record<string, any> | null;
+
+  created_at: string;
+  updated_at: string;
+  folder?: IFolder;
+}