More tests

Gangs.sln

@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsPlugin", "GangsPlugin\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsTest", "GangsTest\GangsTest.csproj", "{B1D1E7C7-BDF3-4238-9025-4FEB2B7DAB89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsImpl.Memory", "GangsImpl.Memory\GangsImpl.Memory.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsImpl.Mock", "GangsImpl.Mock\GangsImpl.Mock.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

GangsAPI/Struct/Gang/IGang.cs → GangsAPI/Data/Gang/IGang.cs

@@ -1,17 +1,19 @@
-using GangsAPI.Permissions;
-using GangsAPI.Struct.Stat;
+using System.Collections;
+using GangsAPI.Data.Stat;
+using GangsAPI.Permissions;
 
-namespace GangsAPI.Struct.Gang;
+namespace GangsAPI.Data.Gang;
 
 /// <summary>
 ///   Represents an instance of a gang.
 /// </summary>
-public interface IGang : IEqualityComparer<IGang> {
+public interface IGang : IEqualityComparer<IGang>, IEquatable<IGang>,
+  IEnumerable<ulong>, ICloneable {
   /// <summary>
   ///   The unique identifier of the gang.
   ///   All gangs have a unique identifier.
   /// </summary>
-  int Id { get; }
+  int GangId { get; }
 
   /// <summary>
   ///   The name of the gang.
@@ -22,22 +24,31 @@ public interface IGang : IEqualityComparer<IGang> {
 
   /// <summary>
   ///   The members of the gang.
+  ///   All gangs have at least one owner.
   /// </summary>
   IDictionary<ulong, IGangRank> Members { get; }
 
+  /// <summary>
+  /// The ranks of the gang.
+  /// </summary>
+  ISet<IGangRank> Ranks { get; }
+
+  ulong Owner
+    => Members.First(m => m.Value.Perms.HasFlag(IGangRank.Permissions.OWNER))
+     .Key;
+
   /// <summary>
   ///   The amount of currency the gang has in its bank.
   /// </summary>
   int? Bank {
     get {
-      var stat = GetStat("gang_bank") as IStat<ulong, int>;
+      var stat = GetStat("gang_bank") as IStat<int>;
       return stat?.Value;
     }
 
     set {
       ArgumentNullException.ThrowIfNull(value);
-      if (GetStat("gang_bank") is IStat<ulong, int> stat)
-        stat.Value = value.Value;
+      if (GetStat("gang_bank") is IStat<int> stat) stat.Value = value.Value;
     }
   }
 
@@ -92,11 +103,16 @@ public interface IGang : IEqualityComparer<IGang> {
 
   bool IEqualityComparer<IGang>.Equals(IGang? x, IGang? y) {
     if (x is null || y is null) return false;
-    return x.Id == y.Id;
+    return x.GangId == y.GangId;
   }
 
   int IEqualityComparer<IGang>.GetHashCode(IGang obj) {
-    return obj.Id.GetHashCode();
+    return obj.GangId.GetHashCode();
+  }
+
+  bool IEquatable<IGang>.Equals(IGang? other) {
+    if (other is null) return false;
+    return GangId == other.GangId;
   }
 
   IStat? GetPerk(string perkId) {
@@ -106,4 +122,12 @@ int IEqualityComparer<IGang>.GetHashCode(IGang obj) {
   IStat? GetStat(string statId) {
     return Stats.FirstOrDefault(s => s.StatId.Equals(statId));
   }
+
+  IEnumerator IEnumerable.GetEnumerator() {
+    return Members.Keys.GetEnumerator();
+  }
+
+  IEnumerator<ulong> IEnumerable<ulong>.GetEnumerator() {
+    return Members.Keys.GetEnumerator();
+  }
 }

GangsAPI/Struct/Gang/IGangPlayer.cs → GangsAPI/Data/Gang/IGangPlayer.cs

@@ -1,7 +1,7 @@
-using GangsAPI.Permissions;
-using GangsAPI.Struct.Stat;
+using GangsAPI.Data.Stat;
+using GangsAPI.Permissions;
 
-namespace GangsAPI.Struct.Gang;
+namespace GangsAPI.Data.Gang;
 
 /// <summary>
 ///   A gang player is a player tracked by the gangs plugin.
@@ -33,27 +33,28 @@ public interface IGangPlayer {
   /// </summary>
   DateTime? LastSeen {
     get {
-      var stat = GetStat("last_seen") as IStat<ulong, DateTime>;
+      var stat = GetStat("gang_native_lastseen") as IStat<DateTime>;
       return stat?.Value;
     }
 
     set {
-      if (GetStat("last_seen") is IStat<ulong, DateTime?> stat)
+      if (GetStat("gang_native_lastseen") is IStat<DateTime?> stat)
         stat.Value = value;
     }
   }
 
   ISet<IStat> Stats { get; }
+  ISet<IStat> Perks { get; }
 
   int? Balance {
     get {
-      var stat = GetStat("balance") as IStat<ulong, int>;
+      var stat = GetStat("gang_native_balance") as IStat<int>;
       return stat?.Value;
     }
 
     set {
       ArgumentNullException.ThrowIfNull(value);
-      if (GetStat("balance") is IStat<ulong, int> stat)
+      if (GetStat("gang_native_balance") is IStat<int> stat)
         stat.Value = value.Value;
     }
   }

GangsAPI/Data/Stat/IGangStat.cs

@@ -0,0 +1,3 @@
+namespace GangsAPI.Data.Stat;
+
+public interface IGangStat<T> : IStat<T> { }

GangsAPI/Data/Stat/IPlayerStat.cs

@@ -0,0 +1,3 @@
+namespace GangsAPI.Data.Stat;
+
+public interface IPlayerStat<T> : IStat<T> { }

GangsAPI/Struct/Stat/IStat.cs → GangsAPI/Data/Stat/IStat.cs

@@ -1,4 +1,4 @@
-namespace GangsAPI.Struct.Stat;
+namespace GangsAPI.Data.Stat;
 
 /// <summary>
 ///   Represents a numerical statistic.
@@ -34,12 +34,7 @@ bool IEquatable<IStat>.Equals(IStat? other) {
   }
 }
 
-public interface IStat<K, T> : IStat {
-  /// <summary>
-  ///   A key identifying an instance of the statistic.
-  /// </summary>
-  K Key { get; init; }
-
+public interface IStat<T> : IStat {
   /// <summary>
   ///   The value of the statistic.
   /// </summary>

GangsAPI/Services/IGangManager.cs

@@ -1,4 +1,4 @@
-using GangsAPI.Struct.Gang;
+using GangsAPI.Data.Gang;
 
 namespace GangsAPI.Services;
 
@@ -31,12 +31,14 @@ public interface IGangManager : IPluginBehavior {
   Task<IGang?> GetGang(ulong steam);
 
   /// <summary>
-  ///   Pushes a gang to the database.
-  ///   Used for updating or creating gangs.
+  ///   Updates a gang to the database.
+  ///   Used for updating a gang's name or members.
+  ///   All other changes should be done through the respective managers.
   /// </summary>
   /// <param name="gang"></param>
-  /// <returns>True if the update was successful</returns>
-  Task<bool> PushGang(IGang gang);
+  /// <returns>True if the update was successful, false otherwise (e.g. gang
+  /// was not previously registered)</returns>
+  Task<bool> UpdateGang(IGang gang);
 
   /// <summary>
   ///   Deletes a gang by its ID.

GangsAPI/Services/IGangStatManager.cs

@@ -1,8 +1,46 @@
-using GangsAPI.Struct.Stat;
+using System.Collections;
+using GangsAPI.Data.Gang;
+using GangsAPI.Data.Stat;
 
 namespace GangsAPI.Services;
 
 public interface IGangStatManager {
   Task<IGangStat<V>?> GetForGang<V>(int key, string id);
-  Task<bool> PushToGang<V>(int key, string id, V value);
+  Task<bool> PushToGang<V>(int gangId, string id, V value);
+
+  Task<IGangStat<V>?> GetForGang<V>(IGang gang, string id) {
+    return GetForGang<V>(gang.GangId, id);
+  }
+
+  Task<bool> PushToGang<V>(IGang gang, string id, V value) {
+    return PushToGang<V>(gang.GangId, id, value);
+  }
+
+  Task<IGangStat<V>?> GetForGang<V>(IGang gang, IStat stat, V value) {
+    return GetForGang<V>(gang, stat.StatId);
+  }
+
+  Task<bool> PushToGang<V>(IGang gang, IStat stat, V value) {
+    return PushToGang<V>(gang, stat.StatId, value);
+  }
+
+  Task<bool> PushToGang<V>(int gangId, IStat<V> stat) {
+    return PushToGang<V>(gangId, stat.StatId, stat.Value);
+  }
+
+  Task<bool> PushToGang<V>(IGang gang, IStat<V> stat) {
+    return PushToGang<V>(gang, stat.StatId, stat.Value);
+  }
+
+  Task<IGangStat<V>?> GetForGang<V>(int key, IStat stat, V value) {
+    return GetForGang<V>(key, stat.StatId);
+  }
+
+  Task<bool> PushToGang<V>(int gangId, IStat stat, V value) {
+    return PushToGang<V>(gangId, stat.StatId, value);
+  }
+
+  Task<IGangStat<V>?> GetForGang<V>(IGang gang, IStat stat) {
+    return GetForGang<V>(gang, stat.StatId);
+  }
 }

GangsAPI/Services/IPlayerManager.cs

@@ -1,4 +1,4 @@
-using GangsAPI.Struct.Gang;
+using GangsAPI.Data.Gang;
 
 namespace GangsAPI.Services;
 
@@ -7,14 +7,17 @@ namespace GangsAPI.Services;
 /// </summary>
 public interface IPlayerManager : IPluginBehavior {
   /// <summary>
-  ///   Gets a player by their SteamID64, creating them if they do not exist.
+  ///   Gets a player by their SteamID64.
   /// </summary>
   /// <param name="steamId">The SteamID64 of the player.</param>
-  /// <returns>The player, or null if there was an error creating one.</returns>
-  Task<IGangPlayer?> GetPlayer(ulong steamId);
+  /// <returns>The player, or null if they did not exist.</returns>
+  Task<IGangPlayer?> GetPlayer(ulong steamId) {
+    return GetPlayer(steamId, false);
+  }
 
   /// <summary>
   ///   Gets a player by their SteamID64.
+  ///   If the player was already created, returns them.
   /// </summary>
   /// <param name="steamId">The SteamID64 of the player.</param>
   /// <param name="create">True if the manager should create a new player if they don't exist.</param>

GangsAPI/Services/IPlayerStatManager.cs

@@ -1,8 +1,15 @@
-using GangsAPI.Struct.Stat;
+using GangsAPI.Data.Gang;
+using GangsAPI.Data.Stat;
 
 namespace GangsAPI.Services;
 
 public interface IPlayerStatManager {
-  Task<IGangStat<V>?> GetForPlayer<V>(ulong key, string id);
-  Task<bool> PushToPlayer<V>(ulong key, string id, V value);
+  Task<IPlayerStat<V>?> GetForPlayer<V>(ulong key, string statId);
+
+  Task<bool> PushToPlayer<V>(ulong key, IPlayerStat<V> value) {
+    return PushToPlayer(key, value.StatId, value.Value);
+  }
+
+  Task<bool> PushToPlayer<V>(ulong key, string statId, V value);
+
 }

GangsAPI/Services/IStatManager.cs

@@ -1,4 +1,4 @@
-using GangsAPI.Struct.Stat;
+using GangsAPI.Data.Stat;
 
 namespace GangsAPI.Services;
 

GangsImpl.Memory/GangsImpl.Memory.csproj → GangsImpl.Mock/GangsImpl.Mock.csproj

@@ -7,6 +7,7 @@
 
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <RootNamespace>GangsImpl.Memory</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

GangsImpl.Memory/MemoryImpl.cs → GangsImpl.Mock/MemoryImpl.cs

@@ -6,6 +6,6 @@ namespace GangsImpl.Memory;
 
 public static class MemoryImpl {
   public static void AddMemoryImpl(this IServiceCollection collection) {
-    collection.AddPluginBehavior<IStatManager, MemoryStatManager>();
+    collection.AddPluginBehavior<IStatManager, MockStatManager>();
   }
 }