From 4ef9d6c3ffca9bcf9201bd1a9df7b22d459bc04d Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sat, 2 Oct 2021 23:05:19 +0200
Subject: [PATCH] Add expired flag to share details

---
 .../src/main/resources/docspell-openapi.yml        |  3 +++
 .../docspell/restserver/routes/ShareRoutes.scala   | 14 ++++++++------
 .../main/scala/docspell/store/records/RShare.scala |  6 +++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml
index f01cd129..ac2cc363 100644
--- a/modules/restapi/src/main/resources/docspell-openapi.yml
+++ b/modules/restapi/src/main/resources/docspell-openapi.yml
@@ -4226,6 +4226,7 @@ components:
         - publishUntil
         - password
         - views
+        - expired
       properties:
         id:
           type: string
@@ -4243,6 +4244,8 @@ components:
         publishUntil:
           type: integer
           format: date-time
+        expired:
+          type: boolean
         password:
           type: boolean
         views:
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ShareRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ShareRoutes.scala
index 060ef30c..846bc7bc 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ShareRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ShareRoutes.scala
@@ -9,15 +9,13 @@ package docspell.restserver.routes
 import cats.data.OptionT
 import cats.effect._
 import cats.implicits._
-
 import docspell.backend.BackendApp
 import docspell.backend.auth.AuthToken
 import docspell.backend.ops.OShare
-import docspell.common.Ident
+import docspell.common.{Ident, Timestamp}
 import docspell.restapi.model._
 import docspell.restserver.http4s.ResponseGenerator
 import docspell.store.records.RShare
-
 import org.http4s.HttpRoutes
 import org.http4s.circe.CirceEntityDecoder._
 import org.http4s.circe.CirceEntityEncoder._
@@ -33,7 +31,8 @@ object ShareRoutes {
       case GET -> Root =>
         for {
           all <- backend.share.findAll(user.account.collective)
-          res <- Ok(ShareList(all.map(mkShareDetail)))
+          now <- Timestamp.current[F]
+          res <- Ok(ShareList(all.map(mkShareDetail(now))))
         } yield res
 
       case req @ POST -> Root =>
@@ -47,7 +46,8 @@ object ShareRoutes {
       case GET -> Root / Ident(id) =>
         (for {
           share <- backend.share.findOne(id, user.account.collective)
-          resp <- OptionT.liftF(Ok(mkShareDetail(share)))
+          now <- OptionT.liftF(Timestamp.current[F])
+          resp <- OptionT.liftF(Ok(mkShareDetail(now)(share)))
         } yield resp).getOrElseF(NotFound())
 
       case req @ PUT -> Root / Ident(id) =>
@@ -90,7 +90,7 @@ object ShareRoutes {
         BasicResult(false, "Until date must not be in the past")
     }
 
-  def mkShareDetail(r: RShare): ShareDetail =
+  def mkShareDetail(now: Timestamp)(r: RShare): ShareDetail =
     ShareDetail(
       r.id,
       r.query,
@@ -98,8 +98,10 @@ object ShareRoutes {
       r.enabled,
       r.publishAt,
       r.publishUntil,
+      now > r.publishUntil,
       r.password.isDefined,
       r.views,
       r.lastAccess
     )
+
 }
diff --git a/modules/store/src/main/scala/docspell/store/records/RShare.scala b/modules/store/src/main/scala/docspell/store/records/RShare.scala
index af0b1e40..4cef0929 100644
--- a/modules/store/src/main/scala/docspell/store/records/RShare.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RShare.scala
@@ -102,7 +102,11 @@ object RShare {
     )
 
   def findAllByCollective(cid: Ident): ConnectionIO[List[RShare]] =
-    Select(select(T.all), from(T), T.cid === cid).build.query[RShare].to[List]
+    Select(select(T.all), from(T), T.cid === cid)
+      .orderBy(T.publishedAt.desc)
+      .build
+      .query[RShare]
+      .to[List]
 
   def deleteByIdAndCid(id: Ident, cid: Ident): ConnectionIO[Int] =
     DML.delete(T, T.id === id && T.cid === cid)