@spytecgps/nova-orm 1.0.61 → 1.0.62

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.
@@ -26,6 +26,7 @@ export const createPosition = async (novaDataSource, params, logger) => {
26
26
  gpsUtcTime: params.gpsUtcTime,
27
27
  externalBatteryPercentage: params.externalBatteryPercentage,
28
28
  externalPowerVoltage: params.externalPowerVoltage,
29
+ //azimuth: params.azimuth,
29
30
  };
30
31
  const createdPosition = await positionsRepository.save(newPosition);
31
32
  if (!createdPosition) {
@@ -69,6 +70,7 @@ export const upsertPositions = async (novaDataSource, params, logger) => {
69
70
  gpsUtcTime: param.gpsUtcTime,
70
71
  externalBatteryPercentage: param.externalBatteryPercentage,
71
72
  externalPowerVoltage: param.externalPowerVoltage,
73
+ //azimuth: param.azimuth,
72
74
  };
73
75
  positions.push(newPosition);
74
76
  });
@@ -1 +1 @@
1
- {"version":3,"file":"createPosition.js","sourceRoot":"","sources":["../../../src/repositories/positions/createPosition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createPosition.js","sourceRoot":"","sources":["../../../src/repositories/positions/createPosition.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { Position } from '../../entities/position';
2
+ import { mapToPositionReport } from './mapping/mapToPositionReport';
2
3
  export const getPositionsReportByClient = async (novaDataSource, params, logger) => {
3
4
  if (!params.filters.clientId) {
4
5
  return [];
@@ -64,18 +65,21 @@ export const getPositionsReportByClient = async (novaDataSource, params, logger)
64
65
  'p.actualDate as actualDate',
65
66
  'p.lat as lat',
66
67
  'p.lon as lon',
68
+ 'p.messageId as messageId',
69
+ 'p.sendTime as sendTime',
67
70
  'p.address as address',
68
71
  'p.speed as speed',
69
72
  'p.odometer as odometer',
70
73
  'p.batteryPercentage as batteryPercentage',
71
74
  'p.externalPowerVoltage as externalPowerVoltage',
72
75
  'p.externalBatteryPercentage as externalBatteryPercentage',
76
+ //'p.azimuth as azimuth', //TODO: uncomment when azimuth is available in the database
73
77
  `sub.totalCount as totalCount`,
74
78
  ])
75
79
  .limit(params.pagingOptions.pageSize)
76
80
  .offset(params.pagingOptions.pageSize * params.pagingOptions.pageIndex)
77
81
  .getRawMany();
78
- return positions;
82
+ return positions.map(mapToPositionReport);
79
83
  }
80
84
  catch (error) {
81
85
  logger.error({ error }, 'PositionsRepository::GetPositionsReportByClientId error');
@@ -1 +1 @@
1
- {"version":3,"file":"getPositionsReportByClient.js","sourceRoot":"","sources":["../../../src/repositories/positions/getPositionsReportByClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getPositionsReportByClient.js","sourceRoot":"","sources":["../../../src/repositories/positions/getPositionsReportByClient.ts"],"names":[],"mappings":"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"}
@@ -53,7 +53,7 @@ export class PositionRepository extends BaseRepository {
53
53
  this.logger.trace(params, `PositionsRepository::this.createPosition started with params`);
54
54
  const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
55
55
  const result = await upsertPositions(novaDataSource, params, this.logger);
56
- this.logger.trace(result, 'PositionsRepository::insertPositions result');
56
+ this.logger.trace({ length: result.length }, 'PositionsRepository::insertPositions result');
57
57
  return result;
58
58
  }
59
59
  /**
@@ -65,7 +65,7 @@ export class PositionRepository extends BaseRepository {
65
65
  this.logger.trace(params, `PositionsRepository::this.getPositionsByImei started with params`);
66
66
  const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
67
67
  const result = await getPositionsByImei(novaDataSource, params, this.logger);
68
- this.logger.trace(result, 'PositionsRepository::getPositionsByImei result');
68
+ this.logger.trace({ length: result.length }, 'PositionsRepository::getPositionsByImei result');
69
69
  return result;
70
70
  }
71
71
  /**
@@ -88,7 +88,7 @@ export class PositionRepository extends BaseRepository {
88
88
  this.logger.trace(params, `PositionsRepository::getPositionsReportByClientId started with params`);
89
89
  const novaDataSource = new NovaDataSource(this.novaDataSourceConfig, this.logger);
90
90
  const result = await getPositionsReportByClient(novaDataSource, params, this.logger);
91
- this.logger.trace(result, 'PositionsRepository::getPositionsReportByClientId result');
91
+ this.logger.trace({ length: result.length }, 'PositionsRepository::getPositionsReportByClientId result');
92
92
  return result;
93
93
  }
94
94
  async getLatestPositionByImei(params) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/positions/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repositories/positions/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import { Position } from '../../../entities';
2
+ import { PositionReport } from '../../../types/position';
3
+ export declare const mapToPositionReport: (position: Position & {
4
+ totalCount: number;
5
+ }) => PositionReport;
@@ -0,0 +1,21 @@
1
+ import { binaryBufferToUuidString } from '../../../utils/uuidHelpers';
2
+ export const mapToPositionReport = (position) => {
3
+ return {
4
+ imei: position.imei,
5
+ createdAt: position.createdAt,
6
+ actualDate: position.actualDate,
7
+ sendTime: position.sendTime,
8
+ messageId: binaryBufferToUuidString(position.messageId),
9
+ lat: position.lat,
10
+ lon: position.lon,
11
+ //azimuth: position.azimuth ?? 0,
12
+ address: position.address,
13
+ speed: position.speed,
14
+ odometer: position.odometer,
15
+ batteryPercentage: position.batteryPercentage,
16
+ externalPowerVoltage: position.externalPowerVoltage,
17
+ externalBatteryPercentage: position.externalBatteryPercentage,
18
+ totalCount: position.totalCount,
19
+ };
20
+ };
21
+ //# sourceMappingURL=mapToPositionReport.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mapToPositionReport.js","sourceRoot":"","sources":["../../../../src/repositories/positions/mapping/mapToPositionReport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAErE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,QAA2C,EAC3B,EAAE;IAClB,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS,EAAE,wBAAwB,CAAC,QAAQ,CAAC,SAAS,CAAC;QACvD,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,iCAAiC;QACjC,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;QACnD,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB;QAC7D,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAA;AACH,CAAC,CAAA"}
@@ -42,6 +42,8 @@ export interface PositionReport {
42
42
  imei: string;
43
43
  createdAt: Date;
44
44
  actualDate: Date;
45
+ sendTime: Date;
46
+ messageId: string;
45
47
  lat: number;
46
48
  lon: number;
47
49
  address: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spytecgps/nova-orm",
3
- "version": "1.0.61",
3
+ "version": "1.0.62",
4
4
  "description": "ORM with PlanetScale",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",