@spytecgps/nova-orm 1.0.10 → 1.0.11

package/dist/repositories/devices/getDevices.js

@@ -40,6 +40,15 @@ export const getDevices = async (novaDataSource, params, logger) => {
         if (params.projectionOptions.withClientDeviceSettings) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('device.clientDeviceSetting', ClientDeviceSetting, 'clientDeviceSetting', 'device.imei = clientDeviceSetting.imei and device.clientId = clientDeviceSetting.clientId');
         }
+        if (params?.sortOptions?.sortField) {
+            queryBuilder = queryBuilder.orderBy(`device.${params.sortOptions.sortField}`, params?.sortOptions?.sortOrder ?? 'ASC');
+        }
+        if (params?.pagingOptions?.pageIndex) {
+            const pageSize = params?.pagingOptions?.pageSize ?? 1000;
+            const realPageIndex = (params?.pagingOptions?.pageIndex ?? 1) - 1;
+            queryBuilder = queryBuilder.offset(realPageIndex * pageSize);
+            queryBuilder = queryBuilder.limit(pageSize);
+        }
         const devices = await queryBuilder.getMany();
         return devices;
     }, 'DevicesRepository::getDevices');

package/dist/types/common.d.ts

@@ -4,3 +4,9 @@ export interface ReportPagination {
         pageIndex: number | 0;
     };
 }
+export interface OptionalReportPagination {
+    pagingOptions?: {
+        pageSize?: number;
+        pageIndex?: number;
+    };
+}

package/dist/types/devices.d.ts

@@ -1,3 +1,4 @@
+import { OptionalReportPagination } from './common';
 import { DeviceStatus } from './enums';
 export interface GetDeviceParams {
     filters: {
@@ -10,7 +11,7 @@ export interface GetDeviceParams {
         withClientDeviceSettings: boolean;
     };
 }
-export interface GetDevicesParams {
+export interface GetDevicesParams extends OptionalReportPagination {
     filters: {
         deviceTypeId?: number;
         status?: DeviceStatus;
@@ -18,9 +19,13 @@ export interface GetDevicesParams {
         imeiList?: string[];
     };
     projectionOptions: {
-        withDeviceType: boolean;
-        withIccidCarrier: boolean;
-        withClientDeviceSettings: boolean;
+        withDeviceType?: boolean;
+        withIccidCarrier?: boolean;
+        withClientDeviceSettings?: boolean;
+    };
+    sortOptions?: {
+        sortField?: 'name';
+        sortOrder?: 'ASC' | 'DESC';
     };
 }
 export interface AllImeisAreActiveForClientParams {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",