wbportfolio 1.52.1__py2.py3-none-any.whl → 1.52.2rc0__py2.py3-none-any.whl

wbportfolio/models/transactions/transactions.py

@@ -1,105 +1,78 @@
 from decimal import Decimal
 
-from django.apps import apps
 from django.db import models
-from django.dispatch import receiver
-from wbcore.contrib.io.mixins import ImportMixin
-from wbcore.signals import pre_merge
-from wbfdm.models.instruments.instruments import Instrument
-from wbfdm.signals import add_instrument_to_investable_universe
 
 
-class ShareMixin(models.Model):
-    shares = models.DecimalField(
-        max_digits=15,
-        decimal_places=4,
-        default=Decimal("0.0"),
-        help_text="The number of shares that were traded.",
-        verbose_name="Shares",
-    )
-    price = models.DecimalField(
-        max_digits=16,
-        decimal_places=4,
-        default=Decimal(
-            "0.0"
-        ),  # we shouldn't default to anything but we have trade with price=None. Needs to be handled carefully
-        help_text="The price per share.",
-        verbose_name="Price",
-    )
-
-    price_gross = models.DecimalField(
-        max_digits=16,
-        decimal_places=4,
-        help_text="The gross price per share.",
-        verbose_name="Gross Price",
+class TransactionMixin(models.Model):
+    value_date = models.DateField(
+        verbose_name="Value Date",
+        help_text="The date that this transaction was valuated/paid.",
     )
-
-    def save(
-        self,
-        *args,
-        factor: Decimal = Decimal("1.0"),
-        **kwargs,
-    ):
-        if self.price_gross is None:
-            self.price_gross = self.price
-
-        self.total_value = self.price * self.shares * factor
-        self.total_value_gross = self.price_gross * self.shares * factor
-        super().save(*args, **kwargs)
-
-    class Meta:
-        abstract = True
-
-
-class Transaction(ImportMixin, models.Model):
-    class Type(models.TextChoices):
-        # Standart Asset Types
-        TRADE = "Trade", "Trade"
-        DIVIDEND_TRANSACTION = "DividendTransaction", "Dividend Transaction"
-        EXPIRY = "Expiry", "Expiry"
-        FEES = "Fees", "Fees"
-
-    transaction_type = models.CharField(max_length=255, verbose_name="Type", choices=Type.choices, default=Type.TRADE)
-
     portfolio = models.ForeignKey(
-        "wbportfolio.Portfolio", related_name="transactions", on_delete=models.PROTECT, verbose_name="Portfolio"
+        "wbportfolio.Portfolio", related_name="%(class)ss", on_delete=models.PROTECT, verbose_name="Portfolio"
     )
-
     underlying_instrument = models.ForeignKey(
         to="wbfdm.Instrument",
-        related_name="transactions",
+        related_name="%(class)ss",
         limit_choices_to=models.Q(children__isnull=True),
         on_delete=models.PROTECT,
         verbose_name="Underlying Instrument",
         help_text="The instrument that is this transaction.",
     )
-
-    transaction_date = models.DateField(
-        verbose_name="Trade Date",
-        help_text="The date that this transaction was traded.",
-    )
-    book_date = models.DateField(
-        verbose_name="Trade Date",
-        help_text="The date that this transaction was booked.",
-    )
-    value_date = models.DateField(
-        verbose_name="Value Date",
-        help_text="The date that this transaction was valuated.",
-    )
-
     currency = models.ForeignKey(
         "currency.Currency",
-        related_name="transactions",
+        related_name="%(class)ss",
         on_delete=models.PROTECT,
         verbose_name="Currency",
     )
     currency_fx_rate = models.DecimalField(
         max_digits=14, decimal_places=8, default=Decimal(1.0), verbose_name="FOREX rate"
     )
-    total_value = models.DecimalField(max_digits=20, decimal_places=4, verbose_name="Total Value")
-    total_value_gross = models.DecimalField(max_digits=20, decimal_places=4, verbose_name="Total Value Gross")
+    price = models.DecimalField(
+        max_digits=16,
+        decimal_places=4,
+        help_text="The price per share.",
+        verbose_name="Price",
+    )
+    price_gross = models.DecimalField(
+        max_digits=16,
+        decimal_places=4,
+        help_text="The gross price per share.",
+        verbose_name="Gross Price",
+    )
+    shares = models.DecimalField(
+        max_digits=15,
+        decimal_places=4,
+        default=Decimal("0.0"),
+        help_text="The number of shares held at record date, used to calculate the dividend",
+        verbose_name="Shares / Quantity",
+    )
+    fees = models.GeneratedField(
+        expression=models.F("price_gross") - models.F("price"),
+        output_field=models.DecimalField(
+            max_digits=20,
+            decimal_places=4,
+        ),
+        db_persist=True,
+    )
+    total_value_gross = models.GeneratedField(
+        expression=models.F("price_gross") * models.F("shares"),
+        output_field=models.DecimalField(
+            max_digits=20,
+            decimal_places=4,
+        ),
+        db_persist=True,
+    )
+    total_value = models.GeneratedField(
+        expression=models.F("price") * models.F("shares"),
+        output_field=models.DecimalField(
+            max_digits=20,
+            decimal_places=4,
+        ),
+        db_persist=True,
+    )
     total_value_fx_portfolio = models.GeneratedField(
-        expression=models.F("currency_fx_rate") * models.F("total_value"),
+        expression=models.F("currency_fx_rate") * models.F("price") * models.F("shares"),
         output_field=models.DecimalField(
             max_digits=20,
             decimal_places=4,
@@ -107,99 +80,30 @@ class Transaction(ImportMixin, models.Model):
         db_persist=True,
     )
     total_value_gross_fx_portfolio = models.GeneratedField(
-        expression=models.F("currency_fx_rate") * models.F("total_value_gross"),
+        expression=models.F("currency_fx_rate") * models.F("price_gross") * models.F("shares"),
         output_field=models.DecimalField(
             max_digits=20,
             decimal_places=4,
         ),
         db_persist=True,
     )
-    external_id = models.CharField(
-        max_length=255,
-        null=True,
-        blank=True,
-        help_text="An external identifier that was supplied.",
-        verbose_name="External Identifier",
-    )
+
     comment = models.TextField(default="", verbose_name="Comment", blank=True)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
 
     def save(self, *args, **kwargs):
-        if not self.value_date:
-            self.value_date = self.transaction_date
-        if not self.book_date:
-            self.book_date = self.transaction_date
-
         if not getattr(self, "currency", None) and self.underlying_instrument:
             self.currency = self.underlying_instrument.currency
         if self.currency_fx_rate is None:
             self.currency_fx_rate = self.underlying_instrument.currency.convert(
                 self.value_date, self.portfolio.currency, exact_lookup=True
             )
-        if not self.transaction_type:
-            self.transaction_type = self.__class__.__name__
-
-        if self.total_value_gross is None:
-            self.total_value_gross = self.total_value
-
+        if self.price is not None and self.price_gross is None:
+            self.price_gross = self.price
+        elif self.price_gross is not None and self.price is None:
+            self.price = self.price_gross
         super().save(*args, **kwargs)
 
-    def __str__(self):
-        return f"{self.total_value} - {self.transaction_date:%d.%m.%Y} : {str(self.underlying_instrument)} (in {str(self.portfolio)})"
-
-    def get_casted_model(self):
-        return apps.get_model(app_label="wbportfolio", model_name=self.transaction_type)
-
-    def get_casted_transaction(self) -> models.Model:
-        """
-        Cast the asset into its child representative
-        """
-        model = self.get_casted_model()
-        return model.objects.get(pk=self.pk)
-
     class Meta:
-        verbose_name = "Transaction"
-        verbose_name_plural = "Transactions"
-        indexes = [
-            models.Index(fields=["underlying_instrument", "transaction_date"]),
-            # models.Index(fields=["date", "underlying_instrument"]),
-        ]
-
-    objects = models.Manager()
-
-    @classmethod
-    def get_representation_value_key(cls):
-        return "id"
-
-    @classmethod
-    def get_representation_label_key(cls):
-        return "{{total_value}}{{transaction_date}}"
-
-    @classmethod
-    def get_endpoint_basename(cls):
-        return "wbportfolio:transaction"
-
-
-@receiver(pre_merge, sender="wbfdm.Instrument")
-def pre_merge_instrument(sender: models.Model, merged_object: "Instrument", main_object: "Instrument", **kwargs):
-    """
-    Simply reassign the transactions linked to the merged instrument to the main instrument
-    """
-    merged_object.transactions.update(underlying_instrument=main_object)
-
-
-@receiver(add_instrument_to_investable_universe, sender="wbfdm.Instrument")
-def add_instrument_to_investable_universe_from_transactions(sender: models.Model, **kwargs) -> list[int]:
-    """
-    register all instrument linked to assets as within the investible universe
-    """
-    return list(
-        (
-            Instrument.objects.annotate(
-                transaction_exists=models.Exists(
-                    Transaction.objects.filter(underlying_instrument=models.OuterRef("pk"))
-                )
-            ).filter(transaction_exists=True)
-        )
-        .distinct()
-        .values_list("id", flat=True)
-    )
+        abstract = True

wbportfolio/serializers/signals.py

@@ -84,7 +84,7 @@ def transactions_resources(sender, serializer, instance, request, user, **kwargs
     additional_resources = dict()
     portfolio = instance.primary_portfolio
     if portfolio:
-        if portfolio.transactions.exists() and user.profile.is_internal:
+        if portfolio.trades.exists() and user.profile.is_internal:
             additional_resources["portfolio_subscriptionsredemptions"] = (
                 f'{reverse("wbportfolio:portfolio-trade-list", args=[portfolio.id], request=request)}?is_customer_trade=True'
             )
@@ -92,16 +92,13 @@ def transactions_resources(sender, serializer, instance, request, user, **kwargs
                 f'{reverse("wbportfolio:portfolio-trade-list", args=[portfolio.id], request=request)}?is_customer_trade=False'
             )
 
-            additional_resources["portfolio_transactions"] = reverse(
-                "wbportfolio:portfolio-transaction-list", args=[portfolio.id], request=request
+        if instance.fees.exists() and PortfolioRole.is_portfolio_manager(user.profile, portfolio=portfolio):
+            additional_resources["product_fees"] = reverse(
+                "wbportfolio:product-fees-list", args=[portfolio.id], request=request
+            )
+            additional_resources["product_aggregatedfees"] = reverse(
+                "wbportfolio:product-feesaggregated-list", args=[portfolio.id], request=request
             )
-            if PortfolioRole.is_portfolio_manager(user.profile, portfolio=portfolio):
-                additional_resources["portfolio_fees"] = reverse(
-                    "wbportfolio:portfolio-fees-list", args=[portfolio.id], request=request
-                )
-                additional_resources["portfolio_aggregatedfees"] = reverse(
-                    "wbportfolio:portfolio-feesaggregated-list", args=[portfolio.id], request=request
-                )
 
     return additional_resources
 
@@ -130,6 +127,14 @@ def product_resources(sender, serializer, instance, request, user, **kwargs):
             args=[instance.id],
             request=request,
         )
+    if instance.fees.exists() and PortfolioRole.is_portfolio_manager(user.profile, instrument=instance):
+        additional_resources["product_fees"] = reverse(
+            "wbportfolio:product-fees-list", args=[instance.id], request=request
+        )
+        additional_resources["product_aggregatedfees"] = reverse(
+            "wbportfolio:product-feesaggregated-list", args=[instance.id], request=request
+        )
+
     return additional_resources
 
 

wbportfolio/serializers/transactions/__init__.py

@@ -9,7 +9,6 @@ from .claim import (
     NegativeTermimalAccountPerProductModelSerializer,
 )
 from .dividends import DividendModelSerializer, DividendRepresentationSerializer
-from .expiry import ExpiryModelSerializer, ExpiryRepresentationSerializer
 from .fees import FeesModelSerializer, FeesRepresentationSerializer
 from .trades import (
     TradeModelSerializer,
@@ -18,7 +17,3 @@ from .trades import (
     TradeTradeProposalModelSerializer,
     ReadOnlyTradeTradeProposalModelSerializer,
 )
-from .transactions import (
-    TransactionModelSerializer,
-    TransactionRepresentationSerializer,
-)

wbportfolio/serializers/transactions/dividends.py

@@ -1,18 +1,46 @@
-from wbportfolio.models import DividendTransaction
+from wbcore import serializers as wb_serializers
+from wbcore.contrib.currency.serializers import CurrencyRepresentationSerializer
+from wbfdm.serializers import InvestableUniverseRepresentationSerializer
 
-from .transactions import (
-    TransactionModelSerializer,
-    TransactionRepresentationSerializer,
-)
+from wbportfolio.models import DividendTransaction
+from wbportfolio.serializers import PortfolioRepresentationSerializer
 
 
-class DividendRepresentationSerializer(TransactionRepresentationSerializer):
+class DividendRepresentationSerializer(wb_serializers.RepresentationSerializer):
     class Meta:
         model = DividendTransaction
-        fields = TransactionRepresentationSerializer.Meta.fields
+        fields = ("id", "value_date")
+
+
+class DividendModelSerializer(wb_serializers.ModelSerializer):
+    _portfolio = PortfolioRepresentationSerializer(source="portfolio")
+    _underlying_instrument = InvestableUniverseRepresentationSerializer(source="underlying_instrument")
+    _currency = CurrencyRepresentationSerializer(source="currency")
 
+    total_value = wb_serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True, required=False)
+    total_value_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
+    total_value_gross = wb_serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True, required=False)
+    total_value_gross_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
 
-class DividendModelSerializer(TransactionModelSerializer):
     class Meta:
         model = DividendTransaction
-        fields = TransactionModelSerializer.Meta.fields
+        fields = (
+            "id",
+            "value_date",
+            "record_date",
+            "ex_date",
+            "portfolio",
+            "underlying_instrument",
+            "currency",
+            "_portfolio",
+            "_underlying_instrument",
+            "_currency",
+            "total_value",
+            "total_value_fx_portfolio",
+            "total_value_gross",
+            "total_value_gross_fx_portfolio",
+        )

wbportfolio/serializers/transactions/fees.py

@@ -1,20 +1,28 @@
 from wbcore import serializers as wb_serializers
+from wbcore.contrib.currency.serializers import CurrencyRepresentationSerializer
 
 from wbportfolio.models import Fees
+from wbportfolio.serializers.products import ProductRepresentationSerializer
 
-from .transactions import (
-    TransactionModelSerializer,
-    TransactionRepresentationSerializer,
-)
 
+class FeesRepresentationSerializer(wb_serializers.RepresentationSerializer):
+    _detail = wb_serializers.HyperlinkField(reverse_name="wbportfolio:fees-detail")
 
-class FeesRepresentationSerializer(TransactionRepresentationSerializer):
     class Meta:
         model = Fees
-        fields = ("transaction_subtype",) + TransactionRepresentationSerializer.Meta.fields
+        fields = ("transaction_subtype", "total_value", "_detail")
 
 
-class FeesModelSerializer(TransactionModelSerializer):
+class FeesModelSerializer(wb_serializers.ModelSerializer):
+    _product = ProductRepresentationSerializer(source="product")
+    _currency = CurrencyRepresentationSerializer(source="currency")
+    total_value_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
+    total_value_gross_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
+
     @wb_serializers.register_resource()
     def additional_resources(self, instance, request, user):
         if (view := request.parser_context.get("view")) and view.is_manager and instance.import_source:
@@ -23,11 +31,32 @@ class FeesModelSerializer(TransactionModelSerializer):
 
     class Meta:
         model = Fees
-        decorators = TransactionModelSerializer.Meta.decorators
+        decorators = {
+            "total_value": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{_currency.symbol}}"
+            ),
+            "total_value_fx_portfolio": wb_serializers.decorator(
+                position="left", value="{{_portfolio.currency_symbol}}"
+            ),
+            "total_value_gross": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{_currency.symbol}}"
+            ),
+            "total_value_gross_fx_portfolio": wb_serializers.decorator(
+                position="left", value="{{_portfolio.currency_symbol}}"
+            ),
+        }
         fields = (
+            "id",
             "_additional_resources",
             "transaction_subtype",
             "calculated",
             "fee_date",
-            "linked_product",
-        ) + TransactionModelSerializer.Meta.fields
+            "product",
+            "currency",
+            "_product",
+            "_currency",
+            "total_value",
+            "total_value_fx_portfolio",
+            "total_value_gross",
+            "total_value_gross_fx_portfolio",
+        )

wbportfolio/serializers/transactions/trades.py

@@ -4,20 +4,22 @@ from decimal import Decimal
 from rest_framework import serializers
 from rest_framework.reverse import reverse
 from wbcore import serializers as wb_serializers
+from wbcore.contrib.currency.serializers import CurrencyRepresentationSerializer
 from wbcore.metadata.configs.display.list_display import BaseTreeGroupLevelOption
 from wbfdm.models import Instrument
 from wbfdm.serializers import InvestableInstrumentRepresentationSerializer
-from wbfdm.serializers.instruments.instruments import CompanyRepresentationSerializer, SecurityRepresentationSerializer
+from wbfdm.serializers.instruments.instruments import (
+    CompanyRepresentationSerializer,
+    InvestableUniverseRepresentationSerializer,
+    SecurityRepresentationSerializer,
+)
 
 from wbportfolio.models import PortfolioRole, Trade, TradeProposal
 from wbportfolio.models.transactions.claim import Claim
 from wbportfolio.serializers.custodians import CustodianRepresentationSerializer
 from wbportfolio.serializers.registers import RegisterRepresentationSerializer
 
-from .transactions import (
-    TransactionModelSerializer,
-    TransactionRepresentationSerializer,
-)
+from .. import PortfolioRepresentationSerializer
 
 
 class CopyClaimRepresentationSerializer(wb_serializers.RepresentationSerializer):
@@ -47,13 +49,23 @@ class TradeProposalRepresentationSerializer(wb_serializers.RepresentationSeriali
         fields = ("id", "trade_date", "status", "_detail")
 
 
-class TradeRepresentationSerializer(TransactionRepresentationSerializer):
+class TradeRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.HyperlinkField(reverse_name="wbportfolio:trade-detail")
-    diff_shares = wb_serializers.DecimalField(max_digits=15, decimal_places=4)
+    diff_shares = wb_serializers.DecimalField(max_digits=15, decimal_places=4, read_only=True)
+    total_value = wb_serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True, required=False)
 
     class Meta:
         model = Trade
-        fields = ("claimed_shares", "diff_shares", "bank", "shares") + TransactionRepresentationSerializer.Meta.fields
+        fields = (
+            "id",
+            "transaction_date",
+            "total_value",
+            "_detail",
+            "claimed_shares",
+            "diff_shares",
+            "bank",
+            "shares",
+        )
 
 
 class TradeClaimRepresentationSerializer(TradeRepresentationSerializer):
@@ -78,7 +90,11 @@ class TradeClaimRepresentationSerializer(TradeRepresentationSerializer):
         return {}
 
 
-class TradeModelSerializer(TransactionModelSerializer):
+class TradeModelSerializer(wb_serializers.ModelSerializer):
+    _portfolio = PortfolioRepresentationSerializer(source="portfolio")
+    _underlying_instrument = InvestableUniverseRepresentationSerializer(source="underlying_instrument")
+    _currency = CurrencyRepresentationSerializer(source="currency")
+
     marked_for_deletion = wb_serializers.BooleanField(required=False, read_only=True)
     marked_as_internal = wb_serializers.BooleanField()
 
@@ -91,6 +107,19 @@ class TradeModelSerializer(TransactionModelSerializer):
     completely_claimed = wb_serializers.BooleanField(required=False, read_only=True, default=Decimal(0.0))
     completely_claimed_if_approved = wb_serializers.BooleanField(required=False, read_only=True, default=Decimal(0.0))
 
+    total_value = wb_serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True, required=False)
+    total_value_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
+    total_value_gross = wb_serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True, required=False)
+    total_value_gross_fx_portfolio = wb_serializers.DecimalField(
+        max_digits=14, decimal_places=2, read_only=True, required=False
+    )
+    external_id = wb_serializers.CharField(required=False, read_only=True)
+    value_date = wb_serializers.DateField(required=False, read_only=True)
+    total_value_usd = wb_serializers.FloatField(default=0, read_only=True, label="Total Value ($)")
+    total_value_gross_usd = wb_serializers.FloatField(default=0, read_only=True, label="Total Value Gross ($)")
+
     # We commented it because people needs to filter with lookup equals onto these fields
     # shares = wb_serializers.DecimalField(max_digits=16, decimal_places=2)
     # price = wb_serializers.DecimalField(max_digits=16, decimal_places=2)
@@ -127,7 +156,24 @@ class TradeModelSerializer(TransactionModelSerializer):
 
     class Meta:
         model = Trade
-        decorators = TransactionModelSerializer.Meta.decorators
+        decorators = {
+            "total_value": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{_currency.symbol}}"
+            ),
+            "total_value_gross": wb_serializers.decorator(
+                decorator_type="text", position="left", value="{{_currency.symbol}}"
+            ),
+            "total_value_usd": wb_serializers.decorator(decorator_type="text", position="left", value="{{$}}"),
+            "total_value_gross_usd": wb_serializers.decorator(decorator_type="text", position="left", value="{{$}}"),
+            "total_value_fx_portfolio": wb_serializers.decorator(
+                position="left", value="{{_portfolio.currency_symbol}}"
+            ),
+            "total_value_gross_fx_portfolio": wb_serializers.decorator(
+                position="left", value="{{_portfolio.currency_symbol}}"
+            ),
+            # "total_value_fx_portfolio": wb_serializers.decorator(decorator_type="text", position="left", value="{{_portfolio.currency_symbol}}}"),
+            # "total_value_gross_fx_portfolio": wb_serializers.decorator(decorator_type="text", position="left", value="{{_portfolio.currency_symbol}}"),
+        }
         read_only_fields = (
             "id",
             "shares",
@@ -145,9 +191,6 @@ class TradeModelSerializer(TransactionModelSerializer):
             "marked_for_deletion",
             "_claims",
             "claims",
-            "transaction_type",
-            "transaction_url_type",
-            "transaction_underlying_type",
             "portfolio",
             "_portfolio",
             "underlying_instrument",
@@ -185,9 +228,6 @@ class TradeModelSerializer(TransactionModelSerializer):
             "marked_for_deletion",
             "_claims",
             "claims",
-            "transaction_type",
-            "transaction_url_type",
-            "transaction_underlying_type",
             "portfolio",
             "_portfolio",
             "underlying_instrument",

wbportfolio/tasks.py

@@ -4,7 +4,7 @@ from datetime import date, timedelta
 from django.db.models import ProtectedError, Q
 
 from wbportfolio.models import Portfolio, Trade
-from wbportfolio.models.products import Product, update_outstanding_shares_as_task
+from wbportfolio.models.products import Product
 
 from .fdm.tasks import *  # noqa
 
@@ -15,7 +15,7 @@ def daily_active_product_task(today: date | None = None):
         today = date.today()
     qs = Product.active_objects.all()
     for product in tqdm(qs, total=qs.count()):
-        update_outstanding_shares_as_task(product.id)
+        product.update_outstanding_shares()
         product.check_and_notify_product_termination_on_date(today)
 
 

wbportfolio/tests/conftest.py

@@ -1,7 +1,4 @@
-from datetime import date
-
-from faker import Faker
-from pandas.tseries.offsets import BDay
+from pytest_factoryboy import register
 from wbcompliance.factories.risk_management import (
     RiskRuleFactory,
     RuleBackendFactory,
@@ -10,6 +7,7 @@ from wbcompliance.factories.risk_management import (
 from wbcore.contrib.authentication.factories import (
     InternalUserFactory,
     SuperUserFactory,
+    UserFactory
 )
 from wbcore.contrib.currency.factories import CurrencyFactory, CurrencyFXRatesFactory
 from wbcore.contrib.directory.factories.entries import (
@@ -74,9 +72,6 @@ from wbportfolio.factories import (
 
 from wbcore.tests.conftest import *  # isort:skip
 
-
-fake = Faker()
-
 register(AccountFactory)
 register(AccountWithOwnerFactory)
 register(AccountRoleFactory)
@@ -113,7 +108,6 @@ register(CurrencyFactory)
 register(CityFactory)
 register(StateFactory)
 register(CountryFactory)
-register(ContinentFactory)
 
 register(CompanyFactory)
 register(PersonFactory)

wbportfolio/tests/models/test_imports.py

@@ -27,7 +27,6 @@ class TestImportMixinModel:
             data["currency"] = {"key": portfolio.currency.key}
             del data["id"]
             del data["import_source"]
-            del data["transaction_ptr"]
             return data
 
         trade = trade_factory.build()
@@ -76,16 +75,12 @@ class TestImportMixinModel:
 
         def serialize(fees):
             data = model_to_dict(fees)
-            data["transaction_date"] = fees.transaction_date.strftime("%Y-%m-%d")
-            data["value_date"] = fees.value_date.strftime("%Y-%m-%d")
-            data["portfolio"] = portfolio.id
-            data["linked_product"] = product.id
-            data["portfolio"] = portfolio.id
+            data["fee_date"] = fees.fee_date.strftime("%Y-%m-%d")
+            data["product"] = product.id
             data["currency"] = {"key": portfolio.currency.key}
             del data["calculated"]
             del data["id"]
             del data["import_source"]
-            del data["transaction_ptr"]
             return data
 
         fees = fees_factory.build(calculated=False)