wbfdm 1.48.0__tar.gz → 1.49.1__tar.gz

{wbfdm-1.48.0 → wbfdm-1.49.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.48.0
+Version: 1.49.1
 Summary: The workbench module ensures rapid access to diverse financial data (market, fundamental, forecasts, ESG), with features for storing instruments, classifying them, and conducting financial analysis.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: roman==4.*

{wbfdm-1.48.0 → wbfdm-1.49.1}/wbfdm/factories/instruments.py

@@ -2,7 +2,7 @@ import factory
 import rstr
 from slugify import slugify
 
-from wbfdm.models import Instrument, InstrumentType
+from wbfdm.models import Cash, Instrument, InstrumentType
 
 
 class InstrumentTypeFactory(factory.django.DjangoModelFactory):
@@ -52,9 +52,17 @@ class InstrumentFactory(factory.django.DjangoModelFactory):
         model = Instrument
 
 
-class CashFactory(InstrumentFactory):
+class CashFactory(factory.django.DjangoModelFactory):
     is_cash = True
-    instrument_type = factory.LazyAttribute(lambda o: InstrumentTypeFactory.create(name="Cash", key="cash"))
+    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyFactory")
+    name = factory.LazyAttribute(lambda o: o.currency.title)
+    instrument_type = factory.LazyAttribute(
+        lambda o: InstrumentType.objects.get_or_create(key="cash", defaults={"name": "Cash", "short_name": "Cash"})[0]
+    )
+
+    class Meta:
+        model = Cash
+        django_get_or_create = ("currency",)
 
 
 class EquityFactory(InstrumentFactory):

{wbfdm-1.48.0 → wbfdm-1.49.1}/wbfdm/filters/instruments.py

@@ -6,6 +6,7 @@ from wbcore import filters as wb_filters
 from wbcore.contrib.tags.filters import TagFilterMixin
 
 from wbfdm.filters.utils import _get_default_classification_group_id, get_earliest_date, get_latest_date
+from wbfdm.models import InstrumentType
 from wbfdm.models.instruments import (
     ClassificationGroup,
     Instrument,
@@ -103,6 +104,14 @@ class InstrumentFilterSet(TagFilterMixin, InstrumentFavoriteGroupFilterSet):
     instrument_type__key = wb_filters.CharFilter(label="Instrument Type Key", hidden=True)
     instrument_type__is_classifiable = wb_filters.BooleanFilter(label="Instrument Type Classifiable", hidden=True)
 
+    instrument_type = wb_filters.ModelMultipleChoiceFilter(
+        label="Asset Classes",
+        queryset=InstrumentType.objects.all(),
+        endpoint=InstrumentType.get_representation_endpoint(),
+        value_key=InstrumentType.get_representation_value_key(),
+        label_key=InstrumentType.get_representation_label_key(),
+    )
+
     is_classifiable = wb_filters.BooleanFilter(label="Is Classifiable", method="filter_is_classifiable", hidden=True)
 
     def filter_is_classifiable(self, queryset, name, value):

{wbfdm-1.48.0 → wbfdm-1.49.1}/wbfdm/models/instruments/instrument_requests.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, Optional
 
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import Currency
@@ -112,7 +113,7 @@ class InstrumentRequest(WBModel):
 
     def can_approve(self):
         if self._check_already_existing_instrument():
-            return {"non_field_errors": "An instrument already exists with the proposed identifier"}
+            return {"non_field_errors": [_("An instrument already exists with the proposed identifier")]}
 
     @transition(
         field=status,
@@ -178,7 +179,7 @@ class InstrumentRequest(WBModel):
 
     def can_submit(self) -> Dict[str, Any]:
         if self._check_already_existing_instrument():
-            return {"non_field_errors": "An instrument already exists with the proposed identifier"}
+            return {"non_field_errors": [_("An instrument already exists with the proposed identifier")]}
 
     @classmethod
     def get_representation_endpoint(cls) -> str:

{wbfdm-1.48.0 → wbfdm-1.49.1}/wbfdm/models/instruments/instruments.py

@@ -964,6 +964,10 @@ class CashManager(InstrumentManager):
 class Cash(Instrument):
     objects = CashManager()
 
+    def save(self, *args, **kwargs):
+        self.is_cash = True
+        super().save(*args, **kwargs)
+
     class Meta:
         proxy = True
 
@@ -971,7 +975,7 @@ class Cash(Instrument):
 @receiver(post_save, sender="currency.Currency")
 def create_cash_from_currency(sender, instance, created, raw, **kwargs):
     if created:
-        Instrument.objects.get_or_create(
+        Cash.objects.get_or_create(
             instrument_type=InstrumentType.CASH, currency=instance, defaults={"name": f"Cash {instance.key}"}
         )