Refactor account layer (#86)

refactor: Refactor account layers

Author: BerezinD

api/src/main/java/org/cardanofoundation/rosetta/api/account/controller/AccountApiDelegate.java

@@ -1,27 +1,30 @@
 package org.cardanofoundation.rosetta.api.account.controller;
 
 import jakarta.validation.Valid;
+
 import lombok.RequiredArgsConstructor;
-import org.cardanofoundation.rosetta.api.account.service.AccountService;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.openapitools.client.api.AccountApi;
 import org.openapitools.client.model.AccountBalanceRequest;
 import org.openapitools.client.model.AccountBalanceResponse;
 import org.openapitools.client.model.AccountCoinsRequest;
 import org.openapitools.client.model.AccountCoinsResponse;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+
+import org.cardanofoundation.rosetta.api.account.service.AccountService;
 
 @RestController
 @RequiredArgsConstructor
-public class AccountApiDelegateImplementation implements AccountApiDelegate {
+public class AccountApiImplementation implements AccountApi {
 
   private final AccountService accountService;
 
   @Override
   public ResponseEntity<AccountBalanceResponse> accountBalance(
       @Valid @RequestBody AccountBalanceRequest accountBalanceRequest) {
     return ResponseEntity.ok(accountService.getAccountBalance(accountBalanceRequest));
-
   }
 
   @Override

api/src/main/java/org/cardanofoundation/rosetta/api/account/controller/AccountApiDelegateImplementation.java renamed to api/src/main/java/org/cardanofoundation/rosetta/api/account/controller/AccountApiImplementation.java

@@ -0,0 +1,27 @@
+package org.cardanofoundation.rosetta.api.account.model.domain;
+
+import java.math.BigInteger;
+
+import lombok.Builder;
+
+import org.cardanofoundation.rosetta.api.account.model.entity.AddressBalanceEntity;
+
+@Builder
+public record AddressBalance(String address,
+                             String unit,
+                             Long slot,
+                             BigInteger quantity,
+                             String policy,
+                             String assetName) {
+
+  public static AddressBalance fromEntity(AddressBalanceEntity addressBalanceEntity) {
+    return AddressBalance.builder()
+        .assetName(addressBalanceEntity.getAssetName())
+        .address(addressBalanceEntity.getAddress())
+        .unit(addressBalanceEntity.getUnit())
+        .slot(addressBalanceEntity.getSlot())
+        .quantity(addressBalanceEntity.getQuantity())
+        .policy(addressBalanceEntity.getPolicy())
+        .build();
+  }
+}

api/src/main/java/org/cardanofoundation/rosetta/api/account/model/domain/AddressBalance.java

@@ -0,0 +1,65 @@
+package org.cardanofoundation.rosetta.api.account.model.domain;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import org.cardanofoundation.rosetta.api.account.model.entity.AddressUtxoEntity;
+import org.cardanofoundation.rosetta.api.account.model.entity.Amt;
+import org.cardanofoundation.rosetta.api.block.model.entity.UtxoKey;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Utxo {
+
+  private String txHash;
+  private Integer outputIndex;
+  private Long slot;
+  private String blockHash;
+  private Integer epoch;
+  private String ownerAddr;
+  private String ownerAddrFull;
+  private String ownerStakeAddr;
+  private String ownerPaymentCredential;
+  private String ownerStakeCredential;
+  private BigInteger lovelaceAmount;
+  private List<Amt> amounts;
+  private String dataHash;
+  private String inlineDatum;
+  private String scriptRef;
+  private String referenceScriptHash;
+  private Boolean isCollateralReturn;
+
+  public Utxo(String txHash, Integer outputIndex) {
+    this.txHash = txHash;
+    this.outputIndex = outputIndex;
+  }
+
+  public static Utxo fromUtxoKey(UtxoKey utxoKey) {
+    return new Utxo(utxoKey.getTxHash(), utxoKey.getOutputIndex());
+  }
+
+  public void populateFromUtxoEntity(AddressUtxoEntity entity) {
+    this.slot = entity.getSlot();
+    this.blockHash = entity.getBlockHash();
+    this.epoch = entity.getEpoch();
+    this.ownerAddr = entity.getOwnerAddr();
+    this.ownerAddrFull = entity.getOwnerAddrFull();
+    this.ownerStakeAddr = entity.getOwnerStakeAddr();
+    this.ownerPaymentCredential = entity.getOwnerPaymentCredential();
+    this.ownerStakeCredential = entity.getOwnerStakeCredential();
+    this.lovelaceAmount = entity.getLovelaceAmount();
+    this.amounts = entity.getAmounts();
+    this.dataHash = entity.getDataHash();
+    this.inlineDatum = entity.getInlineDatum();
+    this.scriptRef = entity.getScriptRef();
+    this.referenceScriptHash = entity.getReferenceScriptHash();
+    this.isCollateralReturn = entity.getIsCollateralReturn();
+  }
+}

api/src/main/java/org/cardanofoundation/rosetta/api/account/model/domain/Utxo.java

@@ -1,16 +1,24 @@
 package org.cardanofoundation.rosetta.api.account.model.entity;
 
-import jakarta.persistence.*;
+import java.math.BigInteger;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.cardanofoundation.rosetta.api.block.model.entity.BlockAwareEntity;
+
 import org.hibernate.annotations.DynamicUpdate;
 
-import java.math.BigInteger;
+import org.cardanofoundation.rosetta.api.block.model.entity.BlockAwareEntity;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @SuperBuilder
@@ -19,41 +27,42 @@
 @IdClass(AddressBalanceId.class)
 @DynamicUpdate
 public class AddressBalanceEntity extends BlockAwareEntity {
-    @Id
-    @Column(name = "address")
-    private String address;
 
-    @Id
-    @Column(name = "unit")
-    private String unit;
+  @Id
+  @Column(name = "address")
+  private String address;
+
+  @Id
+  @Column(name = "unit")
+  private String unit;
 
-    @Id
-    @Column(name = "slot")
-    private Long slot;
+  @Id
+  @Column(name = "slot")
+  private Long slot;
 
-    @Column(name = "quantity")
-    private BigInteger quantity;
+  @Column(name = "quantity")
+  private BigInteger quantity;
 
-    //Only set if address doesn't fit in ownerAddr field. Required for few Byron Era addr
-    @Column(name = "addr_full")
-    private String addrFull;
+  //Only set if address doesn't fit in ownerAddr field. Required for few Byron Era addr
+  @Column(name = "addr_full")
+  private String addrFull;
 
-    @Column(name = "policy")
-    private String policy;
+  @Column(name = "policy")
+  private String policy;
 
-    @Column(name = "asset_name")
-    private String assetName;
+  @Column(name = "asset_name")
+  private String assetName;
 
-    @Column(name = "payment_credential")
-    private String paymentCredential;
+  @Column(name = "payment_credential")
+  private String paymentCredential;
 
-    @Column(name = "stake_address")
-    private String stakeAddress;
+  @Column(name = "stake_address")
+  private String stakeAddress;
 
-    @Column(name = "block_hash")
-    private String blockHash;
+  @Column(name = "block_hash")
+  private String blockHash;
 
-    @Column(name = "epoch")
-    private Integer epoch;
+  @Column(name = "epoch")
+  private Integer epoch;
 
 }