wbcommission 1.54.8__tar.gz → 1.59.5rc0__tar.gz

{wbcommission-1.54.8 → wbcommission-1.59.5rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcommission
-Version: 1.54.8
+Version: 1.59.5rc0
 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.54.8 → wbcommission-1.59.5rc0}/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.54.8 → wbcommission-1.59.5rc0}/wbcommission/filters/rebate.py

@@ -13,7 +13,6 @@ 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,
@@ -98,7 +97,6 @@ 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,
         initial=current_quarter_date_range,

{wbcommission-1.54.8 → wbcommission-1.59.5rc0}/wbcommission/models/account_service.py

@@ -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.54.8 → wbcommission-1.59.5rc0}/wbcommission/models/commission.py

@@ -551,6 +551,9 @@ class CommissionExclusionRule(models.Model):
             ),
         ]
 
+    def __str__(self) -> str:
+        return super().__str__()
+
 
 class CommissionRule(ComplexToStringMixin, WBModel):
     id: Optional[int]

{wbcommission-1.54.8 → wbcommission-1.59.5rc0}/wbcommission/models/rebate.py

@@ -13,6 +13,7 @@ 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 wbcore.workers import Queue
 from wbcrm.models.accounts import Account
 
 from .commission import Commission, CommissionType
@@ -271,7 +272,7 @@ class Rebate(BookingEntryCalculatedValueMixin, models.Model):
 # ----------- TASKS -----------
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.EXTENDED_BACKGROUND.value)
 def manage_rebate_as_task(
     main_account_id: int,
     start_date: date_lib | None = None,

{wbcommission-1.54.8 → wbcommission-1.59.5rc0}/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.54.8 → wbcommission-1.59.5rc0}/wbcommission/reports/audit_report.py

@@ -5,6 +5,7 @@ import pandas as pd
 from celery import shared_task
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.directory.models import Entry
+from wbcore.workers import Queue
 from wbcrm.models.accounts import Account
 from wbportfolio.models.products import Product
 
@@ -13,7 +14,7 @@ from wbcommission.models import Commission, CommissionType, Rebate
 from .utils import create_report_and_send
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.DEFAULT.value)
 def create_audit_report_and_send_as_task(user_id: int, recipient_id: int, start_date: date, end_date: date):
     user = User.objects.get(id=user_id)
     recipient = Entry.objects.get(id=recipient_id)

{wbcommission-1.54.8 → wbcommission-1.59.5rc0}/wbcommission/reports/customer_report.py

@@ -8,6 +8,7 @@ from django.db.models import Case, F, Sum, When
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import CurrencyFXRates
 from wbcore.contrib.directory.models import Entry
+from wbcore.workers import Queue
 from wbcrm.models.accounts import (
     Account,
     AccountRole,
@@ -25,7 +26,7 @@ from .utils import create_report_and_send
 AccountCustomer = None
 
 
-@shared_task(queue="commission")
+@shared_task(queue=Queue.DEFAULT.value)
 def create_customer_report_and_send_as_task(user_id: int, recipient_id: int, start_date: date, end_date: date):
     user = User.objects.get(id=user_id)
     recipient = Entry.objects.get(id=recipient_id)
@@ -218,7 +219,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.54.8 → wbcommission-1.59.5rc0}/wbcommission/tests/models/test_commission.py

@@ -478,10 +478,10 @@ class TestCommissionType:
         res = dict()
         for commission_type in CommissionType.objects.all():
             for (
-                terminal_account,
-                compute_date,
-                commission,
-                product,
+                _,
+                _,
+                _,
+                _,
                 recipient,
                 recipient_fees,
                 _,