updates in user/project list

Author: Narek Mkhitaryan

src/superannotate/lib/core/jsx_conditions.py

@@ -13,7 +13,9 @@ class OperatorEnum(str, Enum):
     EQ = "$eq"
     NE = "$ne"
     GT = "$gt"
+    GTE = "$gte"
     LT = "$lt"
+    LTE = "$lte"
     IS = "$is"
     CONTAINS = "$cont"
     STARTS = "$starts"

src/superannotate/lib/infrastructure/controller.py

@@ -162,9 +162,15 @@ def set_custom_field_value(
         )
 
     def list_users(self, include: List[Literal["custom_fields"]] = None, **filters):
+        valid_fields = generate_schema(
+            UserFilters.__annotations__,
+            self.service_provider.get_custom_fields_templates(
+                CustomFieldEntityEnum.CONTRIBUTOR
+            ),
+        )
         chain = QueryBuilderChain(
             [
-                FieldValidationHandler(UserFilters.__annotations__.keys()),
+                FieldValidationHandler(valid_fields.keys()),
                 UserFilterHandler(
                     service_provider=self.service_provider,
                     entity=CustomFieldEntityEnum.CONTRIBUTOR,

src/superannotate/lib/infrastructure/custom_entities.py

@@ -10,29 +10,34 @@
         OperatorEnum.NOTIN,
         OperatorEnum.CONTAINS,
     ],
-    CustomFieldType.MULTI_SELECT: [OperatorEnum.EQ, OperatorEnum.NOTIN],
+    CustomFieldType.MULTI_SELECT: [
+        OperatorEnum.EQ,
+        OperatorEnum.NOTIN,
+        OperatorEnum.IN,
+    ],
     CustomFieldType.SINGLE_SELECT: [
         OperatorEnum.EQ,
         OperatorEnum.IN,
         OperatorEnum.NOTIN,
         OperatorEnum.CONTAINS,
     ],
-    CustomFieldType.DATE_PICKER: [OperatorEnum.GT, OperatorEnum.LT, OperatorEnum.EQ],
+    CustomFieldType.DATE_PICKER: [
+        OperatorEnum.GT,
+        OperatorEnum.LT,
+        OperatorEnum.GTE,
+        OperatorEnum.LTE,
+        OperatorEnum.EQ,
+    ],
     CustomFieldType.NUMERIC: [
         OperatorEnum.GT,
         OperatorEnum.LT,
         OperatorEnum.EQ,
+        OperatorEnum.NE,
         OperatorEnum.IN,
         OperatorEnum.NOTIN,
     ],
 }
 
-# todo implement
-FIELD_TYPE_BED_OPERATIONS_MAPPING = {
-    CustomFieldType.MULTI_SELECT: {OperatorEnum.EQ: OperatorEnum.IN},
-    CustomFieldType.DATE_PICKER: {OperatorEnum.EQ: OperatorEnum.IS},
-}
-
 
 def generate_schema(base_schema: dict, custom_field_templates) -> dict:
     annotations = base_schema

src/superannotate/lib/infrastructure/query_builder.py

@@ -109,14 +109,20 @@ def _handle_custom_field_key(self, key) -> Tuple[str, str, Optional[str]]:
             reverse=True,
         ):
             if custom_field in key:
-                return key.replace(
+                custom_field_id = self._service_provider.get_custom_field_id(
+                    custom_field, entity=self._entity
+                )
+                component_id = self._service_provider.get_custom_field_component_id(
+                    custom_field_id, entity=self._entity
+                )
+                key = key.replace(
                     custom_field,
-                    str(
-                        self._service_provider.get_custom_field_id(
-                            custom_field, entity=self._entity
-                        )
-                    ),
+                    str(custom_field_id),
                 ).split("__")
+                # in case multi_select replace EQ to IN (BED requirement)
+                if component_id == CustomFieldType.MULTI_SELECT.value and len(key) == 2:
+                    key.append(OperatorEnum.IN.name)
+                return key
         raise AppException("Invalid custom field name provided.")
 
     @staticmethod

src/superannotate/lib/infrastructure/utils.py

@@ -65,7 +65,8 @@ def sync(self, **kwargs):
         raise NotImplementedError
 
     def get(self, key, **kwargs):
-        self.sync(**kwargs)
+        if not self._is_cache_valid(key):
+            self.sync(**kwargs)
         return self._K_V_map[key]
 
 
@@ -143,7 +144,8 @@ def sync(self, team_id):
         self._update_cache_timestamp(team_id)
 
     def get(self, key, **kwargs):
-        self.sync(team_id=key)
+        if not self._is_cache_valid(key):
+            self.sync(team_id=key)
         return self._K_V_map[key]
 
 

tests/integration/work_management/test_project_custom_fields.py

@@ -1,3 +1,4 @@
+import time
 from typing import Any
 from typing import Dict
 
@@ -131,6 +132,7 @@ def test_set_project_custom_field_validation(
                 self.PROJECT_NAME, "SDK_test_single_select", 123
             )
 
+    # TODO BED issue ("projects/search" endpoint return other teams projects)
     def test_list_projects_by_native_fields(self):
         projects = sa.list_projects(name=self.PROJECT_NAME)
         assert len(projects) == 1
@@ -237,23 +239,28 @@ def test_list_projects_by_custom_fields(self):
             len(
                 sa.list_projects(
                     include=["custom_fields"],
-                    custom_field__SDK_test_multi_select__in=["option1"],
+                    custom_field__SDK_test_date_picker__gte=time.time(),
                 )
             )
-            == 1
+            == 0
         )
         assert (
             len(
                 sa.list_projects(
                     include=["custom_fields"],
-                    custom_field__SDK_test_multi_select__in=["option1", "option2"],
+                    custom_field__SDK_test_date_picker__lte=time.time(),
                 )
             )
             == 1
         )
-
-        self._set_custom_field_values(
-            {"SDK_test_multi_select": ["option1", "option2", "option3"]}
+        assert (
+            len(
+                sa.list_projects(
+                    include=["custom_fields"],
+                    custom_field__SDK_test_multi_select__in=["option1"],
+                )
+            )
+            == 1
         )
         assert (
             len(
@@ -264,26 +271,28 @@ def test_list_projects_by_custom_fields(self):
             )
             == 1
         )
+        # multi select EQ case
         assert (
             len(
                 sa.list_projects(
                     include=["custom_fields"],
-                    custom_field__SDK_test_multi_select__contains="option3",
+                    custom_field__SDK_test_multi_select=["option1", "option2"],
                 )
             )
             == 1
         )
+
+        self._set_custom_field_values(
+            {"SDK_test_multi_select": ["option1", "option2", "option3"]}
+        )
         assert (
             len(
                 sa.list_projects(
                     include=["custom_fields"],
-                    custom_field__SDK_test_multi_select__contains=[
-                        "option3",
-                        "option1",
-                    ],
+                    custom_field__SDK_test_multi_select__in=["option1", "option2"],
                 )
             )
-            == 0
+            == 1
         )
         assert (
             len(
@@ -298,15 +307,11 @@ def test_list_projects_by_custom_fields(self):
             len(
                 sa.list_projects(
                     include=["custom_fields"],
-                    custom_field__SDK_test_multi_select__contains="option2",
+                    custom_field__SDK_test_single_select__contains="option1",
                 )
             )
             == 1
         )
-        assert not sa.list_projects(
-            include=["custom_fields"],
-            custom_field__SDK_test_multi_select__contains="invalid_option",
-        )
         assert (
             len(
                 sa.list_projects(
@@ -318,9 +323,7 @@ def test_list_projects_by_custom_fields(self):
         )
 
     def test_list_projects_by_custom_invalid_field(self):
-        with self.assertRaisesRegexp(
-            AppException, "Invalid custom field name provided."
-        ):
+        with self.assertRaisesRegexp(AppException, "Invalid filter param provided."):
             sa.list_projects(
                 include=["custom_fields"],
                 custom_field__INVALID_FIELD="text",
@@ -338,11 +341,3 @@ def test_list_projects_by_status_in(self):
         ]
         assert len(set(all_team_ids)) == 1
         assert all_team_ids[0] == sa.controller.team_id
-
-    # TODO BED issue (in case multiselect exact match)
-    def test_list_projects_by_multi_select_eq(self):
-        self._set_custom_field_values()
-        sa.list_projects(
-            include=["custom_fields"],
-            custom_field__SDK_test_multi_select=["option1", "option2"],
-        )

tests/integration/work_management/test_user_custom_fields.py

@@ -51,6 +51,7 @@ def test_get_set_user_metadata(self):
         users = sa.list_users()
         scapegoat = [u for u in users if u["role"] == "Contributor"][0]
         assert not scapegoat["custom_fields"]
+        # text field
         sa.set_user_custom_field(
             scapegoat["email"],
             custom_field_name="SDK_test_text",
@@ -70,6 +71,53 @@ def test_get_set_user_metadata(self):
         assert len(users) == 1
         assert users[0]["custom_fields"]["SDK_test_text"] == "Dummy data"
 
+        # multi select field
+        sa.set_user_custom_field(
+            scapegoat["email"],
+            custom_field_name="SDK_test_multi_select",
+            value=["option1", "option2"],
+        )
+        assert (
+            len(
+                sa.list_users(
+                    include=["custom_fields"],
+                    custom_field__SDK_test_multi_select=["option1", "option2"],
+                )
+            )
+            == 1
+        )
+
+        # single select field
+        sa.set_user_custom_field(
+            scapegoat["email"],
+            custom_field_name="SDK_test_single_select",
+            value="option1",
+        )
+        assert (
+            len(
+                sa.list_users(
+                    include=["custom_fields"],
+                    custom_field__SDK_test_single_select__contains="option1",
+                )
+            )
+            == 1
+        )
+
+        # numeric field
+        sa.set_user_custom_field(
+            scapegoat["email"],
+            custom_field_name="SDK_test_numeric",
+            value=5,
+        )
+        assert (
+            len(
+                sa.list_users(
+                    include=["custom_fields"], custom_field__SDK_test_numeric__lt=10
+                )
+            )
+            == 1
+        )
+
     def test_list_users(self):
         users = sa.list_users()
         all_contributors = [u for u in users if u["role"] == "Contributor"]