@spytecgps/nova-orm 1.0.14 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +1 -1
  2. package/dist/repositories/deviceStatus/upsertDeviceStatuses.js +28 -22
  3. package/package.json +1 -1
package/dist/repositories/deviceStatus/upsertDeviceStatuses.js CHANGED
@@ -7,34 +7,40 @@ export const upsertDeviceStatuses = async (novaDataSource, params, logger) => {
7
7
  return novaDataSource.safeQuery(async (dataSource) => {
8
8
  const deviceStatusRepository = dataSource.getRepository(DeviceStatus);
9
9
  const deviceStatuses = params.items.map(item => {
10
- return {
10
+ const ds = {
11
11
  clientId: item.clientId,
12
12
  imei: item.imei,
13
13
  created: new Date(item.created),
14
14
  sendTime: new Date(item.sendTime),
15
15
  data: item,
16
16
  };
17
+ ds.created.setMilliseconds(0);
18
+ ds.sendTime.setMilliseconds(0);
19
+ return ds;
17
20
  });
18
- const result = await deviceStatusRepository.upsert(deviceStatuses, {
19
- conflictPaths: ['imei'],
20
- });
21
- // const values = deviceStatuses
22
- // .map(
23
- // d =>
24
- // `(${d.imei}, '${d.clientId}', '${d.created}', '${d.sendTime}', '${JSON.stringify(
25
- // d.data,
26
- // )}')`,
27
- // )
28
- // .join(', ')
29
- // const query = `
30
- // INSERT INTO deviceStatus (imei, clientId, created, sendTime, data)
31
- // VALUES ${values}
32
- // ON DUPLICATE KEY UPDATE
33
- // created = IF(VALUES(sendTime) > sendTime, VALUES(created), created),
34
- // sendTime = IF(VALUES(sendTime) > sendTime, VALUES(sendTime), sendTime),
35
- // data = IF(VALUES(sendTime) > sendTime, VALUES(data), data);
36
- // `
37
- // const result = await deviceStatusRepository.query(query)
38
- return result?.raw?.affectedRows > 0;
21
+ const values = deviceStatuses
22
+ .map(() => {
23
+ return `(?, ?, ?, ?, ?)`;
24
+ })
25
+ .join(', ');
26
+ const queryParams = deviceStatuses.reduce((acc, ds) => {
27
+ acc.push(ds.imei);
28
+ acc.push(ds.clientId);
29
+ acc.push(ds.created);
30
+ acc.push(ds.sendTime);
31
+ acc.push(JSON.stringify(ds.data));
32
+ return acc;
33
+ }, []);
34
+ const updateQueryCondition = 'VALUES(sendTime) >= sendTime';
35
+ const query = `
36
+ INSERT INTO deviceStatus (imei, clientId, created, sendTime, \`data\`)
37
+ VALUES ${values}
38
+ ON DUPLICATE KEY UPDATE
39
+ clientId = CASE WHEN ${updateQueryCondition} THEN VALUES(clientId) ELSE clientId END,
40
+ \`data\` = CASE WHEN ${updateQueryCondition} THEN VALUES(\`data\`) ELSE \`data\` END,
41
+ created = CASE WHEN ${updateQueryCondition} THEN VALUES(created) ELSE created END,
42
+ sendTime = CASE WHEN ${updateQueryCondition} THEN VALUES(sendTime) ELSE sendTime END;`;
43
+ const result = await deviceStatusRepository.query(query, queryParams);
44
+ return result?.affectedRows > 0;
39
45
  }, 'DeviceStatusRepository::upsertDeviceStatus');
40
46
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spytecgps/nova-orm",
3
- "version": "1.0.14",
3
+ "version": "1.0.15",
4
4
  "description": "ORM with PlanetScale",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",