Merge pull request #33 from Team-Wilhelm/final-tweaks

Small changes
Team-Wilhelm · May 28, 2024 · 8bd1d9b · 8bd1d9b
2 parents 25ea313 + 935ebb2
commit 8bd1d9b
Show file tree

Hide file tree

Showing 27 changed files with 234 additions and 111 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -35,7 +35,4 @@ jobs:
           MQTT_CLIENT_ID: ${{ secrets.MQTT_CLIENT_ID }}
           MQTT_SUBSCRIBE_TOPIC: ${{ secrets.MQTT_SUBSCRIBE_TOPIC }}
           MQTT_PUBLISH_TOPIC: ${{ secrets.MQTT_PUBLISH_TOPIC }}
-
-          AZURE_VISION_KEY: ${{ secrets.AZURE_VISION_KEY }}
-          AZURE_VISION_ENDPOINT: ${{ secrets.AZURE_VISION_ENDPOINT }}
         run: cd Tests && dotnet test
diff --git a/Infrastructure/Repositories/CollectionsRepository.cs b/Infrastructure/Repositories/CollectionsRepository.cs
@@ -67,11 +67,4 @@ public async Task RemovePlantFromCollection(Collection collection, Plant plant)
         collection.Plants.Remove(plant);
         await applicationDbContext.SaveChangesAsync();
     }
-
-    public async Task<int> GetTotalCollectionsCount(string email)
-    {
-        await using var applicationDbContext = await dbContextFactory.CreateDbContextAsync();
-        return await applicationDbContext.Collections
-            .CountAsync(collection => collection.UserEmail == email);
-    }
 }
diff --git a/Infrastructure/Repositories/PlantRepository.cs b/Infrastructure/Repositories/PlantRepository.cs
@@ -114,20 +114,21 @@ public async Task<List<Plant>> GetCriticalPlants(string requesterEmail)
             .Select(p => p.Plant)
             .ToListAsync();
     }
-
-    public async Task<int> GetHappyPlantsCount(string userEmail)
+    public async Task<Stats> GetStats(string userEmail)
     {
         await using var context = await dbContextFactory.CreateDbContextAsync();
-        return await context.Plants
+        var totalPlants = await context.Plants.CountAsync(p => p.UserEmail == userEmail);
+        var happyPlants = await context.Plants
             .Include(plant => plant.ConditionsLogs)
             .Where(p => p.UserEmail == userEmail && p.ConditionsLogs.Count != 0)
             .CountAsync(p => p.ConditionsLogs.OrderByDescending(log => log.TimeStamp).FirstOrDefault()!.Mood > 2);
-    }
+        var collections = await context.Collections.CountAsync(c => c.UserEmail == userEmail);
 
-    public async Task<int> GetTotalPlantsCount(string userEmail)
-    {
-        await using var context = await dbContextFactory.CreateDbContextAsync();
-        return await context.Plants
-            .CountAsync(p => p.UserEmail == userEmail);
+        return new Stats
+        {
+            TotalPlants = totalPlants,
+            HappyPlants = happyPlants,
+            Collections = collections
+        };
     }
 }
diff --git a/Shared/Models/Stats.cs b/Shared/Models/Stats.cs
@@ -0,0 +1,8 @@
+namespace Shared.Models;
+
+public class Stats
+{
+    public int TotalPlants { get; set; }
+    public int HappyPlants { get; set; }
+    public int Collections { get; set; }
+}
diff --git a/Tests/PlantTests.cs b/Tests/PlantTests.cs
@@ -1,4 +1,3 @@
-using api.Events.Collections.Server;
 using api.Events.PlantEvents.Client;
 using api.Events.PlantEvents.Server;
 using lib;
@@ -15,16 +14,24 @@ public async Task CreatePlant()
     {
         var jwtAndEmail = await SignUpAndLogIn();
         var jwt = jwtAndEmail[DictionaryKeys.Jwt];
-        var email = jwtAndEmail[DictionaryKeys.Email];
-        var createPlantDto = GenerateRandomCreatePlantDto(email);
+        var createPlantDto = GenerateRandomCreatePlantDto();
 
         var webSocketTestClient = await new WebSocketTestClient().ConnectAsync();
 
         await webSocketTestClient.DoAndAssert(new ClientWantsToCreatePlantDto { CreatePlantDto = createPlantDto, Jwt = jwt }, receivedMessages =>
         {
             return receivedMessages.Count(e => e.eventType == nameof(ServerSavesPlant)) == 1;
         });
-
+    }
+
+    [Test]
+    public async Task GetAllPlants()
+    {
+        var jwtAndEmail = await SignUpAndLogIn();
+        var jwt = jwtAndEmail[DictionaryKeys.Jwt];
+
+        var webSocketTestClient = await new WebSocketTestClient().ConnectAsync();
+
         await webSocketTestClient.DoAndAssert(new ClientWantsAllPlantsDto
         {
             Jwt = jwt,
@@ -36,7 +43,7 @@ await webSocketTestClient.DoAndAssert(new ClientWantsAllPlantsDto
         });
     }
 
-    private CreatePlantDto GenerateRandomCreatePlantDto(string email)
+    private CreatePlantDto GenerateRandomCreatePlantDto()
     {
         var createPlantDto = new CreatePlantDto
         {

diff --git a/Tests/TestBase.cs b/Tests/TestBase.cs
@@ -35,8 +35,10 @@ await webSocketTestClient.DoAndAssert(new ClientWantsToSignUpDto { RegisterUserD
 
         var jwtSubscription = webSocketTestClient.Client.MessageReceived.Subscribe(msg =>
         {
+            var eventType = JsonSerializer.Deserialize<BaseDto>(msg.Text).eventType;
+            if (eventType != nameof(ServerAuthenticatesUser)) return;
             var serverAuthenticates = JsonSerializer.Deserialize<ServerAuthenticatesUser>(msg.Text, options: new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-            jwt = serverAuthenticates.Jwt;
+            jwt = serverAuthenticates!.Jwt;
         });
         webSocketTestClient.Send(new ClientWantsToLogInDto { LoginDto = loginDto });
 

diff --git a/Tests/WebSocketTestClient.cs b/Tests/WebSocketTestClient.cs
@@ -0,0 +1,69 @@
+using System.Text.Json;
+using api.Events.Global;
+using lib;
+using Websocket.Client;
+
+namespace Tests
+{
+    public class WebSocketTestClient
+    {
+        public readonly WebsocketClient Client;
+        public readonly List<BaseDto> ReceivedMessages = [];
+        private static readonly JsonSerializerOptions JsonSerializerOptions = new()
+        {
+            PropertyNameCaseInsensitive = true
+        };
+
+        public WebSocketTestClient(string? url = null)
+        {
+            Client = url == null ? new WebsocketClient(new Uri("ws://localhost:" + (Environment.GetEnvironmentVariable("FULLSTACK_API_PORT") ?? "8181"))) : new WebsocketClient(new Uri(url));
+            Client.MessageReceived.Subscribe(msg =>
+            {
+                BaseDto baseDto = JsonSerializer.Deserialize<BaseDto>(msg.Text, JsonSerializerOptions);
+
+                if (baseDto.eventType == "ServerSendsErrorMessage" || baseDto.eventType.Contains("ServerResponds") ||
+                    baseDto.eventType.Contains("ServerRejects"))
+                {
+                    var error = JsonSerializer.Deserialize<ServerSendsErrorMessage>(msg.Text, JsonSerializerOptions);
+                    Console.WriteLine("Error: " + error!.Error);
+                }
+
+                lock (ReceivedMessages)
+                    ReceivedMessages.Add(baseDto);
+            });
+        }
+
+        public async Task<WebSocketTestClient> ConnectAsync()
+        {
+            await Client.Start();
+            if (!Client.IsRunning)
+                throw new Exception("Could not start client!");
+            return this;
+        }
+
+        public void Send<T>(T dto) where T : BaseDto
+        {
+            Client.Send(JsonSerializer.Serialize(dto));
+        }
+
+        public async Task DoAndAssert<T>(T? action = null, Func<List<BaseDto>, bool>? condition = null) where T : BaseDto
+        {
+            if ((object) (T) action != null)
+                Send(action);
+            if (condition != null)
+            {
+                DateTime startTime = DateTime.UtcNow;
+                while (DateTime.UtcNow - startTime < TimeSpan.FromSeconds(5.0))
+                {
+                    lock (ReceivedMessages)
+                    {
+                        if (condition(ReceivedMessages))
+                            return;
+                    }
+                    await Task.Delay(100);
+                }
+                throw new TimeoutException("Condition not met: ");
+            }
+        }
+    }
+}
diff --git a/api/Core/Services/CollectionsService.cs b/api/Core/Services/CollectionsService.cs
@@ -74,9 +74,4 @@ private async Task<Collection> VerifyCollectionExistsAndUserHasAccess(Guid colle
         if (collection.UserEmail != loggedInUser) throw new NoAccessException("You don't have access to this collection");
         return collection;
     }
-
-    public async Task<int> GetTotalCollectionsCount(string email)
-    {
-        return await collectionsRepository.GetTotalCollectionsCount(email);
-    }
 }
diff --git a/api/Core/Services/PlantService.cs b/api/Core/Services/PlantService.cs
@@ -134,16 +134,6 @@ public async Task<List<GetCriticalPlantDto>> GetCriticalPlants(string requesterE
 
         return criticalPlants;
     }
-
-    public async Task<int> GetHappyPlantsCount(string userEmail)
-    {
-        return await plantRepository.GetHappyPlantsCount(userEmail);
-    }
-
-    public async Task<int> GetTotalPlantsCount(string userEmail)
-    {
-        return await plantRepository.GetTotalPlantsCount(userEmail);
-    }
 
     private string GenerateRandomNickname()
     {

diff --git a/api/Core/Services/StatsService.cs b/api/Core/Services/StatsService.cs
@@ -0,0 +1,13 @@
+using Infrastructure.Repositories;
+using Shared.Dtos;
+using Shared.Models;
+
+namespace api.Core.Services;
+
+public class StatsService(PlantRepository plantRepository)
+{
+    public async Task<Stats> GetStats(string email)
+    {
+        return await plantRepository.GetStats(email);
+    }
+}
diff --git a/api/EnvironmentHelper.cs b/api/EnvironmentHelper.cs
@@ -0,0 +1,26 @@
+namespace api;
+
+public static class EnvironmentHelper
+{
+    private static readonly List<string?> NonProdEnvironments = ["Development", "Testing"];
+
+    public static bool IsTesting()
+    {
+        return Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Testing";
+    }
+
+    public static bool IsDevelopment()
+    {
+        return Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development";
+    }
+
+    public static bool IsNonProd()
+    {
+        return NonProdEnvironments.Contains(Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"));
+    }
+
+    public static bool IsCi()
+    {
+        return Environment.GetEnvironmentVariable("CI") == "true";
+    }
+}
diff --git a/api/Events/Auth/Client/ClientWantsToLogIn.cs b/api/Events/Auth/Client/ClientWantsToLogIn.cs
@@ -44,7 +44,8 @@ public override async Task Handle(ClientWantsToLogInDto dto, IWebSocketConnectio
             Jwt = jwt,
 
         });
-        socket.SendDto(new ServerSendsUserInfo
+
+       socket.SendDto(new ServerSendsUserInfo
         {
             GetUserDto = getUserDto
         });

diff --git a/api/Events/Auth/Client/ClientWantsToLogOut.cs b/api/Events/Auth/Client/ClientWantsToLogOut.cs
@@ -12,7 +12,7 @@ public class ClientWantsToLogOut(WebSocketConnectionService connectionService)
 {
     public override Task Handle(ClientWantsToLogOutDto dto, IWebSocketConnection socket)
     {
-        connectionService.RemoveConnection(socket);
+        connectionService.RemoveEmailFromConnection(socket);
         socket.SendDto(new ServerLogsOutUser());
         return Task.CompletedTask;
     }

diff --git a/api/Events/Collections/Client/ClientWantsToCreateCollection.cs b/api/Events/Collections/Client/ClientWantsToCreateCollection.cs
@@ -1,5 +1,6 @@
 using api.Core.Services;
 using api.Events.Collections.Server;
+using api.Events.Statistics;
 using api.Extensions;
 using Fleck;
 using lib;
@@ -13,16 +14,20 @@ public class ClientWantsToCreateCollectionDto : BaseDtoWithJwt
     public required CreateCollectionDto CreateCollectionDto { get; set; }
 }
 
-public class ClientWantsToCreateCollection(CollectionsService collectionsService, JwtService jwtService) : BaseEventHandler<ClientWantsToCreateCollectionDto>
+public class ClientWantsToCreateCollection(CollectionsService collectionsService, JwtService jwtService, StatsService statsService) : BaseEventHandler<ClientWantsToCreateCollectionDto>
 {
     public override async Task Handle(ClientWantsToCreateCollectionDto dto, IWebSocketConnection socket)
     {
         var email = jwtService.GetEmailFromJwt(dto.Jwt!);
         await collectionsService.CreateCollection(dto.CreateCollectionDto, email);
         var allCollections = await collectionsService.GetCollectionsForUser(email);
+        var stats = await statsService.GetStats(email);
+
         socket.SendDto(new ServerSendsAllCollections()
         {
             Collections = allCollections.ToList()
         });
+
+        socket.SendDto(new ServerSendsStats{Stats = stats});
     }
 }
diff --git a/api/Events/Collections/Client/ClientWantsToDeleteCollection.cs b/api/Events/Collections/Client/ClientWantsToDeleteCollection.cs
@@ -1,5 +1,6 @@
 using api.Core.Services;
 using api.Events.Collections.Server;
+using api.Events.Statistics;
 using api.Extensions;
 using Fleck;
 using lib;
@@ -13,16 +14,20 @@ public class ClientWantsToDeleteCollectionDto : BaseDtoWithJwt
     public Guid CollectionId { get; set; }
 }
 
-public class ClientWantsToDeleteCollection(CollectionsService collectionsService, JwtService jwtService) : BaseEventHandler<ClientWantsToDeleteCollectionDto>
+public class ClientWantsToDeleteCollection(CollectionsService collectionsService, JwtService jwtService, StatsService statsService) : BaseEventHandler<ClientWantsToDeleteCollectionDto>
 {
     public override async Task Handle(ClientWantsToDeleteCollectionDto dto, IWebSocketConnection socket)
     {
         var email = jwtService.GetEmailFromJwt(dto.Jwt!);
         await collectionsService.DeleteCollection(dto.CollectionId, email);
         var allCollections = await collectionsService.GetCollectionsForUser(email);
+
+        var stats = await statsService.GetStats(email);
         socket.SendDto(new ServerSendsAllCollections()
         {
             Collections = allCollections.ToList()
         });
+
+        socket.SendDto(new ServerSendsStats{Stats = stats});
     }
 }
diff --git a/api/Events/PlantEvents/Client/ClientWantsToCreatePlant.cs b/api/Events/PlantEvents/Client/ClientWantsToCreatePlant.cs
@@ -1,6 +1,7 @@
 using api.Core.Services;
 using api.EventFilters;
 using api.Events.PlantEvents.Server;
+using api.Events.Statistics;
 using api.Extensions;
 using Fleck;
 using lib;
@@ -11,11 +12,11 @@ namespace api.Events.PlantEvents.Client;
 
 public class ClientWantsToCreatePlantDto: BaseDtoWithJwt
 {
-    public CreatePlantDto CreatePlantDto { get; set; }
+    public required CreatePlantDto CreatePlantDto { get; set; }
 }
 
 [ValidateDataAnnotations]
-public class ClientWantsToCreatePlant(PlantService plantService, JwtService jwtService): BaseEventHandler<ClientWantsToCreatePlantDto>
+public class ClientWantsToCreatePlant(PlantService plantService, JwtService jwtService, StatsService statsService): BaseEventHandler<ClientWantsToCreatePlantDto>
 {
     public override async Task Handle(ClientWantsToCreatePlantDto dto, IWebSocketConnection socket)
     {
@@ -26,7 +27,9 @@ public override async Task Handle(ClientWantsToCreatePlantDto dto, IWebSocketCon
         {
             Plant = plant
         };
-
         socket.SendDto(serverCreatesNewPlant);
+
+       var stats = await statsService.GetStats(email);
+       socket.SendDto(new ServerSendsStats{Stats = stats});
     }
 }
diff --git a/api/Events/PlantEvents/Client/ClientWantsToDeletePlant.cs b/api/Events/PlantEvents/Client/ClientWantsToDeletePlant.cs
@@ -3,6 +3,7 @@
 using api.EventFilters;
 using api.Events.Global;
 using api.Events.PlantEvents.Server;
+using api.Events.Statistics;
 using api.Extensions;
 using Fleck;
 using lib;
@@ -16,13 +17,17 @@ public class ClientWantsToDeletePlantDto: BaseDtoWithJwt
 }
 
 [ValidateDataAnnotations]
-public class ClientWantsToDeletePlant(PlantService plantService, JwtService jwtService): BaseEventHandler<ClientWantsToDeletePlantDto>
+public class ClientWantsToDeletePlant(PlantService plantService, JwtService jwtService, StatsService statsService): BaseEventHandler<ClientWantsToDeletePlantDto>
 {
     public override async Task Handle(ClientWantsToDeletePlantDto dto, IWebSocketConnection socket)
     {
         var email = jwtService.GetEmailFromJwt(dto.Jwt!);
+        var stats = await statsService.GetStats(email);
+
         await plantService.DeletePlant(dto.PlantId, email);
         socket.SendDto( new ServerConfirmsDelete());
+
+        socket.SendDto(new ServerSendsStats{Stats = stats});
     }
 }