@spytecgps/nova-orm 1.0.37 → 1.0.38
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.
|
@@ -5,12 +5,12 @@ import { uuidStringToBinaryBuffer } from '../../utils/uuidHelpers';
|
|
|
5
5
|
export const getLiveLinkData = async (novaDataSource, params, logger, deviceStatusRepository) => {
|
|
6
6
|
if (!params?.filters?.id || !params?.filters?.clientId) {
|
|
7
7
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinkData - missing required parameters');
|
|
8
|
-
return {
|
|
8
|
+
return { trackersWithStatus: [] };
|
|
9
9
|
}
|
|
10
10
|
const binaryBuffer = uuidStringToBinaryBuffer(params?.filters?.id);
|
|
11
11
|
if (!binaryBuffer?.length) {
|
|
12
12
|
logger.warn({ params }, 'LiveLinksRepository::getLiveLinkData - id should be a valid UUID');
|
|
13
|
-
return {
|
|
13
|
+
return { trackersWithStatus: [] };
|
|
14
14
|
}
|
|
15
15
|
return novaDataSource.safeQuery(async (dataSource) => {
|
|
16
16
|
const liveLinksRepository = dataSource.getRepository(LiveLink);
|
|
@@ -20,10 +20,10 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
20
20
|
.andWhere('clientId = :clientId', { clientId: params.filters.clientId });
|
|
21
21
|
const liveLink = await queryBuilder.getOne();
|
|
22
22
|
if (!liveLink) {
|
|
23
|
-
return {
|
|
23
|
+
return { trackersWithStatus: [] };
|
|
24
24
|
}
|
|
25
25
|
const result = {
|
|
26
|
-
|
|
26
|
+
trackersWithStatus: [],
|
|
27
27
|
};
|
|
28
28
|
const devices = liveLink.devices;
|
|
29
29
|
if (liveLink.deviceAccess === 'limited' && !devices?.length) {
|
|
@@ -58,7 +58,7 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
58
58
|
offset: params.pagingOptions?.pageIndex ?? 0,
|
|
59
59
|
},
|
|
60
60
|
});
|
|
61
|
-
result.
|
|
61
|
+
result.trackersWithStatus.push(...deviceStatuses.map(deviceStatus => {
|
|
62
62
|
const data = deviceStatus?.data;
|
|
63
63
|
return {
|
|
64
64
|
imei: deviceStatus.imei,
|
|
@@ -67,17 +67,19 @@ export const getLiveLinkData = async (novaDataSource, params, logger, deviceStat
|
|
|
67
67
|
deviceTypeId: deviceStatus.device?.deviceTypeId,
|
|
68
68
|
color: deviceStatus.device?.color,
|
|
69
69
|
icon: deviceStatus.device?.icon,
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
70
|
+
status: {
|
|
71
|
+
latitude: tryParseFloat(data?.latitude) ?? undefined,
|
|
72
|
+
longitude: tryParseFloat(data?.longitude) ?? undefined,
|
|
73
|
+
address: data?.address ?? undefined,
|
|
74
|
+
sendTime: tryParseDate(data?.sendTime) ?? undefined,
|
|
75
|
+
odoMileage: tryParseFloat(data?.odoMileage) ?? undefined,
|
|
76
|
+
batteryPercentage: tryParseFloat(data?.batteryPercentage) ?? undefined,
|
|
77
|
+
speed: tryParseFloat(data?.speed) ?? undefined,
|
|
78
|
+
hoursOfOperation: tryParseFloat(data?.hoursOfOperation) ?? undefined,
|
|
79
|
+
batteryVoltage: tryParseFloat(data?.batteryVoltage) ?? undefined,
|
|
80
|
+
externalPowerVoltage: tryParseFloat(data?.externalPowerVoltage) ?? undefined,
|
|
81
|
+
reportType: tryParseFloat(data?.reportType) ?? undefined,
|
|
82
|
+
},
|
|
81
83
|
};
|
|
82
84
|
}));
|
|
83
85
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,cAA8B,EAC9B,MAA6B,EAC7B,MAAc,EACd,sBAA8C,EACvB,EAAE;IACzB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACtD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"getLiveLinkData.js","sourceRoot":"","sources":["../../../src/repositories/liveLinks/getLiveLinkData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAGlE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,cAA8B,EAC9B,MAA6B,EAC7B,MAAc,EACd,sBAA8C,EACvB,EAAE;IACzB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;QACtD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,oEAAoE,CAAC,CAAA;QAC7F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,MAAM,YAAY,GAAG,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAElE,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,kEAAkE,CAAC,CAAA;QAC3F,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;KAClC;IAED,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,UAA0B,EAAyB,EAAE;QAC1F,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAE9D,MAAM,YAAY,GAAG,mBAAmB;aACrC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aAC1C,QAAQ,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QAE1E,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAE5C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;SAClC;QAED,MAAM,MAAM,GAAiB;YAC3B,kBAAkB,EAAE,EAAE;SACvB,CAAA;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAmB,CAAA;QAE5C,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;YAC3D,OAAO,MAAM,CAAA;SACd;QAED,MAAM,OAAO,GACX,QAAQ,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAA;QAE/F,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC,iBAAiB,CAAC;YACpE,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;gBACvC,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;aACxC;YACD,iBAAiB,EAAE;gBACjB,UAAU,EAAE,IAAI;gBAChB,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC;gBAClF,sBAAsB,EAAE;oBACtB,UAAU;oBACV,WAAW;oBACX,SAAS;oBACT,UAAU;oBACV,YAAY;oBACZ,mBAAmB;oBACnB,OAAO;oBACP,kBAAkB;oBAClB,gBAAgB;oBAChB,sBAAsB;oBACtB,YAAY;iBACb;aACF;YACD,aAAa,EAAE;gBACb,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,QAAQ,IAAI,GAAG;gBAC5C,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,CAAC;aAC7C;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAC5B,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACnC,MAAM,IAAI,GAAG,YAAY,EAAE,IAAW,CAAA;YAEtC,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,WAAW,EAAE,YAAY,CAAC,MAAM,EAAE,WAAW;gBAC7C,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY;gBAC/C,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK;gBACjC,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI;gBAC/B,MAAM,EAAE;oBACN,QAAQ,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACpD,SAAS,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,SAAS;oBACtD,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,SAAS;oBACnC,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS;oBACnD,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;oBACxD,iBAAiB,EAAE,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,SAAS;oBACtE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,SAAS;oBAC9C,gBAAgB,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,SAAS;oBACpE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,SAAS;oBAChE,oBAAoB,EAAE,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,SAAS;oBAC5E,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,SAAS;iBACzD;aACF,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC,EAAE,sCAAsC,CAAC,CAAA;AAC5C,CAAC,CAAA"}
|
|
@@ -58,25 +58,27 @@ export interface GetLiveLinkDataCountParams {
|
|
|
58
58
|
minSendTime?: Date;
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
-
export interface
|
|
61
|
+
export interface TrackerWithStatus {
|
|
62
62
|
imei: string;
|
|
63
63
|
name: string;
|
|
64
64
|
description?: string;
|
|
65
65
|
deviceTypeId: number;
|
|
66
66
|
color?: string;
|
|
67
67
|
icon?: string;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
68
|
+
status: {
|
|
69
|
+
latitude?: number;
|
|
70
|
+
longitude?: number;
|
|
71
|
+
address?: string;
|
|
72
|
+
sendTime?: Date;
|
|
73
|
+
odoMileage?: number;
|
|
74
|
+
batteryPercentage?: number;
|
|
75
|
+
speed?: number;
|
|
76
|
+
hoursOfOperation?: number;
|
|
77
|
+
batteryVoltage?: number;
|
|
78
|
+
externalPowerVoltage?: number;
|
|
79
|
+
reportType?: number;
|
|
80
|
+
};
|
|
79
81
|
}
|
|
80
82
|
export interface LiveLinkData {
|
|
81
|
-
|
|
83
|
+
trackersWithStatus: TrackerWithStatus[];
|
|
82
84
|
}
|