wbportfolio 1.50.10__py2.py3-none-any.whl → 1.50.11__py2.py3-none-any.whl

wbportfolio/models/reconciliations/account_reconciliations.py

@@ -1,5 +1,3 @@
-from contextlib import suppress
-
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -58,6 +56,7 @@ class AccountReconciliation(Reconciliation):
                 "Account Reconciliation Events",
                 "A notification that informs the user about an account reconciliation event.",
                 email=True,
+                is_lock=True,
             ),
         ]
 
@@ -80,12 +79,13 @@ class AccountReconciliation(Reconciliation):
     def get_representation_label_key(cls):
         return "{{account}} {{reconciliation_date}}"
 
-    def notify(self, update: bool = False):
+    def notify(self, update: bool = False, silent_errors: bool = True) -> None:
         registry = global_preferences_registry.manager()
         title = registry["wbportfolio__account_holding_reconciliation_notification_title"]
         body = registry[f"wbportfolio__account_holding_reconciliation_notification_body{'_update' if update else ''}"]
+        errors_entries = []
         for role in self.account.roles.filter(role_type__key="reconciliation-manager"):
-            with suppress(User.DoesNotExist):
+            try:
                 user = User.objects.get(profile_id=role.entry.id)
                 send_notification(
                     code="wbportfolio.account_reconciliation.notify",
@@ -95,6 +95,12 @@ class AccountReconciliation(Reconciliation):
                     reverse_name="wbportfolio:accountreconciliation-detail",
                     reverse_args=[self.id],
                 )
+            except User.DoesNotExist:
+                errors_entries.append(role.entry)
+        if errors_entries and not silent_errors:
+            raise ValueError(
+                f"Because of missing valid user account, we couldn't successfully notify the account holding reconciliation to the following customers:  {', '.join(errors_entries)}. Note: The other customers were successfully notified."
+            )
 
 
 @receiver(post_save, sender=AccountReconciliation)

wbportfolio/viewsets/assets.py

@@ -356,11 +356,19 @@ class ContributorPortfolioChartView(UserPortfolioRequestPermissionMixin, viewset
     title_config_class = ContributorPortfolioChartTitleConfig
     endpoint_config_class = ContributorPortfolioChartEndpointConfig
 
+    ROW_HEIGHT: int = 20
+
+    @property
+    def min_height(self):
+        if hasattr(self, "nb_rows"):
+            return self.nb_rows * self.ROW_HEIGHT
+        return "300px"
+
     @cached_property
     def hedged_currency(self) -> Currency | None:
         if "hedged_currency" in self.request.GET:
             with suppress(Currency.DoesNotExist):
-                return Currency.objects.get(pk=self.kwargs["hedged_currency"])
+                return Currency.objects.get(pk=self.request.GET["hedged_currency"])
 
     @cached_property
     def show_lookthrough(self) -> bool:
@@ -407,6 +415,7 @@ class ContributorPortfolioChartView(UserPortfolioRequestPermissionMixin, viewset
 
             text_forex = df_forex.contribution_forex.apply(lambda x: f"{x:,.2%}")
             text_equity = contribution_equity.apply(lambda x: f"{x:,.2%}")
+            setattr(self, "nb_rows", df.shape[0])
             fig.add_trace(
                 go.Bar(
                     y=df.instrument_id,
@@ -443,10 +452,16 @@ class ContributorPortfolioChartView(UserPortfolioRequestPermissionMixin, viewset
                 paper_bgcolor="rgba(0,0,0,0)",
                 plot_bgcolor="rgba(0,0,0,0)",
                 font=dict(family="roboto", size=12, color="black"),
+                bargap=0.3,
             )
             # fig = get_horizontal_barplot(df, x_label="contribution_total", y_label="name")
         return fig
 
+    def parse_figure_dict(self, figure_dict: dict[str, any]) -> dict[str, any]:
+        figure_dict = super().parse_figure_dict(figure_dict)
+        figure_dict["style"]["minHeight"] = self.min_height
+        return figure_dict
+
     def get_queryset(self):
         if self.has_portfolio_access:
             return super().get_queryset().filter(portfolio=self.portfolio)

wbportfolio/viewsets/reconciliations.py

@@ -46,7 +46,13 @@ class AccountReconciliationModelViewSet(viewsets.ModelViewSet):
     button_config_class = AccountReconciliationButtonViewConfig
     endpoint_config_class = AccountReconciliationEndpointViewConfig
 
-    filterset_fields = {"account": ["exact"]}
+    filterset_fields = {
+        "account": ["exact"],
+        "creator": ["exact"],
+        "approved_by": ["exact"],
+        "reconciliation_date": ["gte", "exact", "lte"],
+        "approved_dt": ["gte", "lte"],
+    }
     ordering = ordering_fields = ["-reconciliation_date"]
 
     def get_queryset(self):
@@ -108,8 +114,11 @@ class AccountReconciliationModelViewSet(viewsets.ModelViewSet):
 
     @action(methods=["PATCH"], detail=True)
     def notify(self, request: "Request", pk: int | None = None) -> Response:
-        self.get_object().notify(update=True)
-        return Response()
+        try:
+            self.get_object().notify(update=True, silent_errors=False)
+            return Response()
+        except ValueError as e:
+            return Response(str(e), status=status.HTTP_400_BAD_REQUEST)
 
 
 class AccountReconciliationLineModelViewSet(viewsets.ModelViewSet):

{wbportfolio-1.50.10.dist-info → wbportfolio-1.50.11.dist-info}/METADATA

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

{wbportfolio-1.50.10.dist-info → wbportfolio-1.50.11.dist-info}/RECORD

@@ -269,7 +269,7 @@ wbportfolio/models/mixins/instruments.py,sha256=SgBreTpa_X3uyCWo7t8B0VaTtl49IjmB
 wbportfolio/models/mixins/liquidity_stress_test.py,sha256=whkzjtbOyl_ncNyaQBORb_Z_rDgcvfdTYPgqPolu7dA,58865
 wbportfolio/models/reconciliations/__init__.py,sha256=MXH5fZIPGDRBgJkO6wVu_NLRs8fkP1im7G6d-h36lQY,127
 wbportfolio/models/reconciliations/account_reconciliation_lines.py,sha256=QP6M7hMcyFbuXBa55Y-azui6Dl_WgbzMntEqWzQkbfM,7394
-wbportfolio/models/reconciliations/account_reconciliations.py,sha256=_teOTNePxua9C894auy8CvdOFsmUnQiOM2_TZAHvzY4,3955
+wbportfolio/models/reconciliations/account_reconciliations.py,sha256=rofSxetFfEJov6mPyoTvGxELA16HILyJZtQvm_kwYU0,4405
 wbportfolio/models/reconciliations/reconciliations.py,sha256=kF-BNhUoT4TCn1RIgPSkdEk1iX4NQeZlGGFd_ZulAZU,686
 wbportfolio/models/transactions/__init__.py,sha256=R-4fHylrUf3773kGSEt09vtYj3LUlia5yf7rxHXjvHA,295
 wbportfolio/models/transactions/claim.py,sha256=XUSephKt-VkILe2i-Sd9aoVxB-50PJANCPIDLa_dKl4,25872
@@ -401,7 +401,7 @@ wbportfolio/tests/viewsets/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 wbportfolio/tests/viewsets/transactions/test_claims.py,sha256=QEZfMAW07dyoZ63t2umSwGOqvaTULfYfbN_F4ZoSAcw,6368
 wbportfolio/viewsets/__init__.py,sha256=3kUaQ66ybvROwejd3bEcSt4XKzfOlPDaeoStMvlz7qY,2294
 wbportfolio/viewsets/adjustments.py,sha256=5hWCjxSgUIsrPOmJKoDYK3gywdMTI0aYDorEj1FXRVc,1429
-wbportfolio/viewsets/assets.py,sha256=FgJhBK13tAkrDyTiWsgnIT0Oq39mlvJTQSq1ztopQhY,24172
+wbportfolio/viewsets/assets.py,sha256=Gf5QKDM7QR9MC8GJhMNzaY7NzeKV_yOQw0wktKPEc9o,24661
 wbportfolio/viewsets/assets_and_net_new_money_progression.py,sha256=Jl4vEQP4N2OFL5IGBXoKcj-0qaPviU0I8npvQLw4Io0,4464
 wbportfolio/viewsets/custodians.py,sha256=CTFqkqVP1R3AV7lhdvcdICxB5DfwDYCyikNSI5kbYEo,2322
 wbportfolio/viewsets/esg.py,sha256=27MxxdXQH3Cq_1UEYmcrF7htUOg6i81fUpbVQXAAKJI,6985
@@ -415,7 +415,7 @@ wbportfolio/viewsets/positions.py,sha256=2rzFHB_SI09rXC_EYi58G_eqvzONbk8z61JDkkj
 wbportfolio/viewsets/product_groups.py,sha256=YvmuXPPy98K1J_rz6YPsx9gNK-tCS2P-wc1uRYgfyo0,2399
 wbportfolio/viewsets/product_performance.py,sha256=dRfRgifjGS1RgZSu9uJRM0SmB7eLnNUkPuqARMO4gyo,28371
 wbportfolio/viewsets/products.py,sha256=1KXUDXdNmBFYjQcvJkwUCnjIOKZT0cAk_XTihMKRWvw,20459
-wbportfolio/viewsets/reconciliations.py,sha256=nRWWfrMqZAXmXB1ZG3coUHjYEiZNblobO5u3zsXWono,7037
+wbportfolio/viewsets/reconciliations.py,sha256=tRS7UBDtMn-07uA9QqYvnCtp_mZGVeULF2OJMfHJPZk,7357
 wbportfolio/viewsets/registers.py,sha256=eOuEhW2McHsOapCKue7M4eazrJnVpCBVxImpFccq0z0,2401
 wbportfolio/viewsets/roles.py,sha256=vnzS1mlJMZS3GObrss6SfXOr3KRb-OHB1s4Msvtn7xQ,1556
 wbportfolio/viewsets/signals.py,sha256=URxNz-7tKNBgvaFIE3FItfao3Md0dKQN_eVFwxxiErk,2125
@@ -522,7 +522,7 @@ wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQV
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=iQpC_Thbj56SmM05vPRsF1JZguGBDaTUH3I-_iCHCV0,5958
 wbportfolio/viewsets/transactions/trades.py,sha256=-yJ4j8NJTu2VWyhCq5BXGNND_925Ietoxx9k07SLVh0,21634
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.50.10.dist-info/METADATA,sha256=e_s5BwIt2n97gDO321AtrrM38advbJ1Q18XHUInpP8w,703
-wbportfolio-1.50.10.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.50.10.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.50.10.dist-info/RECORD,,
+wbportfolio-1.50.11.dist-info/METADATA,sha256=-P0DH8eaypNkb_aIxSByI1N2TdeWYx9zZZXZ5QzGl84,703
+wbportfolio-1.50.11.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.50.11.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.50.11.dist-info/RECORD,,