@spytecgps/nova-orm 1.0.13 → 1.0.15

package/dist/repositories/deviceStatus/getDeviceStatuses.js

@@ -37,6 +37,9 @@ export const getDeviceStatuses = async (novaDataSource, params, logger) => {
         if (params.projectionOptions?.withClientDeviceSettings) {
             queryBuilder = queryBuilder.leftJoinAndMapOne('deviceStatus.clientDeviceSetting', ClientDeviceSetting, 'clientDeviceSetting', 'deviceStatus.imei = clientDeviceSetting.imei and deviceStatus.clientId = clientDeviceSetting.clientId');
         }
+        queryBuilder = queryBuilder
+            .limit(params.pagingOptions?.limit ?? 100)
+            .offset(params.pagingOptions?.offset ?? 0);
         const deviceStatuses = await queryBuilder.getMany();
         return deviceStatuses;
     }, 'DeviceStatusRepository::getDevice');

package/dist/repositories/deviceStatus/upsertDeviceStatuses.js

@@ -7,34 +7,40 @@ export const upsertDeviceStatuses = async (novaDataSource, params, logger) => {
     return novaDataSource.safeQuery(async (dataSource) => {
         const deviceStatusRepository = dataSource.getRepository(DeviceStatus);
         const deviceStatuses = params.items.map(item => {
-            return {
+            const ds = {
                 clientId: item.clientId,
                 imei: item.imei,
                 created: new Date(item.created),
                 sendTime: new Date(item.sendTime),
                 data: item,
             };
+            ds.created.setMilliseconds(0);
+            ds.sendTime.setMilliseconds(0);
+            return ds;
         });
-        const result = await deviceStatusRepository.upsert(deviceStatuses, {
-            conflictPaths: ['imei'],
-        });
-        // const values = deviceStatuses
-        //   .map(
-        //     d =>
-        //       `(${d.imei}, '${d.clientId}', '${d.created}', '${d.sendTime}', '${JSON.stringify(
-        //         d.data,
-        //       )}')`,
-        //   )
-        //   .join(', ')
-        // const query = `
-        //     INSERT INTO deviceStatus (imei, clientId, created, sendTime, data)
-        //     VALUES ${values}
-        //     ON DUPLICATE KEY UPDATE
-        //         created = IF(VALUES(sendTime) > sendTime, VALUES(created), created),
-        //         sendTime = IF(VALUES(sendTime) > sendTime, VALUES(sendTime), sendTime),
-        //         data = IF(VALUES(sendTime) > sendTime, VALUES(data), data);
-        // `
-        // const result = await deviceStatusRepository.query(query)
-        return result?.raw?.affectedRows > 0;
+        const values = deviceStatuses
+            .map(() => {
+            return `(?, ?, ?, ?, ?)`;
+        })
+            .join(', ');
+        const queryParams = deviceStatuses.reduce((acc, ds) => {
+            acc.push(ds.imei);
+            acc.push(ds.clientId);
+            acc.push(ds.created);
+            acc.push(ds.sendTime);
+            acc.push(JSON.stringify(ds.data));
+            return acc;
+        }, []);
+        const updateQueryCondition = 'VALUES(sendTime) >= sendTime';
+        const query = `
+        INSERT INTO deviceStatus (imei, clientId, created, sendTime, \`data\`)
+        VALUES ${values}
+        ON DUPLICATE KEY UPDATE            
+            clientId = CASE WHEN ${updateQueryCondition} THEN VALUES(clientId) ELSE clientId END,            
+            \`data\` = CASE WHEN ${updateQueryCondition} THEN VALUES(\`data\`) ELSE \`data\` END,
+            created = CASE WHEN ${updateQueryCondition} THEN VALUES(created) ELSE created END,
+            sendTime = CASE WHEN ${updateQueryCondition} THEN VALUES(sendTime) ELSE sendTime END;`;
+        const result = await deviceStatusRepository.query(query, queryParams);
+        return result?.affectedRows > 0;
     }, 'DeviceStatusRepository::upsertDeviceStatus');
 };

package/dist/types/deviceStatus.d.ts

@@ -22,6 +22,10 @@ export interface GetDeviceStatusesParams {
         withClientDeviceSettings?: boolean;
         clientDeviceSettingsProperties?: (keyof ClientDeviceSetting)[];
     };
+    pagingOptions?: {
+        limit?: number;
+        offset?: number;
+    };
 }
 export interface UpsertDeviceStatusesParams {
     items: DeviceStatusEntity[];

package/package.json

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