From e8ad5ff9ab4276e958b767c7be629767ae142610 Mon Sep 17 00:00:00 2001 From: Quentin Defenouillere Date: Fri, 25 Jan 2019 10:48:58 +0100 Subject: [PATCH] [cragr] Replaced OrderedDict with dict and typed transactions There is no need to use OrderedDict for transactions since we use Map() on the short label. I also typed transfer transactions correctly. [cragr] Added double quote to transaction type --- modules/cragr/api/pages.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/modules/cragr/api/pages.py b/modules/cragr/api/pages.py index 194973e8d0..d29bf7c28c 100644 --- a/modules/cragr/api/pages.py +++ b/modules/cragr/api/pages.py @@ -19,7 +19,6 @@ from __future__ import unicode_literals -from collections import OrderedDict from decimal import Decimal import re import json @@ -261,22 +260,24 @@ class iter_history(DictElement): class item(ItemElement): - TRANSACTION_TYPES = OrderedDict(( - ('PAIEMENT PAR CARTE', Transaction.TYPE_CARD), - ('REMISE CARTE', Transaction.TYPE_CARD), - ('PRELEVEMENT CARTE', Transaction.TYPE_CARD_SUMMARY), - ('RETRAIT AU DISTRIBUTEUR', Transaction.TYPE_WITHDRAWAL), - ('RETRAIT MUR D\'ARGENT', Transaction.TYPE_WITHDRAWAL), - ('FRAIS', Transaction.TYPE_BANK), - ('COTISATION', Transaction.TYPE_BANK), - ('VIREMENT', Transaction.TYPE_TRANSFER), - ('CHEQUE EMIS', Transaction.TYPE_CHECK), - ('REMISE DE CHEQUE', Transaction.TYPE_DEPOSIT), - ('PRELEVEMENT', Transaction.TYPE_ORDER), - ('PRELEVT', Transaction.TYPE_ORDER), - ('PRELEVMNT', Transaction.TYPE_ORDER), - ('REMBOURSEMENT DE PRET', Transaction.TYPE_LOAN_PAYMENT), - )) + TRANSACTION_TYPES = { + 'PAIEMENT PAR CARTE': Transaction.TYPE_CARD, + 'REMISE CARTE': Transaction.TYPE_CARD, + 'PRELEVEMENT CARTE': Transaction.TYPE_CARD_SUMMARY, + 'RETRAIT AU DISTRIBUTEUR': Transaction.TYPE_WITHDRAWAL, + "RETRAIT MUR D'ARGENT": Transaction.TYPE_WITHDRAWAL, + 'FRAIS': Transaction.TYPE_BANK, + 'COTISATION': Transaction.TYPE_BANK, + 'VIREMENT': Transaction.TYPE_TRANSFER, + 'VIREMENT EN VOTRE FAVEUR': Transaction.TYPE_TRANSFER, + 'VIREMENT EMIS': Transaction.TYPE_TRANSFER, + 'CHEQUE EMIS': Transaction.TYPE_CHECK, + 'REMISE DE CHEQUE': Transaction.TYPE_DEPOSIT, + 'PRELEVEMENT': Transaction.TYPE_ORDER, + 'PRELEVT': Transaction.TYPE_ORDER, + 'PRELEVMNT': Transaction.TYPE_ORDER, + 'REMBOURSEMENT DE PRET': Transaction.TYPE_LOAN_PAYMENT, + } klass = Transaction @@ -330,6 +331,7 @@ class iter_card_history(DictElement): class item(ItemElement): klass = Transaction + obj_raw = CleanText(Dict('libelleOperation')) obj_label = CleanText(Dict('libelleOperation')) obj_amount = Eval(float_to_decimal, Dict('montant')) obj_type = Transaction.TYPE_DEFERRED_CARD -- GitLab