fix(opcua): set oibus timestamp when server timestamp is not set

OptimistikSAS · Feb 14, 2025 · 452beb8 · 452beb8
1 parent 89a9892
commit 452beb8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/backend/src/south/south-opcua/south-opcua.spec.ts b/backend/src/south/south-opcua/south-opcua.spec.ts
@@ -629,9 +629,17 @@ describe('SouthOPCUA', () => {
 
   it('should properly query items', async () => {
     const read = jest.fn().mockReturnValue([
-      { value: { value: 1, dataType: DataType.Float }, serverTimestamp: new Date(), statusCode: { value: 0 } },
-      { value: { value: 2, dataType: DataType.Double }, serverTimestamp: new Date(), statusCode: { value: 0 } },
-      { value: { value: 3, dataType: DataType.UInt16 }, serverTimestamp: new Date(), statusCode: { value: 0 } }
+      {
+        value: { value: 1, dataType: DataType.Float },
+        sourceTimestamp: new Date(testData.constants.dates.DATE_1),
+        statusCode: { value: 0 }
+      },
+      {
+        value: { value: 2, dataType: DataType.Double },
+        serverTimestamp: new Date(testData.constants.dates.DATE_2),
+        statusCode: { value: 0 }
+      },
+      { value: { value: 3, dataType: DataType.UInt16 }, statusCode: { value: 0 } }
     ]);
     (nodeOPCUAClient.OPCUAClient.createSession as jest.Mock).mockReturnValue({ read });
     south.addContent = jest.fn();
@@ -650,15 +658,15 @@ describe('SouthOPCUA', () => {
       content: [
         {
           pointId: expectedItemsToRead[0].name,
-          timestamp: testData.constants.dates.FAKE_NOW,
+          timestamp: testData.constants.dates.DATE_1,
           data: {
             value: '1',
             quality: JSON.stringify({ value: 0 })
           }
         },
         {
           pointId: expectedItemsToRead[1].name,
-          timestamp: testData.constants.dates.FAKE_NOW,
+          timestamp: testData.constants.dates.DATE_2,
           data: {
             value: '2',
             quality: JSON.stringify({ value: 0 })

diff --git a/backend/src/south/south-opcua/south-opcua.ts b/backend/src/south/south-opcua/south-opcua.ts
@@ -632,11 +632,12 @@ export default class SouthOPCUA
         );
       }
 
+      const defaultTimestamp = DateTime.now().toUTC().toISO();
       const values = dataValues.map((dataValue: DataValue, i) => {
         const selectedTimestamp = dataValue.sourceTimestamp ?? dataValue.serverTimestamp;
         return {
           pointId: items[i].name,
-          timestamp: selectedTimestamp!.toISOString(),
+          timestamp: selectedTimestamp ? selectedTimestamp.toISOString() : defaultTimestamp,
           data: {
             value: this.parseOPCUAValue(items[i].name, dataValue.value),
             quality: JSON.stringify(dataValue.statusCode)