Merge branch 'master' into PY-benOff-fields

e2e_tests/account_test.py

@@ -148,12 +148,9 @@ def test_update_credit_account():
     account_id = "3344334"
     _credit_limit = 4000
     request = PatchCreditAccountRequest(account_id, tags={
-        "purpose": "tax",
-        "trackUserId": "userId_fe6885b5815463b26f65e71095832bdd916890f7"})
+        "purpose": "tax"})
     response = client.accounts.update(request)
     assert response.data.type == "creditAccount"
-    assert response.data.attributes.get("tags").get("purpose") == "tax"
-
 
 def test_get_deposit_products():
     response = create_deposit_account()

e2e_tests/payment_test.py

@@ -156,6 +156,7 @@ def test_ach_received_payment_dto():
             "status": "Completed",
             "wasAdvanced": True,
             "isAdvanceable": True,
+            "direction": "Credit",
             "amount": 100000,
             "completionDate": "2022-01-23",
             "companyName": "Uber",

e2e_tests/received_payment_test.py

@@ -59,7 +59,8 @@ def test_ach_received_payment_dto():
           "createdAt": "2022-02-01T12:03:14.406Z",
           "status": "Pending",
           "wasAdvanced": False,
-          "isAdvanceable": True,
+          "isAdvanceable": False,
+          "direction": "Credit",
           "amount": 500000,
           "completionDate": "2020-07-30",
           "companyName": "UBER LTD",
@@ -105,6 +106,7 @@ def test_ach_received_payment_dto():
             "status": "Completed",
             "wasAdvanced": True,
             "isAdvanceable": True,
+            "direction": "Credit",
             "amount": 100000,
             "completionDate": "2022-01-23",
             "companyName": "Uber",

unit/models/payment.py

@@ -137,7 +137,7 @@ def __init__(self, _id: str, created_at: datetime, status: AchReceivedPaymentSta
     @staticmethod
     def from_json_api(_id, _type, attributes, relationships):
         return AchReceivedPaymentDTO(_id, date_utils.to_datetime(attributes["createdAt"]), attributes["status"],
-                                     attributes["wasAdvanced"], attributes.get("isAdvanceable", None), date_utils.to_date(attributes["completionDate"]),
+                                     attributes["wasAdvanced"], attributes.get("isAdvanceable"), attributes["direction"], date_utils.to_date(attributes["completionDate"]),
                                      attributes.get("returnReason"), attributes["amount"], attributes["description"],
                                      attributes.get("addenda"), attributes.get("companyName"),
                                      attributes.get("counterpartyRoutingNumber"), attributes.get("traceNumber"),