wbcore 1.56.6__py2.py3-none-any.whl → 1.56.8__py2.py3-none-any.whl

wbcore/contrib/directory/models/entries.py

@@ -22,6 +22,7 @@ from slugify import slugify
 
 from wbcore.contrib.agenda.models import CalendarItem
 from wbcore.contrib.authentication.models import User
+from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.directory.models.contacts import (
     AddressContact,
     BankingContact,
@@ -413,6 +414,14 @@ class Entry(ComplexToStringMixin, DeleteToDisableMixin, WBModel):
         if additional_field_key in self.additional_fields:
             del self.additional_fields[additional_field_key]
 
+    def get_banking_contact(self, currency: Currency) -> BankingContact | None:
+        bank_accounts = self.banking.all()
+        if bank_accounts.filter(currency=currency).exists():
+            bank_accounts = bank_accounts.filter(currency=currency)
+        if bank_accounts.filter(primary=True).exists():
+            bank_accounts = bank_accounts.filter(primary=True)
+        return bank_accounts.first()
+
     @classmethod
     def get_endpoint_basename(cls):
         return "wbcore:directory:entry"

wbcore/contrib/directory/serializers/companies.py

@@ -27,9 +27,7 @@ class CompanyModelSerializer(EntryModelSerializer):
     )
     _employees = PersonRepresentationSerializer(source="employees", many=True)
     is_primary_employer = wb_serializers.BooleanField(read_only=True)
-    tier = wb_serializers.CharField(
-        help_text=settings.DEFAULT_TIERING_HELP_TEXT, required=False, read_only=True, label=_("Tier")
-    )
+    tier = wb_serializers.CharField(help_text=settings.DEFAULT_TIERING_HELP_TEXT, label=_("Tier"), required=False)
     _type = CompanyTypeRepresentationSerializer(source="type")
 
     @wb_serializers.register_resource()

wbcore/contrib/directory/serializers/entries.py

@@ -203,7 +203,6 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
     )
     primary_telephone = wb_serializers.TelephoneField(
         allow_null=True,
-        read_only=True,
         required=False,
         label=_("Primary Telephone"),
     )

wbcore/contrib/directory/serializers/persons.py

@@ -29,7 +29,7 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
         color=WBColor.BLUE_LIGHT.value, required=False, label=_("Personality Profile Blue")
     )
     _specializations = SpecializationRepresentationSerializer(source="specializations", many=True)
-    tier = wb_serializers.CharField(read_only=True, help_text=_("Tier of the primary employer"), label=_("Tier"))
+    tier = wb_serializers.CharField(help_text=_("Tier of the primary employer"), label=_("Tier"), required=False)
 
     def get_user_account_email(self, obj):
         if hasattr(obj, "user_account"):

wbcore/contrib/directory/tests/conftest.py

@@ -5,6 +5,7 @@ from django.db.models.signals import pre_migrate
 from pytest_factoryboy import register
 from wbcore.contrib.authentication.factories import InternalUserFactory, UserFactory
 from wbcore.contrib.geography.tests.signals import app_pre_migration
+from wbcore.contrib.currency.factories import CurrencyFactory
 from wbcore.tests.conftest import *
 
 from ..factories import (
@@ -45,6 +46,7 @@ register(RelationshipFactory)
 register(RelationshipTypeFactory)
 register(CustomerStatusFactory)
 register(CompanyTypeFactory)
+register(CurrencyFactory)
 
 
 @pytest.fixture(autouse=True, scope="session")

wbcore/contrib/directory/tests/test_models.py

@@ -405,3 +405,24 @@ class TestSpecificModelsRelationships:
             to_entry=to_entry,
         )
         assert rel.__str__() == "John Doe is Type of Jane Doe"
+
+
+@pytest.mark.django_db
+class TestEntry:
+    def test_get_banking_contact(self, entry, banking_contact_factory, currency_factory):
+        eur = currency_factory.create()
+        usd = currency_factory.create()
+
+        euro_banking_contact = banking_contact_factory.create(entry=entry, currency=eur)
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert (
+            entry.get_banking_contact(usd) == euro_banking_contact
+        )  # even if usd does not exist, we need to return at least a banking contact
+
+        usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert entry.get_banking_contact(usd) == usd_banking_contact
+
+        new_primary_usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+        assert entry.get_banking_contact(usd) == new_primary_usd_banking_contact

wbcore/utils/strings.py

@@ -15,7 +15,7 @@ def enumerated_string_join(array):
     return ""
 
 
-def format_number(number, decimal: int = 2, **kwargs) -> float | None:
+def format_number(number, decimal: int = 2, **kwargs) -> float | str:
     """
     utility function used to serialize an aggregate to a json compatible value
     Args:
@@ -28,7 +28,7 @@ def format_number(number, decimal: int = 2, **kwargs) -> float | None:
     try:
         return float(round(number, decimal))
     except TypeError:
-        return None
+        return ""
 
 
 class ReferenceIDMixin:

{wbcore-1.56.6.dist-info → wbcore-1.56.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.56.6
+Version: 1.56.8
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: boto3==1.35.*
 Requires-Dist: celery[redis]==5.*

{wbcore-1.56.6.dist-info → wbcore-1.56.8.dist-info}/RECORD

@@ -318,17 +318,17 @@ wbcore/contrib/directory/migrations/0013_alter_clientmanagerrelationship_options
 wbcore/contrib/directory/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/directory/models/__init__.py,sha256=XtnmU5YUr3SGig6PsSfGsWUaiBaX6kaHShBv3sbxZ14,526
 wbcore/contrib/directory/models/contacts.py,sha256=8KVCmzNARTzeQgRtXe78QKhJr0SvEJ-aZcsRuYaMIbE,18322
-wbcore/contrib/directory/models/entries.py,sha256=S53zghpS18sqZGquAEirMGVuenHhq2Yhdh8ijTScPCw,31904
+wbcore/contrib/directory/models/entries.py,sha256=XXEWJ3UOvs8CgN0AekY7FOy4sNOww5jTpPTdDedYYb0,32365
 wbcore/contrib/directory/models/relationships.py,sha256=7SZFo1tA7NRzS7_gv_fKwMsPPhawu90eWSrEvij_0rk,22108
 wbcore/contrib/directory/release_notes/1_0_0.md,sha256=Twbl9RMLO6dbbm5dVoKorw8BecRqAYsKeobcNmDWHu8,165
 wbcore/contrib/directory/release_notes/1_0_1.md,sha256=yHolV-HwBmIavaPn9pg0ABRgxQ-eKIuiAs-phKb_ix0,285
 wbcore/contrib/directory/release_notes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/directory/serializers/__init__.py,sha256=36WcX6aHrBuZXVWR0JSCeCCvJin_jOEaiwuSYBSs5eo,2131
-wbcore/contrib/directory/serializers/companies.py,sha256=E9LegHl_jBdlJnixaa9j3RmMtvgYqHiEHHRK8GmhZzU,5777
+wbcore/contrib/directory/serializers/companies.py,sha256=Bvxex_tq5lyR3k9Ox_Z2AnRQVyhPM0l1bdClJAjeEdo,5747
 wbcore/contrib/directory/serializers/contacts.py,sha256=Q-3lmivmS4ci9XP-65lO1d06Gm6cQMgPH3YA8FY71ZE,15205
-wbcore/contrib/directory/serializers/entries.py,sha256=gtp0zLfyrbr46N3hKhbBy7BkT8wHq-be4weva6ckVhc,13608
+wbcore/contrib/directory/serializers/entries.py,sha256=QV_hlstwFWvhp-uiVPn3xMt0bES_6gKJs4rf_CVHIn0,13584
 wbcore/contrib/directory/serializers/entry_representations.py,sha256=Pj8j4HYDINvXlLZ7onBypF2ZOK_GGzFZevd-yzESqoU,1397
-wbcore/contrib/directory/serializers/persons.py,sha256=1zPg1FnPuXg-0jtf2lRxP0Wo-inD2ZifzEpv5UelZys,7641
+wbcore/contrib/directory/serializers/persons.py,sha256=YtUgKKeijvV87JLtgeQtxmyk21COLQjSrb5klBw_EXQ,7641
 wbcore/contrib/directory/serializers/relationships.py,sha256=jGrjy8M8kaxNRHHJ0HiDMdD_-wZFwioRJabCpCwHZ4U,12390
 wbcore/contrib/directory/static/directory/markdown/documentation/address.md,sha256=gfUVi2PZh5uQ5sWkLG-AxYV9ULWeswRp3E2Me4fEs88,1865
 wbcore/contrib/directory/static/directory/markdown/documentation/banking.md,sha256=5jgF1tqTGdr4fRaXCtobtpFEx0xcSmVYkKvzVALp4L8,28387
@@ -352,12 +352,12 @@ wbcore/contrib/directory/static/directory/markdown/documentation/userisclient.md
 wbcore/contrib/directory/static/directory/markdown/documentation/userismanager.md,sha256=I3ojIVTFZ_bEk8-67jO2Jrctk90kSzX-WrREDfplwpg,1037
 wbcore/contrib/directory/static/directory/markdown/documentation/website.md,sha256=n8VAXbgxQh9zslLfLB0UhRgliMCvNS2N6gR-K0oTrkY,1453
 wbcore/contrib/directory/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcore/contrib/directory/tests/conftest.py,sha256=6Png5NaERN8WBcnpw3mM8F6Xg7erCHh0IO-6hdPyT6E,1738
+wbcore/contrib/directory/tests/conftest.py,sha256=54xK711IfBc6Cj7MweNOGNdkP-ojjMcfqjP1G2XrSn0,1826
 wbcore/contrib/directory/tests/disable_signals.py,sha256=kgVeTtzItEtLJ7MOVo9KdnRABsMvKBTub-vhHIMKO_M,1727
 wbcore/contrib/directory/tests/signals.py,sha256=DqQkJWnq2Y0wTTLh3ICY3qZJLUpGJqiTTSV6YypqsDQ,3217
 wbcore/contrib/directory/tests/test_configs.py,sha256=VouLg3TpDuxi_ljh8MtJGMhtW_h8OzCo15GyyApW16c,189
 wbcore/contrib/directory/tests/test_filters.py,sha256=tc4G0XoUoDoiisECXtaftYCG69fdE42-EmkmLcjbN78,2492
-wbcore/contrib/directory/tests/test_models.py,sha256=OhqzBiI6B3-yrdsKV1PS0LyJcWwayGPdR7OwU2BDi54,18323
+wbcore/contrib/directory/tests/test_models.py,sha256=L2029y7pTUznRYHXJOKFpy_jdTBZvvbx3KwHMEcNSAM,19304
 wbcore/contrib/directory/tests/test_permissions.py,sha256=lmGAiE0wtIDJkHEfNk_8NDwqN71FdPuu2qXvSMm0FbM,4231
 wbcore/contrib/directory/tests/test_serializers.py,sha256=AIa-Rktw4EG2eywMSCz-X1rYcBSmw7Zzx38CghBVGzo,9202
 wbcore/contrib/directory/tests/test_viewsets.py,sha256=pZJ-D-pxRP1IWNZDrKML_6j4iBcFzv8qpo59qX9MpOU,32624
@@ -1216,7 +1216,7 @@ wbcore/utils/serializers.py,sha256=fn__UYJolYjg063OHmAt7zC9zxMxsqrVERpGhLzUK3o,4
 wbcore/utils/settings.py,sha256=MCt48ZJO9nOzGPAFYJ-_o0uRCDUt3_yzEek6m4oZTYg,198
 wbcore/utils/signals.py,sha256=sNDbYKcjTsACpod50dB_TgYC-f37aN0N_M_DMJgTiMA,1132
 wbcore/utils/string_loader.py,sha256=AWmn40nM8A1cxoVwpO2lF6YidEfL3JC1du2cank4Dw4,1169
-wbcore/utils/strings.py,sha256=_7IzcjOQqPVbqxnRwGI4PAJrwJa7NmnXqXWxMuw5kew,1859
+wbcore/utils/strings.py,sha256=DvMm2vrEjfxH6Hjf7XvRSo-3eAnLf4oLzxki8xonmNs,1856
 wbcore/utils/task.py,sha256=HlPyALx78lSprsY_ICeI-SrXTPBmRpx8nyVIIrRtKb4,84
 wbcore/utils/urls.py,sha256=BjmavE84QYECWDKyV3dENn8GQqwdBmX6MqXyCjmwmbA,2137
 wbcore/utils/views.py,sha256=XnWQqMjAi6dXTF-ZYF9FHU1a7cDpAymcuZRt8g_cEqI,8541
@@ -1229,6 +1229,6 @@ wbcore/viewsets/generics.py,sha256=lKDq9UY_Tyc56u1bqaIEvHGgoaXwXxpZ1c3fLVteptI,1
 wbcore/viewsets/mixins.py,sha256=IdHd_uixOv3ExKoHxTgL5Bt8OELIwfYwhBZm0nsvZfc,12054
 wbcore/viewsets/utils.py,sha256=4520Ij3ASM8lOa8QZkCqbBfOexVRiZu688eW-PGqMOA,882
 wbcore/viewsets/viewsets.py,sha256=FPPESunEjlunDr5VFsjTfsquTS3iDSQkw0H6QjMKPqk,6574
-wbcore-1.56.6.dist-info/METADATA,sha256=y-y-6lzajumEVNnQ1SH4JkvwCCBMYJUFH4d_eWaQvT0,2332
-wbcore-1.56.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcore-1.56.6.dist-info/RECORD,,
+wbcore-1.56.8.dist-info/METADATA,sha256=cga3JvdAH3UXpC-1tiJr-T6bI08lEZ2HXvyRJHm43RI,2332
+wbcore-1.56.8.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcore-1.56.8.dist-info/RECORD,,