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

wbportfolio/admin/orders/order_proposals.py

@@ -12,3 +12,5 @@ class OrderProposalAdmin(admin.ModelAdmin):
     list_display = ("portfolio", "rebalancing_model", "trade_date", "status")
     autocomplete_fields = ["portfolio", "rebalancing_model"]
     inlines = [OrderTabularInline]
+
+    raw_id_fields = ["portfolio", "creator", "approver"]

wbportfolio/admin/orders/orders.py

@@ -28,3 +28,5 @@ class OrderTabularInline(admin.TabularInline):
         "shares",
         "daily_return",
     ]
+
+    raw_id_fields = ["underlying_instrument"]

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/api_clients/ubs.py

@@ -16,7 +16,6 @@ class UBSNeoAPIClient:
         self,
         initial_jwt_token: str,
         jwt_token_expiry_timestamp: datetime | None = None,
-        default_execution_instruction: str = "MARKET_ON_CLOSE",
     ):
         """
         :param service_account_id: Identifier for your UBS service account (for reference).
@@ -27,7 +26,6 @@ class UBSNeoAPIClient:
         self.jwt_token_expiry = (
             jwt_token_expiry_timestamp if jwt_token_expiry_timestamp else timezone.now() + timedelta(days=1)
         )
-        self.default_execution_instruction = default_execution_instruction
 
     def _is_token_expired(self) -> bool:
         """Check if the current token is expired or near expiry (e.g. within 5 minutes)."""
@@ -62,21 +60,21 @@ class UBSNeoAPIClient:
     def _raise_for_status(self, response):
         try:
             response.raise_for_status()
-        except HTTPError:
+        except HTTPError as e:
             json_response = response.json()
-            raise HTTPError(json_response.get("errors", json_response.get("message")))
+            raise HTTPError(json_response.get("errors", json_response.get("message"))) from e
 
     def get_rebalance_service_status(self) -> dict:
         """Check API connection status."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/status"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_rebalance_status_for_isin(self, isin: str) -> dict:
         """Check certificate accessibility and workflow status for given ISIN."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/status/{isin}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -90,7 +88,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin, test=test)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/submit/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers())
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -99,7 +97,7 @@ class UBSNeoAPIClient:
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/savedraft/{isin}"
         payload = {"items": items}
-        response = requests.post(url, json=payload, headers=self._get_headers())
+        response = requests.post(url, json=payload, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -107,20 +105,32 @@ class UBSNeoAPIClient:
         """Cancel a rebalance request."""
         isin = self._validate_isin(isin)
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/cancel/{isin}"
-        response = requests.delete(url, headers=self._get_headers())
+        response = requests.delete(url, headers=self._get_headers(), timeout=60)
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_current_rebalance_request(self, isin: str) -> dict:
         """Fetch the current rebalance request for a certificate."""
         url = f"{self.BASE_URL}/ged-amc/external/rebalance/v1/currentRebalanceRequest/{isin}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=60)
+        self._raise_for_status(response)
+        return self._get_json(response)
+
+    def get_rebalance_reports(self, isin: str, from_date: date, to_date: date) -> dict:
+        """Fetch the current rebalance request for a certificate."""
+        url = f"{self.BASE_URL}/ged-amc/external/report/v1/rebalance/{isin}"
+        response = requests.get(
+            url,
+            headers=self._get_headers(),
+            timeout=60,
+            params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
+        )
         self._raise_for_status(response)
         return self._get_json(response)
 
     def get_portfolio_at_date(self, isin: str, val_date: date) -> dict:
         url = f"https://neo.ubs.com/api/ged-amc/external/report/v1/valuation/{isin}/{val_date:%Y-%m-%d}"
-        response = requests.get(url, headers=self._get_headers())
+        response = requests.get(url, headers=self._get_headers(), timeout=10)
         self._raise_for_status(response)
         return self._get_json(response)
 
@@ -130,6 +140,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
+            timeout=30,
         )
         self._raise_for_status(response)
         return self._get_json(response)
@@ -140,6 +151,7 @@ class UBSNeoAPIClient:
             url,
             headers=self._get_headers(),
             params={"fromDate": from_date.strftime("%Y-%m-%d"), "toDate": to_date.strftime("%Y-%m-%d")},
+            timeout=30,
         )
         self._raise_for_status(response)
         return self._get_json(response)

wbportfolio/contrib/company_portfolio/configs/display.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
 from django.utils.translation import gettext as _
-from wbcore.contrib.directory.viewsets.display.entries import CompanyModelDisplay as CMD
-from wbcore.contrib.directory.viewsets.display.entries import PersonModelDisplay as PMD
+from wbcore.contrib.directory.viewsets.display.entries import CompanyModelDisplay as BaseCompanyModelDisplay
+from wbcore.contrib.directory.viewsets.display.entries import PersonModelDisplay as BasePersonModelDisplay
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display import (
     Inline,
@@ -62,14 +62,20 @@ AUM_FIELDS = Section(
 )
 
 
-class CompanyModelDisplay(CMD):
+class CompanyModelDisplay(BaseCompanyModelDisplay):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         list_display = super().get_list_display()
         list_display.fields = (
             *list_display.fields[:5],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[5:],
         )
         return list_display
@@ -134,15 +140,21 @@ class CompanyModelDisplay(CMD):
         return instance_display
 
 
-class PersonModelDisplay(PMD):
+class PersonModelDisplay(BasePersonModelDisplay):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         list_display = super().get_list_display()
 
         list_display.fields = (
             *list_display.fields[:7],
-            dp.Field(key="invested_assets_under_management_usd", label="AUM Invested"),
-            dp.Field(key="asset_under_management", label="AUM"),
-            dp.Field(key="potential", label="Potential"),
+            dp.Field(
+                key=None,
+                label=_("AUM"),
+                children=[
+                    dp.Field(key="invested_assets_under_management_usd", label="AUM Invested", width=100),
+                    dp.Field(key="asset_under_management", label="AUM", width=100),
+                    dp.Field(key="potential", label="Potential", width=100),
+                ],
+            ),
             *list_display.fields[7:],
         )
         return list_display

wbportfolio/contrib/company_portfolio/configs/previews.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from wbcore.contrib.directory.viewsets.previews import EntryPreviewConfig
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import buttons as bt
@@ -17,12 +19,10 @@ class CompanyPreviewConfig(EntryPreviewConfig):
             ["asset_under_management", "invested_assets_under_management_usd"],
             [repeat_field(2, "potential")],
         ]
-        try:
+        with suppress(Exception):
             entry = self.view.get_object()
             if entry.profile_image:
                 fields.insert(0, [repeat_field(2, "profile_image")])
-        except Exception:
-            pass
 
         return create_simple_display(fields)
 

wbportfolio/contrib/company_portfolio/filters.py

@@ -1,6 +1,6 @@
 from wbcore import filters
-from wbcore.contrib.directory.filters import CompanyFilter as CF
-from wbcore.contrib.directory.filters import PersonFilter as PF
+from wbcore.contrib.directory.filters import CompanyFilter as BaseCompanyFilter
+from wbcore.contrib.directory.filters import PersonFilter as BasePersonFilter
 from wbcore.contrib.directory.models import Company, Person
 
 
@@ -99,29 +99,29 @@ class EntryPortfolioFilter(filters.FilterSet):
         return queryset
 
 
-class CompanyFilter(CF, EntryPortfolioFilter):
+class CompanyFilter(BaseCompanyFilter, EntryPortfolioFilter):
     @classmethod
     def get_filter_class_for_remote_filter(cls):
         """
         Define which filterset class sender to user for remote filter registration
         """
-        return CF
+        return BaseCompanyFilter
 
-    class Meta(CF.Meta):
+    class Meta(BaseCompanyFilter.Meta):
         fields = {
-            **CF.Meta.fields,
+            **BaseCompanyFilter.Meta.fields,
         }
 
 
-class PersonFilter(PF, EntryPortfolioFilter):
+class PersonFilter(BasePersonFilter, EntryPortfolioFilter):
     @classmethod
     def get_filter_class_for_remote_filter(cls):
         """
         Define which filterset class sender to user for remote filter registration
         """
-        return PF
+        return BasePersonFilter
 
-    class Meta(PF.Meta):
+    class Meta(BasePersonFilter.Meta):
         fields = {
-            **PF.Meta.fields,
+            **BasePersonFilter.Meta.fields,
         }

wbportfolio/contrib/company_portfolio/models.py

@@ -3,6 +3,7 @@ from datetime import date
 from decimal import Decimal
 
 from django.conf import settings
+from django.core.cache import cache
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -16,7 +17,12 @@ from wbportfolio.models import Claim, Product
 
 
 def get_total_assets_under_management(val_date: date) -> Decimal:
-    return sum([product.get_total_aum_usd(val_date) for product in Product.active_objects.all()])
+    cache_key = f"total_assets_under_management:{val_date.isoformat()}"
+    return cache.get_or_set(
+        cache_key,
+        lambda: sum([product.get_total_aum_usd(val_date) for product in Product.active_objects.all()]),
+        60 * 60 * 24,
+    )
 
 
 def get_lost_client_customer_status():
@@ -44,9 +50,8 @@ class Updater:
         self.val_date = val_date
         self.total_assets_under_management = get_total_assets_under_management(val_date)
 
-    def update_company_data(self, company):
+    def update_company_data(self, company_portfolio_data) -> tuple[str, str]:
         # save company portfolio data
-        company_portfolio_data = CompanyPortfolioData.objects.get_or_create(company=company)[0]
         if (
             invested_assets_under_management_usd := company_portfolio_data.get_assets_under_management_usd(
                 self.val_date
@@ -55,19 +60,11 @@ class Updater:
             company_portfolio_data.invested_assets_under_management_usd = invested_assets_under_management_usd
         if (potential := company_portfolio_data.get_potential(self.val_date)) is not None:
             company_portfolio_data.potential = potential
-        company_portfolio_data.save()
 
         # update the company object itself
-        if (tier := company_portfolio_data.get_tiering(self.total_assets_under_management)) is not None:
-            company.tier = tier
-        company.customer_status = company_portfolio_data.get_customer_status()
-        company.save()
-
-    # def update_all_companies(self, val_date: date):
-    #     for company in tqdm(qs, total=qs.count()):
-    #         with suppress(CompanyPortfolioData.DoesNotExist):
-    #             company_portfolio = CompanyPortfolioData.objects.get(company=company)
-    #             company_portfolio.update_data(date.today())
+        tier = company_portfolio_data.get_tiering(self.total_assets_under_management)
+        customer_status = company_portfolio_data.get_customer_status()
+        return customer_status, tier
 
 
 class CompanyPortfolioData(models.Model):
@@ -104,14 +101,6 @@ class CompanyPortfolioData(models.Model):
         verbose_name="AUM",
         help_text="The Assets under Management (AUM) that is managed by this company or this person's primary employer.",
     )
-    invested_assets_under_management_usd = models.DecimalField(
-        max_digits=17,
-        decimal_places=2,
-        null=True,
-        blank=True,
-        help_text="The invested Assets under Management (AUM).",
-        verbose_name="Invested AUM ($)",
-    )
 
     investment_discretion = models.CharField(
         max_length=21,
@@ -120,10 +109,6 @@ class CompanyPortfolioData(models.Model):
         help_text="What discretion this company or this person's primary employer has to invest its assets.",
         verbose_name="Investment Discretion",
     )
-
-    potential = models.DecimalField(
-        decimal_places=2, max_digits=19, null=True, blank=True, help_text=potential_help_text
-    )
     potential_currency = models.ForeignKey(
         to="currency.Currency",
         related_name="wbportfolio_potential_currencies",
@@ -132,6 +117,25 @@ class CompanyPortfolioData(models.Model):
         on_delete=models.PROTECT,
     )
 
+    # Dynamic fields
+    invested_assets_under_management_usd = models.DecimalField(
+        max_digits=17,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text="The invested Assets under Management (AUM).",
+        verbose_name="Invested AUM ($)",
+    )
+
+    potential = models.DecimalField(
+        decimal_places=2, max_digits=19, null=True, blank=True, help_text=potential_help_text
+    )
+
+    def update(self):
+        with suppress(CurrencyFXRates.DoesNotExist):
+            val_date = CurrencyFXRates.objects.latest("date").date
+            self.company.customer_status, self.company.tier = Updater(val_date).update_company_data(self)
+
     def get_assets_under_management_usd(self, val_date: date) -> Decimal:
         return Claim.objects.filter(status=Claim.Status.APPROVED).filter_for_customer(
             self.company
@@ -140,16 +144,17 @@ class CompanyPortfolioData(models.Model):
         )["invested_aum_usd"] or Decimal(0)
 
     def _get_default_potential(self, val_date: date) -> Decimal:
-        with suppress(CurrencyFXRates.DoesNotExist):
-            fx = CurrencyFXRates.objects.get(currency=self.assets_under_management_currency, date=val_date).value
+        if self.assets_under_management:
+            with suppress(CurrencyFXRates.DoesNotExist):
+                fx = CurrencyFXRates.objects.get(currency=self.assets_under_management_currency, date=val_date).value
 
-            aum_usd = self.assets_under_management / fx
-            aum_potential = Decimal(0)
-            for asset_allocation in self.company.asset_allocations.all():
-                aum_potential += aum_usd * asset_allocation.percent * asset_allocation.max_investment
-            invested_aum = self.invested_assets_under_management_usd or Decimal(0.0)
+                aum_usd = self.assets_under_management / fx
+                aum_potential = Decimal(0)
+                for asset_allocation in self.company.asset_allocations.all():
+                    aum_potential += aum_usd * asset_allocation.percent * asset_allocation.max_investment
+                invested_aum = self.invested_assets_under_management_usd or Decimal(0.0)
 
-            return aum_potential - invested_aum
+                return aum_potential - invested_aum
 
     def get_potential(self, val_date: date) -> Decimal:
         if module_path := getattr(settings, "PORTFOLIO_COMPANY_DATA_POTENTIAL_METHOD", None):
@@ -225,11 +230,6 @@ class CompanyPortfolioData(models.Model):
         verbose_name_plural = "Company Portfolio Data"
 
 
-@receiver(post_save, sender="directory.Company")
-def create_company_portfolio_data(sender, instance, created, **kwargs):
-    CompanyPortfolioData.objects.get_or_create(company=instance)
-
-
 class AssetAllocationType(WBModel):
     name = models.CharField(max_length=255)
     default_max_investment = models.DecimalField(
@@ -329,3 +329,33 @@ class GeographicFocus(models.Model):
     @classmethod
     def get_representation_label_key(cls):
         return "{{company}}: {{percent}} {{country}}"
+
+
+@receiver(post_save, sender=AssetAllocation)
+@receiver(post_save, sender=GeographicFocus)
+def post_save_company_data(sender, instance, created, **kwargs):
+    company = instance.company
+    portfolio_data, created = CompanyPortfolioData.objects.get_or_create(company=company)
+    if not created:
+        portfolio_data.update()
+        portfolio_data.save()
+        portfolio_data.company.save()
+
+
+@receiver(post_save, sender="directory.Company")
+def handle_company_portfolio_data(sender, instance, created, **kwargs):
+    # create default asset allocation type (equity 50/50)
+    if not instance.asset_allocations.exists():
+        equity_asset_type = AssetAllocationType.objects.get_or_create(name="Equity")[0]
+        AssetAllocation.objects.create(
+            company=instance,
+            asset_type=equity_asset_type,
+            percent=0.5,
+            max_investment=0.5,
+        )
+    if created:
+        portfolio_data, created = CompanyPortfolioData.objects.get_or_create(company=instance)
+        if not created:
+            portfolio_data.update()
+            portfolio_data.save()
+            portfolio_data.company.save()

wbportfolio/contrib/company_portfolio/scripts.py

@@ -1,8 +1,11 @@
+import logging
 import re
 
 from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.directory.models import Company
 
+logger = logging.getLogger("pms")
+
 
 def get_currency_and_assets_under_management(
     aum_string, currency_mapping, default_currency, multiplier_mapping, default_multiplier
@@ -72,5 +75,7 @@ def assign_aum():
         portfolio_data.assets_under_management_currency = currency
         try:
             portfolio_data.save()
-        except Exception:
-            pass
+        except Exception as e:
+            logger.error(
+                f"while we try to save the customer portfolio aum data for {company}, we encounter the error: {e}"
+            )

wbportfolio/contrib/company_portfolio/serializers.py

@@ -91,7 +91,7 @@ def update_portfolio_data(company_portfolio_data, portfolio_data):
 
     if investment_discretion := portfolio_data["investment_discretion"]:
         company_portfolio_data.investment_discretion = investment_discretion
-
+    company_portfolio_data.update()
     company_portfolio_data.save()
 
 
@@ -103,22 +103,11 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
         read_only=True,
         **_get_assets_under_management_kwargs(field_name="invested_assets_under_management_usd"),
     )
-    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
-    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        default=None,
-        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
-    )
+
     assets_under_management_currency_repr = serializers.CharField(read_only=True, required=False)
-    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+
     potential = serializers.DecimalField(**_get_potential_kwargs())
-    potential_currency = serializers.PrimaryKeyRelatedField(
-        required=False,
-        queryset=Currency.objects.all(),
-        label=CompanyPortfolioData.potential_currency.field.verbose_name,
-    )
-    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+    investment_discretion = serializers.ChoiceField(**_get_investment_discretion_kwargs())
 
     # Not sure why read_only_fields does not work...
     tier = serializers.ChoiceField(
@@ -144,10 +133,6 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
             "asset_under_management",  # TODO: add an s after asset - After removing this field from the base model
             "assets_under_management_currency_repr",
             "invested_assets_under_management_usd",
-            "potential_currency",
-            "_potential_currency",
-            "assets_under_management_currency",
-            "_assets_under_management_currency",
             "investment_discretion",
             "potential",
             "tier",
@@ -156,6 +141,19 @@ class CompanyPortfolioDataMixin(serializers.ModelSerializer):
 
 class CompanyModelSerializer(CompanyPortfolioDataMixin, BaseCompanyModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
 
     def update(self, instance, validated_data):
         validated_data, portfolio_data = get_portfolio_data(validated_data)
@@ -209,6 +207,20 @@ class CompanyModelListSerializer(CompanyPortfolioDataMixin, BaseCompanyModelList
 class PersonModelSerializer(CompanyPortfolioDataMixin, BasePersonModelSerializer):
     SERIALIZER_CLASS_FOR_REMOTE_ADDITIONAL_RESOURCES = BasePersonModelSerializer
 
+    assets_under_management_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        default=None,
+        label=CompanyPortfolioData.assets_under_management_currency.field.verbose_name,
+    )
+    _assets_under_management_currency = CurrencyRepresentationSerializer(source="assets_under_management_currency")
+    potential_currency = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=Currency.objects.all(),
+        label=CompanyPortfolioData.potential_currency.field.verbose_name,
+    )
+    _potential_currency = CurrencyRepresentationSerializer(source="potential_currency")
+
     asset_under_management = serializers.DecimalField(
         **_get_assets_under_management_kwargs(field_name="assets_under_management"),
         read_only=True,
@@ -243,11 +255,9 @@ class PersonModelListSerializer(CompanyPortfolioDataMixin, BasePersonModelListSe
 
 
 class AssetAllocationTypeRepresentationSerializer(serializers.RepresentationSerializer):
-    _detail = serializers.HyperlinkField(reverse_name="company_portfolio:assetallocationtyperepresentation-detail")
-
     class Meta:
         model = AssetAllocationType
-        fields = ("id", "name", "_detail")
+        fields = ("id", "name")
 
 
 class AssetAllocationTypeModelSerializer(serializers.ModelSerializer):

wbportfolio/contrib/company_portfolio/tasks.py

@@ -19,5 +19,16 @@ def update_all_portfolio_data(val_date: date | None = None):
         has_account=Exists(Account.objects.filter(owner=OuterRef("pk"))),
         has_portfolio_data=Exists(CompanyPortfolioData.objects.filter(company=OuterRef("pk"))),
     )
+    company_objs = []
+    portfolio_data_objs = []
     for company in tqdm(qs, total=qs.count()):
-        updater.update_company_data(company)
+        portfolio_data = CompanyPortfolioData.objects.get_or_create(company=company)[0]
+        company.customer_status, company.tier = updater.update_company_data(portfolio_data)
+        portfolio_data_objs.append(portfolio_data)
+        company_objs.append(company)
+    if company_objs:
+        Company.objects.bulk_update(company_objs, ["customer_status", "tier"])
+    if portfolio_data_objs:
+        CompanyPortfolioData.objects.bulk_update(
+            portfolio_data_objs, ["invested_assets_under_management_usd", "potential"]
+        )

wbportfolio/factories/assets.py

@@ -37,7 +37,7 @@ class AssetPositionFactory(factory.django.DjangoModelFactory):
     initial_price = factory.Faker("pydecimal", min_value=100, max_value=120, right_digits=4)
     underlying_quote_price = factory.LazyAttribute(
         lambda o: InstrumentPriceFactory.create(
-            instrument=o.underlying_instrument or o.underlying_quote,
+            instrument=o.underlying_quote or o.underlying_instrument,
             calculated=False,
             date=o.date,
             net_value=o.initial_price,

wbportfolio/factories/orders/order_proposals.py

@@ -1,6 +1,7 @@
 import factory
 from faker import Faker
 from pandas._libs.tslibs.offsets import BDay
+from wbcore.contrib.authentication.factories import UserFactory
 from wbcore.contrib.currency.factories import CurrencyFactory
 
 from wbportfolio.factories import PortfolioFactory
@@ -16,4 +17,5 @@ class OrderProposalFactory(factory.django.DjangoModelFactory):
     trade_date = factory.LazyAttribute(lambda o: (fake.date_object() + BDay(1)).date())
     comment = factory.Faker("paragraph")
     portfolio = factory.LazyAttribute(lambda o: PortfolioFactory.create(currency=CurrencyFactory.create(key="USD")))
-    creator = factory.SubFactory("wbcore.contrib.directory.factories.PersonFactory")
+    creator = factory.LazyAttribute(lambda o: UserFactory.create().profile)
+    approver = factory.LazyAttribute(lambda o: UserFactory.create().profile)

wbportfolio/factories/orders/orders.py

@@ -22,8 +22,13 @@ class OrderFactory(factory.django.DjangoModelFactory):
     @factory.post_generation
     def create_price(self, create, extracted, **kwargs):
         if create:
-            p = InstrumentPriceFactory.create(
-                instrument=self.underlying_instrument, date=self.value_date, calculated=False
-            )
+            if self.price:
+                p = InstrumentPriceFactory.create(
+                    instrument=self.underlying_instrument, date=self.value_date, calculated=False, net_value=self.price
+                )
+            else:
+                p = InstrumentPriceFactory.create(
+                    instrument=self.underlying_instrument, date=self.value_date, calculated=False
+                )
             self.price = p.net_value
             self.save()