wbportfolio 1.51.7__tar.gz → 1.52.1__tar.gz

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/PKG-INFO

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

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/wbportfolio/models/transactions/trade_proposals.py

@@ -5,6 +5,7 @@ from decimal import Decimal
 from typing import TypeVar
 
 from celery import shared_task
+from django.contrib.messages import info
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.functional import cached_property
@@ -243,7 +244,6 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         effective_portfolio = self.portfolio._build_dto(last_effective_date)
         if not target_portfolio:
             target_portfolio = self._get_default_target_portfolio()
-
         if target_portfolio:
             service = TradingService(
                 self.trade_date,
@@ -251,7 +251,6 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
                 target_portfolio=target_portfolio,
             )
             if validate_trade:
-                service.normalize()
                 service.is_valid()
                 trades = service.validated_trades
             else:
@@ -266,6 +265,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
                 try:
                     trade = self.trades.get(underlying_instrument=instrument)
                     trade.weighting = weighting
+                    trade.comment = ""
                     trade.currency_fx_rate = currency_fx_rate
                     trade.status = Trade.Status.DRAFT
                 except Trade.DoesNotExist:
@@ -449,13 +449,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
     )
     def submit(self, by=None, description=None, **kwargs):
         self.reset_trades(target_portfolio=self._build_dto().convert_to_portfolio())
-        trades = []
-        for trade in self.trades.all():
-            trade.status = Trade.Status.SUBMIT
-            trade.comment = ""
-            trades.append(trade)
-
-        Trade.objects.bulk_update(trades, ["status", "comment"])
+        self.trades.update(status=Trade.Status.SUBMIT)
 
         # If we estimate cash on this trade proposal, we make sure to create the corresponding cash component
         estimated_cash_position = self.get_estimated_target_cash(self.portfolio.currency)
@@ -470,7 +464,6 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
                     estimated_cash_position._build_dto()
                 )
             target_portfolio = PortfolioDTO(positions=tuple(target_portfolio.positions_map.values()))
-
         self.evaluate_active_rules(self.trade_date, target_portfolio, asynchronously=True)
 
     def can_submit(self):
@@ -543,6 +536,11 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
         if estimated_cash_position.weighting and len(trades) > 0:
             estimated_cash_position.pre_save()
             assets.append(estimated_cash_position)
+            if (fsm_context := getattr(self, "fsm_context", None)) and (request := fsm_context.get("request", None)):
+                info(
+                    request,
+                    f"We created automatically a cash position of weight {estimated_cash_position.weighting:.2%}",
+                )
 
         Trade.objects.bulk_update(trades, ["status"])
         self.portfolio.bulk_create_positions(

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/wbportfolio/viewsets/configs/buttons/__init__.py

@@ -16,6 +16,7 @@ from .registers import RegisterButtonConfig
 from .trades import (
     TradeButtonConfig,
     TradeInstrumentButtonConfig,
+    TradeTradeProposalButtonConfig
 )
 from .trade_proposals import TradeProposalButtonConfig
 from .reconciliations import AccountReconciliationButtonViewConfig, AccountReconciliationLineButtonViewConfig

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/wbportfolio/viewsets/configs/buttons/trades.py

@@ -1,6 +1,7 @@
 from rest_framework.reverse import reverse
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import buttons as bt
+from wbcore.metadata.configs.buttons.enums import Button
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbfdm.models import Instrument
 
@@ -58,3 +59,10 @@ class TradeInstrumentButtonConfig(TradeButtonConfig):
                     )
                 )
         return res
+
+
+class TradeTradeProposalButtonConfig(ButtonViewConfig):
+    def get_create_buttons(self):
+        return {
+            Button.SAVE_AND_CLOSE.value,
+        }

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/wbportfolio/viewsets/transactions/trade_proposals.py

@@ -98,6 +98,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
     def reset(self, request, pk=None):
         trade_proposal = get_object_or_404(TradeProposal, pk=pk)
         if trade_proposal.status == TradeProposal.Status.DRAFT:
+            trade_proposal.trades.all().delete()
             trade_proposal.reset_trades()
             return Response({"send": True})
         return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)

{wbportfolio-1.51.7 → wbportfolio-1.52.1}/wbportfolio/viewsets/transactions/trades.py

@@ -64,6 +64,7 @@ from ..configs import (
     TradePortfolioEndpointConfig,
     TradePortfolioTitleConfig,
     TradeTitleConfig,
+    TradeTradeProposalButtonConfig,
     TradeTradeProposalDisplayConfig,
     TradeTradeProposalEndpointConfig,
 )
@@ -388,6 +389,7 @@ class TradeTradeProposalModelViewSet(
     display_config_class = TradeTradeProposalDisplayConfig
     endpoint_config_class = TradeTradeProposalEndpointConfig
     serializer_class = TradeTradeProposalModelSerializer
+    button_config_class = TradeTradeProposalButtonConfig
 
     @cached_property
     def trade_proposal(self):