You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/08/19 03:33:36 UTC
[james-project] branch master updated: JAMES-3440 JMAP RFC-8621:
EmailQueryView position handling was wrong
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 850fe0b JAMES-3440 JMAP RFC-8621: EmailQueryView position handling was wrong
850fe0b is described below
commit 850fe0b314846ff15713f3b8122acc0d788eadec
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Aug 17 18:20:23 2021 +0700
JAMES-3440 JMAP RFC-8621: EmailQueryView position handling was wrong
---
.../contract/EmailQueryMethodContract.scala | 73 ++++++++++++++++++++++
.../james/jmap/method/EmailQueryMethod.scala | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
index dd7efb8..ad16a8b 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala
@@ -4075,6 +4075,79 @@ trait EmailQueryMethodContract {
}
@Test
+ def combiningSortPositionAndLimitShouldYieldExpectedResult(server: GuiceJamesServer): Unit = {
+ val mailboxId = server.getProbe(classOf[MailboxProbeImpl]).createMailbox(MailboxPath.inbox(BOB))
+ val message: Message = buildTestMessage
+ val messageId1: MessageId = server.getProbe(classOf[MailboxProbeImpl])
+ .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.builder()
+ .withInternalDate(Date.from(ZonedDateTime.now().minusDays(2).toInstant))
+ .build(message))
+ .getMessageId
+ val messageId2: MessageId = server.getProbe(classOf[MailboxProbeImpl])
+ .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.builder()
+ .withInternalDate(Date.from(ZonedDateTime.now().minusDays(2).toInstant))
+ .build(message))
+ .getMessageId
+ val messageId3: MessageId = server.getProbe(classOf[MailboxProbeImpl])
+ .appendMessage(BOB.asString, MailboxPath.inbox(BOB), AppendCommand.builder()
+ .withInternalDate(Date.from(ZonedDateTime.now().minusDays(2).toInstant))
+ .build(message))
+ .getMessageId
+
+ val request =
+ s"""{
+ | "using": [
+ | "urn:ietf:params:jmap:core",
+ | "urn:ietf:params:jmap:mail"],
+ | "methodCalls": [[
+ | "Email/query",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "position": 2,
+ | "limit": 2,
+ | "filter": {
+ | "inMailbox": "${mailboxId.serialize()}"
+ | },
+ | "sort": [{
+ | "property":"sentAt",
+ | "isAscending": false
+ | }]
+ | },
+ | "c1"]]
+ |}""".stripMargin
+
+ awaitAtMostTenSeconds.untilAsserted { () =>
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(request)
+ .when
+ .post
+ .`then`
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response).isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [[
+ | "Email/query",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "queryState": "${generateQueryState(messageId1)}",
+ | "position": 2,
+ | "canCalculateChanges": false,
+ | "ids": ["${messageId1.serialize()}"]
+ | },
+ | "c1"
+ | ]]
+ |}""".stripMargin)
+ }
+ }
+
+ @Test
def shouldReturnAnIllegalArgumentExceptionIfThePositionIsNegative(server: GuiceJamesServer): Unit = {
val message: Message = buildTestMessage
server.getProbe(classOf[MailboxProbeImpl]).createMailbox(MailboxPath.inbox(BOB))
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala
index ad4cace..6f9de13 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala
@@ -109,7 +109,7 @@ class EmailQueryMethod @Inject() (serializer: EmailQuerySerializer,
val after: ZonedDateTime = condition.after.get.asUTC
SMono(mailboxManager.getMailboxReactive(mailboxId, mailboxSession))
.`then`(SFlux.fromPublisher(
- emailQueryView.listMailboxContentSinceReceivedAt(mailboxId, after, JavaLimit.from(limitToUse.value)))
+ emailQueryView.listMailboxContentSinceReceivedAt(mailboxId, after, JavaLimit.from(limitToUse.value + position.value)))
.drop(position.value)
.take(limitToUse.value)
.collectSeq())
@@ -123,7 +123,7 @@ class EmailQueryMethod @Inject() (serializer: EmailQuerySerializer,
val mailboxId: MailboxId = request.filter.get.asInstanceOf[FilterCondition].inMailbox.get
SMono(mailboxManager.getMailboxReactive(mailboxId, mailboxSession))
.`then`(SFlux.fromPublisher(
- emailQueryView.listMailboxContent(mailboxId, JavaLimit.from(limitToUse.value)))
+ emailQueryView.listMailboxContent(mailboxId, JavaLimit.from(limitToUse.value + position.value)))
.drop(position.value)
.take(limitToUse.value)
.collectSeq())
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org