Merge pull request #169 from bahlo/more-paypal-fixes

More paypal fixes

Author: bahlo

ing_ynab/ynab.py

@@ -10,7 +10,7 @@
 
 YNAB_BASE_URL = "https://api.youneedabudget.com/v1"
 PAYPAL_PAYEE_REGEX = re.compile(r"^PayPal\s?\(Europe\)")
-PAYPAL_MEMO_REGEX = re.compile(r".*, Ihr Einkauf bei (.*)$")
+PAYPAL_MEMO_REGEX = re.compile(r".*, Ihr Einkauf be\n?i\s?(.*)$")
 
 
 class YNABError(Exception):

tests/test_ynab.py

@@ -94,6 +94,7 @@ def test_paypal_extraction(self):
 
         tests = [
             {
+                "name": "no pp",
                 "transaction": Transaction(
                     [],
                     data={
@@ -109,6 +110,7 @@ def test_paypal_extraction(self):
                 },
             },
             {
+                "name": "pp",
                 "transaction": Transaction(
                     [],
                     data={
@@ -123,12 +125,46 @@ def test_paypal_extraction(self):
                     "memo": "PP.0000.PP . GITHUB INC, Ihr Einkauf bei GITHUB INC",
                 },
             },
+            {
+                "name": "linebreak",
+                "transaction": Transaction(
+                    [],
+                    data={
+                        "date": date.fromisoformat("2020-08-18"),
+                        "applicant_name": "PayPal (Europe) S.a.r.l. et Cie., S.C.A.",
+                        "purpose": "PP.0000.PP . GITHUB INC, Ihr Einkauf be\ni GITHUB INC",
+                        "amount": Amount("4.99", "D"),
+                    },
+                ),
+                "expected": {
+                    "payee_name": "PAYPAL GITHUB INC",
+                    "memo": "PP.0000.PP . GITHUB INC, Ihr Einkauf be\ni GITHUB INC",
+                },
+            },
+            {
+                "name": "missing space",
+                "transaction": Transaction(
+                    [],
+                    data={
+                        "date": date.fromisoformat("2020-08-18"),
+                        "applicant_name": "PayPal (Europe) S.a.r.l. et Cie., S.C.A.",
+                        "purpose": "PP.0000.PP . GITHUB INC, Ihr Einkauf beiGITHUB INC",
+                        "amount": Amount("4.99", "D"),
+                    },
+                ),
+                "expected": {
+                    "payee_name": "PAYPAL GITHUB INC",
+                    "memo": "PP.0000.PP . GITHUB INC, Ihr Einkauf beiGITHUB INC",
+                },
+            },
         ]
 
         for test in tests:
             transformed = ynab_client.transform_transactions([test["transaction"]])
             for key in test["expected"]:
-                self.assertEqual(test["expected"][key], transformed[0][key])
+                self.assertEqual(
+                    test["expected"][key], transformed[0][key], test["name"]
+                )
 
     def test_paypal_applicant_names(self):
         ynab_client = YNABClient("", "foo", "")
@@ -156,4 +192,3 @@ def test_paypal_applicant_names(self):
                 ]
             )
             self.assertEqual("PAYPAL GITHUB INC", transformed[0]["payee_name"])
-