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

package/src/dao/VideoMinuteResultDAO.ts

@@ -23,6 +23,14 @@ interface ITMCVehicles {
   [vehicleClass: string]: ITMCDirections;
 }
 
+interface ICrosswalkResults {
+  [crosswalkName: string]: {
+    [entityClass: string]: {
+      [direction: string]: number;
+    };
+  };
+}
+
 interface ITMCResult {
   vehicles: ITMCVehicles;
   counts: {
@@ -33,6 +41,8 @@ interface ITMCResult {
   totalcount: number;
   detected_classes: { [vehicleClass: string]: number };
   study_type: "TMC";
+  crosswalks?: ICrosswalkResults;
+  crosswalk_totals?: { pedestrian: number; bicycle: number };
 }
 
 interface IATRVehicles {
@@ -69,15 +79,15 @@ interface IGroupedResponse {
 }
 
 interface IStudyTimeGroupResult {
-  absoluteTime: string; // ISO 8601 start of bucket
+  absoluteTime: string;      // ISO 8601 start of bucket
   groupIndex: number;
-  startMinute: number; // Start minute number (0-based from video start)
-  endMinute: number; // End minute number (0-based from video start)
-  label: string; // Formatted label
+  startMinute: number;        // Start minute number (0-based from video start)
+  endMinute: number;          // End minute number (0-based from video start)
+  label: string;              // Formatted label
   results: ITMCResult | IATRResult;
   minuteCount: number;
   videoCount: number;
-  contributingVideos: string[]; // Video UUIDs
+  contributingVideos: string[];  // Video UUIDs
 }
 
 interface IGroupedStudyResponse {
@@ -87,7 +97,7 @@ interface IGroupedStudyResponse {
   study: {
     uuid: string;
     name: string;
-    type: "TMC" | "ATR";
+    type: 'TMC' | 'ATR';
     status: string;
   };
   videoCount: number;
@@ -406,11 +416,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
           groupIndex: row.minute_number,
           startMinute: row.minute_number,
           endMinute: row.minute_number,
-          label: this.formatTimeLabel(
-            row.minute_number,
-            row.minute_number,
-            video.recordingStartedAt,
-          ),
+          label: this.formatTimeLabel(row.minute_number, row.minute_number, video.recordingStartedAt),
           results: row.results,
           minuteCount: 1,
         })),
@@ -427,41 +433,37 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
     // Use Knex query builder for safe parameter binding
     const groupingQuery = this.knex(this.tableName)
       .select(
-        this.knex.raw("FLOOR(minute_number / ?) as group_index", [
-          groupingMinutes,
-        ]),
-        this.knex.raw("MIN(minute_number) as start_minute"),
-        this.knex.raw("MAX(minute_number) as end_minute"),
-        this.knex.raw("COUNT(*) as minute_count"),
-        this.knex.raw(
-          "array_agg(results ORDER BY minute_number) as all_results",
-        ),
+        this.knex.raw('FLOOR(minute_number / ?) as group_index', [groupingMinutes]),
+        this.knex.raw('MIN(minute_number) as start_minute'),
+        this.knex.raw('MAX(minute_number) as end_minute'),
+        this.knex.raw('COUNT(*) as minute_count'),
+        this.knex.raw('array_agg(results ORDER BY minute_number) as all_results')
       )
-      .where("video_id", video.id);
+      .where('video_id', video.id);
 
     if (startMinute !== undefined) {
-      groupingQuery.where("minute_number", ">=", startMinute);
+      groupingQuery.where('minute_number', '>=', startMinute);
     }
 
     if (endMinute !== undefined) {
-      groupingQuery.where("minute_number", "<=", endMinute);
+      groupingQuery.where('minute_number', '<=', endMinute);
     }
 
     const rows = await groupingQuery
-      .groupBy("group_index")
-      .orderBy("group_index");
+      .groupBy('group_index')
+      .orderBy('group_index');
 
     // Aggregate the results in TypeScript based on video type
     const aggregatedGroups: IGroupedResult[] = rows.map((row: any) => {
-      if (!row || typeof row !== "object") {
-        throw new Error("Invalid row data received from database query");
+      if (!row || typeof row !== 'object') {
+        throw new Error('Invalid row data received from database query');
       }
 
       const allResults = Array.isArray(row.all_results) ? row.all_results : [];
-
+      
       // Determine video type based on multiple factors
-      let studyType = video.videoType || "ATR"; // Default fallback to ATR
-
+      let studyType = video.videoType || 'ATR'; // Default fallback to ATR
+      
       // Check if minute data has study_type field (ATR usually does)
       if (allResults.length > 0 && allResults[0].study_type) {
         studyType = allResults[0].study_type;
@@ -473,24 +475,20 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
           const vehicleKeys = Object.keys(sampleResult.vehicles);
           if (vehicleKeys.length > 0) {
             const firstVehicleType = sampleResult.vehicles[vehicleKeys[0]];
-            if (firstVehicleType && typeof firstVehicleType === "object") {
+            if (firstVehicleType && typeof firstVehicleType === 'object') {
               const directions = Object.keys(firstVehicleType);
-              if (
-                directions.includes("NORTH") ||
-                directions.includes("SOUTH") ||
-                directions.includes("EAST") ||
-                directions.includes("WEST")
-              ) {
-                studyType = "TMC";
+              if (directions.includes('NORTH') || directions.includes('SOUTH') || 
+                  directions.includes('EAST') || directions.includes('WEST')) {
+                studyType = 'TMC';
               }
             }
           }
         }
       }
-
+      
       // Aggregate based on determined video type
       let aggregatedResult;
-      if (studyType === "TMC") {
+      if (studyType === 'TMC') {
         aggregatedResult = this.aggregateTMCResults(allResults);
       } else {
         aggregatedResult = this.aggregateATRResults(allResults);
@@ -500,11 +498,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
         groupIndex: row.group_index,
         startMinute: row.start_minute,
         endMinute: row.end_minute,
-        label: this.formatTimeLabel(
-          row.start_minute,
-          row.end_minute,
-          video.recordingStartedAt,
-        ),
+        label: this.formatTimeLabel(row.start_minute, row.end_minute, video.recordingStartedAt),
         results: aggregatedResult,
         minuteCount: row.minute_count,
       };
@@ -585,8 +579,8 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
         "v.uuid as videoUuid",
         "v.recordingStartedAt",
         this.knex.raw(
-          '"v"."recordingStartedAt" + (vmr.minute_number || \' minutes\')::INTERVAL as "absoluteTime"',
-        ),
+          '"v"."recordingStartedAt" + (vmr.minute_number || \' minutes\')::INTERVAL as "absoluteTime"'
+        )
       )
       .whereIn("v.id", videoIds)
       .orderBy("absoluteTime", "asc");
@@ -624,7 +618,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
     for (const minute of minuteResults) {
       const absoluteTime = new Date(minute.absoluteTime);
       const minutesSinceEarliest = Math.floor(
-        (absoluteTime.getTime() - earliestTime.getTime()) / (1000 * 60),
+        (absoluteTime.getTime() - earliestTime.getTime()) / (1000 * 60)
       );
       const bucketIndex = Math.floor(minutesSinceEarliest / groupingMinutes);
 
@@ -632,7 +626,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
         // Calculate bucket start time
         const bucketStartMinutes = bucketIndex * groupingMinutes;
         const bucketStartTime = new Date(
-          earliestTime.getTime() + bucketStartMinutes * 60 * 1000,
+          earliestTime.getTime() + bucketStartMinutes * 60 * 1000
         );
 
         buckets.set(bucketIndex, {
@@ -649,14 +643,12 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
     }
 
     // Step 5: Aggregate using existing methods based on study type
-    const aggregatedGroups: IStudyTimeGroupResult[] = Array.from(
-      buckets.values(),
-    )
+    const aggregatedGroups: IStudyTimeGroupResult[] = Array.from(buckets.values())
       .sort((a, b) => a.groupIndex - b.groupIndex)
       .map((bucket) => {
         let aggregatedResult: ITMCResult | IATRResult;
 
-        if (study.type === "TMC") {
+        if (study.type === 'TMC') {
           aggregatedResult = this.aggregateTMCResults(bucket.results);
         } else {
           aggregatedResult = this.aggregateATRResults(bucket.results);
@@ -667,10 +659,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
           groupIndex: bucket.groupIndex,
           startMinute: bucket.groupIndex * groupingMinutes,
           endMinute: (bucket.groupIndex + 1) * groupingMinutes - 1,
-          label: this.formatStudyTimeLabel(
-            bucket.absoluteTime,
-            groupingMinutes,
-          ),
+          label: this.formatStudyTimeLabel(bucket.absoluteTime, groupingMinutes),
           results: aggregatedResult,
           minuteCount: bucket.results.length,
           videoCount: bucket.videoUuids.size,
@@ -733,27 +722,25 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
       vehicles: {},
       counts: {
         total_vehicles: 0,
-        entry_vehicles: 0,
+        entry_vehicles: 0
       },
       total: 0,
       totalcount: 0,
       detected_classes: {},
-      study_type: "TMC",
+      study_type: "TMC"
     };
 
     for (const minute of minutes) {
       const results = minute; // minute is already the results object from array_agg
 
       // Aggregate vehicle movements by class and direction
-      if (results.vehicles && typeof results.vehicles === "object") {
-        for (const [vehicleClass, directions] of Object.entries(
-          results.vehicles,
-        )) {
+      if (results.vehicles && typeof results.vehicles === 'object') {
+        for (const [vehicleClass, directions] of Object.entries(results.vehicles)) {
           // Skip the 'total' pseudo vehicle class - validate it's actually aggregate data
-          if (vehicleClass === "total" && typeof directions === "number") {
+          if (vehicleClass === 'total' && typeof directions === 'number') {
             continue; // This is aggregate total data, not a vehicle class
           }
-
+          
           if (!aggregated.vehicles[vehicleClass]) {
             aggregated.vehicles[vehicleClass] = {};
           }
@@ -776,12 +763,11 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
               for (const [turnType, count] of Object.entries(turns)) {
                 const turnCount = (count as number) || 0;
                 aggregated.vehicles[vehicleClass][direction][turnType] =
-                  (aggregated.vehicles[vehicleClass][direction][turnType] ||
-                    0) + turnCount;
-
+                  (aggregated.vehicles[vehicleClass][direction][turnType] || 0) + turnCount;
+                
                 // Add to detected_classes count for this vehicle type
                 aggregated.detected_classes[vehicleClass] += turnCount;
-
+                
                 // Add to total counts
                 aggregated.total += turnCount;
                 aggregated.totalcount += turnCount;
@@ -789,12 +775,10 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
             }
           }
         }
-
+        
         // Also process the 'total' entry for validation but don't count it as a vehicle class
         if (results.vehicles.total) {
-          for (const [direction, turns] of Object.entries(
-            results.vehicles.total as any,
-          )) {
+          for (const [direction, turns] of Object.entries(results.vehicles.total as any)) {
             if (typeof turns === "object" && turns !== null) {
               for (const [turnType, count] of Object.entries(turns)) {
                 const turnCount = (count as number) || 0;
@@ -807,12 +791,75 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
     }
 
     // Set entry_vehicles same as total_vehicles for TMC
-    aggregated.counts.entry_vehicles =
-      aggregated.counts.total_vehicles || aggregated.total;
+    aggregated.counts.entry_vehicles = aggregated.counts.total_vehicles || aggregated.total;
+
+    // Aggregate crosswalk results if any minute contains crosswalk data
+    const crosswalkResult = this.aggregateCrosswalkResults(minutes);
+    if (crosswalkResult.crosswalks) {
+      aggregated.crosswalks = crosswalkResult.crosswalks;
+      aggregated.crosswalk_totals = crosswalkResult.crosswalk_totals;
+    }
 
     return aggregated;
   }
 
+  /**
+   * Aggregate crosswalk results from minute-level data
+   * Sums counts by crosswalk name, entity class, and direction
+   */
+  private aggregateCrosswalkResults(minutes: any[]): {
+    crosswalks?: ICrosswalkResults;
+    crosswalk_totals?: { pedestrian: number; bicycle: number };
+  } {
+    let hasCrosswalkData = false;
+    const aggregated: ICrosswalkResults = {};
+    const totals = { pedestrian: 0, bicycle: 0 };
+
+    for (const minute of minutes) {
+      const results = minute;
+      if (!results.crosswalks || typeof results.crosswalks !== 'object') {
+        continue;
+      }
+
+      hasCrosswalkData = true;
+
+      for (const [crosswalkName, classData] of Object.entries(results.crosswalks)) {
+        if (!aggregated[crosswalkName]) {
+          aggregated[crosswalkName] = {};
+        }
+
+        if (typeof classData !== 'object' || classData === null) continue;
+
+        for (const [entityClass, directions] of Object.entries(classData as Record<string, any>)) {
+          if (!aggregated[crosswalkName][entityClass]) {
+            aggregated[crosswalkName][entityClass] = {};
+          }
+
+          if (typeof directions !== 'object' || directions === null) continue;
+
+          for (const [direction, count] of Object.entries(directions as Record<string, any>)) {
+            const numericCount = typeof count === 'number' ? count : 0;
+            aggregated[crosswalkName][entityClass][direction] =
+              (aggregated[crosswalkName][entityClass][direction] || 0) + numericCount;
+
+            // Accumulate totals by entity class
+            if (entityClass === 'pedestrian') {
+              totals.pedestrian += numericCount;
+            } else if (entityClass === 'bicycle') {
+              totals.bicycle += numericCount;
+            }
+          }
+        }
+      }
+    }
+
+    if (!hasCrosswalkData) {
+      return {};
+    }
+
+    return { crosswalks: aggregated, crosswalk_totals: totals };
+  }
+
   /**
    * Aggregate ATR (Automatic Traffic Recorder) results
    */
@@ -832,7 +879,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
       if (results.vehicles) {
         for (const [vehicleClass, lanes] of Object.entries(results.vehicles)) {
           // Skip 'total' pseudo-class if present
-          if (vehicleClass === "total") {
+          if (vehicleClass === 'total') {
             continue;
           }
 
@@ -841,8 +888,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
           }
 
           for (const [laneId, count] of Object.entries(lanes as any)) {
-            const numericCount =
-              typeof count === "number" ? count : parseInt(String(count)) || 0;
+            const numericCount = typeof count === 'number' ? count : (parseInt(String(count)) || 0);
             aggregated.vehicles[vehicleClass][laneId] =
               (aggregated.vehicles[vehicleClass][laneId] || 0) + numericCount;
           }
@@ -939,7 +985,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
   private formatTimeLabel(
     startMinute: number,
     endMinute: number,
-    recordingStartedAt?: Date | string | null,
+    recordingStartedAt?: Date | string | null
   ): string {
     if (recordingStartedAt) {
       // Calculate actual wall-clock times using recordingStartedAt
@@ -978,10 +1024,7 @@ export class VideoMinuteResultDAO implements IBaseDAO<IVideoMinuteResult> {
    * Used when results are already grouped by date in the UI
    * Uses UTC time for consistency with absoluteTime field
    */
-  private formatStudyTimeLabel(
-    startTime: Date,
-    durationMinutes: number,
-  ): string {
+  private formatStudyTimeLabel(startTime: Date, durationMinutes: number): string {
     const endTime = new Date(startTime.getTime() + durationMinutes * 60 * 1000);
 
     const formatTime = (date: Date): string => {
@@ -1002,6 +1045,7 @@ export type {
   IGroupedResult,
   ITMCResult,
   IATRResult,
+  ICrosswalkResults,
 };
 
 export default VideoMinuteResultDAO;

package/src/dao/auth/auth.dao.ts

@@ -4,61 +4,58 @@ import { IAuth } from "../../interfaces/auth/auth.interfaces";
 import KnexManager from "../../KnexConnection";
 
 export class AuthDAO implements IBaseDAO<IAuth> {
-  private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
-
-  async create(item: IAuth): Promise<IAuth> {
-    const [createdAuth] = await this._knex("auth").insert(item).returning("*");
-    return createdAuth;
-  }
-
-  async getById(id: number): Promise<IAuth | null> {
-    const auth = await this._knex("auth").where({ id }).first();
-    return auth || null;
-  }
-
-  async getByUuid(uuid: string): Promise<IAuth | null> {
-    // Auth table doesn't have uuid, so we'll return null or throw error
-    return null;
-  }
-
-  async getByUserId(userId: number): Promise<IAuth | null> {
-    const auth = await this._knex("auth").where({ userId }).first();
-    return auth || null;
-  }
-
-  async getByEmailToken(emailToken: string): Promise<IAuth | null> {
-    const auth = await this._knex("auth").where({ emailToken }).first();
-    return auth || null;
-  }
-
-  async update(id: number, item: Partial<IAuth>): Promise<IAuth | null> {
-    const [updatedAuth] = await this._knex("auth")
-      .where({ id })
-      .update(item)
-      .returning("*");
-    return updatedAuth || null;
-  }
-
-  async delete(id: number): Promise<boolean> {
-    const result = await this._knex("auth").where({ id }).del();
-    return result > 0;
-  }
-
-  async getAll(page: number, limit: number): Promise<IDataPaginator<IAuth>> {
-    const offset = (page - 1) * limit;
-
-    const [countResult] = await this._knex("auth").count("* as count");
-    const totalCount = +countResult.count;
-    const auths = await this._knex("auth").limit(limit).offset(offset);
-
-    return {
-      success: true,
-      data: auths,
-      page,
-      limit,
-      count: auths.length,
-      totalCount,
-      totalPages: Math.ceil(totalCount / limit),
-    };
-  }
-}
+    private _knex: Knex<any, unknown[]> = KnexManager.getConnection();
+
+    async create(item: IAuth): Promise<IAuth> {
+        const [createdAuth] = await this._knex("auth").insert(item).returning("*");
+        return createdAuth;
+    }
+
+    async getById(id: number): Promise<IAuth | null> {
+        const auth = await this._knex("auth").where({ id }).first();
+        return auth || null;
+    }
+
+    async getByUuid(uuid: string): Promise<IAuth | null> {
+        // Auth table doesn't have uuid, so we'll return null or throw error
+        return null;
+    }
+
+    async getByUserId(userId: number): Promise<IAuth | null> {
+        const auth = await this._knex("auth").where({ userId }).first();
+        return auth || null;
+    }
+
+    async getByEmailToken(emailToken: string): Promise<IAuth | null> {
+        const auth = await this._knex("auth").where({ emailToken }).first();
+        return auth || null;
+    }
+
+    async update(id: number, item: Partial<IAuth>): Promise<IAuth | null> {
+        const [updatedAuth] = await this._knex("auth").where({ id }).update(item).returning("*");
+        return updatedAuth || null;
+    }
+
+    async delete(id: number): Promise<boolean> {
+        const result = await this._knex("auth").where({ id }).del();
+        return result > 0;
+    }
+
+    async getAll(page: number, limit: number): Promise<IDataPaginator<IAuth>> {
+        const offset = (page - 1) * limit;
+
+        const [countResult] = await this._knex("auth").count("* as count");
+        const totalCount = +countResult.count;
+        const auths = await this._knex("auth").limit(limit).offset(offset);
+
+        return {
+            success: true,
+            data: auths,
+            page,
+            limit,
+            count: auths.length,
+            totalCount,
+            totalPages: Math.ceil(totalCount / limit),
+        };
+    }
+}