From 7d7460b1c900b1bacf3ad63ccf5af253195a6cca Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Wed, 24 Jun 2020 00:23:22 +0200
Subject: [PATCH] Cleanup + hiding false errors from log

---
 .../src/main/scala/docspell/ftssolr/JsonCodec.scala  |  6 +++---
 .../scala/docspell/restserver/conv/Conversions.scala |  3 +--
 .../main/scala/docspell/store/queries/QItem.scala    | 12 ++++++++++--
 .../scala/docspell/store/records/RFtsMigration.scala |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/JsonCodec.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/JsonCodec.scala
index a053d724..96ee969d 100644
--- a/modules/fts-solr/src/main/scala/docspell/ftssolr/JsonCodec.scala
+++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/JsonCodec.scala
@@ -65,9 +65,9 @@ trait JsonCodec {
     new Decoder[FtsResult.ItemMatch] {
       final def apply(c: HCursor): Decoder.Result[FtsResult.ItemMatch] =
         for {
-          itemId <- c.get[Ident]("itemId")
-          id     <- c.get[Ident]("id")
-          coll   <- c.get[Ident]("collectiveId")
+          itemId <- c.get[Ident](Field.itemId.name)
+          id     <- c.get[Ident](Field.id.name)
+          coll   <- c.get[Ident](Field.collectiveId.name)
           score  <- c.get[Double]("score")
           md     <- decodeMatchData(c)
         } yield FtsResult.ItemMatch(id, itemId, coll, score, md)
diff --git a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
index 9cdd8be6..86296a15 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
@@ -173,10 +173,9 @@ trait Conversions {
     ItemLightList(gs)
   }
 
-  def mkItemListWithTagsFtsPlain(v: Vector[OFulltext.FtsItemWithTags]): ItemLightList = {
+  def mkItemListWithTagsFtsPlain(v: Vector[OFulltext.FtsItemWithTags]): ItemLightList =
     if (v.isEmpty) ItemLightList(Nil)
     else ItemLightList(List(ItemLightGroup("Results", v.map(mkItemLightWithTags).toList)))
-  }
 
   def mkItemLight(i: OItemSearch.ListItem): ItemLight =
     ItemLight(
diff --git a/modules/store/src/main/scala/docspell/store/queries/QItem.scala b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
index 64868a6c..5e172450 100644
--- a/modules/store/src/main/scala/docspell/store/queries/QItem.scala
+++ b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
@@ -214,7 +214,11 @@ object QItem {
       Batch(0, c)
   }
 
-  private def findItemsBase(q: Query, distinct: Boolean, ctes: (String, Fragment)*): Fragment = {
+  private def findItemsBase(
+      q: Query,
+      distinct: Boolean,
+      ctes: (String, Fragment)*
+  ): Fragment = {
     val IC         = RItem.Columns
     val AC         = RAttachment.Columns
     val PC         = RPerson.Columns
@@ -389,7 +393,11 @@ object QItem {
         .map(it => fr"(${it.itemId}, ${it.weight})")
         .reduce((r, e) => r ++ fr"," ++ e)
 
-      val from = findItemsBase(q, false, ("tids(item_id, weight)", fr"(VALUES" ++ values ++ fr")")) ++
+      val from = findItemsBase(
+        q,
+        false,
+        ("tids(item_id, weight)", fr"(VALUES" ++ values ++ fr")")
+      ) ++
         fr"INNER JOIN tids ON" ++ IC.id.prefix("i").f ++ fr" = tids.item_id" ++
         fr"ORDER BY tids.weight DESC"
 
diff --git a/modules/store/src/main/scala/docspell/store/records/RFtsMigration.scala b/modules/store/src/main/scala/docspell/store/records/RFtsMigration.scala
index ab2e40c0..edd47c1c 100644
--- a/modules/store/src/main/scala/docspell/store/records/RFtsMigration.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RFtsMigration.scala
@@ -46,7 +46,7 @@ object RFtsMigration {
       table,
       all,
       fr"${v.id},${v.version},${v.ftsEngine},${v.description},${v.created}"
-    ).update.run
+    ).updateWithLogHandler(LogHandler.nop).run
 
   def exists(vers: Int, engine: Ident): ConnectionIO[Boolean] =
     selectCount(id, table, and(version.is(vers), ftsEngine.is(engine)))