From 5131b17901b0a262e01d6c61340ea8e72899dc52 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Mon, 18 Apr 2022 16:36:14 +0300
Subject: [PATCH] Support not returning hidden sub-projects when include_stats
 is specified without search_hidden

---
 apiserver/bll/organization/tags_cache.py |  3 +++
 apiserver/bll/project/project_bll.py     | 26 +++++++++++++++++++++---
 apiserver/database/model/__init__.py     |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/apiserver/bll/organization/tags_cache.py b/apiserver/bll/organization/tags_cache.py
index 7ed62ce..bf6a602 100644
--- a/apiserver/bll/organization/tags_cache.py
+++ b/apiserver/bll/organization/tags_cache.py
@@ -6,6 +6,7 @@ from redis import Redis
 
 from apiserver.config_repo import config
 from apiserver.bll.project import project_ids_with_children
+from apiserver.database.model import EntityVisibility
 from apiserver.database.model.base import GetMixin
 from apiserver.database.model.model import Model
 from apiserver.database.model.task.task import Task
@@ -42,6 +43,8 @@ class _TagsCache:
                     query &= GetMixin.get_list_field_query(name, vals)
         if project:
             query &= Q(project__in=project_ids_with_children([project]))
+        else:
+            query &= Q(system_tags__nin=[EntityVisibility.hidden.value])
 
         return self.db_cls.objects(query).distinct(field)
 
diff --git a/apiserver/bll/project/project_bll.py b/apiserver/bll/project/project_bll.py
index e36d557..3968dd5 100644
--- a/apiserver/bll/project/project_bll.py
+++ b/apiserver/bll/project/project_bll.py
@@ -511,13 +511,14 @@ class ProjectBLL:
         project_ids: Sequence[str],
         specific_state: Optional[EntityVisibility] = None,
         include_children: bool = True,
+        return_hidden_children: bool = False,
         filter_: Mapping[str, Any] = None,
     ) -> Tuple[Dict[str, dict], Dict[str, dict]]:
         if not project_ids:
             return {}, {}
 
         child_projects = (
-            _get_sub_projects(project_ids, _only=("id", "name"))
+            _get_sub_projects(project_ids, _only=("id", "name", "system_tags"))
             if include_children
             else {}
         )
@@ -626,9 +627,24 @@ class ProjectBLL:
             for project in project_ids
         }
 
+        def filter_child_projects(project: str) -> Sequence[Project]:
+            non_filtered_children = child_projects.get(project, [])
+            if not non_filtered_children or return_hidden_children:
+                return non_filtered_children
+
+            return [
+                c
+                for c in non_filtered_children
+                if not c.system_tags
+                or EntityVisibility.hidden.value not in c.system_tags
+            ]
+
         children = {
             project: sorted(
-                [{"id": c.id, "name": c.name} for c in child_projects.get(project, [])],
+                [
+                    {"id": c.id, "name": c.name}
+                    for c in filter_child_projects(project)
+                ],
                 key=itemgetter("name"),
             )
             for project in project_ids
@@ -740,10 +756,13 @@ class ProjectBLL:
         If projects is None or empty then get parents for all the company tasks
         """
         query = Q(company=company_id)
+
         if projects:
             if include_subprojects:
                 projects = _ids_with_children(projects)
             query &= Q(project__in=projects)
+        else:
+            query &= Q(system_tags__nin=[EntityVisibility.hidden.value])
 
         if state == EntityVisibility.archived:
             query &= Q(system_tags__in=[EntityVisibility.archived.value])
@@ -772,7 +791,8 @@ class ProjectBLL:
         if project_ids:
             project_ids = _ids_with_children(project_ids)
             query &= Q(project__in=project_ids)
-
+        else:
+            query &= Q(system_tags__nin=[EntityVisibility.hidden.value])
         res = Task.objects(query).distinct(field="type")
         return set(res).intersection(external_task_types)
 
diff --git a/apiserver/database/model/__init__.py b/apiserver/database/model/__init__.py
index 52049ff..1ac82b3 100644
--- a/apiserver/database/model/__init__.py
+++ b/apiserver/database/model/__init__.py
@@ -60,3 +60,4 @@ def validate_id(cls, company, **kwargs):
 class EntityVisibility(Enum):
     active = "active"
     archived = "archived"
+    hidden = "hidden"