From 0e0cee204df24aa78234ceb0c9835e270f6231d9 Mon Sep 17 00:00:00 2001 From: Matheo THIERRY Date: Mon, 22 May 2023 13:22:37 +0200 Subject: [PATCH 1/2] fix persistence - tructure ok --- notus/Biblioteque_de_Class/IManager.cs | 19 +++++++++++ notus/Biblioteque_de_Class/Manager.cs | 27 ++++++++++++++- notus/Notus_Persistence/PersistenceManager.cs | 33 ------------------- 3 files changed, 45 insertions(+), 34 deletions(-) create mode 100644 notus/Biblioteque_de_Class/IManager.cs delete mode 100644 notus/Notus_Persistence/PersistenceManager.cs diff --git a/notus/Biblioteque_de_Class/IManager.cs b/notus/Biblioteque_de_Class/IManager.cs new file mode 100644 index 0000000..74f98cc --- /dev/null +++ b/notus/Biblioteque_de_Class/IManager.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Biblioteque_de_Class +{ + public interface IManager + { + public void SaveDatabaseData(Database database); + + public Database LoadDatabaseData(); + + public void SaveUserData(User user); + + public User LoadUserData(); + } +} diff --git a/notus/Biblioteque_de_Class/Manager.cs b/notus/Biblioteque_de_Class/Manager.cs index 5699a42..90faa60 100644 --- a/notus/Biblioteque_de_Class/Manager.cs +++ b/notus/Biblioteque_de_Class/Manager.cs @@ -8,6 +8,31 @@ namespace Biblioteque_de_Class { public class Manager { - private PersistenceManager persistence { set; get; } + private IManager persistence; + + public Manager(IManager pers) + { + persistence = pers; + } + + public void SaveDatabaseData(Database database) + { + persistence.SaveDatabaseData(database); + } + + public Database LoadDatabaseData() + { + return persistence.LoadDatabaseData(); + } + + public void SaveUserData(User user) + { + persistence.SaveUserData(user); + } + + public User LoadUserData() + { + return persistence.LoadUserData(); + } } } diff --git a/notus/Notus_Persistence/PersistenceManager.cs b/notus/Notus_Persistence/PersistenceManager.cs deleted file mode 100644 index 4828a29..0000000 --- a/notus/Notus_Persistence/PersistenceManager.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Biblioteque_de_Class; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Json; -using System.Xml; -using System; -using System.Collections.Generic; -using System.Diagnostics; - -namespace Notus_Persistance -{ - public static class PersistenceManager - { - public static void SaveDatabaseData(Database database) - { - ToJSON.SaveDatabaseData(database); - } - - public static Database LoadDatabaseData() - { - return ToJSON.LoadDatabaseData(); - } - - public static void SaveUserData(User user) - { - ToJSON.SaveUserData(user); - } - - public static User LoadUserData() - { - return ToJSON.LoadUserData(); - } - } -} \ No newline at end of file From d34d420121ff73af44046d12d428eaf6eb6732be Mon Sep 17 00:00:00 2001 From: Matheo THIERRY Date: Mon, 22 May 2023 14:20:19 +0200 Subject: [PATCH 2/2] fix persistance v2 --- notus/Notus_Persistence/Stub.cs | 18 +++++++++--------- notus/Notus_Persistence/ToJSON.cs | 10 +++++----- notus/Notus_Persistence/ToXML.cs | 18 +++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/notus/Notus_Persistence/Stub.cs b/notus/Notus_Persistence/Stub.cs index 8056488..d7c6135 100644 --- a/notus/Notus_Persistence/Stub.cs +++ b/notus/Notus_Persistence/Stub.cs @@ -8,26 +8,26 @@ using System.Threading.Tasks; namespace Notus_Persistance { - internal class Stub + internal class Stub : IManager { - public static void SaveDatabaseData(Database database) + public void SaveDatabaseData(Database database) { - + throw new NotImplementedException(); } - public static Database LoadDatabaseData() + public Database LoadDatabaseData() { - + throw new NotImplementedException(); } - public static void SaveUserData(User user) + public void SaveUserData(User user) { - + throw new NotImplementedException(); } - public static User LoadUserData() + public User LoadUserData() { - + throw new NotImplementedException(); } } } diff --git a/notus/Notus_Persistence/ToJSON.cs b/notus/Notus_Persistence/ToJSON.cs index 5f10a96..9ff522a 100644 --- a/notus/Notus_Persistence/ToJSON.cs +++ b/notus/Notus_Persistence/ToJSON.cs @@ -12,13 +12,13 @@ using System.Text.Json; namespace Notus_Persistance { - public static class ToJSON + public class ToJSON : IManager { private const string DatabaseDataFilePath = "data.json"; private const string UserDataFilePath = "userdata.json"; private static DataContractJsonSerializer DatabasejsonSerializer = new DataContractJsonSerializer(typeof(Database)); private static DataContractJsonSerializer UserjsonSerializer = new DataContractJsonSerializer(typeof(User)); - public static void SaveDatabaseData(Database database) + public void SaveDatabaseData(Database database) { using (FileStream fileStream = File.Create(DatabaseDataFilePath)) { @@ -33,7 +33,7 @@ namespace Notus_Persistance } } - public static Database LoadDatabaseData() + public Database LoadDatabaseData() { if (File.Exists(DatabaseDataFilePath)) { @@ -57,7 +57,7 @@ namespace Notus_Persistance } } - public static void SaveUserData(User user) + public void SaveUserData(User user) { using (FileStream fileStream = File.Create(UserDataFilePath)) { @@ -72,7 +72,7 @@ namespace Notus_Persistance } } - public static User LoadUserData() + public User LoadUserData() { if (File.Exists(UserDataFilePath)) { diff --git a/notus/Notus_Persistence/ToXML.cs b/notus/Notus_Persistence/ToXML.cs index f813109..47332f0 100644 --- a/notus/Notus_Persistence/ToXML.cs +++ b/notus/Notus_Persistence/ToXML.cs @@ -10,29 +10,29 @@ using System.Threading.Tasks; namespace Notus_Persistance { - public static class ToXML + public class ToXML : IManager { private const string DataFilePath = "data.xml"; private const string XmlDataFilePath = "userdata.xml"; - public static void SaveDatabaseData(Database database) + public void SaveDatabaseData(Database database) { - + throw new NotImplementedException(); } - public static Database LoadDatabaseData() + public Database LoadDatabaseData() { - + throw new NotImplementedException(); } - public static void SaveUserData(User user) + public void SaveUserData(User user) { - + throw new NotImplementedException(); } - public static User LoadUserData() + public User LoadUserData() { - + throw new NotImplementedException(); } } }