@dative-gpi/foundation-core-domain 1.0.146 → 1.0.147-maps

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 (5) hide show
  1. package/models/alerts/alertInfos.ts +8 -0
  2. package/models/alerts/alertState.ts +9 -6
  3. package/models/deviceOrganisations/deviceOrganisationAlert.ts +3 -0
  4. package/models/deviceOrganisations/deviceOrganisationInfos.ts +6 -0
  5. package/package.json +4 -4
package/models/alerts/alertInfos.ts CHANGED
@@ -31,10 +31,12 @@ export class AlertInfos {
31
31
  triggerSourceTimestamp: number | null;
32
32
  triggerEnqueuedTimestamp: number | null;
33
33
  triggerProcessedTimestamp: number | null;
34
+ triggerActualTimestamp: number | null;
34
35
  lastState: AlertState;
35
36
  currentSourceTimestamp: number | null;
36
37
  currentEnqueuedTimestamp: number | null;
37
38
  currentProcessedTimestamp: number | null;
39
+ currentActualTimestamp: number | null;
38
40
  currentStatus: AlertStatus;
39
41
  tags: string[];
40
42
  history: AlertState[];
@@ -69,6 +71,8 @@ export class AlertInfos {
69
71
  isoToEpoch(params.triggerEnqueuedTimestamp) : null;
70
72
  this.triggerProcessedTimestamp = params.triggerProcessedTimestamp ?
71
73
  isoToEpoch(params.triggerProcessedTimestamp) : null;
74
+ this.triggerActualTimestamp = params.triggerActualTimestamp ?
75
+ isoToEpoch(params.triggerActualTimestamp) : null;
72
76
  this.lastState = new AlertState(params.lastState);
73
77
  this.currentSourceTimestamp = params.currentSourceTimestamp ?
74
78
  isoToEpoch(params.currentSourceTimestamp) : null;
@@ -76,6 +80,8 @@ export class AlertInfos {
76
80
  isoToEpoch(params.currentEnqueuedTimestamp) : null;
77
81
  this.currentProcessedTimestamp = params.currentProcessedTimestamp ?
78
82
  isoToEpoch(params.currentProcessedTimestamp) : null;
83
+ this.currentActualTimestamp = params.currentActualTimestamp ?
84
+ isoToEpoch(params.currentActualTimestamp) : null;
79
85
  this.currentStatus = params.currentStatus;
80
86
  this.tags = params.tags;
81
87
  this.history = params.history.map(dto => new AlertState(dto));
@@ -108,10 +114,12 @@ export interface AlertInfosDTO {
108
114
  triggerSourceTimestamp: string | null;
109
115
  triggerEnqueuedTimestamp: string | null;
110
116
  triggerProcessedTimestamp: string | null;
117
+ triggerActualTimestamp: string | null;
111
118
  lastState: AlertStateDTO;
112
119
  currentSourceTimestamp: string | null;
113
120
  currentEnqueuedTimestamp: string | null;
114
121
  currentProcessedTimestamp: string | null;
122
+ currentActualTimestamp: string | null;
115
123
  currentStatus: AlertStatus;
116
124
  tags: string[];
117
125
  history: AlertStateDTO[];
package/models/alerts/alertState.ts CHANGED
@@ -6,17 +6,19 @@ import { AlertDataDefinition, type AlertDataDefinitionDTO } from "./alertDataDef
6
6
  export class AlertState {
7
7
  id: string;
8
8
  status: AlertStatus;
9
- sourceTimestamp: number;
10
- enqueuedTimestamp: number;
9
+ sourceTimestamp: number | null;
10
+ enqueuedTimestamp: number | null;
11
11
  processedTimestamp: number;
12
+ actualTimestamp: number;
12
13
  metadataValues?: AlertDataDefinition[];
13
14
 
14
15
  constructor(params: AlertStateDTO) {
15
16
  this.id = params.id;
16
17
  this.status = params.status;
17
- this.sourceTimestamp = isoToEpoch(params.sourceTimestamp);
18
- this.enqueuedTimestamp = isoToEpoch(params.enqueuedTimestamp);
18
+ this.sourceTimestamp = params.sourceTimestamp ? isoToEpoch(params.sourceTimestamp) : null;
19
+ this.enqueuedTimestamp = params.enqueuedTimestamp ? isoToEpoch(params.enqueuedTimestamp) : null;
19
20
  this.processedTimestamp = isoToEpoch(params.processedTimestamp);
21
+ this.actualTimestamp = isoToEpoch(params.actualTimestamp);
20
22
  this.metadataValues = params.metadataValues?.map(dto => new AlertDataDefinition(dto));
21
23
  }
22
24
  }
@@ -24,8 +26,9 @@ export class AlertState {
24
26
  export interface AlertStateDTO {
25
27
  id: string;
26
28
  status: AlertStatus;
27
- sourceTimestamp: string;
28
- enqueuedTimestamp: string;
29
+ sourceTimestamp: string | null;
30
+ enqueuedTimestamp: string | null;
29
31
  processedTimestamp: string;
32
+ actualTimestamp: string;
30
33
  metadataValues?: AlertDataDefinitionDTO[];
31
34
  }
package/models/deviceOrganisations/deviceOrganisationAlert.ts CHANGED
@@ -8,6 +8,7 @@ export class DeviceOrganisationAlert {
8
8
  criticity: Criticity;
9
9
  sourceTimestamp?: number;
10
10
  enqueuedTimestamp?: number;
11
+ actualTimestamp: number;
11
12
 
12
13
  constructor(params: DeviceOrganisationAlertDTO) {
13
14
  this.id = params.id;
@@ -16,6 +17,7 @@ export class DeviceOrganisationAlert {
16
17
  this.criticity = params.criticity;
17
18
  this.sourceTimestamp = params.sourceTimestamp ? isoToEpoch(params.sourceTimestamp) : undefined;
18
19
  this.enqueuedTimestamp = params.enqueuedTimestamp ? isoToEpoch(params.enqueuedTimestamp) : undefined;
20
+ this.actualTimestamp = isoToEpoch(params.actualTimestamp);
19
21
  }
20
22
  }
21
23
 
@@ -26,4 +28,5 @@ export interface DeviceOrganisationAlertDTO {
26
28
  criticity: Criticity;
27
29
  sourceTimestamp?: string;
28
30
  enqueuedTimestamp?: string;
31
+ actualTimestamp: string;
29
32
  }
package/models/deviceOrganisations/deviceOrganisationInfos.ts CHANGED
@@ -24,6 +24,8 @@ export class DeviceOrganisationInfos {
24
24
  locationId: string | null;
25
25
  locationLabel: string | null;
26
26
  locationAddress: string | null;
27
+ locationLatitude: number | null;
28
+ locationLongitude: number | null;
27
29
  groupId: string | null;
28
30
  groupLabel: string | null;
29
31
  groupIcon: string | null;
@@ -61,6 +63,8 @@ export class DeviceOrganisationInfos {
61
63
  this.locationId = params.locationId;
62
64
  this.locationLabel = params.locationLabel;
63
65
  this.locationAddress = params.locationAddress;
66
+ this.locationLatitude = params.locationLatitude;
67
+ this.locationLongitude = params.locationLongitude;
64
68
  this.groupId = params.groupId;
65
69
  this.groupLabel = params.groupLabel;
66
70
  this.groupIcon = params.groupIcon;
@@ -101,6 +105,8 @@ export interface DeviceOrganisationInfosDTO {
101
105
  locationId: string | null;
102
106
  locationLabel: string | null;
103
107
  locationAddress: string | null;
108
+ locationLatitude: number | null;
109
+ locationLongitude: number | null;
104
110
  groupId: string | null;
105
111
  groupLabel: string | null;
106
112
  groupIcon: string | null;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-domain",
3
3
  "sideEffects": false,
4
- "version": "1.0.146",
4
+ "version": "1.0.147-maps",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,8 +10,8 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-shared-domain": "1.0.146",
14
- "@dative-gpi/foundation-shared-services": "1.0.146"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.147-maps",
14
+ "@dative-gpi/foundation-shared-services": "1.0.147-maps"
15
15
  },
16
- "gitHead": "6054ea411ddcd4f9f4942e5a4e7a99b6f92338a1"
16
+ "gitHead": "ae8bef1eca27c0f0c345f01c69bf851e12fec0df"
17
17
  }