@trafficgroup/knex-rel 0.1.21 → 0.1.23-rc.0

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

@@ -1,10 +1,6 @@
 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> {
@@ -15,17 +11,23 @@ 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;
   }
 
@@ -33,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);
@@ -48,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);
@@ -92,38 +94,36 @@ 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,
-    query?: string,
-  ): Promise<IChatPaginatorResponse> {
+  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");
+    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");
+    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);
+      dataQuery = dataQuery.where('title', 'ILIKE', searchTerm);
+      countQuery = countQuery.where('title', 'ILIKE', searchTerm);
     }
 
     const [results, [{ count }]] = await Promise.all([
-      dataQuery.orderBy("created_at", "desc").limit(limit).offset(offset),
-      countQuery.count("* as count"),
+      dataQuery
+        .orderBy('created_at', 'desc')
+        .limit(limit)
+        .offset(offset),
+      countQuery.count('* as count')
     ]);
 
     const totalCount = parseInt(count as string);
@@ -138,7 +138,7 @@ export class ChatDAO implements IBaseDAO<IChat> {
       count: results.length,
       totalCount,
       totalPages,
-      hasMore,
+      hasMore
     };
   }
-}
+}

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

@@ -2,128 +2,113 @@ import { Knex } from "knex";
 import { IBaseDAO, IDataPaginator } from "../../d.types";
 import { IFolder } from "../../interfaces/folder/folder.interfaces";
 import KnexManager from "../../KnexConnection";
-import {
-  FolderSortField,
-  FolderStatus,
-  FOLDER_SORT_COLUMN_MAP,
-} from "../../constants/folder.constants";
+import { FolderSortField, FolderStatus, FOLDER_SORT_COLUMN_MAP } from "../../constants/folder.constants";
 import { SortOrder } from "../../constants/video.constants";
 
 export interface IFolderFilters {
-  studyId?: number | null;
-  status?: FolderStatus;
-  search?: string;
-  sortBy?: FolderSortField;
-  sortOrder?: SortOrder;
+    studyId?: number | null;
+    status?: FolderStatus;
+    search?: string;
+    sortBy?: FolderSortField;
+    sortOrder?: SortOrder;
 }
 
 export class FolderDAO implements IBaseDAO<IFolder> {
-  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
 
-  async create(item: IFolder): Promise<IFolder> {
-    const [createdFolder] = await this._knex("folders")
-      .insert(item)
-      .returning("*");
-    return createdFolder;
-  }
+    async create(item: IFolder): Promise<IFolder> {
+        const [createdFolder] = await this._knex("folders").insert(item).returning("*");
+        return createdFolder;
+    }
 
-  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"))
-      .where("f.id", id)
-      .first();
-    return folder || null;
-  }
+    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"))
+            .where("f.id", id)
+            .first();
+        return folder || null;
+    }
 
-  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"))
-      .where("f.uuid", uuid)
-      .first();
-    return folder || null;
-  }
+    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"))
+            .where("f.uuid", uuid)
+            .first();
+        return folder || null;
+    }
 
-  async update(id: number, item: Partial<IFolder>): Promise<IFolder | null> {
-    const [updatedFolder] = await this._knex("folders")
-      .where({ id })
-      .update(item)
-      .returning("*");
-    return updatedFolder || null;
-  }
+    async update(id: number, item: Partial<IFolder>): Promise<IFolder | null> {
+        const [updatedFolder] = await this._knex("folders").where({ id }).update(item).returning("*");
+        return updatedFolder || null;
+    }
 
-  async delete(id: number): Promise<boolean> {
-    const result = await this._knex("folders").where({ id }).del();
-    return result > 0;
-  }
+    async delete(id: number): Promise<boolean> {
+        const result = await this._knex("folders").where({ id }).del();
+        return result > 0;
+    }
 
-  async getAll(
-    page: number,
-    limit: number,
-    filters?: IFolderFilters,
-  ): Promise<IDataPaginator<IFolder>> {
-    const offset = (page - 1) * limit;
+    async getAll(
+        page: number,
+        limit: number,
+        filters?: IFolderFilters
+    ): Promise<IDataPaginator<IFolder>> {
+        const offset = (page - 1) * limit;
 
-    const query = this._knex("folders as f")
-      .innerJoin("study as s", "f.studyId", "s.id")
-      .leftJoin("locations as l", "s.locationId", "l.id")
-      .select(
-        "f.*",
-        this._knex.raw("to_jsonb(s.*) as study"),
-        "l.name as locationName",
-        "l.uuid as locationUuid",
-      );
+        const query = this._knex("folders as f")
+            .innerJoin("study as s", "f.studyId", "s.id")
+            .leftJoin("locations as l", "s.locationId", "l.id")
+            .select(
+                "f.*",
+                this._knex.raw("to_jsonb(s.*) as study"),
+                "l.name as locationName",
+                "l.uuid as locationUuid"
+            );
 
-    // Apply filters
-    if (filters) {
-      // Filter by studyId
-      if (filters.studyId !== undefined && filters.studyId !== null) {
-        query.where("f.studyId", filters.studyId);
-      }
+        // Apply filters
+        if (filters) {
+            // Filter by studyId
+            if (filters.studyId !== undefined && filters.studyId !== null) {
+                query.where("f.studyId", filters.studyId);
+            }
 
-      // Filter by status
-      if (filters.status) {
-        query.where("f.status", filters.status);
-      }
+            // Filter by status
+            if (filters.status) {
+                query.where("f.status", filters.status);
+            }
 
-      // Search by name (case-insensitive)
-      if (filters.search) {
-        query.whereRaw("LOWER(f.name) LIKE ?", [
-          `%${filters.search.toLowerCase()}%`,
-        ]);
-      }
+            // Search by name (case-insensitive)
+            if (filters.search) {
+                query.whereRaw("LOWER(f.name) LIKE ?", [`%${filters.search.toLowerCase()}%`]);
+            }
 
-      // Apply sorting
-      if (filters.sortBy) {
-        const columnName = FOLDER_SORT_COLUMN_MAP[filters.sortBy];
-        const order = filters.sortOrder || "DESC";
-        query.orderBy(columnName, order);
-      } else {
-        // Default sort by created_at DESC
-        query.orderBy("f.created_at", "DESC");
-      }
-    } else {
-      // Default sort by created_at DESC
-      query.orderBy("f.created_at", "DESC");
-    }
+            // Apply sorting
+            if (filters.sortBy) {
+                const columnName = FOLDER_SORT_COLUMN_MAP[filters.sortBy];
+                const order = filters.sortOrder || 'DESC';
+                query.orderBy(columnName, order);
+            } else {
+                // Default sort by created_at DESC
+                query.orderBy('f.created_at', 'DESC');
+            }
+        } else {
+            // Default sort by created_at DESC
+            query.orderBy('f.created_at', 'DESC');
+        }
 
-    const [countResult] = await query
-      .clone()
-      .clearSelect()
-      .clearOrder()
-      .count("* as count");
-    const totalCount = +countResult.count;
-    const folders = await query.clone().limit(limit).offset(offset);
+        const [countResult] = await query.clone().clearSelect().clearOrder().count("* as count");
+        const totalCount = +countResult.count;
+        const folders = await query.clone().limit(limit).offset(offset);
 
-    return {
-      success: true,
-      data: folders,
-      page,
-      limit,
-      count: folders.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
+        return {
+            success: true,
+            data: folders,
+            page,
+            limit,
+            count: folders.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
+    }
 }

package/src/dao/location/location.dao.ts

@@ -5,119 +5,97 @@ import { IVideo } from "../../interfaces/video/video.interfaces";
 import KnexManager from "../../KnexConnection";
 
 export class LocationDAO implements IBaseDAO<ILocation> {
-  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
-
-  async create(item: ILocation): Promise<ILocation> {
-    const [createdLocation] = await this._knex("locations")
-      .insert(item)
-      .returning("*");
-    return createdLocation;
-  }
-
-  async getById(id: number): Promise<ILocation | null> {
-    const location = await this._knex("locations").where({ id }).first();
-    return location || null;
-  }
-
-  async getByUuid(uuid: string): Promise<ILocation | null> {
-    const location = await this._knex("locations").where({ uuid }).first();
-    return location || null;
-  }
-
-  async update(
-    id: number,
-    item: Partial<ILocation>,
-  ): Promise<ILocation | null> {
-    const [updatedLocation] = await this._knex("locations")
-      .where({ id })
-      .update(item)
-      .returning("*");
-    return updatedLocation || null;
-  }
-
-  async delete(id: number): Promise<boolean> {
-    const result = await this._knex("locations").where({ id }).del();
-    return result > 0;
-  }
-
-  async getAll(
-    page: number,
-    limit: number,
-  ): Promise<IDataPaginator<ILocation>> {
-    const offset = (page - 1) * limit;
-
-    const [countResult] = await this._knex("locations").count("* as count");
-    const totalCount = +countResult.count;
-    const locations = await this._knex("locations").limit(limit).offset(offset);
-
-    return {
-      success: true,
-      data: locations,
-      page,
-      limit,
-      count: locations.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
-
-  async getByName(name: string): Promise<ILocation | null> {
-    const location = await this._knex("locations").where({ name }).first();
-    return location || null;
-  }
-
-  async getLocationsNearCoordinates(
-    longitude: number,
-    latitude: number,
-    radiusKm: number = 1,
-  ): Promise<ILocation[]> {
-    // Using ST_DWithin for geographic distance calculation
-    // This is a PostgreSQL-specific query for geospatial operations
-    const locations = await this._knex("locations").whereRaw(
-      `ST_DWithin(
+    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+
+    async create(item: ILocation): Promise<ILocation> {
+        const [createdLocation] = await this._knex("locations").insert(item).returning("*");
+        return createdLocation;
+    }
+
+    async getById(id: number): Promise<ILocation | null> {
+        const location = await this._knex("locations").where({ id }).first();
+        return location || null;
+    }
+
+    async getByUuid(uuid: string): Promise<ILocation | null> {
+        const location = await this._knex("locations").where({ uuid }).first();
+        return location || null;
+    }
+
+    async update(id: number, item: Partial<ILocation>): Promise<ILocation | null> {
+        const [updatedLocation] = await this._knex("locations").where({ id }).update(item).returning("*");
+        return updatedLocation || null;
+    }
+
+    async delete(id: number): Promise<boolean> {
+        const result = await this._knex("locations").where({ id }).del();
+        return result > 0;
+    }
+
+    async getAll(page: number, limit: number): Promise<IDataPaginator<ILocation>> {
+        const offset = (page - 1) * limit;
+
+        const [countResult] = await this._knex("locations").count("* as count");
+        const totalCount = +countResult.count;
+        const locations = await this._knex("locations").limit(limit).offset(offset);
+
+        return {
+            success: true,
+            data: locations,
+            page,
+            limit,
+            count: locations.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
+    }
+
+    async getByName(name: string): Promise<ILocation | null> {
+        const location = await this._knex("locations").where({ name }).first();
+        return location || null;
+    }
+
+    async getLocationsNearCoordinates(longitude: number, latitude: number, radiusKm: number = 1): Promise<ILocation[]> {
+        // Using ST_DWithin for geographic distance calculation
+        // This is a PostgreSQL-specific query for geospatial operations
+        const locations = await this._knex("locations")
+            .whereRaw(
+                `ST_DWithin(
                     ST_MakePoint(longitude, latitude)::geography,
                     ST_MakePoint(?, ?)::geography,
                     ?
                 )`,
-      [longitude, latitude, radiusKm * 1000], // Convert km to meters
-    );
-    return locations;
-  }
-
-  /**
-   * Get all locations with optional search filter by name (case-insensitive partial match)
-   */
-  async getAllWithSearch(
-    page: number,
-    limit: number,
-    name?: string,
-  ): Promise<IDataPaginator<ILocation>> {
-    const offset = (page - 1) * limit;
-
-    let query = this._knex("locations");
-
-    // Apply search filter if name provided (escape special chars to prevent pattern injection)
-    if (name && name.trim().length > 0) {
-      const escapedName = name.trim().replace(/[%_\\]/g, "\\$&");
-      query = query.where("name", "ilike", `%${escapedName}%`);
+                [longitude, latitude, radiusKm * 1000] // Convert km to meters
+            );
+        return locations;
     }
 
-    const [countResult] = await query.clone().count("* as count");
-    const totalCount = +countResult.count;
-    const locations = await query
-      .clone()
-      .limit(limit)
-      .offset(offset)
-      .orderBy("name", "asc");
-
-    return {
-      success: true,
-      data: locations,
-      page,
-      limit,
-      count: locations.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
+    /**
+     * Get all locations with optional search filter by name (case-insensitive partial match)
+     */
+    async getAllWithSearch(page: number, limit: number, name?: string): Promise<IDataPaginator<ILocation>> {
+        const offset = (page - 1) * limit;
+
+        let query = this._knex("locations");
+
+        // Apply search filter if name provided (escape special chars to prevent pattern injection)
+        if (name && name.trim().length > 0) {
+            const escapedName = name.trim().replace(/[%_\\]/g, '\\$&');
+            query = query.where('name', 'ilike', `%${escapedName}%`);
+        }
+
+        const [countResult] = await query.clone().count("* as count");
+        const totalCount = +countResult.count;
+        const locations = await query.clone().limit(limit).offset(offset).orderBy('name', 'asc');
+
+        return {
+            success: true,
+            data: locations,
+            page,
+            limit,
+            count: locations.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
+    }
 }