@trafficgroup/knex-rel 0.1.20 → 0.1.21

package/dist/constants/study.constants.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Study sorting constants
+ * Shared between DAO and API controller to ensure validation consistency
+ */
+export declare const VALID_STUDY_SORT_FIELDS: readonly ["created_at", "name", "type", "status"];
+export type StudySortField = (typeof VALID_STUDY_SORT_FIELDS)[number];
+/**
+ * Maps API sort field names to database column names with table aliases
+ */
+export declare const STUDY_SORT_COLUMN_MAP: Record<StudySortField, string>;

package/dist/constants/study.constants.js

@@ -0,0 +1,23 @@
+"use strict";
+/**
+ * Study sorting constants
+ * Shared between DAO and API controller to ensure validation consistency
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STUDY_SORT_COLUMN_MAP = exports.VALID_STUDY_SORT_FIELDS = void 0;
+exports.VALID_STUDY_SORT_FIELDS = [
+    "created_at",
+    "name",
+    "type",
+    "status",
+];
+/**
+ * Maps API sort field names to database column names with table aliases
+ */
+exports.STUDY_SORT_COLUMN_MAP = {
+    created_at: "s.created_at",
+    name: "s.name",
+    type: "s.type",
+    status: "s.status",
+};
+//# sourceMappingURL=study.constants.js.map

package/dist/constants/study.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"study.constants.js","sourceRoot":"","sources":["../../src/constants/study.constants.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEU,QAAA,uBAAuB,GAAG;IACrC,YAAY;IACZ,MAAM;IACN,MAAM;IACN,QAAQ;CACA,CAAC;AAGX;;GAEG;AACU,QAAA,qBAAqB,GAAmC;IACnE,UAAU,EAAE,cAAc;IAC1B,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;CACnB,CAAC"}

package/dist/dao/study/study.dao.d.ts

@@ -1,5 +1,5 @@
 import { IBaseDAO, IDataPaginator } from "../../d.types";
-import { IStudy } from "../../interfaces/study/study.interfaces";
+import { IStudy, IStudyFilters } from "../../interfaces/study/study.interfaces";
 export declare class StudyDAO implements IBaseDAO<IStudy> {
     private _knex;
     create(item: IStudy): Promise<IStudy>;
@@ -7,6 +7,6 @@ export declare class StudyDAO implements IBaseDAO<IStudy> {
     getByUuid(uuid: string): Promise<IStudy | null>;
     update(id: number, item: Partial<IStudy>): Promise<IStudy | null>;
     delete(id: number): Promise<boolean>;
-    getAll(page: number, limit: number, createdBy?: number | null): Promise<IDataPaginator<IStudy>>;
+    getAll(page: number, limit: number, filters?: IStudyFilters): Promise<IDataPaginator<IStudy>>;
     getStudiesByLocation(locationId: number): Promise<IStudy[]>;
 }

package/dist/dao/study/study.dao.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StudyDAO = void 0;
+const study_constants_1 = require("../../constants/study.constants");
 const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
 class StudyDAO {
     constructor() {
@@ -63,18 +64,21 @@ class StudyDAO {
             return result > 0;
         });
     }
-    getAll(page, limit, createdBy) {
+    getAll(page, limit, filters) {
         return __awaiter(this, void 0, void 0, function* () {
             const offset = (page - 1) * limit;
             const query = this._knex("study as s")
                 .innerJoin("users as u", "s.createdBy", "u.id")
                 .leftJoin("locations as l", "s.locationId", "l.id")
                 .select("s.*", this._knex.raw("to_jsonb(u.*) as user"), this._knex.raw("to_jsonb(l.*) as location"));
-            if (createdBy !== undefined && createdBy !== null) {
-                query.where("s.createdBy", createdBy);
-            }
             const [countResult] = yield query.clone().clearSelect().count("* as count");
             const totalCount = +countResult.count;
+            // Apply sorting
+            const sortColumn = (filters === null || filters === void 0 ? void 0 : filters.sortBy) && study_constants_1.STUDY_SORT_COLUMN_MAP[filters.sortBy]
+                ? study_constants_1.STUDY_SORT_COLUMN_MAP[filters.sortBy]
+                : "s.created_at";
+            const sortOrder = (filters === null || filters === void 0 ? void 0 : filters.sortOrder) || "DESC";
+            query.orderBy(sortColumn, sortOrder);
             const studies = yield query.clone().limit(limit).offset(offset);
             return {
                 success: true,

package/dist/dao/study/study.dao.js.map

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

package/dist/index.d.ts

@@ -15,6 +15,8 @@ export { VideoDAO } from "./dao/video/video.dao";
 export { VideoMinuteResultDAO } from "./dao/VideoMinuteResultDAO";
 export { VALID_VIDEO_SORT_FIELDS, VALID_SORT_ORDERS, VIDEO_SORT_COLUMN_MAP, } from "./constants/video.constants";
 export type { VideoSortField, SortOrder } from "./constants/video.constants";
+export { VALID_STUDY_SORT_FIELDS, STUDY_SORT_COLUMN_MAP, } from "./constants/study.constants";
+export type { StudySortField } from "./constants/study.constants";
 export { VALID_FOLDER_SORT_FIELDS, VALID_FOLDER_STATUSES, FOLDER_SORT_COLUMN_MAP, } from "./constants/folder.constants";
 export type { FolderSortField, FolderStatus, } from "./constants/folder.constants";
 export type { IFolderFilters } from "./dao/folder/folder.dao";
@@ -27,7 +29,7 @@ export { IFolder } from "./interfaces/folder/folder.interfaces";
 export { ILocation } from "./interfaces/location/location.interfaces";
 export { IMessage, IMessageCreate, IMessageUpdate, } from "./interfaces/message/message.interfaces";
 export { IReportConfiguration, IReportConfigurationData, IReportConfigurationInput, ICustomClass, IValidationResult, } from "./interfaces/report-configuration/report-configuration.interfaces";
-export { IStudy } from "./interfaces/study/study.interfaces";
+export { IStudy, IStudyFilters } from "./interfaces/study/study.interfaces";
 export { ISystemConfiguration } from "./interfaces/systemConfiguration/ISystemConfiguration";
 export { IUser } from "./interfaces/user/user.interfaces";
 export { IUserPushNotificationToken } from "./interfaces/user-push-notification-token/user-push-notification-token.interfaces";

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KnexManager = exports.FOLDER_SORT_COLUMN_MAP = exports.VALID_FOLDER_STATUSES = exports.VALID_FOLDER_SORT_FIELDS = exports.VIDEO_SORT_COLUMN_MAP = exports.VALID_SORT_ORDERS = exports.VALID_VIDEO_SORT_FIELDS = exports.VideoMinuteResultDAO = exports.VideoDAO = exports.ReconciliationLogDAO = exports.UserPushNotificationTokenDAO = exports.UserDAO = exports.SystemConfigurationDAO = exports.StudyDAO = exports.ReportConfigurationDAO = exports.MessageDAO = exports.LocationDAO = exports.FolderDAO = exports.ChatDAO = exports.CameraDAO = exports.BatchDAO = exports.AuthDAO = void 0;
+exports.KnexManager = exports.FOLDER_SORT_COLUMN_MAP = exports.VALID_FOLDER_STATUSES = exports.VALID_FOLDER_SORT_FIELDS = exports.STUDY_SORT_COLUMN_MAP = exports.VALID_STUDY_SORT_FIELDS = exports.VIDEO_SORT_COLUMN_MAP = exports.VALID_SORT_ORDERS = exports.VALID_VIDEO_SORT_FIELDS = exports.VideoMinuteResultDAO = exports.VideoDAO = exports.ReconciliationLogDAO = exports.UserPushNotificationTokenDAO = exports.UserDAO = exports.SystemConfigurationDAO = exports.StudyDAO = exports.ReportConfigurationDAO = exports.MessageDAO = exports.LocationDAO = exports.FolderDAO = exports.ChatDAO = exports.CameraDAO = exports.BatchDAO = exports.AuthDAO = void 0;
 // DAOs
 var auth_dao_1 = require("./dao/auth/auth.dao");
 Object.defineProperty(exports, "AuthDAO", { enumerable: true, get: function () { return auth_dao_1.AuthDAO; } });
@@ -40,6 +40,9 @@ var video_constants_1 = require("./constants/video.constants");
 Object.defineProperty(exports, "VALID_VIDEO_SORT_FIELDS", { enumerable: true, get: function () { return video_constants_1.VALID_VIDEO_SORT_FIELDS; } });
 Object.defineProperty(exports, "VALID_SORT_ORDERS", { enumerable: true, get: function () { return video_constants_1.VALID_SORT_ORDERS; } });
 Object.defineProperty(exports, "VIDEO_SORT_COLUMN_MAP", { enumerable: true, get: function () { return video_constants_1.VIDEO_SORT_COLUMN_MAP; } });
+var study_constants_1 = require("./constants/study.constants");
+Object.defineProperty(exports, "VALID_STUDY_SORT_FIELDS", { enumerable: true, get: function () { return study_constants_1.VALID_STUDY_SORT_FIELDS; } });
+Object.defineProperty(exports, "STUDY_SORT_COLUMN_MAP", { enumerable: true, get: function () { return study_constants_1.STUDY_SORT_COLUMN_MAP; } });
 var folder_constants_1 = require("./constants/folder.constants");
 Object.defineProperty(exports, "VALID_FOLDER_SORT_FIELDS", { enumerable: true, get: function () { return folder_constants_1.VALID_FOLDER_SORT_FIELDS; } });
 Object.defineProperty(exports, "VALID_FOLDER_STATUSES", { enumerable: true, get: function () { return folder_constants_1.VALID_FOLDER_STATUSES; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO;AACP,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,sDAAoD;AAA3C,uGAAA,SAAS,OAAA;AAClB,gDAAsE;AAA7D,mGAAA,OAAO,OAAA;AAChB,sDAAoD;AAA3C,uGAAA,SAAS,OAAA;AAClB,4DAA0D;AAAjD,2GAAA,WAAW,OAAA;AACpB,yDAAuD;AAA9C,yGAAA,UAAU,OAAA;AACnB,gGAA6F;AAApF,kIAAA,sBAAsB,OAAA;AAC/B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,2FAA0F;AAAjF,gIAAA,sBAAsB,OAAA;AAC/B,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,wHAAmH;AAA1G,gJAAA,4BAA4B,OAAA;AACrC,0FAAuF;AAA9E,8HAAA,oBAAoB,OAAA;AAC7B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,mEAAkE;AAAzD,4HAAA,oBAAoB,OAAA;AAE7B,YAAY;AACZ,+DAIqC;AAHnC,0HAAA,uBAAuB,OAAA;AACvB,oHAAA,iBAAiB,OAAA;AACjB,wHAAA,qBAAqB,OAAA;AAIvB,iEAIsC;AAHpC,4HAAA,wBAAwB,OAAA;AACxB,yHAAA,qBAAqB,OAAA;AACrB,0HAAA,sBAAsB,OAAA;AAsDxB,sEAA2C;AAClC,sBADF,wBAAW,CACE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO;AACP,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,sDAAoD;AAA3C,uGAAA,SAAS,OAAA;AAClB,gDAAsE;AAA7D,mGAAA,OAAO,OAAA;AAChB,sDAAoD;AAA3C,uGAAA,SAAS,OAAA;AAClB,4DAA0D;AAAjD,2GAAA,WAAW,OAAA;AACpB,yDAAuD;AAA9C,yGAAA,UAAU,OAAA;AACnB,gGAA6F;AAApF,kIAAA,sBAAsB,OAAA;AAC/B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,2FAA0F;AAAjF,gIAAA,sBAAsB,OAAA;AAC/B,gDAA8C;AAArC,mGAAA,OAAO,OAAA;AAChB,wHAAmH;AAA1G,gJAAA,4BAA4B,OAAA;AACrC,0FAAuF;AAA9E,8HAAA,oBAAoB,OAAA;AAC7B,mDAAiD;AAAxC,qGAAA,QAAQ,OAAA;AACjB,mEAAkE;AAAzD,4HAAA,oBAAoB,OAAA;AAE7B,YAAY;AACZ,+DAIqC;AAHnC,0HAAA,uBAAuB,OAAA;AACvB,oHAAA,iBAAiB,OAAA;AACjB,wHAAA,qBAAqB,OAAA;AAIvB,+DAGqC;AAFnC,0HAAA,uBAAuB,OAAA;AACvB,wHAAA,qBAAqB,OAAA;AAIvB,iEAIsC;AAHpC,4HAAA,wBAAwB,OAAA;AACxB,yHAAA,qBAAqB,OAAA;AACrB,0HAAA,sBAAsB,OAAA;AAsDxB,sEAA2C;AAClC,sBADF,wBAAW,CACE"}

package/dist/interfaces/study/study.interfaces.d.ts

@@ -1,5 +1,7 @@
 import type { IUser } from "../user/user.interfaces";
 import type { ILocation } from "../location/location.interfaces";
+import type { SortOrder } from "../../constants/video.constants";
+import type { StudySortField } from "../../constants/study.constants";
 export interface IStudy {
     id: number;
     uuid: string;
@@ -15,3 +17,7 @@ export interface IStudy {
     user?: IUser;
     location?: ILocation;
 }
+export interface IStudyFilters {
+    sortBy?: StudySortField;
+    sortOrder?: SortOrder;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trafficgroup/knex-rel",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Knex Module",
   "main": "dist/index.js",
   "scripts": {

package/src/constants/study.constants.ts

@@ -0,0 +1,22 @@
+/**
+ * Study sorting constants
+ * Shared between DAO and API controller to ensure validation consistency
+ */
+
+export const VALID_STUDY_SORT_FIELDS = [
+  "created_at",
+  "name",
+  "type",
+  "status",
+] as const;
+export type StudySortField = (typeof VALID_STUDY_SORT_FIELDS)[number];
+
+/**
+ * Maps API sort field names to database column names with table aliases
+ */
+export const STUDY_SORT_COLUMN_MAP: Record<StudySortField, string> = {
+  created_at: "s.created_at",
+  name: "s.name",
+  type: "s.type",
+  status: "s.status",
+};

package/src/dao/study/study.dao.ts

@@ -1,6 +1,7 @@
 import { Knex } from "knex";
 import { IBaseDAO, IDataPaginator } from "../../d.types";
-import { IStudy } from "../../interfaces/study/study.interfaces";
+import { IStudy, IStudyFilters } from "../../interfaces/study/study.interfaces";
+import { STUDY_SORT_COLUMN_MAP } from "../../constants/study.constants";
 import KnexManager from "../../KnexConnection";
 
 export class StudyDAO implements IBaseDAO<IStudy> {
@@ -57,7 +58,7 @@ export class StudyDAO implements IBaseDAO<IStudy> {
   async getAll(
     page: number,
     limit: number,
-    createdBy?: number | null,
+    filters?: IStudyFilters,
   ): Promise<IDataPaginator<IStudy>> {
     const offset = (page - 1) * limit;
 
@@ -69,12 +70,18 @@ export class StudyDAO implements IBaseDAO<IStudy> {
         this._knex.raw("to_jsonb(u.*) as user"),
         this._knex.raw("to_jsonb(l.*) as location"),
       );
-    if (createdBy !== undefined && createdBy !== null) {
-      query.where("s.createdBy", createdBy);
-    }
 
     const [countResult] = await query.clone().clearSelect().count("* as count");
     const totalCount = +countResult.count;
+
+    // Apply sorting
+    const sortColumn =
+      filters?.sortBy && STUDY_SORT_COLUMN_MAP[filters.sortBy]
+        ? STUDY_SORT_COLUMN_MAP[filters.sortBy]
+        : "s.created_at";
+    const sortOrder = filters?.sortOrder || "DESC";
+    query.orderBy(sortColumn, sortOrder);
+
     const studies = await query.clone().limit(limit).offset(offset);
 
     return {

package/src/index.ts

@@ -23,6 +23,12 @@ export {
 } from "./constants/video.constants";
 export type { VideoSortField, SortOrder } from "./constants/video.constants";
 
+export {
+  VALID_STUDY_SORT_FIELDS,
+  STUDY_SORT_COLUMN_MAP,
+} from "./constants/study.constants";
+export type { StudySortField } from "./constants/study.constants";
+
 export {
   VALID_FOLDER_SORT_FIELDS,
   VALID_FOLDER_STATUSES,
@@ -60,7 +66,7 @@ export {
   ICustomClass,
   IValidationResult,
 } from "./interfaces/report-configuration/report-configuration.interfaces";
-export { IStudy } from "./interfaces/study/study.interfaces";
+export { IStudy, IStudyFilters } from "./interfaces/study/study.interfaces";
 export { ISystemConfiguration } from "./interfaces/systemConfiguration/ISystemConfiguration";
 export { IUser } from "./interfaces/user/user.interfaces";
 export { IUserPushNotificationToken } from "./interfaces/user-push-notification-token/user-push-notification-token.interfaces";

package/src/interfaces/study/study.interfaces.ts

@@ -1,5 +1,7 @@
 import type { IUser } from "../user/user.interfaces";
 import type { ILocation } from "../location/location.interfaces";
+import type { SortOrder } from "../../constants/video.constants";
+import type { StudySortField } from "../../constants/study.constants";
 
 export interface IStudy {
   id: number;
@@ -16,3 +18,8 @@ export interface IStudy {
   user?: IUser;
   location?: ILocation;
 }
+
+export interface IStudyFilters {
+  sortBy?: StudySortField;
+  sortOrder?: SortOrder;
+}