From 2866c12985fcba7c572b6e238a39a82e00c01920 Mon Sep 17 00:00:00 2001
From: Thomas Fransolet <tfransolet@thelis.be>
Date: Tue, 5 Dec 2023 15:40:51 +0100
Subject: [PATCH] Add MQTT events

---
 ManagerService/Controllers/ConfigurationController.cs | 4 ++--
 ManagerService/Controllers/DeviceController.cs        | 2 +-
 ManagerService/Controllers/SectionController.cs       | 4 ++--
 ManagerService/Extensions/MqttClientService.cs        | 6 +++---
 ManagerService/Startup.cs                             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ManagerService/Controllers/ConfigurationController.cs b/ManagerService/Controllers/ConfigurationController.cs
index a268bb9..19444c4 100644
--- a/ManagerService/Controllers/ConfigurationController.cs
+++ b/ManagerService/Controllers/ConfigurationController.cs
@@ -232,7 +232,7 @@ namespace ManagerService.Controllers
 
                 Configuration configurationModified = _configurationService.Update(updatedConfiguration.id, configuration);
 
-                // TODO HANDLE MqttClientService.PublishMessage($"config/{configurationModified.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
+                MqttClientService.PublishMessage($"config/{configurationModified.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
                 
                 List<string> sectionIds = _sectionService.GetAllIdsFromConfiguration(configuration.Id);
 
@@ -284,7 +284,7 @@ namespace ManagerService.Controllers
                     _deviceService.Update(device.Id, device);
                 }
 
-                // TODO MqttClientService.PublishMessage($"config/{id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true, isDeleted = true }));
+                MqttClientService.PublishMessage($"config/{id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true, isDeleted = true }));
 
                 return new ObjectResult("The configuration has been deleted") { StatusCode = 202 };
 
diff --git a/ManagerService/Controllers/DeviceController.cs b/ManagerService/Controllers/DeviceController.cs
index 1c004b4..4598aa2 100644
--- a/ManagerService/Controllers/DeviceController.cs
+++ b/ManagerService/Controllers/DeviceController.cs
@@ -242,7 +242,7 @@ namespace ManagerService.Controllers
 
                 Device deviceModified = _deviceService.Update(device.Id, device);
 
-                // TODO MqttClientService.PublishMessage($"player/{device.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
+                MqttClientService.PublishMessage($"player/{device.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
 
                 return new OkObjectResult(deviceModified.ToDTO());
             }
diff --git a/ManagerService/Controllers/SectionController.cs b/ManagerService/Controllers/SectionController.cs
index c013738..7354206 100644
--- a/ManagerService/Controllers/SectionController.cs
+++ b/ManagerService/Controllers/SectionController.cs
@@ -533,7 +533,7 @@ namespace ManagerService.Controllers
 
                 Section sectionModified = _sectionService.Update(updatedSection.id, section);
 
-                // TODO MqttClientService.PublishMessage($"config/{sectionModified.ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
+                MqttClientService.PublishMessage($"config/{sectionModified.ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
 
                 return new OkObjectResult(sectionModified.ToDTO());
             }
@@ -582,7 +582,7 @@ namespace ManagerService.Controllers
                 }
 
                 if (updatedSectionsOrder.Count > 0) {
-                    // TODO MqttClientService.PublishMessage($"config/{updatedSectionsOrder[0].configurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
+                    MqttClientService.PublishMessage($"config/{updatedSectionsOrder[0].configurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
                 }
 
                 return new ObjectResult("Sections order has been successfully modified") { StatusCode = 200 };
diff --git a/ManagerService/Extensions/MqttClientService.cs b/ManagerService/Extensions/MqttClientService.cs
index 7b23799..56ca6bf 100644
--- a/ManagerService/Extensions/MqttClientService.cs
+++ b/ManagerService/Extensions/MqttClientService.cs
@@ -27,9 +27,9 @@ namespace Mqtt.Client.AspNetCore.Services
 
         public MqttClientService(IMqttClientOptions options)
         {
-            var server = "localhost";
+            var server = "mymuseum.be";
 #if DEBUG
-            server = "localhost";//"192.168.31.96";
+            server = "mymuseum.be";//"192.168.31.96";
 #endif
             this.options = options;
             this.options = new MqttClientOptionsBuilder()
@@ -141,7 +141,7 @@ namespace Mqtt.Client.AspNetCore.Services
                 .WithRetainFlag(false)
                 .Build();
 
-            if (mqttClient.IsConnected)
+            if (mqttClient != null && mqttClient.IsConnected)
                 await mqttClient.PublishAsync(mqttMessage);
         }
 
diff --git a/ManagerService/Startup.cs b/ManagerService/Startup.cs
index bdea5fb..504e664 100644
--- a/ManagerService/Startup.cs
+++ b/ManagerService/Startup.cs
@@ -41,7 +41,7 @@ namespace ManagerService
         {
             Configuration = configuration;
 
-            //MapConfiguration();
+            MapConfiguration();
         }
 
         public IConfiguration Configuration { get; }
@@ -133,7 +133,7 @@ namespace ManagerService
                     };
                 });
 
-            //services.AddMqttClientHostedService();
+            services.AddMqttClientHostedService();
             services.AddScoped(typeof(ProfileLogic));
             services.AddScoped<TokensService>();
             services.AddScoped<UserDatabaseService>();