TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1230 from eikek/bugfix/periodic-tasks

Browse Source 
Fix sending notification mails from background tasks
This commit is contained in:
mergify[bot] 2021-12-22 17:21:36 +00:00 committed by GitHub
commit d060b0442f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/backend/src/main/scala/docspell/backend/ops/ONotification.scala
View File

@ -34,7 +34,10 @@ trait ONotification[F[_]] {
def offerEvents(ev: Iterable[Event]): F[Unit] def offerEvents(ev: Iterable[Event]): F[Unit]
def mkNotificationChannel(channel: Channel): F[Vector[NotificationChannel]] def mkNotificationChannel(
channel: Channel,
userId: Ident
): F[Vector[NotificationChannel]]
def findNotificationChannel(ref: ChannelRef): F[Vector[NotificationChannel]] def findNotificationChannel(ref: ChannelRef): F[Vector[NotificationChannel]]
@ -109,22 +112,30 @@ object ONotification {
channel: Channel, channel: Channel,
account: AccountId, account: AccountId,
baseUrl: Option[LenientUri] baseUrl: Option[LenientUri]
): F[SendTestResult] = ): F[SendTestResult] = {
(for { def doCreate(userId: Ident) =
ev <- sampleEvent(evt, account, baseUrl) (for {
logbuf <- Logger.buffer() ev <- sampleEvent(evt, account, baseUrl)
ch <- mkNotificationChannel(channel) logbuf <- Logger.buffer()
_ <- notMod.send(logbuf._2.andThen(log), ev, ch) ch <- mkNotificationChannel(channel, userId)
logs <- logbuf._1.get _ <- notMod.send(logbuf._2.andThen(log), ev, ch)
res = SendTestResult(true, logs) logs <- logbuf._1.get
} yield res).attempt res = SendTestResult(true, logs)
.map { } yield res).attempt
case Right(res) => res .map {
case Left(ex) => case Right(res) => res
val ps = new StringWriter() case Left(ex) =>
ex.printStackTrace(new PrintWriter(ps)) val ps = new StringWriter()
SendTestResult(false, Vector(s"${ex.getMessage}\n$ps")) ex.printStackTrace(new PrintWriter(ps))
} SendTestResult(false, Vector(s"${ex.getMessage}\n$ps"))
}
OptionT(store.transact(RUser.findIdByAccount(account)))
.semiflatMap(doCreate)
.getOrElse(
SendTestResult(false, Vector(s"No user found in db for: ${account.asString}"))
)
}
def listChannels(account: AccountId): F[Vector[Channel]] = def listChannels(account: AccountId): F[Vector[Channel]] =
store store
@ -142,7 +153,7 @@ object ONotification {
(for { (for {
newId <- OptionT.liftF(Ident.randomId[F]) newId <- OptionT.liftF(Ident.randomId[F])
userId <- OptionT(store.transact(RUser.findIdByAccount(account))) userId <- OptionT(store.transact(RUser.findIdByAccount(account)))
r <- ChannelConv.makeRecord[F](store, Right(channel), newId, userId) r <- ChannelConv.makeRecord[F](store, log, Right(channel), newId, userId)
_ <- OptionT.liftF(store.transact(RNotificationChannel.insert(r))) _ <- OptionT.liftF(store.transact(RNotificationChannel.insert(r)))
_ <- OptionT.liftF(log.debug(s"Created channel $r for $account")) _ <- OptionT.liftF(log.debug(s"Created channel $r for $account"))
} yield AddResult.Success) } yield AddResult.Success)
@ -151,7 +162,7 @@ object ONotification {
def updateChannel(channel: Channel, account: AccountId): F[UpdateResult] = def updateChannel(channel: Channel, account: AccountId): F[UpdateResult] =
(for { (for {
userId <- OptionT(store.transact(RUser.findIdByAccount(account))) userId <- OptionT(store.transact(RUser.findIdByAccount(account)))
r <- ChannelConv.makeRecord[F](store, Right(channel), channel.id, userId) r <- ChannelConv.makeRecord[F](store, log, Right(channel), channel.id, userId)
n <- OptionT.liftF(store.transact(RNotificationChannel.update(r))) n <- OptionT.liftF(store.transact(RNotificationChannel.update(r)))
} yield UpdateResult.fromUpdateRows(n)).getOrElse(UpdateResult.notFound) } yield UpdateResult.fromUpdateRows(n)).getOrElse(UpdateResult.notFound)
@ -170,7 +181,7 @@ object ONotification {
_ <- OptionT.liftF(log.debug(s"Creating new notification hook: $hook")) _ <- OptionT.liftF(log.debug(s"Creating new notification hook: $hook"))
channelId <- OptionT.liftF(Ident.randomId[F]) channelId <- OptionT.liftF(Ident.randomId[F])
userId <- OptionT(store.transact(RUser.findIdByAccount(account))) userId <- OptionT(store.transact(RUser.findIdByAccount(account)))
r <- ChannelConv.makeRecord[F](store, hook.channel, channelId, userId) r <- ChannelConv.makeRecord[F](store, log, hook.channel, channelId, userId)
_ <- OptionT.liftF( _ <- OptionT.liftF(
if (channelId == r.id) store.transact(RNotificationChannel.insert(r)) if (channelId == r.id) store.transact(RNotificationChannel.insert(r))
else ().pure[F] else ().pure[F]
@ -196,7 +207,7 @@ object ONotification {
r: RNotificationHook r: RNotificationHook
)(f: RNotificationChannel => F[UpdateResult]): F[UpdateResult] = )(f: RNotificationChannel => F[UpdateResult]): F[UpdateResult] =
ChannelConv ChannelConv
.makeRecord(store, hook.channel, r.channelId, r.uid) .makeRecord(store, log, hook.channel, r.channelId, r.uid)
.semiflatMap(f) .semiflatMap(f)
.getOrElse(UpdateResult.notFound) .getOrElse(UpdateResult.notFound)
@ -221,10 +232,13 @@ object ONotification {
withHook(doUpdate) withHook(doUpdate)
} }
def mkNotificationChannel(channel: Channel): F[Vector[NotificationChannel]] = def mkNotificationChannel(
channel: Channel,
userId: Ident
): F[Vector[NotificationChannel]] =
(for { (for {
rec <- ChannelConv rec <- ChannelConv
.makeRecord(store, Right(channel), channel.id, Ident.unsafe("")) .makeRecord(store, log, Right(channel), channel.id, userId)
ch <- OptionT.liftF(store.transact(QNotification.readChannel(rec))) ch <- OptionT.liftF(store.transact(QNotification.readChannel(rec)))
} yield ch).getOrElse(Vector.empty) } yield ch).getOrElse(Vector.empty)
@ -249,13 +263,15 @@ object ONotification {
private[ops] def makeRecord[F[_]: Sync]( private[ops] def makeRecord[F[_]: Sync](
store: Store[F], store: Store[F],
logger: Logger[F],
channelIn: Either[ChannelRef, Channel], channelIn: Either[ChannelRef, Channel],
id: Ident, id: Ident,
userId: Ident userId: Ident
): OptionT[F, RNotificationChannel] = ): OptionT[F, RNotificationChannel] =
channelIn match { channelIn match {
case Left(ref) => case Left(ref) =>
OptionT(store.transact(RNotificationChannel.getByRef(ref))) OptionT.liftF(logger.debug(s"Loading channel for ref: ${ref}")) *>
OptionT(store.transact(RNotificationChannel.getByRef(ref)))
case Right(channel) => case Right(channel) =>
for { for {
@ -264,6 +280,11 @@ object ONotification {
channel match { channel match {
case Channel.Mail(_, conn, recipients) => case Channel.Mail(_, conn, recipients) =>
for { for {
_ <- OptionT.liftF(
logger.debug(
s"Looking up user smtp for ${userId.id} and ${conn.id}"
)
)
mailConn <- OptionT( mailConn <- OptionT(
store.transact(RUserEmail.getByUser(userId, conn)) store.transact(RUserEmail.getByUser(userId, conn))
) )

8
modules/joex/src/main/scala/docspell/joex/notify/PeriodicDueItemsTask.scala
View File

@ -7,6 +7,7 @@
package docspell.joex.notify package docspell.joex.notify
import cats.data.NonEmptyList import cats.data.NonEmptyList
import cats.data.OptionT
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
@ -23,6 +24,7 @@ import docspell.query.ItemQueryDsl._
import docspell.store.qb.Batch import docspell.store.qb.Batch
import docspell.store.queries.ListItem import docspell.store.queries.ListItem
import docspell.store.queries.{QItem, Query} import docspell.store.queries.{QItem, Query}
import docspell.store.records.RUser
object PeriodicDueItemsTask { object PeriodicDueItemsTask {
val taskName = PeriodicDueItemsArgs.taskName val taskName = PeriodicDueItemsArgs.taskName
@ -49,7 +51,11 @@ object PeriodicDueItemsTask {
def withChannel[F[_]: Sync](ctx: Context[F, Args], ops: ONotification[F])( def withChannel[F[_]: Sync](ctx: Context[F, Args], ops: ONotification[F])(
cont: Vector[NotificationChannel] => F[Unit] cont: Vector[NotificationChannel] => F[Unit]
): F[Unit] = ): F[Unit] =
TaskOperations.withChannel(ctx.logger, ctx.args.channel, ops)(cont) OptionT(ctx.store.transact(RUser.findIdByAccount(ctx.args.account)))
.semiflatMap(userId =>
TaskOperations.withChannel(ctx.logger, ctx.args.channel, userId, ops)(cont)
)
.getOrElse(())
def withItems[F[_]: Sync](ctx: Context[F, Args], limit: Int, now: Timestamp)( def withItems[F[_]: Sync](ctx: Context[F, Args], limit: Int, now: Timestamp)(
cont: Vector[ListItem] => F[Unit] cont: Vector[ListItem] => F[Unit]

8
modules/joex/src/main/scala/docspell/joex/notify/PeriodicQueryTask.scala
View File

@ -6,6 +6,7 @@
package docspell.joex.notify package docspell.joex.notify
import cats.data.OptionT
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
@ -20,6 +21,7 @@ import docspell.query.ItemQueryParser
import docspell.store.qb.Batch import docspell.store.qb.Batch
import docspell.store.queries.ListItem import docspell.store.queries.ListItem
import docspell.store.queries.{QItem, Query} import docspell.store.queries.{QItem, Query}
import docspell.store.records.RUser
object PeriodicQueryTask { object PeriodicQueryTask {
val taskName = PeriodicQueryArgs.taskName val taskName = PeriodicQueryArgs.taskName
@ -46,7 +48,11 @@ object PeriodicQueryTask {
def withChannel[F[_]: Sync](ctx: Context[F, Args], ops: ONotification[F])( def withChannel[F[_]: Sync](ctx: Context[F, Args], ops: ONotification[F])(
cont: Vector[NotificationChannel] => F[Unit] cont: Vector[NotificationChannel] => F[Unit]
): F[Unit] = ): F[Unit] =
TaskOperations.withChannel(ctx.logger, ctx.args.channel, ops)(cont) OptionT(ctx.store.transact(RUser.findIdByAccount(ctx.args.account)))
.semiflatMap(userId =>
TaskOperations.withChannel(ctx.logger, ctx.args.channel, userId, ops)(cont)
)
.getOrElse(())
def withItems[F[_]: Sync](ctx: Context[F, Args], limit: Int, now: Timestamp)( def withItems[F[_]: Sync](ctx: Context[F, Args], limit: Int, now: Timestamp)(
cont: Vector[ListItem] => F[Unit] cont: Vector[ListItem] => F[Unit]

3
modules/joex/src/main/scala/docspell/joex/notify/TaskOperations.scala
View File

@ -24,12 +24,13 @@ trait TaskOperations {
def withChannel[F[_]: Sync]( def withChannel[F[_]: Sync](
logger: Logger[F], logger: Logger[F],
channel: ChannelOrRef, channel: ChannelOrRef,
userId: Ident,
ops: ONotification[F] ops: ONotification[F]
)( )(
cont: Vector[NotificationChannel] => F[Unit] cont: Vector[NotificationChannel] => F[Unit]
): F[Unit] = { ): F[Unit] = {
val channels = channel match { val channels = channel match {
case Right(ch) => ops.mkNotificationChannel(ch) case Right(ch) => ops.mkNotificationChannel(ch, userId)
case Left(ref) => ops.findNotificationChannel(ref) case Left(ref) => ops.findNotificationChannel(ref)
} }
channels.flatMap { ch => channels.flatMap { ch =>