wbportfolio 1.44.1__py2.py3-none-any.whl → 1.44.2__py2.py3-none-any.whl

wbportfolio/filters/transactions/claim.py

@@ -7,6 +7,7 @@ from wbcore.utils.date import current_financial_quarter
 from wbcrm.models.accounts import Account, AccountRole
 from wbfdm.models import Classification, ClassificationGroup
 from wbfdm.preferences import get_default_classification_group
+from wbportfolio.filters.transactions.mixins import OppositeSharesFieldMethodMixin
 from wbportfolio.models import Product, ProductGroup
 from wbportfolio.models.transactions.claim import Claim, ClaimGroupbyChoice
 from wbportfolio.preferences import get_monthly_nnm_target
@@ -140,7 +141,23 @@ class CommissionBaseFilterSet(wb_filters.FilterSet):
         return queryset
 
 
-class ClaimFilter(CommissionBaseFilterSet):
+class ClaimFilter(OppositeSharesFieldMethodMixin, CommissionBaseFilterSet):
+    # we have to redefine the mixin fields because django_filters does not allow class extension with mixin
+    opposite_shares = wb_filters.NumberFilter(
+        field_name="shares",
+        label="Opposite Shares",
+        method="filter_opposite_shares",
+        lookup_icon="±",
+        lookup_label="Opposite",
+    )
+    opposite_approximate_shares = wb_filters.NumberFilter(
+        field_name="shares",
+        label="Opposite Approximite Shares",
+        method="filter_opposite_approximate_shares",
+        lookup_icon="≈±",
+        lookup_label="Opposite Approximate (+- 10%)",
+    )
+
     pending_approval = wb_filters.BooleanFilter(label="Pending Approval", method="boolean_pending_approval")
     linked_trade = wb_filters.BooleanFilter(method="filter_trade_isnotnull", label="Trade Linked")
     in_charge_of_customer = wb_filters.ModelChoiceFilter(

wbportfolio/filters/transactions/mixins.py

@@ -0,0 +1,12 @@
+class OppositeSharesFieldMethodMixin:
+    def filter_opposite_shares(self, queryset, name, value):
+        return queryset.filter(shares=value * -1)
+
+    def filter_opposite_approximate_shares(self, queryset, name, value):
+        value = float(value)
+        value_lower_bound = -0.9 * value
+        value_higher_bound = -1.1 * value
+
+        if value > 0:
+            return queryset.filter(shares__lte=value_lower_bound, shares__gte=value_higher_bound)
+        return queryset.filter(shares__lte=value_higher_bound, shares__gte=value_lower_bound)

wbportfolio/filters/transactions/trades.py

@@ -6,11 +6,27 @@ from wbcrm.models.accounts import Account
 from wbfdm.models import Instrument
 from wbportfolio.models import Product, Trade
 from wbportfolio.models.transactions.claim import Claim
+from .mixins import OppositeSharesFieldMethodMixin
 
 from .transactions import TransactionFilterSet
 
 
-class TradeFilter(TransactionFilterSet):
+class TradeFilter(OppositeSharesFieldMethodMixin, TransactionFilterSet):
+    # we have to redefine the mixin fields because django_filters does not allow class extension with mixin
+    opposite_shares = wb_filters.NumberFilter(
+        field_name="shares",
+        label="Opposite Shares",
+        method="filter_opposite_shares",
+        lookup_icon="±",
+        lookup_label="Opposite",
+    )
+    opposite_approximate_shares = wb_filters.NumberFilter(
+        field_name="shares",
+        label="Opposite Approximite Shares",
+        method="filter_opposite_approximate_shares",
+        lookup_icon="≈±",
+        lookup_label="Opposite Approximate (+- 10%)",
+    )
     transaction_date = wb_filters.DateRangeFilter(
         method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
@@ -159,34 +175,6 @@ class SubscriptionRedemptionFilterSet(TradeFilter):
         label_key=Product.get_representation_label_key(),
     )
 
-    opposite_shares = wb_filters.NumberFilter(
-        field_name="shares",
-        label="Opposite Shares",
-        method="filter_opposite_shares",
-        lookup_icon="±",
-        lookup_label="Opposite",
-    )
-
-    def filter_opposite_shares(self, queryset, name, value):
-        return queryset.filter(shares=value * -1)
-
-    opposite_approximate_shares = wb_filters.NumberFilter(
-        field_name="shares",
-        label="Opposite Approximite Shares",
-        method="filter_opposite_approximate_shares",
-        lookup_icon="≈±",
-        lookup_label="Opposite Approximate (+- 10%)",
-    )
-
-    def filter_opposite_approximate_shares(self, queryset, name, value):
-        value = float(value)
-        value_lower_bound = -0.9 * value
-        value_higher_bound = -1.1 * value
-
-        if value > 0:
-            return queryset.filter(shares__lte=value_lower_bound, shares__gte=value_higher_bound)
-        return queryset.filter(shares__lte=value_higher_bound, shares__gte=value_lower_bound)
-
     class Meta:
         model = Trade
         fields = {

{wbportfolio-1.44.1.dist-info → wbportfolio-1.44.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.44.1
+Version: 1.44.2
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.44.1.dist-info → wbportfolio-1.44.2.dist-info}/RECORD

@@ -91,9 +91,10 @@ wbportfolio/filters/products.py,sha256=Zo-k7maW4R5OrqJDB-hVTfOIyFoK1KZ8gU0nsDbfw
 wbportfolio/filters/roles.py,sha256=-yDD_18nFL7aGGiIlO2R0SrFDV8eXD_9vnT_u9-6q-g,919
 wbportfolio/filters/signals.py,sha256=by7XgXoQYnaW-4Rr1NvQDUUPusrJ0Qj5QnrXBdOhHQM,3888
 wbportfolio/filters/transactions/__init__.py,sha256=gGXXvQypleQOdKrH1-donElIAWtgCltm0_IqFr9pa7c,630
-wbportfolio/filters/transactions/claim.py,sha256=hzknQP6vuXkOSLvrgatoO7_DoqQpJGWw6FfMQsbqYsM,15617
+wbportfolio/filters/transactions/claim.py,sha256=wLQUokT5x0cUXqJF8j21zNCd2eAA9qE4e2ZGzUuHO18,16331
 wbportfolio/filters/transactions/fees.py,sha256=9iqJuF31pf8C18OyNseSIgBZPDyWxgpBWu6S7nEJaoo,2133
-wbportfolio/filters/transactions/trades.py,sha256=bYnHGBCmL5NO5XTeAcDNbWPSACHT8diPC4x0IbKDLC8,9665
+wbportfolio/filters/transactions/mixins.py,sha256=TEV3MUsiQTeu4NdFYHMIIMonmC7CdFF80JTpWYIvfRQ,550
+wbportfolio/filters/transactions/trades.py,sha256=wXWBKe-yv2ihpOlccRvQoyMQ6Oi_JSiIvGV6mtdqpfA,9341
 wbportfolio/filters/transactions/transactions.py,sha256=zkaEkYRXAMtF6U0iyOAdB44mFmRhaoE6czOVSgtlWVM,3537
 wbportfolio/fixtures/product_factsheets.yaml,sha256=z5o-viDbgwWkssDJXZYayasFgw1nJ0uiOiYrJNDkRtg,5455
 wbportfolio/fixtures/wbportfolio.yaml.gz,sha256=902nxQZM6VcVcc0wI9AYaSedcJIfsK5letLF31j1Jdg,1479453
@@ -500,7 +501,7 @@ wbportfolio/viewsets/transactions/mixins.py,sha256=i9ICaUXZfryIrbgS-bdCcoBJO-pTn
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=5mgAk60cINZHd2HfTu7StFOc882FGakNcIVZpNSwBCs,3528
 wbportfolio/viewsets/transactions/trades.py,sha256=_rZuPRDjf3MbwZ5xvdCgczCxcIbvI-RvyAf-50Y_Ga4,14744
 wbportfolio/viewsets/transactions/transactions.py,sha256=VgSBUs1g5etsXjt7zi4wQi82XwOGuHsd_zppnsbMZMs,4517
-wbportfolio-1.44.1.dist-info/METADATA,sha256=C8XJhmd9qFLEqDHA1Gjxx9smfA8wIKu9PXyCSyr6xDg,645
-wbportfolio-1.44.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.44.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.44.1.dist-info/RECORD,,
+wbportfolio-1.44.2.dist-info/METADATA,sha256=gCo3d7CxhVgXlaFxVZc4q440peMJml7yZrFhhgMNr4U,645
+wbportfolio-1.44.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.44.2.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.44.2.dist-info/RECORD,,