TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return member count and if current user is owner or member

Browse Source
This commit is contained in:
Eike Kettner
2020-07-10 00:46:14 +02:00
parent ea4ab11195
commit 60a08fc786
5 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -15,8 +15,8 @@ import docspell.common.syntax.all._
import docspell.ftsclient.FtsResult
import docspell.restapi.model._
import docspell.restserver.conv.Conversions._
import docspell.store.{AddResult, UpdateResult}
import docspell.store.records._
import docspell.store.{AddResult, UpdateResult}
import bitpeace.FileMeta
import org.http4s.headers.`Content-Type`

12
modules/restserver/src/main/scala/docspell/restserver/routes/SpaceRoutes.scala
View File

@ -8,10 +8,10 @@ import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken
import docspell.backend.ops.OSpace
import docspell.common._
import docspell.store.records.RSpace
import docspell.restapi.model._
import docspell.restserver.conv.Conversions
import docspell.restserver.http4s._
import docspell.store.records.RSpace
import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityDecoder._
@ -29,7 +29,7 @@ object SpaceRoutes {
val login =
owning.filter(identity).map(_ => user.account.user)
for {
all <- backend.space.findAll(user.account.collective, login, q.map(_.q))
all <- backend.space.findAll(user.account, login, q.map(_.q))
resp <- Ok(SpaceList(all.map(mkSpace).toList))
} yield resp
@ -43,7 +43,7 @@ object SpaceRoutes {
case GET -> Root / Ident(id) =>
(for {
space <- OptionT(backend.space.findById(id, user.account.collective))
space <- OptionT(backend.space.findById(id, user.account))
resp <- OptionT.liftF(Ok(mkSpaceDetail(space)))
} yield resp).getOrElseF(NotFound())
@ -82,7 +82,9 @@ object SpaceRoutes {
item.id,
item.name,
Conversions.mkIdName(item.owner),
item.created
item.created,
item.member,
item.memberCount
)
private def mkSpaceDetail(item: OSpace.SpaceDetail): SpaceDetail =
@ -91,6 +93,8 @@ object SpaceRoutes {
item.name,
Conversions.mkIdName(item.owner),
item.created,
item.member,
item.memberCount,
item.members.map(Conversions.mkIdName)
)