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

package/migrations/20250911000000_migration.ts

@@ -4,11 +4,7 @@ export async function up(knex: Knex): Promise<void> {
   // Create cameras table
   await knex.schema.createTable("cameras", (table) => {
     table.increments("id").primary();
-    table
-      .uuid("uuid")
-      .defaultTo(knex.raw("uuid_generate_v4()"))
-      .notNullable()
-      .unique();
+    table.uuid("uuid").defaultTo(knex.raw("uuid_generate_v4()")).notNullable().unique();
     table.string("name", 100).notNullable();
     table.decimal("longitude", 10, 7).notNullable();
     table.decimal("latitude", 10, 7).notNullable();
@@ -20,23 +16,13 @@ export async function up(knex: Knex): Promise<void> {
 
   // Add cameraId to videos table
   await knex.schema.alterTable("video", (table) => {
-    table
-      .integer("cameraId")
-      .nullable()
-      .references("id")
-      .inTable("cameras")
-      .onDelete("SET NULL");
+    table.integer("cameraId").nullable().references("id").inTable("cameras").onDelete("SET NULL");
     table.index(["cameraId"]);
   });
 
   // Add cameraId to folders table
   await knex.schema.alterTable("folders", (table) => {
-    table
-      .integer("cameraId")
-      .nullable()
-      .references("id")
-      .inTable("cameras")
-      .onDelete("SET NULL");
+    table.integer("cameraId").nullable().references("id").inTable("cameras").onDelete("SET NULL");
     table.index(["cameraId"]);
   });
 }
@@ -58,4 +44,4 @@ export async function down(knex: Knex): Promise<void> {
 
   // Drop cameras table
   await knex.schema.dropTable("cameras");
-}
+}

package/migrations/20250917144153_migration.ts

@@ -3,35 +3,28 @@ import type { Knex } from "knex";
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.alterTable("video", (table) => {
     // Add annotationSourceId column with foreign key to video table
-    table
-      .integer("annotationSourceId")
+    table.integer("annotationSourceId")
       .nullable()
       .references("id")
       .inTable("video")
       .onDelete("SET NULL");
-
+    
     // Add index for performance when querying by annotation source
     table.index(["annotationSourceId"], "idx_video_annotation_source_id");
-
+    
     // Add composite index for efficient template lookups
-    table.index(
-      ["folderId", "videoType", "status"],
-      "idx_video_template_lookup",
-    );
+    table.index(["folderId", "videoType", "status"], "idx_video_template_lookup");
   });
 }
 
 export async function down(knex: Knex): Promise<void> {
   await knex.schema.alterTable("video", (table) => {
     // Drop indexes first
-    table.dropIndex(
-      ["folderId", "videoType", "status"],
-      "idx_video_template_lookup",
-    );
+    table.dropIndex(["folderId", "videoType", "status"], "idx_video_template_lookup");
     table.dropIndex(["annotationSourceId"], "idx_video_annotation_source_id");
-
+    
     // Drop foreign key and column
     table.dropForeign(["annotationSourceId"]);
     table.dropColumn("annotationSourceId");
   });
-}
+}

package/migrations/20250930200521_migration.ts

@@ -4,11 +4,7 @@ export async function up(knex: Knex): Promise<void> {
   // Create report_configurations table
   await knex.schema.createTable("report_configurations", (table) => {
     table.increments("id").primary();
-    table
-      .uuid("uuid")
-      .notNullable()
-      .unique()
-      .defaultTo(knex.raw("uuid_generate_v4()"));
+    table.uuid("uuid").notNullable().unique().defaultTo(knex.raw("uuid_generate_v4()"));
     table.string("name", 30).notNullable().unique();
     table.text("description");
     table.jsonb("configuration").notNullable();
@@ -34,9 +30,9 @@ export async function up(knex: Knex): Promise<void> {
       customClasses: [
         { name: "Cars", fhwaClasses: [1, 2, 3] },
         { name: "Medium Trucks", fhwaClasses: [5] },
-        { name: "Heavy Trucks", fhwaClasses: [4, 6, 7, 8, 9, 10, 11, 12, 13] },
-      ],
-    }),
+        { name: "Heavy Trucks", fhwaClasses: [4, 6, 7, 8, 9, 10, 11, 12, 13] }
+      ]
+    })
   });
 }
 

package/migrations/20251010143500_migration.ts

@@ -5,12 +5,7 @@ export async function up(knex: Knex): Promise<void> {
   const studyHasCamera = await knex.schema.hasColumn("study", "cameraId");
   if (!studyHasCamera) {
     await knex.schema.alterTable("study", (table) => {
-      table
-        .integer("cameraId")
-        .nullable()
-        .references("id")
-        .inTable("cameras")
-        .onDelete("SET NULL");
+      table.integer("cameraId").nullable().references("id").inTable("cameras").onDelete("SET NULL");
       table.index(["cameraId"]);
     });
   }
@@ -18,9 +13,7 @@ export async function up(knex: Knex): Promise<void> {
   // 2. Remove cameraId from video table
   const videoHasCamera = await knex.schema.hasColumn("video", "cameraId");
   if (videoHasCamera) {
-    await knex.raw(
-      `ALTER TABLE video DROP CONSTRAINT IF EXISTS video_cameraid_foreign`,
-    );
+    await knex.raw(`ALTER TABLE video DROP CONSTRAINT IF EXISTS video_cameraid_foreign`);
     await knex.raw(`DROP INDEX IF EXISTS video_cameraid_index`);
     await knex.schema.alterTable("video", (table) => {
       table.dropColumn("cameraId");
@@ -30,9 +23,7 @@ export async function up(knex: Knex): Promise<void> {
   // 3. Remove cameraId from folders table
   const foldersHasCamera = await knex.schema.hasColumn("folders", "cameraId");
   if (foldersHasCamera) {
-    await knex.raw(
-      `ALTER TABLE folders DROP CONSTRAINT IF EXISTS folders_cameraid_foreign`,
-    );
+    await knex.raw(`ALTER TABLE folders DROP CONSTRAINT IF EXISTS folders_cameraid_foreign`);
     await knex.raw(`DROP INDEX IF EXISTS folders_cameraid_index`);
     await knex.schema.alterTable("folders", (table) => {
       table.dropColumn("cameraId");
@@ -45,12 +36,7 @@ export async function down(knex: Knex): Promise<void> {
   const foldersHasCamera = await knex.schema.hasColumn("folders", "cameraId");
   if (!foldersHasCamera) {
     await knex.schema.alterTable("folders", (table) => {
-      table
-        .integer("cameraId")
-        .nullable()
-        .references("id")
-        .inTable("cameras")
-        .onDelete("SET NULL");
+      table.integer("cameraId").nullable().references("id").inTable("cameras").onDelete("SET NULL");
       table.index(["cameraId"]);
     });
   }
@@ -59,12 +45,7 @@ export async function down(knex: Knex): Promise<void> {
   const videoHasCamera = await knex.schema.hasColumn("video", "cameraId");
   if (!videoHasCamera) {
     await knex.schema.alterTable("video", (table) => {
-      table
-        .integer("cameraId")
-        .nullable()
-        .references("id")
-        .inTable("cameras")
-        .onDelete("SET NULL");
+      table.integer("cameraId").nullable().references("id").inTable("cameras").onDelete("SET NULL");
       table.index(["cameraId"]);
     });
   }
@@ -72,9 +53,7 @@ export async function down(knex: Knex): Promise<void> {
   // 3. Remove cameraId from study table
   const studyHasCamera = await knex.schema.hasColumn("study", "cameraId");
   if (studyHasCamera) {
-    await knex.raw(
-      `ALTER TABLE study DROP CONSTRAINT IF EXISTS study_cameraid_foreign`,
-    );
+    await knex.raw(`ALTER TABLE study DROP CONSTRAINT IF EXISTS study_cameraid_foreign`);
     await knex.raw(`DROP INDEX IF EXISTS study_cameraid_index`);
     await knex.schema.alterTable("study", (table) => {
       table.dropColumn("cameraId");

package/migrations/20251020225758_migration.ts

@@ -13,49 +13,28 @@ import type { Knex } from "knex";
 export async function up(knex: Knex): Promise<void> {
   // Step 1: Create video_batch table with proper id/uuid pattern
   await knex.schema.createTable("video_batch", (table) => {
-    table
-      .increments("id")
-      .primary()
+    table.increments("id").primary()
       .comment("Primary key for internal foreign key relationships");
 
-    table
-      .uuid("uuid")
-      .notNullable()
-      .unique()
-      .defaultTo(knex.raw("uuid_generate_v4()"))
+    table.uuid("uuid").notNullable().unique().defaultTo(knex.raw('uuid_generate_v4()'))
       .comment("UUID for external API communication");
 
-    table
-      .integer("folderId")
-      .unsigned()
-      .notNullable()
-      .references("id")
-      .inTable("folders")
-      .onDelete("CASCADE")
+    table.integer("folderId").unsigned().notNullable()
+      .references("id").inTable("folders").onDelete("CASCADE")
       .comment("Foreign key to folders table");
 
-    table
-      .enu("status", ["PENDING", "IN_PROGRESS", "COMPLETED", "FAILED"])
+    table.enu("status", ["PENDING", "IN_PROGRESS", "COMPLETED", "FAILED"])
       .notNullable()
       .defaultTo("PENDING")
       .comment("Status of the batch upload");
 
-    table
-      .integer("totalVideos")
-      .notNullable()
-      .defaultTo(0)
+    table.integer("totalVideos").notNullable().defaultTo(0)
       .comment("Total number of videos in batch");
 
-    table
-      .integer("completedVideos")
-      .notNullable()
-      .defaultTo(0)
+    table.integer("completedVideos").notNullable().defaultTo(0)
       .comment("Number of successfully created videos");
 
-    table
-      .integer("failedVideos")
-      .notNullable()
-      .defaultTo(0)
+    table.integer("failedVideos").notNullable().defaultTo(0)
       .comment("Number of failed videos");
 
     table.timestamps(true, true);
@@ -63,32 +42,17 @@ export async function up(knex: Knex): Promise<void> {
 
   // Step 2: Add recording time, trimming, and batch columns to video table
   await knex.schema.alterTable("video", (table) => {
-    table
-      .timestamp("recordingStartedAt", { useTz: true })
-      .nullable()
+    table.timestamp("recordingStartedAt", { useTz: true }).nullable()
       .comment("Recording start time in UTC - null for backward compatibility");
 
-    table
-      .boolean("trimEnabled")
-      .notNullable()
-      .defaultTo(false)
+    table.boolean("trimEnabled").notNullable().defaultTo(false)
       .comment("Whether video trimming is enabled");
 
-    table
-      .jsonb("trimPeriods")
-      .nullable()
-      .comment(
-        "Array of trim periods with startTime and endTime in ISO 8601 format",
-      );
-
-    table
-      .integer("batchId")
-      .unsigned()
-      .nullable()
-      .references("id")
-      .inTable("video_batch")
-      .withKeyName("fk_video_batch")
-      .onDelete("SET NULL")
+    table.jsonb("trimPeriods").nullable()
+      .comment("Array of trim periods with startTime and endTime in ISO 8601 format");
+
+    table.integer("batchId").unsigned().nullable()
+      .references("id").inTable("video_batch").withKeyName("fk_video_batch").onDelete("SET NULL")
       .comment("Foreign key to video_batch table (numerical ID, NOT UUID)");
   });
 

package/migrations/20251112120000_migration.ts

@@ -29,11 +29,7 @@ export async function up(knex: Knex): Promise<void> {
 
   // 5. Add new foreign key constraint with updated name
   await knex.schema.alterTable("study", (table) => {
-    table
-      .foreign("locationId")
-      .references("id")
-      .inTable("locations")
-      .onDelete("SET NULL");
+    table.foreign("locationId").references("id").inTable("locations").onDelete("SET NULL");
   });
 
   // 6. Drop old index if it exists
@@ -66,11 +62,7 @@ export async function down(knex: Knex): Promise<void> {
 
   // 4. Restore original foreign key constraint
   await knex.schema.alterTable("study", (table) => {
-    table
-      .foreign("cameraId")
-      .references("id")
-      .inTable("locations")
-      .onDelete("SET NULL");
+    table.foreign("cameraId").references("id").inTable("locations").onDelete("SET NULL");
   });
 
   // 5. Restore original index

package/migrations/20251112120200_migration.ts

@@ -9,27 +9,15 @@ import { Knex } from "knex";
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.createTable("cameras", (table) => {
     table.increments("id").primary();
-    table
-      .uuid("uuid")
-      .defaultTo(knex.raw("uuid_generate_v4()"))
-      .unique()
-      .notNullable();
-    table
-      .integer("locationId")
-      .unsigned()
-      .notNullable()
-      .references("id")
-      .inTable("locations")
-      .onDelete("CASCADE");
+    table.uuid("uuid").defaultTo(knex.raw("uuid_generate_v4()")).unique().notNullable();
+    table.integer("locationId").unsigned().notNullable()
+      .references("id").inTable("locations").onDelete("CASCADE");
     table.string("name", 100).notNullable();
     table.text("description").nullable();
-    table
-      .enu("status", ["ACTIVE", "INACTIVE", "MAINTENANCE"], {
-        useNative: true,
-        enumName: "camera_status_enum",
-      })
-      .defaultTo("ACTIVE")
-      .notNullable();
+    table.enu("status", ["ACTIVE", "INACTIVE", "MAINTENANCE"], {
+      useNative: true,
+      enumName: "camera_status_enum"
+    }).defaultTo("ACTIVE").notNullable();
     table.jsonb("metadata").defaultTo("{}").notNullable();
     table.timestamps(true, true);
 

package/migrations/20251112120300_migration.ts

@@ -8,13 +8,8 @@ import { Knex } from "knex";
  */
 export async function up(knex: Knex): Promise<void> {
   await knex.schema.alterTable("video", (table) => {
-    table
-      .integer("cameraId")
-      .unsigned()
-      .nullable()
-      .references("id")
-      .inTable("cameras")
-      .onDelete("SET NULL");
+    table.integer("cameraId").unsigned().nullable()
+      .references("id").inTable("cameras").onDelete("SET NULL");
     table.index(["cameraId"], "video_cameraid_index");
   });
 }

package/migrations/20260109140000_migration.ts

@@ -4,11 +4,7 @@ export async function up(knex: Knex): Promise<void> {
   // Create system_configuration table
   await knex.schema.createTable("system_configuration", (table) => {
     table.increments("id").primary();
-    table
-      .uuid("configUuid")
-      .notNullable()
-      .unique()
-      .defaultTo(knex.raw("uuid_generate_v4()"));
+    table.uuid("configUuid").notNullable().unique().defaultTo(knex.raw("uuid_generate_v4()"));
     table.string("key").notNullable().unique();
     table.text("value").notNullable();
     table.string("dataType").notNullable();
@@ -27,8 +23,7 @@ export async function up(knex: Knex): Promise<void> {
     key: "batch_email_enabled",
     value: "false",
     dataType: "boolean",
-    description:
-      "If it's true, send a single email upon completion of the batch. If it's false, send one email for each video.",
+    description: "If it's true, send a single email upon completion of the batch. If it's false, send one email for each video."
   });
 }
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@trafficgroup/knex-rel",
-  "version": "0.1.21",
+  "version": "0.1.23-rc.0",
   "description": "Knex Module",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
-    "format": "prettier --write .",
+    "format": "prettier --write src/",
     "build": "tsc",
-    "clean": "rimraf dist && npm run format && npm run build",
+    "clean": "rimraf dist && npm run build",
     "npm:publish": "npm run clean && npm publish",
     "migrate:create": "knex migrate:make migration -x ts",
     "migrate:deploy": "knex migrate:latest",

package/src/constants/folder.constants.ts

@@ -3,27 +3,18 @@
  * Shared between DAO and API controller to ensure validation consistency
  */
 
-export const VALID_FOLDER_SORT_FIELDS = [
-  "created_at",
-  "name",
-  "status",
-  "updated_at",
-] as const;
-export type FolderSortField = (typeof VALID_FOLDER_SORT_FIELDS)[number];
+export const VALID_FOLDER_SORT_FIELDS = ['created_at', 'name', 'status', 'updated_at'] as const;
+export type FolderSortField = typeof VALID_FOLDER_SORT_FIELDS[number];
 
-export const VALID_FOLDER_STATUSES = [
-  "UPLOADING",
-  "COMPLETED",
-  "FAILED",
-] as const;
-export type FolderStatus = (typeof VALID_FOLDER_STATUSES)[number];
+export const VALID_FOLDER_STATUSES = ['UPLOADING', 'COMPLETED', 'FAILED'] as const;
+export type FolderStatus = typeof VALID_FOLDER_STATUSES[number];
 
 /**
  * Maps API sort field names to database column names with table aliases
  */
 export const FOLDER_SORT_COLUMN_MAP: Record<FolderSortField, string> = {
-  created_at: "f.created_at",
-  name: "f.name",
-  status: "f.status",
-  updated_at: "f.updated_at",
+    'created_at': 'f.created_at',
+    'name': 'f.name',
+    'status': 'f.status',
+    'updated_at': 'f.updated_at'
 };

package/src/constants/study.constants.ts

@@ -1,5 +1,5 @@
 /**
- * Study sorting constants
+ * Study sorting and filtering constants
  * Shared between DAO and API controller to ensure validation consistency
  */
 

package/src/constants/video.constants.ts

@@ -3,21 +3,17 @@
  * Shared between DAO and API controller to ensure validation consistency
  */
 
-export const VALID_VIDEO_SORT_FIELDS = [
-  "created_at",
-  "name",
-  "status",
-] as const;
-export type VideoSortField = (typeof VALID_VIDEO_SORT_FIELDS)[number];
+export const VALID_VIDEO_SORT_FIELDS = ['created_at', 'name', 'status'] as const;
+export type VideoSortField = typeof VALID_VIDEO_SORT_FIELDS[number];
 
-export const VALID_SORT_ORDERS = ["ASC", "DESC"] as const;
-export type SortOrder = (typeof VALID_SORT_ORDERS)[number];
+export const VALID_SORT_ORDERS = ['ASC', 'DESC'] as const;
+export type SortOrder = typeof VALID_SORT_ORDERS[number];
 
 /**
  * Maps API sort field names to database column names with table aliases
  */
 export const VIDEO_SORT_COLUMN_MAP: Record<VideoSortField, string> = {
-  created_at: "v.created_at",
-  name: "v.name",
-  status: "v.status",
+    'created_at': 'v.created_at',
+    'name': 'v.name',
+    'status': 'v.status'
 };

package/src/d.types.ts

@@ -1,22 +1,18 @@
 export interface IDataPaginator<T> {
-  success: boolean;
-  data: T[];
-  page: number;
-  limit: number;
-  count: number;
-  totalCount: number;
-  totalPages: number;
+    success: boolean;
+    data: T[];
+    page: number;
+    limit: number;
+    count: number;
+    totalCount: number;
+    totalPages: number;
 }
 
 export interface IBaseDAO<T> {
-  create(item: T): Promise<T>;
-  getById(id: number): Promise<T | null>;
-  getByUuid(uuid: string): Promise<T | null>;
-  getAll(
-    page: number,
-    limit: number,
-    entityId?: any | null,
-  ): Promise<IDataPaginator<T>>;
-  update(id: number, item: T): Promise<T | null>;
-  delete(id: number): Promise<boolean>;
-}
+    create(item: T): Promise<T>;
+    getById(id: number): Promise<T | null>;
+    getByUuid(uuid: string): Promise<T | null>;
+    getAll(page: number, limit: number, entityId?: any | null): Promise<IDataPaginator<T>>;
+    update(id: number, item: T): Promise<T | null>;
+    delete(id: number): Promise<boolean>;
+}