feature/edit-address

src/main/java/br/edu/utfpr/servicebook/controller/MyAccountController.java

@@ -8,6 +8,7 @@
 import br.edu.utfpr.servicebook.service.*;
 import br.edu.utfpr.servicebook.util.UserTemplateInfo;
 import br.edu.utfpr.servicebook.util.TemplateUtil;
+import br.edu.utfpr.servicebook.util.UserWizardUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@
 import javax.annotation.security.RolesAllowed;
 import javax.persistence.EntityNotFoundException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Optional;
 
@@ -72,6 +74,9 @@ public class MyAccountController {
     @Autowired
     private AddressService addressService;
 
+    @Autowired
+    private UserWizardUtil userWizardUtil;
+
     @GetMapping
     public String home(HttpServletRequest request) {
         return "redirect:/minha-conta/cliente";
@@ -227,20 +232,21 @@ public ModelAndView showMyAddress(@PathVariable Long id) throws IOException {
     @RolesAllowed({RoleType.USER, RoleType.COMPANY})
     public String saveAddress(
             @PathVariable Long id,
+            HttpSession httpSession,
             HttpServletRequest request,
-            RedirectAttributes redirectAttributes)
+            RedirectAttributes redirectAttributes,
+            @Validated(AddressDTO.RequestUserAddressInfoGroupValidation.class) AddressDTO dto,
+            BindingResult errors)
             throws IOException {
-        this.addressService.editAddress(id, request);
+
+        this.addressService.editAddress(id, dto, errors, httpSession);
 
         redirectAttributes.addFlashAttribute("msg", "Endereço editado com sucesso");
 
         return "redirect:/minha-conta/meu-endereco/{id}";
     }
 
-//    tente rota endereço
-
     /**
-     * FIXME Ao mudar o email, fazer logout para o usuário logar novamente, aí com o novo email
      * @param id
      * @param request
      * @param redirectAttributes

src/main/java/br/edu/utfpr/servicebook/service/AddressService.java

@@ -1,11 +1,17 @@
 package br.edu.utfpr.servicebook.service;
 
 
+import br.edu.utfpr.servicebook.model.dto.*;
 import br.edu.utfpr.servicebook.model.entity.*;
+import br.edu.utfpr.servicebook.model.mapper.CityMapper;
+import br.edu.utfpr.servicebook.model.mapper.IndividualMapper;
+import br.edu.utfpr.servicebook.model.mapper.UserMapper;
+import br.edu.utfpr.servicebook.util.UserWizardUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.BindingResult;
 
-import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.Optional;
 
 @Service
@@ -29,23 +35,26 @@ public Boolean compareAddres(Address address, Address addressUser) {
         }
     }
 
-    public void editAddress(Long id, HttpServletRequest request) {
+    public void editAddress(Long id, AddressDTO dto, BindingResult errors, HttpSession httpSession) {
         try {
+            Optional<City> oCity = cityService.findByName(dto.getCity());
+
+            if (!oCity.isPresent()) {
+                errors.rejectValue("city", "error.dto", "Cidade não cadastrada! Por favor, insira uma cidade cadastrada.");
+            }
+
+            City cityMidDTO = oCity.get();
+
+            Address addressFullDTO = new Address();
             Optional<User> oUser = this.userService.findById(id);
             User user = oUser.get();
-            Optional<City> cities = this.cityService.findById(user.getAddress().getCity().getId());
-            City cityUser = cities.get();
-            Address addressEdit = new Address();
-            addressEdit.setNeighborhood(request.getParameter("neighborhood"));
-            addressEdit.setStreet(request.getParameter("street"));
-            addressEdit.setNumber(request.getParameter("number"));
-            addressEdit.setPostalCode(request.getParameter("postalCode").replaceAll("-", ""));
-            addressEdit.setCity(cityUser);
-
-            if (!compareAddres(addressEdit, user.getAddress())) {
-                user.setAddress(addressEdit);
-                this.userService.save(user);
-            }
+            user.getAddress().setStreet(dto.getStreet().trim());
+            user.getAddress().setNumber(dto.getNumber().trim());
+            user.getAddress().setPostalCode(dto.getPostalCode().trim());
+            user.getAddress().setNeighborhood(dto.getNeighborhood().trim());
+            user.getAddress().setCity(cityMidDTO);
+            this.userService.save(user);
+
         } catch (Exception exception) {
             System.out.println(exception.getMessage());
         }