🔥 ⚰️ Fix #60

Sources/Data/Stub.cs

@@ -1,4 +1,5 @@
-using Model.Dice;
+using Model;
+using Model.Dice;
 using Model.Dice.Faces;
 using Model.Games;
 using Model.Players;
@@ -19,7 +20,7 @@ namespace Data
 
             Player player1 = new("Alice"), player2 = new("Bob"), player3 = new("Clyde");
 
-            DieManager globalDieManager = new DieManager();
+            IManager<(string, IEnumerable<AbstractDie<AbstractDieFace>>)> globalDieManager = new DieManager();
 
             // create at least one fav group in there
             // ... 

Sources/Model/Dice/DieManager.cs

@@ -17,7 +17,7 @@ namespace Model.Dice
             throw new System.NotImplementedException();
         }
 
-        public (string, IEnumerable<AbstractDie<AbstractDieFace>>) GetOneById(int id)
+        public (string, IEnumerable<AbstractDie<AbstractDieFace>>) GetOneByName(string name)
         {
             throw new System.NotImplementedException();
         }

Sources/Model/Games/Game.cs

@@ -33,9 +33,9 @@ namespace Model.Games
         private string name;
 
         /// <summary>
-        /// whether this game is new or not
+        /// references the position in list of the current player, for a given game.
         /// </summary>
-        public bool IsFirstTurn { get; private set; } = false;
+        private int nextIndex = 0;
 
         /// <summary>
         /// the turns that have been done so far
@@ -51,7 +51,7 @@ namespace Model.Games
         /// <summary>
         /// the game's player manager, doing CRUD on players and switching whose turn it is
         /// </summary>
-        private readonly PlayerManager playerManager;
+        private readonly IManager<Player> playerManager;
 
         /// <summary>
         /// the group of dice used for this game
@@ -66,7 +66,7 @@ namespace Model.Games
         /// <param name="turns">the turns that have been done so far</param>
         /// <param name="playerManager">the game's player manager, doing CRUD on players and switching whose turn it is</param>
         /// <param name="favGroup">the group of dice used for this game</param>
-        public Game(string name, PlayerManager playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice, IEnumerable<Turn> turns)
+        public Game(string name, IManager<Player> playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice, IEnumerable<Turn> turns)
         {
             Name = name;
             this.turns = turns.ToList() ?? new List<Turn>();
@@ -80,7 +80,7 @@ namespace Model.Games
         /// <param name="name">the name of the game 😎</param>
         /// <param name="playerManager">the game's player manager, doing CRUD on players and switching whose turn it is</param>
         /// <param name="favGroup">the group of dice used for this game</param>
-        public Game(string name, PlayerManager playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice)
+        public Game(string name, IManager<Player> playerManager, IEnumerable<AbstractDie<AbstractDieFace>> dice)
             : this(name, playerManager, dice, null)
         { }
 
@@ -90,21 +90,61 @@ namespace Model.Games
         /// <param name="player">the player whose turn it is</param>
         public void PerformTurn(Player player)
         {
-            if (IsFirstTurn) { IsFirstTurn = false; } // only true one time (on the first turn...)
             Turn turn = Turn.CreateWithDefaultTime(
                 new Player(player),
-                ThrowAll() //using a copy so that next line doesn't "change history"
+                ThrowAll() //using a copy so that next lines can't "change history"
                 );
             turns.Add(turn);
+            nextIndex++;
         }
 
         /// <summary>
-        /// finds whose turn it is
+        /// finds and returns the player whose turn it is
         /// </summary>
-        /// <returns>the Player whose turn it is</returns>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
         public Player GetWhoPlaysNow()
         {
-            return playerManager.WhoPlaysNow(IsFirstTurn);
+            if (!playerManager.GetAll().Any())
+            {
+                throw new MemberAccessException("you are exploring an empty collection\nthis should not have happened");
+            }
+
+            return playerManager.GetAll().ElementAt(nextIndex);
+        }
+
+        /// <summary>
+        /// this feels very dirty
+        /// </summary>
+        /// <param name="current">the current player</param>
+        /// <exception cref="MemberAccessException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="ArgumentException"></exception>
+        public void PrepareNextPlayer(Player current)
+        {
+            if (!playerManager.GetAll().Any())
+            {
+                throw new MemberAccessException("you are exploring an empty collection\nthis should not have happened");
+            }
+            if (current == null)
+            {
+                throw new ArgumentNullException(nameof(current), "param should not be null");
+            }
+            if (!playerManager.GetAll().Contains(current))
+            {
+                throw new ArgumentException("param could not be found in this collection\n did you forget to add it?", nameof(current));
+            }
+
+            if (playerManager.GetAll().Last() == current)
+            {
+                // if we've reached the last player, we need the index to loop back around
+                nextIndex = 0;
+            }
+            else
+            {
+                // else we can just move up by one from the current index
+                nextIndex++;
+            }
         }
 
         /// <summary>
@@ -121,15 +161,6 @@ namespace Model.Games
             return faces;
         }
 
-        /// <summary>
-        /// asks the PlayerManager to prepare the next Player
-        /// </summary>
-        /// <param name="currentPlayer">the Player whose turn it was</param>
-        public void PrepareNextPlayer(Player currentPlayer)
-        {
-            playerManager.PrepareNextPlayer(currentPlayer);
-        }
-
         public Player AddPlayerToGame(Player player)
         {
             return playerManager.Add(player);
@@ -162,7 +193,7 @@ namespace Model.Games
                 "Log:\n",
                 Name,
                 playerManager.GetAll().ToString(),
-                playerManager.WhoPlaysNow(IsFirstTurn));
+                GetWhoPlaysNow());
 
             foreach (Turn turn in this.turns)
             {

Sources/Model/Games/GameRunner.cs

@@ -4,17 +4,18 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Model.Dice;
+using Model.Dice.Faces;
 using Model.Players;
 
 namespace Model.Games
 {
     public class GameRunner
     {
-        private readonly PlayerManager globalPlayerManager;
+        private readonly IManager<Player> globalPlayerManager;
-        private readonly DieManager globalDieManager;
+        private readonly IManager<(string, IEnumerable<AbstractDie<AbstractDieFace>>)> globalDieManager;
         private readonly List<Game> games;
 
-        public GameRunner(PlayerManager globalPlayerManager, DieManager globalDieManager, List<Game> games)
+        public GameRunner(IManager<Player> globalPlayerManager, IManager<(string, IEnumerable<AbstractDie<AbstractDieFace>>)> globalDieManager, List<Game> games)
         {
             this.globalPlayerManager = globalPlayerManager;
             this.globalDieManager = globalDieManager;

Sources/Model/IManager.cs

@@ -4,7 +4,7 @@ namespace Model
     public interface IManager<T>
     {
         public T Add(T toAdd);
-        public T GetOneById(int id);
+        public T GetOneByName(string name);
         public IEnumerable<T> GetAll();
         public T Update(T before, T after);
         public void Remove(T toRemove);

Sources/Model/Players/PlayerManager.cs

@@ -11,13 +11,6 @@ namespace Model.Players
         /// </summary>
         private readonly List<Player> players;
 
-        /// <summary>
-        /// references the position in list of the current player, for a given game.
-        /// <br/>
-        /// ASSUMING that each Game made its own instance of PlayerManager
-        /// </summary>
-        public int NextIndex { get; private set; } = 0;
-
         public PlayerManager()
         {
             players = new();
@@ -41,17 +34,6 @@ namespace Model.Players
             return toAdd;
         }
 
-        /// <summary>
-        /// might never get implemented in the model, go through GetOneByName() in the meantime
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
-        public Player GetOneById(int id)
-        {
-            throw new NotImplementedException("might never get implemented\ngo through GetOneByName() in the meantime");
-        }
-
         /// <summary>
         /// finds the player with that name and returns A COPY OF IT
         /// <br/>
@@ -77,64 +59,6 @@ namespace Model.Players
         /// <returns>a readonly enumerable of all this manager's players</returns>
         public IEnumerable<Player> GetAll() => players.AsEnumerable();
 
-        /// <summary>
-        /// finds and returns the player whose turn it is
-        /// </summary>
-        /// <returns></returns>
-        /// <exception cref="Exception"></exception>
-        public Player WhoPlaysNow(bool isFirstTurn)
-        {
-            if (players.Count == 0)
-            {
-                throw new MemberAccessException("you are exploring an empty collection\nthis should not have happened");
-            }
-
-            Player result;
-            if (isFirstTurn)
-            {
-                result = players[0];
-            }
-            else
-            {
-                result = players[NextIndex];
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// this feels very dirty
-        /// </summary>
-        /// <param name="current"></param>
-        /// <exception cref="Exception"></exception>
-        /// <exception cref="ArgumentNullException"></exception>
-        /// <exception cref="ArgumentException"></exception>
-        public void PrepareNextPlayer(Player current)
-        {
-            if (players.Count == 0)
-            {
-                throw new MemberAccessException("you are exploring an empty collection\nthis should not have happened");
-            }
-            if (current == null)
-            {
-                throw new ArgumentNullException(nameof(current), "param should not be null");
-            }
-            if (!players.Contains(current))
-            {
-                throw new ArgumentException("param could not be found in this collection\n did you forget to add it?", nameof(current));
-            }
-
-            if (players.Last() == current)
-            {
-                // if we've reached the last index, we need to loop back around
-                NextIndex = 0;
-            }
-            else
-            {
-                // else we can just move up one from current
-                NextIndex++;
-            }
-        }
-
         /// <summary>
         /// update a player from <paramref name="before"/> to <paramref name="after"/>
         /// </summary>

Sources/Tests/Model_UTs/PlayerManagerTest.cs

@@ -63,19 +63,6 @@ namespace Tests.Model_UTs
             Assert.Throws<ArgumentNullException>(action);
         }
 
-        [Fact]
-        public void TestGetOneByIdThrowsNotImplemented()
-        {
-            // Arrange
-            PlayerManager playerManager = new();
-
-            // Act
-            void action() => playerManager.GetOneById(1);
-
-            // Assert
-            Assert.Throws<NotImplementedException>(action);
-        }
-
         [Theory]
         [InlineData("")]
         [InlineData(null)]