minor changes

Team-Wilhelm · May 9, 2024 · 0fb01da · 0fb01da
1 parent 1cb7f02
commit 0fb01da
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/Core/Services/ConditionsLogsService.cs b/Core/Services/ConditionsLogsService.cs
@@ -26,7 +26,8 @@ public async Task CreateConditionsLogAsync(CreateConditionsLogDto createConditio
             Light = createConditionsLogDto.Light,
             Temperature = createConditionsLogDto.Temperature,
             Humidity = createConditionsLogDto.Humidity,
-            PlantId = plantId
+            PlantId = plantId,
+            Mood = -1
         };
 
         var newMood = await CalculateMood(conditionsLog);

diff --git a/Infrastructure/ApplicationDbContext.cs b/Infrastructure/ApplicationDbContext.cs
@@ -142,6 +142,8 @@ await conditionsLogRepository.CreateConditionsLogAsync(
             {
                 ConditionsId = Guid.NewGuid(),
                 PlantId = plants[0].PlantId,
+                TimeStamp = DateTime.UtcNow,
+                Mood = 2,
                 Light = 33.0,
                 SoilMoisture = 74.0,
                 Humidity = 50.0,

diff --git a/Shared/Models/Information/ConditionsLog.cs b/Shared/Models/Information/ConditionsLog.cs
@@ -2,12 +2,12 @@ namespace Shared.Models.Information;
 
 public class ConditionsLog
 {
-    public Guid ConditionsId { get; set; }
-    public Guid PlantId { get; set; }
-    public DateTime TimeStamp { get; set; }
-    public int Mood { get; set; }
-    public double SoilMoisture { get; set; }
-    public double Light { get; set; }
-    public double Temperature { get; set; }
-    public double Humidity { get; set; }
+    public required Guid ConditionsId { get; set; }
+    public required Guid PlantId { get; set; }
+    public required DateTime TimeStamp { get; set; }
+    public required int Mood { get; set; }
+    public required double SoilMoisture { get; set; }
+    public required double Light { get; set; }
+    public required double Temperature { get; set; }
+    public required double Humidity { get; set; }
 }
diff --git a/Tests/PlantTests.cs b/Tests/PlantTests.cs
@@ -1,3 +1,4 @@
+using api.Events.Collections.Server;
 using api.Events.PlantEvents.Client;
 using api.Events.PlantEvents.Server;
 using lib;
@@ -31,7 +32,7 @@ await webSocketTestClient.DoAndAssert(new ClientWantsAllPlantsDto
             PageSize = 10
         }, receivedMessages =>
         {
-            return receivedMessages.Count(e => e.eventType == nameof(ServerSendsAllPlants)) == 1;
+            return receivedMessages.Count(e => e.eventType == nameof(ServerSendsPlantsForCollection)) == 1;
         });
     }
 

diff --git a/api/Events/Conditions/ClientWantsLatestConditionsForPlant.cs b/api/Events/Conditions/ClientWantsLatestConditionsForPlant.cs
@@ -17,10 +17,12 @@ public override async Task Handle(ClientWantsLatestConditionsForPlantDto dto, IW
     {
         var email = jwtService.GetEmailFromJwt(dto.Jwt!);
         var conditionsLog = await conditionsLogsService.GetLatestConditionsLogForPlant(dto.PlantId, email);
-        socket.SendDto(new ServerSendsLatestConditionsForPlant()
-            {
-                ConditionsLog = conditionsLog
-            }
-        );
+
+        var serverResponse = new ServerSendsLatestConditionsForPlant
+        {
+            ConditionsLog = conditionsLog
+        };
+
+        socket.SendDto(serverResponse);
     }
 }
diff --git a/api/Events/Conditions/ServerSendsLatestConditionsForPlant.cs b/api/Events/Conditions/ServerSendsLatestConditionsForPlant.cs
@@ -5,5 +5,5 @@ namespace api.Events.Conditions;
 
 public class ServerSendsLatestConditionsForPlant : BaseDto
 {
-    public required ConditionsLog ConditionsLog;
+    public required ConditionsLog ConditionsLog { get; set; }
 }
diff --git a/api/Events/PlantEvents/Client/ClientWantsPlantById.cs b/api/Events/PlantEvents/Client/ClientWantsPlantById.cs
@@ -20,7 +20,7 @@ public class ClientWantsPlantById(PlantService plantService, JwtService jwtServi
 {
     public override async Task Handle(ClientWantsPlantByIdDto dto, IWebSocketConnection socket)
     {
-        var email = jwtService.GetEmailFromJwt(dto.Jwt);
+        var email = jwtService.GetEmailFromJwt(dto.Jwt!);
         var plant = await plantService.GetPlantById(dto.PlantId, email);
         socket.SendDto(new ServerSendsPlant
         {

diff --git a/api/Extensions/WebSocketExtensions.cs b/api/Extensions/WebSocketExtensions.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using Fleck;
 using lib;
+using Serilog;
 
 namespace api.Extensions;
 
@@ -13,6 +14,7 @@ public static class WebSocketExtensions
 
     public static void SendDto<T>(this IWebSocketConnection ws, T dto) where T : BaseDto
     {
+        Log.Information("Sending message: {message}", JsonSerializer.Serialize(dto, Options));
         ws.Send(JsonSerializer.Serialize(dto, Options) ?? throw new ArgumentException("Failed to serialize dto"));
     }
 }