Merge pull request #30 from digipost/fetch-messages-2

Fetch messages

Author: Christian Strandenæs

docs/_v2_x/4_fetch_messages.md

@@ -52,11 +52,11 @@ if (agreementResult.isSuccess()) {
 final SenderId senderId = SenderId.of(1234L);
 final UserId userId = UserId.of("01017012345");
 
-final List<Document> unpaidInvoice = client.getDocuments(senderId, AgreementType.FETCH_MESSAGES, userId,
-	GetDocumentsQuery.empty());
+final List<Document> previouslyDeliveredDocs = client.getDocuments(senderId, AgreementType.FETCH_MESSAGES,
+	userId, GetDocumentsQuery.empty());
 
 final ZoneId OSLO_ZONE = ZoneId.of("Europe/Oslo");
-final List<Document> allOptions = client.getDocuments(senderId, AgreementType.FETCH_MESSAGES, userId,
+final List<Document> withinTimeWindow = client.getDocuments(senderId, AgreementType.FETCH_MESSAGES, userId,
 	GetDocumentsQuery.builder()
 		.deliveryTimeFrom(ZonedDateTime.of(2020, 1, 1, 0, 0, 0, 0, OSLO_ZONE))
 		.deliveryTimeTo(ZonedDateTime.now(OSLO_ZONE))

src/main/java/no/digipost/api/useragreements/client/AgreementType.java

@@ -19,6 +19,7 @@ public final class AgreementType {
 
 	public static final AgreementType INVOICE_BANK = new AgreementType("invoice-bank");
 	public static final AgreementType BANK_ACCOUNT_NUMBER_FOR_RECEIPTS = new AgreementType("account-num-for-receipts");
+	public static final AgreementType FETCH_MESSAGES = new AgreementType("fetch-messages");
 
 	public static final String QUERY_PARAM_NAME = "agreement-type";
 

src/main/java/no/digipost/api/useragreements/client/ApiService.java

@@ -181,11 +181,11 @@ public StreamingRateLimitedResponse<UserId> getAgreementOwners(final SenderId se
 	}
 
 	private static String userAgreementsPath(final SenderId senderId) {
-		return senderId.serialize() + "/" + USER_AGREEMENTS_PATH;
+		return "/" + senderId.serialize() + "/" + USER_AGREEMENTS_PATH;
 	}
 
 	private static String userDocumentsPath(final SenderId senderId) {
-		return senderId.serialize() + "/" + USER_DOCUMENTS_PATH;
+		return "/" + senderId.serialize() + "/" + USER_DOCUMENTS_PATH;
 	}
 
 	private <T> T executeHttpRequest(final HttpRequestBase request, final ResponseHandler<T> handler) {

src/main/java/no/digipost/api/useragreements/client/AuthenticationLevel.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) Posten Norge AS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package no.digipost.api.useragreements.client;
+
+import java.util.Arrays;
+
+public enum AuthenticationLevel {
+	IDPORTEN_4("Id-Porten Two-Factor"),
+	IDPORTEN_3("Id-Porten MinId", IDPORTEN_4),
+	TWO_FACTOR("Two-Factor", IDPORTEN_4),
+	PASSWORD("Password", TWO_FACTOR, IDPORTEN_3, IDPORTEN_4);
+
+	final String description;
+	final AuthenticationLevel[] acceptable;
+
+	AuthenticationLevel(String description, AuthenticationLevel... acceptable) {
+		this.description = description;
+		this.acceptable = acceptable;
+	}
+
+	boolean isAccessibleAtLevel(AuthenticationLevel other) {
+		return Arrays.asList(this, acceptable).contains(other);
+	}
+}

src/main/java/no/digipost/api/useragreements/client/Document.java

@@ -19,6 +19,8 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.net.URI;
+import java.time.ZonedDateTime;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "user-document")
@@ -30,6 +32,16 @@ public class Document {
 	private String senderName;
 	@XmlElement
 	private Invoice invoice;
+	@XmlElement
+	private String subject;
+	@XmlElement(name = "delivery-time")
+	private ZonedDateTime deliveryTime;
+	@XmlElement(name = "read")
+	private Boolean read;
+	@XmlElement(name = "authentication-level")
+	private String authenticationLevel;
+	@XmlElement(name = "digipost-uri")
+	private String digipostUri;
 
 	private Document() {}
 
@@ -50,12 +62,34 @@ public long getId() {
 		return id;
 	}
 
+	public String getSubject() {
+		return subject;
+	}
+
+	public ZonedDateTime getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public boolean isRead() {
+		return read != null && read;
+	}
+
+	public AuthenticationLevel getAuthenticationLevel() {
+		return AuthenticationLevel.valueOf(authenticationLevel);
+	}
+
+	public URI getDigipostUri() {
+		return URI.create(digipostUri);
+	}
+
 	@Override
 	public String toString() {
 		final StringBuilder sb = new StringBuilder("Document{");
 		sb.append("id=").append(id);
 		sb.append(", senderName='").append(senderName).append('\'');
 		sb.append(", invoice=").append(invoice);
+		sb.append(", authenticationLevel=").append(authenticationLevel);
+		sb.append(", deliveryTime=").append(deliveryTime);
 		sb.append('}');
 		return sb.toString();
 	}

src/main/java/no/digipost/api/useragreements/client/package-info.java

@@ -17,19 +17,22 @@
 @XmlJavaTypeAdapters({
 		@XmlJavaTypeAdapter(type = Instant.class, value = InstantXmlAdapter.class),
 		@XmlJavaTypeAdapter(type = LocalDate.class, value = DateXmlAdapter.class),
+		@XmlJavaTypeAdapter(type = ZonedDateTime.class, value = ZonedDateTImeXmlAdapter.class),
 		@XmlJavaTypeAdapter(type = UserId.class, value = UserIdXmlAdapter.class)
 })
 package no.digipost.api.useragreements.client;
 
 import no.digipost.api.useragreements.client.xml.DateXmlAdapter;
 import no.digipost.api.useragreements.client.xml.InstantXmlAdapter;
 import no.digipost.api.useragreements.client.xml.UserIdXmlAdapter;
+import no.digipost.api.useragreements.client.xml.ZonedDateTImeXmlAdapter;
 
 import javax.xml.bind.annotation.XmlSchema;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
 
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.ZonedDateTime;
 
 import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED;

src/main/java/no/digipost/api/useragreements/client/xml/ZonedDateTImeXmlAdapter.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) Posten Norge AS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package no.digipost.api.useragreements.client.xml;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import java.time.ZonedDateTime;
+
+import static java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME;
+
+public class ZonedDateTImeXmlAdapter extends XmlAdapter<String, ZonedDateTime> {
+
+	@Override
+	public ZonedDateTime unmarshal(String value) {
+		if (value == null) {
+			return null;
+		}
+		return ZonedDateTime.from(ISO_ZONED_DATE_TIME.parse(value));
+
+	}
+
+	@Override
+	public String marshal(ZonedDateTime dateTime) {
+		if (dateTime == null) {
+			return null;
+		}
+		return ISO_ZONED_DATE_TIME.format(dateTime);
+	}
+}