hot fix for not getting historic data

Team-Wilhelm · Jun 5, 2024 · 0c6b42e · 0c6b42e
1 parent 26e4201
commit 0c6b42e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/deploy-be.yaml b/.github/workflows/deploy-be.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           dotnet-version: '8.0.x'
 
-      - run: cd api && dotnet publish -c Release -o publish
+      - run: cd api && dotnet publish --prod -c Release -o publish
       - uses: AkhileshNS/[email protected]
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}

diff --git a/Infrastructure/Repositories/ConditionsLogsRepository.cs b/Infrastructure/Repositories/ConditionsLogsRepository.cs
@@ -42,12 +42,22 @@ public async Task<int> GetRecentMoodAsync(Guid plantId)
             .FirstOrDefaultAsync();
     }
 
+    // TODO: returns empty if there is no data in the past 7 days, but should then look further back
     public async Task<List<ConditionsLog>> GetConditionsLogsForPlant(Guid plantId, int timeSpanInDays)
     {
         await using var context = await dbContextFactory.CreateDbContextAsync();
         var logs = await context.ConditionsLogs
             .Where(log => log.PlantId == plantId && log.TimeStamp >= DateTime.UtcNow.AddDays(-timeSpanInDays))
             .ToListAsync();
+
+        if (logs.Count == 0)
+        {
+           logs = await context.ConditionsLogs
+                .Where(log => log.PlantId == plantId)
+                .OrderByDescending(log => log.TimeStamp)
+                .Take(7)
+                .ToListAsync();
+        }
 
         var groupedLogs = logs
             .GroupBy(log => new DateTime(log.TimeStamp.Year, log.TimeStamp.Month, timeSpanInDays == 365 ? 1 : log.TimeStamp.Day))

diff --git a/Shared/Exceptions/AppException.cs b/Shared/Exceptions/AppException.cs
@@ -2,15 +2,9 @@ namespace Shared.Exceptions;
 
 public class AppException : Exception
 {
-    public AppException(string message) : base(message)
-    {
-    }
+    public AppException(string message) : base(message) { }
 
-    protected AppException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
+    protected AppException(string message, Exception innerException) : base(message, innerException) { }
 
-    protected AppException()
-    {
-    }
+    protected AppException() { }
 }
diff --git a/api/Program.cs b/api/Program.cs
@@ -138,6 +138,7 @@ public static async Task<WebApplication> StartApi(string[] args)
                         var jwtValid = jwtService.IsJwtTokenValid(dto.Jwt);
                         if (!jwtValid)
                         {
+                            app.Services.GetRequiredService<WebSocketConnectionService>().RemoveEmailFromConnection(socket);
                             throw new NotAuthenticatedException("JWT token is not valid. Please log in.");
                         }
                     }