Refactor: project struct

andersonhsporto · Oct 11, 2024 · 630575d · 630575d
1 parent 79634f8
commit 630575d
Show file tree

Hide file tree

Showing 25 changed files with 81 additions and 83 deletions.
diff --git a/...stimoapi/controller/ClientController.java → ...mprestimoapi/client/ClientController.java b/...stimoapi/controller/ClientController.java → ...mprestimoapi/client/ClientController.java
@@ -1,9 +1,8 @@
-package dev.anderson.emprestimoapi.controller;
+package dev.anderson.emprestimoapi.client;
 
-import dev.anderson.emprestimoapi.dto.ClientDto;
-import dev.anderson.emprestimoapi.exceptions.ClientDuplicatedException;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.service.ClientService;
+import dev.anderson.emprestimoapi.common.exceptions.ClientDuplicatedException;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.common.handler.GlobalExceptionHandler;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -13,9 +12,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping("/api/v1/clientes")
+@RequestMapping("/clientes")
 @AllArgsConstructor
-public class ClientController {
+public class ClientController extends GlobalExceptionHandler {
 
     private ClientService clientService;
 

diff --git a/...anderson/emprestimoapi/dto/ClientDto.java → ...erson/emprestimoapi/client/ClientDto.java b/...anderson/emprestimoapi/dto/ClientDto.java → ...erson/emprestimoapi/client/ClientDto.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.dto;
+package dev.anderson.emprestimoapi.client;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

diff --git a/.../emprestimoapi/entities/ClientEntity.java → ...on/emprestimoapi/client/ClientEntity.java b/.../emprestimoapi/entities/ClientEntity.java → ...on/emprestimoapi/client/ClientEntity.java
@@ -1,5 +1,7 @@
-package dev.anderson.emprestimoapi.entities;
+package dev.anderson.emprestimoapi.client;
 
+import dev.anderson.emprestimoapi.common.entities.AddressEntity;
+import dev.anderson.emprestimoapi.loan.LoanEntity;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/...on/emprestimoapi/mapper/ClientMapper.java → ...on/emprestimoapi/client/ClientMapper.java b/...on/emprestimoapi/mapper/ClientMapper.java → ...on/emprestimoapi/client/ClientMapper.java
@@ -1,7 +1,5 @@
-package dev.anderson.emprestimoapi.mapper;
+package dev.anderson.emprestimoapi.client;
 
-import dev.anderson.emprestimoapi.dto.ClientDto;
-import dev.anderson.emprestimoapi.entities.ClientEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;

diff --git a/...imoapi/repositories/ClientRepository.java → ...mprestimoapi/client/ClientRepository.java b/...imoapi/repositories/ClientRepository.java → ...mprestimoapi/client/ClientRepository.java
@@ -1,6 +1,5 @@
-package dev.anderson.emprestimoapi.repositories;
+package dev.anderson.emprestimoapi.client;
 
-import dev.anderson.emprestimoapi.entities.ClientEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ClientRepository extends JpaRepository<ClientEntity, Long> {

diff --git a/.../emprestimoapi/service/ClientService.java → ...n/emprestimoapi/client/ClientService.java b/.../emprestimoapi/service/ClientService.java → ...n/emprestimoapi/client/ClientService.java
@@ -1,12 +1,8 @@
-package dev.anderson.emprestimoapi.service;
-
-import dev.anderson.emprestimoapi.dto.ClientDto;
-import dev.anderson.emprestimoapi.entities.ClientEntity;
-import dev.anderson.emprestimoapi.entities.LoanEntity;
-import dev.anderson.emprestimoapi.exceptions.ClientDuplicatedException;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.mapper.ClientMapper;
-import dev.anderson.emprestimoapi.repositories.ClientRepository;
+package dev.anderson.emprestimoapi.client;
+
+import dev.anderson.emprestimoapi.loan.LoanEntity;
+import dev.anderson.emprestimoapi.common.exceptions.ClientDuplicatedException;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

diff --git a/src/main/java/dev/anderson/emprestimoapi/common/aspect/LoggerAspect.java b/src/main/java/dev/anderson/emprestimoapi/common/aspect/LoggerAspect.java
@@ -0,0 +1,11 @@
+package dev.anderson.emprestimoapi.common.aspect;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class LoggerAspect {
+
+
+}
diff --git a/...emprestimoapi/entities/AddressEntity.java → ...imoapi/common/entities/AddressEntity.java b/...emprestimoapi/entities/AddressEntity.java → ...imoapi/common/entities/AddressEntity.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.entities;
+package dev.anderson.emprestimoapi.common.entities;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...exceptions/ClientDuplicatedException.java → ...exceptions/ClientDuplicatedException.java b/...exceptions/ClientDuplicatedException.java → ...exceptions/ClientDuplicatedException.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.exceptions;
+package dev.anderson.emprestimoapi.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/...i/exceptions/ClientNotFoundException.java → ...n/exceptions/ClientNotFoundException.java b/...i/exceptions/ClientNotFoundException.java → ...n/exceptions/ClientNotFoundException.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.exceptions;
+package dev.anderson.emprestimoapi.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/...api/exceptions/LoanNotFoundException.java → ...mon/exceptions/LoanNotFoundException.java b/...api/exceptions/LoanNotFoundException.java → ...mon/exceptions/LoanNotFoundException.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.exceptions;
+package dev.anderson.emprestimoapi.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/...stimoapi/exceptions/MaxLoanException.java → ...i/common/exceptions/MaxLoanException.java b/...stimoapi/exceptions/MaxLoanException.java → ...i/common/exceptions/MaxLoanException.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.exceptions;
+package dev.anderson.emprestimoapi.common.exceptions;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/...tions/handler/GlobalExceptionHandler.java → ...ommon/handler/GlobalExceptionHandler.java b/...tions/handler/GlobalExceptionHandler.java → ...ommon/handler/GlobalExceptionHandler.java
@@ -1,9 +1,9 @@
-package dev.anderson.emprestimoapi.exceptions.handler;
+package dev.anderson.emprestimoapi.common.handler;
 
-import dev.anderson.emprestimoapi.exceptions.ClientDuplicatedException;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.LoanNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.MaxLoanException;
+import dev.anderson.emprestimoapi.common.exceptions.ClientDuplicatedException;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.LoanNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.MaxLoanException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.FieldError;

diff --git a/...erson/emprestimoapi/types/Membership.java → ...mprestimoapi/common/types/Membership.java b/...erson/emprestimoapi/types/Membership.java → ...mprestimoapi/common/types/Membership.java
@@ -1,4 +1,4 @@
-package dev.anderson.emprestimoapi.types;
+package dev.anderson.emprestimoapi.common.types;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

diff --git a/...restimoapi/controller/LoanController.java → ...on/emprestimoapi/loan/LoanController.java b/...restimoapi/controller/LoanController.java → ...on/emprestimoapi/loan/LoanController.java
@@ -1,10 +1,9 @@
-package dev.anderson.emprestimoapi.controller;
+package dev.anderson.emprestimoapi.loan;
 
-import dev.anderson.emprestimoapi.dto.LoanDto;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.LoanNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.MaxLoanException;
-import dev.anderson.emprestimoapi.service.LoanService;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.LoanNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.MaxLoanException;
+import dev.anderson.emprestimoapi.common.handler.GlobalExceptionHandler;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -14,9 +13,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping("/api/v1/clientes/{cpf}/emprestimos")
+@RequestMapping("/clientes/{cpf}/emprestimos")
 @AllArgsConstructor
-public class LoanController {
+public class LoanController extends GlobalExceptionHandler {
 
     private LoanService loanService;
 

diff --git a/...v/anderson/emprestimoapi/dto/LoanDto.java → .../anderson/emprestimoapi/loan/LoanDto.java b/...v/anderson/emprestimoapi/dto/LoanDto.java → .../anderson/emprestimoapi/loan/LoanDto.java
@@ -1,7 +1,7 @@
-package dev.anderson.emprestimoapi.dto;
+package dev.anderson.emprestimoapi.loan;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import dev.anderson.emprestimoapi.types.Membership;
+import dev.anderson.emprestimoapi.common.types.Membership;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 

diff --git a/...on/emprestimoapi/entities/LoanEntity.java → ...derson/emprestimoapi/loan/LoanEntity.java b/...on/emprestimoapi/entities/LoanEntity.java → ...derson/emprestimoapi/loan/LoanEntity.java
@@ -1,6 +1,7 @@
-package dev.anderson.emprestimoapi.entities;
+package dev.anderson.emprestimoapi.loan;
 
-import dev.anderson.emprestimoapi.types.Membership;
+import dev.anderson.emprestimoapi.client.ClientEntity;
+import dev.anderson.emprestimoapi.common.types.Membership;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/...rson/emprestimoapi/mapper/LoanMapper.java → ...derson/emprestimoapi/loan/LoanMapper.java b/...rson/emprestimoapi/mapper/LoanMapper.java → ...derson/emprestimoapi/loan/LoanMapper.java
@@ -1,7 +1,5 @@
-package dev.anderson.emprestimoapi.mapper;
+package dev.anderson.emprestimoapi.loan;
 
-import dev.anderson.emprestimoapi.dto.LoanDto;
-import dev.anderson.emprestimoapi.entities.LoanEntity;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;

diff --git a/...stimoapi/repositories/LoanRepository.java → ...on/emprestimoapi/loan/LoanRepository.java b/...stimoapi/repositories/LoanRepository.java → ...on/emprestimoapi/loan/LoanRepository.java
@@ -1,6 +1,5 @@
-package dev.anderson.emprestimoapi.repositories;
+package dev.anderson.emprestimoapi.loan;
 
-import dev.anderson.emprestimoapi.entities.LoanEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface LoanRepository extends JpaRepository<LoanEntity, Long> {

diff --git a/...on/emprestimoapi/service/LoanService.java → ...erson/emprestimoapi/loan/LoanService.java b/...on/emprestimoapi/service/LoanService.java → ...erson/emprestimoapi/loan/LoanService.java
@@ -1,14 +1,10 @@
-package dev.anderson.emprestimoapi.service;
-
-import dev.anderson.emprestimoapi.dto.LoanDto;
-import dev.anderson.emprestimoapi.entities.ClientEntity;
-import dev.anderson.emprestimoapi.entities.LoanEntity;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.LoanNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.MaxLoanException;
-import dev.anderson.emprestimoapi.mapper.LoanMapper;
-import dev.anderson.emprestimoapi.repositories.ClientRepository;
-import dev.anderson.emprestimoapi.repositories.LoanRepository;
+package dev.anderson.emprestimoapi.loan;
+
+import dev.anderson.emprestimoapi.client.ClientEntity;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.LoanNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.MaxLoanException;
+import dev.anderson.emprestimoapi.client.ClientRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -10,3 +10,4 @@ spring.jpa.hibernate.ddl-auto=update
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2-console
 
+server.servlet.context-path: /api/v1
diff --git a/src/test/java/dev/anderson/emprestimoapi/EmprestimoApiApplicationTests.java b/src/test/java/dev/anderson/emprestimoapi/EmprestimoApiApplicationTests.java
@@ -1,7 +1,7 @@
 package dev.anderson.emprestimoapi;
 
-import dev.anderson.emprestimoapi.controller.ClientController;
-import dev.anderson.emprestimoapi.controller.LoanController;
+import dev.anderson.emprestimoapi.client.ClientController;
+import dev.anderson.emprestimoapi.loan.LoanController;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/test/java/dev/anderson/emprestimoapi/service/ClientServiceTest.java b/src/test/java/dev/anderson/emprestimoapi/service/ClientServiceTest.java
@@ -1,11 +1,12 @@
 package dev.anderson.emprestimoapi.service;
 
-import dev.anderson.emprestimoapi.dto.ClientDto;
-import dev.anderson.emprestimoapi.entities.ClientEntity;
-import dev.anderson.emprestimoapi.exceptions.ClientDuplicatedException;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.mapper.ClientMapper;
-import dev.anderson.emprestimoapi.repositories.ClientRepository;
+import dev.anderson.emprestimoapi.client.ClientService;
+import dev.anderson.emprestimoapi.client.ClientDto;
+import dev.anderson.emprestimoapi.client.ClientEntity;
+import dev.anderson.emprestimoapi.common.exceptions.ClientDuplicatedException;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.client.ClientMapper;
+import dev.anderson.emprestimoapi.client.ClientRepository;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/test/java/dev/anderson/emprestimoapi/service/LoanServiceTest.java b/src/test/java/dev/anderson/emprestimoapi/service/LoanServiceTest.java
@@ -1,17 +1,14 @@
 package dev.anderson.emprestimoapi.service;
 
-import dev.anderson.emprestimoapi.dto.ClientDto;
-import dev.anderson.emprestimoapi.dto.LoanDto;
-import dev.anderson.emprestimoapi.entities.ClientEntity;
-import dev.anderson.emprestimoapi.entities.LoanEntity;
-import dev.anderson.emprestimoapi.exceptions.ClientNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.LoanNotFoundException;
-import dev.anderson.emprestimoapi.exceptions.MaxLoanException;
-import dev.anderson.emprestimoapi.mapper.ClientMapper;
-import dev.anderson.emprestimoapi.mapper.LoanMapper;
-import dev.anderson.emprestimoapi.repositories.ClientRepository;
-import dev.anderson.emprestimoapi.repositories.LoanRepository;
-import dev.anderson.emprestimoapi.types.Membership;
+import dev.anderson.emprestimoapi.client.ClientDto;
+import dev.anderson.emprestimoapi.loan.*;
+import dev.anderson.emprestimoapi.client.ClientEntity;
+import dev.anderson.emprestimoapi.common.exceptions.ClientNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.LoanNotFoundException;
+import dev.anderson.emprestimoapi.common.exceptions.MaxLoanException;
+import dev.anderson.emprestimoapi.client.ClientMapper;
+import dev.anderson.emprestimoapi.client.ClientRepository;
+import dev.anderson.emprestimoapi.common.types.Membership;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,7 +101,7 @@ void makeLoanOfClientThatDoesExist() throws Exception {
 
     @Test
     @DisplayName("Create a loan of a client that does exist but is not eligible for loan")
-    void makeLoanOfClientNotEligibleForLoan() throws Exception {
+    void makeLoanOfClientNotEligibleForLoan() {
         ClientDto clientDto = new ClientDto();
         clientDto.setCpf("12345678901");
         clientDto.setName("Bilbo Baggins");

diff --git a/src/test/java/dev/anderson/emprestimoapi/types/MembershipTest.java b/src/test/java/dev/anderson/emprestimoapi/types/MembershipTest.java
@@ -1,5 +1,6 @@
 package dev.anderson.emprestimoapi.types;
 
+import dev.anderson.emprestimoapi.common.types.Membership;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;