Move from camt 53 to 52 for intraday request. Parsing logic for it. Add test endpoint for getting parsed version

Author: snemvalts

build.gradle.kts

@@ -316,7 +316,8 @@ tasks {
         val rootSchemas =
             listOf(
                 file("$xsdDir/camt.060.001.03.xsd") to "ee.swedbank.gateway.iso.request",
-                file("$xsdDir/camt.053.001.02.xsd") to "ee.swedbank.gateway.iso.response",
+                file("$xsdDir/camt.052.001.02.xsd") to "ee.swedbank.gateway.iso.response",
+                // file("$xsdDir/camt.053.001.02.xsd") to "ee.swedbank.gateway.iso.response",
             )
 
         doLast {

src/main/java/ee/tuleva/onboarding/ledger/LedgerTestController.java

@@ -5,12 +5,14 @@
 
 import ee.tuleva.onboarding.auth.principal.AuthenticatedPerson;
 import ee.tuleva.onboarding.swedbank.fetcher.SwedbankStatementFetcher;
+import ee.tuleva.onboarding.swedbank.statement.BankStatement;
 import ee.tuleva.onboarding.user.User;
 import ee.tuleva.onboarding.user.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -76,5 +78,13 @@ public void getSwedbankResponse() {
     swedbankStatementFetcher.getResponse(DEPOSIT_EUR);
   }
 
+  @Operation(summary = "Get statement response")
+  @GetMapping("/swedbank/job/{id}")
+  public BankStatement getSwedbankJobResponse(@PathVariable UUID id) {
+    var job = swedbankStatementFetcher.getById(id).orElseThrow();
+    var parsed = swedbankStatementFetcher.getParsedStatementResponse(job);
+    return BankStatement.from(parsed.getBkToCstmrAcctRpt().getRpt().getFirst());
+  }
+
   record DepositDto(BigDecimal amount) {}
 }

src/main/java/ee/tuleva/onboarding/swedbank/fetcher/SwedbankStatementFetcher.java

@@ -8,11 +8,11 @@
 import java.time.Clock;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
+import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Profile;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClientException;
 
@@ -40,7 +40,11 @@ public enum SwedbankAccount {
     }
   }
 
-  @Scheduled(cron = "0 0 9-17 * * MON-FRI")
+  public Optional<SwedbankStatementFetchJob> getById(UUID id) {
+    return swedbankStatementFetchJobRepository.findById(id);
+  }
+
+  // @Scheduled(cron = "0 0 9-17 * * MON-FRI")
   public void sendRequests() {
     for (SwedbankAccount account : SwedbankAccount.values()) {
       sendRequest(account);
@@ -90,7 +94,7 @@ public void sendRequest(SwedbankAccount account) {
     }
   }
 
-  @Scheduled(cron = "0 */15 9-17 * * MON-FRI")
+  // @Scheduled(cron = "0 */15 9-17 * * MON-FRI")
   public void getResponses() {
     for (SwedbankAccount account : SwedbankAccount.values()) {
       getResponse(account);
@@ -166,18 +170,19 @@ public void getResponse(SwedbankAccount account) {
     swedbankStatementFetchJobRepository.save(jobForResponseFromSwedbank);
 
     try {
-      processStatementResponse(jobForResponseFromSwedbank);
+      getParsedStatementResponse(jobForResponseFromSwedbank);
     } catch (Exception e) {
       log.error("Failed to process Swedbank statement response for account={}", account, e);
     }
 
     acknowledgeResponse(response, jobForResponseFromSwedbank);
   }
 
-  private void processStatementResponse(SwedbankStatementFetchJob job) {
-    Document response = swedbankGatewayClient.getParsedStatementResponse(job.getRawResponse());
-
-    log.info("Swedbank statement response: {}", response);
+  public Document getParsedStatementResponse(SwedbankStatementFetchJob job) {
+    if (job.getRawResponse() == null) {
+      throw new IllegalStateException("Job has no response");
+    }
+    return swedbankGatewayClient.getParsedStatementResponse(job.getRawResponse());
   }
 
   private void acknowledgeResponse(

src/main/java/ee/tuleva/onboarding/swedbank/http/SwedbankGatewayClient.java

@@ -118,7 +118,7 @@ public JAXBElement<ee.swedbank.gateway.iso.request.Document> getAccountStatement
     ReportingRequest3 reportingRequest = new ReportingRequest3();
 
     reportingRequest.setId(serializeRequestId(messageId));
-    reportingRequest.setReqdMsgNmId("camt.053.001.02");
+    reportingRequest.setReqdMsgNmId("camt.052.001.02"); // current day 52, past 53
 
     CashAccount24 cashAccount24 = new CashAccount24();
     AccountIdentification4Choice accountIdentification = new AccountIdentification4Choice();
@@ -130,7 +130,7 @@ public JAXBElement<ee.swedbank.gateway.iso.request.Document> getAccountStatement
 
     var partyChoice = new Party12Choice();
     var party = new PartyIdentification43();
-    party.setNm("Tuleva");
+    // party.setNm("Tuleva");
     partyChoice.setPty(party);
 
     reportingRequest.setAcctOwnr(partyChoice);
@@ -169,7 +169,10 @@ public JAXBElement<ee.swedbank.gateway.iso.request.Document> getAccountStatement
   }
 
   public ee.swedbank.gateway.iso.response.Document getParsedStatementResponse(String rawResponse) {
-    return marshaller.unMarshal(rawResponse, ee.swedbank.gateway.iso.response.Document.class);
+    JAXBElement<ee.swedbank.gateway.iso.response.Document> marshalled =
+        marshaller.unMarshal(rawResponse, JAXBElement.class);
+
+    return marshalled.getValue();
   }
 
   public String getRequestXml(JAXBElement<ee.swedbank.gateway.iso.request.Document> requestEntity) {

src/main/java/ee/tuleva/onboarding/swedbank/statement/BankStatement.java

@@ -2,7 +2,7 @@
 
 import static lombok.AccessLevel.PRIVATE;
 
-import ee.swedbank.gateway.iso.response.AccountStatement2;
+import ee.swedbank.gateway.iso.response.AccountReport11;
 import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -16,10 +16,11 @@ public class BankStatement {
   // TODO check entries against TtlCdtNtries and TttlDbtEntries count from balances?
   private final List<BankStatementEntry> entries;
 
-  public static BankStatement from(AccountStatement2 statement) {
-    var accountType = BankStatementAccountType.from(statement);
-    var balances = statement.getBal().stream().map(BankStatementBalance::from).toList();
-    var entries = statement.getNtry().stream().map(BankStatementEntry::from).toList();
+  // TODO camt 053 for previous reports also here?
+  public static BankStatement from(AccountReport11 report) {
+    var accountType = BankStatementAccountType.from(report);
+    var balances = report.getBal().stream().map(BankStatementBalance::from).toList();
+    var entries = report.getNtry().stream().map(BankStatementEntry::from).toList();
 
     return new BankStatement(accountType, balances, entries);
   }

src/main/java/ee/tuleva/onboarding/swedbank/statement/BankStatementAccountType.java

@@ -2,7 +2,7 @@
 
 import static ee.tuleva.onboarding.ledger.LedgerAccount.ServiceAccountType.DEPOSIT_EUR;
 
-import ee.swedbank.gateway.iso.response.AccountStatement2;
+import ee.swedbank.gateway.iso.response.AccountReport11;
 import ee.tuleva.onboarding.ledger.LedgerAccount.ServiceAccountType;
 
 public record BankStatementAccountType(String iban) {
@@ -11,7 +11,7 @@ public ServiceAccountType getServiceAccountType() {
     return DEPOSIT_EUR;
   }
 
-  public static BankStatementAccountType from(AccountStatement2 statement) {
-    return new BankStatementAccountType(statement.getAcct().getId().getIBAN());
+  public static BankStatementAccountType from(AccountReport11 report) {
+    return new BankStatementAccountType(report.getAcct().getId().getIBAN());
   }
 }

src/main/java/ee/tuleva/onboarding/swedbank/statement/BankStatementBalance.java

@@ -34,15 +34,17 @@ public static StatementBalanceType fromBalanceCode(BalanceType12Code balanceType
       return Arrays.stream(StatementBalanceType.values())
           .filter(balanceType -> balanceType.balanceCode.equals(balanceTypeCode))
           .findFirst()
-          .orElseThrow(
-              () -> new IllegalArgumentException("Cannot match balance type " + balanceTypeCode));
+          .orElse(null); // TODO reserved party null balance code?
+      /*.orElseThrow(
+      () -> new IllegalArgumentException("Cannot match balance type " + balanceTypeCode));*/
     }
   }
 
   public static BankStatementBalance from(CashBalance3 balance) {
     var dateConverter = new XmlGregorianCalendarConverterToLocalDate();
     var statementBalanceType =
-        StatementBalanceType.fromBalanceCode(balance.getTp().getCdOrPrtry().getCd());
+        StatementBalanceType.fromBalanceCode(
+            balance.getTp().getCdOrPrtry().getCd()); // TODO reserved party = null?
 
     // handle dateTime here as well?
     var date = dateConverter.convert(balance.getDt().getDt());