Merge pull request #440 from 0jc1/main

Total holdings across brokers

autoRSA.py

@@ -116,6 +116,7 @@ def nicknames(broker):
 # broker name + type of function
 def fun_run(orderObj: stockOrder, command, botObj=None, loop=None):
     if command in [("_init", "_holdings"), ("_init", "_transaction")]:
+        totalValue = 0
         for broker in orderObj.get_brokers():
             if broker in orderObj.get_notbrokers():
                 continue
@@ -195,11 +196,19 @@ def fun_run(orderObj: stockOrder, command, botObj=None, loop=None):
                             f"All {broker.capitalize()} transactions complete",
                             loop,
                         )
+                # Add to total sum
+                totalValue += sum(
+                    account["total"] for account in orderObj.get_logged_in(broker).get_account_totals().values()
+                )
             except Exception as ex:
                 print(traceback.format_exc())
                 print(f"Error in {fun_name} with {broker}: {ex}")
                 print(orderObj)
             print()
+
+        # Print final total value and closing message
+        if "_holdings" in command:
+            printAndDiscord(f"Total Value of All Accounts: ${format(totalValue, '0.2f')}", loop)
         printAndDiscord("All commands complete in all brokers", loop)
     else:
         print(f"Error: {command} is not a valid command")

helperAPI.py

@@ -257,7 +257,7 @@ def set_account_totals(self, parent_name: str, account_name: str, total: float):
             self.__account_totals[parent_name] = {}
         self.__account_totals[parent_name][account_name] = round(float(total), 2)
         self.__account_totals[parent_name]["total"] = sum(
-            self.__account_totals[parent_name].values()
+            value for key, value in self.__account_totals[parent_name].items() if key != "total"
         )
 
     def set_account_type(self, parent_name: str, account_name: str, account_type: str):