Merge pull request #93 from UdL-EPS-SoftArch/77-fix-update-room-test

77 fix update room test

src/main/java/cat/udl/eps/softarch/demo/config/WebSecurityConfig.java

@@ -36,6 +36,8 @@ protected SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exce
                         .requestMatchers(HttpMethod.POST, "/users/*").denyAll()
                         .requestMatchers(HttpMethod.POST, "/rooms").authenticated()
                         .requestMatchers(HttpMethod.POST, "/rooms/*").hasAnyRole("OWNER")
+                        .requestMatchers(HttpMethod.PATCH, "/rooms").authenticated()
+                        .requestMatchers(HttpMethod.PATCH, "/rooms/*").hasAnyRole("OWNER")
                         .requestMatchers(HttpMethod.POST, "/properties").hasAuthority("ROLE_OWNER")
                         .requestMatchers(HttpMethod.PUT, "/properties/*").hasAuthority("ROLE_OWNER")
                         .requestMatchers(HttpMethod.DELETE, "/properties/*").hasAuthority("ROLE_OWNER")

src/main/java/cat/udl/eps/softarch/demo/domain/Room.java

@@ -34,10 +34,10 @@ public class Room extends UriEntity<Long> {
     @NotNull
     private Apartment apart;
 
+    private String ownerId;
+    public void setOwner(Owner owner) {
+        ownerId = owner.getId();
+    }
 
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @NotNull
-    @ManyToOne
-    private Owner owner;
 
 }

src/main/java/cat/udl/eps/softarch/demo/handler/RoomEventHandler.java

@@ -1,40 +1,77 @@
-package cat.udl.eps.softarch.demo.handler;
-
-
-import cat.udl.eps.softarch.demo.domain.Apartment;
-import cat.udl.eps.softarch.demo.domain.Owner;
-import cat.udl.eps.softarch.demo.domain.Room;
-import cat.udl.eps.softarch.demo.repository.ApartmentRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.rest.core.annotation.HandleBeforeCreate;
-import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-@RepositoryEventHandler
-public class RoomEventHandler {
-
-    final Logger logger = LoggerFactory.getLogger(Room.class);
-    final ApartmentRepository apartmentRepository;
-
-    public RoomEventHandler(ApartmentRepository apartmentRepository) {
-        this.apartmentRepository = apartmentRepository;
-    }
-
-    @HandleBeforeCreate
-    public void handleBeforeCreate(Room room) {
-        Owner owner = (Owner) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        room.setOwner(owner);
-
-        List<Apartment> apartmentList = apartmentRepository.findByOwner(owner);
-        if (!apartmentList.isEmpty()) {
-            room.setApart(apartmentList.get(0));
-        }
-        logger.info("New room created: {}", room);
-    }
-}
-
+package cat.udl.eps.softarch.demo.handler;
+
+
+import cat.udl.eps.softarch.demo.domain.Apartment;
+import cat.udl.eps.softarch.demo.domain.Owner;
+import cat.udl.eps.softarch.demo.domain.Room;
+import cat.udl.eps.softarch.demo.repository.ApartmentRepository;
+import cat.udl.eps.softarch.demo.repository.RoomRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.rest.core.annotation.HandleBeforeCreate;
+import org.springframework.data.rest.core.annotation.HandleBeforeDelete;
+import org.springframework.data.rest.core.annotation.HandleBeforeSave;
+import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.server.ResponseStatusException;
+
+
+@Component
+@RepositoryEventHandler
+public class RoomEventHandler {
+
+    final Logger logger = LoggerFactory.getLogger(Room.class);
+    final ApartmentRepository apartmentRepository;
+
+    public RoomEventHandler(ApartmentRepository apartmentRepository, RoomRepository roomRepository) {
+        this.apartmentRepository = apartmentRepository;
+    }
+
+    @HandleBeforeSave
+    public void handleBeforeSave(Room room) {
+        Owner owner = (Owner) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        Apartment apart = room.getApart();
+        Owner roomOwner = apart.getOwner();
+        assert roomOwner.getId() != null;
+        if(!roomOwner.getId().equals(owner.getId())){
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Unauthorized owner.");        }
+        logger.info("New room updated: {}", room);
+    }
+
+    @HandleBeforeCreate
+    public void handleBeforeCreate(Room room) {
+        Owner owner;
+        try{
+            owner = (Owner) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        }catch (Exception e){
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Not owner type.");
+        }
+        Apartment apart = room.getApart();
+        Owner roomOwner = apart.getOwner();
+        assert roomOwner.getId() != null;
+        if(!roomOwner.getId().equals(owner.getId())){
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Unauthorized owner.");        }
+        logger.info("New room updated: {}", room);
+    }
+
+    @HandleBeforeDelete
+    public void handleBeforeDelate(Room room) {
+        Owner owner;
+        try{
+            owner = (Owner) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        }catch (Exception e){
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Not owner type.");
+        }
+        Apartment apart = room.getApart();
+        Owner roomOwner = apart.getOwner();
+        assert roomOwner.getId() != null;
+        if(!roomOwner.getId().equals(owner.getId())){
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Unauthorized owner.");        }
+        logger.info("New room updated: {}", room);
+    }
+
+
+}

src/main/java/cat/udl/eps/softarch/demo/repository/RoomRepository.java

@@ -14,6 +14,5 @@
 public interface RoomRepository extends CrudRepository<Room, Long>, PagingAndSortingRepository<Room, Long> {
 
     @NotNull Optional<Room> findById(@Param("long")@NotNull Long id);
-    List<Room> findByOwner(@Param("owner") Owner owner);
     List<Room> findByApart(@Param("apart") Apartment apart);
 }

src/test/java/cat/udl/eps/softarch/demo/steps/CreateRoomStepDefs.java

@@ -46,20 +46,16 @@ public void thereIsARoomWithSurfaceIsOccupiedHasWindowHasDeskAndHaveBedByOwnerUs
             Owner owner = owner_list_by_userid.get();
             Room room = RoomUtils.buildRoom(surface,IsOccupied,HasWindow,HasDesk,HasBed);
             room.setApart(apart);
-            room.setOwner(owner);
             roomRepository.save(room);
         }
     }
 
-    @When("I create a Room with the surface {string}, occupied {string}, window {string}, desk {string} and bed {string}, by owner username {string} and the apartment_name {string}")
-    public void iCreateARoomWithDetails(String surface, String occupied, String window, String desk, String bed, String UserName, String ApartmentName) throws Exception {
-        Optional<Owner> owner_list_by_userid = ownerRepository.findById(UserName);
+    @When("I create a Room with the surface {string}, occupied {string}, window {string}, desk {string} and bed {string} and the apartment_name {string}")
+    public void iCreateARoomWithDetails(String surface, String occupied, String window, String desk, String bed, String ApartmentName) throws Exception {
         Apartment apart = apartmentRepository.findByName(ApartmentName).get(0);
 
-        Owner owner = owner_list_by_userid.get();
         Room room = RoomUtils.buildRoom(surface,occupied,window,desk,bed);
         room.setApart(apart);
-        room.setOwner(owner);
         stepDefs.result = stepDefs.mockMvc.perform(
                         post("/rooms")
                                 .contentType(MediaType.APPLICATION_JSON)
@@ -84,7 +80,6 @@ public void iCreateARoomWithTheSurfaceOccupiedWindowDeskAndBed(String surface, S
         Apartment apartment = apartmentList.iterator().next();
         Owner owner = usersList.iterator().next();
         room.setApart(apartment);
-        room.setOwner(owner);
         stepDefs.result = stepDefs.mockMvc.perform(
                         post("/rooms")
                                 .contentType(MediaType.APPLICATION_JSON)

src/test/java/cat/udl/eps/softarch/demo/steps/DeleteRoomStepDefs.java

@@ -9,11 +9,14 @@
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class DeleteRoomStepDefs {
 
@@ -51,4 +54,23 @@ public void iTryToDeleteRoomOfTheApartment(String apartmentName) throws Throwabl
                                 .with(AuthenticationStepDefs.authenticate()))
                 .andDo(print());
     }
+
+    @When("I try to delete Room with the id {string}")
+    public void iTryToDeleteRoomWithTheId(String id) throws Exception {
+        if(roomRepository.findById(Long.parseLong(id)).isEmpty()) {
+            stepDefs.result = stepDefs.mockMvc.perform(
+                            delete("/rooms/" + id)  // Ruta para eliminar el Room con el ID dado
+                                    .accept(MediaType.APPLICATION_JSON)
+                                    .with(AuthenticationStepDefs.authenticate()))
+                    .andExpect(status().isNotFound()) 
+                    .andDo(print());
+
+        }else{
+            stepDefs.result = stepDefs.mockMvc.perform(
+                    delete("/rooms/" + id)
+                            .accept(MediaType.APPLICATION_JSON)
+                            .with(AuthenticationStepDefs.authenticate())).andDo(print());
+        }
+
+    }
 }

src/test/java/cat/udl/eps/softarch/demo/steps/UpdateRoomStepsDefs.java

@@ -14,9 +14,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class UpdateRoomStepsDefs {
     @Autowired
@@ -28,30 +31,41 @@ public class UpdateRoomStepsDefs {
     @Autowired
     private OwnerRepository ownerRepository;
 
-    @When("I update an apartment called {string}")
-    public void iUpdateAnApartmentCalled(String apartmentName) throws Exception {
-        Apartment apartment = apartmentRepository.findByName(apartmentName).get(0);
-        Room room = RoomUtils.getRoom(roomRepository, apartment);
-        if (room != null) {
+    @When("I update the room {string}")
+    public void iUpdateAnRoom(String id) throws Exception {
+        Optional<Room> RoomList = roomRepository.findById(Long.parseLong(id));
+        if(RoomList.isEmpty()) {
+
             JSONObject json = new JSONObject();
             json.put("surface", 20);
             json.put("isOccupied", true);
             json.put("hasWindow", true);
             json.put("hasDesk", true);
             json.put("hasBed", true);
+            stepDefs.result = stepDefs.mockMvc.perform(
+                            patch("/rooms/" + id)  // Ruta para eliminar el Room con el ID dado
+                                    .contentType(MediaType.APPLICATION_JSON)
+                                    .content(json.toString())
+                                    .characterEncoding(StandardCharsets.UTF_8)
+                                    .accept(MediaType.APPLICATION_JSON)
+                                    .with(AuthenticationStepDefs.authenticate()))
+                    .andExpect(status().isNotFound())
+                    .andDo(print());
+
+        }else{
+            Room room = roomRepository.findById(Long.parseLong(id)).get();
+
+            room.setSurface(3);
 
             stepDefs.result = stepDefs.mockMvc.perform(patch(room.getUri())
                             .contentType(MediaType.APPLICATION_JSON)
-                            .content(json.toString())
+                            .content(stepDefs.mapper.writeValueAsString(room))
                             .characterEncoding(StandardCharsets.UTF_8)
                             .accept(MediaType.APPLICATION_JSON)
                             .with(AuthenticationStepDefs.authenticate()))
                     .andDo(print());
-
-            stepDefs.result.andReturn().getResponse().getHeader("Location");
-        } else {
-            throw new RuntimeException("Room not found.");
         }
+
     }
 }
 

src/test/resources/features/CreateRoom.feature

@@ -4,16 +4,31 @@ Feature: Create Room
   I must be able to create Room
 
   Background:
+    Given There is a registered user with username "demo" and password "password" and email "[email protected]"
+    Given There is a registered owner with username "owner" and password "password" and email "[email protected]"
     Given There is a registered owner with username "owner1" and password "password" and email "[email protected]"
-    Given There is a apartment with the name "test", floor "2", address "123 Wall Street", postal code "10005", city "New York", country "United States of America", description "..." and a creation date "2024-10-16T10:30:00-04:00" by owner username "owner"
+    Given There is a apartment with the name "testApartment", floor "0", address "roomAddressX", postal code "postalCodeX", city "cityX", country "countryX", description "roomDescriptionX" and a creation date "2024-10-18T17:44:30.551316+00:00" by owner username "owner1"
 
 
   Scenario: Create a new Room while logged in
     Given I login as "owner1" with password "password"
-    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false", by owner username "owner1" and the apartment_name "test"
+    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false" and the apartment_name "testApartment"
     Then The response code is 201
 
   Scenario: Create a Room without being logged in
     Given I'm not logged in
-    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false", by owner username "owner1" and the apartment_name "test"
-    Then The response code is 401
+    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false" and the apartment_name "testApartment"
+    Then The response code is 401
+
+  Scenario: Create Room as a non-owner
+    Given I login as "demo" with password "password"
+    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false" and the apartment_name "testApartment"
+    Then The response code is 403
+    And The error message is "Not owner type."
+
+
+  Scenario: Create Room as a other owner
+    Given I login as "owner" with password "password"
+    When I create a Room with the surface "30", occupied "false", window "false", desk "false" and bed "false" and the apartment_name "testApartment"
+    Then The response code is 403
+    And The error message is "Unauthorized owner."

src/test/resources/features/DeleteRoom.feature

@@ -10,10 +10,29 @@ Feature: Delete Room
 
   Scenario: Delete a Room with owner and room not logged in
     Given I'm not logged in
-    When I try to delete Room of the apartment "testApartment"
+    When I try to delete Room with the id "1"
     Then The response code is 401
 
   Scenario: Delete a Room with owner and room logged in
+    Given I login as "owner" with password "password"
+    When I try to delete Room with the id "1"
+    Then The response code is 200
+
+  Scenario: Delete a Room that not exists
+    Given I login as "owner" with password "password"
+    When I try to delete Room with the id "3"
+    Then The response code is 404
+
+  Scenario: Delete Room as a non-owner
+    Given I login as "demo" with password "password"
+    When I try to delete Room with the id "1"
+    Then The response code is 403
+    And The error message is "Not owner type."
+
+  Scenario: Delete Room as another owner
     Given I login as "owner1" with password "password"
-    When I try to delete Room of the apartment "testApartment"
-    Then The response code is 200
+    When I try to delete Room with the id "1"
+    Then The response code is 403
+    And The error message is "Unauthorized owner."
+
+