From 3578a49d30ae66a2de2eed9c7d052956419134ef Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Mon, 24 Jan 2022 18:39:47 +0100
Subject: [PATCH] #2305 Cleanup

---
 ScalliGraph                                       |  2 +-
 .../org/thp/thehive/controllers/v1/UserCtrl.scala | 15 ---------------
 thehive/app/org/thp/thehive/services/TagSrv.scala |  7 ++++++-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ScalliGraph b/ScalliGraph
index 5c72cdd441..2052736e5d 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 5c72cdd441a9d38d38bd5a6b1bdc9deb45b547ab
+Subproject commit 2052736e5d6e59b07894e36e87ef971e63786835
diff --git a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
index 78d1857fd3..7ba1eddc6d 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
@@ -76,21 +76,6 @@ class UserCtrl @Inject() (
           }
       }
     )
-//
-//            authContext
-//          }))(org => userSteps.richUser(authContext, EntityIdOrName(org)))
-//          .page(params.from, params.to, params.extraData.contains("total"), limitedCountThreshold)
-//    )
-//  override def pageQuery(limitedCountThreshold: Long): ParamQuery[OutputParam] =
-//    Query.withParam[OutputParam, Traversal.V[Case], IteratorOutput](
-//      "page",
-//      {
-//        case (OutputParam(from, to, extraData), caseSteps, authContext) =>
-//          caseSteps.richPage(from, to, extraData.contains("total"), limitedCountThreshold) {
-//            _.richCaseWithCustomRenderer(caseStatsRenderer(extraData - "total")(authContext))(authContext)
-//          }
-//      }
-//    )
 
   override val outputQuery: Query =
     Query.outputWithContext[RichUser, Traversal.V[User]]((userSteps, authContext) => userSteps.richUser(authContext))
diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
index d5a429b129..615821a17a 100644
--- a/thehive/app/org/thp/thehive/services/TagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -189,7 +189,12 @@ class TagIntegrityCheckOps @Inject() (val db: Database, val service: TagSrv) ext
 
   override def globalCheck(): Map[String, Int] =
     service
-      .pagedTraversalIds(db, 100, _.filterNot(_.or(_.alert, _.observable, _.`case`, _.caseTemplate, _.taxonomy))) { ids =>
+      .pagedTraversalIds(
+        db,
+        100,
+        _.filter(_.taxonomy.has(_.namespace, TextP.startingWith("_freetags_")))
+          .filterNot(_.or(_.alert, _.observable, _.`case`, _.caseTemplate, _.taxonomy))
+      ) { ids =>
         db.tryTransaction { implicit graph =>
           Try {
             val orphans = service