From 6799fa674994ed718d4c0c29781272d9a279e37c Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Fri, 19 Feb 2021 11:48:09 +0100
Subject: [PATCH] #1799 Update elastic4play for ES7.11 support

---
 project/Dependencies.scala                 | 2 +-
 thehive-backend/app/models/Migration.scala | 3 ++-
 thehive-backend/app/models/package.scala   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index e3dcc90901..018aa23e67 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
 
     val reflections      = "org.reflections"     % "reflections"         % "0.9.11"
     val zip4j            = "net.lingala.zip4j"   % "zip4j"               % "2.6.0"
-    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.3"
+    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.13.0"
     val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
     val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion
     val akkaClusterTools = "com.typesafe.akka"   %% "akka-cluster-tools" % play.core.PlayVersion.akkaVersion
diff --git a/thehive-backend/app/models/Migration.scala b/thehive-backend/app/models/Migration.scala
index cf5c1cbd4c..d07e0bf871 100644
--- a/thehive-backend/app/models/Migration.scala
+++ b/thehive-backend/app/models/Migration.scala
@@ -148,7 +148,7 @@ class Migration(
         renameAttribute("reportTemplate", "analyzerId", "analyzers"), // reportTemplate refers only one analyzer
         renameAttribute("reportTemplate", "reportType", "flavor"),    // rename flavor into reportType
         removeAttribute("case", "isIncident"),                        // this information is now stored in resolutionStatus
-        mapEntity("case") { c =>                                       // add case owner
+        mapEntity("case") { c =>                                      // add case owner
           val owner = (c \ "createdBy")
             .asOpt[JsString]
             .getOrElse(JsString("init"))
@@ -375,6 +375,7 @@ class Migration(
         }
       )
     case DatabaseState(15) => Nil
+    case DatabaseState(16) => Nil
   }
 
   private def generateAlertId(alert: JsObject): String = {
diff --git a/thehive-backend/app/models/package.scala b/thehive-backend/app/models/package.scala
index 92fd3669a9..62ee5ca8eb 100644
--- a/thehive-backend/app/models/package.scala
+++ b/thehive-backend/app/models/package.scala
@@ -1,3 +1,3 @@
 package object models {
-  val modelVersion = 16
+  val modelVersion = 17
 }