From a18196020554f30b83f35d82969d1d5eee027442 Mon Sep 17 00:00:00 2001 From: "titouan.louvet" Date: Tue, 6 Jun 2023 11:26:26 +0200 Subject: [PATCH] Changed list to hashSet --- .../DataContractPersJSON.cs | 4 ++-- .../DataContractPersistance/DataContractPersXML.cs | 4 ++-- .../DataContractPersistance/DataToPersist.cs | 2 +- src/Banquale/Banquale/Stub/Stub.cs | 6 +++--- src/Banquale/Model/Account.cs | 13 ++++++++++++- src/Banquale/Model/IPersistenceManager.cs | 4 ++-- src/Banquale/Model/Manager.cs | 14 +++++++------- 7 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPersJSON.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPersJSON.cs index 85df3fb..5bc155f 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataContractPersJSON.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPersJSON.cs @@ -18,7 +18,7 @@ namespace Banquale.DataContractPersistance public string FileName { get; set; } = "DataSave.json"; - public (List, Consultant) DataLoad() + public (HashSet, Consultant) DataLoad() { DataContractJsonSerializer jsonSerializer = new DataContractJsonSerializer(typeof(DataToPersist)); @@ -33,7 +33,7 @@ namespace Banquale.DataContractPersistance } - public void DataSave(List cu, Consultant co) + public void DataSave(HashSet cu, Consultant co) { DataToPersist data = new DataToPersist(); diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPersXML.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPersXML.cs index 893ee04..637ddf4 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataContractPersXML.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPersXML.cs @@ -15,7 +15,7 @@ namespace Banquale.DataContractPersistance public string FilePath { get; set; } = FileSystem.Current.AppDataDirectory; public string FileName { get; set; } = "DataSave.xml"; - public (List, Consultant) DataLoad() + public (HashSet, Consultant) DataLoad() { var serializer = new DataContractSerializer(typeof(DataToPersist)); @@ -49,7 +49,7 @@ namespace Banquale.DataContractPersistance return (data.customer, data.consultant); } - public void DataSave(List cu, Consultant co) + public void DataSave(HashSet cu, Consultant co) { var serializer = new DataContractSerializer(typeof(DataToPersist), new DataContractSerializerSettings() { PreserveObjectReferences = true }); // La deuxième partie sert à faire des références, cela sert à ne pas duppliquer l'écriture de certains attributs diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs index 22c9843..1e08211 100644 --- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs +++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs @@ -5,7 +5,7 @@ namespace Banquale.DataContractPersistance { public class DataToPersist { - public List customer { get; set; } = new List(); + public HashSet customer { get; set; } = new HashSet(); public Consultant consultant { get; set; } } } diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs index 3749c51..5242d6d 100644 --- a/src/Banquale/Banquale/Stub/Stub.cs +++ b/src/Banquale/Banquale/Stub/Stub.cs @@ -7,7 +7,7 @@ namespace Banquale.Stub public class Stub : IPersistenceManager { - public (List, Consultant) DataLoad() + public (HashSet, Consultant) DataLoad() { Consultant Consultant = new Consultant("Consultant", "Consultant", "Consultant"); // toujours creer en premier le consultant @@ -32,7 +32,7 @@ namespace Banquale.Stub Transactions Transactions3 = new Transactions(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00)); Debug.WriteLine(Customer1.Name, Customer1.Password); - List CustomersList = new List(); + HashSet CustomersList = new HashSet(); List TransactionsList= new List(); List AccountsList = new List(); @@ -57,7 +57,7 @@ namespace Banquale.Stub return (CustomersList, Consultant); } - public void DataSave(List c, Consultant consultant) + public void DataSave(HashSet c, Consultant consultant) { throw new NotImplementedException(); } diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs index b42dff7..0e0c6bb 100644 --- a/src/Banquale/Model/Account.cs +++ b/src/Banquale/Model/Account.cs @@ -82,7 +82,17 @@ namespace Model private string ibanHide; [DataMember(Order = 5)] - public List TransactionsList { get; set; } = new List(); + public List TransactionsList + { + get => transactionsList; + set + { + transactionsList = value; + OnPropertyChanged(nameof(TransactionsList)); + } + } + + private List transactionsList; public void DoTransactions(Account involvedAccount, double sum, bool type, int nb) { @@ -106,6 +116,7 @@ namespace Model Balance = balance; Name = name; IBAN = iban; + TransactionsList = new List(); IBANHide = IBANToString(); } diff --git a/src/Banquale/Model/IPersistenceManager.cs b/src/Banquale/Model/IPersistenceManager.cs index afff14b..ef0b752 100644 --- a/src/Banquale/Model/IPersistenceManager.cs +++ b/src/Banquale/Model/IPersistenceManager.cs @@ -8,8 +8,8 @@ namespace Model { public interface IPersistenceManager { - public (List, Consultant) DataLoad(); + public (HashSet, Consultant) DataLoad(); - void DataSave(List cu, Consultant co); + void DataSave(HashSet cu, Consultant co); } } diff --git a/src/Banquale/Model/Manager.cs b/src/Banquale/Model/Manager.cs index dfd80ba..4ccb2e0 100644 --- a/src/Banquale/Model/Manager.cs +++ b/src/Banquale/Model/Manager.cs @@ -14,7 +14,7 @@ namespace Model => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); [DataMember] - public List CustomersList { get; private set; } // devient un set + public HashSet CustomersList { get; private set; } [DataMember] public Consultant Consultant { get; private set; } // 1 SEUL consultant @@ -69,13 +69,13 @@ namespace Model public Manager(IPersistenceManager persistence) { - CustomersList = new List(); + CustomersList = new HashSet(); Persistence = persistence; } public Manager() { - CustomersList = new List(); + CustomersList = new HashSet(); } public bool AddCustomer(Customer MyCustomer) @@ -84,9 +84,9 @@ namespace Model return true; } - public Customer GetCustomer(int place) { - return CustomersList[place]; - } + //public Customer GetCustomer(int place) { + // return CustomersList[place]; + //} public void DataSave() { @@ -97,7 +97,7 @@ namespace Model { var data = Persistence.DataLoad(); - CustomersList.AddRange(data.Item1); + CustomersList =data.Item1; /*foreach (var j in data.Item1) {