@trafficgroup/knex-rel 0.1.9 → 0.1.11-rc0

package/src/dao/batch/batch.dao.ts

@@ -4,118 +4,115 @@ import { IBatch } from "../../interfaces/batch/batch.interfaces";
 import KnexManager from "../../KnexConnection";
 
 export class BatchDAO implements IBaseDAO<IBatch> {
-  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
 
-  async create(item: IBatch): Promise<IBatch> {
-    const [createdBatch] = await this._knex("video_batch")
-      .insert(item)
-      .returning("*");
-    return createdBatch;
-  }
+    async create(item: IBatch): Promise<IBatch> {
+        const [createdBatch] = await this._knex("video_batch").insert(item).returning("*");
+        return createdBatch;
+    }
 
-  async getById(id: number): Promise<IBatch | null> {
-    const batch = await this._knex("video_batch as b")
-      .innerJoin("folders as f", "b.folderId", "f.id")
-      .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
-      .where("b.id", id)
-      .first();
-    return batch || null;
-  }
+    async getById(id: number): Promise<IBatch | null> {
+        const batch = await this._knex("video_batch as b")
+            .innerJoin("folders as f", "b.folderId", "f.id")
+            .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
+            .where("b.id", id)
+            .first();
+        return batch || null;
+    }
 
-  async getByUuid(uuid: string): Promise<IBatch | null> {
-    const batch = await this._knex("video_batch as b")
-      .innerJoin("folders as f", "b.folderId", "f.id")
-      .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
-      .where("b.uuid", uuid)
-      .first();
-    return batch || null;
-  }
+    async getByUuid(uuid: string): Promise<IBatch | null> {
+        const batch = await this._knex("video_batch as b")
+            .innerJoin("folders as f", "b.folderId", "f.id")
+            .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
+            .where("b.uuid", uuid)
+            .first();
+        return batch || null;
+    }
 
-  async update(id: number, item: Partial<IBatch>): Promise<IBatch | null> {
-    const [updatedBatch] = await this._knex("video_batch")
-      .where({ id })
-      .update(item)
-      .returning("*");
-    return updatedBatch || null;
-  }
+    async update(id: number, item: Partial<IBatch>): Promise<IBatch | null> {
+        const [updatedBatch] = await this._knex("video_batch").where({ id }).update(item).returning("*");
+        return updatedBatch || null;
+    }
 
-  async delete(id: number): Promise<boolean> {
-    const result = await this._knex("video_batch").where({ id }).del();
-    return result > 0;
-  }
+    async delete(id: number): Promise<boolean> {
+        const result = await this._knex("video_batch").where({ id }).del();
+        return result > 0;
+    }
 
-  async getAll(
-    page: number,
-    limit: number,
-    folderId?: number | null,
-  ): Promise<IDataPaginator<IBatch>> {
-    const offset = (page - 1) * limit;
+    async getAll(page: number, limit: number, folderId?: number | null): Promise<IDataPaginator<IBatch>> {
+        const offset = (page - 1) * limit;
 
-    const query = this._knex("video_batch as b")
-      .innerJoin("folders as f", "b.folderId", "f.id")
-      .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"));
-    if (folderId !== undefined && folderId !== null) {
-      query.where("b.folderId", folderId);
-    }
+        const query = this._knex("video_batch as b")
+            .innerJoin("folders as f", "b.folderId", "f.id")
+            .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"));
+        if (folderId !== undefined && folderId !== null) {
+            query.where("b.folderId", folderId);
+        }
 
-    const [countResult] = await query.clone().clearSelect().count("* as count");
-    const totalCount = +countResult.count;
-    const batches = await query.clone().limit(limit).offset(offset);
+        const [countResult] = await query.clone().clearSelect().count("* as count");
+        const totalCount = +countResult.count;
+        const batches = await query.clone().limit(limit).offset(offset);
 
-    return {
-      success: true,
-      data: batches,
-      page,
-      limit,
-      count: batches.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
+        return {
+            success: true,
+            data: batches,
+            page,
+            limit,
+            count: batches.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
+    }
 
-  /**
-   * Get batches by folder ID
-   */
-  async getByFolderId(folderId: number): Promise<IBatch[]> {
-    return this._knex("video_batch as b")
-      .innerJoin("folders as f", "b.folderId", "f.id")
-      .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
-      .where("b.folderId", folderId)
-      .orderBy("b.created_at", "desc");
-  }
+    /**
+     * Get batches by folder ID
+     */
+    async getByFolderId(folderId: number): Promise<IBatch[]> {
+        return this._knex("video_batch as b")
+            .innerJoin("folders as f", "b.folderId", "f.id")
+            .select("b.*", this._knex.raw("to_jsonb(f.*) as folder"))
+            .where("b.folderId", folderId)
+            .orderBy("b.created_at", "desc");
+    }
 
-  /**
-   * Update batch progress
-   */
-  async updateProgress(
-    id: number,
-    completedVideos: number,
-    failedVideos: number,
-  ): Promise<void> {
-    await this._knex("video_batch").where({ id }).update({
-      completedVideos,
-      failedVideos,
-      updated_at: this._knex.fn.now(),
-    });
-  }
+    /**
+     * Update batch progress
+     */
+    async updateProgress(
+        id: number,
+        completedVideos: number,
+        failedVideos: number
+    ): Promise<void> {
+        await this._knex("video_batch")
+            .where({ id })
+            .update({
+                completedVideos,
+                failedVideos,
+                updated_at: this._knex.fn.now()
+            });
+    }
 
-  /**
-   * Mark batch as completed
-   */
-  async markCompleted(id: number): Promise<void> {
-    await this._knex("video_batch").where({ id }).update({
-      status: "COMPLETED",
-      updated_at: this._knex.fn.now(),
-    });
-  }
+    /**
+     * Mark batch as completed
+     */
+    async markCompleted(id: number): Promise<void> {
+        await this._knex("video_batch")
+            .where({ id })
+            .update({
+                status: "COMPLETED",
+                updated_at: this._knex.fn.now()
+            });
+    }
 
-  /**
-   * Mark batch as failed
-   */
-  async markFailed(id: number): Promise<void> {
-    await this._knex("video_batch").where({ id }).update({
-      status: "FAILED",
-      updated_at: this._knex.fn.now(),
-    });
-  }
+    /**
+     * Mark batch as failed
+     */
+    async markFailed(id: number): Promise<void> {
+        await this._knex("video_batch")
+            .where({ id })
+            .update({
+                status: "FAILED",
+                updated_at: this._knex.fn.now()
+            });
+    }
 }

package/src/dao/camera/camera.dao.ts

@@ -4,134 +4,131 @@ import { ICamera } from "../../interfaces/camera/camera.interfaces";
 import KnexManager from "../../KnexConnection";
 
 export class CameraDAO implements IBaseDAO<ICamera> {
-  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
-
-  async create(item: ICamera): Promise<ICamera> {
-    const [createdCamera] = await this._knex("cameras")
-      .insert(item)
-      .returning("*");
-    return createdCamera;
-  }
-
-  async getById(id: number): Promise<ICamera | null> {
-    const camera = await this._knex("cameras").where({ id }).first();
-    return camera || null;
-  }
-
-  async getByUuid(uuid: string): Promise<ICamera | null> {
-    const camera = await this._knex("cameras").where({ uuid }).first();
-    return camera || null;
-  }
-
-  async update(id: number, item: Partial<ICamera>): Promise<ICamera | null> {
-    const [updatedCamera] = await this._knex("cameras")
-      .where({ id })
-      .update(item)
-      .returning("*");
-    return updatedCamera || null;
-  }
-
-  async delete(id: number): Promise<boolean> {
-    const result = await this._knex("cameras").where({ id }).del();
-    return result > 0;
-  }
-
-  async getAll(page: number, limit: number): Promise<IDataPaginator<ICamera>> {
-    const offset = (page - 1) * limit;
-
-    const [countResult] = await this._knex("cameras").count("* as count");
-    const totalCount = +countResult.count;
-    const cameras = await this._knex("cameras").limit(limit).offset(offset);
-
-    return {
-      success: true,
-      data: cameras,
-      page,
-      limit,
-      count: cameras.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
-
-  /**
-   * Get cameras for a specific location
-   * @param locationId - The location ID
-   * @param status - Optional filter by camera status
-   */
-  async getCamerasByLocationId(
-    locationId: number,
-    status?: string,
-  ): Promise<ICamera[]> {
-    let query = this._knex("cameras").where("locationId", locationId);
-
-    if (status) {
-      query = query.where("status", status);
+    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+
+    async create(item: ICamera): Promise<ICamera> {
+        const [createdCamera] = await this._knex("cameras").insert(item).returning("*");
+        return createdCamera;
+    }
+
+    async getById(id: number): Promise<ICamera | null> {
+        const camera = await this._knex("cameras").where({ id }).first();
+        return camera || null;
+    }
+
+    async getByUuid(uuid: string): Promise<ICamera | null> {
+        const camera = await this._knex("cameras").where({ uuid }).first();
+        return camera || null;
+    }
+
+    async update(id: number, item: Partial<ICamera>): Promise<ICamera | null> {
+        const [updatedCamera] = await this._knex("cameras").where({ id }).update(item).returning("*");
+        return updatedCamera || null;
+    }
+
+    async delete(id: number): Promise<boolean> {
+        const result = await this._knex("cameras").where({ id }).del();
+        return result > 0;
     }
 
-    return query.orderBy("name", "asc");
-  }
-
-  /**
-   * Get cameras for a specific location with pagination
-   * @param locationId - The location ID
-   * @param page - Page number
-   * @param limit - Items per page
-   * @param status - Optional filter by camera status
-   */
-  async getCamerasByLocationIdPaginated(
-    locationId: number,
-    page: number,
-    limit: number,
-    status?: string,
-  ): Promise<IDataPaginator<ICamera>> {
-    const offset = (page - 1) * limit;
-
-    let query = this._knex("cameras").where("locationId", locationId);
-
-    if (status) {
-      query = query.where("status", status);
+    async getAll(page: number, limit: number): Promise<IDataPaginator<ICamera>> {
+        const offset = (page - 1) * limit;
+
+        const [countResult] = await this._knex("cameras").count("* as count");
+        const totalCount = +countResult.count;
+        const cameras = await this._knex("cameras").limit(limit).offset(offset);
+
+        return {
+            success: true,
+            data: cameras,
+            page,
+            limit,
+            count: cameras.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
     }
 
-    const [countResult] = await query.clone().count("* as count");
-    const totalCount = +countResult.count;
-    const cameras = await query
-      .clone()
-      .limit(limit)
-      .offset(offset)
-      .orderBy("name", "asc");
-
-    return {
-      success: true,
-      data: cameras,
-      page,
-      limit,
-      count: cameras.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
-
-  /**
-   * Check if a camera name already exists for a location
-   * @param name - Camera name
-   * @param locationId - Location ID
-   * @param excludeId - Optional camera ID to exclude (for update operations)
-   */
-  async existsByNameAndLocation(
-    name: string,
-    locationId: number,
-    excludeId?: number,
-  ): Promise<boolean> {
-    let query = this._knex("cameras")
-      .where("locationId", locationId)
-      .where("name", name);
-
-    if (excludeId !== undefined) {
-      query = query.whereNot("id", excludeId);
+    /**
+     * Get cameras for a specific location
+     * @param locationId - The location ID
+     * @param status - Optional filter by camera status
+     */
+    async getCamerasByLocationId(
+        locationId: number,
+        status?: string
+    ): Promise<ICamera[]> {
+        let query = this._knex("cameras")
+            .where("locationId", locationId);
+
+        if (status) {
+            query = query.where("status", status);
+        }
+
+        return query.orderBy("name", "asc");
     }
 
-    const result = await query.first();
-    return result !== null && result !== undefined;
-  }
+    /**
+     * Get cameras for a specific location with pagination
+     * @param locationId - The location ID
+     * @param page - Page number
+     * @param limit - Items per page
+     * @param status - Optional filter by camera status
+     */
+    async getCamerasByLocationIdPaginated(
+        locationId: number,
+        page: number,
+        limit: number,
+        status?: string
+    ): Promise<IDataPaginator<ICamera>> {
+        const offset = (page - 1) * limit;
+
+        let query = this._knex("cameras")
+            .where("locationId", locationId);
+
+        if (status) {
+            query = query.where("status", status);
+        }
+
+        const [countResult] = await query.clone().count("* as count");
+        const totalCount = +countResult.count;
+        const cameras = await query
+            .clone()
+            .limit(limit)
+            .offset(offset)
+            .orderBy("name", "asc");
+
+        return {
+            success: true,
+            data: cameras,
+            page,
+            limit,
+            count: cameras.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit)
+        };
+    }
+
+    /**
+     * Check if a camera name already exists for a location
+     * @param name - Camera name
+     * @param locationId - Location ID
+     * @param excludeId - Optional camera ID to exclude (for update operations)
+     */
+    async existsByNameAndLocation(
+        name: string,
+        locationId: number,
+        excludeId?: number
+    ): Promise<boolean> {
+        let query = this._knex("cameras")
+            .where("locationId", locationId)
+            .where("name", name);
+
+        if (excludeId !== undefined) {
+            query = query.whereNot("id", excludeId);
+        }
+
+        const result = await query.first();
+        return result !== null && result !== undefined;
+    }
 }

package/src/dao/chat/chat.dao.ts

@@ -1,27 +1,33 @@
 import { Knex } from "knex";
 import { IBaseDAO, IDataPaginator } from "../../d.types";
-import {
-  IChat,
-  IChatCreate,
-  IChatUpdate,
-} from "../../interfaces/chat/chat.interfaces";
+import { IChat, IChatCreate, IChatUpdate } from '../../interfaces/chat/chat.interfaces';
 import KnexManager from "../../KnexConnection";
 
+export interface IChatPaginatorResponse extends IDataPaginator<IChat> {
+  hasMore: boolean;
+}
+
 export class ChatDAO implements IBaseDAO<IChat> {
   private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
 
   async create(item: IChatCreate): Promise<IChat> {
-    const [result] = await this._knex("chat").insert(item).returning("*");
+    const [result] = await this._knex('chat')
+      .insert(item)
+      .returning('*');
     return result;
   }
 
   async getById(id: number): Promise<IChat | null> {
-    const result = await this._knex("chat").where("id", id).first();
+    const result = await this._knex('chat')
+      .where('id', id)
+      .first();
     return result || null;
   }
 
   async getByUuid(uuid: string): Promise<IChat | null> {
-    const result = await this._knex("chat").where("uuid", uuid).first();
+    const result = await this._knex('chat')
+      .where('uuid', uuid)
+      .first();
     return result || null;
   }
 
@@ -29,11 +35,11 @@ export class ChatDAO implements IBaseDAO<IChat> {
     const offset = (page - 1) * limit;
 
     const [results, [{ count }]] = await Promise.all([
-      this._knex("chat")
-        .orderBy("created_at", "desc")
+      this._knex('chat')
+        .orderBy('created_at', 'desc')
         .limit(limit)
         .offset(offset),
-      this._knex("chat").count("* as count"),
+      this._knex('chat').count('* as count')
     ]);
 
     const totalCount = parseInt(count as string);
@@ -44,40 +50,40 @@ export class ChatDAO implements IBaseDAO<IChat> {
       limit,
       count: results.length,
       totalCount,
-      totalPages: Math.ceil(totalCount / limit),
+      totalPages: Math.ceil(totalCount / limit)
     };
   }
 
   async update(id: number, item: IChatUpdate): Promise<IChat | null> {
-    const [result] = await this._knex("chat")
-      .where("id", id)
+    const [result] = await this._knex('chat')
+      .where('id', id)
       .update({
         ...item,
-        updated_at: new Date(),
+        updated_at: new Date()
       })
-      .returning("*");
+      .returning('*');
     return result || null;
   }
 
   async delete(id: number): Promise<boolean> {
-    const result = await this._knex("chat").where("id", id).delete();
+    const result = await this._knex('chat')
+      .where('id', id)
+      .delete();
     return result > 0;
   }
 
-  async getByUserId(
-    userId: number,
-    page = 1,
-    limit = 10,
-  ): Promise<IDataPaginator<IChat>> {
+  async getByUserId(userId: number, page = 1, limit = 10): Promise<IDataPaginator<IChat>> {
     const offset = (page - 1) * limit;
 
     const [results, [{ count }]] = await Promise.all([
-      this._knex("chat")
-        .where("userId", userId)
-        .orderBy("created_at", "desc")
+      this._knex('chat')
+        .where('userId', userId)
+        .orderBy('created_at', 'desc')
         .limit(limit)
         .offset(offset),
-      this._knex("chat").where("userId", userId).count("* as count"),
+      this._knex('chat')
+        .where('userId', userId)
+        .count('* as count')
     ]);
 
     const totalCount = parseInt(count as string);
@@ -88,31 +94,42 @@ export class ChatDAO implements IBaseDAO<IChat> {
       limit,
       count: results.length,
       totalCount,
-      totalPages: Math.ceil(totalCount / limit),
+      totalPages: Math.ceil(totalCount / limit)
     };
   }
 
-  async getActiveByUserId(
-    userId: number,
-    page = 1,
-    limit = 10,
-  ): Promise<IDataPaginator<IChat>> {
+  async getActiveByUserId(userId: number, page = 1, limit = 10, query?: string): Promise<IChatPaginatorResponse> {
     const offset = (page - 1) * limit;
 
+    // Build data query
+    let dataQuery = this._knex('chat')
+      .where('userId', userId)
+      .where('status', 'active');
+
+    // Build count query
+    let countQuery = this._knex('chat')
+      .where('userId', userId)
+      .where('status', 'active');
+
+    // Apply search filter if query is provided
+    if (query && query.trim()) {
+      const searchTerm = `%${query.trim()}%`;
+      dataQuery = dataQuery.where('title', 'ILIKE', searchTerm);
+      countQuery = countQuery.where('title', 'ILIKE', searchTerm);
+    }
+
     const [results, [{ count }]] = await Promise.all([
-      this._knex("chat")
-        .where("userId", userId)
-        .where("status", "active")
-        .orderBy("created_at", "desc")
+      dataQuery
+        .orderBy('created_at', 'desc')
         .limit(limit)
         .offset(offset),
-      this._knex("chat")
-        .where("userId", userId)
-        .where("status", "active")
-        .count("* as count"),
+      countQuery.count('* as count')
     ]);
 
     const totalCount = parseInt(count as string);
+    const totalPages = Math.ceil(totalCount / limit);
+    const hasMore = page < totalPages;
+
     return {
       success: true,
       data: results,
@@ -120,7 +137,8 @@ export class ChatDAO implements IBaseDAO<IChat> {
       limit,
       count: results.length,
       totalCount,
-      totalPages: Math.ceil(totalCount / limit),
+      totalPages,
+      hasMore
     };
   }
-}
+}