update privacy settings checks

Author: samonaisi

apps/accounts/tests/views/test_privacy_settings_fields.py

@@ -39,6 +39,7 @@ def assert_fields_visible(self, user, data):
         self.assertEqual(data["landline_phone"], user.landline_phone)
         self.assertEqual(data["mobile_phone"], user.mobile_phone)
         self.assertEqual(data["email"], user.email)
+        self.assertEqual(data["personal_email"], user.personal_email)
         self.assertEqual(data["linkedin"], user.linkedin)
         self.assertEqual(data["medium"], user.medium)
         self.assertEqual(data["website"], user.website)
@@ -55,6 +56,7 @@ def assert_fields_hidden(self, data):
         self.assertIsNone(data["landline_phone"])
         self.assertIsNone(data["mobile_phone"])
         self.assertIsNone(data["email"])
+        self.assertIsNone(data["personal_email"])
         self.assertIsNone(data["linkedin"])
         self.assertIsNone(data["medium"])
         self.assertIsNone(data["website"])
@@ -153,7 +155,6 @@ def test_view_fields_list_users(self, role, privacy_settings_value, fields_visib
         self.assertEqual(len(retrieved_user), 1)
         retrieved_user = retrieved_user[0]
         if fields_visible:
-            self.assertIsNotNone(retrieved_user["profile_picture"])
             self.assertEqual(
                 retrieved_user["profile_picture"]["id"], instance.profile_picture.id
             )

apps/commons/fields.py

@@ -1,6 +1,7 @@
 import inspect
 
 from django.contrib.auth.models import Group
+from django.db.models import QuerySet
 from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
 from drf_spectacular.types import OpenApiTypes
@@ -165,11 +166,44 @@ def __init__(self, **kwargs):
         ]
         super().__init__(**kwargs)
 
+    def _get_user(self, value):
+        if isinstance(value, ProjectUser):
+            return value
+        user_data = getattr(self.parent, "instance", None) or getattr(
+            self.parent, "queryset", None
+        )
+        if (
+            user_data
+            and isinstance(user_data, QuerySet)
+            and user_data.model == ProjectUser
+            and user_data.count() == 1
+        ):
+            return user_data.get()
+        if (
+            user_data
+            and isinstance(user_data, QuerySet)
+            and user_data.model == ProjectUser
+            and self.source_attrs
+        ):
+            return user_data.filter(**{self.source_attrs[0]: value}).first()
+        if user_data and isinstance(user_data, ProjectUser):
+            return user_data
+        if user_data and isinstance(user_data, list) and len(user_data) == 1:
+            return user_data[0]
+        if user_data and isinstance(user_data, list) and self.source_attrs:
+            return [
+                user
+                for user in user_data
+                if getattr(user, self.source_attrs[0]) == value
+            ][0]
+        if self.source_attrs:
+            queryset = ProjectUser.objects.filter(**{self.source_attrs[0]: value})
+            if queryset.count() == 1:
+                return queryset.get()
+        return None
+
     def _check_privacy_settings(self, value):
-        if isinstance(self.parent.instance, ProjectUser):
-            instance = self.parent.instance
-        else:
-            instance = value
+        instance = self._get_user(value)
         assert isinstance(instance, ProjectUser)
         request = self.context.get("request")
         assert request is not None

locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-25 17:05+0100\n"
+"POT-Creation-Date: 2024-12-10 14:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -166,16 +166,16 @@ msgstr ""
 msgid "Unknown publication status '{publication_status}'"
 msgstr ""
 
-#: apps/commons/fields.py:28 apps/skills/serializers.py:101
+#: apps/commons/fields.py:29 apps/skills/serializers.py:101
 msgid "This field is required."
 msgstr ""
 
-#: apps/commons/fields.py:29
+#: apps/commons/fields.py:30
 #, python-brace-format
 msgid "Invalid id \"{user_id}\" - object does not exist."
 msgstr ""
 
-#: apps/commons/fields.py:31 apps/skills/serializers.py:106
+#: apps/commons/fields.py:32 apps/skills/serializers.py:106
 #, python-brace-format
 msgid "Incorrect type. Expected str value, received {data_type}."
 msgstr ""

locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-25 17:05+0100\n"
+"POT-Creation-Date: 2024-12-10 14:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -190,16 +190,16 @@ msgstr "Statut de publication inconnu"
 msgid "Unknown publication status '{publication_status}'"
 msgstr "Statut de publication inconnu '{publication_status}'"
 
-#: apps/commons/fields.py:28 apps/skills/serializers.py:101
+#: apps/commons/fields.py:29 apps/skills/serializers.py:101
 msgid "This field is required."
 msgstr "Ce champ est obligatoire."
 
-#: apps/commons/fields.py:29
+#: apps/commons/fields.py:30
 #, python-brace-format
 msgid "Invalid id \"{user_id}\" - object does not exist."
 msgstr "identifiant invalide \"{user_id}\" - cet objet n'existe pas."
 
-#: apps/commons/fields.py:31 apps/skills/serializers.py:106
+#: apps/commons/fields.py:32 apps/skills/serializers.py:106
 #, python-brace-format
 msgid "Incorrect type. Expected str value, received {data_type}."
 msgstr "Type incorrect. Valeur str attendue, {data_type} reçue."