From df465372668bb04a8088b1386b53a170043cdf1f Mon Sep 17 00:00:00 2001 From: kapcake Date: Fri, 12 May 2023 14:38:17 +0200 Subject: [PATCH] Move entities to domain package --- .../bankingservice/converters/AbstractConverter.java | 2 -- .../converters/BankAccountConverter.java | 4 ++-- .../bankingservice/converters/PaymentConverter.java | 7 +++---- .../model/{entities => domain}/Balance.java | 2 +- .../model/{entities => domain}/BankAccount.java | 3 +-- .../model/{entities => domain}/Payment.java | 4 +--- .../model/{entities => domain}/User.java | 2 +- .../model/{domain => dtos}/BalanceDTO.java | 4 +++- .../model/{domain => dtos}/BankAccountDTO.java | 3 ++- .../model/{domain => dtos}/PaymentDTO.java | 4 +++- .../model/{domain => dtos}/UserDTO.java | 2 +- .../repositories/BalanceRepository.java | 2 +- .../repositories/BankAccountRepository.java | 2 +- .../repositories/PaymentRepository.java | 2 +- .../bankingservice/repositories/UserRepository.java | 2 +- .../bankingservice/security/UserDetailsImpl.java | 2 +- .../security/UserDetailsServiceImpl.java | 2 +- .../bankingservice/services/AccountService.java | 2 +- .../bankingservice/services/PaymentService.java | 9 ++++----- .../bankingservice/validation/PaymentValidator.java | 6 +++--- .../validation/PaymentValidatorTest.java | 11 ++++------- 21 files changed, 36 insertions(+), 41 deletions(-) rename src/main/java/net/kapcake/bankingservice/model/{entities => domain}/Balance.java (91%) rename src/main/java/net/kapcake/bankingservice/model/{entities => domain}/BankAccount.java (89%) rename src/main/java/net/kapcake/bankingservice/model/{entities => domain}/Payment.java (85%) rename src/main/java/net/kapcake/bankingservice/model/{entities => domain}/User.java (92%) rename src/main/java/net/kapcake/bankingservice/model/{domain => dtos}/BalanceDTO.java (68%) rename src/main/java/net/kapcake/bankingservice/model/{domain => dtos}/BankAccountDTO.java (83%) rename src/main/java/net/kapcake/bankingservice/model/{domain => dtos}/PaymentDTO.java (78%) rename src/main/java/net/kapcake/bankingservice/model/{domain => dtos}/UserDTO.java (86%) diff --git a/src/main/java/net/kapcake/bankingservice/converters/AbstractConverter.java b/src/main/java/net/kapcake/bankingservice/converters/AbstractConverter.java index fef752d..4040c1b 100644 --- a/src/main/java/net/kapcake/bankingservice/converters/AbstractConverter.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/converters/BankAccountConverter.java b/src/main/java/net/kapcake/bankingservice/converters/BankAccountConverter.java index 4c5b9cf..313d4e9 100644 --- a/src/main/java/net/kapcake/bankingservice/converters/BankAccountConverter.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/converters/PaymentConverter.java b/src/main/java/net/kapcake/bankingservice/converters/PaymentConverter.java index 7200bbd..7562f6f 100644 --- a/src/main/java/net/kapcake/bankingservice/converters/PaymentConverter.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/entities/Balance.java b/src/main/java/net/kapcake/bankingservice/model/domain/Balance.java similarity index 91% rename from src/main/java/net/kapcake/bankingservice/model/entities/Balance.java rename to src/main/java/net/kapcake/bankingservice/model/domain/Balance.java index 1076af5..44d905d 100644 --- a/src/main/java/net/kapcake/bankingservice/model/entities/Balance.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/entities/BankAccount.java b/src/main/java/net/kapcake/bankingservice/model/domain/BankAccount.java similarity index 89% rename from src/main/java/net/kapcake/bankingservice/model/entities/BankAccount.java rename to src/main/java/net/kapcake/bankingservice/model/domain/BankAccount.java index 6eb45d9..6917f05 100644 --- a/src/main/java/net/kapcake/bankingservice/model/entities/BankAccount.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/entities/Payment.java b/src/main/java/net/kapcake/bankingservice/model/domain/Payment.java similarity index 85% rename from src/main/java/net/kapcake/bankingservice/model/entities/Payment.java rename to src/main/java/net/kapcake/bankingservice/model/domain/Payment.java index c9c8ccb..9a17725 100644 --- a/src/main/java/net/kapcake/bankingservice/model/entities/Payment.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/entities/User.java b/src/main/java/net/kapcake/bankingservice/model/domain/User.java similarity index 92% rename from src/main/java/net/kapcake/bankingservice/model/entities/User.java rename to src/main/java/net/kapcake/bankingservice/model/domain/User.java index f58896a..1633c5f 100644 --- a/src/main/java/net/kapcake/bankingservice/model/entities/User.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/domain/BalanceDTO.java b/src/main/java/net/kapcake/bankingservice/model/dtos/BalanceDTO.java similarity index 68% rename from src/main/java/net/kapcake/bankingservice/model/domain/BalanceDTO.java rename to src/main/java/net/kapcake/bankingservice/model/dtos/BalanceDTO.java index 3758615..5850087 100644 --- a/src/main/java/net/kapcake/bankingservice/model/domain/BalanceDTO.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/domain/BankAccountDTO.java b/src/main/java/net/kapcake/bankingservice/model/dtos/BankAccountDTO.java similarity index 83% rename from src/main/java/net/kapcake/bankingservice/model/domain/BankAccountDTO.java rename to src/main/java/net/kapcake/bankingservice/model/dtos/BankAccountDTO.java index ed8f3d7..d8b22b8 100644 --- a/src/main/java/net/kapcake/bankingservice/model/domain/BankAccountDTO.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/domain/PaymentDTO.java b/src/main/java/net/kapcake/bankingservice/model/dtos/PaymentDTO.java similarity index 78% rename from src/main/java/net/kapcake/bankingservice/model/domain/PaymentDTO.java rename to src/main/java/net/kapcake/bankingservice/model/dtos/PaymentDTO.java index 56cc1c1..e3d37dd 100644 --- a/src/main/java/net/kapcake/bankingservice/model/domain/PaymentDTO.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/model/domain/UserDTO.java b/src/main/java/net/kapcake/bankingservice/model/dtos/UserDTO.java similarity index 86% rename from src/main/java/net/kapcake/bankingservice/model/domain/UserDTO.java rename to src/main/java/net/kapcake/bankingservice/model/dtos/UserDTO.java index 29b0e9a..bddef35 100644 --- a/src/main/java/net/kapcake/bankingservice/model/domain/UserDTO.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/repositories/BalanceRepository.java b/src/main/java/net/kapcake/bankingservice/repositories/BalanceRepository.java index 929f894..c3aea35 100644 --- a/src/main/java/net/kapcake/bankingservice/repositories/BalanceRepository.java +++ b/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 { diff --git a/src/main/java/net/kapcake/bankingservice/repositories/BankAccountRepository.java b/src/main/java/net/kapcake/bankingservice/repositories/BankAccountRepository.java index 4e4ea42..0556f89 100644 --- a/src/main/java/net/kapcake/bankingservice/repositories/BankAccountRepository.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/repositories/PaymentRepository.java b/src/main/java/net/kapcake/bankingservice/repositories/PaymentRepository.java index 0d1f769..087fa44 100644 --- a/src/main/java/net/kapcake/bankingservice/repositories/PaymentRepository.java +++ b/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 { diff --git a/src/main/java/net/kapcake/bankingservice/repositories/UserRepository.java b/src/main/java/net/kapcake/bankingservice/repositories/UserRepository.java index e748dc7..d54399b 100644 --- a/src/main/java/net/kapcake/bankingservice/repositories/UserRepository.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/security/UserDetailsImpl.java b/src/main/java/net/kapcake/bankingservice/security/UserDetailsImpl.java index d5ba2ed..29e5971 100644 --- a/src/main/java/net/kapcake/bankingservice/security/UserDetailsImpl.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/security/UserDetailsServiceImpl.java b/src/main/java/net/kapcake/bankingservice/security/UserDetailsServiceImpl.java index 2e42a5f..471cde5 100644 --- a/src/main/java/net/kapcake/bankingservice/security/UserDetailsServiceImpl.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/services/AccountService.java b/src/main/java/net/kapcake/bankingservice/services/AccountService.java index 7fd9b94..f9c956d 100644 --- a/src/main/java/net/kapcake/bankingservice/services/AccountService.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/services/PaymentService.java b/src/main/java/net/kapcake/bankingservice/services/PaymentService.java index 7e63082..ba18738 100644 --- a/src/main/java/net/kapcake/bankingservice/services/PaymentService.java +++ b/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; diff --git a/src/main/java/net/kapcake/bankingservice/validation/PaymentValidator.java b/src/main/java/net/kapcake/bankingservice/validation/PaymentValidator.java index f2a1e4f..22133e8 100644 --- a/src/main/java/net/kapcake/bankingservice/validation/PaymentValidator.java +++ b/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; diff --git a/src/test/java/net/kapcake/bankingservice/validation/PaymentValidatorTest.java b/src/test/java/net/kapcake/bankingservice/validation/PaymentValidatorTest.java index a9b965a..d6575c7 100644 --- a/src/test/java/net/kapcake/bankingservice/validation/PaymentValidatorTest.java +++ b/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;