wbcommission 1.43.2__tar.gz → 1.59.0__tar.gz

{wbcommission-1.43.2 → wbcommission-1.59.0}/.gitignore

@@ -71,7 +71,6 @@ report.xml
 */report.xml
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:

{wbcommission-1.43.2 → wbcommission-1.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.43.2
+Version: 1.59.0
 Summary: A workbench module for managing human resources.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: reportlab==3.*
@@ -8,4 +8,7 @@ Requires-Dist: wbcompliance
 Requires-Dist: wbcore
 Requires-Dist: wbcrm
 Requires-Dist: wbfdm
+Requires-Dist: wbmailing
 Requires-Dist: wbnews
+Requires-Dist: wbportfolio
+Requires-Dist: wbreport

{wbcommission-1.43.2 → wbcommission-1.59.0}/pyproject.toml

@@ -10,6 +10,9 @@ dependencies = [
   "wbnews",
   "wbfdm",
   "wbcompliance",
+  "wbportfolio",
+  "wbreport",
+  "wbmailing",
   "reportlab == 3.*",
 ]
 
@@ -19,6 +22,9 @@ wbcrm = { workspace = true }
 wbnews = { workspace = true }
 wbfdm = { workspace = true }
 wbcompliance = { workspace = true }
+wbportfolio = { workspace = true }
+wbmailing = { workspace = true }
+wbreport = { workspace = true }
 
 [tool.uv]
 package = true

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/admin/accounts.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
-from wbcommission.models.rebate import manage_rebate_as_task
 from wbcrm.admin.accounts import AccountModelAdmin as BaseAccountModelAdmin
 from wbcrm.models.accounts import Account
 
+from wbcommission.models.rebate import manage_rebate_as_task
+
 from .commission import CommissionTabularInline
 
 admin.site.unregister(Account)

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/admin/commission.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from wbcommission.models import (
     Commission,
     CommissionExclusionRule,

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/analytics/marginality.py

@@ -1,15 +1,17 @@
-from datetime import date
+from datetime import date, timedelta
 from decimal import Decimal
 
 import numpy as np
 import pandas as pd
 from django.db.models import Case, OuterRef, Subquery, Value, When
 from django.db.models.functions import Coalesce
-from wbcommission.models import CommissionType, Rebate
+from pandas._libs.tslibs.offsets import BDay
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbfdm.models import InstrumentPrice
 from wbportfolio.models import Fees
 
+from wbcommission.models import CommissionType, Rebate
+
 
 class MarginalityCalculator:
     FEE_MAP = {
@@ -19,6 +21,9 @@ class MarginalityCalculator:
     }
 
     def __init__(self, products, from_date: date, to_date: date):
+        bday_from_date = (from_date + timedelta(days=1) - BDay(1)).date()
+        bday_to_date = (to_date - timedelta(days=1) + BDay(1)).date()
+
         products = products.annotate(
             fx_rate=Coalesce(
                 Subquery(
@@ -39,7 +44,7 @@ class MarginalityCalculator:
         # compute net marginality
         self.df_aum = pd.DataFrame(
             InstrumentPrice.objects.annotate_base_data()
-            .filter(instrument__in=products, date__gte=from_date, date__lte=to_date)
+            .filter(instrument__in=products, date__gte=bday_from_date, date__lte=bday_to_date)
             .values_list("calculated", "net_value_usd", "date", "outstanding_shares", "instrument"),
             columns=["calculated", "net_value_usd", "date", "outstanding_shares", "instrument"],
         ).rename(columns={"instrument": "id"})
@@ -65,12 +70,11 @@ class MarginalityCalculator:
         ).dropna()
 
         # Build the fees dataframe where product id is the index and colum are the every fees type available and value are the amount.
-
         fees = Fees.valid_objects.filter(
-            transaction_date__lte=to_date,
-            transaction_date__gte=from_date,
+            fee_date__lte=bday_to_date,
+            fee_date__gte=bday_from_date,
             transaction_subtype__in=self.FEE_MAP.keys(),
-            linked_product__in=products,
+            product__in=products,
         ).annotate(
             fee_type=Case(
                 *[When(transaction_subtype=k, then=Value(v)) for k, v in self.FEE_MAP.items()],
@@ -78,9 +82,9 @@ class MarginalityCalculator:
             )
         )
         self.df_fees = pd.DataFrame(
-            fees.values_list("linked_product", "fee_type", "total_value", "transaction_date", "calculated"),
-            columns=["linked_product", "fee_type", "total_value", "transaction_date", "calculated"],
-        ).rename(columns={"linked_product": "id", "transaction_date": "date"})
+            fees.values_list("product", "fee_type", "total_value", "fee_date", "calculated"),
+            columns=["product", "fee_type", "total_value", "fee_date", "calculated"],
+        ).rename(columns={"product": "id", "fee_date": "date"})
         self.df_fees["date"] = pd.to_datetime(self.df_fees["date"])
 
         self.df_fees = (
@@ -92,10 +96,14 @@ class MarginalityCalculator:
         self.df_fees["total"] = self.df_fees.sum(axis=1)
         self.df_fees = self.df_fees.reindex(self.df_aum.index, fill_value=0)
         self.df_fees = self._rolling_average_monday(self.df_fees)
+        self.df_fees = self.df_fees[
+            (self.df_fees.index.get_level_values(1) >= pd.Timestamp(from_date))
+            & (self.df_fees.index.get_level_values(1) <= pd.Timestamp(to_date))
+        ]
 
         # Build the fees dataframe where product id is the index and colum are the every fees type available and value are the amount.
         self.df_rebates = pd.DataFrame(
-            Rebate.objects.filter(date__gte=from_date, date__lte=to_date, product__in=products).values_list(
+            Rebate.objects.filter(date__gte=bday_from_date, date__lte=bday_to_date, product__in=products).values_list(
                 "product", "value", "date", "commission_type__key"
             ),
             columns=["product", "value", "date", "commission_type__key"],
@@ -117,9 +125,16 @@ class MarginalityCalculator:
         self.df_rebates = self.df_rebates.reindex(self.df_aum.index, fill_value=0)
         self.df_rebates["total"] = self.df_rebates.sum(axis=1)
         self.df_rebates = self._rolling_average_monday(self.df_rebates)
-        # Iniliaze basic column
-
-        self.empty_column = pd.Series(0.0, dtype="float64", index=self.df_fees.index)
+        self.df_rebates = self.df_rebates[
+            (self.df_rebates.index.get_level_values(1) >= pd.Timestamp(from_date))
+            & (self.df_rebates.index.get_level_values(1) <= pd.Timestamp(to_date))
+        ]
+        # Initialize basic column
+        self.df_aum = self.df_aum[
+            (self.df_aum.index.get_level_values(1) >= pd.Timestamp(from_date))
+            & (self.df_aum.index.get_level_values(1) <= pd.Timestamp(to_date))
+        ]
+        self.empty_column = pd.Series(0.0, dtype="float64", index=self.df_aum.index)
         self._set_basics_statistics()
 
     def _set_basics_statistics(self):

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/factories/commission.py

@@ -2,13 +2,14 @@ from datetime import date
 
 import factory
 from psycopg.types.range import DateRange
+from wbportfolio.models.roles import PortfolioRole
+
 from wbcommission.models.commission import (
     Commission,
     CommissionExclusionRule,
     CommissionRole,
     CommissionType,
 )
-from wbportfolio.models.roles import PortfolioRole
 
 
 class CommissionTypeFactory(factory.django.DjangoModelFactory):

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/factories/rebate.py

@@ -1,4 +1,5 @@
 import factory
+
 from wbcommission.models import Rebate
 
 

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/filters/rebate.py

@@ -1,5 +1,3 @@
-from wbcommission.models import Rebate
-from wbcommission.models.rebate import RebateGroupbyChoice
 from wbcore import filters as wb_filters
 from wbcore.contrib.directory.models import Company
 from wbcore.filters.defaults import current_quarter_date_range
@@ -9,14 +7,16 @@ from wbfdm.preferences import get_default_classification_group
 from wbportfolio.filters.transactions.claim import CommissionBaseFilterSet
 from wbportfolio.models import Product
 
+from wbcommission.models import Rebate
+from wbcommission.models.rebate import RebateGroupbyChoice
+
 
 class RebateDateFilter(CommissionBaseFilterSet):
     date = wb_filters.DateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,
-        default=current_quarter_date_range,
+        initial=current_quarter_date_range,
     )
 
     class Meta:
@@ -34,13 +34,13 @@ class RebateGroupByFilter(PandasFilterSetMixin, RebateDateFilter):
     group_by = wb_filters.ChoiceFilter(
         label="Group By",
         choices=RebateGroupbyChoice.choices(),
-        default=RebateGroupbyChoice.ACCOUNT.name,  # typing: ignore
+        initial=RebateGroupbyChoice.ACCOUNT.name,  # typing: ignore
         method=lambda queryset, label, value: queryset,
         clearable=False,
         required=True,
     )
     groupby_classification_group = wb_filters.ModelChoiceFilter(
-        default=lambda k, v, f: get_default_classification_group().id,
+        initial=lambda k, v, f: get_default_classification_group().id,
         method=lambda queryset, label, value: queryset,
         label="Group by Classification Group",
         queryset=ClassificationGroup.objects.all(),
@@ -97,10 +97,9 @@ class CustomerRebateGroupByFilter(RebateGroupByFilter):
 class RebateMarginalityFilter(PandasFilterSetMixin, wb_filters.FilterSet):
     date = wb_filters.DateRangeFilter(
         label="Date Range",
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         required=True,
         clearable=False,
-        default=current_quarter_date_range,
+        initial=current_quarter_date_range,
     )
 
     bank = wb_filters.ModelMultipleChoiceFilter(

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/generators/rebate_generator.py

@@ -7,10 +7,11 @@ from typing import Iterable
 from django.db.models import QuerySet, Sum
 from wbaccounting.generators.base import AbstractBookingEntryGenerator
 from wbaccounting.models import BookingEntry
-from wbcommission.models import Rebate
 from wbcore.contrib.directory.models import Entry
 from wbportfolio.models import Product
 
+from wbcommission.models import Rebate
+
 
 class RebateGenerator(AbstractBookingEntryGenerator):
     TITLE = "Rebate Generation"

wbcommission-1.59.0/wbcommission/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"PO-Revision-Date: 2025-05-30 09:40+0000\n"
+"Language-Team: German (https://app.transifex.com/stainly/teams/171242/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: viewsets/buttons/rebate.py:19
+msgid "Start"
+msgstr ""
+
+#: viewsets/rebate.py:435
+msgid ""
+"The selected date range includes a Saturday or Sunday. Please note that fees"
+" and rebates are normalized over the weekend, as fees continue to accumulate"
+" during this period."
+msgstr ""

wbcommission-1.59.0/wbcommission/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: viewsets/buttons/rebate.py:19
+msgid "Start"
+msgstr ""
+
+#: viewsets/rebate.py:435
+msgid ""
+"The selected date range includes a Saturday or Sunday. Please note that fees "
+"and rebates are normalized over the weekend, as fees continue to accumulate "
+"during this period."
+msgstr ""

wbcommission-1.59.0/wbcommission/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"PO-Revision-Date: 2025-05-30 09:40+0000\n"
+"Language-Team: French (https://app.transifex.com/stainly/teams/171242/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: viewsets/buttons/rebate.py:19
+msgid "Start"
+msgstr ""
+
+#: viewsets/rebate.py:435
+msgid ""
+"The selected date range includes a Saturday or Sunday. Please note that fees"
+" and rebates are normalized over the weekend, as fees continue to accumulate"
+" during this period."
+msgstr ""

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/models/account_service.py

@@ -31,13 +31,13 @@ class AccountRebateManager:
         # get the fees as a multi-index matrix
         self.df_fees = pd.DataFrame(
             Fees.valid_objects.filter(
-                linked_product__in=claim_products,
+                product__in=claim_products,
                 transaction_subtype__in=self.FEE_MAP[self.commission_type_key],
-            ).values("linked_product", "transaction_date", "total_value")
+            ).values("product", "fee_date", "total_value")
         )
         if not self.df_fees.empty:
             self.df_fees = (
-                self.df_fees.rename(columns={"linked_product": "product", "transaction_date": "date"})
+                self.df_fees.rename(columns={"product": "product", "fee_date": "date"})
                 .groupby(["product", "date"])
                 .sum()
                 .total_value.astype(float)
@@ -91,7 +91,7 @@ class AccountRebateManager:
         only_content_object_ids: list[int] | None = None,
         start_date: date | None = None,
         terminal_account_filter_dict: dict[str, Any] | None = None,
-        **kwargs
+        **kwargs,
     ) -> Generator[tuple[Account, Product, date], None, None]:
         """
         Given the parameters and the instance root account and commission type, yield all valid terminal account, product and date
@@ -182,7 +182,9 @@ class AccountRebateManager:
                       and date, a KeyError will be caught, and the function will return Decimal(0).
         """
         with suppress(InstrumentPrice.DoesNotExist, KeyError):
-            product_shares = max(product.prices.get(date=compute_date, calculated=True).outstanding_shares, Decimal(0))
+            product_shares = max(
+                product.prices.get(date=compute_date, calculated=True).outstanding_shares or Decimal(0), Decimal(0)
+            )
             account_shares = max(
                 Decimal(self.df_shares.loc[(terminal_account.id, product.id, compute_date)]), Decimal(0)
             )

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/models/commission.py

@@ -201,13 +201,21 @@ class CommissionType(WBModel):
                         )  # If fees are negative, then we need to return the negative of the recipient fees
 
                         # Yield rebate information
-                        yield terminal_account, compute_date, commission, content_object, recipient, rebate_gain, {
-                            "terminal_account_holding_ratio": terminal_account_holding_ratio,
-                            "root_account_total_holding": root_account_total_holding,
-                            "commission_percent": actual_percent,
-                            "commission_pool": commission_pool,
-                            "recipient_percent": recipient_percent,
-                        }
+                        yield (
+                            terminal_account,
+                            compute_date,
+                            commission,
+                            content_object,
+                            recipient,
+                            rebate_gain,
+                            {
+                                "terminal_account_holding_ratio": terminal_account_holding_ratio,
+                                "root_account_total_holding": root_account_total_holding,
+                                "commission_percent": actual_percent,
+                                "commission_pool": commission_pool,
+                                "recipient_percent": recipient_percent,
+                            },
+                        )
 
     def __str__(self) -> str:
         return self.name
@@ -433,11 +441,14 @@ class Commission(OrderedModel, WBModel):
             )
             total_weighting = Decimal(account_roles.aggregate(s=Sum("weighting"))["s"] or 0)
             for account_role in account_roles:
-                yield account_role.entry, Decimal(
-                    account_role.weighting
-                ) / total_weighting if total_weighting else Decimal(0)
+                yield (
+                    account_role.entry,
+                    Decimal(account_role.weighting) / total_weighting if total_weighting else Decimal(0),
+                )
         else:
-            role_recipients = PortfolioRole.objects.exclude(weighting=0).filter(
+            role_recipients = PortfolioRole.objects.exclude(
+                weighting=0
+            ).filter(
                 (Q(role_type=self.portfolio_role_recipient) & (Q(instrument=product) | Q(instrument__isnull=True)))
                 & (Q(start__lte=val_date) | Q(start__isnull=True))
                 & (
@@ -446,9 +457,10 @@ class Commission(OrderedModel, WBModel):
             )
             total_weighting = Decimal(role_recipients.aggregate(s=Sum("weighting"))["s"] or 0)
             for portfolio_role in role_recipients:
-                yield portfolio_role.person.entry_ptr, Decimal(
-                    Decimal(portfolio_role.weighting) / total_weighting
-                ) if total_weighting else Decimal(0)
+                yield (
+                    portfolio_role.person.entry_ptr,
+                    Decimal(Decimal(portfolio_role.weighting) / total_weighting) if total_weighting else Decimal(0),
+                )
 
     @classmethod
     def get_endpoint_basename(cls) -> str:
@@ -539,6 +551,9 @@ class CommissionExclusionRule(models.Model):
             ),
         ]
 
+    def __str__(self) -> str:
+        return super().__str__()
+
 
 class CommissionRule(ComplexToStringMixin, WBModel):
     id: Optional[int]

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/models/rebate.py

@@ -10,6 +10,7 @@ from django.db.models import Exists, OuterRef, QuerySet
 from django.dispatch import receiver
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.notifications.dispatch import send_notification
+from wbcore.contrib.notifications.utils import create_notification_type
 from wbcore.signals import pre_merge
 from wbcore.utils.enum import ChoiceEnum
 from wbcrm.models.accounts import Account
@@ -160,7 +161,7 @@ class Rebate(BookingEntryCalculatedValueMixin, models.Model):
             #             ("date", "recipient", "product", "commission"),
         ]
         notification_types = [
-            (
+            create_notification_type(
                 "wbcommission.rebate.computation_done",
                 "Rebate Computation Done",
                 "Sends a notification to notify rebate computation requester that the calculation is done",

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/models/signals.py

@@ -31,15 +31,15 @@ def post_fees_save_for_rebate_computation(sender, instance, created, **kwargs):
     # if a new commission line is created, we create a general rule
     if (
         created
-        and (date.today() - instance.transaction_date).days
+        and (date.today() - instance.fee_date).days
         <= global_preferences_registry.manager()["wbcommission__days_to_recompute_rebate_from_fees_threshold"]
     ):  # we make sure that the fee won't trigger rebate computation if they are created too much in the past
         for root_account in Account.objects.filter(level=0):
             if Claim.objects.filter(
-                account__in=root_account.get_descendants(include_self=True), product=instance.linked_product
+                account__in=root_account.get_descendants(include_self=True), product=instance.product
             ).exists():
                 manage_rebate_as_task.delay(
                     root_account.id,
-                    start_date=instance.transaction_date,
-                    only_content_object_ids=[instance.linked_product.id],
+                    start_date=instance.fee_date,
+                    only_content_object_ids=[instance.product.id],
                 )

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/permissions.py

@@ -1,6 +1,6 @@
-from rest_framework.permissions import BasePermission
+from rest_framework.permissions import IsAuthenticated
 
 
-class IsCommissionAdmin(BasePermission):
+class IsCommissionAdmin(IsAuthenticated):
     def has_permission(self, request, view):
         return request.user.has_perm("wbcommission.administrate_commission")

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/reports/audit_report.py

@@ -3,12 +3,13 @@ from io import BytesIO
 
 import pandas as pd
 from celery import shared_task
-from wbcommission.models import Commission, CommissionType, Rebate
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.directory.models import Entry
 from wbcrm.models.accounts import Account
 from wbportfolio.models.products import Product
 
+from wbcommission.models import Commission, CommissionType, Rebate
+
 from .utils import create_report_and_send
 
 

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/reports/customer_report.py

@@ -5,7 +5,6 @@ from io import BytesIO
 import xlsxwriter
 from celery import shared_task
 from django.db.models import Case, F, Sum, When
-from wbcommission.models import CommissionType, Rebate
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbcore.contrib.directory.models import Entry
@@ -19,6 +18,8 @@ from wbfdm.models import InstrumentPrice
 from wbportfolio.models.transactions.claim import Claim
 from xlsxwriter.utility import xl_rowcol_to_cell
 
+from wbcommission.models import CommissionType, Rebate
+
 from .utils import create_report_and_send
 
 AccountCustomer = None
@@ -217,7 +218,7 @@ def create_report(user, customer, start_date, end_date):
         worksheet_trade_performance.write_string(bank_cell, claim.bank, base_format)
         worksheet_trade_performance.write_string(root_account_cell, claim.account.get_root().title, base_format)
         worksheet_trade_performance.write_string(account_cell, str(claim.account), base_format)
-        worksheet_trade_performance.write_string(product_cell, claim.product.title, base_format)
+        worksheet_trade_performance.write_string(product_cell, claim.product.name, base_format)
 
         worksheet_trade_performance.write_number(
             price_trade_cell, claim.price_date or claim.product.share_price, decimal_format

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/serializers/commissions.py

@@ -1,6 +1,7 @@
-from wbcommission.models import CommissionType
 from wbcore import serializers as wb_serializers
 
+from wbcommission.models import CommissionType
+
 
 class CommissionTypeRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcommission:commissiontype-detail")

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/serializers/rebate.py

@@ -1,6 +1,7 @@
-from wbcommission.models import Rebate
 from wbcore import serializers as wb_serializers
 
+from wbcommission.models import Rebate
+
 
 class RebateModelSerializer(wb_serializers.ModelSerializer):
     id = wb_serializers.PrimaryKeyField()

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/serializers/signals.py

@@ -21,7 +21,7 @@ def commission_adding_additional_resource(sender, serializer, instance, request,
         "generate_customer_commission_report": f'{reverse("wbcommission:rebate-customerreport", request=request)}?recipient_id={instance.id}',
     }
     if user.has_perm("wbcommission.administrate_commission"):
-        res[
-            "generate_audit_commission_report"
-        ] = f'{reverse("wbcommission:rebate-auditreport", request=request)}?recipient_id={instance.id}'
+        res["generate_audit_commission_report"] = (
+            f'{reverse("wbcommission:rebate-auditreport", request=request)}?recipient_id={instance.id}'
+        )
     return res

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/tests/analytics/test_marginality.py

@@ -3,11 +3,13 @@ from faker import Faker
 from pandas.tseries.offsets import BDay
 from rest_framework.reverse import reverse
 from rest_framework.test import APIClient, APIRequestFactory
+from wbfdm.factories import InstrumentPriceFactory
+from wbportfolio.factories import FeesFactory, ProductFactory
+from wbportfolio.models import Product
+
 from wbcommission.analytics.marginality import MarginalityCalculator
 from wbcommission.factories import CommissionTypeFactory, RebateFactory
 from wbcommission.viewsets.rebate import RebateProductMarginalityViewSet
-from wbportfolio.factories import FeesFactory, InstrumentPriceFactory, ProductFactory
-from wbportfolio.models import Product
 
 fake = Faker()
 
@@ -19,14 +21,14 @@ def _create_fixture(product, val_date, net_value=100, outstanding_shares=100):
         instrument=product, net_value=net_value, outstanding_shares=outstanding_shares, calculated=False, date=val_date
     ).net_value  # create a price of AUM 100*100
     management_fees_1 = FeesFactory.create(
-        linked_product=product, transaction_date=val_date, transaction_subtype="MANAGEMENT", calculated=False
+        product=product, fee_date=val_date, transaction_subtype="MANAGEMENT", calculated=False
     ).total_value
     performance_fees_1 = FeesFactory.create(
-        linked_product=product, transaction_date=val_date, transaction_subtype="PERFORMANCE", calculated=False
+        product=product, fee_date=val_date, transaction_subtype="PERFORMANCE", calculated=False
     ).total_value
     performance_crys_fees_1 = FeesFactory.create(
-        linked_product=product,
-        transaction_date=val_date,
+        product=product,
+        fee_date=val_date,
         transaction_subtype="PERFORMANCE_CRYSTALIZED",
         calculated=False,
     ).total_value

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/tests/conftest.py

@@ -23,12 +23,11 @@ from wbcore.contrib.geography.factories import (
 )
 from wbcore.contrib.geography.tests.signals import app_pre_migration
 from wbcrm.factories import AccountFactory, AccountRoleFactory, AccountRoleTypeFactory
-from wbfdm.factories import ExchangeFactory, InstrumentFactory, InstrumentTypeFactory
+from wbfdm.factories import ExchangeFactory, InstrumentFactory, InstrumentTypeFactory, InstrumentPriceFactory
 from wbportfolio.factories import (
     ClaimFactory,
     CustomerTradeFactory,
     FeesFactory,
-    InstrumentPriceFactory,
     PortfolioFactory,
     ProductFactory,
     ProductPortfolioRoleFactory,

{wbcommission-1.43.2 → wbcommission-1.59.0}/wbcommission/tests/models/mixins.py

@@ -1,7 +1,8 @@
 import pytest
+from wbcrm.factories import AccountFactory
+
 from wbcommission.factories import CommissionTypeFactory
 from wbcommission.models.account_service import AccountRebateManager
-from wbcrm.factories import AccountFactory
 
 
 class AccountManagerFixture: