Release 1.0.0

.github/workflows/build.yml

@@ -2,7 +2,10 @@ name: Build
 
 on:
   push:
-    branches: [ main, develop ]
+    branches:
+      - main
+      - develop
+      - 'release/*'
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   pull_request:

_backend-services/cf-reeve-ledger-follower-app/src/main/java/org/cardano/foundation/lob/resource/LedgerFollowerResource.java

@@ -30,7 +30,7 @@
 
 @RestController
 @CrossOrigin(origins = "http://localhost:3000")
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 @Slf4j
 public class LedgerFollowerResource {

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/config/BusinessRulesConfig.java

@@ -56,6 +56,7 @@ public BusinessRulesPipelineProcessor reprocessBusinessRulesProcessor() {
         val pipelineTasks = new ArrayList<PipelineTask>();
 
         pipelineTasks.add(conversionPipelineTask());
+        pipelineTasks.add(postCleansingPipelineTask());
 
         return new DefaultBusinessRulesPipelineProcessor(pipelineTasks);
     }
@@ -69,8 +70,7 @@ private PipelineTask sanityCheckPipelineTask() {
 
     private PipelineTask preCleansingPipelineTask() {
         return new DefaultPipelineTask(List.of(
-                new DiscardZeroBalanceTxItemsTaskItem(),
-                new JournalAccountCreditEnrichmentTaskItem(organisationPublicApi)
+                new DiscardZeroBalanceTxItemsTaskItem()
         ));
     }
 
@@ -79,7 +79,8 @@ private PipelineTask preValidationPipelineTask() {
                 new AmountsFcyCheckTaskItem(),
                 new AmountsLcyCheckTaskItem(),
                 new AmountLcyBalanceZerosOutCheckTaskItem(),
-                new AmountFcyBalanceZerosOutCheckTaskItem()
+                new AmountFcyBalanceZerosOutCheckTaskItem(),
+                new JournalAccountCreditEnrichmentTaskItem(organisationPublicApi)
         ));
     }
 

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

@@ -197,6 +197,11 @@ public String getId() {
     @Setter
     private Boolean ledgerDispatchApproved = false;
 
+    @Column(name = "is_ready_to_publish", nullable = false)
+    @Getter
+    @Setter
+    private Boolean isReadyToPublish = false;
+
     @Column(name = "ledger_dispatch_status", nullable = false)
     @Enumerated(STRING)
     @JdbcType(PostgreSQLEnumJdbcType.class)

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/job/TxStatusUpdaterJob.java

@@ -0,0 +1,111 @@
+package org.cardanofoundation.lob.app.accounting_reporting_core.job;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import io.vavr.control.Either;
+import org.zalando.problem.Problem;
+
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.LedgerDispatchStatus;
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.core.TxStatusUpdate;
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.entity.TransactionEntity;
+import org.cardanofoundation.lob.app.accounting_reporting_core.domain.entity.report.ReportEntity;
+import org.cardanofoundation.lob.app.accounting_reporting_core.repository.ReportRepository;
+import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.LedgerService;
+import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.ReportService;
+import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.TransactionBatchService;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+@ConditionalOnProperty(value = "lob.accounting_reporting_core.enabled", havingValue = "true", matchIfMissing = true)
+public class TxStatusUpdaterJob {
+
+    private final Map<String, TxStatusUpdate> txStatusUpdatesMap = new ConcurrentHashMap<>();
+    private final LedgerService ledgerService;
+    private final TransactionBatchService transactionBatchService;
+    private final ReportRepository reportRepository;
+    private final ReportService reportService;
+
+    @Value("${lob.blockchain.tx-status-updater.max-map-size:1000}")
+    private int maxMapSize;
+
+    // This Job collects all TxStatusUpdate events and updates the transactions in the database
+    @Scheduled(
+            fixedDelayString = "${ob.blockchain.tx-status-updater.fixed_delay:PT30S}",
+            initialDelayString = "${lob.blockchain.tx-status-updater.delay:PT30S}")
+    @Transactional
+    public void execute() {
+        Map<String, TxStatusUpdate> updates;
+        synchronized (txStatusUpdatesMap) {
+            updates = new HashMap<>(txStatusUpdatesMap);
+        }
+        if(updates.isEmpty()) {
+            log.debug("No TxStatusUpdate events to process");
+            return;
+        }
+        try {
+            log.info("Updating Status of {} transactions", updates.size());
+            List<TransactionEntity> transactionEntities = ledgerService.updateTransactionsWithNewStatuses(updates);
+            ledgerService.saveAllTransactionEntities(transactionEntities);
+
+            transactionBatchService.updateBatchesPerTransactions(updates);
+            updates.forEach(txStatusUpdatesMap::remove);
+
+            // Updating respective reports - Could be refactored to a separate method
+            Set<ReportEntity> reportEntitiesToBeUpdated = new HashSet<>();
+            for(TransactionEntity tx : transactionEntities) {
+                if (tx.getLedgerDispatchStatus() == LedgerDispatchStatus.FINALIZED) {
+                    LocalDate date = tx.getEntryDate();
+                    int year = date.getYear();
+                    int month = date.getMonthValue();
+                    int quarter = (month - 1) / 3 + 1;
+                    reportEntitiesToBeUpdated.addAll(reportRepository.findNotPublishedByOrganisationIdAndContainingDate(tx.getOrganisation().getId(), year, quarter, month));
+                }
+            }
+
+            reportEntitiesToBeUpdated.forEach(report -> {
+                log.info("Checking if report {} is ready to publish", report.getId());
+                Either<Problem, Boolean> isReadyToPublish = reportService.canPublish(report);
+                if (isReadyToPublish.isLeft()) {
+                    log.error("Report {} cannot be published: {}", report.getId(), isReadyToPublish.getLeft().getDetail());
+                    return;
+                }
+                report.setIsReadyToPublish(isReadyToPublish.get());
+                reportRepository.save(report);
+            });
+
+        } catch (Exception e) {
+            log.error("Failed to process TxStatusUpdates - entries will be retained in the map", e);
+        }
+    }
+
+    public void addToStatusUpdateMap(Map<String, TxStatusUpdate> updateMap) {
+        synchronized (txStatusUpdatesMap) {
+            updateMap.forEach((key, value) -> {
+                txStatusUpdatesMap.merge(key, value, (oldValue, newValue) ->
+                    newValue.getStatus().compareTo(oldValue.getStatus()) > 0 ? newValue : oldValue
+                );
+            });
+        }
+        if(txStatusUpdatesMap.size() > maxMapSize) {
+            log.warn("TxStatusUpdate map size exceeded the limit of {}. Current size: {}", maxMapSize, txStatusUpdatesMap.size());
+        }
+    }
+
+
+}

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/repository/ReportRepository.java

@@ -15,6 +15,8 @@
 
 public interface ReportRepository extends JpaRepository<ReportEntity, String> {
 
+    Optional<ReportEntity> findFirstByOrganisationIdAndReportId(@Param("organisationId") String organisationId, @Param("reportId") String reportId);
+
     @Query("""
             SELECT r FROM accounting_reporting_core.report.ReportEntity r
              WHERE r.organisation.id = :organisationId
@@ -75,4 +77,16 @@ List<ReportEntity> getNewestReportsInRange(@Param("organisationId") String organ
              AND r.ledgerDispatchStatus = 'FINALIZED'
             """)
     Set<ReportEntity> findByTypeAndWithinYearRange(@Param("organisationId") String organisationId, @Param("reportType") ReportType reportType, @Param("startYear") int startYear, @Param("endYear") int endYear);
+
+    @Query("""
+            SELECT r FROM accounting_reporting_core.report.ReportEntity r
+             WHERE
+             r.organisation.id = :organisationId
+             AND r.ledgerDispatchStatus = 'NOT_DISPATCHED'
+             AND
+                (r.intervalType = 'YEAR' AND r.year >= :year)
+                OR (r.intervalType = 'QUARTER' AND ((r.year = :year AND r.period >= :quarter) OR (r.year > :year)))
+                OR (r.intervalType = 'MONTH' AND ((r.year = :year AND r.period >= :month) OR (r.year > :year)))
+            """)
+    Set<ReportEntity> findNotPublishedByOrganisationIdAndContainingDate(@Param("organisationId") String organisationId, @Param("year") int year, @Param("quarter") int quarter, @Param("month") int month);
 }

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/AccountingCoreResource.java

@@ -46,7 +46,7 @@
 
 @RestController
 @CrossOrigin(origins = "http://localhost:3000")
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 @Slf4j
 @ConditionalOnProperty(value = "lob.accounting_reporting_core.enabled", havingValue = "true", matchIfMissing = true)

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/AccountingCoreResourceNetSuiteMock.java

@@ -17,7 +17,7 @@
 
 @RestController
 @CrossOrigin(origins = "http://localhost:3000")
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 @Slf4j
 @ConditionalOnProperty(value = "lob.accounting_reporting_core.enabled", havingValue = "true", matchIfMissing = true)

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/AccountingCoreResourceReconciliation.java

@@ -28,7 +28,7 @@
 
 @RestController
 @CrossOrigin(origins = "http://localhost:3000")
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 @Slf4j
 @ConditionalOnProperty(value = "lob.accounting_reporting_core.enabled", havingValue = "true", matchIfMissing = true)

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/ExperimentalAccountingCoreResource.java

@@ -23,7 +23,7 @@
 import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.TransactionBatchService;
 
 @RestController
-@RequestMapping("/api/core")
+@RequestMapping("/api/v1/core")
 @Slf4j
 @RequiredArgsConstructor
 @Deprecated(forRemoval = true)

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/ExtractionController.java

@@ -28,7 +28,7 @@
 import org.cardanofoundation.lob.app.support.date.FlexibleDateParser;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @CrossOrigin(origins = "http://localhost:3000")
 @RequiredArgsConstructor
 @Slf4j

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/MetricController.java

@@ -29,7 +29,7 @@
 import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.metrics.MetricService;
 
 @RestController
-@RequestMapping("/api/metrics")
+@RequestMapping("/api/v1/metrics")
 @CrossOrigin(origins = "http://localhost:3000")
 @RequiredArgsConstructor
 @Slf4j

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/PublicInterfaceController.java

@@ -35,7 +35,7 @@
 import org.cardanofoundation.lob.app.organisation.OrganisationPublicApi;
 
 @RestController
-@RequestMapping("/api/public")
+@RequestMapping("/api/v1/public")
 @RequiredArgsConstructor
 @Slf4j
 public class PublicInterfaceController {

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/ReportController.java

@@ -4,6 +4,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import jakarta.validation.Valid;
@@ -28,7 +29,7 @@
 import org.cardanofoundation.lob.app.organisation.service.OrganisationCurrencyService;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/v1")
 @RequiredArgsConstructor
 @Slf4j
 @ConditionalOnProperty(value = "lob.accounting_reporting_core.enabled", havingValue = "true", matchIfMissing = true)
@@ -42,13 +43,23 @@ public class ReportController {
     @PreAuthorize("hasRole(@securityConfig.getManagerRole()) or hasRole(@securityConfig.getAccountantRole())")
     public ResponseEntity<ReportResponseView> reportGenerate(@Valid @RequestBody ReportGenerateRequest reportGenerateRequest) {
         return reportService.reportGenerate(reportGenerateRequest).fold(
-                problem -> {
-                    return ResponseEntity.status(problem.getStatus().getStatusCode()).body(ReportResponseView.createFail(problem));
-                }, success -> {
-                    return ResponseEntity.ok().body(
-                            ReportResponseView.createSuccess(List.of(reportViewService.responseView(success)))
-                    );
-                }
+                problem ->
+                        ResponseEntity.status(Objects.requireNonNull(problem.getStatus()).getStatusCode()).body(ReportResponseView.createFail(problem)),
+                success -> ResponseEntity.ok().body(
+                        ReportResponseView.createSuccess(List.of(reportViewService.responseView(success)))
+                )
+        );
+    }
+
+    @Tag(name = "Reporting", description = "Reprocess Report")
+    @PostMapping(value = "/report-reprocess", produces = "application/json")
+    @PreAuthorize("hasRole(@securityConfig.getManagerRole()) or hasRole(@securityConfig.getAccountantRole())")
+    public ResponseEntity<ReportResponseView> reportReprocess(@Valid @RequestBody ReportReprocessRequest reportReprocessRequest) {
+        return reportService.reportReprocess(reportReprocessRequest).fold(
+                problem -> ResponseEntity.status(Objects.requireNonNull(problem.getStatus()).getStatusCode()).body(ReportResponseView.createFail(problem)),
+                success -> ResponseEntity.ok().body(
+                        ReportResponseView.createSuccess(List.of(reportViewService.responseView(success)))
+                )
         );
     }
 

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/presentation_layer_service/AccountingCorePresentationViewService.java

@@ -36,6 +36,7 @@
 import org.cardanofoundation.lob.app.accounting_reporting_core.resource.views.*;
 import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.AccountingCoreService;
 import org.cardanofoundation.lob.app.accounting_reporting_core.service.internal.TransactionRepositoryGateway;
+import org.cardanofoundation.lob.app.organisation.OrganisationPublicApiIF;
 import org.cardanofoundation.lob.app.organisation.domain.entity.OrganisationCostCenter;
 import org.cardanofoundation.lob.app.organisation.domain.entity.OrganisationProject;
 import org.cardanofoundation.lob.app.organisation.repository.CostCenterRepository;
@@ -57,6 +58,7 @@ public class AccountingCorePresentationViewService {
     private final TransactionReconcilationRepository transactionReconcilationRepository;
     private final CostCenterRepository costCenterRepository;
     private final ProjectMappingRepository projectMappingRepository;
+    private final OrganisationPublicApiIF organisationPublicApiIF;
 
     /**
      * TODO: waiting for refactoring the layer to remove this
@@ -458,8 +460,8 @@ private Set<TransactionItemView> getTransactionItemView(TransactionEntity transa
                     item.getAccountCredit().map(Account::getCode).orElse(""),
                     item.getAccountCredit().flatMap(Account::getName).orElse(""),
                     item.getAccountCredit().flatMap(Account::getRefCode).orElse(""),
-                    transaction.getTransactionType().equals(TransactionType.FxRevaluation) ? item.getAmountFcy() : item.getAmountFcy().abs(),
-                    transaction.getTransactionType().equals(TransactionType.FxRevaluation) ? item.getAmountLcy() : item.getAmountLcy().abs(),
+                    item.getOperationType().equals(OperationType.CREDIT) ? item.getAmountFcy().negate() : item.getAmountFcy(),
+                    item.getOperationType().equals(OperationType.CREDIT) ? item.getAmountLcy().negate() : item.getAmountLcy(),
                     item.getFxRate(),
                     item.getCostCenter().map(CostCenter::getCustomerCode).orElse(""),
                     item.getCostCenter().flatMap(CostCenter::getExternalCustomerCode).orElse(""),
@@ -497,38 +499,39 @@ private Set<ViolationView> getViolations(TransactionEntity transaction) {
 
     private TransactionReconciliationTransactionsView getReconciliationTransactionsSelector(Object[] violations) {
         for (Object o : violations) {
+            if (Objects.isNull(o)) {
+                continue;
+            }
             if (o instanceof TransactionEntity transactionEntity && transactionEntity.getLastReconcilation().isPresent()) {
                 return getTransactionReconciliationView(transactionEntity);
             }
             if (o instanceof ReconcilationViolation reconcilationViolation) {
                 return getTransactionReconciliationViolationView(reconcilationViolation);
             }
-
-            try {
-                log.warn("Object type: {}", o.getClass());
-            } catch (Exception e) {
-                log.warn("\nempty object: {}\n", o);
-            }
-
         }
-
         return getTransactionReconciliationViolationView();
     }
 
     public BigDecimal getAmountLcyTotalForAllDebitItems(TransactionEntity tx) {
         Set<TransactionItemEntity> items = tx.getItems();
 
         if (tx.getTransactionType().equals(TransactionType.Journal)) {
-            items = tx.getItems().stream().filter(txItems -> txItems.getOperationType().equals(OperationType.DEBIT)).collect(toSet());
+            Optional<String> dummyAccount = organisationPublicApiIF.findByOrganisationId(tx.getOrganisation().getId()).orElse(new org.cardanofoundation.lob.app.organisation.domain.entity.Organisation()).getDummyAccount();
+            items = tx.getItems().stream().filter(txItems -> txItems.getAccountDebit().isPresent() && txItems.getAccountDebit().get().getCode().equals(dummyAccount.orElse(""))).collect(toSet());
         }
 
         if (tx.getTransactionType().equals(TransactionType.FxRevaluation)) {
-            items.stream()
+            BigDecimal totalCredit = items.stream()
                     .filter(item -> item.getOperationType().equals(OperationType.CREDIT))
-                    .forEach(item -> {
-                        item.setAmountLcy(item.getAmountLcy().negate());
-                        item.setAmountFcy(item.getAmountFcy().negate());
-                    });
+                    .map(TransactionItemEntity::getAmountLcy)
+                    .reduce(ZERO, BigDecimal::add); // Use ZERO as identity for sum
+
+            BigDecimal totalDebit = items.stream()
+                    .filter(item -> item.getOperationType().equals(OperationType.DEBIT))
+                    .map(TransactionItemEntity::getAmountLcy)
+                    .reduce(ZERO, BigDecimal::add); // Use ZERO as identity for sum
+
+            return totalCredit.subtract(totalDebit).abs();
         }
 
         return items.stream()