Merge pull request #63 from rcsim/feature/standardize_code

 Issue #62 - Padronização do código entre os endpoints

Author: rcsim

docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - SPRING_DATASOURCE_USERNAME=compose-postgres
       - SPRING_DATASOURCE_PASSWORD=compose-postgres
       - SPRING_JPA_HIBERNATE_DDL_AUTO=update
+      - SPRING_PROFILES_ACTIVE=dev
     ports:
       - "8080:8080"
     networks:

src/main/java/br/com/postech30/challenge/controller/AddressController.java

@@ -4,68 +4,76 @@
 import br.com.postech30.challenge.dto.ApplianceDTO;
 import br.com.postech30.challenge.dto.DependentDTO;
 import br.com.postech30.challenge.service.AddressService;
+import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @RequestMapping(value = "/address")
+@Validated
+@Transactional
 public class AddressController {
 
     @Autowired
-    AddressService service;
+    AddressService addressService;
+
+    public AddressController(AddressService addressService) {
+        this.addressService = addressService;
+    }
 
     @PostMapping
-    public ResponseEntity<String> addAddress(@RequestBody @Valid AddressDTO addressDTO) {
+    public ResponseEntity<AddressDTO> addAddress(@RequestBody @Valid AddressDTO addressDTO) {
 
-        service.saveAddress(addressDTO);
-        return ResponseEntity.status(HttpStatus.CREATED).body("Endereço cadastrado com sucesso!");
+        var addressSave = addressService.saveAddress(addressDTO);
+        return ResponseEntity.status(HttpStatus.CREATED).body(addressSave);
     }
 
     @GetMapping
     public  ResponseEntity<Page<AddressDTO>> getAddresses(
             @RequestParam(defaultValue = "") String search, Pageable pageable)  {
 
-        Page<AddressDTO> page = service.search(search, pageable);
+        Page<AddressDTO> page = addressService.search(search, pageable);
         return ResponseEntity.status(HttpStatus.OK).body(page);
     }
 
     @GetMapping(value = "{id}")
     public ResponseEntity<AddressDTO> getAddressById(@PathVariable Long id) {
 
-        AddressDTO dto = service.findById(id);
+        AddressDTO dto = addressService.findById(id);
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
     @DeleteMapping(value = "{id}")
     public ResponseEntity<String> removeAddress(@PathVariable Long id) {
 
-        service.delete(id);
+        addressService.delete(id);
         return ResponseEntity.status(HttpStatus.OK).body("Endereço deletado com sucesso!");
     }
 
     @PutMapping(value = "{id}")
     public ResponseEntity<String> updateAddress(@PathVariable Long id, @RequestBody @Valid AddressDTO addressDTO) {
 
-        service.update(id, addressDTO);
+        addressService.update(id, addressDTO);
         return ResponseEntity.status(HttpStatus.OK).body("Endereço atualizado com sucesso!");
     }
 
     @GetMapping(value = "{id}/dependents")
     public ResponseEntity<List<DependentDTO>> findDependentAddress(@PathVariable Long id) {
-        var dependent = service.findDependentByAddressId(id);
+        var dependent = addressService.findDependentByAddressId(id);
         return ResponseEntity.ok(dependent);
     }
 
     @GetMapping(value = "{id}/appliances")
     public ResponseEntity<List<ApplianceDTO>> findAppliancesAddress(@PathVariable Long id) {
-        var appliance = service.findApplianceByAddressId(id);
+        var appliance = addressService.findApplianceByAddressId(id);
         return ResponseEntity.ok(appliance);
     }
 }

src/main/java/br/com/postech30/challenge/controller/ApplianceController.java

@@ -18,10 +18,10 @@
 
 
 
-@Validated
-@Transactional
 @RestController
 @RequestMapping(value = "/appliance")
+@Validated
+@Transactional
 public class ApplianceController {
 
     @Autowired
@@ -34,7 +34,7 @@ public ApplianceController(ApplianceService applianceService) {
     @PostMapping
     public ResponseEntity<ApplianceDTO> saveAppliance(@RequestBody @Valid ApplianceDTO applianceDTO) {
         var applianceSave = applianceService.saveAppliance(applianceDTO);
-        return ResponseEntity.ok(applianceSave);
+        return ResponseEntity.status(HttpStatus.CREATED).body(applianceSave);
     }
 
 

src/main/java/br/com/postech30/challenge/controller/DependentController.java

@@ -4,6 +4,7 @@
 import br.com.postech30.challenge.dto.DependentDTO;
 import br.com.postech30.challenge.service.DependentService;
 import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -20,9 +21,9 @@
 @Transactional
 public class DependentController {
 
+    @Autowired
     private final DependentService dependentService;
 
-
     public DependentController(DependentService dependentService) {
         this.dependentService = dependentService;
     }
@@ -42,7 +43,7 @@ public ResponseEntity<DependentDTO> findById(@PathVariable Long id) {
     @PostMapping
     public ResponseEntity<DependentDTO> save(@RequestBody @Valid DependentDTO dependentDTO) {
         var dependentSaved = dependentService.saveDependent(dependentDTO);
-        return ResponseEntity.ok(dependentSaved);
+        return ResponseEntity.status(HttpStatus.CREATED).body(dependentSaved);
     }
 
     @PutMapping("/{id}")

src/main/java/br/com/postech30/challenge/dto/AddressDTO.java

@@ -7,35 +7,37 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
+@Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 public class AddressDTO {
-    @Getter
+
     private Long id;
+
     @JsonProperty
-    @Getter
     @NotBlank(message = "A rua é um campo de preenchimento obrigatório")
     private String street;
+
     @JsonProperty
-    @Getter
     @NotBlank(message = "O número é um campo de preenchimento obrigatório")
     private String number;
+
     @JsonProperty
-    @Getter
     @NotBlank(message = "O bairro é um campo de preenchimento obrigatório")
     private String district;
+
     @JsonProperty
-    @Getter
     @NotBlank(message = "A cidade é um campo de preenchimento obrigatório")
     private String city;
+
     @JsonProperty
-    @Getter
     @NotBlank(message = "O estado é um campo de preenchimento obrigatório")
     private String state;
 
     @JsonProperty
-    @Getter
     @NotNull(message = "O endereço precisa estar associado a um usuário")
     private Long userId;
 

src/main/java/br/com/postech30/challenge/entity/Address.java

@@ -6,6 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
+@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
@@ -15,23 +17,18 @@ public class Address {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter
+
     private Long id;
-    @Getter
-    @Setter
+
     @Column(columnDefinition = "TEXT")
     private String street;
-    @Getter
-    @Setter
+
     private String number;
-    @Getter
-    @Setter
+
     private String district;
-    @Getter
-    @Setter
+
     private String city;
-    @Getter
-    @Setter
+
     private String state;
 
     @Getter
@@ -42,8 +39,6 @@ public class Address {
     @OneToMany(mappedBy = "address", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Dependent> dependentList = new ArrayList<>();
 
-    @Getter
-    @Setter
     private Long userId;
 
 }

src/main/java/br/com/postech30/challenge/repository/AddressRepository.java

@@ -10,7 +10,7 @@
 
 @Repository
 public interface AddressRepository extends JpaRepository<Address, Long> {
-    Address save(Address address);
+    //Address save(Address address);
 
     Page<Address> findByStreetIgnoreCaseContainingOrDistrictIgnoreCaseContainingOrCityIgnoreCaseContainingOrStateIgnoreCaseContaining(String street, String district, String city, String state, Pageable pageable);
 }

src/main/java/br/com/postech30/challenge/repository/ApplianceRepository.java

@@ -10,7 +10,7 @@
 
 @Repository
 public interface ApplianceRepository extends JpaRepository<Appliance, Long> {
-    Appliance save(Appliance appliance);
+   // Appliance save(Appliance appliance);
 
     List<Appliance> findByAddress_Id(Long id);
 

src/main/java/br/com/postech30/challenge/service/AddressService.java

@@ -11,7 +11,7 @@
 
 public interface AddressService {
 
-    void saveAddress(AddressDTO addressDTO);
+    AddressDTO saveAddress(AddressDTO addressDTO);
 
     AddressDTO findById(Long id);
 

src/main/java/br/com/postech30/challenge/service/impl/AddressServiceImpl.java

@@ -25,7 +25,7 @@
 public class AddressServiceImpl implements AddressService {
 
     @Autowired
-    private AddressRepository repository;
+    private AddressRepository addressRepository;
     @Autowired
     DependentRepository dependentRepository;
     @Autowired
@@ -34,44 +34,45 @@ public class AddressServiceImpl implements AddressService {
     static final String RESPONSEENDERECONAOENCONTRADO = "Endereço não encontrado";
     @Override
     @Transactional
-    public void saveAddress(AddressDTO addressDTO) {
-        Address address = new Address();
-        address = mapTo(addressDTO, address);
-        repository.save(address);
+    public AddressDTO saveAddress(AddressDTO addressDTO) {
+        Address addressEntity = new Address();
+        addressEntity = mapTo(addressDTO, addressEntity);
+        return new AddressDTO(addressRepository.save(addressEntity));
     }
 
+
     @Override
     @Transactional(readOnly = true)
     public Page<AddressDTO> search(String text, Pageable pageable) {
         Page<Address> page;
         if (Objects.equals(text, "")) {
-            page = repository.findAll(pageable);
+            page = addressRepository.findAll(pageable);
         } else {
-            page = repository.findByStreetIgnoreCaseContainingOrDistrictIgnoreCaseContainingOrCityIgnoreCaseContainingOrStateIgnoreCaseContaining(text, text, text, text, pageable);
+            page = addressRepository.findByStreetIgnoreCaseContainingOrDistrictIgnoreCaseContainingOrCityIgnoreCaseContainingOrStateIgnoreCaseContaining(text, text, text, text, pageable);
         }
         return page.map(AddressDTO::new);
     }
 
     @Override
     @Transactional
     public List<DependentDTO> findDependentByAddressId(Long id) {
-        Address address = repository.getReferenceById(id);
+        Address address = addressRepository.getReferenceById(id);
         List<Dependent> addressDependent = dependentRepository.findByAddress_Id(address.getId());
         return addressDependent.stream().map(DependentDTO::new).toList();
     }
 
     @Override
     @Transactional
     public List<ApplianceDTO> findApplianceByAddressId(Long id) {
-        Address address = repository.getReferenceById(id);
+        Address address = addressRepository.getReferenceById(id);
         List<Appliance> addressAppliance =applianceRepository.findByAddress_Id(address.getId());
         return addressAppliance.stream().map(ApplianceDTO::new).toList();
     }
 
     @Override
     @Transactional(readOnly = true)
     public AddressDTO findById(Long id) {
-        Address address = repository.findById(id).orElseThrow(
+        Address address = addressRepository.findById(id).orElseThrow(
                 () -> new ResourceNotFoundException(RESPONSEENDERECONAOENCONTRADO));
 
         return new AddressDTO(address);
@@ -80,23 +81,23 @@ public AddressDTO findById(Long id) {
     @Override
     @Transactional(propagation = Propagation.SUPPORTS)
     public void delete(Long id) {
-        if (!repository.existsById(id)) {
+        if (!addressRepository.existsById(id)) {
             throw new ResourceNotFoundException(RESPONSEENDERECONAOENCONTRADO);
         }
 
-        repository.deleteById(id);
+        addressRepository.deleteById(id);
     }
 
     @Override
     @Transactional
     public void update(Long id, AddressDTO addressDTO) {
-        if (!repository.existsById(id)) {
+        if (!addressRepository.existsById(id)) {
             throw new ResourceNotFoundException(RESPONSEENDERECONAOENCONTRADO);
         }
 
-        Address address = repository.getReferenceById(id);
+        Address address = addressRepository.getReferenceById(id);
         address = mapTo(addressDTO, address);
-        repository.save(address);
+        addressRepository.save(address);
     }
 
     public Address mapTo(AddressDTO dto, Address entity) {