Merge pull request #744 from superannotateai/custom_fields

fix cuatom_field timstamp

Author: nareksa

src/superannotate/lib/app/interface/sdk_interface.py

@@ -43,6 +43,7 @@
 from lib.app.serializers import SettingsSerializer
 from lib.app.serializers import TeamSerializer
 from lib.core import LIMITED_FUNCTIONS
+from lib.core.entities.work_managament import WMUserTypeEnum
 from lib.core import entities
 from lib.core.conditions import CONDITION_EQ as EQ
 from lib.core.conditions import Condition
@@ -358,9 +359,13 @@ def set_user_custom_field(
                 value=1738671238.7
             )
         """
-        user_id = self.controller.work_management.get_user_metadata(pk=pk).id
+        user = self.controller.work_management.get_user_metadata(pk=pk)
+        if user.role == WMUserTypeEnum.TeamOwner:
+            raise AppException(
+                "Setting custom fields for the Team Owner is not allowed."
+            )
         self.controller.work_management.set_custom_field_value(
-            entity_id=user_id,
+            entity_id=user.id,
             field_name=custom_field_name,
             value=value,
             entity=CustomFieldEntityEnum.CONTRIBUTOR,

src/superannotate/lib/infrastructure/controller.py

@@ -145,7 +145,7 @@ def set_custom_field_value(
             template_id, entity=entity
         )
         # timestamp: convert seconds to milliseconds
-        if component_id == CustomFieldType.DATE_PICKER.value:
+        if component_id == CustomFieldType.DATE_PICKER.value and value is not None:
             try:
                 value = value * 1000
             except Exception:

src/superannotate/lib/infrastructure/query_builder.py

@@ -211,7 +211,7 @@ def _handle_special_fields(self, keys: List[str], val):
             component_id = self._service_provider.get_custom_field_component_id(
                 field_id=int(keys[1]), entity=self._entity
             )
-            if component_id == CustomFieldType.DATE_PICKER.value:
+            if component_id == CustomFieldType.DATE_PICKER.value and val is not None:
                 try:
                     val = val * 1000
                 except Exception:

tests/integration/work_management/test_user_custom_fields.py

@@ -1,6 +1,7 @@
 import time
 from unittest import TestCase
 
+from lib.core.entities.work_managament import WMUserTypeEnum
 from lib.core.exceptions import AppException
 from src.superannotate import SAClient
 from src.superannotate.lib.core.enums import CustomFieldEntityEnum
@@ -146,6 +147,19 @@ def test_list_users(self):
         )[0]
         assert scapegoat["custom_fields"]["SDK_test_date_picker"] == value
 
+        # by date_picker None case
+        sa.set_user_custom_field(
+            scapegoat["email"],
+            custom_field_name="SDK_test_date_picker",
+            value=None,
+        )
+        assert len(
+            sa.list_users(
+                include=["custom_fields"],
+                custom_field__SDK_test_date_picker=None,
+            )
+        ) == len(users)
+
         # by email__contains
         assert len(sa.list_users(email__contains="@superannotate.com")) == len(
             [i for i in users if i["email"].endswith("@superannotate.com")]
@@ -173,7 +187,15 @@ def test_set_user_custom_field_validation(self):
         )
         error_template_select = error_template + "\nValid options are: {options}."
         users = sa.list_users()
+        team_owner = [u for u in users if u["role"] == WMUserTypeEnum.TeamOwner.name][0]
         scapegoat = [u for u in users if u["role"] == "Contributor"][0]
+
+        # test for Team_Owner
+        with self.assertRaisesRegexp(
+            AppException, "Setting custom fields for the Team Owner is not allowed."
+        ):
+            sa.set_user_custom_field(team_owner["email"], "SDK_test_text", 123)
+
         # test for text
         with self.assertRaisesRegexp(AppException, error_template.format(type="str")):
             sa.set_user_custom_field(scapegoat["email"], "SDK_test_text", 123)