From 098e4cf868e38feddf8b8041ef0da4aaec733fd2 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Sun, 9 Aug 2020 09:21:23 +0200
Subject: [PATCH] Fix uploading to enabled/disabled source endpoints

---
 .../src/main/scala/docspell/backend/ops/OCollective.scala   | 6 +++---
 .../src/main/scala/docspell/backend/ops/OUpload.scala       | 2 +-
 .../scala/docspell/restserver/routes/UploadRoutes.scala     | 4 ++--
 .../src/main/scala/docspell/store/records/RSource.scala     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala b/modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
index 0ed64f2a..e3835448 100644
--- a/modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
+++ b/modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
@@ -41,7 +41,7 @@ trait OCollective[F[_]] {
       kind: Option[ContactKind]
   ): Stream[F, RContact]
 
-  def findSource(sourceId: Ident): F[Option[RSource]]
+  def findEnabledSource(sourceId: Ident): F[Option[RSource]]
 
 }
 
@@ -158,7 +158,7 @@ object OCollective {
       ): Stream[F, RContact] =
         store.transact(QCollective.getContacts(collective, query, kind))
 
-      def findSource(sourceId: Ident): F[Option[RSource]] =
-        store.transact(RSource.find(sourceId))
+      def findEnabledSource(sourceId: Ident): F[Option[RSource]] =
+        store.transact(RSource.findEnabled(sourceId))
     })
 }
diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala b/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
index 7c4b043c..a9145f72 100644
--- a/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
+++ b/modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
@@ -147,7 +147,7 @@ object OUpload {
           itemId: Option[Ident]
       ): F[OUpload.UploadResult] =
         (for {
-          src <- OptionT(store.transact(RSource.find(sourceId)))
+          src <- OptionT(store.transact(RSource.findEnabled(sourceId)))
           updata = data.copy(
             meta = data.meta.copy(
               sourceAbbrev = src.abbrev,
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala
index 322486a0..e3b21a04 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala
@@ -46,7 +46,7 @@ object UploadRoutes {
     HttpRoutes.of {
       case req @ POST -> Root / "item" / Ident(srcId) =>
         (for {
-          _ <- OptionT(backend.collective.findSource(srcId))
+          _ <- OptionT(backend.collective.findEnabledSource(srcId))
           res <- OptionT.liftF(
             submitFiles(backend, cfg, Left(srcId))(req, None, Priority.Low, dsl)
           )
@@ -54,7 +54,7 @@ object UploadRoutes {
 
       case req @ POST -> Root / "item" / Ident(itemId) / Ident(srcId) =>
         (for {
-          _ <- OptionT(backend.collective.findSource(srcId))
+          _ <- OptionT(backend.collective.findEnabledSource(srcId))
           res <- OptionT.liftF(
             submitFiles(backend, cfg, Left(srcId))(req, Some(itemId), Priority.Low, dsl)
           )
diff --git a/modules/store/src/main/scala/docspell/store/records/RSource.scala b/modules/store/src/main/scala/docspell/store/records/RSource.scala
index ea76a919..3d339861 100644
--- a/modules/store/src/main/scala/docspell/store/records/RSource.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RSource.scala
@@ -83,8 +83,8 @@ object RSource {
     sql.query[Int].unique.map(_ > 0)
   }
 
-  def find(id: Ident): ConnectionIO[Option[RSource]] = {
-    val sql = selectSimple(all, table, sid.is(id))
+  def findEnabled(id: Ident): ConnectionIO[Option[RSource]] = {
+    val sql = selectSimple(all, table, and(sid.is(id), enabled.is(true)))
     sql.query[RSource].option
   }