Merge pull request #5 from thaichat04/render-accounts

Render accounts feature

Author: Hong-Thai Nguyen

.idea/.gitignore

@@ -1,167 +1,36 @@
 # python import - http://docs.python.org/library/unittest.html
 import unittest
-from StringIO import StringIO
+from datetime import date
+from io import StringIO
 
-# import cfonb module
-from cfonb.parser import Row, ParsingError, statement as p
+from nose.tools import assert_is_not_none, assert_equal
 
-
-HEAD_LINE = '0130002    00447     0000888899H  160811                                                  0000000132303H                '
-
-
-HEAD_VALUES = [
-    '01',
-    '30002',
-    '    ',
-    '00447',
-    '   ',
-    ' ',
-    ' ',
-    '0000888899H',
-    '  ',
-    '160811',
-    '                                                  ',
-    '0000000132303H',
-    '                ',
-    ]
-
-
-CONTENT_4_LINE = '0430002013400447EUR2E0000431040H21210811  210811VIREMENT COMBELL                 0000000  0000000020000}                '
-
-CONTENT_4_VALUES = [
-    '04',
-    '30002',
-    '0134',
-    '00447',
-    'EUR',
-    '2',
-    'E',
-    '0000431040H',
-    '21',
-    '210811',
-    '  ',
-    '210811',
-    'VIREMENT COMBELL               ',
-    '  ',
-    '0000000',
-    ' ',
-    ' ',
-    '0000000020000}',
-    '                ',
-    ]
-
-
-FOOT_LINE = '0730002    00447     0000888899H  280911                                                  0000000118711D                '
-
-
-FOOT_VALUES = [
-    '07',
-    '30002',
-    '    ',
-    '00447',
-    '   ',
-    ' ',
-    ' ',
-    '0000888899H',
-    '  ',
-    '280911',
-    '                                                  ',
-    '0000000118711D',
-    '                ',
-    ]
+from cfonb import StatementReader
+from cfonb.writer.statement import Statement
 
 
 class TestStatement(unittest.TestCase):
 
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def test_parse_head(self):
-        row = p.parse_head(HEAD_LINE)
-        # little type check
-        self.assertIsInstance(row, Row, 'invalid row type: %s' % type(row))
-        # list copy for check
-        list_1 = row.as_list()[:]
-        list_2 = row.as_dict().values()[:]
-        # sort list to be compared
-        list_1.sort()
-        list_2.sort()
-        # list check
-        self.assertEqual(list_1, list_2)
-        # check dict and obj format
-        for i in range(13):
-            self.assertEqual(row.as_list()[i], getattr(row.as_obj(), p.HEAD_KEYS[i]))
-            self.assertEqual(row.as_list()[i], HEAD_VALUES[i])
-
-    def test_parse_content_4(self):
-        row = p.parse_content_4(CONTENT_4_LINE)
-        # little type check
-        self.assertIsInstance(row, Row, 'invalid row type: %s' % type(row))
-        # list copy for check
-        list_1 = row.as_list()[:]
-        list_2 = row.as_dict().values()[:]
-        # sort list to be compared
-        list_1.sort()
-        list_2.sort()
-        # list check
-        self.assertEqual(list_1, list_2)
-        # check dict and obj format
-        for i in range(19):
-            self.assertEqual(row.as_list()[i], getattr(row.as_obj(), p.CONTENT_4_KEYS[i]))
-            self.assertEqual(row.as_list()[i], CONTENT_4_VALUES[i])
-
-    def test_parse_footer(self):
-        row = p.parse_footer(FOOT_LINE)
-        # little type check
-        self.assertIsInstance(row, Row, 'invalid row type: %s' % type(row))
-        # list copy for check
-        list_1 = row.as_list()[:]
-        list_2 = row.as_dict().values()[:]
-        # sort list to be compared
-        list_1.sort()
-        list_2.sort()
-        # list check
-        self.assertEqual(list_1, list_2)
-        # check dict and obj format
-        for i in range(13):
-            self.assertEqual(row.as_list()[i], getattr(row.as_obj(), p.FOOT_KEYS[i]))
-            self.assertEqual(row.as_list()[i], FOOT_VALUES[i])
-
-    def test_statement(self):
-        # prepare file obj
-        file_obj = StringIO()
-        file_obj.write("%s\n" % HEAD_LINE)
-        file_obj.write("%s\n" % CONTENT_4_LINE)
-        file_obj.write("%s\n" % FOOT_LINE)
-        file_obj.seek(0)
-        # init statement
-        statement = p.Statement()
-        statement.parse(file_obj)
-        # prepare values to compare
-        header_line = p.parse_head(HEAD_LINE)
-        content_line = p.parse_content_4(CONTENT_4_LINE)
-        footer_line = p.parse_footer(FOOT_LINE)
-        # some tests
-        self.assertIsInstance(statement, p.Statement)
-        self.assertIsInstance(statement.header, Row)
-        self.assertIsInstance(statement.footer, Row)
-        self.assertIsInstance(statement.lines, list)
-        self.assertEqual(len(statement.lines), 1)
-        self.assertIsInstance(statement.lines[0], Row)
-        self.assertEqual(statement.header, header_line)
-        self.assertEqual(statement.footer, footer_line)
-        self.assertEqual(statement.lines[0], content_line)
+    def test_render_parse_cfonb(self):
+        content = Statement().header('20002', '90005', 'EUR', '01711467640', date(2011, 10, 14), 12345.67)\
+                             .add('20002', '1234567', '90005', 'EUR', '01711467640', date(2011, 10, 14), 'label 1', 1234.56, 'reference1')\
+                             .add('20002', '1234567', '90005', 'EUR', '01711467640', date(2011, 10, 13), 'label 2', 123.45, 'reference2')\
+                             .render()
+        print('content: {}'.format(content))
+        reader = StatementReader()
+        result = reader.parse(StringIO(content))
+        for account in result:
+            assert_is_not_none(account.account_nb)
+            assert_equal(account.header.get('account_nb'), '01711467640')
+            assert_equal(account.header.get('currency_code'), 'EUR')
+            assert_equal(account.header.get('nb_of_dec'), '2')
+            assert_equal(account.header.get('bank_code'), '20002')
+            print('{}'.format(account.header))
 
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(TestStatement('test_parse_head'))
-    suite.addTest(TestStatement('test_parse_content_4'))
-    suite.addTest(TestStatement('test_parse_footer'))
-    suite.addTest(TestStatement('test_statement'))
+    suite.addTest(TestStatement('test_parse_cfonb'))
     return suite
 
 

.idea/inspectionProfiles/profiles_settings.xml

@@ -7,7 +7,7 @@
 
 
 def _print(res):
-    print res.replace('\r\n','\\r\\n').replace(' ','.')
+    print(res.replace('\r\n','\\r\\n').replace(' ','.'))
 
 
 class TestTransfert(unittest.TestCase):

.idea/misc.xml

@@ -0,0 +1,24 @@
+BR_LINE = '\r\n'
+
+
+def write(input_, length, rpad=False, fill_char=' '):
+    input_ = str(input_)
+    if (rpad):
+        return input_.rjust(length, fill_char)[:length]
+    else:
+        return input_.ljust(length, fill_char)[:length]
+
+
+def save(header, body, footer, filename=None):
+    content  = header
+    content += body
+    content += footer
+    if filename is not None:
+        f = open(filename,'w')
+        f.write(content)
+        f.close()
+    return content
+
+
+def date_format(date):
+    return date.strftime(format='%d%m') + date.strftime(format='%y')

.idea/modules.xml

@@ -0,0 +1,114 @@
+# coding: UTF-8
+
+"""
+This file is part of CFONB.
+
+CFONB is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Foobar is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with CFONB.  If not, see <http://www.gnu.org/licenses/>.
+
+ Coryright 2020, Dhatim
+ Créer un fichier d'opérations bancaires avec
+  - l'entête (01)
+  - ligne détail (04)
+  - ligne total (facultative)
+
+"""
+from cfonb.writer.common import write, date_format, save, BR_LINE
+
+
+class Statement(object):
+    def __init__(self):
+        self._header = {}
+        self._content = []
+        self._footer = {}
+
+    def header(self, bank_code, agency_code, currency, account_number, date, amount):
+        self._header['bank_code'] = bank_code
+        self._header['agency_code'] = agency_code
+        self._header['currency'] = currency
+        self._header['account_number'] = account_number
+        self._header['date'] = date
+        self._header['amount'] = amount
+        return self
+
+    def footer(self, bank_code, agency_code, currency, account_number, date, amount):
+        self._footer['bank_code'] = bank_code
+        self._footer['agency_code'] = agency_code
+        self._footer['currency'] = currency
+        self._footer['account_number'] = account_number
+        self._footer['date'] = date
+        self._footer['amount'] = amount
+        return self
+
+    def add(self, bank_code, operation_code, agency_code, currency,
+            account_number, date, label, amount, reference):
+        line = write('04', 2)
+        line += write(bank_code, 5)
+        line += write(operation_code, 4)
+        line += write(agency_code, 5)
+        line += write(currency, 3)
+        line += write('2', 1) # number of decimal
+        line += write(' ', 1) # SIT code
+        line += write(account_number, 11)
+        line += write('08', 2) # interbank code
+        line += write(date_format(date), 6)
+        line += write('  ', 2) # rejected code
+        line += write(date_format(date), 6)
+        line += write(label, 31)
+        line += write('  ', 2) # reserve zone
+        line += write('       ', 7) # entry writing code
+        line += write(' ', 1) # exoneration code
+        line += write(' ', 1)  # reserve zone
+        line += write(str(amount).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+        line += write(reference, 16)
+        self._content.append(line)
+        return self
+
+    def render(self, filename=None):
+        return save(self._render_header(), BR_LINE.join(self._content) + BR_LINE, self._render_footer(), filename)
+
+    def _render_header(self):
+        if self._header:
+            line = write('01', 2)
+            line += write(self._header['bank_code'], 5)
+            line += write('    ', 4) # reserved zone
+            line += write(self._header['agency_code'], 5)
+            line += write(self._header['currency'], 3)
+            line += write('2', 1) # number of decimal
+            line += write(' ', 1)  # reserved zone
+            line += write(self._header['account_number'], 11)
+            line += write('  ', 2)  # reserved zone
+            line += write(date_format(self._header['date']), 6)
+            line += write(' ', 50)  # reserved zone
+            line += write(str(self._header['amount']).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+            line += write(' ', 16)  # reserved zone
+            return line + BR_LINE
+        return ''
+
+    def _render_footer(self):
+        if self._footer:
+            line = write('07', 2)
+            line += write(self._footer['bank_code'], 5)
+            line += write('    ', 4) # reserved zone
+            line += write(self._footer['agency_code'], 5)
+            line += write(self._footer['currency'], 3)
+            line += write('2', 1) # number of decimal
+            line += write(' ', 1)  # reserved zone
+            line += write(self._footer['account_number'], 11)
+            line += write('  ', 2)  # reserved zone
+            line += write(date_format(self._footer['date']), 6)
+            line += write(' ', 50)  # reserved zone
+            line += write(str(self._footer['amount']).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+            line += write(' ', 16)  # reserved zone
+            return line + BR_LINE
+        return ''