wbcore 1.56.5__py2.py3-none-any.whl → 1.56.7__py2.py3-none-any.whl

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/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,7 +127,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 +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/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,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()
@@ -333,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

@@ -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")
     )
@@ -32,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"):
@@ -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/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/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):

{wbcore-1.56.5.dist-info → wbcore-1.56.7.dist-info}/METADATA

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

{wbcore-1.56.5.dist-info → wbcore-1.56.7.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=Zu4xt3q05tKk6t4Q2BwAMXPsqNdNbRB77in63yoVIUc,31664
+wbcore/contrib/directory/models/entries.py,sha256=S53zghpS18sqZGquAEirMGVuenHhq2Yhdh8ijTScPCw,31904
 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=lJpBsdjyh9t-Xgyp-xeirJdvdWWnQDAzW60icHiVuFE,5566
+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=cDU9RLcdC9mNh9cgMUwQFQI5PSubvz9OSfrzKvsghZA,13324
-wbcore/contrib/directory/serializers/entry_representations.py,sha256=az0qn45ur3dRt8HhEOpt67iu3dWiclW0zragtho6F5E,1343
-wbcore/contrib/directory/serializers/persons.py,sha256=NE_nc038TmovJOjaxhxi4OW-Fb7U5jXVPDF71qaB12M,7781
+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=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
@@ -365,7 +365,7 @@ wbcore/contrib/directory/tests/e2e/__init__.py,sha256=9KFYfXVP_0BwaYFvKQS4P_UMIA
 wbcore/contrib/directory/tests/e2e/e2e_directory_utility.py,sha256=zX71WsMmxQNW9ZLI-TMuxHmiY8PEZoBLt1ztqFSUDSE,7252
 wbcore/contrib/directory/viewsets/__init__.py,sha256=U6f6zuZCtv0ohtLkVYqNNqKl2vk7cugXXoxlPKULA9k,1878
 wbcore/contrib/directory/viewsets/contacts.py,sha256=LmQ_jK-SYG7u0A7DqBrNBTvRasvKtksE9JUVWLPW2OY,14428
-wbcore/contrib/directory/viewsets/entries.py,sha256=vZI0I-t4cYkPfIDeBl0Z19RfFTwNt2MFJu6UC2ag3w8,6762
+wbcore/contrib/directory/viewsets/entries.py,sha256=U56N4abi7Eu4VbH2RAKpB-4fY7gZywmyxmY2s1bshVQ,6780
 wbcore/contrib/directory/viewsets/mixins.py,sha256=8QI6mBpPxykVCvqABDZeQ0n7diHYoMafNH4ZMdCtC4c,353
 wbcore/contrib/directory/viewsets/relationships.py,sha256=jy73aCven25PbLoy3-KTjnAxdItyYZdfkVoClz5ogc4,10045
 wbcore/contrib/directory/viewsets/utils.py,sha256=2i7rIT8qMCD-ajT-uNN7Re4uMRwijrzvblokedJnwOw,3400
@@ -375,7 +375,7 @@ wbcore/contrib/directory/viewsets/buttons/entries.py,sha256=X7tH209qPojFNlBiE8hU
 wbcore/contrib/directory/viewsets/buttons/relationships.py,sha256=Q1vLLA9ZGt-s29Of8dj24IlMQzDzW_sMPU7n_F00DuY,2786
 wbcore/contrib/directory/viewsets/display/__init__.py,sha256=NiC0d1-RjPIYEzkGAQzThNFQeYv5UAW3aKL9j_lFV38,945
 wbcore/contrib/directory/viewsets/display/contacts.py,sha256=2PBSxVmbq_26LyhSTWrpjNv9cxKz7w086BqoVX7SDs4,13449
-wbcore/contrib/directory/viewsets/display/entries.py,sha256=ZWtDnKYxfjUPxoQ1O_7tOv5XhzdWRD-zZsI_miAHOjk,23171
+wbcore/contrib/directory/viewsets/display/entries.py,sha256=tMqdgklK_YjqQ6at2c4aBBf_yvx5PoxvPjWpIqVZw_Q,24295
 wbcore/contrib/directory/viewsets/display/relationships.py,sha256=-s3ABMIGmbvmAOe8CRJqVv8RpKaMw7xeoy0HSvo0kRQ,11587
 wbcore/contrib/directory/viewsets/display/utils.py,sha256=5sMFdEXUfanKp60IvTyO4YLqFlEUz9fGMldoqTYTnwU,830
 wbcore/contrib/directory/viewsets/endpoints/__init__.py,sha256=0z1LYIrLQvIcs2qZEfD2SYB6tqycmSQjlJ4NwZgd0JY,647
@@ -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.5.dist-info/METADATA,sha256=lITdRxKpfiRBHBDXsNkiri2OD7p4wnfHcCrzkwMFODE,2332
-wbcore-1.56.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcore-1.56.5.dist-info/RECORD,,
+wbcore-1.56.7.dist-info/METADATA,sha256=wUZw8P3Rfudayh6ulfJYieR4lWeV-w62wavr1ocxJDk,2332
+wbcore-1.56.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcore-1.56.7.dist-info/RECORD,,