fix model issues, console working!

MCTG/AppException/RecipeExceptions/NoRecipeSelectedException.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AppException
+{
+    public class NoRecipeSelectedException : RecipeException
+    {
+        public NoRecipeSelectedException() : base("No recipe is currently selected to perform this action.") { }
+    }
+}

MCTG/ConsoleApp/ConsoleApp - Backup.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Configurations>Debug;Release;CI</Configurations>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DataPersistence\DataPersistence.csproj" />
-    <ProjectReference Include="..\Model\Model.csproj" />
-  </ItemGroup>
-
-</Project>

MCTG/ConsoleApp/MenuManager.cs

@@ -14,7 +14,7 @@ namespace ConsoleApp
         /// <summary>
         /// The manager that contains usefull data taken from the model.
         /// </summary>
-        public MasterManager MasterMgr => Program.Master;
+        public MasterManager MasterMgr { get; private set; }
 
         /// <summary>
         /// Each menu called are push in this stack. Then, to return back, we pop this stack to retrive the previous menu.
@@ -30,6 +30,7 @@ namespace ConsoleApp
         /// <param name="firstMenu">The starting menu, the first that will be push on the call stack.</param>
         public MenuManager(MasterManager masterManager, IMenu firstMenu)
         {
+            MasterMgr = masterManager;
             MenuCallStack = new Stack<IMenu>();
             MenuCallStack.Push(firstMenu);
         }

MCTG/ConsoleApp/Program.cs

@@ -9,15 +9,6 @@ namespace ConsoleApp;
 
 public static class Program
 {
-    private static IDataManager _dataManager = new DataDefaultManager(new DataContractXML());
-    private static IRecipeManager _recipeManager = new RecipeDefaultManager(_dataManager);
-    private static IPasswordManager _passwordManager = new PasswordSHA256Manager();
-    private static IUserManager _userManager = new UserDefaultManager(_dataManager, _passwordManager);
-
-    public static MasterManager Master { get; private set; }
-        = new MasterManager(_dataManager, _recipeManager, _userManager);
-
-
     public static void Main(string[] args)
     {
         Console.WriteLine("Hello, World!\n\n");
@@ -41,16 +32,17 @@ public static class Program
         IUserManager userManager = new UserDefaultManager(dataManager, passwordManager);
 
         // Initialize the master manager
-        Master = new MasterManager(dataManager, recipeManager, userManager);
+        MasterManager Master = new MasterManager(dataManager, recipeManager, userManager);
         Master.Setup();
 
         MenuManager menuMgr = new MenuManager(Master);
         menuMgr.Loop();
 
         // Change the data serializer if the one in place is 'Stubs'
-        if (Master.Data as Stubs is not null)
+        if (Master.Data.Serializer.GetType() == typeof(Stubs))
         {
-            dataManager = new DataDefaultManager(dataSerializer);
+            var data = Master.Data.Data;
+            dataManager = new DataDefaultManager(dataSerializer, data);
             Master = new MasterManager(dataManager, recipeManager, userManager);
         }
 
@@ -58,7 +50,3 @@ public static class Program
         Console.Write("[ --SAVE-- ]:\t"); Master.Data.SaveData(); Console.WriteLine("Done.");
     }
 }
-
-
-
-

MCTG/Managers/DataDefaultManager.cs

@@ -18,10 +18,16 @@ namespace Managers
         /// Constructor of the DataDefaultManager class. Take a IDataManager that will provide methods for the serialisation of the data.
         /// </summary>
         /// <param name="dataManager">The data manager that know how to serialize a file.</param>
-        public DataDefaultManager(IDataSerializer dataManager)
+        /// <param name="data">The data set of the application.</param>
+        public DataDefaultManager(IDataSerializer dataManager,
+                                  Dictionary<string, List<object>>? data = null)
         {
             Serializer = dataManager;
-            Data = Serializer.Load();
+
+            if (data is null)
+                Data = new Dictionary<string, List<object>>();
+            else
+                Data = data;
         }
         #endregion
 

MCTG/Managers/RecipeDefaultManager.cs

@@ -9,9 +9,8 @@ namespace Managers
     public class RecipeDefaultManager : IRecipeManager
     {
         private IDataManager _dataManager;
-        private Recipe _currentSelected;
 
-        public Recipe? CurrentSelected => _currentSelected;
+        public Recipe? CurrentSelected { get; set; } = null;
 
 
         public RecipeDefaultManager(IDataManager dataManager)
@@ -46,9 +45,12 @@ namespace Managers
             if (author is null)
                 throw new UserNotFoundException(authorMail);
 
+            IEnumerable<Recipe> recipes = from Recipe r in _dataManager.GetFromData<Recipe>()
+                                          where r.AuthorMail == author.Mail
+                                          select r;
+
             return new RecipeCollection(
-                $"{author.Name} {author.Surname}'s recipes",
-                _dataManager.GetFromData<Recipe>().ToArray());
+                $"{author.Name} {author.Surname}'s recipes", recipes.ToArray());
         }
 
         public RecipeCollection SearchRecipeByTitle(string title)
@@ -89,10 +91,13 @@ namespace Managers
 
         public bool ModifyCurrentSelected(Recipe newRecipe)
         {
+            if (CurrentSelected is null)
+                throw new NoRecipeSelectedException();
+
             try
             {
                 var index = _dataManager.GetFromData<Recipe>().ToList()
-                                                            .FindIndex(u => u.Equals(_currentSelected));
+                                                            .FindIndex(u => u.Equals(CurrentSelected));
                 _dataManager.Data[nameof(Recipe)][index] = newRecipe;
             }
             catch (ArgumentNullException e)

MCTG/Managers/UserDefaultManager.cs

@@ -89,7 +89,7 @@ namespace Managers
             if (user is null)
                 return false;
 
-            if (!_passwordManager.VerifyPassword(password, user.Password))
+            if (!_passwordManager.VerifyPassword(user.Password, password))
                 return false;
 
             _currentConnected = user;

MCTG/Model/Managers/IRecipeManager.cs

@@ -8,7 +8,7 @@ namespace Model
 {
     public interface IRecipeManager
     {
-        Recipe? CurrentSelected { get; }
+        Recipe? CurrentSelected { get; set; }
 
         RecipeCollection GetAllRecipes();
         Recipe GetRecipeFromId(int id);

MCTG/Model/Recipes/Recipe.cs

@@ -208,9 +208,11 @@ namespace Model
 
         public override bool Equals(object? obj)
         {
-            var item = obj as Recipe;
-            if (item == null) return false;
-            return Equals(obj);
+            if (ReferenceEquals(obj, null)) return false;
+            if (ReferenceEquals(obj, this)) return true;
+            if (GetType() != obj.GetType()) return false;
+
+            return Equals(obj as Recipe);
         }
 
         public override int GetHashCode()

MCTG/Model/Users/User.cs

@@ -104,14 +104,18 @@ namespace Model
         #region Methods
         public override bool Equals(object? other)
         {
-            if (other == null) return false;
-            if (other == this) return true;
-            return Equals(other);
+            if (ReferenceEquals(other, null)) return false;
+            if (ReferenceEquals(other, this)) return true;
+            if (GetType() != other.GetType()) return false;
+
+            return Equals(other as User);
         }
 
         public bool Equals(User? other)
         {
             if (other == null) return false;
+            if (other == this) return true;
+
             return Name.Equals(other.Name) && Surname.Equals(other.Surname) && Mail.Equals(other.Mail);
         }