Populating more realistic data

Infrastructure/ApplicationDbContext.cs

@@ -54,172 +54,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         base.OnModelCreating(modelBuilder);
     }
-
-    public async Task SeedDevelopmentDataAsync(IServiceScope scope, string defaultPlantImage)
-    {
-        var userRepository = scope.ServiceProvider.GetRequiredService<UserRepository>();
-        await userRepository.CreateUser(new RegisterUserDto
-        {
-            Email = "[email protected]",
-            Password = "password",
-            Username = "bob"
-        });
-
-        var collectionsRepository = scope.ServiceProvider.GetRequiredService<CollectionsRepository>();
-        var collection1 = await collectionsRepository.CreateCollection(
-            new Collection
-            {
-                CollectionId = Guid.NewGuid(),
-                Name = "Succulents",
-                UserEmail = "[email protected]",
-            }
-        );
-        var collection2 = await collectionsRepository.CreateCollection(
-            new Collection
-            {
-                CollectionId = Guid.NewGuid(),
-                Name = "Cacti",
-                UserEmail = "[email protected]",
-            }
-        );
-
-        var plantRepository = scope.ServiceProvider.GetRequiredService<PlantRepository>();
-        await plantRepository.CreatePlant(
-            new Plant
-            {
-                PlantId = Guid.NewGuid(),
-                Nickname = "Aloe Vera",
-                UserEmail = "[email protected]",
-                ImageUrl = defaultPlantImage,
-                CollectionId = collection1.CollectionId,
-                LatestChange = DateTime.UtcNow.Subtract(TimeSpan.FromDays(5))
-            }
-        );
-
-        await plantRepository.CreatePlant(
-            new Plant
-            {
-                PlantId = Guid.NewGuid(),
-                Nickname = "Prickly Pear",
-                UserEmail = "[email protected]",
-                ImageUrl = defaultPlantImage,
-                CollectionId = collection2.CollectionId,
-                LatestChange = DateTime.UtcNow.Subtract(TimeSpan.FromDays(7))
-            }
-        );
-
-        await plantRepository.CreatePlant(
-            new Plant
-            {
-                PlantId = Guid.NewGuid(),
-                Nickname = "Dying plant",
-                UserEmail = "[email protected]",
-                ImageUrl = defaultPlantImage,
-                CollectionId = collection2.CollectionId,
-                LatestChange = DateTime.UtcNow
-            }
-        );
-
-        var plants = await plantRepository.GetPlantsForUser("[email protected]", 1, 5);
-
-        var requirementsRepository = scope.ServiceProvider.GetRequiredService<RequirementsRepository>();
-        await requirementsRepository.CreateRequirements(
-            new Requirements
-            {
-                RequirementsId = Guid.NewGuid(),
-                PlantId = plants.First(p => p.Nickname == "Aloe Vera").PlantId,
-                LightLevel = RequirementLevel.Low,
-                SoilMoistureLevel = RequirementLevel.Medium,
-                HumidityLevel = RequirementLevel.High,
-                TemperatureLevel = 22,
-            }
-        );
-
-      await requirementsRepository.CreateRequirements(
-            new Requirements
-            {
-                RequirementsId = Guid.NewGuid(),
-                PlantId =  plants.First(p => p.Nickname == "Prickly Pear").PlantId,
-                LightLevel = RequirementLevel.High,
-                SoilMoistureLevel = RequirementLevel.Low,
-                HumidityLevel = RequirementLevel.Low,
-                TemperatureLevel = 27,
-            }
-        );
-
-       await requirementsRepository.CreateRequirements(
-            new Requirements
-            {
-                RequirementsId = Guid.NewGuid(),
-                PlantId =  plants.First(p => p.Nickname == "Dying plant").PlantId,
-                LightLevel = RequirementLevel.High,
-                SoilMoistureLevel = RequirementLevel.Low,
-                HumidityLevel = RequirementLevel.Medium,
-                TemperatureLevel = 24,
-            }
-        );
-
-        var conditionsLogRepository = scope.ServiceProvider.GetRequiredService<ConditionsLogsRepository>();
-
-        for (var i = 0; i < 100; i++)
-        {
-            await conditionsLogRepository.CreateConditionsLogAsync(
-                GetRandomConditionsLog(plants.First(p => p.Nickname == "Prickly Pear").PlantId, i * 6)
-            );
-            await conditionsLogRepository.CreateConditionsLogAsync(
-                GetRandomConditionsLog(plants.First(p => p.Nickname == "Aloe Vera").PlantId, i * 6)
-            );
-        }
-
-        await conditionsLogRepository.CreateConditionsLogAsync(
-            new ConditionsLog()
-            {
-                ConditionsId = Guid.NewGuid(),
-                PlantId = plants.First(p => p.Nickname == "Dying plant").PlantId,
-                TimeStamp = DateTime.UtcNow,
-                Mood = 0,
-                SoilMoisture = 55,
-                Light = 13,
-                Humidity = 68,
-                Temperature = 25,
-            }
-        );
-
-        Console.ForegroundColor = ConsoleColor.Green;
-        Console.WriteLine("Seeded development data");
-        Console.ResetColor();
-    }
-
-    private double GetRandomLevelValue()
-    {
-        var random = new Random();
-        return random.NextDouble() * 100;
-    }
-
-    private int GetRandomMood()
-    {
-        var random = new Random();
-        return random.Next(0, 5);
-    }
-
-    private int GetRandomTemperature()
-    {
-        var random = new Random();
-        return random.Next(-20, 45);
-    }
-
-    private ConditionsLog GetRandomConditionsLog(Guid plantId, int hoursAgo = 0)
-    {
-        return new ConditionsLog
-        {
-            ConditionsId = Guid.NewGuid(),
-            PlantId = plantId,
-            TimeStamp = DateTime.UtcNow.Subtract(TimeSpan.FromHours(hoursAgo)),
-            Mood = GetRandomMood(),
-            SoilMoisture = GetRandomLevelValue(),
-            Light = GetRandomLevelValue(),
-            Temperature = GetRandomTemperature(),
-            Humidity = GetRandomLevelValue(),
-        };
-    }
 }

Infrastructure/Repositories/PlantRepository.cs

@@ -98,7 +98,7 @@
         await using var context = await dbContextFactory.CreateDbContextAsync();
         return await context.Plants
             .Include(plant => plant.Requirements)
-            .Include(plant => plant.ConditionsLogs)
+            .Include(plant => plant.ConditionsLogs.OrderByDescending(log => log.TimeStamp).Take(1))
             .Where(p => p.UserEmail == requesterEmail && p.ConditionsLogs.Count != 0)
             .Select(p => new
             {
@@ -108,12 +108,13 @@
                     .ThenByDescending(log => log.TimeStamp)
                     .FirstOrDefault()
             })
             .OrderBy(p => p.WorstMood.Mood)
             .ThenByDescending(p => p.WorstMood.TimeStamp)
             .Take(3)
             .Select(p => p.Plant)
             .ToListAsync();
     }
+
     public async Task<Stats> GetStats(string userEmail)
     {
         await using var context = await dbContextFactory.CreateDbContextAsync();

Shared/Dtos/CreateConditionsLogDto.cs

@@ -6,5 +6,5 @@ public class CreateConditionsLogDto
     public double Light { get; set; }
     public double Temperature { get; set; }
     public double Humidity { get; set; }
-    public long DeviceId { get; set; }
+    public required string DeviceId { get; set; }
 }

api/Core/Services/MqttPublisherService.cs

@@ -22,10 +22,9 @@ public MqttPublisherService(IOptions<MqttOptions> options)
         if (string.IsNullOrEmpty(_options.Value.Username) || _options.Value.Username == "FILL_ME_IN")
             throw new Exception("MQTT username not set in appsettings.json");
     }
-    public async Task PublishAsync(MoodDto mood, long deviceId)
+    public async Task PublishAsync(MoodDto mood, string deviceId)
     {
         var mqttFactory = new MqttFactory();
-
 
         using var mqttClient = mqttFactory.CreateMqttClient();
         var mqttClientOptions = new MqttClientOptionsBuilder()

api/WebSocketConnectionService.cs → api/Core/Services/WebSocketConnectionService.cs

@@ -1,5 +1,4 @@
 using Fleck;
-using Shared;
 using Shared.Wrappers;
 
 namespace api;