Fix custom field id handling

Author: VaghinakDev

src/superannotate/lib/core/serviceproviders.py

@@ -881,6 +881,7 @@ def get_custom_field_name(
     @abstractmethod
     def get_custom_field_component_id(
         self,
+        context: dict,
         field_id: int,
         entity: CustomFieldEntityEnum,
         parent: CustomFieldEntityEnum,

src/superannotate/lib/core/usecases/projects.py

@@ -186,6 +186,7 @@ def execute(self):
                     )
                     # timestamp: convert milliseconds to seconds
                     component_id = self._service_provider.get_custom_field_component_id(
+                        context,
                         field_id,
                         entity=CustomFieldEntityEnum.PROJECT,
                         parent=CustomFieldEntityEnum.TEAM,

src/superannotate/lib/infrastructure/controller.py

@@ -97,7 +97,7 @@ def serialize_custom_fields(
             field_id = int(custom_field_name)
             try:
                 component_id = service_provider.get_custom_field_component_id(
-                    field_id, entity=entity, parent=parent_entity
+                    context, field_id, entity=entity, parent=parent_entity
                 )
             except AppException:
                 # The component template can be deleted, but not from the entity, so it will be skipped.
@@ -155,7 +155,7 @@ def set_custom_field_value(
             _context, field_name, entity=entity, parent=parent_entity
         )
         component_id = self.service_provider.get_custom_field_component_id(
-            template_id, entity=entity, parent=parent_entity
+            _context, template_id, entity=entity, parent=parent_entity
         )
         # timestamp: convert seconds to milliseconds
         if component_id == CustomFieldType.DATE_PICKER.value and value is not None:

src/superannotate/lib/infrastructure/query_builder.py

@@ -174,22 +174,28 @@ def __init__(
         self._parent = parent
         self._team_id = team_id
         self._project_id = project_id
+        self._context = {"team_id": self._team_id, "project_id": self._project_id}
 
     def _handle_custom_field_key(self, key) -> Tuple[str, str, Optional[str]]:
-        context = {"team_id": self._team_id, "project_id": self._project_id}
         for custom_field in sorted(
             self._service_provider.list_custom_field_names(
-                context, self._entity, parent=self._parent
+                self._context, self._entity, parent=self._parent
             ),
             key=len,
             reverse=True,
         ):
             if custom_field in key:
                 custom_field_id = self._service_provider.get_custom_field_id(
-                    context, custom_field, entity=self._entity, parent=self._parent
+                    self._context,
+                    custom_field,
+                    entity=self._entity,
+                    parent=self._parent,
                 )
                 component_id = self._service_provider.get_custom_field_component_id(
-                    custom_field_id, entity=self._entity, parent=self._parent
+                    self._context,
+                    custom_field_id,
+                    entity=self._entity,
+                    parent=self._parent,
                 )
                 key = key.replace(
                     custom_field,
@@ -230,7 +236,10 @@ def _determine_condition_and_key(keys: List[str]) -> Tuple[OperatorEnum, str]:
     def _handle_special_fields(self, keys: List[str], val):
         if keys[0] == "custom_field":
             component_id = self._service_provider.get_custom_field_component_id(
-                field_id=int(keys[1]), entity=self._entity, parent=self._parent
+                self._context,
+                field_id=int(keys[1]),
+                entity=self._entity,
+                parent=self._parent,
             )
             if component_id == CustomFieldType.DATE_PICKER.value and val is not None:
                 try:

src/superannotate/lib/infrastructure/serviceprovider.py

@@ -125,12 +125,13 @@ def get_custom_field_name(
 
     def get_custom_field_component_id(
         self,
+        context: EntityContext,
         field_id: int,
         entity: CustomFieldEntityEnum,
         parent: CustomFieldEntityEnum,
     ) -> str:
         return self._cached_work_management_repository.get_custom_field_component_id(
-            {"team_id": self.client.team_id}, field_id, entity=entity, parent=parent
+            context, field_id, entity=entity, parent=parent
         )
 
     def get_role_id(self, project: entities.ProjectEntity, role_name: str) -> int:

tests/integration/work_management/test_pause_resume_user_activity.py

@@ -36,6 +36,8 @@ def test_pause_and_resume_user_activity(self):
         scapegoat = [
             u for u in users if u["role"] == "Contributor" and u["state"] == "Confirmed"
         ][0]
+        import pdb
+        pdb.set_trace()
         sa.add_contributors_to_project(self.PROJECT_NAME, [scapegoat["email"]], "QA")
         with self.assertLogs("sa", level="INFO") as cm:
             sa.pause_user_activity(pk=scapegoat["email"], projects=[self.PROJECT_NAME])