wbportfolio 1.52.0__py2.py3-none-any.whl → 1.52.1__py2.py3-none-any.whl

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/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/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/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/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):

{wbportfolio-1.52.0.dist-info → wbportfolio-1.52.1.dist-info}/METADATA

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

{wbportfolio-1.52.0.dist-info → wbportfolio-1.52.1.dist-info}/RECORD

@@ -283,7 +283,7 @@ wbportfolio/models/transactions/dividends.py,sha256=92-jG8bZN9nU9oDubpu-UDH43Ri7
 wbportfolio/models/transactions/expiry.py,sha256=vnNHdcC1hf2HP4rAbmoGgOfagBYKNFytqOwzOI0MlVI,144
 wbportfolio/models/transactions/fees.py,sha256=ffvqo8I4A0l5rLi00jJ6sGot0jmnkoxaNsbDzdPLwCg,5712
 wbportfolio/models/transactions/rebalancing.py,sha256=obzgewWKOD4kJbCoF5fhtfDk502QkbrjPKh8T9KDGew,7355
-wbportfolio/models/transactions/trade_proposals.py,sha256=ba7hKiWixjhWEbS_akgQTJokIdMLLOTxHIN4GMD71Zo,31151
+wbportfolio/models/transactions/trade_proposals.py,sha256=o6yMqfE5XavUY-kocf2P9DF-VZQbf8vJCiGrpbr-D6M,31313
 wbportfolio/models/transactions/trades.py,sha256=JBy89HPSMa-jDxIHcDfxNyWFHTjThcnSNY_OcWxZNoc,29188
 wbportfolio/models/transactions/transactions.py,sha256=fWoDf0TSV0L0gLUDOQpCRLzjMt1H4MUvUHGEaMsilCc,7027
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -428,7 +428,7 @@ wbportfolio/viewsets/signals.py,sha256=URxNz-7tKNBgvaFIE3FItfao3Md0dKQN_eVFwxxiE
 wbportfolio/viewsets/charts/__init__.py,sha256=mNSpDrsqK-afRxGBfEsfgupUc20xU-JW08FpxIyudok,71
 wbportfolio/viewsets/charts/assets.py,sha256=rZM4Ul0ZXVr7uz3SU44J5IYU7-FivjDgR1it_4ewk2o,10547
 wbportfolio/viewsets/configs/__init__.py,sha256=K5opfVQvgGwSyw3XwDGkv3lo5i9jBxOJXYhLqyCdfeQ,137
-wbportfolio/viewsets/configs/buttons/__init__.py,sha256=99WAr_tftIXJbQPINkwy8xKI509d1zlatDeGu0zHMjU,846
+wbportfolio/viewsets/configs/buttons/__init__.py,sha256=nqXdv0VEG8MM8IKHHf2PDAulYVinCuvmic5Ru03jVBw,881
 wbportfolio/viewsets/configs/buttons/adjustments.py,sha256=sUY_3vxqP0kuqs8i5hklfboZI6QiAOrmu30eb29Xupo,492
 wbportfolio/viewsets/configs/buttons/assets.py,sha256=6HqSyUpczK66iL0Jg8BbvAJuci3jm8OsB9p9Nt_o14Q,5680
 wbportfolio/viewsets/configs/buttons/claims.py,sha256=G1GFK1jQyR9M0dyXthYA6krG2JFvHhc3D7pFh6IUQ30,3684
@@ -441,7 +441,7 @@ wbportfolio/viewsets/configs/buttons/reconciliations.py,sha256=lw4r22GHpqKPUF1Mr
 wbportfolio/viewsets/configs/buttons/registers.py,sha256=aS89TsYHql83k-NHojOrLDqtBpnpsUUO8x63PiMfrXM,445
 wbportfolio/viewsets/configs/buttons/signals.py,sha256=6sKBQI_eDvZuZR5bUUwvur5R67A3oChAGxPfayWUelE,2739
 wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=eZBfYk5ZhancCVcu7bvRKPGBKTl_tGlgz6BZrGPpPxQ,2953
-wbportfolio/viewsets/configs/buttons/trades.py,sha256=X2B1l0iEIdHb3ZMf9rLVoiX_H8lSyLD12wopgumOIX4,2318
+wbportfolio/viewsets/configs/buttons/trades.py,sha256=bPOqqwdgadSUbU9l5aSirqr5UAMFe2AiFNsXLRsKwn8,2535
 wbportfolio/viewsets/configs/display/__init__.py,sha256=SmazY-YEp-Xf8G08Uz1-CzePZRCRtHrziRMIYYIGpCk,2176
 wbportfolio/viewsets/configs/display/adjustments.py,sha256=jIOEc23OCYBguLaZRlZxC916kocYT35ZV9Jsiocs9nk,3334
 wbportfolio/viewsets/configs/display/assets.py,sha256=SkWwzvrn4gOVbCThGJMV63V-iJh517qfUs4f4Wt3dBA,10573
@@ -525,10 +525,10 @@ wbportfolio/viewsets/transactions/claim.py,sha256=Pb1WftoO-w-ZSTbLRhmQubhy7hgd68
 wbportfolio/viewsets/transactions/fees.py,sha256=7VUXIogmRrXCz_D9tvDiiTae0t5j09W9zPUzxXzBGTE,7031
 wbportfolio/viewsets/transactions/mixins.py,sha256=WipvJoi5hylkpD0y9VATe30WAcwIHUIroVkK10FYw7k,636
 wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQVTN2MH1kG_yCeVkmyK8k,1263
-wbportfolio/viewsets/transactions/trade_proposals.py,sha256=Uk-K-x4MWKzsciRveALA5Fup6zBkin0z4bIedCIqolM,5988
-wbportfolio/viewsets/transactions/trades.py,sha256=-yJ4j8NJTu2VWyhCq5BXGNND_925Ietoxx9k07SLVh0,21634
+wbportfolio/viewsets/transactions/trade_proposals.py,sha256=rCJoJSL11qpjxciX25Q5ZU3ewELyyDBUPXcj4Z88Vdg,6037
+wbportfolio/viewsets/transactions/trades.py,sha256=wCyTTyVKjYuMRsrFcmwD3_yggWxCNm-mdoYzVnhGP0U,21727
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.52.0.dist-info/METADATA,sha256=liB0ZaTtg5EaHhxZmbPz414KkdIs1aTiu2SXYNeGcoE,702
-wbportfolio-1.52.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.52.0.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.52.0.dist-info/RECORD,,
+wbportfolio-1.52.1.dist-info/METADATA,sha256=uubsZOzJQrVgjTFOgljan267Y_G6ufoynoPcmCy19MY,702
+wbportfolio-1.52.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.52.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.52.1.dist-info/RECORD,,