Reorganize

edgegamers · Sep 7, 2024 · 8dbbd98 · 8dbbd98
1 parent de2fd89
commit 8dbbd98
Show file tree

Hide file tree

Showing 63 changed files with 649 additions and 561 deletions.
diff --git a/Commands/CommandManager.cs b/Commands/CommandManager.cs
@@ -5,6 +5,7 @@
 using GangsAPI.Data.Command;
 using GangsAPI.Services;
 using GangsAPI.Services.Commands;
+using GangsAPI.Services.Gang;
 using Mock;
 
 namespace Commands;

diff --git a/Commands/gang/CreateCommand.cs → Commands/Gang/CreateCommand.cs b/Commands/gang/CreateCommand.cs → Commands/Gang/CreateCommand.cs
@@ -2,8 +2,9 @@
 using GangsAPI.Data.Command;
 using GangsAPI.Services;
 using GangsAPI.Services.Commands;
+using GangsAPI.Services.Gang;
 
-namespace Commands.gang;
+namespace Commands.Gang;
 
 // create [name]
 public class CreateCommand(IGangManager gangs) : ICommand {

diff --git a/Commands/gang/HelpCommand.cs → Commands/Gang/HelpCommand.cs b/Commands/gang/HelpCommand.cs → Commands/Gang/HelpCommand.cs
@@ -2,7 +2,7 @@
 using GangsAPI.Data.Command;
 using GangsAPI.Services.Commands;
 
-namespace Commands.gang;
+namespace Commands.Gang;
 
 public class HelpCommand : ICommand {
   public string Name => "help";

diff --git a/Commands/GangCommand.cs b/Commands/GangCommand.cs
@@ -1,9 +1,10 @@
-using Commands.gang;
+using Commands.Gang;
 using CounterStrikeSharp.API.Modules.Utils;
 using GangsAPI.Data;
 using GangsAPI.Data.Command;
 using GangsAPI.Services;
 using GangsAPI.Services.Commands;
+using GangsAPI.Services.Gang;
 
 namespace Commands;
 

diff --git a/Gangs/GangServiceCollection.cs b/Gangs/GangServiceCollection.cs
@@ -3,6 +3,8 @@
 using GangsAPI.Extensions;
 using GangsAPI.Services;
 using GangsAPI.Services.Commands;
+using GangsAPI.Services.Gang;
+using GangsAPI.Services.Player;
 using Microsoft.Extensions.DependencyInjection;
 using Mock;
 
@@ -12,7 +14,7 @@ public class GangServiceCollection : IPluginServiceCollection<CS2Gangs> {
   public void ConfigureServices(IServiceCollection serviceCollection) {
     serviceCollection.AddPluginBehavior<IGangManager, MockGangManager>();
     serviceCollection.AddPluginBehavior<IPlayerManager, MockPlayerManager>();
-    serviceCollection.AddPluginBehavior<IStatManager, MockStatManager>();
+    serviceCollection.AddPluginBehavior<IStatManager, Creation>();
     serviceCollection
      .AddPluginBehavior<IGangStatManager, MockInstanceStatManager>();
     serviceCollection

diff --git a/GangsAPI/Services/IGangManager.cs → GangsAPI/Services/Gang/IGangManager.cs b/GangsAPI/Services/IGangManager.cs → GangsAPI/Services/Gang/IGangManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data;
 using GangsAPI.Data.Gang;
 
-namespace GangsAPI.Services;
+namespace GangsAPI.Services.Gang;
 
 /// <summary>
 ///   A manager for gangs. Allows for the creation, retrieval, updating, and deletion of gangs.

diff --git a/GangsAPI/Services/IGangStatManager.cs → GangsAPI/Services/Gang/IGangStatManager.cs b/GangsAPI/Services/IGangStatManager.cs → GangsAPI/Services/Gang/IGangStatManager.cs
@@ -2,9 +2,9 @@
 using GangsAPI.Data.Gang;
 using GangsAPI.Data.Stat;
 
-namespace GangsAPI.Services;
+namespace GangsAPI.Services.Gang;
 
-public interface IGangStatManager : ICacher {
+public interface IGangStatManager : IPluginBehavior, ICacher {
   Task<(bool, TV?)> GetForGang<TV>(int key, string statId);
   Task<bool> SetForGang<TV>(int gangId, string statId, TV value);
   Task<bool> RemoveFromGang(int gangId, string statId);

diff --git a/GangsAPI/Services/IPlayerManager.cs → GangsAPI/Services/Player/IPlayerManager.cs b/GangsAPI/Services/IPlayerManager.cs → GangsAPI/Services/Player/IPlayerManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data;
 using GangsAPI.Data.Gang;
 
-namespace GangsAPI.Services;
+namespace GangsAPI.Services.Player;
 
 /// <summary>
 ///   A manager for players. Allows for the retrieval and creation of players.

diff --git a/GangsAPI/Services/IPlayerStatManager.cs → ...API/Services/Player/IPlayerStatManager.cs b/GangsAPI/Services/IPlayerStatManager.cs → ...API/Services/Player/IPlayerStatManager.cs
@@ -1,31 +1,19 @@
 using GangsAPI.Data;
 using GangsAPI.Data.Stat;
 
-namespace GangsAPI.Services;
+namespace GangsAPI.Services.Player;
 
 public interface IPlayerStatManager : IPluginBehavior, ICacher {
-  Task<bool> GetForPlayer<TV>(ulong steam, string statId, out TV? result);
+  Task<(bool, TV?)> GetForPlayer<TV>(ulong steam, string statId);
   Task<bool> SetForPlayer<TV>(ulong steam, string statId, TV value);
   Task<bool> RemoveFromPlayer(ulong steam, string statId);
 
   #region Aliases
 
   #region Get
 
-  Task<bool> GetForPlayer<TV>(PlayerWrapper wrapper, string statId,
-    out TV? holder) {
-    return GetForPlayer(wrapper.Steam, statId, out holder);
-  }
-
-  async Task<bool> GetForPlayer<TV>(ulong steam, IStat<TV> holder) {
-    var success = await GetForPlayer(steam, holder.StatId, out TV? tmp);
-    if (!success || tmp == null) return false;
-    holder.Value = tmp;
-    return true;
-  }
-
-  Task<bool> GetForPlayer<TV>(PlayerWrapper wrapper, IStat<TV> holder) {
-    return GetForPlayer(wrapper.Steam, holder);
+  Task<(bool, TV?)> GetForPlayer<TV>(PlayerWrapper wrapper, string statId) {
+    return GetForPlayer<TV>(wrapper.Steam, statId);
   }
 
   #endregion

diff --git a/GangsImpl/AbstractDB/AbstractDBGangManager.cs b/GangsImpl/AbstractDB/AbstractDBGangManager.cs
@@ -3,6 +3,7 @@
 using Dapper;
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
+using GangsAPI.Services.Player;
 using Mock;
 
 namespace GenericDB;

diff --git a/GangsImpl/AbstractDB/AbstractDBStatManager.cs b/GangsImpl/AbstractDB/AbstractDBStatManager.cs
@@ -7,7 +7,7 @@
 namespace GenericDB;
 
 public abstract class AbstractDBStatManager(string connectionString,
-  string table = "gang_stats", bool testing = false) : MockStatManager {
+  string table = "gang_stats", bool testing = false) : Creation {
   private DbConnection connection = null!;
   private DbTransaction? transaction;
 

diff --git a/GangsImpl/SQL/SQLInstanceManager.cs → ...mpl/AbstractDB/AbstractInstanceManager.cs b/GangsImpl/SQL/SQLInstanceManager.cs → ...mpl/AbstractDB/AbstractInstanceManager.cs
@@ -3,31 +3,30 @@
 using System.Reflection;
 using CounterStrikeSharp.API.Core;
 using Dapper;
-using GangsAPI;
-using GangsAPI.Services;
-using MySqlConnector;
 
-namespace SQLImpl;
+namespace GenericDB;
 
-public class SQLInstanceManager(string connectionString, string table_prefix,
-  string gangsTable, bool testing = false) : IPluginBehavior, IGangStatManager {
-  private DbConnection connection = null!;
+public abstract class AbstractInstanceManager<TK>(string connectionString,
+  string table_prefix, bool testing = false) {
+  protected DbConnection Connection;
+  abstract protected string PrimaryKey { get; }
+  private string primaryTypeString => GetDBType(typeof(TK));
 
   public void ClearCache() { }
 
   public Task Load() { return Task.CompletedTask; }
 
-  public async Task<(bool, TV?)> GetForGang<TV>(int key, string statId) {
+  public async Task<(bool, TV?)> Get<TV>(TK key, string statId) {
     await createTable<TV>(statId);
     try {
-      var result = await connection.QuerySingleAsync<TV>(
-        $"SELECT {(typeof(TV).IsPrimitive ? statId : getFieldNames<TV>())} FROM {table_prefix}_{statId} WHERE GangId = @GangId",
+      var result = await Connection.QuerySingleAsync<TV>(
+        $"SELECT {(typeof(TV).IsPrimitive ? statId : getFieldNames<TV>())} FROM {table_prefix}_{statId} WHERE {PrimaryKey} = @{PrimaryKey}",
         new { GangId = key });
       return (true, result);
     } catch (InvalidOperationException) { return (false, default); }
   }
 
-  public async Task<bool> SetForGang<TV>(int gangId, string statId, TV value) {
+  public async Task<bool> Set<TV>(TK key, string statId, TV value) {
     await createTable<TV>(statId);
     var fields = typeof(TV)
      .GetProperties(BindingFlags.Public | BindingFlags.Instance)
@@ -45,12 +44,12 @@ public async Task<bool> SetForGang<TV>(int gangId, string statId, TV value) {
       fields.Select(f => $"{f.Name} = @{f.Name}"));
     if (typeof(TV).IsPrimitive) onDuplicate = $"{statId} = @{statId}";
     var cmd =
-      $"INSERT INTO {table_prefix}_{statId} (GangId, {columns}) VALUES (@GangId, {values}) ON DUPLICATE KEY UPDATE {onDuplicate}";
+      $"INSERT INTO {table_prefix}_{statId} ({PrimaryKey}, {columns}) VALUES (@{PrimaryKey}, {values}) ON DUPLICATE KEY UPDATE {onDuplicate}";
 
     Debug.WriteLine(cmd);
 
     var fieldValues = new DynamicParameters();
-    fieldValues.Add("@GangId", gangId);
+    fieldValues.Add("@" + PrimaryKey, key);
 
     if (typeof(TV).IsPrimitive)
       fieldValues.Add($"@{statId}", value);
@@ -59,23 +58,25 @@ public async Task<bool> SetForGang<TV>(int gangId, string statId, TV value) {
         fieldValues.Add($"@{field.Name}", field.GetValue(value));
 
     Console.WriteLine(cmd, fieldValues);
-    await connection.ExecuteAsync(cmd, fieldValues);
+    await Connection.ExecuteAsync(cmd, fieldValues);
     return true;
   }
 
-  public async Task<bool> RemoveFromGang(int gangId, string statId) {
+  public async Task<bool> Remove(TK key, string statId) {
     try {
-      await connection.ExecuteAsync(
-        $"DELETE FROM {table_prefix}_{statId} WHERE GangId = @GangId",
-        new { GangId = gangId });
+      var dynamicParameters = new DynamicParameters();
+      dynamicParameters.Add(PrimaryKey, key);
+      await Connection.ExecuteAsync(
+        $"DELETE FROM {table_prefix}_{statId} WHERE {PrimaryKey} = @{PrimaryKey}",
+        dynamicParameters);
       return true;
     } catch (DbException) { return false; }
   }
 
   public void Start(BasePlugin? plugin, bool hotReload) {
-    connection = new MySqlConnection(connectionString);
+    Connection = CreateDbConnection(connectionString);
 
-    connection.Open();
+    Connection.Open();
   }
 
   virtual protected string GetDBType(Type type) {
@@ -107,8 +108,8 @@ private async Task createTable<TV>(string id) {
      .ToList();
 
     var cmd = testing ?
-      $"CREATE TEMPORARY TABLE IF NOT EXISTS {table_prefix}_{id} (GangId INT NOT NULL PRIMARY KEY, " :
-      $"CREATE TABLE IF NOT EXISTS {table_prefix}_{id} (GangId INT NOT NULL PRIMARY KEY, ";
+      $"CREATE TEMPORARY TABLE IF NOT EXISTS {table_prefix}_{id} ({PrimaryKey} {primaryTypeString} NOT NULL PRIMARY KEY, " :
+      $"CREATE TABLE IF NOT EXISTS {table_prefix}_{id} ({PrimaryKey} {primaryTypeString} NOT NULL PRIMARY KEY, ";
 
     if (typeof(TV).IsPrimitive) {
       cmd += $"{id} {GetDBType(typeof(TV))}";
@@ -126,7 +127,7 @@ private async Task createTable<TV>(string id) {
 
     Console.WriteLine(cmd);
 
-    await connection.ExecuteAsync(cmd);
+    await Connection.ExecuteAsync(cmd);
   }
 
   private string getFieldNames<TV>(string prefix = "") {
@@ -136,4 +137,6 @@ private string getFieldNames<TV>(string prefix = "") {
 
     return string.Join(", ", fields.Select(f => $"{prefix}{f.Name}"));
   }
+
+  abstract protected DbConnection CreateDbConnection(string connectionString);
 }
diff --git a/GangsImpl/Mock/MockStatManager.cs → GangsImpl/Mock/Creation.cs b/GangsImpl/Mock/MockStatManager.cs → GangsImpl/Mock/Creation.cs
@@ -4,7 +4,7 @@
 
 namespace Mock;
 
-public class MockStatManager : IStatManager {
+public class Creation : IStatManager {
   private readonly HashSet<IStat> backendStats = [];
   protected readonly HashSet<IStat> CachedStats = [];
 

diff --git a/GangsImpl/Mock/MemoryImpl.cs b/GangsImpl/Mock/MemoryImpl.cs
@@ -6,6 +6,6 @@ namespace Mock;
 
 public static class MemoryImpl {
   public static void AddMemoryImpl(this IServiceCollection collection) {
-    collection.AddPluginBehavior<IStatManager, MockStatManager>();
+    collection.AddPluginBehavior<IStatManager, Creation>();
   }
 }
diff --git a/GangsImpl/Mock/MockGangManager.cs b/GangsImpl/Mock/MockGangManager.cs
@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
+using GangsAPI.Services.Gang;
+using GangsAPI.Services.Player;
 
 namespace Mock;
 

diff --git a/GangsImpl/Mock/MockInstanceStatManager.cs b/GangsImpl/Mock/MockInstanceStatManager.cs
@@ -1,4 +1,6 @@
 using GangsAPI.Services;
+using GangsAPI.Services.Gang;
+using GangsAPI.Services.Player;
 
 namespace Mock;
 
@@ -23,16 +25,14 @@ public Task Load() {
   private readonly Dictionary<ulong, Dictionary<string, object>>
     cachedPlayerValues = [], backendPlayerValues = [];
 
-  public Task<bool>
-    GetForPlayer<TV>(ulong steam, string statId, out TV? result) {
-    result = default;
+  public Task<(bool, TV?)> GetForPlayer<TV>(ulong steam, string statId) {
     if (!cachedPlayerValues.TryGetValue(steam, out var playerStatMap))
-      return Task.FromResult(false);
+      return Task.FromResult<(bool, TV?)>((false, default));
     if (!playerStatMap.TryGetValue(statId, out var value))
-      return Task.FromResult(false);
-    if (value is not TV v) return Task.FromResult(false);
-    result = v;
-    return Task.FromResult(true);
+      return Task.FromResult<(bool, TV?)>((false, default));
+    return value is not TV val ?
+      Task.FromResult<(bool, TV?)>((false, default)) :
+      Task.FromResult((true, (TV?)val));
   }
 
   public Task<bool> SetForPlayer<TV>(ulong steam, string statId, TV value) {

diff --git a/GangsImpl/Mock/MockPlayerManager.cs b/GangsImpl/Mock/MockPlayerManager.cs
@@ -1,5 +1,6 @@
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
+using GangsAPI.Services.Player;
 
 namespace Mock;
 

diff --git a/GangsImpl/SQL/SQLGangInstanceManager.cs b/GangsImpl/SQL/SQLGangInstanceManager.cs
@@ -0,0 +1,55 @@
+using System.Data.Common;
+using GangsAPI;
+using GangsAPI.Services;
+using GangsAPI.Services.Gang;
+using GangsAPI.Services.Player;
+using GenericDB;
+using MySqlConnector;
+
+namespace SQLImpl;
+
+public class SQLGangInstanceManager(string connectionString,
+  string table_prefix, bool testing = false)
+  : AbstractInstanceManager<int>(connectionString, table_prefix, testing),
+    IPluginBehavior, IGangStatManager {
+  override protected string PrimaryKey => "GangId";
+
+  public Task<(bool, TV?)> GetForGang<TV>(int key, string statId) {
+    return Get<TV>(key, statId);
+  }
+
+  public Task<bool> SetForGang<TV>(int gangId, string statId, TV value) {
+    return Set(gangId, statId, value);
+  }
+
+  public Task<bool> RemoveFromGang(int gangId, string statId) {
+    return Remove(gangId, statId);
+  }
+
+  override protected DbConnection CreateDbConnection(string connectionString) {
+    return new MySqlConnection(connectionString);
+  }
+}
+
+public class SQLPlayerInstanceManager(string connectionString,
+  string table_prefix, bool testing = false)
+  : AbstractInstanceManager<ulong>(connectionString, table_prefix, testing),
+    IPlayerStatManager {
+  override protected string PrimaryKey => "GangId";
+
+  public Task<(bool, TV?)> GetForPlayer<TV>(ulong steam, string statId) {
+    return Get<TV>(steam, statId);
+  }
+
+  public Task<bool> SetForPlayer<TV>(ulong steam, string statId, TV value) {
+    return Set(steam, statId, value);
+  }
+
+  public Task<bool> RemoveFromPlayer(ulong steam, string statId) {
+    return Remove(steam, statId);
+  }
+
+  override protected DbConnection CreateDbConnection(string connectionString) {
+    return new MySqlConnection(connectionString);
+  }
+}
diff --git a/GangsImpl/SQL/SQLGangManager.cs b/GangsImpl/SQL/SQLGangManager.cs
@@ -1,5 +1,6 @@
 using System.Data.Common;
 using GangsAPI.Services;
+using GangsAPI.Services.Player;
 using GenericDB;
 using MySqlConnector;
 

diff --git a/GangsImpl/SQLite/SQLiteGangManager.cs b/GangsImpl/SQLite/SQLiteGangManager.cs
@@ -3,6 +3,7 @@
 using Dapper;
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
+using GangsAPI.Services.Player;
 using GenericDB;
 using Microsoft.Data.Sqlite;