Add ability to add or update an Owner

* add create form handling * add update form handing closes #55
arrumm · Aug 11, 2020 · e60d404 · e60d404
1 parent 3455018
commit e60d404
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 6 deletions.
diff --git a/pet-clinic-data/src/main/java/rumm/springframework/petclinic/model/BaseEntity.java b/pet-clinic-data/src/main/java/rumm/springframework/petclinic/model/BaseEntity.java
@@ -12,6 +12,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import static java.util.Objects.isNull;
+
 @Setter
 @Getter
 @NoArgsConstructor
@@ -22,4 +24,9 @@ public class BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
+    public Boolean isNew() {
+        return isNull(this.id);
+    }
+
 }
diff --git a/pet-clinic-web/src/main/java/rumm/springframework/petclinic/controllers/OwnerController.java b/pet-clinic-web/src/main/java/rumm/springframework/petclinic/controllers/OwnerController.java
@@ -2,13 +2,16 @@
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -21,6 +24,9 @@
 @Controller
 public class OwnerController {
 
+    public static final String REDIRECT_OWNERS = "redirect:/owners/";
+    private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
     private final OwnerService ownerService;
 
     public OwnerController(final OwnerService ownerService) {
@@ -44,7 +50,7 @@ public String processFindForm(Owner owner, BindingResult result, Model model) {
             return "owners/findOwners";
         } else if (results.size() == 1) {
             owner = results.get(0);
-            return "redirect:/owners/" + owner.getId();
+            return REDIRECT_OWNERS + owner.getId();
         } else {
             model.addAttribute("selections", results);
             return "owners/ownersList";
@@ -64,4 +70,37 @@ public ModelAndView showOwner(@PathVariable("ownerId") Long ownerId) {
         return modelAndView;
     }
 
+    @GetMapping("/new")
+    public String initCreationForm(Model model) {
+        model.addAttribute("owner", Owner.builder().build());
+        return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+    }
+
+    @PostMapping("/new")
+    public String processCreationForm(@Valid Owner owner, BindingResult result) {
+        if (result.hasErrors()) {
+            return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+        } else {
+            final Owner savedOwner = ownerService.save(owner);
+            return REDIRECT_OWNERS + savedOwner.getId();
+        }
+    }
+
+    @GetMapping("/{ownerId}/edit")
+    public String initUpdateOwnerForm(@PathVariable Long ownerId, Model model) {
+        model.addAttribute(ownerService.findById(ownerId));
+        return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+    }
+
+    @PostMapping("/{ownerId}/edit")
+    public String processUpdateOwnerForm(@Valid Owner owner, @PathVariable Long ownerId, BindingResult result) {
+        if (result.hasErrors()) {
+            return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+        } else {
+            owner.setId(ownerId);
+            final Owner savedOwner = ownerService.save(owner);
+            return REDIRECT_OWNERS + savedOwner.getId();
+        }
+    }
+
 }
diff --git a/.../test/java/rumm/springframework/petclinic/controllers/OwnerController_when_is_called.java b/.../test/java/rumm/springframework/petclinic/controllers/OwnerController_when_is_called.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatchers;
@@ -99,7 +98,6 @@ void processFindFormReturnOne() throws Exception {
         //@formatter:on
     }
 
-    @Disabled
     @Test
     void initCreationForm() throws Exception {
         //@formatter:off
@@ -111,7 +109,6 @@ void initCreationForm() throws Exception {
         verifyNoMoreInteractions(ownerService);
     }
 
-    @Disabled
     @Test
     void processCreationForm() throws Exception {
         when(ownerService.save(ArgumentMatchers.any())).thenReturn(Owner.builder().id(1L).build());
@@ -124,7 +121,6 @@ void processCreationForm() throws Exception {
         verify(ownerService).save(ArgumentMatchers.any());
     }
 
-    @Disabled
     @Test
     void initUpdateOwnerForm() throws Exception {
         when(ownerService.findById(anyLong())).thenReturn(Owner.builder().id(1L).build());
@@ -137,7 +133,6 @@ void initUpdateOwnerForm() throws Exception {
         verifyNoMoreInteractions(ownerService);
     }
 
-    @Disabled
     @Test
     void processUpdateOwnerForm() throws Exception {
         when(ownerService.save(ArgumentMatchers.any())).thenReturn(Owner.builder().id(1L).build());