@tmscloud/tbt-knex 0.0.1 → 0.0.2

package/.github/workflows/build-and-push.yml

@@ -0,0 +1,118 @@
+name: Build and Push to ECR
+
+on:
+  push:
+    branches:
+      - main
+
+# Shared constants
+env:
+  AWS_REGION: us-east-1
+  ECR_REPOSITORY: tms-tbt-migration
+
+jobs:
+  build_and_push:
+    name: Build and Push Migrations Image
+    runs-on: ubuntu-latest
+    environment: development
+    concurrency: build-push
+
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Compute image tags
+        id: tags
+        run: |
+          # Compute timestamp in UTC (YYYYmmdd-HHMM format)
+          TIMESTAMP=$(date -u +'%Y.%m.%d-%H%M')
+          echo "timestamp=$TIMESTAMP" >> $GITHUB_OUTPUT
+
+          # Compute short and full SHA
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          FULL_SHA=$(git rev-parse HEAD)
+          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "full_sha=$FULL_SHA" >> $GITHUB_OUTPUT
+
+          # Compute immutable image tags
+          CI_TAG="ci-${TIMESTAMP}-${SHORT_SHA}"
+          SHA_TAG="sha-${FULL_SHA}"
+          echo "ci_tag=$CI_TAG" >> $GITHUB_OUTPUT
+          echo "sha_tag=$SHA_TAG" >> $GITHUB_OUTPUT
+
+          echo "## Image Tags" >> $GITHUB_STEP_SUMMARY
+          echo "- CI Tag: \`$CI_TAG\`" >> $GITHUB_STEP_SUMMARY
+          echo "- SHA Tag: \`$SHA_TAG\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Commit: \`$FULL_SHA\`" >> $GITHUB_STEP_SUMMARY
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          # SOURCE OF TRUTH: GitHub Environment Secret (global)
+          role-to-assume: ${{ secrets.DEVELOPMENT_AWS_ROLE_TO_ASUME_OIDC }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Build Docker image
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          CI_TAG: ${{ steps.tags.outputs.ci_tag }}
+          SHA_TAG: ${{ steps.tags.outputs.sha_tag }}
+        run: |
+          echo "Building image for linux/amd64..."
+          docker buildx build \
+            --platform linux/amd64 \
+            -t $ECR_REGISTRY/$ECR_REPOSITORY:$CI_TAG \
+            -t $ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG \
+            --load \
+            .
+
+          # Output the canonical deployment tag
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG" >> $GITHUB_OUTPUT
+
+      - name: Push image tags to Amazon ECR
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          CI_TAG: ${{ steps.tags.outputs.ci_tag }}
+          SHA_TAG: ${{ steps.tags.outputs.sha_tag }}
+        run: |
+          echo "Pushing immutable tags to ECR..."
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$CI_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG
+
+          echo "## Pushed Images" >> $GITHUB_STEP_SUMMARY
+          echo "- \`$ECR_REGISTRY/$ECR_REPOSITORY:$CI_TAG\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`$ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG\`" >> $GITHUB_STEP_SUMMARY
+
+      - name: Build Summary
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          CI_TAG: ${{ steps.tags.outputs.ci_tag }}
+          SHA_TAG: ${{ steps.tags.outputs.sha_tag }}
+          FULL_SHA: ${{ steps.tags.outputs.full_sha }}
+        run: |
+          echo "## ✅ Build and Push Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Build Details" >> $GITHUB_STEP_SUMMARY
+          echo "- **Commit SHA**: \`$FULL_SHA\`" >> $GITHUB_STEP_SUMMARY
+          echo "- **ECR Repository**: \`$ECR_REPOSITORY\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Immutable Image Tags" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**SHA Tag (recommended for deployment):**" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "$ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**CI Tag (with timestamp):**" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          echo "$ECR_REGISTRY/$ECR_REPOSITORY:$CI_TAG" >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY

package/Dockerfile

@@ -0,0 +1,36 @@
+# ==============================================
+# Knex Migrations Container (Optimized)
+# ==============================================
+# Note: This container needs TypeScript support since migrations are in TS
+# It's a short-lived container, so optimization focus is on build speed
+FROM node:22-alpine
+
+WORKDIR /app
+
+# Install only needed dependencies
+COPY package*.json ./
+RUN npm ci && \
+    npm cache clean --force
+
+# Copy TypeScript configuration
+COPY tsconfig.json ./
+
+# Copy knexfile and migrations
+COPY knexfile.ts ./
+COPY migrations ./migrations
+
+# Copy source code (needed for imports in migrations)
+COPY src ./src
+
+# Set environment to production
+ENV NODE_ENV=production
+
+# Create non-root user
+RUN addgroup -g 1001 -S nodejs && \
+    adduser -S nodejs -u 1001 && \
+    chown -R nodejs:nodejs /app
+
+USER nodejs
+
+# Default command runs migrations
+CMD ["npx", "knex", "migrate:latest"]

package/build-image.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Build the Docker image for local development
+# Use --platform to ensure linux/amd64 compatibility for AWS ECS/Fargate
+IMAGE_NAME='tms-tbt-knex'
+TAG='first'
+docker buildx build --platform linux/amd64 -t $IMAGE_NAME:$TAG --load .
+
+echo "✓ Image built successfully: $IMAGE_NAME:$TAG"
+echo ""
+echo "To use this image in another docker-compose.yml:"
+echo "  services:"
+echo "    migrations:"
+echo "      image: $IMAGE_NAME:$TAG"
+
+# docker tag tms-tbt-knex:first 937623187882.dkr.ecr.us-east-1.amazonaws.com/tms-tbt-migration:first

package/dist/dao/event/event.dao.d.ts

@@ -0,0 +1,38 @@
+import { IEvent, IEventCreate, IEventUpdate } from "../../interfaces/event/event.interfaces";
+import { IBaseDAO, IDataPaginator } from "../../d.types";
+export declare class EventDAO implements IBaseDAO<IEvent> {
+    private _knex?;
+    private get knex();
+    /**
+     * Get all events with pagination
+     */
+    getAll(page?: number, limit?: number): Promise<IDataPaginator<IEvent>>;
+    /**
+     * Get event by ID (only active events by default)
+     */
+    getById(id: number, includeInactive?: boolean): Promise<IEvent | null>;
+    /**
+     * Get event by UUID (only active events by default)
+     */
+    getByUuid(uuid: string, includeInactive?: boolean): Promise<IEvent | null>;
+    /**
+     * Get event by name (only active events by default)
+     */
+    getByName(name: string, includeInactive?: boolean): Promise<IEvent | null>;
+    /**
+     * Create a new event
+     */
+    create(data: IEventCreate): Promise<IEvent>;
+    /**
+     * Update an event by ID
+     */
+    update(id: number, data: IEventUpdate): Promise<IEvent | null>;
+    /**
+     * Delete an event by ID (soft delete by setting is_active to false)
+     */
+    delete(id: number): Promise<boolean>;
+    /**
+     * Hard delete an event by ID
+     */
+    hardDelete(id: number): Promise<boolean>;
+}

package/dist/dao/event/event.dao.js

@@ -0,0 +1,162 @@
+"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.EventDAO = void 0;
+const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
+class EventDAO {
+    get knex() {
+        if (!this._knex) {
+            this._knex = KnexConnection_1.default.getConnection();
+        }
+        return this._knex;
+    }
+    /**
+     * Get all events with pagination
+     */
+    getAll() {
+        return __awaiter(this, arguments, void 0, function* (page = 1, limit = 10) {
+            const offset = (page - 1) * limit;
+            // Get paginated data
+            const data = yield this.knex("events")
+                .select("*")
+                .where("is_active", true)
+                .limit(limit)
+                .offset(offset)
+                .orderBy("created_at", "desc");
+            // Get total count
+            const totalCountResult = yield this.knex("events")
+                .where("is_active", true)
+                .count("* as count")
+                .first();
+            const totalCount = Number((totalCountResult === null || totalCountResult === void 0 ? void 0 : totalCountResult.count) || 0);
+            const count = data.length;
+            const totalPages = Math.ceil(totalCount / limit);
+            return {
+                success: true,
+                data,
+                page,
+                limit,
+                count,
+                totalCount,
+                totalPages,
+            };
+        });
+    }
+    /**
+     * Get event by ID (only active events by default)
+     */
+    getById(id_1) {
+        return __awaiter(this, arguments, void 0, function* (id, includeInactive = false) {
+            const query = this.knex("events")
+                .select("*")
+                .where("id", id);
+            if (!includeInactive) {
+                query.where("is_active", true);
+            }
+            const result = yield query.first();
+            return result || null;
+        });
+    }
+    /**
+     * Get event by UUID (only active events by default)
+     */
+    getByUuid(uuid_1) {
+        return __awaiter(this, arguments, void 0, function* (uuid, includeInactive = false) {
+            const query = this.knex("events")
+                .select("*")
+                .where("uuid", uuid);
+            if (!includeInactive) {
+                query.where("is_active", true);
+            }
+            const result = yield query.first();
+            return result || null;
+        });
+    }
+    /**
+     * Get event by name (only active events by default)
+     */
+    getByName(name_1) {
+        return __awaiter(this, arguments, void 0, function* (name, includeInactive = false) {
+            const query = this.knex("events")
+                .select("*")
+                .where("name", name);
+            if (!includeInactive) {
+                query.where("is_active", true);
+            }
+            const result = yield query.first();
+            return result || null;
+        });
+    }
+    /**
+     * Create a new event
+     */
+    create(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [result] = yield this.knex("events")
+                .insert({
+                name: data.name,
+                start_date: data.start_date || null,
+                end_date: data.end_date || null,
+                is_active: data.is_active !== undefined ? data.is_active : true,
+            })
+                .returning("*");
+            return result;
+        });
+    }
+    /**
+     * Update an event by ID
+     */
+    update(id, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updateData = {};
+            if (data.name !== undefined)
+                updateData.name = data.name;
+            if (data.start_date !== undefined)
+                updateData.start_date = data.start_date;
+            if (data.end_date !== undefined)
+                updateData.end_date = data.end_date;
+            if (data.is_active !== undefined)
+                updateData.is_active = data.is_active;
+            updateData.updated_at = new Date();
+            const [result] = yield this.knex("events")
+                .where("id", id)
+                .update(updateData)
+                .returning("*");
+            return result || null;
+        });
+    }
+    /**
+     * Delete an event by ID (soft delete by setting is_active to false)
+     */
+    delete(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.knex("events").where("id", id).update({
+                is_active: false,
+                updated_at: new Date(),
+            });
+            return result > 0;
+        });
+    }
+    /**
+     * Hard delete an event by ID
+     */
+    hardDelete(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.knex("events").where("id", id).delete();
+            return result > 0;
+        });
+    }
+}
+exports.EventDAO = EventDAO;
+//# sourceMappingURL=event.dao.js.map

package/dist/dao/event/event.dao.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event.dao.js","sourceRoot":"","sources":["../../../src/dao/event/event.dao.ts"],"names":[],"mappings":"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"}

package/dist/dao/route/route.dao.d.ts

@@ -12,11 +12,11 @@ export declare class RouteDAO implements IBaseDAO<IRoute> {
      */
     getAll(page?: number, limit?: number): Promise<IDataPaginator<IRoute>>;
     /**
-     * Get route by ID
+     * Get route by ID with joined event data
      */
     getById(id: number): Promise<IRoute | null>;
     /**
-     * Get route by UUID
+     * Get route by UUID with joined event data
      */
     getByUuid(uuid: string): Promise<IRoute | null>;
     /**
@@ -35,4 +35,12 @@ export declare class RouteDAO implements IBaseDAO<IRoute> {
      * Hard delete a route by ID
      */
     hardDelete(id: number): Promise<boolean>;
+    /**
+     * Get all routes by event ID with pagination
+     */
+    getAllByEventId(eventId: number, page?: number, limit?: number): Promise<IDataPaginator<IRoute>>;
+    /**
+     * Get all routes by event UUID with pagination
+     */
+    getAllByEventUuid(eventUuid: string, page?: number, limit?: number): Promise<IDataPaginator<IRoute>>;
 }

package/dist/dao/route/route.dao.js

@@ -25,11 +25,16 @@ class RouteDAO {
      * Parse JSON fields from database
      */
     parseRouteJson(route) {
-        return Object.assign(Object.assign({}, route), { geojson: typeof route.geojson === "string"
+        const parsed = Object.assign(Object.assign({}, route), { geojson: typeof route.geojson === "string"
                 ? JSON.parse(route.geojson)
                 : route.geojson, custom_instructions: typeof route.custom_instructions === "string"
                 ? JSON.parse(route.custom_instructions)
                 : route.custom_instructions });
+        // Handle joined event data
+        if (route.event && typeof route.event === "string") {
+            parsed.event = JSON.parse(route.event);
+        }
+        return parsed;
     }
     /**
      * Get all routes with pagination
@@ -66,25 +71,27 @@ class RouteDAO {
         });
     }
     /**
-     * Get route by ID
+     * Get route by ID with joined event data
      */
     getById(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.knex("routes")
-                .select("*")
-                .where("id", id)
+            const result = yield this.knex("routes as r")
+                .leftJoin("events as e", "r.event_id", "e.id")
+                .select("r.*", this.knex.raw("to_jsonb(e.*) as event"))
+                .where("r.id", id)
                 .first();
             return result ? this.parseRouteJson(result) : null;
         });
     }
     /**
-     * Get route by UUID
+     * Get route by UUID with joined event data
      */
     getByUuid(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.knex("routes")
-                .select("*")
-                .where("uuid", uuid)
+            const result = yield this.knex("routes as r")
+                .leftJoin("events as e", "r.event_id", "e.id")
+                .select("r.*", this.knex.raw("to_jsonb(e.*) as event"))
+                .where("r.uuid", uuid)
                 .first();
             return result ? this.parseRouteJson(result) : null;
         });
@@ -104,6 +111,7 @@ class RouteDAO {
                     : null,
                 distance: data.distance,
                 estimated_duration: data.estimated_duration,
+                event_id: data.event_id,
                 is_active: data.is_active !== undefined ? data.is_active : true,
             })
                 .returning("*");
@@ -131,6 +139,8 @@ class RouteDAO {
                 updateData.distance = data.distance;
             if (data.estimated_duration !== undefined)
                 updateData.estimated_duration = data.estimated_duration;
+            if (data.event_id !== undefined)
+                updateData.event_id = data.event_id;
             if (data.is_active !== undefined)
                 updateData.is_active = data.is_active;
             updateData.updated_at = new Date();
@@ -162,6 +172,81 @@ class RouteDAO {
             return result > 0;
         });
     }
+    /**
+     * Get all routes by event ID with pagination
+     */
+    getAllByEventId(eventId_1) {
+        return __awaiter(this, arguments, void 0, function* (eventId, page = 1, limit = 10) {
+            const offset = (page - 1) * limit;
+            // Get paginated data with event joined
+            const rawData = yield this.knex("routes as r")
+                .leftJoin("events as e", "r.event_id", "e.id")
+                .select("r.*", this.knex.raw("to_jsonb(e.*) as event"))
+                .where("r.is_active", true)
+                .where("r.event_id", eventId)
+                .limit(limit)
+                .offset(offset)
+                .orderBy("r.created_at", "desc");
+            // Parse JSON fields
+            const data = rawData.map((route) => this.parseRouteJson(route));
+            // Get total count
+            const totalCountResult = yield this.knex("routes")
+                .where("is_active", true)
+                .where("event_id", eventId)
+                .count("* as count")
+                .first();
+            const totalCount = Number((totalCountResult === null || totalCountResult === void 0 ? void 0 : totalCountResult.count) || 0);
+            const count = data.length;
+            const totalPages = Math.ceil(totalCount / limit);
+            return {
+                success: true,
+                data,
+                page,
+                limit,
+                count,
+                totalCount,
+                totalPages,
+            };
+        });
+    }
+    /**
+     * Get all routes by event UUID with pagination
+     */
+    getAllByEventUuid(eventUuid_1) {
+        return __awaiter(this, arguments, void 0, function* (eventUuid, page = 1, limit = 10) {
+            const offset = (page - 1) * limit;
+            // Get paginated data with event joined, filtering by event UUID
+            const rawData = yield this.knex("routes as r")
+                .leftJoin("events as e", "r.event_id", "e.id")
+                .select("r.*", this.knex.raw("to_jsonb(e.*) as event"))
+                .where("r.is_active", true)
+                .where("e.uuid", eventUuid)
+                .limit(limit)
+                .offset(offset)
+                .orderBy("r.created_at", "desc");
+            // Parse JSON fields
+            const data = rawData.map((route) => this.parseRouteJson(route));
+            // Get total count
+            const totalCountResult = yield this.knex("routes as r")
+                .leftJoin("events as e", "r.event_id", "e.id")
+                .where("r.is_active", true)
+                .where("e.uuid", eventUuid)
+                .count("* as count")
+                .first();
+            const totalCount = Number((totalCountResult === null || totalCountResult === void 0 ? void 0 : totalCountResult.count) || 0);
+            const count = data.length;
+            const totalPages = Math.ceil(totalCount / limit);
+            return {
+                success: true,
+                data,
+                page,
+                limit,
+                count,
+                totalCount,
+                totalPages,
+            };
+        });
+    }
 }
 exports.RouteDAO = RouteDAO;
 //# sourceMappingURL=route.dao.js.map

package/dist/dao/route/route.dao.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.dao.js","sourceRoot":"","sources":["../../../src/dao/route/route.dao.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.dao.js","sourceRoot":"","sources":["../../../src/dao/route/route.dao.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,19 +1,21 @@
-export { SundaysPackageVersionDAO } from "./dao/sundays-package-version/sundays-package-version.dao";
-export { RouteDAO } from "./dao/route/route.dao";
+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 { UserDAO } from "./dao/user/user.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 { GPSLocationDAO } from "./dao/gps-location/gps-location.dao";
-export { DriverTrackingDAO } from "./dao/driver-tracking/driver-tracking.dao";
+export { UserDAO } from "./dao/user/user.dao";
 export { IDataPaginator } from "./d.types";
-export { ISundaysPackageVersion } from "./interfaces/sundays-package-version/sundays-package-version.interfaces";
-export { IRoute, IRouteInstruction } from "./interfaces/route/route.interfaces";
+export { IDriverTracking, IDriverTrackingCreate, IDriverTrackingBatchCreate, ITrackingPoint, 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 { IUser, IUserSafe, IRefreshToken, } from "./interfaces/user/user.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 { IGPSLocation, IGPSLocationWithDistance, ITripLocationSummary, } from "./interfaces/gps-location/gps-location.interfaces";
-export { IDriverTracking, IDriverTrackingCreate, IDriverTrackingBatchCreate, ITrackingPoint, ITrackingMetadata, IActiveDriver, ITrackingSession, ITrackingFilters, } from "./interfaces/driver-tracking/driver-tracking.interfaces";
+export { IUser, IUserSafe, IRefreshToken, } from "./interfaces/user/user.interfaces";
 import KnexManager from "./KnexConnection";
 export { KnexManager };

package/dist/index.js

@@ -3,24 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KnexManager = exports.DriverTrackingDAO = exports.GPSLocationDAO = exports.TripDAO = exports.RouteAssignmentDAO = exports.UserDAO = exports.RoleDAO = exports.RouteDAO = exports.SundaysPackageVersionDAO = void 0;
+exports.KnexManager = exports.UserDAO = exports.TripDAO = exports.SundaysPackageVersionDAO = exports.RouteAssignmentDAO = exports.RouteDAO = exports.RoleDAO = exports.GPSLocationDAO = exports.EventDAO = exports.DriverTrackingDAO = void 0;
 // DAOs
-var sundays_package_version_dao_1 = require("./dao/sundays-package-version/sundays-package-version.dao");
-Object.defineProperty(exports, "SundaysPackageVersionDAO", { enumerable: true, get: function () { return sundays_package_version_dao_1.SundaysPackageVersionDAO; } });
-var route_dao_1 = require("./dao/route/route.dao");
-Object.defineProperty(exports, "RouteDAO", { enumerable: true, get: function () { return route_dao_1.RouteDAO; } });
+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 user_dao_1 = require("./dao/user/user.dao");
-Object.defineProperty(exports, "UserDAO", { enumerable: true, get: function () { return user_dao_1.UserDAO; } });
+var route_dao_1 = require("./dao/route/route.dao");
+Object.defineProperty(exports, "RouteDAO", { enumerable: true, get: function () { return route_dao_1.RouteDAO; } });
 var route_assignment_dao_1 = require("./dao/route-assignment/route-assignment.dao");
 Object.defineProperty(exports, "RouteAssignmentDAO", { enumerable: true, get: function () { return route_assignment_dao_1.RouteAssignmentDAO; } });
+var sundays_package_version_dao_1 = require("./dao/sundays-package-version/sundays-package-version.dao");
+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 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 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 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"));
 exports.KnexManager = KnexConnection_1.default;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO;AACP,yGAAqG;AAA5F,uIAAA,wBAAwB,OAAA;AACjC,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,oFAAiF;AAAxE,0HAAA,kBAAkB,OAAA;AAC3B,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,wEAAqE;AAA5D,kHAAA,cAAc,OAAA;AACvB,iFAA8E;AAArE,wHAAA,iBAAiB,OAAA;AAkC1B,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,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"}

package/dist/interfaces/event/event.interfaces.d.ts

@@ -0,0 +1,22 @@
+export interface IEvent {
+    id?: number;
+    uuid?: string;
+    name: string;
+    start_date?: Date | string | null;
+    end_date?: Date | string | null;
+    is_active?: boolean;
+    created_at?: Date | string;
+    updated_at?: Date | string;
+}
+export interface IEventCreate {
+    name: string;
+    start_date?: Date | string | null;
+    end_date?: Date | string | null;
+    is_active?: boolean;
+}
+export interface IEventUpdate {
+    name?: string;
+    start_date?: Date | string | null;
+    end_date?: Date | string | null;
+    is_active?: boolean;
+}

package/dist/interfaces/event/event.interfaces.js

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

package/dist/interfaces/event/event.interfaces.js.map

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

package/dist/interfaces/route/route.interfaces.d.ts

@@ -1,3 +1,4 @@
+import { IEvent } from "../event/event.interfaces";
 export interface IRoute {
     id?: number;
     uuid?: string;
@@ -7,6 +8,8 @@ export interface IRoute {
     custom_instructions?: any[];
     distance?: number;
     estimated_duration?: number;
+    event_id?: number;
+    event?: IEvent;
     is_active?: boolean;
     created_at?: Date;
     updated_at?: Date;

package/package.json

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