wbcore 1.46.0__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

wbcore/contrib/directory/migrations/0011_person_description_person_i18n.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.0.12 on 2025-02-28 10:21
+
+import modeltrans.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0010_remove_addresscontact_city'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='description',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='person',
+            name='i18n',
+            field=modeltrans.fields.TranslationField(fields=['description'], required_languages=(), virtual_fields=True),
+        ),
+    ]

wbcore/contrib/directory/migrations/0012_alter_person_managers.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.13 on 2025-03-10 14:40
+
+import django.db.models.manager
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0011_person_description_person_i18n'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='person',
+            managers=[
+                ('all_objects', django.db.models.manager.Manager()),
+            ],
+        ),
+    ]

wbcore/contrib/directory/migrations/0013_alter_clientmanagerrelationship_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.0.14 on 2025-05-05 09:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('directory', '0012_alter_person_managers'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='clientmanagerrelationship',
+            options={'permissions': (('administrate_clientmanagerrelationship', 'Can administrate Client Manager Relationship'),), 'verbose_name': 'Client Manager Relationship', 'verbose_name_plural': 'Client Manager Relationships'},
+        ),
+    ]

wbcore/contrib/directory/models/contacts.py

@@ -40,7 +40,7 @@ class BankingContact(PrimaryMixin, WBModel):
         @classmethod
         def get_color_map(cls):
             colors = [WBColor.RED_LIGHT.value, WBColor.YELLOW_LIGHT.value, WBColor.GREEN_LIGHT.value]
-            return [choice for choice in zip(cls, colors)]
+            return [choice for choice in zip(cls, colors, strict=False)]
 
     status = FSMField(
         default=Status.DRAFT,
@@ -227,7 +227,7 @@ class BankingContact(PrimaryMixin, WBModel):
 
         notification_types = [
             create_notification_type(
-                code="directory.banking+contact.approval",
+                code="directory.banking_contact.approval",
                 title="Banking Contact Notification",
                 help_text="Sends out a notification when you want need to approve a change in bank details",
             )

wbcore/contrib/directory/models/entries.py

@@ -17,15 +17,18 @@ from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from dynamic_preferences.registries import global_preferences_registry
+from modeltrans.fields import TranslationField
 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,
     ContactLocationChoices,
     EmailContact,
+    SocialMediaContact,
     TelephoneContact,
     WebsiteContact,
 )
@@ -244,10 +247,6 @@ class EntryDefaultQueryset(models.QuerySet):
                     EmailContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("address")[:1],
                     output_field=CharField(),
                 ),
-                secondary_email=Subquery(
-                    EmailContact.objects.filter(primary=False, entry__id=OuterRef("pk")).values("address")[:1],
-                    output_field=CharField(),
-                ),
                 primary_telephone=Subquery(
                     TelephoneContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("number")[:1],
                     output_field=CharField(),
@@ -262,6 +261,14 @@ class EntryDefaultQueryset(models.QuerySet):
                     .values("primary_address")[:1],
                     output_field=CharField(),
                 ),
+                primary_website=Subquery(
+                    WebsiteContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("url")[:1],
+                    output_field=CharField(),
+                ),
+                primary_social=Subquery(
+                    SocialMediaContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("url")[:1],
+                    output_field=CharField(),
+                ),
                 last_event=Subquery(
                     CalendarItem.objects.filter(
                         period__endswith__lte=timezone.now(),
@@ -271,6 +278,15 @@ class EntryDefaultQueryset(models.QuerySet):
                     .order_by("-period__startswith")
                     .values("title")[:1]
                 ),
+                last_event_period_endswith=Subquery(
+                    CalendarItem.objects.filter(
+                        period__endswith__lte=timezone.now(),
+                        visibility=CalendarItem.Visibility.PUBLIC,
+                        entities=OuterRef("pk"),
+                    )
+                    .order_by("-period__startswith")
+                    .values("period__endswith")[:1]
+                ),
                 cities=ArrayAgg("addresses__geography_city", filter=Q(addresses__geography_city__isnull=False)),
             )
         return qs
@@ -398,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"
@@ -540,6 +564,8 @@ class Person(Entry):
         blank=True,
         verbose_name=_("Specializations"),
     )
+    description = models.TextField(default="", blank=True)
+    i18n = TranslationField(fields=["description"])
 
     objects = DefaultPersonManager()
     registered_users = RegisteredPersonManager()
@@ -583,7 +609,7 @@ class Person(Entry):
                     "/".join(self.employers.all().values_list("name", flat=True)) if self.employers.exists() else ""
                 )
             if employers_repr:
-                return f'{self.first_name} {self.last_name}{(" (%s)" % employers_repr)}'
+                return f"{self.first_name} {self.last_name}{(' (%s)' % employers_repr)}"
         except ValueError:
             pass
         return f"{self.first_name} {self.last_name}"

wbcore/contrib/directory/models/relationships.py

@@ -148,6 +148,22 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         APPROVED = "APPROVED", _("Approved")
         REMOVED = "REMOVED", _("Removed")
 
+    @property
+    def can_update_primary_field(self):
+        return super().can_update_primary_field and self.status in [
+            ClientManagerRelationship.Status.APPROVED,
+            ClientManagerRelationship.Status.PENDINGREMOVE,
+        ]
+
+    def get_related_queryset(self):
+        return ClientManagerRelationship.objects.filter(
+            client=self.client,
+            status__in=[
+                ClientManagerRelationship.Status.APPROVED,
+                ClientManagerRelationship.Status.PENDINGREMOVE,
+            ],
+        )
+
     PRIMARY_ATTR_FIELDS = ["client"]
 
     relationship_manager = models.ForeignKey(
@@ -156,10 +172,6 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         verbose_name=_("Relationship Manager"),
         related_name="manager_of",
     )
-    primary = models.BooleanField(
-        verbose_name=_("Primary"),
-        default=False,
-    )
     client = models.ForeignKey(
         on_delete=models.CASCADE,
         to="directory.Entry",
@@ -194,7 +206,7 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         field=status,
         source=[Status.DRAFT],
         target=Status.APPROVED,
-        permission=lambda instance, user: user.has_perm("directory.change_clientmanagerrelationship"),
+        permission=lambda instance, user: user.has_perm("directory.administrate_clientmanagerrelationship"),
         custom={
             "_transition_button": ActionButton(
                 method=RequestType.PATCH,
@@ -209,13 +221,13 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         },
     )
     def mngapprove(self, by=None, description=None, **kwargs):
-        self._handle_primary_status()
+        pass
 
     @transition(
         field=status,
         source=[Status.PENDINGADD],
         target=Status.DRAFT,
-        permission=lambda instance, user: user.has_perm("directory.change_clientmanagerrelationship"),
+        permission=lambda instance, user: user.has_perm("directory.administrate_clientmanagerrelationship"),
         custom={
             "_transition_button": ActionButton(
                 method=RequestType.PATCH,
@@ -236,7 +248,7 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         field=status,
         source=[Status.PENDINGADD],
         target=Status.APPROVED,
-        permission=lambda instance, user: user.has_perm("directory.change_clientmanagerrelationship"),
+        permission=lambda instance, user: user.has_perm("directory.administrate_clientmanagerrelationship"),
         custom={
             "_transition_button": ActionButton(
                 method=RequestType.PATCH,
@@ -251,13 +263,13 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         },
     )
     def approve(self, by=None, description=None, **kwargs):
-        self._handle_primary_status()
+        pass
 
     @transition(
         field=status,
         source=[Status.PENDINGREMOVE],
         target=Status.APPROVED,
-        permission=lambda instance, user: user.has_perm("directory.change_clientmanagerrelationship"),
+        permission=lambda instance, user: user.has_perm("directory.administrate_clientmanagerrelationship"),
         custom={
             "_transition_button": ActionButton(
                 method=RequestType.PATCH,
@@ -278,7 +290,7 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
         field=status,
         source=[Status.PENDINGREMOVE],
         target=Status.REMOVED,
-        permission=lambda instance, user: user.has_perm("directory.change_clientmanagerrelationship"),
+        permission=lambda instance, user: user.has_perm("directory.administrate_clientmanagerrelationship"),
         custom={
             "_transition_button": ActionButton(
                 method=RequestType.PATCH,
@@ -295,8 +307,8 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
     def approveremoval(self, by=None, description=None, **kwargs):
         pass
 
-    def is_not_primary(instance):
-        return not instance.primary
+    def is_not_primary(self):
+        return not self.primary
 
     @transition(
         field=status,
@@ -319,10 +331,10 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
     def makeprimary(self, by=None, description=None, **kwargs):
         self.primary = True
 
-    def last_primary(instance):
-        return not instance.primary and (
-            ClientManagerRelationship.objects.exclude(id=instance.id)
-            .filter(status=ClientManagerRelationship.Status.APPROVED, client=instance.client, primary=True)
+    def last_primary(self):
+        return not self.primary and (
+            ClientManagerRelationship.objects.exclude(id=self.id)
+            .filter(status=ClientManagerRelationship.Status.APPROVED, client=self.client, primary=True)
             .exists()
         )
 
@@ -373,24 +385,6 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
     def delete(self, **kwargs):
         super().delete(no_deletion=False)  # For this model we actually want to delete the object
 
-    def get_related_queryset(self):
-        return (
-            super().get_related_queryset().filter(status=self.Status.APPROVED)
-        )  # only one approved relationship can be primary
-
-    def _handle_primary_status(self):
-        if (
-            self.primary is True
-            and ClientManagerRelationship.objects.filter(client=self.client, primary=True).exists()
-        ):
-            ClientManagerRelationship.objects.filter(client=self.client, primary=True).update(primary=False)
-
-        if (
-            self.primary is False
-            and not ClientManagerRelationship.objects.filter(client=self.client, primary=True).exists()
-        ):
-            self.primary = True
-
     class Meta:
         verbose_name = _("Client Manager Relationship")
         verbose_name_plural = _("Client Manager Relationships")
@@ -402,6 +396,7 @@ class ClientManagerRelationship(ComplexToStringMixin, PrimaryMixin, WBModel):
                 help_text="Sends you a notification when there is a Relationship manager change to approve.",
             )
         ]
+        permissions = (("administrate_clientmanagerrelationship", "Can administrate Client Manager Relationship"),)
 
     @classmethod
     def get_representation_endpoint(cls):
@@ -560,6 +555,7 @@ class EmployerEmployeeRelationship(PrimaryMixin):
     def get_representation_value_key(cls):
         return "id"
 
+    @classmethod
     def representation_label_key(cls):
         return "{{position_name}}"
 

wbcore/contrib/directory/permissions.py

@@ -0,0 +1,6 @@
+from rest_framework.permissions import IsAuthenticated
+
+
+class IsClientManagerRelationshipAdmin(IsAuthenticated):
+    def has_permission(self, request, view):
+        return request.user.has_perm("directory.administrate_clientmanagerrelationship")

wbcore/contrib/directory/serializers/companies.py

@@ -26,10 +26,8 @@ class CompanyModelSerializer(EntryModelSerializer):
         many=True,
     )
     _employees = PersonRepresentationSerializer(source="employees", many=True)
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
-    tier = wb_serializers.CharField(
-        help_text=settings.DEFAULT_TIERING_HELP_TEXT, required=False, read_only=True, label=_("Tier")
-    )
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
+    tier = wb_serializers.CharField(help_text=settings.DEFAULT_TIERING_HELP_TEXT, label=_("Tier"), required=False)
     _type = CompanyTypeRepresentationSerializer(source="type")
 
     @wb_serializers.register_resource()
@@ -63,6 +61,8 @@ class CompanyModelSerializer(EntryModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
             "signature",
@@ -77,7 +77,7 @@ class CompanyModelSerializer(EntryModelSerializer):
 
 class CompanyModelListSerializer(CompanyModelSerializer):
     eer_id = wb_serializers.CharField(default="", required=False, read_only=True)
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
 
     @wb_serializers.register_resource()
     def delete(self, instance, request, user):
@@ -127,8 +127,14 @@ class CompanyModelListSerializer(CompanyModelSerializer):
             "_customer_status",
             "eer_id",
             "is_primary_employer",
+            "primary_address",
+            "primary_email",
             "primary_manager_repr",
+            "primary_telephone",
+            "primary_website",
+            "primary_social",
             "last_event",
+            "last_event_period_endswith",
             "tier",
             "type",
             "_type",
@@ -137,10 +143,12 @@ class CompanyModelListSerializer(CompanyModelSerializer):
 
 
 class BankModelSerializer(wb_serializers.ModelSerializer):
-    primary_address = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Address"), read_only=True)
-    primary_email = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Email"), read_only=True)
+    primary_address = wb_serializers.CharField(
+        allow_null=True, label=_("Primary Address"), read_only=True, required=False
+    )
+    primary_email = wb_serializers.CharField(allow_null=True, label=_("Primary Email"), required=False, read_only=True)
     primary_telephone = wb_serializers.TelephoneField(
-        allow_null=True, default="", label=_("Primary Telephone"), read_only=True
+        allow_null=True, label=_("Primary Telephone"), read_only=True, required=False
     )
     _relationship_managers = PersonRepresentationSerializer(many=True, source="relationship_managers")
 

wbcore/contrib/directory/serializers/contacts.py

@@ -126,8 +126,8 @@ class EmailContactSerializer(wb_serializers.ModelSerializer):
         if address:
             try:
                 validate_email(address)
-            except ValidationError:
-                raise serializers.ValidationError({"address": _("Invalid e-mail address")})
+            except ValidationError as e:
+                raise serializers.ValidationError({"address": _("Invalid e-mail address")}) from e
         return data
 
     class Meta:
@@ -261,8 +261,8 @@ class TelephoneContactSerializer(wb_serializers.ModelSerializer):
                     data["number"] = formatted_number
                 else:
                     raise serializers.ValidationError({"number": _("Invalid phone number format")})
-            except Exception:
-                raise serializers.ValidationError({"number": _("Invalid phone number format")})
+            except Exception as e:
+                raise serializers.ValidationError({"number": _("Invalid phone number format")}) from e
 
             if entry and formatting_successful:
                 telephone_contact = TelephoneContact.objects.filter(number=formatted_number, entry=entry)
@@ -310,7 +310,7 @@ class BankingContactSerializer(wb_serializers.ModelSerializer):
                 iban_formatted = iban.formatted
                 data["iban"] = iban_formatted
             except ValueError as e:
-                raise serializers.ValidationError({"iban": e})
+                raise serializers.ValidationError({"iban": e}) from e
 
             if entry and iban_formatted:
                 banking_contact = BankingContact.objects.filter(iban=iban_formatted, entry=entry)
@@ -325,7 +325,7 @@ class BankingContactSerializer(wb_serializers.ModelSerializer):
             try:
                 BIC(swift_bic_repr)
             except ValueError as e:
-                raise serializers.ValidationError({"swift_bic": e})
+                raise serializers.ValidationError({"swift_bic": e}) from e
         return data
 
     class Meta:
@@ -364,8 +364,8 @@ class SocialMediaContactSerializer(wb_serializers.ModelSerializer):
         url = data.get("url", self.instance.url if self.instance else "")
         try:
             URLValidator()(url)
-        except ValidationError:
-            raise serializers.ValidationError({"url": _("The URL you provided seems to be wrong.")})
+        except ValidationError as e:
+            raise serializers.ValidationError({"url": _("The URL you provided seems to be wrong.")}) from e
 
         if self.instance and (
             ((data_entry := data.get("entry")) != self.instance.entry)

wbcore/contrib/directory/serializers/entries.py

@@ -166,6 +166,7 @@ class SpecializationRepresentationSerializer(wb_serializers.RepresentationSerial
 
 class EntryModelSerializer(wb_serializers.ModelSerializer):
     last_event = wb_serializers.CharField(read_only=True)
+    last_event_period_endswith = wb_serializers.DateTimeField(read_only=True)
     activity_heat = wb_serializers.RangeSelectField(
         color="rgb(220,20,60)", label=_("Activity Heat"), read_only=True, required=False
     )
@@ -180,7 +181,7 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
         read_only=True,
         required=False,
     )
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
     position_in_company = wb_serializers.CharField(
         allow_null=True,
         default="",
@@ -191,19 +192,26 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
         read_only=True,
         required=False,
     )
-    primary_address = wb_serializers.CharField(default="", label=_("Primary Address"), read_only=True)
-    primary_email = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Email"), read_only=False)
-    primary_manager_repr = wb_serializers.CharField(label=_("Primary Manager"), read_only=True)
-    primary_telephone = wb_serializers.TelephoneField(allow_null=True, default="", label=_("Primary Telephone"))
+    primary_address = wb_serializers.CharField(
+        allow_null=True, read_only=True, required=False, label=_("Primary Address")
+    )
+    primary_email = wb_serializers.CharField(
+        allow_null=True, required=False, read_only=False, label=_("Primary Email")
+    )
+    primary_manager_repr = wb_serializers.CharField(
+        allow_null=True, read_only=True, required=False, label=_("Primary Manager")
+    )
+    primary_telephone = wb_serializers.TelephoneField(
+        allow_null=True,
+        required=False,
+        label=_("Primary Telephone"),
+    )
+    primary_website = wb_serializers.URLField(allow_null=True, required=False, label=_("Primary Website"))
+    primary_social = wb_serializers.URLField(allow_null=True, required=False, label=_("Primary Social"))
     profile_image = wb_serializers.ImageField(allow_null=True, required=False, label=_("Profile Image"))
     _relationship_managers = PersonRepresentationSerializer(many=True, source="relationship_managers")
     _social_media = SocialMediaContactRepresentationSerializer(many=True, read_only=True, source="social_media")
-    primary_manager = wb_serializers.PrimaryKeyRelatedField(
-        queryset=lambda: Person.objects.filter_only_internal(),
-        default=wb_serializers.CurrentUserDefault("profile"),
-        label=_("Primary Manager"),
-        required=False,
-    )
+    primary_manager = wb_serializers.PrimaryKeyRelatedField(label=_("Primary Manager"), required=False, read_only=True)
     _primary_manager = InternalUserProfileRepresentationSerializer(source="primary_manager")
 
     @wb_serializers.register_resource()
@@ -251,8 +259,8 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
         if primary_email := data.get("primary_email", None):
             try:
                 validate_email(primary_email)
-            except ValidationError:
-                raise ValidationError({"primary_email": "Invalid e-mail address"})
+            except ValidationError as e:
+                raise ValidationError({"primary_email": "Invalid e-mail address"}) from e
 
         if primary_telephone := data.get("primary_telephone", None):
             try:
@@ -264,8 +272,8 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
                     data["primary_telephone"] = formatted_number
                 else:
                     raise ValidationError({"primary_telephone": gettext("Invalid phone number format")})
-            except Exception:
-                raise ValidationError({"primary_telephone": gettext("Invalid phone number format")})
+            except Exception as e:
+                raise ValidationError({"primary_telephone": gettext("Invalid phone number format")}) from e
         return super().validate(data)
 
     def update(self, instance, validated_data):
@@ -316,6 +324,7 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
 
         fields = (
             "last_event",
+            "last_event_period_endswith",
             "id",
             "computed_str",
             "activity_heat",
@@ -331,6 +340,8 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "relationship_managers",
             "_relationship_managers",

wbcore/contrib/directory/serializers/entry_representations.py

@@ -9,8 +9,10 @@ from ..models import Entry
 class EntryRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.SerializerMethodField()
     _detail_preview = wb_serializers.HyperlinkField(reverse_name="wbcore:directory:entry-detail")
-    primary_email = wb_serializers.CharField(default="", label=_("Primary Email"), allow_null=True)
-    primary_telephone = wb_serializers.TelephoneField(default="", label=_("Primary Telephone"), allow_null=True)
+    primary_email = wb_serializers.CharField(read_only=True, required=False, label=_("Primary Email"), allow_null=True)
+    primary_telephone = wb_serializers.TelephoneField(
+        read_only=True, required=False, label=_("Primary Telephone"), allow_null=True
+    )
 
     def get__detail(self, obj):
         if obj.is_company:

wbcore/contrib/directory/serializers/persons.py

@@ -3,6 +3,7 @@ from rest_framework.reverse import reverse
 
 from wbcore import serializers as wb_serializers
 from wbcore.contrib.color.enums import WBColor
+from wbcore.contrib.i18n.serializers.mixins import ModelTranslateSerializerMixin
 
 from ..models import Company, EmployerEmployeeRelationship, Person, Position
 from .entries import (
@@ -13,14 +14,11 @@ from .entries import (
 from .relationships import PositionRepresentationSerializer
 
 
-class PersonModelSerializer(EntryModelSerializer):
-    activites_count = wb_serializers.IntegerField(default=0, read_only=True)
-
+class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer):
     primary_employer_repr = wb_serializers.CharField(read_only=True, required=False, label=_("Primary Employer"))
     has_user_account = wb_serializers.CharField(read_only=True, label=_("User Account"))
     name = wb_serializers.CharField(read_only=True)
     last_connection = wb_serializers.DateTimeField(read_only=True, default=None, label=_("Last Connection"))
-    secondary_email = wb_serializers.CharField(default="", label=_("Secondary Email"), allow_null=True, read_only=True)
     personality_profile_red = wb_serializers.RangeSelectField(
         color=WBColor.RED_LIGHT.value, required=False, label=_("Personality Profile Red")
     )
@@ -31,7 +29,7 @@ class PersonModelSerializer(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"):
@@ -81,7 +79,6 @@ class PersonModelSerializer(EntryModelSerializer):
             "name",
             "computed_str",
             "active_employee",
-            "activites_count",
             "activity_heat",
             "addresses",
             "cities",
@@ -103,14 +100,17 @@ class PersonModelSerializer(EntryModelSerializer):
             "primary_manager_repr",
             "primary_employer_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
-            "secondary_email",
             "specializations",
             "_specializations",
             "tier",
             "_additional_resources",
             "initials",
+            "description",
+            "_i18n",
         )
 
 
@@ -201,12 +201,14 @@ class PersonModelListSerializer(PersonModelSerializer):
             "_cities",
             "customer_status",
             "primary_employer_repr",
+            "primary_address",
+            "primary_email",
             "primary_manager_repr",
+            "primary_website",
+            "primary_social",
+            "primary_telephone",
             "last_event",
             "position_in_company",
-            "primary_email",
-            "primary_telephone",
-            "primary_telephone",
             "tier",
             "_additional_resources",
         )

wbcore/contrib/directory/serializers/relationships.py

@@ -131,8 +131,8 @@ class RelationshipModelSerializer(serializers.ModelSerializer):
                 data["from_entry_id"] = self.instance.from_entry.id
             else:
                 data["from_entry_id"] = self.context["view"].kwargs["entry_id"]
-        except KeyError:
-            raise ValidationError(_("From entry has to be set."))
+        except KeyError as e:
+            raise ValidationError(_("From entry has to be set.")) from e
         from_entry = data.get("from_entry", getattr(self.instance, "from_entry", None))
         to_entry = data.get("to_entry", getattr(self.instance, "to_entry", None))
 

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")