Skip to content

Commit a79173a

Browse files
barcellos-pedrobarcellos-pedro
committed
refactor: rename packages
1 parent 54227f1 commit a79173a

File tree

16 files changed

+65
-78
lines changed

16 files changed

+65
-78
lines changed

‎src/main/java/com/itau/transferencia/advices/ControllerAdvice.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itau.transferencia.advices;
22

33
import com.itau.transferencia.exceptions.BusinessException;
4-
import com.itau.transferencia.responses.Errors;
4+
import com.itau.transferencia.dtos.response.ErrorDTO;
55
import org.springframework.context.support.DefaultMessageSourceResolvable;
66
import org.springframework.dao.DataIntegrityViolationException;
77
import org.springframework.http.ResponseEntity;
@@ -22,30 +22,30 @@
2222
public class ControllerAdvice {
2323

2424
@ExceptionHandler(BusinessException.class)
25-
public ResponseEntity<Errors> handleBusinessException(BusinessException exception) {
25+
public ResponseEntity<ErrorDTO> handleBusinessException(BusinessException exception) {
2626
return ResponseEntity.status(exception.getHttpStatus())
27-
.body(Errors.of(exception.getMessage()));
27+
.body(ErrorDTO.of(exception.getMessage()));
2828
}
2929

3030
@ExceptionHandler(ObjectOptimisticLockingFailureException.class)
31-
public ResponseEntity<Errors> handleOptimisticLockingException(ObjectOptimisticLockingFailureException exception) {
32-
return ResponseEntity.badRequest().body(Errors.of(OPTIMISTIC_LOCK));
31+
public ResponseEntity<ErrorDTO> handleOptimisticLockingException(ObjectOptimisticLockingFailureException exception) {
32+
return ResponseEntity.badRequest().body(ErrorDTO.of(OPTIMISTIC_LOCK));
3333
}
3434

3535
@ExceptionHandler(DataIntegrityViolationException.class)
36-
public ResponseEntity<Errors> handleDataIntegrityException(DataIntegrityViolationException exception) {
37-
return ResponseEntity.status(CONFLICT).body(Errors.of(UNIQUE_ACCOUNT));
36+
public ResponseEntity<ErrorDTO> handleDataIntegrityException(DataIntegrityViolationException exception) {
37+
return ResponseEntity.status(CONFLICT).body(ErrorDTO.of(UNIQUE_ACCOUNT));
3838
}
3939

4040
@ExceptionHandler(MethodArgumentNotValidException.class)
41-
public ResponseEntity<Errors> handleValidationException(MethodArgumentNotValidException exception) {
41+
public ResponseEntity<ErrorDTO> handleValidationException(MethodArgumentNotValidException exception) {
4242
var errors = getErrorsMessage(exception);
43-
return ResponseEntity.badRequest().body(Errors.of(errors));
43+
return ResponseEntity.badRequest().body(ErrorDTO.of(errors));
4444
}
4545

4646
@ExceptionHandler(HttpMessageNotReadableException.class)
47-
public ResponseEntity<Errors> handleRequestBodyException(HttpMessageNotReadableException exception) {
48-
return ResponseEntity.badRequest().body(Errors.of(BAD_REQUEST.getReasonPhrase()));
47+
public ResponseEntity<ErrorDTO> handleRequestBodyException(HttpMessageNotReadableException exception) {
48+
return ResponseEntity.badRequest().body(ErrorDTO.of(BAD_REQUEST.getReasonPhrase()));
4949
}
5050

5151
public static List<String> getErrorsMessage(MethodArgumentNotValidException ex) {

‎src/main/java/com/itau/transferencia/controllers/CustomerController.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.itau.transferencia.controllers;
22

3+
import com.itau.transferencia.dtos.request.CustomerDTO;
4+
import com.itau.transferencia.dtos.response.TransferDTO;
35
import com.itau.transferencia.entities.Customer;
4-
import com.itau.transferencia.helpers.HttpHelper;
5-
import com.itau.transferencia.dtos.CustomerDTO;
6-
import com.itau.transferencia.dtos.TransferDTO;
7-
import com.itau.transferencia.responses.TransferResponse;
86
import com.itau.transferencia.services.CustomerService;
97
import com.itau.transferencia.services.TransferService;
108
import jakarta.validation.Valid;
119
import org.springframework.http.HttpStatus;
1210
import org.springframework.http.ResponseEntity;
1311
import org.springframework.web.bind.annotation.*;
12+
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
1413

14+
import java.net.URI;
1515
import java.util.List;
16+
import java.util.Map;
1617

1718
import static org.springframework.http.HttpStatus.CREATED;
1819

@@ -43,7 +44,7 @@ public ResponseEntity<Customer> findByAccountNumber(@RequestParam String account
4344
@PostMapping
4445
public ResponseEntity<Customer> create(@Valid @RequestBody CustomerDTO request) {
4546
var newCustomer = customerService.create(request);
46-
var location = HttpHelper.getLocation(newCustomer.getId());
47+
var location = getLocation(newCustomer.getId());
4748
return ResponseEntity.created(location).body(newCustomer);
4849
}
4950

@@ -54,12 +55,19 @@ public ResponseEntity<?> getTransfers(@PathVariable String account) {
5455
}
5556

5657
@PostMapping("/{account}/transfers")
57-
public ResponseEntity<TransferResponse> transfer(
58+
public ResponseEntity<TransferDTO> transfer(
5859
@PathVariable String account,
59-
@Valid @RequestBody TransferDTO transferDTO
60+
@Valid @RequestBody com.itau.transferencia.dtos.request.TransferDTO transferDTO
6061
) {
6162
var transfer = transferService.transfer(account, transferDTO);
62-
var response = TransferResponse.fromEntity(transfer);
63+
var response = TransferDTO.fromEntity(transfer);
6364
return ResponseEntity.status(CREATED).body(response);
6465
}
66+
67+
public static URI getLocation(Long id) {
68+
return ServletUriComponentsBuilder.fromCurrentRequest()
69+
.path("/{id}")
70+
.buildAndExpand(Map.of("id", id))
71+
.toUri();
72+
}
6573
}

src/main/java/com/itau/transferencia/dtos/CustomerDTO.java renamed to src/main/java/com/itau/transferencia/dtos/request/CustomerDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.itau.transferencia.dtos;
1+
package com.itau.transferencia.dtos.request;
22

33
import com.itau.transferencia.validations.AccountNumber;
44
import jakarta.validation.constraints.Min;

src/main/java/com/itau/transferencia/dtos/TransferDTO.java renamed to src/main/java/com/itau/transferencia/dtos/request/TransferDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.itau.transferencia.dtos;
1+
package com.itau.transferencia.dtos.request;
22

33
import com.itau.transferencia.validations.AccountNumber;
44
import jakarta.validation.constraints.Max;

‎src/main/java/com/itau/transferencia/dtos/response/ErrorDTO.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.itau.transferencia.dtos.response;
2+
3+
import java.util.List;
4+
5+
public record ErrorDTO(List<String> errors) {
6+
public static ErrorDTO of(String error) {
7+
return new ErrorDTO(List.of(error));
8+
}
9+
10+
public static ErrorDTO of(List<String> errors) {
11+
return new ErrorDTO(errors);
12+
}
13+
}

src/main/java/com/itau/transferencia/responses/TransferResponse.java renamed to src/main/java/com/itau/transferencia/dtos/response/TransferDTO.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.itau.transferencia.responses;
1+
package com.itau.transferencia.dtos.response;
22

33
import com.fasterxml.jackson.annotation.JsonFormat;
44
import com.itau.transferencia.entities.Customer;
@@ -9,7 +9,7 @@
99
import java.time.LocalDateTime;
1010
import java.util.Optional;
1111

12-
public record TransferResponse(
12+
public record TransferDTO(
1313
Long id,
1414
String sourceAccount,
1515
String destinationAccount,
@@ -18,14 +18,14 @@ public record TransferResponse(
1818
LocalDateTime createdAt,
1919
TransferStatus status
2020
) {
21-
public static TransferResponse fromEntity(Transfer transfer) {
21+
public static TransferDTO fromEntity(Transfer transfer) {
2222
var destination = getAccount(transfer.getDestination());
2323
var source = getAccount(transfer.getSource());
2424
var createdAt = transfer.getCreatedAt();
2525
var amount = transfer.getAmount();
2626
var status = transfer.getStatus();
2727
var id = transfer.getId();
28-
return new TransferResponse(id, source, destination, amount, createdAt, status);
28+
return new TransferDTO(id, source, destination, amount, createdAt, status);
2929
}
3030

3131
private static String getAccount(Customer customer) {

‎src/main/java/com/itau/transferencia/entities/Customer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itau.transferencia.entities;
22

33
import com.fasterxml.jackson.annotation.JsonManagedReference;
4-
import com.itau.transferencia.dtos.CustomerDTO;
4+
import com.itau.transferencia.dtos.request.CustomerDTO;
55
import jakarta.persistence.*;
66

77
import java.math.BigDecimal;

‎src/main/java/com/itau/transferencia/helpers/HttpHelper.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/com/itau/transferencia/responses/Errors.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/main/java/com/itau/transferencia/services/CustomerService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itau.transferencia.services;
22

33
import com.itau.transferencia.entities.Customer;
4-
import com.itau.transferencia.dtos.CustomerDTO;
4+
import com.itau.transferencia.dtos.request.CustomerDTO;
55

66
import java.util.List;
77
import java.util.Optional;

0 commit comments

Comments
 (0)