Move entities to domain package

src/main/java/net/kapcake/bankingservice/converters/AbstractConverter.java

@@ -1,7 +1,5 @@
 package net.kapcake.bankingservice.converters;
 
-import net.kapcake.bankingservice.model.domain.PaymentDTO;
-import net.kapcake.bankingservice.model.entities.Payment;
 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
 

src/main/java/net/kapcake/bankingservice/converters/BankAccountConverter.java

@@ -1,7 +1,7 @@
 package net.kapcake.bankingservice.converters;
 
-import net.kapcake.bankingservice.model.domain.BankAccountDTO;
-import net.kapcake.bankingservice.model.entities.BankAccount;
+import net.kapcake.bankingservice.model.dtos.BankAccountDTO;
+import net.kapcake.bankingservice.model.domain.BankAccount;
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Component;
 

src/main/java/net/kapcake/bankingservice/converters/PaymentConverter.java

@@ -1,13 +1,12 @@
 package net.kapcake.bankingservice.converters;
 
 import net.kapcake.bankingservice.exceptions.PaymentValidationException;
-import net.kapcake.bankingservice.model.domain.PaymentDTO;
-import net.kapcake.bankingservice.model.entities.BankAccount;
-import net.kapcake.bankingservice.model.entities.Payment;
+import net.kapcake.bankingservice.model.dtos.PaymentDTO;
+import net.kapcake.bankingservice.model.domain.BankAccount;
+import net.kapcake.bankingservice.model.domain.Payment;
 import net.kapcake.bankingservice.repositories.BankAccountRepository;
 import org.modelmapper.ModelMapper;
 import org.modelmapper.TypeMap;
-import org.modelmapper.convention.MatchingStrategies;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;

src/main/java/net/kapcake/bankingservice/model/domain/Balance.java

@@ -1,4 +1,4 @@
-package net.kapcake.bankingservice.model.entities;
+package net.kapcake.bankingservice.model.domain;
 
 import jakarta.persistence.*;
 import lombok.Getter;

src/main/java/net/kapcake/bankingservice/model/domain/BankAccount.java

@@ -1,10 +1,9 @@
-package net.kapcake.bankingservice.model.entities;
+package net.kapcake.bankingservice.model.domain;
 
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
-import net.kapcake.bankingservice.model.domain.AccountStatus;
 
 import java.util.List;
 

src/main/java/net/kapcake/bankingservice/model/domain/Payment.java

@@ -1,11 +1,9 @@
-package net.kapcake.bankingservice.model.entities;
+package net.kapcake.bankingservice.model.domain;
 
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
-import net.kapcake.bankingservice.model.domain.Currency;
-import net.kapcake.bankingservice.model.domain.PaymentStatus;
 import org.hibernate.annotations.CreationTimestamp;
 
 import java.math.BigDecimal;

src/main/java/net/kapcake/bankingservice/model/domain/User.java

@@ -1,4 +1,4 @@
-package net.kapcake.bankingservice.model.entities;
+package net.kapcake.bankingservice.model.domain;
 
 import jakarta.persistence.*;
 import lombok.Getter;

src/main/java/net/kapcake/bankingservice/model/dtos/BalanceDTO.java

@@ -1,8 +1,10 @@
-package net.kapcake.bankingservice.model.domain;
+package net.kapcake.bankingservice.model.dtos;
 
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import net.kapcake.bankingservice.model.domain.BalanceType;
+import net.kapcake.bankingservice.model.domain.Currency;
 
 import java.math.BigDecimal;
 

src/main/java/net/kapcake/bankingservice/model/dtos/BankAccountDTO.java

@@ -1,10 +1,11 @@
-package net.kapcake.bankingservice.model.domain;
+package net.kapcake.bankingservice.model.dtos;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import net.kapcake.bankingservice.model.domain.AccountStatus;
 
 import java.util.List;
 

src/main/java/net/kapcake/bankingservice/model/dtos/PaymentDTO.java

@@ -1,8 +1,10 @@
-package net.kapcake.bankingservice.model.domain;
+package net.kapcake.bankingservice.model.dtos;
 
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import net.kapcake.bankingservice.model.domain.Currency;
+import net.kapcake.bankingservice.model.domain.PaymentStatus;
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/net/kapcake/bankingservice/model/dtos/UserDTO.java

@@ -1,4 +1,4 @@
-package net.kapcake.bankingservice.model.domain;
+package net.kapcake.bankingservice.model.dtos;
 
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;

src/main/java/net/kapcake/bankingservice/repositories/BalanceRepository.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.repositories;
 
-import net.kapcake.bankingservice.model.entities.Balance;
+import net.kapcake.bankingservice.model.domain.Balance;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BalanceRepository extends JpaRepository<Balance, Long> {

src/main/java/net/kapcake/bankingservice/repositories/BankAccountRepository.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.repositories;
 
-import net.kapcake.bankingservice.model.entities.BankAccount;
+import net.kapcake.bankingservice.model.domain.BankAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/net/kapcake/bankingservice/repositories/PaymentRepository.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.repositories;
 
-import net.kapcake.bankingservice.model.entities.Payment;
+import net.kapcake.bankingservice.model.domain.Payment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PaymentRepository extends JpaRepository<Payment, Long> {

src/main/java/net/kapcake/bankingservice/repositories/UserRepository.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.repositories;
 
-import net.kapcake.bankingservice.model.entities.User;
+import net.kapcake.bankingservice.model.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

src/main/java/net/kapcake/bankingservice/security/UserDetailsImpl.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.security;
 
-import net.kapcake.bankingservice.model.entities.User;
+import net.kapcake.bankingservice.model.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

src/main/java/net/kapcake/bankingservice/security/UserDetailsServiceImpl.java

@@ -1,6 +1,6 @@
 package net.kapcake.bankingservice.security;
 
-import net.kapcake.bankingservice.model.entities.User;
+import net.kapcake.bankingservice.model.domain.User;
 import net.kapcake.bankingservice.repositories.UserRepository;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/net/kapcake/bankingservice/services/AccountService.java

@@ -1,7 +1,7 @@
 package net.kapcake.bankingservice.services;
 
 import net.kapcake.bankingservice.converters.BankAccountConverter;
-import net.kapcake.bankingservice.model.domain.BankAccountDTO;
+import net.kapcake.bankingservice.model.dtos.BankAccountDTO;
 import net.kapcake.bankingservice.repositories.BankAccountRepository;
 import net.kapcake.bankingservice.security.UserDetailsImpl;
 import org.springframework.stereotype.Service;

src/main/java/net/kapcake/bankingservice/services/PaymentService.java

@@ -2,10 +2,10 @@ package net.kapcake.bankingservice.services;
 
 import net.kapcake.bankingservice.converters.PaymentConverter;
 import net.kapcake.bankingservice.model.domain.BalanceType;
-import net.kapcake.bankingservice.model.domain.PaymentDTO;
-import net.kapcake.bankingservice.model.entities.Balance;
-import net.kapcake.bankingservice.model.entities.BankAccount;
-import net.kapcake.bankingservice.model.entities.Payment;
+import net.kapcake.bankingservice.model.dtos.PaymentDTO;
+import net.kapcake.bankingservice.model.domain.Balance;
+import net.kapcake.bankingservice.model.domain.BankAccount;
+import net.kapcake.bankingservice.model.domain.Payment;
 import net.kapcake.bankingservice.repositories.BalanceRepository;
 import net.kapcake.bankingservice.repositories.BankAccountRepository;
 import net.kapcake.bankingservice.repositories.PaymentRepository;
@@ -13,7 +13,6 @@ import net.kapcake.bankingservice.security.UserDetailsImpl;
 import net.kapcake.bankingservice.validation.PaymentValidator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.Optional;

src/main/java/net/kapcake/bankingservice/validation/PaymentValidator.java

@@ -3,9 +3,9 @@ package net.kapcake.bankingservice.validation;
 import net.kapcake.bankingservice.exceptions.PaymentValidationException;
 import net.kapcake.bankingservice.model.domain.BalanceType;
 import net.kapcake.bankingservice.model.domain.IbanValidationResponse;
-import net.kapcake.bankingservice.model.entities.Balance;
-import net.kapcake.bankingservice.model.entities.Payment;
-import net.kapcake.bankingservice.model.entities.User;
+import net.kapcake.bankingservice.model.domain.Balance;
+import net.kapcake.bankingservice.model.domain.Payment;
+import net.kapcake.bankingservice.model.domain.User;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClientException;

src/test/java/net/kapcake/bankingservice/validation/PaymentValidatorTest.java

@@ -7,22 +7,19 @@ import net.kapcake.bankingservice.exceptions.PaymentValidationException;
 import net.kapcake.bankingservice.model.domain.BalanceType;
 import net.kapcake.bankingservice.model.domain.Currency;
 import net.kapcake.bankingservice.model.domain.IbanValidationResponse;
-import net.kapcake.bankingservice.model.entities.Balance;
-import net.kapcake.bankingservice.model.entities.BankAccount;
-import net.kapcake.bankingservice.model.entities.Payment;
-import net.kapcake.bankingservice.model.entities.User;
+import net.kapcake.bankingservice.model.domain.Balance;
+import net.kapcake.bankingservice.model.domain.BankAccount;
+import net.kapcake.bankingservice.model.domain.Payment;
+import net.kapcake.bankingservice.model.domain.User;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.web.client.ExpectedCount;
 import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.test.web.client.response.MockRestResponseCreators;
 import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;