Merge pull request #492 from cardano-foundation/release/1.2.0

Release/1.2.0

Author: Kammerlo

_backend-services/cf-reeve-ledger-follower-app/Dockerfile

@@ -1,8 +1,8 @@
-FROM openjdk:21-jdk-slim AS build
+FROM eclipse-temurin:21 AS build
 WORKDIR /app
 COPY . /app
 RUN ./gradlew clean build
 
-FROM openjdk:21-jdk-slim AS follower-app
+FROM eclipse-temurin:21-jre AS follower-app
 COPY --from=build /app/build/libs/*-all.jar /app.jar
 ENTRYPOINT ["java", "--enable-preview", "-jar", "/app.jar"]

accounting_reporting_core/build.gradle.kts

@@ -1,3 +1,5 @@
+val openCsvVersion: String by project
+
 dependencies {
     implementation("org.jmolecules:jmolecules-events")
     implementation("org.jmolecules:jmolecules-ddd")
@@ -8,6 +10,7 @@ dependencies {
     implementation(project(":organisation"))
     implementation(project(":support"))
 
+    implementation("com.opencsv:opencsv:$openCsvVersion")
     testImplementation("org.springframework.boot:spring-boot-starter-data-jpa")
     testImplementation("org.springframework.boot:spring-boot-starter-validation")
 }

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/FilterOptions.java

@@ -0,0 +1,14 @@
+package org.cardanofoundation.lob.app.accounting_reporting_core.domain.core;
+
+
+public enum FilterOptions {
+    USERS,
+    DOCUMENT_NUMBERS,
+    TRANSACTION_NUMBERS,
+    TRANSACTION_TYPES,
+    COUNTER_PARTY_NAMES,
+    COUNTER_PARTY_TYPE,
+    COUNTER_PARTY,
+    RECONCILIATION_REJECTION_CODES,
+    RECONCILIATION_SOURCES
+}

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/LedgerDispatchStatus.java

@@ -12,10 +12,14 @@ public enum LedgerDispatchStatus {
 
     COMPLETED, // tx hash is ready and provided and in addition we have decent finality score to consider it completed
 
-    FINALIZED; // finalised on blockchain(s) - tx hash (12 hours)
+    FINALIZED, // finalised on blockchain(s) - tx hash (12 hours)
+
+    RETRYING,
+
+    FAILED;
 
     public static Set<LedgerDispatchStatus> allDispatchedStatuses() {
-        return Set.of(MARK_DISPATCH, DISPATCHED, COMPLETED, FINALIZED);
+        return Set.of(MARK_DISPATCH, DISPATCHED, COMPLETED, FINALIZED, RETRYING, FAILED);
     }
 
     /**

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/ReportStatusUpdate.java

@@ -17,6 +17,8 @@ public class ReportStatusUpdate {
 
     private LedgerDispatchStatus status;
 
+    private String ledgerDispatchStatusErrorReason;
+
     private Set<BlockchainReceipt> blockchainReceipts = Set.of();
 
 }

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/TransactionWithViolationDto.java

@@ -0,0 +1,9 @@
+package org.cardanofoundation.lob.app.accounting_reporting_core.domain.core;
+
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.entity.TransactionEntity;
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.entity.reconcilation.ReconcilationViolation;
+
+public record TransactionWithViolationDto(
+        TransactionEntity tx,
+        ReconcilationViolation violation) {
+}

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/TxStatusUpdate.java

@@ -17,6 +17,8 @@ public class TxStatusUpdate {
 
     private LedgerDispatchStatus status;
 
+    private String ledgerDispatchStatusErrorReason;
+
     private Set<BlockchainReceipt> blockchainReceipts = Set.of();
 
 }

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/core/report/ReportCsvLine.java

@@ -0,0 +1,36 @@
+package org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.report;
+
+import jakarta.validation.constraints.NotNull;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import com.opencsv.bean.CsvBindByName;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportCsvLine {
+
+    @CsvBindByName(column = "Report")
+    @NotNull(message = "Report is required")
+    private String report;
+    @CsvBindByName(column = "Period")
+    @NotNull(message = "Period is required")
+    private String period;
+    @CsvBindByName(column = "Year")
+    @NotNull(message = "Year is required")
+    private Short year;
+    @CsvBindByName(column = "Interval Type")
+    @NotNull(message = "Interval Type is required")
+    private String intervalType;
+    @CsvBindByName(column = "Field")
+    @NotNull(message = "Field is required")
+    private String field;
+    @CsvBindByName(column = "Amount")
+    @NotNull(message = "Amount is required")
+    private Double amount;
+}

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/domain/entity/Details.java

@@ -15,6 +15,7 @@
 @AllArgsConstructor
 @Builder(toBuilder = true)
 @Getter
+@Setter
 @EqualsAndHashCode
 @Audited
 public class Details {