From 33e07c488246a20f49fbafb72a8194c83cb67f6b Mon Sep 17 00:00:00 2001 From: CWX Date: Sat, 18 Jan 2025 14:15:33 +0000 Subject: [PATCH] use prim ctor and fixed warnings: AchievementController, appContext, ContextVar, BackupService stubbed out --- Core/Context/ApplicationContext.cs | 4 ++-- Core/Context/ContextVariable.cs | 17 ++++------------- Core/Controllers/AchievementController.cs | 20 ++++---------------- Core/Services/BackupService.cs | 3 ++- 4 files changed, 12 insertions(+), 32 deletions(-) diff --git a/Core/Context/ApplicationContext.cs b/Core/Context/ApplicationContext.cs index 4e6d4463..7837697d 100644 --- a/Core/Context/ApplicationContext.cs +++ b/Core/Context/ApplicationContext.cs @@ -6,8 +6,8 @@ namespace Core.Context; public class ApplicationContext { private const short MaxSavedValues = 10; - protected Dictionary> variables = new(); - protected object variablesLock = new(); + private readonly Dictionary> variables = new(); + private readonly Lock variablesLock = new(); public ContextVariable? GetLatestValue(ContextVariableType type) { diff --git a/Core/Context/ContextVariable.cs b/Core/Context/ContextVariable.cs index e64ec2f9..6e27e6e5 100644 --- a/Core/Context/ContextVariable.cs +++ b/Core/Context/ContextVariable.cs @@ -1,20 +1,11 @@ namespace Core.Context; -public class ContextVariable +public class ContextVariable(object value, ContextVariableType contextVariableInternalType) { - protected object _value; - protected ContextVariableType _internalType; - protected DateTime _timestamp; - - public ContextVariable(object value, ContextVariableType contextVariableInternalType) - { - _value = value; - _timestamp = DateTime.Now; - _internalType = contextVariableInternalType; - } + private readonly DateTime _timestamp = DateTime.Now; public T GetValue() { - return (T)_value; + return (T)value; } public DateTime GetTimestamp() @@ -24,6 +15,6 @@ public class ContextVariable public ContextVariableType GetContextType() { - return _internalType; + return contextVariableInternalType; } } diff --git a/Core/Controllers/AchievementController.cs b/Core/Controllers/AchievementController.cs index cadee622..f240d8c7 100644 --- a/Core/Controllers/AchievementController.cs +++ b/Core/Controllers/AchievementController.cs @@ -1,26 +1,14 @@ using Core.Annotations; using Core.Models.Eft.Profile; -using Core.Models.Utils; using Core.Services; namespace Core.Controllers; [Injectable] -public class AchievementController -{ - protected ISptLogger _logger; - protected DatabaseService _databaseService; - - public AchievementController - ( - ISptLogger logger, - DatabaseService databaseService +public class AchievementController( + DatabaseService _databaseService ) - { - _logger = logger; - _databaseService = databaseService; - } - +{ public GetAchievementsResponse GetAchievements(string sessionID) { return new GetAchievementsResponse @@ -36,7 +24,7 @@ public class AchievementController foreach (var achievement in achievements) { - stats.Add(achievement.Id, 0); + if (achievement.Id != null) stats.Add(achievement.Id, 0); } return new() diff --git a/Core/Services/BackupService.cs b/Core/Services/BackupService.cs index e2cbb2fa..3bf48683 100644 --- a/Core/Services/BackupService.cs +++ b/Core/Services/BackupService.cs @@ -15,7 +15,8 @@ public class BackupService */ public async Task InitAsync() { - throw new NotImplementedException(); + Console.WriteLine("NEEDS IMPLEMENTING: BackupService"); + return; } /**