wbportfolio 1.50.10__tar.gz → 1.50.11__tar.gz

{wbportfolio-1.50.10 → wbportfolio-1.50.11}/PKG-INFO

@@ -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 → wbportfolio-1.50.11}/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-1.50.10 → wbportfolio-1.50.11}/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-1.50.10 → wbportfolio-1.50.11}/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):