Merge pull request #829 from superannotateai/user_project_filters

User project filters

Author: VaghinakDev

src/superannotate/lib/infrastructure/controller.py

@@ -59,8 +59,7 @@
 from lib.infrastructure.query_builder import ProjectFilterHandler
 from lib.infrastructure.query_builder import ProjectUserRoleFilterHandler
 from lib.infrastructure.query_builder import QueryBuilderChain
-from lib.infrastructure.query_builder import TeamUserRoleFilterHandler
-from lib.infrastructure.query_builder import TeamUserStateFilterHandler
+from lib.infrastructure.query_builder import TeamUserFilterHandler
 from lib.infrastructure.repositories import S3Repository
 from lib.infrastructure.serviceprovider import ServiceProvider
 from lib.infrastructure.services.http_client import HttpClient
@@ -238,13 +237,7 @@ def list_users(
             chain = QueryBuilderChain(
                 [
                     FieldValidationHandler(valid_fields.keys()),
-                    TeamUserRoleFilterHandler(
-                        team_id=self.service_provider.client.team_id,
-                        service_provider=self.service_provider,
-                        entity=CustomFieldEntityEnum.CONTRIBUTOR,
-                        parent=parent_entity,
-                    ),
-                    TeamUserStateFilterHandler(
+                    TeamUserFilterHandler(
                         team_id=self.service_provider.client.team_id,
                         service_provider=self.service_provider,
                         entity=CustomFieldEntityEnum.CONTRIBUTOR,
@@ -717,7 +710,7 @@ def list_projects(
                 FieldValidationHandler(valid_fields.keys()),
                 ProjectFilterHandler(
                     team_id=self.service_provider.client.team_id,
-                    project_id=None,
+                    project=None,
                     service_provider=self.service_provider,
                     entity=CustomFieldEntityEnum.PROJECT,
                     parent=CustomFieldEntityEnum.TEAM,

src/superannotate/lib/infrastructure/query_builder.py

@@ -264,7 +264,7 @@ def handle(self, filters: Dict[str, Any], query: Query = None) -> Query:
         return super().handle(filters, query)
 
 
-class TeamUserRoleFilterHandler(BaseCustomFieldHandler):
+class TeamUserFilterHandler(BaseCustomFieldHandler):
     def _handle_special_fields(self, keys: List[str], val):
         """
         Handle special fields like 'custom_fields__'.
@@ -279,6 +279,14 @@ def _handle_special_fields(self, keys: List[str], val):
                     raise AppException("Invalid user role provided.")
             except (KeyError, AttributeError):
                 raise AppException("Invalid user role provided.")
+        elif keys[0] == "state":
+            try:
+                if isinstance(val, list):
+                    val = [WMUserStateEnum[i].value for i in val]
+                else:
+                    val = WMUserStateEnum[val].value
+            except (TypeError, KeyError):
+                raise AppException("Invalid user state provided.")
         return super()._handle_special_fields(keys, val)
 
 
@@ -303,22 +311,6 @@ def _handle_special_fields(self, keys: List[str], val):
         return super()._handle_special_fields(keys, val)
 
 
-class TeamUserStateFilterHandler(BaseCustomFieldHandler):
-    def _handle_special_fields(self, keys: List[str], val):
-        """
-        Handle special fields like 'custom_fields__'.
-        """
-        if keys[0] == "state":
-            try:
-                if isinstance(val, list):
-                    val = [WMUserStateEnum[i].value for i in val]
-                else:
-                    val = WMUserStateEnum[val].value
-            except (TypeError, KeyError):
-                raise AppException("Invalid user state provided.")
-        return super()._handle_special_fields(keys, val)
-
-
 class ProjectFilterHandler(BaseCustomFieldHandler):
     def _handle_special_fields(self, keys: List[str], val):
         """