wbportfolio 1.55.8__py2.py3-none-any.whl → 1.55.9__py2.py3-none-any.whl

wbportfolio/admin/portfolio.py

@@ -10,10 +10,6 @@ from wbportfolio.models import (
     PortfolioSwingPricing,
 )
 
-from .portfolio_relationships import (
-    PortfolioInstrumentPreferredClassificationThroughInlineModelAdmin,
-)
-
 
 @admin.register(PortfolioBankAccountThroughModel)
 class PortfolioBankAccountThroughModelModelAdmin(admin.ModelAdmin):
@@ -64,6 +60,16 @@ class PortfolioModelAdmin(admin.ModelAdmin):
                 )
             },
         ),
+        (
+            "OMS",
+            {
+                "fields": (
+                    "default_order_proposal_min_order_value",
+                    "default_order_proposal_min_weighting",
+                    "default_order_proposal_total_cash_weight",
+                )
+            },
+        ),
     )
     readonly_fields = ["updated_at"]
     list_display = (
@@ -78,7 +84,7 @@ class PortfolioModelAdmin(admin.ModelAdmin):
     inlines = [
         PortfolioBankAccountThroughModelAdmin,
         InstrumentPortfolioThroughModelAdmin,
-        PortfolioInstrumentPreferredClassificationThroughInlineModelAdmin,
+        # PortfolioInstrumentPreferredClassificationThroughInlineModelAdmin,
         PortfolioPortfolioThroughModelInlineAdmin,
     ]
     raw_id_fields = [

wbportfolio/migrations/0089_orderproposal_min_weighting.py

@@ -0,0 +1,71 @@
+# Generated by Django 5.0.12 on 2025-09-15 13:45
+
+import django.core.validators
+from decimal import Decimal
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbportfolio', '0088_orderproposal_total_effective_portfolio_contribution'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderproposal',
+            name='min_weighting',
+            field=models.DecimalField(decimal_places=8, default=Decimal('0'), help_text='The minimum weight allowed for this order proposal ', max_digits=9, verbose_name='Minimum Weight'),
+        ),
+        migrations.AddField(
+            model_name='portfolio',
+            name='default_order_proposal_min_order_value',
+            field=models.IntegerField(default=0, verbose_name='Default Order Proposal Minimum Order Value'),
+        ),
+        migrations.AddField(
+            model_name='portfolio',
+            name='default_order_proposal_min_weighting',
+            field=models.DecimalField(decimal_places=8, default=Decimal('0'), max_digits=9,
+                                      verbose_name='Default Order Proposal Minimum Weight'),
+        ),
+        migrations.AddField(
+            model_name='portfolio',
+            name='default_order_proposal_total_cash_weight',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0'), max_digits=5,
+                                      verbose_name='Default Order Proposal Total Cash Weight'),
+        ),
+        migrations.AlterField(
+            model_name='orderproposal',
+            name='min_weighting',
+            field=models.DecimalField(decimal_places=8, default=Decimal('0'),
+                                      help_text='The minimum weight allowed for this order proposal ', max_digits=9,
+                                      validators=[django.core.validators.MinValueValidator(Decimal('0')),
+                                                  django.core.validators.MaxValueValidator(Decimal('1'))],
+                                      verbose_name='Minimum Weight'),
+        ),
+        migrations.AlterField(
+            model_name='orderproposal',
+            name='total_cash_weight',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0'),
+                                      help_text='The desired percentage for the cash component. The remaining percentage (100% minus this value) will be allocated to total target weighting. Default is 0%.',
+                                      max_digits=5, validators=[django.core.validators.MinValueValidator(Decimal('0')),
+                                                                django.core.validators.MaxValueValidator(Decimal('1'))],
+                                      verbose_name='Total Cash Weight'),
+        ),
+        migrations.AlterField(
+            model_name='portfolio',
+            name='default_order_proposal_min_weighting',
+            field=models.DecimalField(decimal_places=8, default=Decimal('0'), max_digits=9,
+                                      validators=[django.core.validators.MinValueValidator(Decimal('0')),
+                                                  django.core.validators.MaxValueValidator(Decimal('1'))],
+                                      verbose_name='Default Order Proposal Minimum Weight'),
+        ),
+        migrations.AlterField(
+            model_name='portfolio',
+            name='default_order_proposal_total_cash_weight',
+            field=models.DecimalField(decimal_places=4, default=Decimal('0'), max_digits=5,
+                                      validators=[django.core.validators.MinValueValidator(Decimal('0')),
+                                                  django.core.validators.MaxValueValidator(Decimal('1'))],
+                                      verbose_name='Default Order Proposal Total Cash Weight'),
+        ),
+    ]

wbportfolio/models/orders/order_proposals.py

@@ -7,6 +7,7 @@ from typing import Any, TypeVar
 
 from celery import shared_task
 from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import DatabaseError, models
 from django.db.models import (
     F,
@@ -96,12 +97,22 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
     min_order_value = models.IntegerField(
         default=0, verbose_name="Minimum Order Value", help_text="Minimum Order Value in the Portfolio currency"
     )
+    min_weighting = models.DecimalField(
+        max_digits=9,
+        decimal_places=Order.ORDER_WEIGHTING_PRECISION,
+        default=Decimal(0),
+        help_text="The minimum weight allowed for this order proposal ",
+        verbose_name="Minimum Weight",
+        validators=[MinValueValidator(Decimal("0")), MaxValueValidator(Decimal("1"))],
+    )
+
     total_cash_weight = models.DecimalField(
         default=Decimal("0"),
         decimal_places=4,
         max_digits=5,
         verbose_name="Total Cash Weight",
         help_text="The desired percentage for the cash component. The remaining percentage (100% minus this value) will be allocated to total target weighting. Default is 0%.",
+        validators=[MinValueValidator(Decimal("0")), MaxValueValidator(Decimal("1"))],
     )
     total_effective_portfolio_contribution = models.DecimalField(
         default=Decimal("1"),
@@ -136,6 +147,13 @@ class OrderProposal(CloneMixin, RiskCheckMixin, WBModel):
         ]
 
     def save(self, *args, **kwargs):
+        # if the order proposal is created, we default these fields with the portfolio default value for automatic value assignement
+        if not self.id and not self.min_order_value:
+            self.min_order_value = self.portfolio.default_order_proposal_min_order_value
+        if not self.id and not self.min_weighting:
+            self.min_weighting = self.portfolio.default_order_proposal_min_weighting
+        if not self.id and not self.total_cash_weight:
+            self.total_cash_weight = self.portfolio.default_order_proposal_total_cash_weight
         # if a order proposal is created before the existing earliest order proposal, we automatically shift the linked instruments inception date to allow automatic NAV computation since the new inception date
         if not self.portfolio.order_proposals.filter(trade_date__lt=self.trade_date).exists():
             # we need to set the inception date as the first order proposal trade date (and thus, the first position date). We expect a NAV at 100 then

wbportfolio/models/orders/orders.py

@@ -87,6 +87,12 @@ class Order(TransactionMixin, ImportMixin, OrderedModel, models.Model):
                 self.shares = shares
                 if portfolio_total_asset_value:
                     self.weighting = self.shares * self.price * self.currency_fx_rate / portfolio_total_asset_value
+        if abs(self.weighting) < self.order_proposal.min_weighting:
+            warnings.append(
+                f"Weighting for order {self.underlying_instrument.computed_str} ({self.weighting}) is bellow the allowed Minimum Weighting ({self.order_proposal.min_weighting})"
+            )
+            self.shares = Decimal("0")
+            self.weighting = Decimal("0")
         if self.shares and abs(self.total_value_fx_portfolio) < self.order_proposal.min_order_value:
             warnings.append(
                 f"Total Value for order {self.underlying_instrument.computed_str} ({self.total_value_fx_portfolio}) is bellow the allowed Minimum Order Value ({self.order_proposal.min_order_value})"

wbportfolio/models/portfolio.py

@@ -9,6 +9,7 @@ import pandas as pd
 from celery import shared_task
 from django.contrib.postgres.fields import DateRangeField
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Exists, F, OuterRef, Q, QuerySet, Sum
 from django.db.models.signals import post_save
@@ -233,6 +234,25 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         blank=True,
     )
 
+    # OMS default parameters. Used to seed order proposal default value upon creation
+    default_order_proposal_min_order_value = models.IntegerField(
+        default=0, verbose_name="Default Order Proposal Minimum Order Value"
+    )
+    default_order_proposal_min_weighting = models.DecimalField(
+        max_digits=9,
+        decimal_places=8,
+        default=Decimal(0),
+        verbose_name="Default Order Proposal Minimum Weight",
+        validators=[MinValueValidator(Decimal("0")), MaxValueValidator(Decimal("1"))],
+    )
+    default_order_proposal_total_cash_weight = models.DecimalField(
+        default=Decimal("0"),
+        decimal_places=4,
+        max_digits=5,
+        verbose_name="Default Order Proposal Total Cash Weight",
+        validators=[MinValueValidator(Decimal("0")), MaxValueValidator(Decimal("1"))],
+    )
+
     objects = DefaultPortfolioManager()
     tracked_objects = ActiveTrackedPortfolioManager()
 

wbportfolio/serializers/orders/order_proposals.py

@@ -90,6 +90,7 @@ class OrderProposalModelSerializer(wb_serializers.ModelSerializer):
             "comment",
             "status",
             "min_order_value",
+            "min_weighting",
             "_rebalancing_model",
             "rebalancing_model",
             "target_portfolio",

wbportfolio/tasks.py

@@ -1,12 +1,12 @@
 from contextlib import suppress
 from datetime import date, timedelta
 
+from celery import shared_task
 from django.db.models import ProtectedError, Q
+from tqdm import tqdm
+from wbfdm.models import Controversy, Instrument
 
-from wbportfolio.models import Portfolio, Trade
-from wbportfolio.models.products import Product
-
-from .fdm.tasks import *  # noqa
+from wbportfolio.models import AssetPosition, Portfolio, Product, Trade
 
 
 @shared_task(queue="portfolio")
@@ -49,3 +49,41 @@ def update_preferred_classification_per_instrument_and_portfolio_as_task():
 # - propagate (or update) t-2 asset positions into t-1
 # - Synchronize wbportfolio at t-1
 # - Compute Instrument Price estimate at t-1
+
+
+@shared_task(queue="portfolio")
+def synchronize_portfolio_controversies():
+    active_portfolios = Portfolio.objects.filter_active_and_tracked()
+    qs = (
+        AssetPosition.objects.filter(portfolio__in=active_portfolios)
+        .values("underlying_instrument")
+        .distinct("underlying_instrument")
+    )
+    objs = {}
+    securities = Instrument.objects.filter(id__in=qs.values("underlying_instrument"))
+    securities_mapping = {security.id: security.get_root() for security in securities}
+    for controversy in securities.dl.esg_controversies():
+        instrument = securities_mapping[controversy["instrument_id"]]
+        obj = Controversy.dict_to_model(controversy, instrument)
+        objs[obj.external_id] = obj
+
+    Controversy.objects.bulk_create(
+        objs.values(),
+        update_fields=[
+            "instrument",
+            "headline",
+            "description",
+            "source",
+            "direct_involvement",
+            "company_response",
+            "review",
+            "initiated",
+            "flag",
+            "status",
+            "type",
+            "severity",
+        ],
+        unique_fields=["external_id"],
+        update_conflicts=True,
+        batch_size=10000,
+    )

wbportfolio/tests/models/orders/test_order_proposals.py

@@ -695,6 +695,38 @@ class TestOrderProposal:
         assert order.shares == Decimal(0)
         assert order.weighting == Decimal(0)
 
+    def test_order_submit_bellow_minimum_weighting(self, order_factory, order_proposal):
+        o1 = order_factory.create(order_proposal=order_proposal, price=Decimal(1), weighting=Decimal("0.8"))
+        o2 = order_factory.create(order_proposal=order_proposal, price=Decimal(1), weighting=Decimal("0.2"))
+        order_proposal.submit()
+        order_proposal.save()
+
+        o1.refresh_from_db()
+        o2.refresh_from_db()
+        assert o1.weighting == Decimal("0.8")
+        assert o2.weighting == Decimal("0.2")
+
+        order_proposal.min_weighting = Decimal("0.21")
+        order_proposal.backtodraft()
+        order_proposal.submit()
+        order_proposal.save()
+
+        o1.refresh_from_db()
+        o2.refresh_from_db()
+        assert o1.weighting == Decimal("0.8")
+        assert o2.weighting == Decimal("0")
+
+        order_proposal.approve()
+        order_proposal.apply()
+        order_proposal.save()
+
+        assert order_proposal.portfolio.assets.get(
+            date=order_proposal.trade_date, underlying_quote=o1.underlying_instrument
+        ).weighting == Decimal("0.8")
+        assert order_proposal.portfolio.assets.get(
+            date=order_proposal.trade_date, underlying_quote=order_proposal.cash_component
+        ).weighting == Decimal("0.2")
+
     def test_reset_order_use_desired_target_weight(self, order_proposal, order_factory):
         order1 = order_factory.create(
             order_proposal=order_proposal, weighting=Decimal("0.5"), desired_target_weight=Decimal("0.7")

wbportfolio/viewsets/orders/configs/displays/order_proposals.py

@@ -132,12 +132,12 @@ class OrderProposalDisplayConfig(DisplayViewConfig):
                     layouts={
                         default(): Layout(
                             grid_template_areas=[
-                                ["status", "status", "status"],
-                                ["trade_date", "total_cash_weight", "min_order_value"],
-                                ["rebalancing_model", "target_portfolio", "target_portfolio"]
+                                ["status", "status", "status", "status"],
+                                ["trade_date", "total_cash_weight", "min_order_value", "min_weighting"],
+                                ["rebalancing_model", "rebalancing_model", "target_portfolio", "target_portfolio"]
                                 if self.view.new_mode
-                                else ["rebalancing_model", "creator", "approver"],
-                                ["comment", "comment", "comment"],
+                                else ["rebalancing_model", "rebalancing_model", "creator", "approver"],
+                                ["comment", "comment", "comment", "comment"],
                             ],
                         ),
                     },

{wbportfolio-1.55.8.dist-info → wbportfolio-1.55.9.dist-info}/METADATA

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

{wbportfolio-1.55.8.dist-info → wbportfolio-1.55.9.dist-info}/RECORD

@@ -4,14 +4,14 @@ wbportfolio/constants.py,sha256=86bfJ-xAyJQGv8DDxhVP_BM7Jr_lxQMhe4SkrxpfN_c,119
 wbportfolio/dynamic_preferences_registry.py,sha256=SV-4JWBZBYhXt5cNMglx-yRJhxpejP_jo157ghjq2q0,2294
 wbportfolio/permissions.py,sha256=F147DXfitbw6IdMQGEFfymCJkiG5YGkWKsLdVVliPyw,320
 wbportfolio/preferences.py,sha256=JpowIFTrnjfomogJNrYmmfv7V35bRZNNGL_zooKzEhc,465
-wbportfolio/tasks.py,sha256=619LS4AN1-5RqdtwwLODdXA-IJKs5OA93JyLEnIJy4g,1969
+wbportfolio/tasks.py,sha256=fjmG0FrCkwoHKDk7re6-vjKpI0q_HFtYLF8cddZHvnw,3243
 wbportfolio/urls.py,sha256=PE9UwW2RR8FEUnPc3foaDIW7T49vTwO1TyBPYaSorw0,10539
 wbportfolio/utils.py,sha256=QZ4t0j2NwKYmgWJM77yvXSp-8wVcZmFvNi5_v7YA3ac,750
 wbportfolio/admin/__init__.py,sha256=oTmHrq_4H4OyEna3R_3tIh7pyCyNYVsMDD8y06IYMfQ,675
 wbportfolio/admin/asset.py,sha256=Nukw4axCnctQFlAtPkPJyalEga7RtTp7jr138MOdWSM,1254
 wbportfolio/admin/custodians.py,sha256=rJ9wFdiFM5t3WrmAfNXWzjxDAWrbnlSstfNjQxSmTNE,332
 wbportfolio/admin/indexes.py,sha256=XPiVGBRDD7SV7YvSDv9pAo513IjIbEOBS_pcvVP_UfQ,440
-wbportfolio/admin/portfolio.py,sha256=ihAYlvx7vvRbFMIKobo-VokYfvlTowGDzcSmlXHCJDY,3873
+wbportfolio/admin/portfolio.py,sha256=OiUFpxqK7V0iL8dO6LxE_LOepvr20b2CIDRiKPkdEns,4063
 wbportfolio/admin/portfolio_relationships.py,sha256=mLRQUvezcUQfEls0p6pe0P1qVf335zD5pX4eRVf119M,711
 wbportfolio/admin/product_groups.py,sha256=0iXpoj-gGwLeF6BmCohX7d5qrVhCgIxNWUQmJcM67q0,1391
 wbportfolio/admin/products.py,sha256=vEtUpSlnCLLCs4SXkI5UFO7iPsXhRUk7PsNvfD7FS40,2550
@@ -79,8 +79,6 @@ wbportfolio/factories/trades.py,sha256=ZHfj20KjeTu57sNaZzfSw2JqCoI9q4BjfPp5qRMVs
 wbportfolio/factories/orders/__init__.py,sha256=QG7on_F9GiuJgvGbM0BNDVdfGwwBz_WGbmCFNbKPZzc,83
 wbportfolio/factories/orders/order_proposals.py,sha256=3QGG6eI2sWYGJenn17gz37A2PJgjZLlPqAsqci1lFXI,702
 wbportfolio/factories/orders/orders.py,sha256=tTw2U-xvUsFpG4zad3KCHZPQx1FVg-zPjwEN73XEOjg,907
-wbportfolio/fdm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/fdm/tasks.py,sha256=v7UmrQhHAgJOQ3AC3VRvJ4YIKveqsqyWnvM33UQOUDI,1367
 wbportfolio/filters/__init__.py,sha256=m44CdyYMtku8rMGyiX8KSmMdvyqaElKW4UMkEqOC1VM,1374
 wbportfolio/filters/assets.py,sha256=rvBNtQ8OcvYXSmaVdgjH7IITvaBZ558Y9sCj0B_WDpw,18866
 wbportfolio/filters/assets_and_net_new_money_progression.py,sha256=IYl_qMFO9QKhXhCTtz2JrOjlAKdEkykNlu4DO_H7HkQ,1403
@@ -271,6 +269,7 @@ wbportfolio/migrations/0085_order_desired_target_weight.py,sha256=L8p5t4PqjWIwqw
 wbportfolio/migrations/0086_orderproposal_total_cash_weight.py,sha256=IE65OYYBOSQjj6znl9jmsMalxDmKdnHV1DbVz_ZX_M4,689
 wbportfolio/migrations/0087_product_order_routing_custodian_adapter.py,sha256=4OHTjdXNwJ-My8EgUGYWM_vRBccjYgghjN4fLV0n1yQ,4564
 wbportfolio/migrations/0088_orderproposal_total_effective_portfolio_contribution.py,sha256=6Q41GSbWg_L8r6FUcQ9MrdpRazOdUlc7tD8_bmg8a3Y,521
+wbportfolio/migrations/0089_orderproposal_min_weighting.py,sha256=DgJdIRka1eZSrEZqkUBHiVPpCfOvChWPrWdx-ZExO6Q,3906
 wbportfolio/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/__init__.py,sha256=qU4e7HKyh8NL_0Mg92PcbHTewCv7Ya2gei1DMGe1LWE,980
 wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQtbHVo,10272
@@ -279,7 +278,7 @@ wbportfolio/models/builder.py,sha256=txZE_gEDgkPgSxSF0AlvZiRyhRQixD4Ame0wEF6Fjoo
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
 wbportfolio/models/indexes.py,sha256=gvW4K9U9Bj8BmVCqFYdWiXvDWhjHINRON8XhNsZUiQY,639
-wbportfolio/models/portfolio.py,sha256=fuYvHx4D3GqHjO0cBqe09M-t-t6jUzuOMh2ikTbykMo,54640
+wbportfolio/models/portfolio.py,sha256=zgismDA7dXSvX7b_1h9jOdYeilg9qv5mI0mQcy7aRW0,55547
 wbportfolio/models/portfolio_cash_flow.py,sha256=uElG7IJUBY8qvtrXftOoskX6EA-dKgEG1JJdvHeWV7g,7336
 wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAudKBEzqPsO715w52U,1498
 wbportfolio/models/portfolio_relationship.py,sha256=ZGECiPZiLdlk4uSamOrEfuzO0hduK6OMKJLUSnh5_kc,5190
@@ -299,8 +298,8 @@ wbportfolio/models/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 wbportfolio/models/mixins/instruments.py,sha256=SuMPquQ93D4pZMK-4hQbJtV58_NOyf3wVOctQq7LNXQ,7054
 wbportfolio/models/mixins/liquidity_stress_test.py,sha256=iQVzT3QM7VtHnqfj9gT6KUIe4wC4MJXery-AXJHUYns,58820
 wbportfolio/models/orders/__init__.py,sha256=EH9UacGR3npBMje5FGTeLOh1xqFBh9kc24WbGmBIA3g,69
-wbportfolio/models/orders/order_proposals.py,sha256=1ce97DXjzZ4MsUAgA_GlnofnztAf0Y6zR1etZs-LrFI,57120
-wbportfolio/models/orders/orders.py,sha256=kiVmVeW2D1bAuT983nSeIug6uoZ78IZovuAgls-CO8w,10150
+wbportfolio/models/orders/order_proposals.py,sha256=u-RNtSw-psb8BGeE7Lkbet5UQnCL_hacyhX3he0PxZQ,58191
+wbportfolio/models/orders/orders.py,sha256=OpUbKzY2g6XA3n8hyU-FTauEQE5UKLEdOPQkdi4rktU,10520
 wbportfolio/models/orders/routing.py,sha256=OpeP-rfMm1UN7a3vbNxBEQxqtGfE57AeGWnbTZa1fRQ,2223
 wbportfolio/models/reconciliations/__init__.py,sha256=MXH5fZIPGDRBgJkO6wVu_NLRs8fkP1im7G6d-h36lQY,127
 wbportfolio/models/reconciliations/account_reconciliation_lines.py,sha256=QP6M7hMcyFbuXBa55Y-azui6Dl_WgbzMntEqWzQkbfM,7394
@@ -375,7 +374,7 @@ wbportfolio/serializers/registers.py,sha256=zhdKH_mHEBE0VOhm6xpY54bTMtcSaY5BskEa
 wbportfolio/serializers/roles.py,sha256=T-9NqTldpvaEMFy-Bib5MB6MeboygEOqcMP61mzzD3Q,2146
 wbportfolio/serializers/signals.py,sha256=hD6R4oFtwhvnsJPteytPKy2JwEelmxrapdfoLSnluaE,7053
 wbportfolio/serializers/orders/__init__.py,sha256=PKJRksA1pWsh8nVfGASoB0m3LyUzVRnq1m9VPp90J7k,271
-wbportfolio/serializers/orders/order_proposals.py,sha256=wIxnTY35dn7gH1kj9wGHnl2lOrR6ikRdqxXrSf85tT0,4762
+wbportfolio/serializers/orders/order_proposals.py,sha256=Jxea2-Ze8Id5URv4UV-vTfCQGt11tjR27vRRfCs0gXU,4791
 wbportfolio/serializers/orders/orders.py,sha256=7zIl5lwt7RatSVcrmNmLpWX2r2VkND33HQOUkryGjYo,7582
 wbportfolio/serializers/transactions/__init__.py,sha256=-7Pan4n7YI3iDvGXff6okzk4ycEURRxp5n_SHCY_g_I,493
 wbportfolio/serializers/transactions/claim.py,sha256=kC4E2RZRrpd9i8tGfoiV-gpWDk3ikR5F1Wf0v_IGIvw,11599
@@ -420,7 +419,7 @@ wbportfolio/tests/models/test_roles.py,sha256=4Cn7WyrA2ztJNeWLk5cy9kYo5XLWMbFSvo
 wbportfolio/tests/models/test_splits.py,sha256=ytKcHsI_90kj1L4s8It-KEcc24rkDcElxwQ8q0QxEvk,9689
 wbportfolio/tests/models/utils.py,sha256=ORNJq6NMo1Za22jGZXfTfKeNEnTRlfEt_8SJ6xLaQWg,325
 wbportfolio/tests/models/orders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/tests/models/orders/test_order_proposals.py,sha256=WxZgoN0J7rF5TVa_hmXZdYnUXtrU0eH-U9CW1NWNBIM,34123
+wbportfolio/tests/models/orders/test_order_proposals.py,sha256=N_l7wgFgd-1uFCE6ZbWCzXEOmOgWaiee-w1VCqKxLnw,35401
 wbportfolio/tests/models/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/tests/models/transactions/test_claim.py,sha256=NG3BKB-FVcIDgHSJHCjImxgMM3ISVUMl24xUPmEcPec,5570
 wbportfolio/tests/models/transactions/test_fees.py,sha256=tAp18x2wCNQr11LUnLtHNbBDbbX0v1DZnmW7i-cEi5Q,2423
@@ -555,7 +554,7 @@ wbportfolio/viewsets/orders/configs/buttons/__init__.py,sha256=EHzNmAfa0UQFITEF-
 wbportfolio/viewsets/orders/configs/buttons/order_proposals.py,sha256=1BPkIYv0-K2DDGa4Gua2_Pxsx7fNurTZ2tYNdL66On0,6495
 wbportfolio/viewsets/orders/configs/buttons/orders.py,sha256=GDO4Y33wkjhDxzpf7B1d_rKzAixegLv5rHam1DV3WkM,290
 wbportfolio/viewsets/orders/configs/displays/__init__.py,sha256=__YJBbz_ZnKpE8WMMDR2PC9Nng-EVlRpGTEQucdrhRA,108
-wbportfolio/viewsets/orders/configs/displays/order_proposals.py,sha256=1HnQGR8WFSWHfugEhbTrCaxZ5pabzH8iaLKVBb_Fowc,7282
+wbportfolio/viewsets/orders/configs/displays/order_proposals.py,sha256=zLoLEw4N1i_LD0e3hJnxzO8ORN2byFZoCxWnAz8DBx0,7362
 wbportfolio/viewsets/orders/configs/displays/orders.py,sha256=R1oaDTGosL430xnYZpJz7ihnCOCO6eAFhDQz-wGYT24,7611
 wbportfolio/viewsets/orders/configs/endpoints/__init__.py,sha256=IB8GEadiEtBDclhkgpcJGXWfCF6qRK_42hxJ4pcdZDU,148
 wbportfolio/viewsets/orders/configs/endpoints/order_proposals.py,sha256=fY3y2YWR9nY-KE8k078NszDsnwOgqOIjHUgLvQjDivU,822
@@ -567,7 +566,7 @@ wbportfolio/viewsets/transactions/claim.py,sha256=Pb1WftoO-w-ZSTbLRhmQubhy7hgd68
 wbportfolio/viewsets/transactions/fees.py,sha256=WT2bWWfgozz4_rpyTKX7dgBBTXD-gu0nlsd2Nk2Zh1Q,7028
 wbportfolio/viewsets/transactions/mixins.py,sha256=WipvJoi5hylkpD0y9VATe30WAcwIHUIroVkK10FYw7k,636
 wbportfolio/viewsets/transactions/trades.py,sha256=xBgOGaJ8aEg-2RxEJ4FDaBs4SGwuLasun3nhpis0WQY,12363
-wbportfolio-1.55.8.dist-info/METADATA,sha256=JBgCNHH4seDymSNEd6z5o49vq2VI66Pg0v3tLoxJ41w,751
-wbportfolio-1.55.8.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.55.8.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.55.8.dist-info/RECORD,,
+wbportfolio-1.55.9.dist-info/METADATA,sha256=n1wrT55caQrYOtnWIcc_-bZdvHAjIDCO0rDr92VeroM,751
+wbportfolio-1.55.9.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.55.9.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.55.9.dist-info/RECORD,,

wbportfolio/fdm/tasks.py

@@ -1,42 +0,0 @@
-from celery import shared_task
-from wbfdm.models import Controversy, Instrument
-
-from wbportfolio.models import AssetPosition, Portfolio
-
-
-@shared_task(queue="portfolio")
-def synchronize_portfolio_controversies():
-    active_portfolios = Portfolio.objects.filter_active_and_tracked()
-    qs = (
-        AssetPosition.objects.filter(portfolio__in=active_portfolios)
-        .values("underlying_instrument")
-        .distinct("underlying_instrument")
-    )
-    objs = {}
-    securities = Instrument.objects.filter(id__in=qs.values("underlying_instrument"))
-    securities_mapping = {security.id: security.get_root() for security in securities}
-    for controversy in securities.dl.esg_controversies():
-        instrument = securities_mapping[controversy["instrument_id"]]
-        obj = Controversy.dict_to_model(controversy, instrument)
-        objs[obj.external_id] = obj
-
-    Controversy.objects.bulk_create(
-        objs.values(),
-        update_fields=[
-            "instrument",
-            "headline",
-            "description",
-            "source",
-            "direct_involvement",
-            "company_response",
-            "review",
-            "initiated",
-            "flag",
-            "status",
-            "type",
-            "severity",
-        ],
-        unique_fields=["external_id"],
-        update_conflicts=True,
-        batch_size=10000,
-    )