#2305 Cleanup

TheHive-Project · Jan 24, 2022 · 3578a49 · 3578a49
1 parent 2d4328d
commit 3578a49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git 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
@@ -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