chore: regrouped all helper functions calls together

Author: gboudreau

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ws-api"
-version = "0.29.4"
+version = "0.30.0"
 description = "Access your Wealthsimple account using their (GraphQL) API."
 readme = "README.md"
 license = {file = "LICENSE"}

ws_api/formatters.py

@@ -212,7 +212,10 @@ def format_activity_description(act: dict, api_context) -> None:
     """
     act["description"] = f"{act['type']}: {act['subType']}"
 
-    if act["type"] == "INTERNAL_TRANSFER" or act["type"] == "ASSET_MOVEMENT":
+    if _format_corporate_action_subdivision(act, api_context) or _format_institutional_transfer(act, api_context) or _format_credit_card_description(act):
+        pass  # Handled by helper function
+
+    elif act["type"] == "INTERNAL_TRANSFER" or act["type"] == "ASSET_MOVEMENT":
         accounts = api_context.get_accounts(False)
         matching = [acc for acc in accounts if acc["id"] == act["opposingAccountId"]]
         target_account = matching.pop() if matching else None
@@ -245,9 +248,6 @@ def format_activity_description(act: dict, api_context) -> None:
                 f"{security} @ {float(act['amount']) / float(act['assetQuantity'])}"
             )
 
-    elif _format_corporate_action_subdivision(act, api_context):
-        pass  # Handled by helper function
-
     elif act["type"] in ["DEPOSIT", "WITHDRAWAL"] and act["subType"] in [
         "E_TRANSFER",
         "E_TRANSFER_FUNDING",
@@ -281,8 +281,6 @@ def format_activity_description(act: dict, api_context) -> None:
     elif act["type"] == "REFUND" and act["subType"] == "TRANSFER_FEE_REFUND":
         act["description"] = "Reimbursement: account transfer fee"
 
-    elif _format_institutional_transfer(act, api_context):
-        pass  # Handled by helper function
     elif act["type"] == "INTEREST":
         if act["subType"] == "FPL_INTEREST":
             act["description"] = "Stock Lending Earnings"
@@ -340,9 +338,6 @@ def format_activity_description(act: dict, api_context) -> None:
         type_ = act["type"].capitalize()
         act["description"] = f"{type_}"
 
-    elif _format_credit_card_description(act):
-        pass  # Handled by helper function
-
     elif act["type"] == "REIMBURSEMENT" and act["subType"] == "CASHBACK":
         program = (
             "- Visa Infinite"