Refactor EnvironmentSensor namespace to Environment

NucuCar.Domain/Sensors/Bme680MeasurementData.cs

@@ -1,11 +0,0 @@
-namespace NucuCar.Domain.Sensors
-{
-    // TODO Make generic, reuse nucucarsensor response or modify this.
-    public class Bme680MeasurementData
-    {
-        public double Temperature { get; set; }
-        public double Humidity { get; set; }
-        public double Pressure { get; set; }
-        public double VolatileOrganicCompounds { get; set; }
-    }
-}

NucuCar.Sensors/Environment/Bme680Config.cs

@@ -1,6 +1,6 @@
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace NucuCar.Sensors.EnvironmentSensor
+namespace NucuCar.Sensors.Environment
 {
     public class Bme680Config
     {

NucuCar.Sensors/Environment/Bme680GrpcService.cs

@@ -4,7 +4,7 @@ using Grpc.Core;
 using Microsoft.Extensions.Logging;
 using NucuCarSensorsProto;
 
-namespace NucuCar.Sensors.EnvironmentSensor
+namespace NucuCar.Sensors.Environment
 {
     /// <summary>
     /// EnvironmentSensor's gRPC service.

NucuCar.Sensors/Environment/Bme680Sensor.cs

@@ -10,8 +10,16 @@ using Newtonsoft.Json;
 using NucuCar.Domain.Sensors;
 using NucuCarSensorsProto;
 
-namespace NucuCar.Sensors.EnvironmentSensor
+namespace NucuCar.Sensors.Environment
 {
+    internal class Bme680MeasurementData
+    {
+        public double Temperature { get; set; }
+        public double Humidity { get; set; }
+        public double Pressure { get; set; }
+        public double VolatileOrganicCompounds { get; set; }
+    }
+    
     /// <summary>
     /// Abstraction for the BME680 sensor.
     /// See: https://www.bosch-sensortec.com/bst/products/all_products/bme680
@@ -120,7 +128,7 @@ namespace NucuCar.Sensors.EnvironmentSensor
 
         public override string GetIdentifier()
         {
-            return nameof(EnvironmentSensor);
+            return "Bme680-Sensor";
         }
 
         public override Dictionary<string, object> GetTelemetryData()

NucuCar.Sensors/Environment/Bme680Worker.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using NucuCar.Sensors.Telemetry;
 
-namespace NucuCar.Sensors.EnvironmentSensor
+namespace NucuCar.Sensors.Environment
 {
     public class Bme680Worker : SensorWorker
     {

NucuCar.Sensors/GrpcStartup.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using NucuCar.Sensors.Environment;
 
 namespace NucuCar.Sensors
 {
@@ -29,7 +30,7 @@ namespace NucuCar.Sensors
             app.UseEndpoints(endpoints =>
             {
                 // Add the gRPC services here.
-                endpoints.MapGrpcService<EnvironmentSensor.Bme680GrpcService>();
+                endpoints.MapGrpcService<Bme680GrpcService>();
 
                 endpoints.MapGet("/",
                     async context =>

NucuCar.Sensors/Program.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using NucuCar.Sensors.EnvironmentSensor;
+using NucuCar.Sensors.Environment;
 using NucuCar.Sensors.Telemetry;
 
 namespace NucuCar.Sensors

NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor.Tests/Bme680GrpcServiceTest.cs

@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging;
 using Moq;
 using NucuCar.Domain.Sensors;
 using NucuCar.Sensors;
-using NucuCar.Sensors.EnvironmentSensor;
+using NucuCar.Sensors.Environment;
 using NucuCarSensorsProto;
 using Xunit;
 

NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor.Tests/Bme680WorkerTests.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using NucuCar.Sensors;
-using NucuCar.Sensors.EnvironmentSensor;
+using NucuCar.Sensors.Environment;
 using NucuCar.Sensors.Telemetry;
 using NucuCarSensorsProto;
 using Xunit;

NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor.Tests/TestBme680Sensor.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using NucuCar.Sensors.EnvironmentSensor;
+using NucuCar.Sensors.Environment;
 using NucuCarSensorsProto;
 
 namespace NucuCar.UnitTests.NucuCar.Sensors.Tests.EnvironmentSensor.Tests