wbcore 1.56.4__tar.gz → 1.56.6__tar.gz

{wbcore-1.56.4 → wbcore-1.56.6}/PKG-INFO

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

{wbcore-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/models/entries.py

@@ -27,6 +27,7 @@ from wbcore.contrib.directory.models.contacts import (
     BankingContact,
     ContactLocationChoices,
     EmailContact,
+    SocialMediaContact,
     TelephoneContact,
     WebsiteContact,
 )
@@ -245,10 +246,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(),
@@ -263,6 +260,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(),

{wbcore-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/serializers/companies.py

@@ -26,7 +26,7 @@ class CompanyModelSerializer(EntryModelSerializer):
         many=True,
     )
     _employees = PersonRepresentationSerializer(source="employees", many=True)
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=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")
     )
@@ -63,6 +63,8 @@ class CompanyModelSerializer(EntryModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
             "signature",
@@ -77,7 +79,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,7 +129,12 @@ 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",
@@ -138,10 +145,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-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/serializers/entries.py

@@ -181,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="",
@@ -192,19 +192,27 @@ 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,
+        read_only=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()
@@ -333,6 +341,8 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "relationship_managers",
             "_relationship_managers",

{wbcore-1.56.4 → wbcore-1.56.6}/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-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/serializers/persons.py

@@ -15,13 +15,10 @@ from .relationships import PositionRepresentationSerializer
 
 
 class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer):
-    activites_count = wb_serializers.IntegerField(default=0, read_only=True)
-
     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")
     )
@@ -82,7 +79,6 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
             "name",
             "computed_str",
             "active_employee",
-            "activites_count",
             "activity_heat",
             "addresses",
             "cities",
@@ -104,9 +100,10 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
             "primary_manager_repr",
             "primary_employer_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
-            "secondary_email",
             "specializations",
             "_specializations",
             "tier",
@@ -204,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-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/viewsets/display/entries.py

@@ -285,13 +285,23 @@ class PersonModelDisplay(EntryModelDisplay):
         return dp.ListDisplay(
             fields=[
                 dp.Field(key="name", label=_("Name")),
-                dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
                 dp.Field(key="customer_status", label=_("Status")),
                 dp.Field(key="position_in_company", label=_("Position")),
                 dp.Field(key="cities", label=_("City")),
-                dp.Field(key="primary_telephone", label=_("Primary Phone Number")),
                 dp.Field(key="tier", label=_("Tier")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),
@@ -468,7 +478,18 @@ class CompanyModelDisplay(EntryModelDisplay):
                 dp.Field(key="type", label=_("Type")),
                 dp.Field(key="tier", label=_("Tier")),
                 dp.Field(key="customer_status", label=_("Status")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),

{wbcore-1.56.4 → wbcore-1.56.6}/wbcore/contrib/directory/viewsets/entries.py

@@ -150,11 +150,10 @@ class PersonModelViewSet(ModelTranslateMixin, EntryModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
-        )
+        qs = super().get_queryset()
+        if "pk" in self.kwargs:
+            qs = qs.annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
+        return qs
 
 
 class CompanyModelViewSet(EntryModelViewSet):