feat #740: filter personal team if tenant's subscriptionSecurity is a…

…ctivated.
MAIF · Sep 5, 2024 · bfcabf4 · bfcabf4
1 parent cad25d6
commit bfcabf4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/daikoku/app/controllers/ApiController.scala b/daikoku/app/controllers/ApiController.scala
@@ -3309,14 +3309,21 @@ class ApiController(
         val teamUsersFilter =
           if (ctx.user.isDaikokuAdmin) Json.obj()
           else Json.obj("users.userId" -> ctx.user.id.value)
-
+        val typeFilter = if (ctx.tenant.subscriptionSecurity.isDefined
+          &&  ctx.tenant.subscriptionSecurity.exists(identity)) {
+          Json.obj(
+            "type" -> Json.obj("$in" -> Json.arr(TeamType.Admin.name, TeamType.Organization.name))
+          )
+        } else {
+          Json.obj()
+        }
         for {
           myTeams <- env.dataStore.teamRepo.myTeams(ctx.tenant, ctx.user)
           teams <-
             env.dataStore.teamRepo
               .forTenant(ctx.tenant.id)
               .findNotDeleted(
-                Json.obj("name" -> searchAsRegex) ++ teamUsersFilter,
+                Json.obj("name" -> searchAsRegex) ++ teamUsersFilter ++ typeFilter,
                 5,
                 Json.obj("name" -> 1).some
               )

diff --git a/daikoku/app/domain/CommonServices.scala b/daikoku/app/domain/CommonServices.scala
@@ -673,6 +673,14 @@ object CommonServices {
     _TenantAdminAccessTenant(
       AuditTrailEvent("@{user.name} has accessed to all teams list")
     )(ctx) {
+      val typeFilter = if (ctx.tenant.subscriptionSecurity.isDefined
+        &&  ctx.tenant.subscriptionSecurity.exists(identity)) {
+        Json.obj(
+          "type" -> Json.obj("$in" -> Json.arr(TeamType.Admin.name, TeamType.Organization.name))
+        )
+      } else {
+        Json.obj()
+      }
       for {
         teams <-
           env.dataStore.teamRepo
@@ -681,7 +689,7 @@ object CommonServices {
               Json.obj(
                 "_deleted" -> false,
                 "name" -> Json.obj("$regex" -> research)
-              ),
+              )++ typeFilter,
               offset,
               limit,
               Some(Json.obj("_humanReadableId" -> 1))

diff --git a/daikoku/app/storage/api.scala b/daikoku/app/storage/api.scala
@@ -400,15 +400,27 @@ trait TeamRepo extends TenantCapableRepo[Team, TeamId] {
       env: Env,
       ec: ExecutionContext
   ): Future[Seq[Team]] = {
+    val typeFilter = if (tenant.subscriptionSecurity.isDefined
+      &&  tenant.subscriptionSecurity.exists(identity)) {
+      Json.obj(
+        "type" -> Json.obj("$in" -> Json.arr(TeamType.Admin.name, TeamType.Organization.name))
+      )
+    } else {
+      Json.obj()
+    }
     if (user.isDaikokuAdmin) {
       env.dataStore.teamRepo
         .forTenant(tenant.id)
-        .findAllNotDeleted()
+        .findNotDeleted(
+            typeFilter
+        )
+
+
     } else {
       env.dataStore.teamRepo
         .forTenant(tenant.id)
         .findNotDeleted(
-          Json.obj("users.userId" -> user.id.value)
+          Json.obj("users.userId" -> user.id.value) ++ typeFilter
         )
     }
   }