From 6b600b7c79f8d4fa01a8a46017bf76e72776489d Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Thu, 8 Jun 2023 21:20:04 +0200
Subject: [PATCH 1/3] add opposition mechanic

---
 src/Banquale/Banquale/Views/TransactionsPage.xaml.cs | 1 +
 src/Banquale/Model/Transaction.cs                    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
index 25e29df..d20ab97 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml.cs
@@ -22,6 +22,7 @@ public partial class TransactionsPage : ContentPage
 
     async void Objection_Clicked(System.Object sender, System.EventArgs e)
     {
+        Mgr.SelectedTransaction.IsOpposition = true;
         await Shell.Current.Navigation.PopAsync();
     }
 
diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs
index 27d1ff6..b72a1ae 100644
--- a/src/Banquale/Model/Transaction.cs
+++ b/src/Banquale/Model/Transaction.cs
@@ -115,6 +115,11 @@ namespace Model
         [DataMember]
         private DateTime date;
 
+
+        [DataMember(Order = 7)]
+        public bool IsOpposition { get; set;  }
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Transaction"/> class.
         /// </summary>
@@ -131,6 +136,7 @@ namespace Model
             Id = id;
             InvolvedAccounts = involvedAccounts;
             Date = date;
+            IsOpposition = false;
         }
 
         public void ChangeCategory(string newCateg)

From 61e4ae7f7750f4f2634a0db9c8d7939b6dda1794 Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Thu, 8 Jun 2023 21:22:30 +0200
Subject: [PATCH 2/3] fix bug

---
 src/Banquale/Banquale/Views/TransactionsPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml b/src/Banquale/Banquale/Views/TransactionsPage.xaml
index 4d265eb..02ccd33 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml
@@ -91,7 +91,7 @@
         <Button
             Text="Faire opposition"
             Margin="0, 50, 0, 0"
-            Clicked="Objection_Clicked" x:Name="oppose"/>
+            Clicked="Objection_Clicked"/>
 
     </VerticalStackLayout>
 

From 1b4882ab513952879ee418cd1d99831b41cf72ef Mon Sep 17 00:00:00 2001
From: "titouan.louvet" <titouan.louvet@etu.uca.fr>
Date: Thu, 8 Jun 2023 21:43:48 +0200
Subject: [PATCH 3/3] Added request transaction

---
 src/Banquale/Banquale/Stub/Stub.cs            | 20 ++++++------
 .../Banquale/Views/TransactionsPage.xaml      |  2 +-
 .../Banquale/Views/Transfer/RequestPage.xaml  |  5 +--
 .../Views/Transfer/RequestPage.xaml.cs        | 31 +++++++++++++++++--
 .../Views/Transfer/TransferPage.xaml.cs       |  3 +-
 src/Banquale/Model/Account.cs                 |  9 +++---
 src/Banquale/Model/Transaction.cs             | 21 +++++--------
 7 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/Banquale/Banquale/Stub/Stub.cs b/src/Banquale/Banquale/Stub/Stub.cs
index f82d7a8..501412a 100644
--- a/src/Banquale/Banquale/Stub/Stub.cs
+++ b/src/Banquale/Banquale/Stub/Stub.cs
@@ -25,11 +25,11 @@ namespace Banquale.Stub
             Account Account2 = new Account(9510, "Despoints", "FR7647858569691441525263003");
             Account Account3 = new Account(3519, "Perotte", "FR7663522541416969585847002");
 
-            Transaction Transaction1 = new Transaction(true, 55, Account2, 1, new DateTime(2023, 6, 21, 15, 29, 20));
-            Transaction Transaction12 = new Transaction(true, 105, Account2, 2, new DateTime(2023, 8, 17, 18, 54, 35));
-            Transaction Transaction13 = new Transaction(true, 187, Account3, 3, new DateTime(2023, 5, 3, 8, 39, 49));
-            Transaction Transaction2 = new Transaction(false, 54.99, Account2, 4, new DateTime(2022, 8, 15));
-            Transaction Transaction3 = new Transaction(true, 1000, Account3, 5, new DateTime(2020, 9, 1, 20, 00, 00));
+            Transaction Transaction1 = new Transaction(true, 55, Account2, new DateTime(2023, 6, 21, 15, 29, 20));
+            Transaction Transaction12 = new Transaction(true, 105, Account2, new DateTime(2023, 8, 17, 18, 54, 35));
+            Transaction Transaction13 = new Transaction(true, 187, Account3, new DateTime(2023, 5, 3, 8, 39, 49));
+            Transaction Transaction2 = new Transaction(false, 54.99, Account2, new DateTime(2022, 8, 15));
+            Transaction Transaction3 = new Transaction(true, 1000, Account3, new DateTime(2020, 9, 1, 20, 00, 00));
 
             Debug.WriteLine(Customer1.Name, Customer1.Password);
 
@@ -46,11 +46,11 @@ namespace Banquale.Stub
 
             //Account2.TransactionsList.Add(Transaction2);
 
-            Account1.DoTransactions(Account2, 55, true, 1);
-            Account1.DoTransactions(Account2, 105, true, 2);
-            Account1.DoTransactions(Account3, 187, true, 3);
-            Account1.DoTransactions(Account2, 54.99, false, 4);
-            Account1.DoTransactions(Account3, 1000, false, 5);
+            Account1.DoTransactions(Account2, 55, true);
+            Account1.DoTransactions(Account2, 105, true);
+            Account1.DoTransactions(Account3, 187, true);
+            Account1.DoTransactions(Account2, 54.99, false);
+            Account1.DoTransactions(Account3, 1000, false);
 
 
             Customer1.AccountsList.Add(Account1);
diff --git a/src/Banquale/Banquale/Views/TransactionsPage.xaml b/src/Banquale/Banquale/Views/TransactionsPage.xaml
index 02ccd33..4d265eb 100644
--- a/src/Banquale/Banquale/Views/TransactionsPage.xaml
+++ b/src/Banquale/Banquale/Views/TransactionsPage.xaml
@@ -91,7 +91,7 @@
         <Button
             Text="Faire opposition"
             Margin="0, 50, 0, 0"
-            Clicked="Objection_Clicked"/>
+            Clicked="Objection_Clicked" x:Name="oppose"/>
 
     </VerticalStackLayout>
 
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
index 7a3709a..8f20e5a 100644
--- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml
@@ -26,7 +26,7 @@
                Padding="3">
 
             <Entry
-                Text="FR "
+                Text="FR"
                 Placeholder="IBAN (FR)"
                 HorizontalOptions="Center"
                 WidthRequest="280"
@@ -54,7 +54,8 @@
             Margin="0, 75, 0, 0"
             MinimumHeightRequest="80"
             WidthRequest="300"
-            MaximumWidthRequest="400"/>
+            MaximumWidthRequest="400"
+            Clicked="Send_Clicked"/>
 
     </VerticalStackLayout>
 
diff --git a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
index c41832d..00ac895 100644
--- a/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/RequestPage.xaml.cs
@@ -14,7 +14,34 @@ public partial class RequestPage : ContentPage
 
     public async void Send_Clicked(Object sender, EventArgs e)
     {
-        //Account.DoRequest(Name.Text, IBAN.Text, Sum.Text);
-        await Shell.Current.GoToAsync("//balance");
+
+        if (string.IsNullOrEmpty(Name.Text) || string.IsNullOrEmpty(IBAN.Text) || string.IsNullOrEmpty(Sum.Text))
+        {
+            await DisplayAlert("Erreur", "Tout les champs doivent être complétés", "OK");
+            return;
+        }
+        if (Name.Text == Mgr.SelectedAccount.Name && IBAN.Text == Mgr.SelectedAccount.IBAN)
+        {
+            await DisplayAlert("Erreur", "Vous ne pouvez vous faire de demande à vous même", "OK");
+            return;
+        }
+        foreach (var cust in Mgr.CustomersList)
+        {
+            foreach (var acc in cust.AccountsList)
+            {
+                if (acc.Name == Name.Text && acc.IBAN == IBAN.Text)
+                {
+                    if (acc.Balance - Convert.ToDouble(Sum.Text) < 0)
+                    {
+                        await DisplayAlert("Erreur", "Le compte ne possède assez d'argent sur son compte pour aboutir à la transaction", "OK");
+                        return;
+                    }
+                    acc.DoTransactions(acc, Convert.ToDouble(Sum.Text), true); // Type true car c'est un virement que le SelectedAccount reçoit
+                    await Shell.Current.Navigation.PopAsync();
+                    return;
+                }
+            }
+        }
+        await DisplayAlert("Erreur", "Le compte n'existe pas", "OK");
     }
 }
diff --git a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
index ac48216..4e8abbe 100644
--- a/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/Transfer/TransferPage.xaml.cs
@@ -12,7 +12,6 @@ public partial class TransferPage : ContentPage
 
     public async void Send_Clicked(Object sender, EventArgs e)
     {
-        int count = Mgr.SelectedAccount.TransactionsList.Count;
 
         if (string.IsNullOrEmpty(Name.Text) || string.IsNullOrEmpty(IBAN.Text) || string.IsNullOrEmpty(Sum.Text))
         {
@@ -35,7 +34,7 @@ public partial class TransferPage : ContentPage
                         await DisplayAlert("Erreur", "Vous ne possèdez pas assez d'argent sur ce compte pour aboutir à la transaction", "OK");
                         return;
                     }
-                    Mgr.SelectedAccount.DoTransactions(acc, Convert.ToDouble(Sum.Text), true, count+1); // Type true car c'est un virement
+                    Mgr.SelectedAccount.DoTransactions(acc, Convert.ToDouble(Sum.Text), true); // Type true car c'est un virement
                     await Shell.Current.Navigation.PopAsync();
                     return;
                 }
diff --git a/src/Banquale/Model/Account.cs b/src/Banquale/Model/Account.cs
index 3ab60ef..92c9175 100644
--- a/src/Banquale/Model/Account.cs
+++ b/src/Banquale/Model/Account.cs
@@ -127,19 +127,18 @@ namespace Model
         /// <param name="involvedAccount">Compte tiers impliqué dans la transaction.</param>
         /// <param name="sum">Somme de la transaction.</param>
         /// <param name="type">Type de transaction (débit ou crédit).</param>
-        /// <param name="nb">Numéro de la transaction.</param>
-        public void DoTransactions(Account involvedAccount, double sum, bool type, int nb)
+        public void DoTransactions(Account involvedAccount, double sum, bool type)
         {
             if (type) // si le type est True => c'est un débit, on doit donc ajouter la transaction pour l'autre compte
             {
-                Transaction transaction = new Transaction(type, sum, involvedAccount, nb, DateTime.Now);
+                Transaction transaction = new Transaction(type, sum, involvedAccount, DateTime.Now);
                 TransactionsList.Add(transaction);
                 Balance = Balance - sum;
-                involvedAccount.DoTransactions(this, sum, !type, nb + 1);
+                involvedAccount.DoTransactions(this, sum, !type);
             }
             else // Sinon, c'est un crédit, on a juste à l'ajouter à notre liste de transactions
             {
-                TransactionsList.Add(new Transaction(type, sum, involvedAccount, nb, DateTime.Now));
+                TransactionsList.Add(new Transaction(type, sum, involvedAccount, DateTime.Now));
                 Balance = Balance + sum;
             }
         }
diff --git a/src/Banquale/Model/Transaction.cs b/src/Banquale/Model/Transaction.cs
index b72a1ae..28a708f 100644
--- a/src/Banquale/Model/Transaction.cs
+++ b/src/Banquale/Model/Transaction.cs
@@ -19,16 +19,10 @@ namespace Model
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        /// <summary>
-        /// Gets the unique identifier of the transaction.
-        /// </summary>
-        [DataMember(Order = 1)]
-        public int Id { get; private set; }
-
         /// <summary>
         /// Gets or sets the type of the transaction (debit or credit).
         /// </summary>
-        [DataMember(Order = 2)]
+        [DataMember(Order = 1)]
         public bool Type
         {
             get => type;
@@ -46,7 +40,7 @@ namespace Model
         /// <summary>
         /// Gets or sets the sum of the transaction.
         /// </summary>
-        [DataMember(Order = 3)]
+        [DataMember(Order = 2)]
         public double Sum
         {
             get => sum;
@@ -64,7 +58,7 @@ namespace Model
         /// <summary>
         /// Gets or sets the account(s) involved in the transaction.
         /// </summary>
-        [DataMember(Order = 4)]
+        [DataMember(Order = 3)]
         public Account? InvolvedAccounts
         {
             get => involvedAccounts;
@@ -82,7 +76,7 @@ namespace Model
         /// <summary>
         /// Gets or sets the category of the transaction.
         /// </summary>
-        [DataMember(Order = 5)]
+        [DataMember(Order = 4)]
         public string? Category
         {
             get => category;
@@ -100,7 +94,7 @@ namespace Model
         /// <summary>
         /// Gets or sets the date of the transaction.
         /// </summary>
-        [DataMember(Order = 6)]
+        [DataMember(Order = 5)]
         public DateTime Date
         {
             get => date;
@@ -116,7 +110,7 @@ namespace Model
         private DateTime date;
 
 
-        [DataMember(Order = 7)]
+        [DataMember(Order = 6)]
         public bool IsOpposition { get; set;  }
 
 
@@ -128,12 +122,11 @@ namespace Model
         /// <param name="involvedAccounts">The account(s) involved in the transaction.</param>
         /// <param name="id">The unique identifier of the transaction.</param>
         /// <param name="date">The date of the transaction.</param>
-        public Transaction(bool type, double sum, Account involvedAccounts, int id, DateTime date)
+        public Transaction(bool type, double sum, Account involvedAccounts, DateTime date)
         {
             Category = null;
             Type = type;
             Sum = sum;
-            Id = id;
             InvolvedAccounts = involvedAccounts;
             Date = date;
             IsOpposition = false;