UNOV/manager-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mqtt + changed first char of all DTO (Json deserialization fix)

Browse Source
This commit is contained in:
Thomas Fransolet 2021-07-25 00:18:15 +02:00
parent 0ee024e8ef
commit ed1e08f443
22 changed files with 407 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Manager.Interfaces/DTO/PlayerMessageDTO.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Manager.Interfaces.Models
{
public class PlayerMessageDTO
{
public bool configChanged { get; set; }
public bool isDeleted { get; set; }
}
}

26
Manager.Interfaces/DTO/SubSection/MapDTO.cs
View File

@ -7,27 +7,27 @@ namespace Manager.Interfaces.DTO
{
public class MapDTO
{
public int Zoom { get; set; } // Default = 18
public MapTypeApp MapType { get; set; } // Default = Hybrid
public List<GeoPointDTO> Points { get; set; }
public string IconResourceId { get; set; }
public string IconSource { get; set; } // url to resource id (local) or on internet
public int zoom { get; set; } // Default = 18
public MapTypeApp mapType { get; set; } // Default = Hybrid
public List<GeoPointDTO> points { get; set; }
public string iconResourceId { get; set; }
public string iconSource { get; set; } // url to resource id (local) or on internet
}
public class GeoPointDTO
{
public int Id { get; set; }
public List<TranslationDTO> Title { get; set; }
public List<TranslationDTO> Description { get; set; }
public List<ImageGeoPoint> Images { get; set; }
public string Latitude { get; set; }
public string Longitude { get; set; }
public int id { get; set; }
public List<TranslationDTO> title { get; set; }
public List<TranslationDTO> description { get; set; }
public List<ImageGeoPoint> images { get; set; }
public string latitude { get; set; }
public string longitude { get; set; }
}
public class ImageGeoPoint
{
public string ImageResourceId { get; set; }
public string ImageSource { get; set; } // url to resource id (local) or on internet
public string imageResourceId { get; set; }
public string imageSource { get; set; } // url to resource id (local) or on internet
}
public enum MapTypeApp

2
Manager.Interfaces/DTO/SubSection/MenuDTO.cs
View File

@ -7,6 +7,6 @@ namespace Manager.Interfaces.DTO
public class MenuDTO
{
//public string Title { get; set; } // Dictionary<string, object> with all languages
public List<SectionDTO> Sections { get; set; }
public List<SectionDTO> sections { get; set; }
}
}

12
Manager.Interfaces/DTO/SubSection/SliderDTO.cs
View File

@ -7,14 +7,14 @@ namespace Manager.Interfaces.DTO
{
public class SliderDTO
{
public List<ImageDTO> Images { get; set; }
public List<ImageDTO> images { get; set; }
}
public class ImageDTO {
public List<TranslationDTO> Title { get; set; }
public List<TranslationDTO> Description { get; set; }
public string ResourceId { get; set; }
public string Source { get; set; } // url to resource id (local) or on internet
public int Order { get; set; } // Order to show
public List<TranslationDTO> title { get; set; }
public List<TranslationDTO> description { get; set; }
public string resourceId { get; set; }
public string source { get; set; } // url to resource id (local) or on internet
public int order { get; set; } // Order to show
}
}

2
Manager.Interfaces/DTO/SubSection/VideoDTO.cs
View File

@ -7,6 +7,6 @@ namespace Manager.Interfaces.DTO
public class VideoDTO
{
//public string Title { get; set; } // Dictionary<string, object> with all languages
public string Source { get; set; } // url to resource id (local) or on internet
public string source { get; set; } // url to resource id (local) or on internet
}
}

2
Manager.Interfaces/DTO/SubSection/WebDTO.cs
View File

@ -7,6 +7,6 @@ namespace Manager.Interfaces.DTO
public class WebDTO
{
//public string Title { get; set; } // Dictionary<string, object> with all languages
public string Source { get; set; } // url to resource id (local) or on internet
public string source { get; set; } // url to resource id (local) or on internet
}
}

9
ManagerService/Controllers/AuthenticationController.cs
View File

@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers;
using Mqtt.Client.AspNetCore.Services;
using NSwag.Annotations;
using System;
using System.Collections.Generic;
@ -26,12 +27,16 @@ namespace ManagerService.Service.Controllers
private readonly ILogger<AuthenticationController> _logger;
private readonly TokensService _tokensService;
private readonly UserDatabaseService _UserDatabaseService;
private readonly DeviceDatabaseService _DeviceDatabaseService;
private readonly ConfigurationDatabaseService _ConfigurationDatabaseService;
public AuthenticationController(ILogger<AuthenticationController> logger, TokensService tokensService, UserDatabaseService UserDatabaseService)
public AuthenticationController(ILogger<AuthenticationController> logger, TokensService tokensService, UserDatabaseService UserDatabaseService, DeviceDatabaseService DeviceDatabaseService, ConfigurationDatabaseService ConfigurationDatabaseService)
{
_logger = logger;
_tokensService = tokensService;
_UserDatabaseService = UserDatabaseService;
_DeviceDatabaseService = DeviceDatabaseService;
_ConfigurationDatabaseService = ConfigurationDatabaseService;
}
/// <summary>
@ -55,6 +60,8 @@ namespace ManagerService.Service.Controllers
if (user == null)
throw new KeyNotFoundException("User not found");
MqttClientService.SetServices(_DeviceDatabaseService, _ConfigurationDatabaseService);
return new OkObjectResult(token);
}
catch (UnauthorizedAccessException ex)

6
ManagerService/Controllers/ConfigurationController.cs
View File

@ -9,6 +9,8 @@ using ManagerService.Service.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Mqtt.Client.AspNetCore.Services;
using Newtonsoft.Json;
using NSwag.Annotations;
namespace ManagerService.Controllers
@ -151,6 +153,8 @@ namespace ManagerService.Controllers
Configuration configurationModified = _configurationService.Update(updatedConfiguration.Id, configuration);
MqttClientService.PublishMessage($"config/{configurationModified.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
return new OkObjectResult(configurationModified.ToDTO());
}
catch (ArgumentNullException ex)
@ -189,6 +193,8 @@ namespace ManagerService.Controllers
_configurationService.Remove(id);
MqttClientService.PublishMessage($"config/{id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true, isDeleted = true }));
return new ObjectResult("The configuration has been deleted") { StatusCode = 202 };
}

4
ManagerService/Controllers/DeviceController.cs
View File

@ -12,6 +12,8 @@ using ManagerService.Service.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Mqtt.Client.AspNetCore.Services;
using Newtonsoft.Json;
using NSwag.Annotations;
namespace ManagerService.Controllers
@ -237,6 +239,8 @@ namespace ManagerService.Controllers
Device deviceModified = _deviceService.Update(device.Id, device);
MqttClientService.PublishMessage($"player/{device.Id}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
return new OkObjectResult(deviceModified.ToDTO());
}
catch (ArgumentNullException ex)

75
ManagerService/Controllers/SectionController.cs
View File

@ -4,6 +4,7 @@ using Manager.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Mqtt.Client.AspNetCore.Services;
using Newtonsoft.Json;
using NSwag.Annotations;
using System;
@ -275,17 +276,17 @@ namespace ManagerService.Controllers
switch (newSection.Type) {
case SectionType.Map:
mapDTO = new MapDTO();
mapDTO.MapType = MapTypeApp.hybrid;
mapDTO.Zoom = 18;
mapDTO.mapType = MapTypeApp.hybrid;
mapDTO.zoom = 18;
mapDTO.Points = new List<GeoPointDTO>() {
mapDTO.points = new List<GeoPointDTO>() {
new GeoPointDTO() {
Id = 0,
Title = section.Title,
Description = section.Description,
Latitude = "50.416639",
Longitude= "4.879169",
Images = new List<ImageGeoPoint>()
id = 0,
title = section.Title,
description = section.Description,
latitude = "50.416639",
longitude= "4.879169",
images = new List<ImageGeoPoint>()
}
};
@ -294,51 +295,27 @@ namespace ManagerService.Controllers
case SectionType.Slider:
sliderDTO = new SliderDTO();
ImageDTO imageDTO = new ImageDTO();
imageDTO.Title = section.Title;
imageDTO.Description = section.Description;
imageDTO.Source = null;
sliderDTO.Images = new List<ImageDTO>();
sliderDTO.Images.Add(imageDTO);
imageDTO.title = section.Title;
imageDTO.description = section.Description;
imageDTO.source = null;
sliderDTO.images = new List<ImageDTO>();
sliderDTO.images.Add(imageDTO);
section.Data = JsonConvert.SerializeObject(sliderDTO); // Include all info from specific section as JSON
break;
case SectionType.Video:
VideoDTO videoDTO = new VideoDTO();
videoDTO.Source = "";
videoDTO.source = "";
section.Data = JsonConvert.SerializeObject(videoDTO); // Include all info from specific section as JSON
break;
case SectionType.Web:
WebDTO webDTO = new WebDTO();
webDTO.Source = "";
webDTO.source = "";
section.Data = JsonConvert.SerializeObject(webDTO); // Include all info from specific section as JSON
break;
case SectionType.Menu:
MenuDTO menuDTO = new MenuDTO();
menuDTO.Sections = new List<SectionDTO>();
/*SectionDTO section0DTO = new SectionDTO();
section0DTO.IsSubSection = true;
section0DTO.Label = newSection.Label;
section0DTO.ImageId = newSection.ImageId;
section0DTO.ConfigurationId = newSection.ConfigurationId;
section0DTO.DateCreation = DateTime.Now;
section0DTO.ParentId = null;
section0DTO.Type = SectionType.Map;
section0DTO.Data = JsonConvert.SerializeObject(mapDTO);
SectionDTO section1DTO = new SectionDTO();
section0DTO.IsSubSection = true;
section0DTO.Label = newSection.Label;
section0DTO.ImageId = newSection.ImageId;
section0DTO.ConfigurationId = newSection.ConfigurationId;
section0DTO.DateCreation = DateTime.Now;
section0DTO.ParentId = null;
section0DTO.Type = SectionType.Slider;
section1DTO.IsSubSection = true;
section1DTO.Data = JsonConvert.SerializeObject(sliderDTO);*/
/*menuDTO.Sections.Add(section0DTO);
menuDTO.Sections.Add(section1DTO);*/
menuDTO.sections = new List<SectionDTO>();
section.Data = JsonConvert.SerializeObject(menuDTO); // Include all info from specific section as JSON
break;
}
@ -448,6 +425,8 @@ namespace ManagerService.Controllers
Section sectionModified = _sectionService.Update(updatedSection.Id, section);
MqttClientService.PublishMessage($"config/{sectionModified.ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
return new OkObjectResult(sectionModified.ToDTO());
}
catch (ArgumentNullException ex)
@ -494,6 +473,10 @@ namespace ManagerService.Controllers
_sectionService.Update(section.Id, section);
}
if (updatedSectionsOrder.Count > 0) {
MqttClientService.PublishMessage($"config/{updatedSectionsOrder[0].ConfigurationId}", JsonConvert.SerializeObject(new PlayerMessageDTO() { configChanged = true }));
}
return new ObjectResult("Sections order has been successfully modified") { StatusCode = 200 };
}
catch (ArgumentNullException ex)
@ -598,5 +581,15 @@ namespace ManagerService.Controllers
{
return new ObjectResult("MenuDTO") { StatusCode = 200 };
}
/// <summary>
/// Useless, just to generate dto code
/// </summary>
[ProducesResponseType(typeof(PlayerMessageDTO), 200)]
[HttpGet("PlayerMessageDTO")]
public ObjectResult PlayerMessageDTO()
{
return new ObjectResult("PlayerMessageDTO") { StatusCode = 200 };
}
}
}

10
ManagerService/Extensions/AppSettingsProvider.cs Normal file
View File

@ -0,0 +1,10 @@
using Mqtt.Client.AspNetCore.Settings;
namespace ManagerService.Extensions
{
public class AppSettingsProvider
{
public static BrokerHostSettings BrokerHostSettings;
public static ClientSettings ClientSettings;
}
}

15
ManagerService/Extensions/AspCoreMqttClientOptionBuilder.cs Normal file
View File

@ -0,0 +1,15 @@
using MQTTnet.Client.Options;
using System;
namespace Mqtt.Client.AspNetCore.Options
{
public class AspCoreMqttClientOptionBuilder : MqttClientOptionsBuilder
{
public IServiceProvider ServiceProvider { get; }
public AspCoreMqttClientOptionBuilder(IServiceProvider serviceProvider)
{
ServiceProvider = serviceProvider;
}
}
}

8
ManagerService/Extensions/BrokerHostSettings.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Mqtt.Client.AspNetCore.Settings
{
public class BrokerHostSettings
{
public string Host { set; get; }
public int Port { set; get; }
}
}

9
ManagerService/Extensions/ClientSettings.cs Normal file
View File

@ -0,0 +1,9 @@
namespace Mqtt.Client.AspNetCore.Settings
{
public class ClientSettings
{
public string Id { set; get; }
public string UserName { set; get; }
public string Password { set; get; }
}
}

11
ManagerService/Extensions/ExternalService.cs Normal file
View File

@ -0,0 +1,11 @@
namespace Mqtt.Client.AspNetCore.Services
{
public class ExternalService
{
private readonly IMqttClientService mqttClientService;
public ExternalService(MqttClientServiceProvider provider)
{
mqttClientService = provider.MqttClientService;
}
}
}

14
ManagerService/Extensions/IMqttClientService.cs Normal file
View File

@ -0,0 +1,14 @@
using Microsoft.Extensions.Hosting;
using MQTTnet.Client.Connecting;
using MQTTnet.Client.Disconnecting;
using MQTTnet.Client.Receiving;
namespace Mqtt.Client.AspNetCore.Services
{
public interface IMqttClientService : IHostedService,
IMqttClientConnectedHandler,
IMqttClientDisconnectedHandler,
IMqttApplicationMessageReceivedHandler
{
}
}

151
ManagerService/Extensions/MqttClientService.cs Normal file
View File

@ -0,0 +1,151 @@
using Manager.Interfaces.Models;
using Manager.Services;
using MQTTnet;
using MQTTnet.Client;
using MQTTnet.Client.Connecting;
using MQTTnet.Client.Disconnecting;
using MQTTnet.Client.Options;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Mqtt.Client.AspNetCore.Services
{
public class MqttClientService : IMqttClientService
{
private static IMqttClient mqttClient;
private IMqttClientOptions options;
static DeviceDatabaseService _deviceDatabaseService;
static ConfigurationDatabaseService _configurationDatabaseService;
public static string lastTopic;
public static long lastTimeTopic;
public MqttClientService(IMqttClientOptions options)
{
var server = "localhost";
#if DEBUG
server = "192.168.31.96";
#endif
this.options = options;
this.options = new MqttClientOptionsBuilder()
.WithClientId(options.ClientId)
.WithTcpServer(server)
.WithCredentials(options.Credentials.Username, options.Credentials.Password)
.WithCleanSession()
.Build();
mqttClient = new MqttFactory().CreateMqttClient();
ConfigureMqttClient();
}
private void ConfigureMqttClient()
{
mqttClient.ConnectedHandler = this;
mqttClient.DisconnectedHandler = this;
mqttClient.ApplicationMessageReceivedHandler = this;
}
public Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs e)
{
var payload = "";
if (e.ApplicationMessage.Payload != null)
{
payload = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
}
var topic = e.ApplicationMessage.Topic;
var currentTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
try
{
var deserialized = JsonConvert.DeserializeObject<Dictionary<string, object>>(payload);
switch (topic.Split("/")[0]) {
case "player":
var test = topic.Split("/")[1]; // Get device id
if (topic == "player/status") {
var deviceId = (string)deserialized["deviceId"];
var connectedStatus = (bool)deserialized["connected"];
Device device = _deviceDatabaseService.GetById(deviceId);
if (device != null)
{
device.Connected = connectedStatus;
_deviceDatabaseService.Update(device.Id, device);
}
}
break;
}
} catch (Exception ex)
{
}
return null;
}
public async Task HandleConnectedAsync(MqttClientConnectedEventArgs eventArgs)
{
System.Console.WriteLine("connected");
await mqttClient.SubscribeAsync("#");
}
public async Task HandleDisconnectedAsync(MqttClientDisconnectedEventArgs eventArgs)
{
if (!mqttClient.IsConnected)
{
await mqttClient.ReconnectAsync();
}
}
public async Task StartAsync(CancellationToken cancellationToken)
{
await mqttClient.ConnectAsync(options);
if (!mqttClient.IsConnected)
{
await mqttClient.ReconnectAsync();
}
}
public async Task StopAsync(CancellationToken cancellationToken)
{
if(cancellationToken.IsCancellationRequested)
{
var disconnectOption = new MqttClientDisconnectOptions
{
ReasonCode = MqttClientDisconnectReason.NormalDisconnection,
ReasonString = "NormalDiconnection"
};
await mqttClient.DisconnectAsync(disconnectOption, cancellationToken);
}
await mqttClient.DisconnectAsync();
}
public static async Task PublishMessage(string topic, string message)
{
var mqttMessage = new MqttApplicationMessageBuilder()
.WithTopic(topic)
.WithPayload(message)
.WithExactlyOnceQoS()
.WithRetainFlag()
.Build();
if (mqttClient.IsConnected)
await mqttClient.PublishAsync(mqttMessage);
}
public static void SetServices(DeviceDatabaseService _DeviceDatabaseService, ConfigurationDatabaseService _ConfigurationDatabaseService)
{
_deviceDatabaseService = _DeviceDatabaseService;
_configurationDatabaseService = _ConfigurationDatabaseService;
}
}
}

12
ManagerService/Extensions/MqttClientServiceProvider.cs Normal file
View File

@ -0,0 +1,12 @@
namespace Mqtt.Client.AspNetCore.Services
{
public class MqttClientServiceProvider
{
public readonly IMqttClientService MqttClientService;
public MqttClientServiceProvider(IMqttClientService mqttClientService)
{
MqttClientService = mqttClientService;
}
}
}

53
ManagerService/Extensions/ServiceCollectionExtension.cs Normal file
View File

@ -0,0 +1,53 @@
using ManagerService.Extensions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Mqtt.Client.AspNetCore.Options;
using Mqtt.Client.AspNetCore.Services;
using Mqtt.Client.AspNetCore.Settings;
using MQTTnet.Client.Options;
using System;
namespace MyCore.Service.Extensions
{
public static class ServiceCollectionExtension
{
public static IServiceCollection AddMqttClientHostedService(this IServiceCollection services)
{
services.AddMqttClientServiceWithConfig(aspOptionBuilder =>
{
var clientSettings = AppSettingsProvider.ClientSettings;
var brokerHostSettings = AppSettingsProvider.BrokerHostSettings;
aspOptionBuilder
.WithCredentials(clientSettings.UserName, clientSettings.Password)
.WithClientId(clientSettings.Id)
.WithTcpServer(brokerHostSettings.Host, brokerHostSettings.Port);
});
return services;
}
private static IServiceCollection AddMqttClientServiceWithConfig(this IServiceCollection services, Action<AspCoreMqttClientOptionBuilder> configure)
{
// No need as we implement options in service (localhost)
services.AddSingleton<IMqttClientOptions>(serviceProvider =>
{
var optionBuilder = new AspCoreMqttClientOptionBuilder(serviceProvider);
configure(optionBuilder);
return optionBuilder.Build();
});
services.AddSingleton<MqttClientService>();
services.AddSingleton<IHostedService>(serviceProvider =>
{
return serviceProvider.GetService<MqttClientService>();
});
services.AddSingleton<MqttClientServiceProvider>(serviceProvider =>
{
var mqttClientService = serviceProvider.GetService<MqttClientService>();
var mqttClientServiceProvider = new MqttClientServiceProvider(mqttClientService);
return mqttClientServiceProvider;
});
return services;
}
}
}

1
ManagerService/ManagerService.csproj
View File

@ -8,6 +8,7 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.10.0" />
<PackageReference Include="MongoDB.Driver" Version="2.12.1" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.13" />
<PackageReference Include="NSwag.AspNetCore" Version="13.10.8" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />

26
ManagerService/Startup.cs
View File

@ -2,6 +2,7 @@ using Manager.Framework.Business;
using Manager.Framework.Models;
using Manager.Interfaces.Models;
using Manager.Services;
using ManagerService.Extensions;
using ManagerService.Service;
using ManagerService.Service.Services;
using Microsoft.AspNetCore.Authentication.JwtBearer;
@ -18,6 +19,8 @@ using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Mqtt.Client.AspNetCore.Settings;
using MyCore.Service.Extensions;
using NSwag;
using NSwag.Generation.AspNetCore;
using NSwag.Generation.Processors.Security;
@ -36,10 +39,32 @@ namespace ManagerService
public Startup(IConfiguration configuration)
{
Configuration = configuration;
MapConfiguration();
}
public IConfiguration Configuration { get; }
private void MapConfiguration()
{
MapBrokerHostSettings();
MapClientSettings();
}
private void MapBrokerHostSettings()
{
BrokerHostSettings brokerHostSettings = new BrokerHostSettings();
Configuration.GetSection(nameof(BrokerHostSettings)).Bind(brokerHostSettings);
AppSettingsProvider.BrokerHostSettings = brokerHostSettings;
}
private void MapClientSettings()
{
ClientSettings clientSettings = new ClientSettings();
Configuration.GetSection(nameof(ClientSettings)).Bind(clientSettings);
AppSettingsProvider.ClientSettings = clientSettings;
}
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
@ -107,6 +132,7 @@ namespace ManagerService
};
});
services.AddMqttClientHostedService();
services.AddScoped(typeof(ProfileLogic));
services.AddScoped<TokensService>();
services.AddScoped<UserDatabaseService>();

10
ManagerService/appsettings.json
View File

@ -22,5 +22,15 @@
"Audience": "the client of your app",
"IdType": "Name",
"TokenExpiryInHours": 2
},
"BrokerHostSettings": {
"Host": "localhost",
"Port": 1883
},
"ClientSettings": {
"Id": "ManagerService",
"UserName": "admin",
"Password": "mdlf2021!"
}
}