Merge pull request #119 from alexandre-touret/fix/get_owner_pets_impl…

…ementation add getOwnersPet implementation
spring-petclinic · Jul 14, 2023 · adfe18b · adfe18b
2 parents 065bba9 + 6011644
commit adfe18b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
@@ -35,8 +35,10 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 import jakarta.transaction.Transactional;
+
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Vitaliy Fedoriv
@@ -160,4 +162,20 @@ public ResponseEntity<VisitDto> addVisitToOwner(Integer ownerId, Integer petId,
         return new ResponseEntity<>(visitDto, headers, HttpStatus.CREATED);
     }
 
+
+    @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
+    @Override
+    public ResponseEntity<PetDto> getOwnersPet(Integer ownerId, Integer petId) {
+        Owner owner = this.clinicService.findOwnerById(ownerId);
+        Pet pet = this.clinicService.findPetById(petId);
+        if (owner == null || pet == null) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        } else {
+            if (!pet.getOwner().equals(owner)) {
+                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+            } else {
+                return new ResponseEntity<>(petMapper.toPetDto(pet), HttpStatus.OK);
+            }
+        }
+    }
 }
diff --git a/.../java/org/springframework/samples/petclinic/rest/controller/OwnerRestControllerTests.java b/.../java/org/springframework/samples/petclinic/rest/controller/OwnerRestControllerTests.java
@@ -26,8 +26,10 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.samples.petclinic.mapper.OwnerMapper;
+import org.springframework.samples.petclinic.mapper.PetMapper;
 import org.springframework.samples.petclinic.mapper.VisitMapper;
 import org.springframework.samples.petclinic.model.Owner;
+import org.springframework.samples.petclinic.model.Pet;
 import org.springframework.samples.petclinic.rest.advice.ExceptionControllerAdvice;
 import org.springframework.samples.petclinic.rest.dto.OwnerDto;
 import org.springframework.samples.petclinic.rest.dto.PetDto;
@@ -68,6 +70,9 @@ class OwnerRestControllerTests {
     @Autowired
     private OwnerMapper ownerMapper;
 
+    @Autowired
+    private PetMapper petMapper;
+
     @Autowired
     private VisitMapper visitMapper;
 
@@ -377,7 +382,7 @@ void testCreatePetError() throws Exception {
     }
 
     @Test
-    @WithMockUser(roles="OWNER_ADMIN")
+    @WithMockUser(roles = "OWNER_ADMIN")
     void testCreateVisitSuccess() throws Exception {
         VisitDto newVisit = visits.get(0);
         newVisit.setId(999);
@@ -391,4 +396,32 @@ void testCreateVisitSuccess() throws Exception {
             .andExpect(status().isCreated());
     }
 
+    @Test
+    @WithMockUser(roles = "OWNER_ADMIN")
+    void testGetOwnerPetSuccess() throws Exception {
+        owners.remove(0);
+        owners.remove(1);
+        given(this.clinicService.findAllOwners()).willReturn(ownerMapper.toOwners(owners));
+        var owner = ownerMapper.toOwner(owners.get(0));
+        given(this.clinicService.findOwnerById(2)).willReturn(owner);
+        var pet = petMapper.toPet(pets.get(0));
+        pet.setOwner(owner);
+        given(this.clinicService.findPetById(1)).willReturn(pet);
+        this.mockMvc.perform(get("/api/owners/2/pets/1")
+                .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType("application/json"));
+    }
+
+    @Test
+    @WithMockUser(roles = "OWNER_ADMIN")
+    void testGetOwnersPetsNotFound() throws Exception {
+        owners.clear();
+        given(this.clinicService.findAllOwners()).willReturn(ownerMapper.toOwners(owners));
+        this.mockMvc.perform(get("/api/owners/1/pets/1")
+                .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound());
+    }
+
+
 }