From 4f9c91d6afa56e27a18194e758dc2a8df0d14e15 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Fri, 28 Jan 2022 18:04:39 +0100
Subject: [PATCH] Reordered some routes due to a change in http4s

Upstream ticket http4s#5959
---
 .../restserver/routes/CollectiveRoutes.scala     | 14 +++++++-------
 .../restserver/routes/NotifyDueItemsRoutes.scala | 14 +++++++-------
 .../restserver/routes/PeriodicQueryRoutes.scala  | 15 ++++++++-------
 .../restserver/routes/ScanMailboxRoutes.scala    | 16 ++++++++--------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala
index e4f99565..8e4cc6e6 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala
@@ -30,6 +30,13 @@ object CollectiveRoutes {
     import dsl._
 
     HttpRoutes.of {
+      case GET -> Root =>
+        for {
+          collDb <- backend.collective.find(user.account.collective)
+          coll = collDb.map(c => Collective(c.id, c.state, c.created))
+          resp <- coll.toResponse()
+        } yield resp
+
       case GET -> Root / "insights" =>
         for {
           ins <- backend.collective.insights(user.account.collective)
@@ -122,13 +129,6 @@ object CollectiveRoutes {
           )
           resp <- Ok(BasicResult(true, "Task submitted"))
         } yield resp
-
-      case GET -> Root =>
-        for {
-          collDb <- backend.collective.find(user.account.collective)
-          coll = collDb.map(c => Collective(c.id, c.state, c.created))
-          resp <- coll.toResponse()
-        } yield resp
     }
   }
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/NotifyDueItemsRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/NotifyDueItemsRoutes.scala
index e53bef82..eae528e2 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/NotifyDueItemsRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/NotifyDueItemsRoutes.scala
@@ -38,6 +38,13 @@ object NotifyDueItemsRoutes extends MailAddressCodec with NonEmptyListSupport {
     import dsl._
 
     HttpRoutes.of {
+      case GET -> Root =>
+        ut.getNotifyDueItems(UserTaskScope(user.account))
+          .evalMap(task => taskToSettings(backend, task))
+          .compile
+          .toVector
+          .flatMap(Ok(_))
+
       case GET -> Root / Ident(id) =>
         (for {
           task <- ut.findNotifyDueItems(id, UserTaskScope(user.account))
@@ -94,13 +101,6 @@ object NotifyDueItemsRoutes extends MailAddressCodec with NonEmptyListSupport {
               .map(Conversions.basicResult(_, "Saved successfully."))
           resp <- Ok(res)
         } yield resp
-
-      case GET -> Root =>
-        ut.getNotifyDueItems(UserTaskScope(user.account))
-          .evalMap(task => taskToSettings(backend, task))
-          .compile
-          .toVector
-          .flatMap(Ok(_))
     }
   }
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/PeriodicQueryRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/PeriodicQueryRoutes.scala
index 0efd2661..496b069e 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/PeriodicQueryRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/PeriodicQueryRoutes.scala
@@ -38,7 +38,14 @@ object PeriodicQueryRoutes extends MailAddressCodec with NonEmptyListSupport {
     val ut = backend.userTask
     import dsl._
 
-    HttpRoutes.of {
+    HttpRoutes.strict {
+      case GET -> Root =>
+        ut.getPeriodicQuery(UserTaskScope(user.account))
+          .evalMap(task => taskToSettings(task))
+          .compile
+          .toVector
+          .flatMap(Ok(_))
+
       case GET -> Root / Ident(id) =>
         (for {
           task <- ut.findPeriodicQuery(id, UserTaskScope(user.account))
@@ -96,12 +103,6 @@ object PeriodicQueryRoutes extends MailAddressCodec with NonEmptyListSupport {
           resp <- Ok(res)
         } yield resp
 
-      case GET -> Root =>
-        ut.getPeriodicQuery(UserTaskScope(user.account))
-          .evalMap(task => taskToSettings(task))
-          .compile
-          .toVector
-          .flatMap(Ok(_))
     }
   }
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ScanMailboxRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ScanMailboxRoutes.scala
index 0f7a3f7f..3912d872 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ScanMailboxRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ScanMailboxRoutes.scala
@@ -33,6 +33,14 @@ object ScanMailboxRoutes {
     import dsl._
 
     HttpRoutes.of {
+      case GET -> Root =>
+        ut.getScanMailbox(UserTaskScope(user.account))
+          .evalMap(task => taskToSettings(user.account, backend, task))
+          .compile
+          .toVector
+          .map(v => ScanMailboxSettingsList(v.toList))
+          .flatMap(Ok(_))
+
       case GET -> Root / Ident(id) =>
         (for {
           task <- ut.findScanMailbox(id, UserTaskScope(user.account))
@@ -89,14 +97,6 @@ object ScanMailboxRoutes {
               .map(Conversions.basicResult(_, "Saved successfully."))
           resp <- Ok(res)
         } yield resp
-
-      case GET -> Root =>
-        ut.getScanMailbox(UserTaskScope(user.account))
-          .evalMap(task => taskToSettings(user.account, backend, task))
-          .compile
-          .toVector
-          .map(v => ScanMailboxSettingsList(v.toList))
-          .flatMap(Ok(_))
     }
   }