fix(account): footer was wrongly parsed

airporting · Feb 28, 2024 · b6fcac5 · b6fcac5
1 parent 7f80e5b
commit b6fcac5
Show file tree

Hide file tree

Showing 12 changed files with 384 additions and 44 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [18, 20, 21]
+        version: [18, 20]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,7 @@
+# GENERATED FILE - Do not edit manually
+
 # Ignore artifacts:
 coverage
+.yarn
+.idea
+node_modules
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![Static Badge](https://img.shields.io/badge/coverage-87.86-brightgreen)
-![Static Badge](https://img.shields.io/badge/release-1.13.6-blue)
+![Static Badge](https://img.shields.io/badge/coverage-82.56-brightgreen)
+![Static Badge](https://img.shields.io/badge/release-1.13.9-blue)
 [![test](https://github.com/airporting/ebics-parser/actions/workflows/test.yml/badge.svg)](https://github.com/airporting/ebics-parser/actions/workflows/test.yml)
 
 # ebics-parser
@@ -9,7 +9,7 @@ Lightweight and very fast parser, only two dep (date-fns, joi).
 
 Used by [Airporting](https://www.airporting.com)
 
-NodeJs 18.x or newer only.
+Tested on NodeJS 18.x and 20.x
 
 [![Linkedin](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/airporting)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airporting/ebics-parser",
-  "version": "1.13.8",
+  "version": "1.13.9",
   "main": "src/index.js",
   "repository": "git@github.com:airporting/ebics-parser.git",
   "author": "mathrobin <mthrobin@gmail.com>",

diff --git a/src/account/index.js b/src/account/index.js
@@ -93,7 +93,7 @@ module.exports = function chunkParser(allLines) {
           transactionsList.push(currentTransaction.transaction);
         }
 
-        footer = footerParser(line.split(/(\s+)/));
+        footer = footerParser(line);
 
         endAmount = footer.next_amount;
 

diff --git a/src/account/index.test.js b/src/account/index.test.js
@@ -34,6 +34,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00071',
@@ -77,6 +82,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00823',
@@ -120,6 +130,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30056',
         desk_code: '00917',
@@ -174,6 +189,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00585',
@@ -295,6 +315,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '18020',
         desk_code: '00001',
@@ -591,6 +616,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '18020',
         desk_code: '00001',
@@ -756,6 +786,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '18020',
         desk_code: '00001',
@@ -866,6 +901,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '18020',
         desk_code: '00001',
@@ -909,6 +949,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '18020',
         desk_code: '00001',
@@ -959,6 +1004,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30003',
         desk_code: '01678',
@@ -1080,6 +1130,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: 'C',
         record_code: '07',
         bank_code: '30003',
         desk_code: '03300',
@@ -1203,6 +1258,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00071',
@@ -1426,6 +1486,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00585',
@@ -1516,6 +1581,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '30004',
         desk_code: '00760',
@@ -1712,6 +1782,11 @@ describe('account', function () {
         _5: '030323060323',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '10278',
         desk_code: '06186',
@@ -1791,6 +1866,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '10207',
         desk_code: '00233',
@@ -1859,6 +1939,11 @@ describe('account', function () {
         _5: '',
       },
       footer: {
+        _1: '',
+        _2: '',
+        _3: '',
+        _4: '',
+        _5: '',
         record_code: '07',
         bank_code: '10207',
         desk_code: '00233',

diff --git a/src/account/schema.js b/src/account/schema.js
@@ -86,6 +86,11 @@ module.exports = () => {
       account_nb: Joi.string(),
       next_date: Joi.string(),
       next_amount: Joi.string(),
+      _1: Joi.string().empty('').optional(),
+      _2: Joi.string().empty('').optional(),
+      _3: Joi.string().empty('').optional(),
+      _4: Joi.string().empty('').optional(),
+      _5: Joi.string().empty('').optional(),
     }),
     transactions: Joi.array().items(transactionSchema),
     problems: Joi.array()