#60 Fix migration entity rename

TheHive-Project · Jul 9, 2018 · 23f764a · 23f764a
1 parent d3d985f
commit 23f764a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/org/elastic4play/services/MigrationSrv.scala b/app/org/elastic4play/services/MigrationSrv.scala
@@ -180,10 +180,10 @@ class MigrationSrv @Inject() (
 trait Operation extends ((String ⇒ Source[JsObject, NotUsed]) ⇒ (String ⇒ Source[JsObject, NotUsed]))
 object Operation {
   def apply(o: (String ⇒ Source[JsObject, NotUsed]) ⇒ String ⇒ Source[JsObject, NotUsed]) = new Operation {
-    def apply(f: (String ⇒ Source[JsObject, NotUsed])): (String) ⇒ Source[JsObject, NotUsed] = o(f)
+    def apply(f: String ⇒ Source[JsObject, NotUsed]): String ⇒ Source[JsObject, NotUsed] = o(f)
   }
   def renameEntity(previous: String, next: String): Operation = Operation((f: String ⇒ Source[JsObject, NotUsed]) ⇒ {
-    case `next` ⇒ f(previous)
+    case `next` ⇒ f(previous).map(_ + ("_type" -> JsString(next)))
     case "audit" ⇒ f("audit").map { x ⇒
       (x \ "objectType").asOpt[String] match {
         case Some(`previous`) ⇒ x - "objectType" + ("objectType" → JsString(next))

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version := "1.5.1-SNAPSHOT"
+version := "1.6.0-SNAPSHOT"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version := "1.5.1-SNAPSHOT"
		version := "1.6.0-SNAPSHOT"