chibenwa commented on a change in pull request #365:
URL: https://github.com/apache/james-project/pull/365#discussion_r608300098
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNParseMethod.scala
##########
@@ -77,29 +82,51 @@ class MDNParseMethod @Inject()(val blobResolvers:
BlobResolvers,
val parsed: SFlux[MDNParseResults] = SFlux.fromIterable(parsedIds)
.flatMap(blobId => toParseResults(blobId, mailboxSession))
- .map(_.fold(e => MDNParseResults.notFound(e.blobId), result => result))
SFlux.merge(Seq(parsed, SFlux.fromIterable(invalid)))
.reduce(MDNParseResults.empty())(MDNParseResults.merge)
.map(_.asResponse(request.accountId))
}
- private def toParseResults(blobId: BlobId, mailboxSession: MailboxSession):
SMono[Either[BlobNotFoundException, MDNParseResults]] =
+ private def toParseResults(blobId: BlobId, mailboxSession: MailboxSession):
SMono[MDNParseResults] =
blobResolvers.resolve(blobId, mailboxSession)
- .map(blob => Right(parse(blob.blobId, blob.content)))
+ .flatMap(blob => parse(blob.blobId, blob.content)
+ .flatMap(mdnAndMsg => buildMDNParseResults(blobId, mdnAndMsg._1,
mdnAndMsg._2, mailboxSession)))
Review comment:
```suggestion
.flatMap {
case (mdn, message) => buildMDNParseResults(blobId, mdn, message,
mailboxSession)
}
```
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDNParse.scala
##########
@@ -103,9 +106,9 @@ object IncludeOriginalMessageField {
case class IncludeOriginalMessageField(value: Boolean) extends AnyVal
object MDNParsed {
- def fromMDN(mdn: MDN, message: Message): MDNParsed = {
+ def fromMDN(mdn: MDN, message: Message, originalMessageId:
Option[MessageId]): MDNParsed = {
val report = mdn.getReport
- MDNParsed(forEmailId = None,
+ MDNParsed(forEmailId = originalMessageId.map(msgId =>
ForEmailIdField(msgId)),
Review comment:
```suggestion
MDNParsed(forEmailId = originalMessageId.map(ForEmailIdField(_)),
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
