Merge pull request #49 from theImmortalCoders/dev

Deploy
theImmortalCoders · Nov 12, 2024 · a04ec1e · a04ec1e
2 parents c6bca19 + dbae4a7
commit a04ec1e
Show file tree

Hide file tree

Showing 25 changed files with 316 additions and 46 deletions.
diff --git a/rag-2-backend/Config/ServiceRegistrationExtension.cs b/rag-2-backend/Config/ServiceRegistrationExtension.cs
@@ -51,6 +51,7 @@ private static void ConfigServices(IServiceCollection services)
         services.AddScoped<RefreshTokenDao>();
         services.AddScoped<GameDao>();
         services.AddScoped<GameRecordDao>();
+        services.AddScoped<StatsUtil>();
     }
 
     private static void ConfigSwagger(IServiceCollection services)

diff --git a/rag-2-backend/Infrastructure/Common/Mapper/GameMapper.cs b/rag-2-backend/Infrastructure/Common/Mapper/GameMapper.cs
@@ -14,7 +14,8 @@ public static GameResponse Map(Game game)
         return new GameResponse
         {
             Id = game.Id,
-            Name = game.Name
+            Name = game.Name,
+            Description = game.Description
         };
     }
 }
diff --git a/rag-2-backend/Infrastructure/Common/Model/GameRecordValue.cs b/rag-2-backend/Infrastructure/Common/Model/GameRecordValue.cs
@@ -6,5 +6,4 @@ public class GameRecordValue
     public object? State { get; init; }
     public List<Player>? Players { get; init; }
     public string? Timestamp { get; init; }
-    public string? OutputSpec { get; init; }
 }
diff --git a/rag-2-backend/Infrastructure/Dao/GameDao.cs b/rag-2-backend/Infrastructure/Dao/GameDao.cs
@@ -20,4 +20,9 @@ public virtual Game GetGameByNameOrThrow(string gameName)
         return dbContext.Games.SingleOrDefault(g => Equals(g.Name.ToLower(), gameName.ToLower()))
                ?? throw new NotFoundException("Game not found");
     }
+
+    public virtual List<Game> GetAllGames()
+    {
+        return dbContext.Games.ToList();
+    }
 }
diff --git a/rag-2-backend/Infrastructure/Dao/GameRecordDao.cs b/rag-2-backend/Infrastructure/Dao/GameRecordDao.cs
@@ -52,6 +52,19 @@ public virtual GameRecord GetRecordedGameById(int recordedGameId)
                ?? throw new NotFoundException("Game record not found");
     }
 
+    public virtual double CountTotalStorageMb()
+    {
+        return dbContext.GameRecords
+            .Select(r => r.SizeMb)
+            .ToList()
+            .Sum();
+    }
+
+    public virtual int CountAllGameRecords()
+    {
+        return dbContext.GameRecords.Count();
+    }
+
     public virtual void PerformGameRecordTransaction(Game game, GameRecord gameRecord,
         User user)
     {

diff --git a/rag-2-backend/Infrastructure/Dao/UserDao.cs b/rag-2-backend/Infrastructure/Dao/UserDao.cs
@@ -21,4 +21,9 @@ public virtual User GetUserByEmailOrThrow(string email)
         return context.Users.SingleOrDefault(u => u.Email == email) ??
                throw new NotFoundException("User not found");
     }
+
+    public virtual int CountUsers()
+    {
+        return context.Users.Count();
+    }
 }
diff --git a/rag-2-backend/Infrastructure/Database/Entity/Game.cs b/rag-2-backend/Infrastructure/Database/Entity/Game.cs
@@ -14,4 +14,5 @@ public class Game
 {
     [Key] public int Id { get; init; }
     [MaxLength(100)] public required string Name { get; set; }
+    [MaxLength(1000)] public string? Description { get; set; }
 }
diff --git a/rag-2-backend/Infrastructure/Database/Entity/User.cs b/rag-2-backend/Infrastructure/Database/Entity/User.cs
@@ -3,13 +3,15 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using HttpExceptions.Exceptions;
+using Microsoft.EntityFrameworkCore;
 using rag_2_backend.Infrastructure.Common.Model;
 
 #endregion
 
 namespace rag_2_backend.Infrastructure.Database.Entity;
 
 [Table("user_table")]
+[Index(nameof(Email), IsUnique = true)]
 public class User
 {
     public User() //for ef

diff --git a/rag-2-backend/Infrastructure/Module/Background/BackgroundServiceImpl.cs b/rag-2-backend/Infrastructure/Module/Background/BackgroundServiceImpl.cs
@@ -2,27 +2,33 @@
 
 using Microsoft.EntityFrameworkCore;
 using rag_2_backend.Infrastructure.Database;
+using rag_2_backend.Infrastructure.Util;
 
 #endregion
 
 namespace rag_2_backend.Infrastructure.Module.Background;
 
-public class BackgroundServiceImpl(IServiceProvider serviceProvider) : BackgroundService
+public class BackgroundServiceImpl(
+    IServiceProvider serviceProvider
+) : BackgroundService
 {
     private DatabaseContext _dbContext = null!;
+    private StatsUtil _statsUtil = null!;
 
     protected override async Task ExecuteAsync(CancellationToken cancellationToken)
     {
         using var scope = serviceProvider.CreateScope();
         _dbContext = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
+        _statsUtil = scope.ServiceProvider.GetRequiredService<StatsUtil>();
 
         while (!cancellationToken.IsCancellationRequested)
         {
             DeleteUnusedAccountTokens();
             DeleteUnusedRefreshTokens();
             DeleteUnusedPasswordResetTokens();
+            UpdateCachedStats();
 
-            await Task.Delay(TimeSpan.FromDays(1), cancellationToken);
+            await Task.Delay(TimeSpan.FromHours(3), cancellationToken);
         }
     }
 
@@ -64,4 +70,14 @@ private void DeleteUnusedPasswordResetTokens()
 
         Console.WriteLine("Deleted " + unusedTokens.Count + " expired password reset tokens");
     }
+
+    private async void UpdateCachedStats()
+    {
+        var games = await _dbContext.Games.ToListAsync();
+        foreach (var game in games) _statsUtil.UpdateCachedGameStats(game);
+
+        _statsUtil.UpdateCachedStats();
+
+        Console.WriteLine("Stats updated.");
+    }
 }
diff --git a/rag-2-backend/Infrastructure/Module/Game/Dto/GameRequest.cs b/rag-2-backend/Infrastructure/Module/Game/Dto/GameRequest.cs
@@ -3,4 +3,5 @@ namespace rag_2_backend.Infrastructure.Module.Game.Dto;
 public class GameRequest
 {
     public required string Name { get; init; }
+    public string? Description { get; set; }
 }
diff --git a/rag-2-backend/Infrastructure/Module/Game/Dto/GameResponse.cs b/rag-2-backend/Infrastructure/Module/Game/Dto/GameResponse.cs
@@ -4,4 +4,5 @@ public class GameResponse
 {
     public int Id { get; init; }
     public required string Name { get; init; }
+    public string? Description { get; set; }
 }
diff --git a/rag-2-backend/Infrastructure/Module/Game/GameService.cs b/rag-2-backend/Infrastructure/Module/Game/GameService.cs
@@ -27,7 +27,8 @@ public void AddGame(GameRequest request)
 
         var game = new Database.Entity.Game
         {
-            Name = request.Name
+            Name = request.Name,
+            Description = request.Description
         };
 
         context.Games.Add(game);
@@ -42,6 +43,7 @@ public void EditGame(GameRequest request, int id)
             throw new BadRequestException("Game with this name already exists");
 
         game.Name = request.Name;
+        game.Description = request.Description;
 
         context.Games.Update(game);
         context.SaveChanges();

diff --git a/rag-2-backend/Infrastructure/Module/GameRecord/Dto/GameRecordRequest.cs b/rag-2-backend/Infrastructure/Module/GameRecord/Dto/GameRecordRequest.cs
@@ -9,5 +9,6 @@ namespace rag_2_backend.Infrastructure.Module.GameRecord.Dto;
 public class GameRecordRequest
 {
     public required string GameName { get; init; }
+    public required string OutputSpec { get; init; }
     public required List<GameRecordValue> Values { get; init; }
 }
diff --git a/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordService.cs b/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordService.cs
@@ -54,7 +54,7 @@ public void AddGameRecord(GameRecordRequest recordRequest, string email)
             Values = recordRequest.Values,
             User = user,
             Players = recordRequest.Values[0].Players,
-            OutputSpec = recordRequest.Values[0].OutputSpec ?? "",
+            OutputSpec = recordRequest.OutputSpec,
             EndState = recordRequest.Values[^1].State?.ToString(),
             SizeMb = JsonSerializer.Serialize(recordRequest.Values).Length / (1024.0 * 1024.0)
         };

diff --git a/rag-2-backend/Infrastructure/Module/Stats/Dto/OverallStatsResponse.cs b/rag-2-backend/Infrastructure/Module/Stats/Dto/OverallStatsResponse.cs
@@ -0,0 +1,10 @@
+namespace rag_2_backend.Infrastructure.Module.Stats.Dto;
+
+public class OverallStatsResponse
+{
+    public required int PlayersAmount { get; init; }
+    public required double TotalMemoryMb { get; init; }
+    public required int GamesAmount { get; init; }
+    public required int GameRecordsAmount { get; init; }
+    public DateTime StatsUpdatedDate { get; init; }
+}
diff --git a/rag-2-backend/Infrastructure/Module/Stats/StatsController.cs b/rag-2-backend/Infrastructure/Module/Stats/StatsController.cs
@@ -31,4 +31,11 @@ public GameStatsResponse GetStatsForGame([Required] [FromQuery] int gameId)
     {
         return statsService.GetStatsForGame(gameId);
     }
+
+    /// <summary>Get overall stats</summary>
+    [HttpGet("all")]
+    public OverallStatsResponse GetOverallStats()
+    {
+        return statsService.GetOverallStats();
+    }
 }
diff --git a/rag-2-backend/Infrastructure/Module/Stats/StatsService.cs b/rag-2-backend/Infrastructure/Module/Stats/StatsService.cs
@@ -4,6 +4,7 @@
 using Newtonsoft.Json;
 using rag_2_backend.Infrastructure.Dao;
 using rag_2_backend.Infrastructure.Module.Stats.Dto;
+using rag_2_backend.Infrastructure.Util;
 using StackExchange.Redis;
 using IDatabase = StackExchange.Redis.IDatabase;
 using Role = rag_2_backend.Infrastructure.Common.Model.Role;
@@ -13,13 +14,14 @@
 namespace rag_2_backend.Infrastructure.Module.Stats;
 
 public class StatsService(
+    IConfiguration configuration,
     IConnectionMultiplexer redisConnection,
     UserDao userDao,
     GameDao gameDao,
-    GameRecordDao gameRecordDao
+    GameRecordDao gameRecordDao,
+    StatsUtil statsUtil
 )
 {
-    private const string RedisCacheKeyPrefix = "GameStats:";
     private readonly IDatabase _redisDatabase = redisConnection.GetDatabase();
 
     public UserStatsResponse GetStatsForUser(string email, int userId)
@@ -49,43 +51,23 @@ public GameStatsResponse GetStatsForGame(int gameId)
     {
         var game = gameDao.GetGameByIdOrThrow(gameId);
 
-        var cacheKey = $"{RedisCacheKeyPrefix}{game.Id}";
+        var cacheKey = $"{configuration.GetValue<string>("Redis:Stats:Prefix")}{game.Id}";
         var cachedStatsJson = _redisDatabase.StringGet(cacheKey);
 
-        if (!string.IsNullOrEmpty(cachedStatsJson))
-        {
-            var cachedStats = JsonConvert.DeserializeObject<GameStatsResponse>(cachedStatsJson!);
-            if (cachedStats.StatsUpdatedDate.AddDays(1) >= DateTime.Now)
-                return cachedStats;
-        }
-
-        return UpdateCachedStats(gameId, game);
+        return !string.IsNullOrEmpty(cachedStatsJson)
+            ? JsonConvert.DeserializeObject<GameStatsResponse>(cachedStatsJson!)
+            : statsUtil.UpdateCachedGameStats(game);
     }
 
-    //
-
-    private GameStatsResponse UpdateCachedStats(int gameId, Database.Entity.Game game)
+    public OverallStatsResponse GetOverallStats()
     {
-        var records = gameRecordDao.GetGameRecordsByGameWithUser(gameId);
-
-        var gameStatsResponse = new GameStatsResponse
-        {
-            FirstPlayed = records.Count > 0 ? records[0].Started : null,
-            LastPlayed = records.Count > 0 ? records.Last().Ended : null,
-            Plays = records.Count,
-            TotalStorageMb = gameRecordDao.GetGameRecordsByGameWithUser(gameId)
-                .Select(r => r.SizeMb)
-                .ToList()
-                .Sum(),
-            TotalPlayers = records.Select(r => r.User.Id).Distinct().Count(),
-            StatsUpdatedDate = DateTime.Now
-        };
-
-        var cacheKey = $"{RedisCacheKeyPrefix}{game.Id}";
-        var serializedStats = JsonConvert.SerializeObject(gameStatsResponse);
-
-        _redisDatabase.StringSet(cacheKey, serializedStats, TimeSpan.FromDays(1));
-
-        return gameStatsResponse;
+        var cachedStatsJson = _redisDatabase.StringGet(
+            configuration.GetValue<string>("Redis:Stats:Prefix") +
+            configuration.GetValue<string>("Redis:Stats:OverallStatsKey")
+        );
+
+        return !string.IsNullOrEmpty(cachedStatsJson)
+            ? JsonConvert.DeserializeObject<OverallStatsResponse>(cachedStatsJson!)
+            : statsUtil.UpdateCachedStats();
     }
 }
diff --git a/rag-2-backend/Infrastructure/Util/StatsUtil.cs b/rag-2-backend/Infrastructure/Util/StatsUtil.cs
@@ -0,0 +1,67 @@
+#region
+
+using Newtonsoft.Json;
+using rag_2_backend.Infrastructure.Dao;
+using rag_2_backend.Infrastructure.Database.Entity;
+using rag_2_backend.Infrastructure.Module.Stats.Dto;
+using StackExchange.Redis;
+
+#endregion
+
+namespace rag_2_backend.Infrastructure.Util;
+
+public class StatsUtil(
+    IConfiguration configuration,
+    IConnectionMultiplexer redisConnection,
+    UserDao userDao,
+    GameDao gameDao,
+    GameRecordDao gameRecordDao
+)
+{
+    private readonly IDatabase _redisDatabase = redisConnection.GetDatabase();
+
+    public GameStatsResponse UpdateCachedGameStats(Game game)
+    {
+        var records = gameRecordDao.GetGameRecordsByGameWithUser(game.Id);
+
+        var gameStatsResponse = new GameStatsResponse
+        {
+            FirstPlayed = records.Count > 0 ? records[0].Started : null,
+            LastPlayed = records.Count > 0 ? records.Last().Ended : null,
+            Plays = records.Count,
+            TotalStorageMb = gameRecordDao.GetGameRecordsByGameWithUser(game.Id)
+                .Select(r => r.SizeMb)
+                .ToList()
+                .Sum(),
+            TotalPlayers = records.Select(r => r.User.Id).Distinct().Count(),
+            StatsUpdatedDate = DateTime.Now
+        };
+
+        var cacheKey = $"{configuration.GetValue<string>("Redis:Stats:Prefix")}{game.Id}";
+        var serializedStats = JsonConvert.SerializeObject(gameStatsResponse);
+
+        _redisDatabase.StringSet(cacheKey, serializedStats, TimeSpan.FromDays(1));
+
+        return gameStatsResponse;
+    }
+
+    public OverallStatsResponse UpdateCachedStats()
+    {
+        var overallStatsResponse = new OverallStatsResponse
+        {
+            PlayersAmount = userDao.CountUsers(),
+            TotalMemoryMb = gameRecordDao.CountTotalStorageMb(),
+            GamesAmount = gameDao.GetAllGames().Count,
+            GameRecordsAmount = gameRecordDao.CountAllGameRecords(),
+            StatsUpdatedDate = DateTime.Now
+        };
+
+        var serializedStats = JsonConvert.SerializeObject(overallStatsResponse);
+        _redisDatabase.StringSet(
+            configuration.GetValue<string>("Redis:Stats:Prefix") +
+            configuration.GetValue<string>("Redis:Stats:OverallStatsKey"),
+            serializedStats, TimeSpan.FromDays(1));
+
+        return overallStatsResponse;
+    }
+}
diff --git a/rag-2-backend/Migrations/20241107192454_Base.Designer.cs b/rag-2-backend/Migrations/20241107192454_Base.Designer.cs