wbportfolio 1.50.5__py2.py3-none-any.whl → 1.50.7__py2.py3-none-any.whl

wbportfolio/models/__init__.py

@@ -18,3 +18,4 @@ from .portfolio_swing_pricings import PortfolioSwingPricing
 from .registers import Register
 from .transactions import *
 from .reconciliations import AccountReconciliation, AccountReconciliationLine
+from .signals import *

wbportfolio/models/indexes.py

@@ -17,6 +17,3 @@ class Index(PMSInstrumentAbstractModel):
     class Meta:
         verbose_name = "Index"
         verbose_name_plural = "Indexes"
-
-    def compute_str(self):
-        return f"{self.name}  ({self.ticker} - {self.isin})"

wbportfolio/models/portfolio_relationship.py

@@ -74,12 +74,6 @@ class InstrumentPortfolioThroughModel(models.Model):
             return portfolio
 
 
-@receiver(models.signals.class_prepared)
-def add_to_instrument(sender, **kwargs):
-    Instrument.add_to_class("portfolio", property(InstrumentPortfolioThroughModel.get_portfolio))
-    Instrument.add_to_class("primary_portfolio", property(InstrumentPortfolioThroughModel.get_primary_portfolio))
-
-
 class PortfolioInstrumentPreferredClassificationThroughModel(models.Model):
     portfolio = models.ForeignKey(
         "wbportfolio.Portfolio", on_delete=models.CASCADE, related_name="preferred_classification_instruments"

wbportfolio/models/signals.py

@@ -0,0 +1,20 @@
+from django.db import models
+from django.dispatch import receiver
+from wbfdm.models import Instrument, InstrumentType
+
+from wbportfolio.models import InstrumentPortfolioThroughModel, Product, ProductGroup
+
+
+def _compute_str(instrument):
+    if instrument.instrument_type == InstrumentType.PRODUCT_GROUP:
+        return ProductGroup.objects.get(id=instrument.id).compute_str()
+    elif instrument.instrument_type == InstrumentType.PRODUCT:
+        return Product.objects.get(id=instrument.id).compute_str()
+    return instrument.get_compute_str()
+
+
+@receiver(models.signals.class_prepared)
+def add_to_instrument(sender, **kwargs):
+    Instrument.add_to_class("portfolio", property(InstrumentPortfolioThroughModel.get_portfolio))
+    Instrument.add_to_class("primary_portfolio", property(InstrumentPortfolioThroughModel.get_primary_portfolio))
+    Instrument.add_to_class("compute_str", _compute_str)

wbportfolio/tests/models/test_products.py

@@ -117,6 +117,12 @@ class TestProductModel(PortfolioTestMixin):
     def test_compute_str(self, product, user):
         assert product.compute_str()
 
+        # test if we save the parent instrument, the computed str is the one from the product class
+        instrument = product.instrument_ptr
+        instrument.save()
+        product.refresh_from_db()
+        assert product.computed_str == product.compute_str()
+
     def test_urlify_title(self, product):
         assert product.name.lower() in product.urlify_title
 

{wbportfolio-1.50.5.dist-info → wbportfolio-1.50.7.dist-info}/METADATA

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

{wbportfolio-1.50.5.dist-info → wbportfolio-1.50.7.dist-info}/RECORD

@@ -243,21 +243,22 @@ wbportfolio/migrations/0074_alter_rebalancer_frequency_and_more.py,sha256=o01rBj
 wbportfolio/migrations/0075_portfolio_initial_position_date_and_more.py,sha256=rXRpsraVlmueAlO2UpBZV4qMf7dtPuptrhfLblZcJDo,1099
 wbportfolio/migrations/0076_alter_dividendtransaction_price_and_more.py,sha256=4g3ok79nw8mTAxHFAqBAdpGKetaPAjv06YSywywt4aU,6106
 wbportfolio/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/models/__init__.py,sha256=IIS_PNRxyX2Dcvyk1bcQOUzFt0B9SPC0WlM88CXqj04,881
+wbportfolio/models/__init__.py,sha256=HSpa5xwh_MHQaBpNrq9E0CbdEE5Iq-pDLIsPzZ-TRTg,904
 wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQtbHVo,10272
 wbportfolio/models/asset.py,sha256=wxV8rHogMAKzWE3qEtu9EiFmK_DKHd5cVAUSsGpUKbA,45353
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
-wbportfolio/models/indexes.py,sha256=iLYF2gzNzX4GLj_Nh3fybUcAQ1TslnT0wgQ6mN164QI,728
+wbportfolio/models/indexes.py,sha256=gvW4K9U9Bj8BmVCqFYdWiXvDWhjHINRON8XhNsZUiQY,639
 wbportfolio/models/portfolio.py,sha256=253Z9K4929UVNaoXmOdcLqWM8xutYwJHdiy0GAHheUM,55967
 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=mMb18UMRWg9kx_9uIPkMktwORuXXLjKdgRPQQvB6fVE,5486
+wbportfolio/models/portfolio_relationship.py,sha256=ZGECiPZiLdlk4uSamOrEfuzO0hduK6OMKJLUSnh5_kc,5190
 wbportfolio/models/portfolio_swing_pricings.py,sha256=_LqYC1VRjnnFFmVqFPRdnbgYsVxocMVpClTk2dnooig,1778
 wbportfolio/models/product_groups.py,sha256=qoT8qv6tRdD6zmNDxsHO6dtnWw1-TRnyS5NqOq_gwhI,7901
 wbportfolio/models/products.py,sha256=5z9OMLVS0ps6aOJbG3JE7gKTf3PlbC4rXIPpv55dD1A,22863
 wbportfolio/models/registers.py,sha256=qA6T33t4gxFYnabQFBMd90WGIr6wxxirDLKDFqjOfok,4667
 wbportfolio/models/roles.py,sha256=wF5Atp0xsJxDrYjmFw9XHgEOe_4C-lm4pppeYdymOrA,7343
+wbportfolio/models/signals.py,sha256=yDKg2ingDBFQY1oOFpDrMU2C2c0f2aIgRul5UEBqhIs,899
 wbportfolio/models/utils.py,sha256=iBdMjRCvr6aOL0nLgfSCWUKe0h39h3IGmUbYo6l9t6w,394
 wbportfolio/models/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/graphs/portfolio.py,sha256=NwkehWvTcyTYrKO5ku3eNNaYLuBwuLdSbTEuugGuSIU,6541
@@ -376,7 +377,7 @@ wbportfolio/tests/models/test_portfolio_cash_targets.py,sha256=q8QWAwt-kKRkLC0E0
 wbportfolio/tests/models/test_portfolio_swing_pricings.py,sha256=kr2AOcQkyg2pX3ULjU-o9ye-NVpjMrrfoe-DVbYCbjs,1656
 wbportfolio/tests/models/test_portfolios.py,sha256=ECUAxE07KwmlHN1udMHVCmNDQrRcCbMfRQe8L3cHOX0,53111
 wbportfolio/tests/models/test_product_groups.py,sha256=AcdxhurV-n_bBuUsfD1GqVtwLFcs7VI2CRrwzsIUWbU,3337
-wbportfolio/tests/models/test_products.py,sha256=FkQLms3kXzyg6mNEEJcHUVKu8YbATY9l6lZyaRUnpjw,9314
+wbportfolio/tests/models/test_products.py,sha256=IcBzw9hrGiWFMRwPBTMukCMWrhqnjOVA2hhb90xYOW8,9580
 wbportfolio/tests/models/test_roles.py,sha256=4Cn7WyrA2ztJNeWLk5cy9kYo5XLWMbFSvo1O-9JYxeA,3323
 wbportfolio/tests/models/test_splits.py,sha256=ytKcHsI_90kj1L4s8It-KEcc24rkDcElxwQ8q0QxEvk,9689
 wbportfolio/tests/models/utils.py,sha256=ORNJq6NMo1Za22jGZXfTfKeNEnTRlfEt_8SJ6xLaQWg,325
@@ -521,7 +522,7 @@ wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQV
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=iQpC_Thbj56SmM05vPRsF1JZguGBDaTUH3I-_iCHCV0,5958
 wbportfolio/viewsets/transactions/trades.py,sha256=-yJ4j8NJTu2VWyhCq5BXGNND_925Ietoxx9k07SLVh0,21634
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.50.5.dist-info/METADATA,sha256=YSKxspCHBavsYHEEz8Qv_6W4F6B6AcdB_KrG1Xy6e8Q,702
-wbportfolio-1.50.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.50.5.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.50.5.dist-info/RECORD,,
+wbportfolio-1.50.7.dist-info/METADATA,sha256=_3QdVIySIlzglfZnVOyVWrGDA7tv9HcUPA6Sy-iT4XY,702
+wbportfolio-1.50.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.50.7.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.50.7.dist-info/RECORD,,