@tmscloud/tbt-knex 0.0.2 → 0.0.4

package/dist/dao/trip-track/trip-track.dao.d.ts

@@ -0,0 +1,49 @@
+import { ITripTrack, ITripTrackCreate, ITrackPoint, ITrackStatistics, IConsolidatedTripHistory, IConsolidatedTripFilters } from "../../interfaces/trip-track/trip-track.interfaces";
+import { IDataPaginator } from "../../d.types";
+export declare class TripTrackDAO {
+    private _knex?;
+    private get knex();
+    /**
+     * Create consolidated trip track
+     */
+    create(data: ITripTrackCreate): Promise<ITripTrack>;
+    /**
+     * Get track by trip ID
+     */
+    getByTripId(tripId: number): Promise<ITripTrack | null>;
+    /**
+     * Get track by UUID
+     */
+    getByUuid(uuid: string): Promise<ITripTrack | null>;
+    /**
+     * Check if a trip already has a consolidated track
+     */
+    existsForTrip(tripId: number): Promise<boolean>;
+    /**
+     * Delete track by trip ID
+     */
+    deleteByTripId(tripId: number): Promise<boolean>;
+    /**
+     * Consolidate track from granular driver_tracking points.
+     * Returns null if zero points provided (no trip_track record created).
+     */
+    consolidate(tripId: number, points: ITrackPoint[]): Promise<ITripTrack | null>;
+    /**
+     * Compute statistics from track points (single-pass)
+     */
+    computeStatistics(points: ITrackPoint[]): ITrackStatistics;
+    /**
+     * Calculate distance between two coordinates using Haversine formula.
+     * Returns distance in kilometers.
+     */
+    private calculateDistance;
+    private toRad;
+    /**
+     * Get consolidated trip history with filters and pagination
+     */
+    getConsolidatedHistory(filters: IConsolidatedTripFilters, page: number, limit: number): Promise<IDataPaginator<IConsolidatedTripHistory>>;
+    /**
+     * Parse JSONB fields from database result
+     */
+    private parseJson;
+}

package/dist/dao/trip-track/trip-track.dao.js

@@ -0,0 +1,252 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TripTrackDAO = void 0;
+const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
+class TripTrackDAO {
+    get knex() {
+        if (!this._knex) {
+            this._knex = KnexConnection_1.default.getConnection();
+        }
+        return this._knex;
+    }
+    /**
+     * Create consolidated trip track
+     */
+    create(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [created] = yield this.knex("trip_track")
+                .insert({
+                trip_id: data.trip_id,
+                track_data: JSON.stringify(data.track_data),
+                max_speed: data.max_speed,
+                max_altitude: data.max_altitude,
+                total_distance: data.total_distance,
+                total_points: data.total_points,
+                start_coords: data.start_coords
+                    ? JSON.stringify(data.start_coords)
+                    : null,
+                end_coords: data.end_coords ? JSON.stringify(data.end_coords) : null,
+                duration_seconds: data.duration_seconds,
+            })
+                .returning("*");
+            return this.parseJson(created);
+        });
+    }
+    /**
+     * Get track by trip ID
+     */
+    getByTripId(tripId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.knex("trip_track")
+                .where("trip_id", tripId)
+                .first();
+            if (!result)
+                return null;
+            return this.parseJson(result);
+        });
+    }
+    /**
+     * Get track by UUID
+     */
+    getByUuid(uuid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.knex("trip_track").where("uuid", uuid).first();
+            if (!result)
+                return null;
+            return this.parseJson(result);
+        });
+    }
+    /**
+     * Check if a trip already has a consolidated track
+     */
+    existsForTrip(tripId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.knex("trip_track")
+                .where("trip_id", tripId)
+                .count("id as count")
+                .first();
+            return Number((result === null || result === void 0 ? void 0 : result.count) || 0) > 0;
+        });
+    }
+    /**
+     * Delete track by trip ID
+     */
+    deleteByTripId(tripId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deleted = yield this.knex("trip_track")
+                .where("trip_id", tripId)
+                .delete();
+            return deleted > 0;
+        });
+    }
+    /**
+     * Consolidate track from granular driver_tracking points.
+     * Returns null if zero points provided (no trip_track record created).
+     */
+    consolidate(tripId, points) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (points.length === 0) {
+                return null;
+            }
+            const stats = this.computeStatistics(points);
+            return this.create(Object.assign({ trip_id: tripId, track_data: points }, stats));
+        });
+    }
+    /**
+     * Compute statistics from track points (single-pass)
+     */
+    computeStatistics(points) {
+        if (points.length === 0) {
+            return {
+                max_speed: null,
+                max_altitude: null,
+                total_distance: null,
+                total_points: 0,
+                start_coords: null,
+                end_coords: null,
+                duration_seconds: null,
+            };
+        }
+        let maxSpeed = null;
+        let maxAltitude = null;
+        let totalDistance = 0;
+        for (let i = 0; i < points.length; i++) {
+            const point = points[i];
+            if (point.speed !== null) {
+                if (maxSpeed === null || point.speed > maxSpeed) {
+                    maxSpeed = point.speed;
+                }
+            }
+            if (point.altitude !== null) {
+                if (maxAltitude === null || point.altitude > maxAltitude) {
+                    maxAltitude = point.altitude;
+                }
+            }
+            if (i > 0) {
+                const prevPoint = points[i - 1];
+                totalDistance += this.calculateDistance(prevPoint.lat, prevPoint.lng, point.lat, point.lng);
+            }
+        }
+        const startCoords = { lat: points[0].lat, lng: points[0].lng };
+        const endCoords = {
+            lat: points[points.length - 1].lat,
+            lng: points[points.length - 1].lng,
+        };
+        // Duration from first to last track point
+        let durationSeconds = null;
+        const firstTime = new Date(points[0].recorded_at).getTime();
+        const lastTime = new Date(points[points.length - 1].recorded_at).getTime();
+        if (!isNaN(firstTime) && !isNaN(lastTime)) {
+            durationSeconds = Math.round((lastTime - firstTime) / 1000);
+        }
+        return {
+            max_speed: maxSpeed,
+            max_altitude: maxAltitude,
+            total_distance: Math.round(totalDistance * 100) / 100,
+            total_points: points.length,
+            start_coords: startCoords,
+            end_coords: endCoords,
+            duration_seconds: durationSeconds,
+        };
+    }
+    /**
+     * Calculate distance between two coordinates using Haversine formula.
+     * Returns distance in kilometers.
+     */
+    calculateDistance(lat1, lon1, lat2, lon2) {
+        const R = 6371; // Earth's radius in kilometers
+        const dLat = this.toRad(lat2 - lat1);
+        const dLon = this.toRad(lon2 - lon1);
+        const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+            Math.cos(this.toRad(lat1)) *
+                Math.cos(this.toRad(lat2)) *
+                Math.sin(dLon / 2) *
+                Math.sin(dLon / 2);
+        const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        return R * c;
+    }
+    toRad(deg) {
+        return deg * (Math.PI / 180);
+    }
+    /**
+     * Get consolidated trip history with filters and pagination
+     */
+    getConsolidatedHistory(filters, page, limit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const offset = (page - 1) * limit;
+            const query = this.knex("trip_track as tt")
+                .join("trips as t", "tt.trip_id", "t.id")
+                .join("users as u", "t.user_id", "u.id")
+                .leftJoin("route_assignments as ra", "t.assignment_id", "ra.id")
+                .leftJoin("routes as r", "ra.route_id", "r.id")
+                .where("t.tracking_status", "consolidated")
+                .select("t.uuid as trip_uuid", this.knex.raw(`jsonb_build_object('uuid', u.uuid, 'email', u.email, 'username', u.username, 'first_name', u.first_name, 'last_name', u.last_name) as "user"`), "ra.uuid as assignment_uuid", "r.uuid as route_uuid", "r.name as route_name", "t.actual_start as started_at", "t.actual_end as ended_at", "tt.total_points", "tt.total_distance", "tt.duration_seconds", "tt.max_speed");
+            if (filters.user_id) {
+                query.where("t.user_id", filters.user_id);
+            }
+            if (filters.from_date) {
+                query.where("t.actual_start", ">=", filters.from_date);
+            }
+            if (filters.to_date) {
+                query.where("t.actual_start", "<=", filters.to_date + " 23:59:59");
+            }
+            if (filters.trip_uuid) {
+                query.whereRaw("t.uuid::text ilike ?", [`%${filters.trip_uuid}%`]);
+            }
+            const countResult = yield query
+                .clone()
+                .clearSelect()
+                .clearOrder()
+                .count("tt.id as count")
+                .first();
+            const totalCount = Number((countResult === null || countResult === void 0 ? void 0 : countResult.count) || 0);
+            const totalPages = Math.ceil(totalCount / limit);
+            const data = yield query
+                .clone()
+                .orderBy("t.actual_start", "desc")
+                .limit(limit)
+                .offset(offset);
+            // Parse numeric fields
+            const parsed = data.map((row) => (Object.assign(Object.assign({}, row), { user: typeof row.user === "string" ? JSON.parse(row.user) : row.user, total_points: Number(row.total_points), total_distance: row.total_distance !== null ? Number(row.total_distance) : null, duration_seconds: row.duration_seconds !== null ? Number(row.duration_seconds) : null, max_speed: row.max_speed !== null ? Number(row.max_speed) : null })));
+            return {
+                success: true,
+                data: parsed,
+                page,
+                limit,
+                count: parsed.length,
+                totalCount,
+                totalPages,
+            };
+        });
+    }
+    /**
+     * Parse JSONB fields from database result
+     */
+    parseJson(row) {
+        return Object.assign(Object.assign({}, row), { track_data: typeof row.track_data === "string"
+                ? JSON.parse(row.track_data)
+                : row.track_data, start_coords: row.start_coords
+                ? typeof row.start_coords === "string"
+                    ? JSON.parse(row.start_coords)
+                    : row.start_coords
+                : null, end_coords: row.end_coords
+                ? typeof row.end_coords === "string"
+                    ? JSON.parse(row.end_coords)
+                    : row.end_coords
+                : null, max_speed: row.max_speed !== null ? Number(row.max_speed) : null, max_altitude: row.max_altitude !== null ? Number(row.max_altitude) : null, total_distance: row.total_distance !== null ? Number(row.total_distance) : null });
+    }
+}
+exports.TripTrackDAO = TripTrackDAO;
+//# sourceMappingURL=trip-track.dao.js.map

package/dist/dao/trip-track/trip-track.dao.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trip-track.dao.js","sourceRoot":"","sources":["../../../src/dao/trip-track/trip-track.dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0EAA+C;AAW/C,MAAa,YAAY;IAGvB,IAAY,IAAI;QACd,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,wBAAW,CAAC,aAAa,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACG,MAAM,CAAC,IAAsB;;YACjC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBAC5C,MAAM,CAAC;gBACN,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC3C,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC7B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;oBACnC,CAAC,CAAC,IAAI;gBACR,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;gBACpE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC,CAAC;iBACD,SAAS,CAAC,GAAG,CAAC,CAAC;YAElB,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;KAAA;IAED;;OAEG;IACG,WAAW,CAAC,MAAc;;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBACzC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC;iBACxB,KAAK,EAAE,CAAC;YAEX,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;KAAA;IAED;;OAEG;IACG,SAAS,CAAC,IAAY;;YAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YAEzE,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;KAAA;IAED;;OAEG;IACG,aAAa,CAAC,MAAc;;YAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBACzC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC;iBACxB,KAAK,CAAC,aAAa,CAAC;iBACpB,KAAK,EAAE,CAAC;YACX,OAAO,MAAM,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,KAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;KAAA;IAED;;OAEG;IACG,cAAc,CAAC,MAAc;;YACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBAC1C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC;iBACxB,MAAM,EAAE,CAAC;YACZ,OAAO,OAAO,GAAG,CAAC,CAAC;QACrB,CAAC;KAAA;IAED;;;OAGG;IACG,WAAW,CACf,MAAc,EACd,MAAqB;;YAErB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAE7C,OAAO,IAAI,CAAC,MAAM,iBAChB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,IACf,KAAK,EACR,CAAC;QACL,CAAC;KAAA;IAED;;OAEG;IACH,iBAAiB,CAAC,MAAqB;QACrC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO;gBACL,SAAS,EAAE,IAAI;gBACf,YAAY,EAAE,IAAI;gBAClB,cAAc,EAAE,IAAI;gBACpB,YAAY,EAAE,CAAC;gBACf,YAAY,EAAE,IAAI;gBAClB,UAAU,EAAE,IAAI;gBAChB,gBAAgB,EAAE,IAAI;aACvB,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,GAAkB,IAAI,CAAC;QACnC,IAAI,WAAW,GAAkB,IAAI,CAAC;QACtC,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAExB,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzB,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,GAAG,QAAQ,EAAE,CAAC;oBAChD,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC;gBACzB,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC5B,IAAI,WAAW,KAAK,IAAI,IAAI,KAAK,CAAC,QAAQ,GAAG,WAAW,EAAE,CAAC;oBACzD,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC;gBAC/B,CAAC;YACH,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACV,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAChC,aAAa,IAAI,IAAI,CAAC,iBAAiB,CACrC,SAAS,CAAC,GAAG,EACb,SAAS,CAAC,GAAG,EACb,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,GAAG,CACV,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC/D,MAAM,SAAS,GAAG;YAChB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG;YAClC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG;SACnC,CAAC;QAEF,0CAA0C;QAC1C,IAAI,eAAe,GAAkB,IAAI,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;QAC3E,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO;YACL,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,WAAW;YACzB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,CAAC,GAAG,GAAG;YACrD,YAAY,EAAE,MAAM,CAAC,MAAM;YAC3B,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,SAAS;YACrB,gBAAgB,EAAE,eAAe;SAClC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,iBAAiB,CACvB,IAAY,EACZ,IAAY,EACZ,IAAY,EACZ,IAAY;QAEZ,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,+BAA+B;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,GACL,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,GAAW;QACvB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACG,sBAAsB,CAC1B,OAAiC,EACjC,IAAY,EACZ,KAAa;;YAEb,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YAElC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;iBACxC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC;iBACxC,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,CAAC;iBACvC,QAAQ,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,OAAO,CAAC;iBAC/D,QAAQ,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC;iBAC9C,KAAK,CAAC,mBAAmB,EAAE,cAAc,CAAC;iBAC1C,MAAM,CACL,qBAAqB,EACrB,IAAI,CAAC,IAAI,CAAC,GAAG,CACX,8IAA8I,CAC/I,EACD,4BAA4B,EAC5B,sBAAsB,EACtB,sBAAsB,EACtB,8BAA8B,EAC9B,0BAA0B,EAC1B,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,cAAc,CACf,CAAC;YAEJ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBACtB,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBACtB,KAAK,CAAC,QAAQ,CAAC,sBAAsB,EAAE,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;YACrE,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,KAAK;iBAC5B,KAAK,EAAE;iBACP,WAAW,EAAE;iBACb,UAAU,EAAE;iBACZ,KAAK,CAAC,gBAAgB,CAAC;iBACvB,KAAK,EAAE,CAAC;YACX,MAAM,UAAU,GAAG,MAAM,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,CAAC,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC;YAEjD,MAAM,IAAI,GAAG,MAAM,KAAK;iBACrB,KAAK,EAAE;iBACP,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC;iBACjC,KAAK,CAAC,KAAK,CAAC;iBACZ,MAAM,CAAC,MAAM,CAAC,CAAC;YAElB,uBAAuB;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,iCACjC,GAAG,KACN,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EACpE,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EACtC,cAAc,EACZ,GAAG,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EACjE,gBAAgB,EACd,GAAG,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EACrE,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAChE,CAAC,CAAC;YAEJ,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;gBACZ,IAAI;gBACJ,KAAK;gBACL,KAAK,EAAE,MAAM,CAAC,MAAM;gBACpB,UAAU;gBACV,UAAU;aACX,CAAC;QACJ,CAAC;KAAA;IAED;;OAEG;IACK,SAAS,CAAC,GAAQ;QACxB,uCACK,GAAG,KACN,UAAU,EACR,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ;gBAChC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC5B,CAAC,CAAC,GAAG,CAAC,UAAU,EACpB,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC5B,CAAC,CAAC,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ;oBACpC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;oBAC9B,CAAC,CAAC,GAAG,CAAC,YAAY;gBACpB,CAAC,CAAC,IAAI,EACR,UAAU,EAAE,GAAG,CAAC,UAAU;gBACxB,CAAC,CAAC,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ;oBAClC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;oBAC5B,CAAC,CAAC,GAAG,CAAC,UAAU;gBAClB,CAAC,CAAC,IAAI,EACR,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAChE,YAAY,EAAE,GAAG,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EACzE,cAAc,EACZ,GAAG,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,IACjE;IACJ,CAAC;CACF;AAhTD,oCAgTC"}

package/dist/index.d.ts

@@ -1,21 +1,21 @@
 export { DriverTrackingDAO } from "./dao/driver-tracking/driver-tracking.dao";
 export { EventDAO } from "./dao/event/event.dao";
-export { GPSLocationDAO } from "./dao/gps-location/gps-location.dao";
 export { RoleDAO } from "./dao/role/role.dao";
 export { RouteDAO } from "./dao/route/route.dao";
 export { RouteAssignmentDAO } from "./dao/route-assignment/route-assignment.dao";
 export { SundaysPackageVersionDAO } from "./dao/sundays-package-version/sundays-package-version.dao";
 export { TripDAO } from "./dao/trip/trip.dao";
+export { TripTrackDAO } from "./dao/trip-track/trip-track.dao";
 export { UserDAO } from "./dao/user/user.dao";
 export { IDataPaginator } from "./d.types";
-export { IDriverTracking, IDriverTrackingCreate, IDriverTrackingBatchCreate, ITrackingPoint, ITrackingMetadata, IActiveDriver, ITrackingSession, ITrackingFilters, } from "./interfaces/driver-tracking/driver-tracking.interfaces";
+export { IDriverTracking, IDriverTrackingBatchCreate, ITrackingPointInput, ITrackingMetadata, IActiveDriver, ITrackingSession, ITrackingFilters, } from "./interfaces/driver-tracking/driver-tracking.interfaces";
 export { IEvent, IEventCreate, IEventUpdate, } from "./interfaces/event/event.interfaces";
-export { IGPSLocation, IGPSLocationWithDistance, ITripLocationSummary, } from "./interfaces/gps-location/gps-location.interfaces";
 export { IRole } from "./interfaces/role/role.interfaces";
 export { IRoute, IRouteInstruction } from "./interfaces/route/route.interfaces";
 export { IRouteAssignment } from "./interfaces/route-assignment/route-assignment.interfaces";
 export { ISundaysPackageVersion } from "./interfaces/sundays-package-version/sundays-package-version.interfaces";
 export { ITrip, ITripStop, ITripWithStops, } from "./interfaces/trip/trip.interfaces";
+export { ITripTrack, ITripTrackCreate, ITrackPoint, ITrackStatistics, TrackingStatus, IConsolidatedTripHistory, IConsolidatedTripFilters, } from "./interfaces/trip-track/trip-track.interfaces";
 export { IUser, IUserSafe, IRefreshToken, } from "./interfaces/user/user.interfaces";
 import KnexManager from "./KnexConnection";
 export { KnexManager };

package/dist/index.js

@@ -3,14 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KnexManager = exports.UserDAO = exports.TripDAO = exports.SundaysPackageVersionDAO = exports.RouteAssignmentDAO = exports.RouteDAO = exports.RoleDAO = exports.GPSLocationDAO = exports.EventDAO = exports.DriverTrackingDAO = void 0;
+exports.KnexManager = exports.UserDAO = exports.TripTrackDAO = exports.TripDAO = exports.SundaysPackageVersionDAO = exports.RouteAssignmentDAO = exports.RouteDAO = exports.RoleDAO = exports.EventDAO = exports.DriverTrackingDAO = void 0;
 // DAOs
 var driver_tracking_dao_1 = require("./dao/driver-tracking/driver-tracking.dao");
 Object.defineProperty(exports, "DriverTrackingDAO", { enumerable: true, get: function () { return driver_tracking_dao_1.DriverTrackingDAO; } });
 var event_dao_1 = require("./dao/event/event.dao");
 Object.defineProperty(exports, "EventDAO", { enumerable: true, get: function () { return event_dao_1.EventDAO; } });
-var gps_location_dao_1 = require("./dao/gps-location/gps-location.dao");
-Object.defineProperty(exports, "GPSLocationDAO", { enumerable: true, get: function () { return gps_location_dao_1.GPSLocationDAO; } });
 var role_dao_1 = require("./dao/role/role.dao");
 Object.defineProperty(exports, "RoleDAO", { enumerable: true, get: function () { return role_dao_1.RoleDAO; } });
 var route_dao_1 = require("./dao/route/route.dao");
@@ -21,6 +19,8 @@ var sundays_package_version_dao_1 = require("./dao/sundays-package-version/sunda
 Object.defineProperty(exports, "SundaysPackageVersionDAO", { enumerable: true, get: function () { return sundays_package_version_dao_1.SundaysPackageVersionDAO; } });
 var trip_dao_1 = require("./dao/trip/trip.dao");
 Object.defineProperty(exports, "TripDAO", { enumerable: true, get: function () { return trip_dao_1.TripDAO; } });
+var trip_track_dao_1 = require("./dao/trip-track/trip-track.dao");
+Object.defineProperty(exports, "TripTrackDAO", { enumerable: true, get: function () { return trip_track_dao_1.TripTrackDAO; } });
 var user_dao_1 = require("./dao/user/user.dao");
 Object.defineProperty(exports, "UserDAO", { enumerable: true, get: function () { return user_dao_1.UserDAO; } });
 const KnexConnection_1 = __importDefault(require("./KnexConnection"));

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO;AACP,iFAA8E;AAArE,wHAAA,iBAAiB,OAAA;AAC1B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,wEAAqE;AAA5D,kHAAA,cAAc,OAAA;AACvB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,oFAAiF;AAAxE,0HAAA,kBAAkB,OAAA;AAC3B,yGAAqG;AAA5F,uIAAA,wBAAwB,OAAA;AACjC,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAuChB,sEAA2C;AAClC,sBADF,wBAAW,CACE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO;AACP,iFAA8E;AAArE,wHAAA,iBAAiB,OAAA;AAC1B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,oFAAiF;AAAxE,0HAAA,kBAAkB,OAAA;AAC3B,yGAAqG;AAA5F,uIAAA,wBAAwB,OAAA;AACjC,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,kEAA+D;AAAtD,8GAAA,YAAY,OAAA;AACrB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AA0ChB,sEAA2C;AAClC,sBADF,wBAAW,CACE"}

package/dist/interfaces/driver-tracking/driver-tracking.interfaces.d.ts

@@ -1,10 +1,8 @@
-import { IUserSafe } from "../user/user.interfaces";
-import { IRouteAssignment } from "../route-assignment/route-assignment.interfaces";
-import { IRoute } from "../route/route.interfaces";
 export interface IDriverTracking {
     id?: number;
     uuid?: string;
     user_id: number;
+    trip_id: number;
     assignment_id?: number | null;
     route_id?: number | null;
     session_id: string;
@@ -19,9 +17,7 @@ export interface IDriverTracking {
     metadata?: ITrackingMetadata | null;
     created_at?: Date | string;
     updated_at?: Date | string;
-    user?: IUserSafe;
-    assignment?: IRouteAssignment;
-    route?: IRoute;
+    user?: any;
 }
 export interface ITrackingMetadata {
     battery_level?: number;
@@ -31,72 +27,55 @@ export interface ITrackingMetadata {
     device_model?: string;
     os_version?: string;
 }
-export interface IDriverTrackingCreate {
+export interface IDriverTrackingBatchCreate {
     user_id: number;
+    trip_id: number;
     assignment_id?: number | null;
     route_id?: number | null;
     session_id: string;
-    latitude: number;
-    longitude: number;
-    accuracy?: number | null;
-    altitude?: number | null;
-    speed?: number | null;
-    heading?: number | null;
-    recorded_at: Date | string;
-    is_navigating?: boolean;
-    metadata?: ITrackingMetadata | null;
-}
-export interface IDriverTrackingBatchCreate {
-    session_id: string;
-    assignment_id?: number | null;
-    route_id?: number | null;
-    points: ITrackingPoint[];
+    points: ITrackingPointInput[];
 }
-export interface ITrackingPoint {
+export interface ITrackingPointInput {
     latitude: number;
     longitude: number;
     accuracy?: number | null;
     altitude?: number | null;
     speed?: number | null;
     heading?: number | null;
-    recorded_at: Date | string;
+    recorded_at: string;
     metadata?: ITrackingMetadata | null;
 }
 export interface IActiveDriver {
-    user_id: number;
-    user?: IUserSafe;
+    user: any;
     session_id: string;
-    assignment_id?: number | null;
-    assignment?: IRouteAssignment;
+    trip_uuid: string;
+    assignment_uuid?: string | null;
+    route_uuid?: string | null;
     current_location: {
         latitude: number;
         longitude: number;
-        heading?: number | null;
-        speed?: number | null;
-        recorded_at: Date | string;
+        heading: number | null;
+        speed: number | null;
+        recorded_at: string;
     };
-    is_navigating: boolean;
 }
 export interface ITrackingSession {
     session_id: string;
-    user_id: number;
-    user?: IUserSafe;
-    assignment_id?: number | null;
-    assignment?: IRouteAssignment;
-    route_id?: number | null;
-    route?: IRoute;
-    started_at: Date | string;
-    ended_at?: Date | string;
+    user: any;
+    trip_uuid: string;
+    assignment_uuid?: string | null;
+    route_uuid?: string | null;
+    started_at: string;
+    ended_at?: string;
     total_points: number;
-    total_distance_km?: number;
-    duration_seconds?: number;
 }
 export interface ITrackingFilters {
     user_id?: number;
+    trip_id?: number;
     assignment_id?: number;
     route_id?: number;
     session_id?: string;
-    from_date?: Date | string;
-    to_date?: Date | string;
+    from_date?: string;
+    to_date?: string;
     is_navigating?: boolean;
 }

package/dist/interfaces/trip/trip.interfaces.d.ts

@@ -1,6 +1,7 @@
 import { IRoute } from "../route/route.interfaces";
 import { IUser } from "../user/user.interfaces";
 import { IRouteAssignment } from "../route-assignment/route-assignment.interfaces";
+import { TrackingStatus } from "../trip-track/trip-track.interfaces";
 export interface ITrip {
     id?: number;
     uuid?: string;
@@ -12,6 +13,7 @@ export interface ITrip {
     actual_start?: Date | string;
     actual_end?: Date | string;
     status: "pending" | "in_progress" | "completed" | "cancelled";
+    tracking_status?: TrackingStatus;
     manifest_data?: any;
     distance_traveled?: number;
     duration_minutes?: number;

package/dist/interfaces/trip-track/trip-track.interfaces.d.ts

@@ -0,0 +1,82 @@
+export interface ITrackPoint {
+    lat: number;
+    lng: number;
+    altitude: number | null;
+    speed: number | null;
+    heading: number | null;
+    accuracy: number | null;
+    recorded_at: string;
+}
+export interface ITrackStatistics {
+    max_speed: number | null;
+    max_altitude: number | null;
+    total_distance: number | null;
+    total_points: number;
+    start_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    end_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    duration_seconds: number | null;
+}
+export interface ITripTrack {
+    id?: number;
+    uuid?: string;
+    trip_id: number;
+    track_data: ITrackPoint[];
+    max_speed: number | null;
+    max_altitude: number | null;
+    total_distance: number | null;
+    total_points: number;
+    start_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    end_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    duration_seconds: number | null;
+    created_at?: string;
+    updated_at?: string;
+}
+export interface ITripTrackCreate {
+    trip_id: number;
+    track_data: ITrackPoint[];
+    max_speed: number | null;
+    max_altitude: number | null;
+    total_distance: number | null;
+    total_points: number;
+    start_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    end_coords: {
+        lat: number;
+        lng: number;
+    } | null;
+    duration_seconds: number | null;
+}
+export type TrackingStatus = "none" | "tracking" | "syncing" | "consolidated";
+export interface IConsolidatedTripHistory {
+    trip_uuid: string;
+    user: any;
+    assignment_uuid: string | null;
+    route_uuid: string | null;
+    route_name: string | null;
+    started_at: string | null;
+    ended_at: string | null;
+    total_points: number;
+    total_distance: number | null;
+    duration_seconds: number | null;
+    max_speed: number | null;
+}
+export interface IConsolidatedTripFilters {
+    user_id?: number;
+    from_date?: string;
+    to_date?: string;
+    trip_uuid?: string;
+}

package/dist/interfaces/{gps-location/gps-location.interfaces.js → trip-track/trip-track.interfaces.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=gps-location.interfaces.js.map
+//# sourceMappingURL=trip-track.interfaces.js.map

package/dist/interfaces/trip-track/trip-track.interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trip-track.interfaces.js","sourceRoot":"","sources":["../../../src/interfaces/trip-track/trip-track.interfaces.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmscloud/tbt-knex",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "TBT Database Access Layer",
   "main": "dist/index.js",
   "publishConfig": {