From dcaefd0c5f90d85ce6fc0fda6f94299e3308b00f Mon Sep 17 00:00:00 2001
From: Sylvie Ye <sye@budget-insight.com>
Date: Tue, 12 Feb 2019 16:57:15 +0100
Subject: [PATCH] [cmso] check if account can do transfer or not

---
 modules/cmso/par/browser.py        |  6 ++++++
 modules/cmso/par/pages.py          |  4 ----
 modules/cmso/par/transfer_pages.py | 23 +++++++++++++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/modules/cmso/par/browser.py b/modules/cmso/par/browser.py
index cc23453410..2c98721073 100644
--- a/modules/cmso/par/browser.py
+++ b/modules/cmso/par/browser.py
@@ -166,6 +166,8 @@ def iter_accounts(self):
 
         self.transfer_info.go(json={"beneficiaryType":"INTERNATIONAL"})
         numbers = self.page.get_numbers()
+        # to know if account can do transfer
+        accounts_eligibilite_debit = self.page.get_eligibilite_debit()
 
         # First get all checking accounts...
         data = dict(self.infos.stay_or_go().get_typelist())
@@ -173,6 +175,8 @@ def iter_accounts(self):
         self.page.check_response()
         for key in self.page.get_keys():
             for a in self.page.iter_accounts(key=key):
+                if a.id in accounts_eligibilite_debit:
+                    a._eligible_debit = accounts_eligibilite_debit[a.id]
                 # Can have duplicate account, avoid them
                 if a._index not in seen:
                     self.accounts_list.append(a)
@@ -183,6 +187,8 @@ def iter_accounts(self):
         page = self.accounts.go(data=json.dumps({}), type='epargne', headers=self.json_headers)
         for key in page.get_keys():
             for a in page.iter_savings(key=key, numbers=numbers):
+                if a.id in accounts_eligibilite_debit:
+                    a._eligible_debit = accounts_eligibilite_debit[a.id]
                 if a._index in seen:
                     acc = seen[a._index]
                     self.accounts_list.remove(acc)
diff --git a/modules/cmso/par/pages.py b/modules/cmso/par/pages.py
index 4500e4b455..d4045eaa09 100644
--- a/modules/cmso/par/pages.py
+++ b/modules/cmso/par/pages.py
@@ -135,8 +135,6 @@ class item(ItemElement):
             # Iban is available without last 5 numbers, or by sms
             obj_iban = NotAvailable
             obj__index = Dict('index')
-            # to know if we can do transfer on account
-            obj__eligible_debit = Dict('eligibiliteDebit', default=False)
 
             def obj_balance(self):
                 balance = CleanDecimal(Dict('soldeEuro', default="0"))(self)
@@ -196,8 +194,6 @@ class item(ItemElement):
                 obj_coming = CleanDecimal(Dict('AVenir', default=None), default=NotAvailable)
                 obj__index = Dict('index')
                 obj__owner = Dict('nomTitulaire')
-                # to know if we can do transfer on account
-                obj__eligible_debit = Dict('eligibiliteDebit', default=False)
 
                 def obj_id(self):
                     type = Field('type')(self)
diff --git a/modules/cmso/par/transfer_pages.py b/modules/cmso/par/transfer_pages.py
index 502a27feda..fdfd9fcfbe 100644
--- a/modules/cmso/par/transfer_pages.py
+++ b/modules/cmso/par/transfer_pages.py
@@ -55,7 +55,7 @@ def get_rcpt_index(self, recipient):
 
 
 class TransferInfoPage(LoggedPage, JsonPage):
-    def get_numbers(self):
+    def get_transfer_info(self, info):
         # If account information is not available when asking for the
         # recipients (server error for ex.), return an empty dictionary
         # that will be filled later after being returned the json of the
@@ -63,25 +63,36 @@ def get_numbers(self):
         if 'listCompteTitulaireCotitulaire' not in self.doc and 'exception' in self.doc:
             return {}
 
-        ret = {}
+        information = {
+            'numbers': ('index', 'numeroContratSouscrit'),
+            'eligibilite_debit': ('numeroContratSouscrit', 'eligibiliteDebit'),
+        }
+        key = information[info][0]
+        value = information[info][1]
 
+        ret = {}
         ret.update({
-            d['index']: d['numeroContratSouscrit']
+            d[key]: d[value]
             for d in self.doc['listCompteTitulaireCotitulaire']
         })
         ret.update({
-            d['index']: d['numeroContratSouscrit']
+            d[key]: d[value]
             for p in self.doc['listCompteMandataire'].values()
             for d in p
         })
         ret.update({
-            d['index']: d['numeroContratSouscrit']
+            d[key]: d[value]
             for p in self.doc['listCompteLegalRep'].values()
             for d in p
         })
-
         return ret
 
+    def get_numbers(self):
+        return self.get_transfer_info('numbers')
+
+    def get_eligibilite_debit(self):
+        return self.get_transfer_info('eligibilite_debit')
+
     @method
     class iter_titu_accounts(DictElement):
         item_xpath = 'listCompteTitulaireCotitulaire'
-- 
GitLab