@trafficgroup/knex-rel 0.1.10 → 0.1.11-rc0

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

@@ -3,6 +3,10 @@ import { IBaseDAO, IDataPaginator } from "../../d.types";
 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();
 
@@ -29,7 +33,7 @@ export class ChatDAO implements IBaseDAO<IChat> {
 
   async getAll(page = 1, limit = 10): Promise<IDataPaginator<IChat>> {
     const offset = (page - 1) * limit;
-    
+
     const [results, [{ count }]] = await Promise.all([
       this._knex('chat')
         .orderBy('created_at', 'desc')
@@ -70,7 +74,7 @@ export class ChatDAO implements IBaseDAO<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)
@@ -94,23 +98,38 @@ export class ChatDAO implements IBaseDAO<IChat> {
     };
   }
 
-  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')
+      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,
@@ -118,7 +137,8 @@ export class ChatDAO implements IBaseDAO<IChat> {
       limit,
       count: results.length,
       totalCount,
-      totalPages: Math.ceil(totalCount / limit)
+      totalPages,
+      hasMore
     };
   }
 }

package/src/index.ts

@@ -2,7 +2,7 @@
 export { AuthDAO } from "./dao/auth/auth.dao";
 export { BatchDAO } from "./dao/batch/batch.dao";
 export { CameraDAO } from "./dao/camera/camera.dao";
-export { ChatDAO } from "./dao/chat/chat.dao";
+export { ChatDAO, IChatPaginatorResponse } from "./dao/chat/chat.dao";
 export { FolderDAO } from "./dao/folder/folder.dao";
 export { LocationDAO } from "./dao/location/location.dao";
 export { MessageDAO } from "./dao/message/message.dao";

package/.env.prod

@@ -1,5 +0,0 @@
-SQL_DB_NAME=traffic_prod
-SQL_HOST=traffic-prod-db.c8rsu6oewn72.us-east-1.rds.amazonaws.com
-SQL_PASSWORD="RqSdB%UhIHaU5hN#"
-SQL_PORT=5432
-SQL_USER=postgres