Refactor: Move models and services according to the new structure (RA-79)

Author: BerezinD

api/src/main/java/org/cardanofoundation/rosetta/api/account/service/AccountServiceImpl.java

@@ -20,7 +20,6 @@
 import org.cardanofoundation.rosetta.api.block.model.domain.Block;
 import org.cardanofoundation.rosetta.api.block.model.domain.StakeAddressBalance;
 import org.cardanofoundation.rosetta.api.block.service.LedgerBlockService;
-import org.cardanofoundation.rosetta.api.construction.service.LedgerDataProviderService;
 import org.cardanofoundation.rosetta.common.exception.ExceptionFactory;
 import org.cardanofoundation.rosetta.common.mapper.DataMapper;
 import org.cardanofoundation.rosetta.common.util.CardanoAddressUtils;
@@ -32,7 +31,7 @@
 @RequiredArgsConstructor
 public class AccountServiceImpl implements AccountService {
 
-  private final LedgerDataProviderService ledgerDataProviderService;
+  private final LedgerAccountService ledgerAccountService;
   private final LedgerBlockService ledgerBlockService;
 
   @Override
@@ -74,7 +73,7 @@ public AccountCoinsResponse getAccountCoins(AccountCoinsRequest accountCoinsRequ
     log.debug("[accountCoins] Filter currency is {}", currenciesRequested);
     Block latestBlock = ledgerBlockService.findLatestBlock();
     log.debug("[accountCoins] Latest block is {}", latestBlock);
-    List<Utxo> utxos = ledgerDataProviderService.findUtxoByAddressAndCurrency(accountAddress,
+    List<Utxo> utxos = ledgerAccountService.findUtxoByAddressAndCurrency(accountAddress,
         currenciesRequested);
     log.debug("[accountCoins] found {} Utxos for Address {}", utxos.size(), accountAddress);
     return DataMapper.mapToAccountCoinsResponse(latestBlock, utxos);
@@ -90,7 +89,7 @@ private AccountBalanceResponse findBalanceDataByAddressAndBlock(String address,
               blockDto.getHash());
           if (CardanoAddressUtils.isStakeAddress(address)) {
             log.debug("Address is StakeAddress, get balance for {}", address);
-            List<StakeAddressBalance> balances = ledgerDataProviderService.findStakeAddressBalanceByAddressAndBlock(
+            List<StakeAddressBalance> balances = ledgerAccountService.findStakeAddressBalanceByAddressAndBlock(
                 address, blockDto.getNumber());
             if (Objects.isNull(balances) || balances.isEmpty()) {
               log.error("[findBalanceDataByAddressAndBlock] No balance found for {}", address);
@@ -99,7 +98,7 @@ private AccountBalanceResponse findBalanceDataByAddressAndBlock(String address,
             return DataMapper.mapToStakeAddressBalanceResponse(blockDto, balances.getFirst());
           } else {
             log.debug("Address isn't StakeAddress");
-            List<AddressBalance> balances = ledgerDataProviderService.findBalanceByAddressAndBlock(
+            List<AddressBalance> balances = ledgerAccountService.findBalanceByAddressAndBlock(
                 address, blockDto.getNumber());
             return DataMapper.mapToAccountBalanceResponse(blockDto, balances);
           }

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/LedgerDataProviderService.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/account/service/LedgerAccountService.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.rosetta.api.construction.service;
+package org.cardanofoundation.rosetta.api.account.service;
 
 
 import java.util.List;
@@ -12,7 +12,7 @@
 /**
  * Exposes functions to access chain data that has been indexed according to Rosetta API needs.
  */
-public interface LedgerDataProviderService {
+public interface LedgerAccountService {
 
   List<AddressBalance> findBalanceByAddressAndBlock(String address, Long number);
 

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/PostgresLedgerDataProviderService.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/account/service/LedgerAccountServiceImpl.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.rosetta.api.construction.service;
+package org.cardanofoundation.rosetta.api.account.service;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class PostgresLedgerDataProviderService implements LedgerDataProviderService {
+public class LedgerAccountServiceImpl implements LedgerAccountService {
 
   private final AddressBalanceRepository addressBalanceRepository;
   private final AddressUtxoRepository addressUtxoRepository;
@@ -34,6 +34,7 @@ public class PostgresLedgerDataProviderService implements LedgerDataProviderServ
 
   @Override
   public List<AddressBalance> findBalanceByAddressAndBlock(String address, Long number) {
+    log.debug("Finding balance for address {} at block {}", address, number);
     List<AddressBalanceEntity> balances = addressBalanceRepository.findAddressBalanceByAddressAndBlockNumber(
         address, number);
     return balances.stream().map(AddressBalance::fromEntity).toList();
@@ -42,6 +43,7 @@ public List<AddressBalance> findBalanceByAddressAndBlock(String address, Long nu
   @Override
   public List<StakeAddressBalance> findStakeAddressBalanceByAddressAndBlock(String address,
       Long number) {
+    log.debug("Finding stake address balance for address {} at block {}", address, number);
     List<StakeAddressBalanceEntity> balances = stakeAddressRepository.findStakeAddressBalanceByAddressAndBlockNumber(
         address, number);
     return balances.stream().map(StakeAddressBalance::fromEntity).toList();
@@ -50,6 +52,7 @@ public List<StakeAddressBalance> findStakeAddressBalanceByAddressAndBlock(String
 
   @Override
   public List<Utxo> findUtxoByAddressAndCurrency(String address, List<Currency> currencies) {
+    log.debug("Finding UTXOs for address {} with currencies {}", address, currencies);
     List<AddressUtxoEntity> addressUtxoEntities = addressUtxoRepository.findUtxosByAddress(address);
     return addressUtxoEntities.stream()
         .map(entity -> createUtxoModel(currencies, entity))

api/src/main/java/org/cardanofoundation/rosetta/api/block/service/LedgerBlockServiceImpl.java

@@ -3,13 +3,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import jakarta.transaction.Transactional;
 import jakarta.validation.constraints.NotNull;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.apache.commons.lang3.ObjectUtils;
 import org.modelmapper.ModelMapper;
 
@@ -86,6 +86,7 @@ private Block toModelFrom(BlockEntity blockEntity) {
   }
 
   @Override
+  @Transactional(readOnly = true)
   public List<BlockTx> findTransactionsByBlock(Long blk, String blkHash) {
     log.debug("query blockNumber: {} blockHash: {}", blk, blkHash);
     Optional<BlockEntity> blkEntity = blockRepository.findByNumberAndHash(blk, blkHash);
@@ -103,7 +104,6 @@ public List<BlockTx> findTransactionsByBlock(Long blk, String blkHash) {
     return Collections.emptyList();
   }
 
-
   @Override
   public Block findLatestBlock() {
     log.debug("About to look for latest block");
@@ -120,8 +120,6 @@ public GenesisBlock findGenesisBlock() {
         .orElseThrow(ExceptionFactory::genesisBlockNotFound);
   }
 
-
-  @Transactional
   private void populateTransaction(BlockTx transaction) {
 
     Optional.ofNullable(transaction.getInputs())

api/src/main/java/org/cardanofoundation/rosetta/common/enumeration/AddressType.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/construction/enumeration/AddressType.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.rosetta.common.enumeration;
+package org.cardanofoundation.rosetta.api.construction.enumeration;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

api/src/main/java/org/cardanofoundation/rosetta/common/enumeration/CatalystLabels.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/construction/enumeration/CatalystLabels.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.rosetta.common.enumeration;
+package org.cardanofoundation.rosetta.api.construction.enumeration;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionService.java

@@ -19,7 +19,7 @@
 
 import org.cardanofoundation.rosetta.api.block.model.domain.ProcessOperations;
 import org.cardanofoundation.rosetta.api.block.model.domain.ProtocolParams;
-import org.cardanofoundation.rosetta.common.enumeration.AddressType;
+import org.cardanofoundation.rosetta.api.construction.enumeration.AddressType;
 import org.cardanofoundation.rosetta.common.enumeration.EraAddressType;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkEnum;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkIdentifierType;

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImpl.java

@@ -55,7 +55,7 @@
 import org.cardanofoundation.rosetta.api.block.model.domain.ProcessOperationsReturn;
 import org.cardanofoundation.rosetta.api.block.model.domain.ProtocolParams;
 import org.cardanofoundation.rosetta.api.block.service.LedgerBlockService;
-import org.cardanofoundation.rosetta.common.enumeration.AddressType;
+import org.cardanofoundation.rosetta.api.construction.enumeration.AddressType;
 import org.cardanofoundation.rosetta.common.enumeration.EraAddressType;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkEnum;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkIdentifierType;

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/ConstructionApiServiceImpl.java

@@ -42,7 +42,7 @@
 import org.openapitools.client.model.TransactionIdentifierResponse;
 
 import org.cardanofoundation.rosetta.api.block.model.domain.ProtocolParams;
-import org.cardanofoundation.rosetta.common.enumeration.AddressType;
+import org.cardanofoundation.rosetta.api.construction.enumeration.AddressType;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkEnum;
 import org.cardanofoundation.rosetta.common.enumeration.NetworkIdentifierType;
 import org.cardanofoundation.rosetta.common.exception.ExceptionFactory;

api/src/main/java/org/cardanofoundation/rosetta/common/model/cardano/transaction/MemPoolTransaction.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/mempool/model/MemPoolTransaction.java

@@ -1,4 +1,4 @@
-package org.cardanofoundation.rosetta.common.model.cardano.transaction;
+package org.cardanofoundation.rosetta.api.mempool.model;
 
 import java.util.Arrays;
 import java.util.Objects;