Merge 07c6724 into 613ccb9

Author: OleksandrChaika

Diff for: src/Mqtt/MqttMessagingProtocolJSON.cpp

@@ -81,28 +81,11 @@ namespace sua {
     std::string MqttMessagingProtocolJSON::createMessage(const class Context& ctx, const std::string& name)
     {
         if(name == "systemVersion") {
-            // clang-format off
-            const std::string tpl = jsonTemplate(R"(
-                {
-                    "timestamp": {},
-                    "payload": {
-                        "domains": [
-                            {
-                                "id": "self-update",
-                                "components": [
-                                    {
-                                        "id": "os-image",
-                                        "version": "{}"
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                }
-            )");
-            // clang-format on
-
-            return fmt::format(tpl, epochTime(), ctx.currentState.version);
+            if(ctx.desiredState.activityId.empty()) {
+                return writeSystemVersionWithoutActivityId(ctx.currentState.version);
+            } else {
+                return writeSystemVersionWithActivityId(ctx.currentState.version, ctx.desiredState.activityId);
+            }
         }
 
         if(name == "identifying") {
@@ -232,4 +215,57 @@ namespace sua {
         return fmt::format(tpl, desiredState.activityId, epochTime(), state, stateMessage, desiredState.bundleVersion, status, progress, statusMessage);
     }
 
+    std::string MqttMessagingProtocolJSON::writeSystemVersionWithoutActivityId(const std::string & version)
+    {
+        // clang-format off
+        const std::string tpl = jsonTemplate(R"(
+            {
+                "timestamp": {},
+                "payload": {
+                    "softwareNodes": [
+                        {
+                            "id": "os-image",
+                            "version": "{}",
+                            "name": "System Image",
+                            "type": "IMAGE",
+                            "parameters": []
+                        }
+                    ],
+                    "hardwareNodes": [],
+                    "associations": []
+                }
+            }
+        )");
+        // clang-format on
+
+        return fmt::format(tpl, epochTime(), version);
+    }
+
+    std::string MqttMessagingProtocolJSON::writeSystemVersionWithActivityId(const std::string & version, const std::string & activityId)
+    {
+        // clang-format off
+        const std::string tpl = jsonTemplate(R"(
+            {
+                "activityId": "{}",
+                "timestamp": {},
+                "payload": {
+                    "softwareNodes": [
+                        {
+                            "id": "os-image",
+                            "version": "{}",
+                            "name": "System Image",
+                            "type": "IMAGE",
+                            "parameters": []
+                        }
+                    ],
+                    "hardwareNodes": [],
+                    "associations": []
+                }
+            }
+        )");
+        // clang-format on
+
+        return fmt::format(tpl, activityId, epochTime(), version);
+    }
+
 } // namespace sua

Diff for: src/Mqtt/MqttMessagingProtocolJSON.h

@@ -39,6 +39,9 @@ namespace sua {
                 const std::string & state, const std::string & stateMessage,
                 const std::string & status, const std::string & statusMessage,
                 int progress) const;
+
+        std::string writeSystemVersionWithoutActivityId(const std::string & version);
+        std::string writeSystemVersionWithActivityId(const std::string & version, const std::string & activityId);
     };
 
 } // namespace sua

Diff for: utest/TestMqttMessagingProtocolJSON.cpp

@@ -82,26 +82,56 @@ namespace {
         EXPECT_EQ(s.activityId, "random-uuid-as-string");
     }
 
-    TEST_F(TestMessagingProtocolJSON, createMessage_systemVersion)
+    TEST_F(TestMessagingProtocolJSON, createMessage_systemVersionWithoutActivityId)
     {
+        ctx.desiredState.activityId = "";
         const std::string result = ProtocolJSON().createMessage(ctx, "systemVersion");
 
         // clang-format off
         const std::string expected = R"(
             {
                 "timestamp": 42,
                 "payload": {
-                    "domains": [
+                    "softwareNodes": [
                         {
-                            "id": "self-update",
-                            "components": [
-                                {
-                                    "id": "os-image",
-                                    "version": "1.0"
-                                }
-                            ]
+                            "id": "os-image",
+                            "version": "1.0",
+                            "name": "System Image",
+                            "type": "IMAGE",
+                            "parameters": []
                         }
-                    ]
+                    ],
+                    "hardwareNodes": [],
+                    "associations": []
+                }
+            }
+        )";
+        // clang-format on
+
+        EXPECT_EQ_MULTILINE(result, expected);
+    }
+
+    TEST_F(TestMessagingProtocolJSON, createMessage_systemVersionWithActivityId)
+    {
+        const std::string result = ProtocolJSON().createMessage(ctx, "systemVersion");
+
+        // clang-format off
+        const std::string expected = R"(
+            {
+                "activityId": "id",
+                "timestamp": 42,
+                "payload": {
+                    "softwareNodes": [
+                        {
+                            "id": "os-image",
+                            "version": "1.0",
+                            "name": "System Image",
+                            "type": "IMAGE",
+                            "parameters": []
+                        }
+                    ],
+                    "hardwareNodes": [],
+                    "associations": []
                 }
             }
         )";