Fixed bug merging dividends from different brokers (#149)

* Cleanup unused code

* Fixed bug when merging dividends paid on the same day

Author: ctasada

instructions.md .github/instructions.mdinstructions.md renamed to .github/instructions.md

@@ -128,22 +128,24 @@ See [Wiki - Developing Stonks Overwatch](./docs/Developing-Stonks-Overwatch)
   * [ ] Create a Crypto Rewards section
   * [ ] Show asset staking blocked amount as in Bitvavo UI
 * [ ] IBKR
-  * [ ] Get Deposits & Withdrawals (Based on ticket only possible with a FlexQuery up to 365 days old)
   * [ ] Show closed positions
   * [ ] Realized % Gain/Loss is not showed when merging positions
   * [ ] Stock Category
   * [ ] Add support for Portfolio Growth
-  * [ ] Diversification: Fix sectors to be properly grouped
-  * [ ] Diversification: Remove Cash and Crypto from Holdings
+  * [ ] Diversification:
+    * [ ] Fix sectors to be properly grouped
+    * [ ] Remove Cash and Crypto from Holdings
   * [ ] Fees: Add support for Fees
   * [ ] Transactions:
     * [ ] Add fees/taxes
     * [ ] Review provided values: Should Dividends be included in the transactions?
     * [ ] Web:
       * Performance & Reports / Transaction History: Shows transactions for the last 2 years
       * Flex Query: Allows creating custom reports.
-  * [ ] Dividends: Implement Announced and Forecasted dividends
-  * [ ] Deposits: Implement Deposits and Withdrawals
+  * [ ] Dividends:
+    * [ ] Taxes are not included in the dividends (See Fees)
+    * [ ] Implement Announced and Forecasted dividends
+  * [ ] Deposits: Implement Deposits and Withdrawals (As per support ticket it's only possible with a FlexQuery up to 365 days old)
   * [ ] Portfolio Growth: Implement Portfolio Growth
 
 ## Logos

README.md

@@ -6,7 +6,7 @@
 """
 
 from abc import ABC, abstractmethod
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 from stonks_overwatch.config.config import Config
 from stonks_overwatch.core.exceptions import DataAggregationException
@@ -158,17 +158,13 @@ def _get_enabled_brokers(self, selected_portfolio: PortfolioId) -> List[str]:
             if self._is_broker_enabled(broker_name, selected_portfolio)
         ]
 
-    def _collect_broker_data(
-        self, selected_portfolio: PortfolioId, method_name: str, *args, **kwargs
-    ) -> Dict[str, Any]:
+    def _collect_broker_data(self, selected_portfolio: PortfolioId, method_name: str) -> Dict[str, Any]:
         """
         Collect data from all enabled brokers using the specified method.
 
         Args:
             selected_portfolio: Selected portfolio configuration
             method_name: Name of the method to call on each broker service
-            *args: Arguments to pass to the method
-            **kwargs: Keyword arguments to pass to the method
 
         Returns:
             Dictionary mapping broker names to their data
@@ -193,8 +189,8 @@ def _collect_broker_data(
 
                     # Check if it's a property or callable
                     if callable(attr):
-                        # It's a method, call it with arguments
-                        data = attr(*args, **kwargs)
+                        # It's a method, call it with no arguments
+                        data = attr()
                     else:
                         # It's a property, just use the value
                         data = attr
@@ -223,34 +219,6 @@ def _collect_broker_data(
 
         return broker_data
 
-    def _merge_lists(self, data_lists: List[List[Any]]) -> List[Any]:
-        """
-        Merge multiple lists into a single list.
-
-        Args:
-            data_lists: List of lists to merge
-
-        Returns:
-            Merged list containing all items
-        """
-        merged = []
-        for data_list in data_lists:
-            if data_list:
-                merged.extend(data_list)
-        return merged
-
-    def _sum_numeric_values(self, values: List[Union[int, float]]) -> float:
-        """
-        Sum numeric values with error handling.
-
-        Args:
-            values: List of numeric values to sum
-
-        Returns:
-            Sum of all values
-        """
-        return sum(float(value) for value in values if value is not None)
-
     @property
     def supported_brokers(self) -> List[str]:
         """
@@ -272,7 +240,7 @@ def service_type(self) -> ServiceType:
         return self._service_type
 
     @abstractmethod
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> Any:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> Any:
         """
         Aggregate data from all enabled brokers.
 
@@ -306,7 +274,7 @@ def _collect_and_merge_lists(
         Returns:
             Combined (and optionally merged) list of data
         """
-        broker_data = self._collect_broker_data(selected_portfolio, method_name, *args, **kwargs)
+        broker_data = self._collect_broker_data(selected_portfolio, method_name)
 
         # Combine all data into a single list
         combined_data = []
@@ -345,7 +313,7 @@ def _collect_and_merge_objects(
         Returns:
             Merged object or list of objects
         """
-        broker_data = self._collect_broker_data(selected_portfolio, method_name, *args, **kwargs)
+        broker_data = self._collect_broker_data(selected_portfolio, method_name)
 
         # Collect objects of the expected type
         typed_objects = []

src/stonks_overwatch/core/aggregators/base_aggregator.py

@@ -15,7 +15,7 @@ def get_account_overview(self, selected_portfolio: PortfolioId) -> List[AccountO
             selected_portfolio, "get_account_overview", sort_key=lambda k: k.datetime, reverse=True
         )
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> List[AccountOverview]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[AccountOverview]:
         """
         Aggregate account overview data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/account_overview_aggregator.py

@@ -55,7 +55,7 @@ def get_cash_deposits(self, selected_portfolio: PortfolioId) -> List[Deposit]:
             selected_portfolio, "get_cash_deposits", sort_key=lambda x: x.datetime, reverse=True
         )
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> List[Deposit]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[Deposit]:
         """
         Aggregate deposit data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/deposits_aggregator.py

@@ -13,7 +13,7 @@ def get_dividends(self, selected_portfolio: PortfolioId) -> List[Dividend]:
         # Use the new helper method to collect and sort dividend data
         return self._collect_and_sort(selected_portfolio, "get_dividends", sort_key=lambda k: k.payment_date)
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> List[Dividend]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[Dividend]:
         """
         Aggregate dividend data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/dividends_aggregator.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from stonks_overwatch.core.aggregators.base_aggregator import BaseAggregator
 from stonks_overwatch.core.service_types import ServiceType
 from stonks_overwatch.services.models import Fee, PortfolioId
@@ -11,7 +13,7 @@ def get_fees(self, selected_portfolio: PortfolioId) -> list[Fee]:
         # Use the new helper method to collect and sort fee data
         return self._collect_and_sort(selected_portfolio, "get_fees", sort_key=lambda k: (k.date, k.time), reverse=True)
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> list[Fee]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[Fee]:
         """
         Aggregate fee data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/fees_aggregator.py

@@ -89,7 +89,7 @@ def calculate_historical_value(self, selected_portfolio: PortfolioId) -> List[Da
             selected_portfolio, "calculate_historical_value", merger_func=DataMerger.merge_historical_values
         )
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> List[PortfolioEntry]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[PortfolioEntry]:
         """
         Aggregate portfolio data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/portfolio_aggregator.py

@@ -18,7 +18,7 @@ def get_transactions(self, selected_portfolio: PortfolioId) -> List[Transaction]
             reverse=True,
         )
 
-    def aggregate_data(self, selected_portfolio: PortfolioId, **kwargs) -> List[Transaction]:
+    def aggregate_data(self, selected_portfolio: PortfolioId) -> List[Transaction]:
         """
         Aggregate transaction data from all enabled brokers.
 

src/stonks_overwatch/services/aggregators/transactions_aggregator.py

@@ -58,7 +58,7 @@ def _get_dividends(self) -> List[Dividend]:
         for transaction in overview:
             if transaction.description in self.DIVIDEND_DESCRIPTIONS:
                 # Create a key to group by date and stock symbol
-                key = (transaction.datetime.date(), transaction.stock_symbol)
+                key = (transaction.value_datetime.date(), transaction.stock_symbol)
 
                 transaction_change = transaction.change
                 currency = transaction.currency
@@ -72,7 +72,7 @@ def _get_dividends(self) -> List[Dividend]:
 
                 if key not in dividend_groups:
                     dividend_groups[key] = {
-                        "payment_date": transaction.datetime,
+                        "payment_date": transaction.value_datetime,
                         "stock_name": transaction.stock_name,
                         "stock_symbol": transaction.stock_symbol,
                         "currency": currency,