Preprod

Services/Devices/Devices.API/Program.cs

@@ -35,7 +35,7 @@
 
 app.UseCors();
 
-app.UseHealthChecks("/health", new HealthCheckOptions
+app.MapHealthChecks("/devices/health", new HealthCheckOptions
 {
     ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse,
 });

Services/Devices/Devices.Application/Devices/DeviceEndpoints.cs

@@ -47,6 +47,14 @@ public void AddRoutes(IEndpointRouteBuilder app)
             return Results.Ok(dtos);
         });
 
+        app.MapGet("/devices/locations/monitored", async (ISender sender) =>
+        {
+            var response = await sender.Send(new GetMonitoredLocationsCommand());
+            var dtos = response.Locations;
+
+            return Results.Ok(dtos);
+        });
+
         app.MapGet("/devices/timestamps/all", async (ISender sender) =>
         {
             var response = await sender.Send(new GetAllTimestampsCommand());

Services/Devices/Devices.Application/Devices/GetDevice/GetMonitoredLocationsCommand.cs

@@ -0,0 +1,11 @@
+namespace Devices.Application.Devices.GetDevice;
+
+public record GetMonitoredLocationsCommand() : IRequest<GetMonitoredLocationsResponse>;
+public record GetMonitoredLocationsResponse(IEnumerable<LocationDTO> Locations);
+
+public class GetMonitoredLocationsCommandValidator : AbstractValidator<GetMonitoredLocationsCommand>
+{
+    public GetMonitoredLocationsCommandValidator()
+    {
+    }
+}

Services/Devices/Devices.Application/Devices/GetDevice/GetMonitoredLocationsHandler.cs

@@ -0,0 +1,22 @@
+namespace Devices.Application.Devices.GetDevice;
+
+public class GetMonitoredLocationsHandler(DevicesDBContext context) : IRequestHandler<GetMonitoredLocationsCommand, GetMonitoredLocationsResponse>
+{
+    public async Task<GetMonitoredLocationsResponse> Handle(GetMonitoredLocationsCommand request, CancellationToken cancellationToken)
+    {
+        var monitoredLocations = await context.Devices
+            .Include(d => d.Location)
+            .Include(d => d.Status)
+            .Where(d => d.Status.Type == "Online")
+            .Select(d => d.Location)
+            .Distinct()
+            .OrderBy(l => l.Name)
+            .ToListAsync(cancellationToken);
+
+        var dtos = monitoredLocations.Adapt<List<LocationDTO>>();
+
+        var response = new GetMonitoredLocationsResponse(dtos);
+
+        return response;
+    }
+}

Services/Emulators/Emulators.Application/Consumers/DeviceGenerateMeasurementConsumer.cs

@@ -151,11 +151,27 @@ public async Task Consume(ConsumeContext<DeviceGenerateMeasurement> context)
                 .OrderByDescending(s => s.Time)
                 .FirstOrDefault();
 
+            if (previousSample is null)
+            {
+                //  Get last one 
+                previousSample = chart.Samples
+                    .OrderByDescending(x => x.Time)
+                    .FirstOrDefault();
+            }
+
             var nextSample = chart.Samples
                 .Where(s => s.Time > targetTime)
                 .OrderBy(s => s.Time)
                 .FirstOrDefault();
 
+            //  It is the 00:00
+            if (nextSample is null)
+            {
+                nextSample = chart.Samples
+                    .OrderBy(x => x.Time)
+                    .FirstOrDefault();
+            }
+
             var seconds = targetTime.Minute * 60 + targetTime.Second;
             var deltaValue = nextSample.Value - previousSample.Value;
             var deltaValuePerSec = deltaValue / (60 * 60);

Services/Emulators/Emulators.WebApp/Emulators.WebApp.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Services/Emulators/Emulators.WebApp/GlobalUsings.cs

@@ -1,2 +1,4 @@
 global using Emulators.Application;
-global using Emulators.Infrastructure;
+global using Emulators.Infrastructure;
+global using HealthChecks.UI.Client;
+global using Microsoft.AspNetCore.Diagnostics.HealthChecks;

Services/Emulators/Emulators.WebApp/Program.cs

@@ -2,12 +2,33 @@
 
 builder.Services.AddInfrastructureServices(builder.Configuration, builder.Environment);
 builder.Services.AddApplicationServices(builder.Configuration, builder.Environment);
+builder.Services.AddHealthChecks();
+
+builder.Services.AddCors(options =>
+{
+    options.AddDefaultPolicy(policy =>
+    {
+        policy.WithOrigins("http://localhost:5173")
+              .AllowAnyHeader()
+              .AllowCredentials()
+              .AllowAnyMethod();
+    });
+});
 
 builder.Configuration.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
 builder.Configuration.AddUserSecrets<Program>();
 
 var app = builder.Build();
 
+app.UseRouting();
+
+app.UseCors();
+
 app.MapGet("/", () => "Hello World!");
 
+app.MapHealthChecks("/emulators/health", new HealthCheckOptions
+{
+    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse,
+});
+
 app.Run();

Services/Gateways/Gateways.Main/appsettings.json

@@ -28,6 +28,13 @@
           "Path": "/raports-service/{**catch-all}"
         },
         "Transforms": [ { "PathPattern": "{**catch-all}" } ]
+      },
+      "emulators-route": {
+        "ClusterId": "emulators-cluster",
+        "Match": {
+          "Path": "/emulators-service/{**catch-all}"
+        },
+        "Transforms": [ { "PathPattern": "{**catch-all}" } ]
       }
     },
     "Clusters": {
@@ -51,6 +58,13 @@
             "Address": "http://raports.api:8080/"
           }
         }
+      },
+      "emulators-cluster": {
+        "Destinations": {
+          "destination1": {
+            "Address": "http://emulators.webapp:8080/"
+          }
+        }
       }
     }
   }

Services/Measurements/Measurements.API/Program.cs

@@ -28,7 +28,7 @@
 
 app.UseCors();
 
-app.UseHealthChecks("/health", new HealthCheckOptions
+app.MapHealthChecks("/measurements/health", new HealthCheckOptions
 {
     ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse,
 });

Services/Measurements/Measurements.Application/Mappers/MeasurementMapper.cs

@@ -101,6 +101,54 @@ public void Register(TypeAdapterConfig config)
             .Map(x => x.Illuminance, y => y.Illuminance)
             .Map(x => x.SoundLevel, y => y.SoundLevel);
 
+        TypeAdapterConfig<DefaultMeasurementDTO, MeasurementsMessage_CreateMeasurement>
+            .NewConfig()
+            .Map(x => x.ID, y => y.ID)
+            .Map(x => x.DeviceNumber, y => y.DeviceNumber)
+            .Map(x => x.MeasurementCaptureDate, y => y.MeasurementCaptureDate)
+            .Map(x => x.LocationHash, y => y.LocationHash)
+            .Map(x => x.Temperature, y => y.Temperature)
+            .Map(x => x.Humidity, y => y.Humidity)
+            .Map(x => x.CarbonDioxide, y => y.CarbonDioxide)
+            .Map(x => x.VolatileOrganicCompounds, y => y.VolatileOrganicCompounds)
+            .Map(x => x.ParticulateMatter1, y => y.ParticulateMatter1)
+            .Map(x => x.ParticulateMatter2v5, y => y.ParticulateMatter2v5)
+            .Map(x => x.ParticulateMatter10, y => y.ParticulateMatter10)
+            .Map(x => x.Formaldehyde, y => y.Formaldehyde)
+            .Map(x => x.CarbonMonoxide, y => y.CarbonMonoxide)
+            .Map(x => x.Ozone, y => y.Ozone)
+            .Map(x => x.Ammonia, y => y.Ammonia)
+            .Map(x => x.Airflow, y => y.Airflow)
+            .Map(x => x.AirIonizationLevel, y => y.AirIonizationLevel)
+            .Map(x => x.Oxygen, y => y.Oxygen)
+            .Map(x => x.Radon, y => y.Radon)
+            .Map(x => x.Illuminance, y => y.Illuminance)
+            .Map(x => x.SoundLevel, y => y.SoundLevel);
+
+        TypeAdapterConfig<MeasurementsMessage_CreateMeasurement, DefaultMeasurementDTO>
+            .NewConfig()
+            .Map(x => x.ID, y => y.ID)
+            .Map(x => x.DeviceNumber, y => y.DeviceNumber)
+            .Map(x => x.MeasurementCaptureDate, y => y.MeasurementCaptureDate)
+            .Map(x => x.LocationHash, y => y.LocationHash)
+            .Map(x => x.Temperature, y => y.Temperature)
+            .Map(x => x.Humidity, y => y.Humidity)
+            .Map(x => x.CarbonDioxide, y => y.CarbonDioxide)
+            .Map(x => x.VolatileOrganicCompounds, y => y.VolatileOrganicCompounds)
+            .Map(x => x.ParticulateMatter1, y => y.ParticulateMatter1)
+            .Map(x => x.ParticulateMatter2v5, y => y.ParticulateMatter2v5)
+            .Map(x => x.ParticulateMatter10, y => y.ParticulateMatter10)
+            .Map(x => x.Formaldehyde, y => y.Formaldehyde)
+            .Map(x => x.CarbonMonoxide, y => y.CarbonMonoxide)
+            .Map(x => x.Ozone, y => y.Ozone)
+            .Map(x => x.Ammonia, y => y.Ammonia)
+            .Map(x => x.Airflow, y => y.Airflow)
+            .Map(x => x.AirIonizationLevel, y => y.AirIonizationLevel)
+            .Map(x => x.Oxygen, y => y.Oxygen)
+            .Map(x => x.Radon, y => y.Radon)
+            .Map(x => x.Illuminance, y => y.Illuminance)
+            .Map(x => x.SoundLevel, y => y.SoundLevel);
+
         //  --------------- Mappings with dtos types ---------------
         TypeAdapterConfig<DefaultMeasurementDTO, Measurement>
             .NewConfig()

Services/Raports/Raports.API/Program.cs

@@ -22,9 +22,11 @@
 
 app.UseApplicationServices();
 
+app.UseRouting();
+
 app.UseCors();
 
-app.UseHealthChecks("/health", new HealthCheckOptions
+app.MapHealthChecks("/raports/health", new HealthCheckOptions
 {
     ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse,
 });