task completed

jv-feb24-group-project5 · Jun 11, 2024 · c9c7ceb · c9c7ceb
1 parent 46448f0
commit c9c7ceb
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 36 deletions.
diff --git a/src/main/java/com/ua/accommodation/controller/AccommodationController.java b/src/main/java/com/ua/accommodation/controller/AccommodationController.java
@@ -8,7 +8,9 @@
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -47,7 +49,9 @@ public AccommodationDto addAccommodation(
             description = "Retrieves a list of all accommodations available in the system."
     )
     @GetMapping
-    public List<AccommodationDto> getAllAccommodations(Pageable pageable) {
+    public List<AccommodationDto> getAllAccommodations(
+            @ParameterObject @PageableDefault(size = 20, sort = "id") Pageable pageable
+    ) {
         return accommodationService.getAccommodations(pageable);
     }
 
@@ -57,7 +61,9 @@ public List<AccommodationDto> getAllAccommodations(Pageable pageable) {
     )
     @GetMapping("/{id}")
     @PreAuthorize("hasRole('USER')")
-    public AccommodationDto getAccommodationById(@PathVariable Long id) {
+    public AccommodationDto getAccommodationById(
+            @PathVariable Long id
+    ) {
         return accommodationService.getAccommodation(id);
     }
 
@@ -69,7 +75,8 @@ public AccommodationDto getAccommodationById(@PathVariable Long id) {
     @PreAuthorize("hasRole('ADMIN')")
     public AccommodationDto updateAccommodation(
             @PathVariable Long id,
-            @RequestBody @Valid CreateAccommodationRequestDto updatedAccommodation) {
+            @RequestBody @Valid CreateAccommodationRequestDto updatedAccommodation
+    ) {
         return accommodationService.updateAccommodation(id, updatedAccommodation);
     }
 
@@ -82,7 +89,8 @@ public AccommodationDto updateAccommodation(
     @PreAuthorize("hasRole('ADMIN')")
     public AccommodationDto partiallyUpdateAccommodation(
             @PathVariable Long id,
-            @RequestBody @Valid CreateAccommodationRequestDto updatedAccommodation) {
+            @RequestBody @Valid CreateAccommodationRequestDto updatedAccommodation
+    ) {
         return accommodationService.patchAccommodation(id, updatedAccommodation);
     }
 

diff --git a/src/main/java/com/ua/accommodation/controller/BookingController.java b/src/main/java/com/ua/accommodation/controller/BookingController.java
@@ -11,7 +11,9 @@
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -39,7 +41,8 @@ public class BookingController {
     )
     public BookingResponseDto createBooking(
             @AuthenticationPrincipal User user,
-            @RequestBody @Valid BookingRequestDto requestDto) {
+            @RequestBody @Valid BookingRequestDto requestDto
+    ) {
         return bookingService.createBooking(user.getId(), requestDto);
     }
 
@@ -50,9 +53,10 @@ public BookingResponseDto createBooking(
             description = "Get list of bookings based on status"
     )
     public List<BookingResponseDto> getUsersBookingsByStatus(
-            Pageable pageable,
+            @ParameterObject @PageableDefault(size = 20, sort = "id") Pageable pageable,
             @RequestParam(name = "user_id") Long userId,
-            @RequestParam Status status) {
+            @RequestParam Status status
+    ) {
         return bookingService.getUsersBookingsByStatus(pageable, userId, status);
     }
 
@@ -63,8 +67,9 @@ public List<BookingResponseDto> getUsersBookingsByStatus(
             description = "Get list of bookings for current user"
     )
     public List<BookingResponseDto> getUsersBookings(
-            Pageable pageable,
-            @AuthenticationPrincipal User user) {
+            @ParameterObject @PageableDefault(size = 20, sort = "id") Pageable pageable,
+            @AuthenticationPrincipal User user
+    ) {
         return bookingService.getBookingsByUserId(pageable, user.getId());
     }
 
@@ -76,7 +81,8 @@ public List<BookingResponseDto> getUsersBookings(
     )
     public BookingResponseDto getBookingById(
             @AuthenticationPrincipal User user,
-            @PathVariable Long bookingId) {
+            @PathVariable Long bookingId
+    ) {
         return bookingService.getBookingById(
                 user.getId(),
                 user.getRoles(),
@@ -93,7 +99,8 @@ public BookingResponseDto getBookingById(
     public BookingResponseDto updateBooking(
             @AuthenticationPrincipal User user,
             @PathVariable Long bookingId,
-            @RequestBody @Valid BookingUpdateDto updateDtoDto) {
+            @RequestBody @Valid BookingUpdateDto updateDtoDto
+    ) {
         return bookingService.updateBookingById(
                 user.getId(),
                 user.getRoles(),
@@ -109,7 +116,8 @@ public BookingResponseDto updateBooking(
     )
     public BookingResponseDto deleteBooking(
             @AuthenticationPrincipal User user,
-            @PathVariable Long bookingId) {
+            @PathVariable Long bookingId
+    ) {
         return bookingService.deleteBookingById(
                 user.getId(),
                 user.getRoles(),

diff --git a/src/main/java/com/ua/accommodation/controller/PaymentController.java b/src/main/java/com/ua/accommodation/controller/PaymentController.java
@@ -8,15 +8,16 @@
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RequiredArgsConstructor
@@ -27,7 +28,6 @@ public class PaymentController {
     private final StripeService stripeService;
 
     @PostMapping("/payments")
-    @ResponseBody
     @Operation(
             summary = "Create session",
             description = "You can create new session. You need to give bookingId, "
@@ -40,12 +40,13 @@ public PaymentResponseDto createSession(
     }
 
     @GetMapping("/payments/{id}")
-    @ResponseBody
     @Operation(
             summary = "Retrieve session",
             description = "You can retrieve session by sessionId. "
                     + "Returns status for this session")
-    public PaymentResponseDto retrieveSession(@PathVariable String id) {
+    public PaymentResponseDto retrieveSession(
+            @PathVariable String id
+    ) {
         return stripeService.retrieveSession(id);
     }
 
@@ -55,8 +56,9 @@ public PaymentResponseDto retrieveSession(@PathVariable String id) {
                     + "will be redirected to this endpoint."
     )
     @GetMapping("/payments/cancel")
-    @ResponseBody
-    public PaymentResponseDto handleCancel(@RequestParam("session_id") String sessionId) {
+    public PaymentResponseDto handleCancel(
+            @RequestParam("session_id") String sessionId
+    ) {
         return stripeService.retrieveSession(sessionId);
     }
 
@@ -65,8 +67,9 @@ public PaymentResponseDto handleCancel(@RequestParam("session_id") String sessio
             description = "When you confirm the payment you will be redirected to this endpoint."
     )
     @GetMapping("/payments/success")
-    @ResponseBody
-    public PaymentResponseDto handleSuccess(@RequestParam("session_id") String sessionId) {
+    public PaymentResponseDto handleSuccess(
+            @RequestParam("session_id") String sessionId
+    ) {
         return stripeService.retrieveSession(sessionId);
     }
 
@@ -75,9 +78,9 @@ public PaymentResponseDto handleSuccess(@RequestParam("session_id") String sessi
             description = "Get all payment operations by users id."
     )
     @GetMapping("/payments")
-    @ResponseBody
     public List<PaymentResponseDto> findPayments(
-            @RequestParam Long userId, Pageable pageable
+            @RequestParam Long userId,
+            @ParameterObject @PageableDefault(size = 20, sort = "id") Pageable pageable
     ) {
         return stripeService.findPaymentsByUserId(userId, pageable);
     }

diff --git a/src/main/java/com/ua/accommodation/controller/UserController.java b/src/main/java/com/ua/accommodation/controller/UserController.java
@@ -31,8 +31,11 @@ public class UserController {
     @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
     @Operation(
             summary = "Get information about user",
-            description = "Get information about current authenticate user")
-    public UserResponseDto getUser(@AuthenticationPrincipal User user) {
+            description = "Get information about current authenticate user"
+    )
+    public UserResponseDto getUser(
+            @AuthenticationPrincipal User user
+    ) {
         return userService.getUser(user.getEmail());
     }
 
@@ -41,10 +44,12 @@ public UserResponseDto getUser(@AuthenticationPrincipal User user) {
     @Operation(
             summary = "Update roles",
             description = "Update roles for user by user id. Available only for admins. "
-                    + "You need make request with Set roles. Don't forget about id")
+                    + "You need make request with Set roles. Don't forget about id"
+    )
     public UserResponseDto updateRoles(
             @PathVariable Long id,
-            @RequestBody @Valid UserUpdateRoleDto updateRoleDto) {
+            @RequestBody @Valid UserUpdateRoleDto updateRoleDto
+    ) {
         return userService.updateRoles(id, updateRoleDto);
     }
 
@@ -54,10 +59,12 @@ public UserResponseDto updateRoles(
             summary = "Update profile",
             description = "You can update personal info about user. "
                     + "You need give all fields in request. "
-                    + "If you don't wanna change something just give old value")
+                    + "If you don't wanna change something just give old value"
+    )
     public UserResponseDto updateProfile(
             @AuthenticationPrincipal User user,
-            @RequestBody @Valid UserUpdateProfileDto updateProfileDto) {
+            @RequestBody @Valid UserUpdateProfileDto updateProfileDto
+    ) {
         return userService.updateProfile(user.getId(), updateProfileDto);
     }
 
@@ -70,7 +77,8 @@ public UserResponseDto updateProfile(
     )
     public UserResponseDto updateEmail(
             @AuthenticationPrincipal User user,
-            @RequestBody @Valid UserUpdateEmailDto updateDto) {
+            @RequestBody @Valid UserUpdateEmailDto updateDto
+    ) {
         return userService.updateEmail(user.getEmail(), updateDto);
     }
 }
diff --git a/src/test/java/com/ua/accommodation/controller/AccommodationControllerTest.java b/src/test/java/com/ua/accommodation/controller/AccommodationControllerTest.java
@@ -32,6 +32,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
@@ -79,12 +80,13 @@ void addAccommodation_ValidRequest_ReturnsCreatedAccommodation() throws Exceptio
     @WithMockUser(username = "testUser", roles = {"USER"})
     void getAllAccommodations_ValidRequest_ReturnsListOfAccommodations() throws Exception {
         List<AccommodationDto> accommodations = Collections.singletonList(createResponseDto());
-        Pageable pageable = PageRequest.of(0, 10);
+        Pageable pageable = PageRequest.of(0, 20, Sort.by("id"));
         given(accommodationService.getAccommodations(pageable)).willReturn(accommodations);
 
         mockMvc.perform(get("/accommodations")
                         .param("page", "0")
-                        .param("size", "10")
+                        .param("size", "20")
+                        .param("sort", "id")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().json(objectMapper.writeValueAsString(accommodations)));

diff --git a/src/test/java/com/ua/accommodation/controller/BookingControllerTest.java b/src/test/java/com/ua/accommodation/controller/BookingControllerTest.java
@@ -26,22 +26,28 @@
 import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+@AutoConfigureMockMvc
+@RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class BookingControllerTest {
 
@@ -93,15 +99,16 @@ void createBooking_ValidRequest_ReturnsCreatedBooking() throws Exception {
     @WithMockUser(username = "adminUser", roles = {"ADMIN"})
     void getUsersBookingsByStatus_ValidRequest_ReturnsListOfBookings() throws Exception {
         List<BookingResponseDto> bookings = Collections.singletonList(createBookingResponseDto());
-        Pageable pageable = PageRequest.of(0, 10);
+        Pageable pageable = PageRequest.of(0, 20, Sort.by("id"));
         given(bookingService.getUsersBookingsByStatus(eq(pageable), eq(1L), eq(Status.CONFIRMED)))
                 .willReturn(bookings);
 
         mockMvc.perform(get("/bookings")
                         .param("user_id", "1")
                         .param("status", "CONFIRMED")
                         .param("page", "0")
-                        .param("size", "10")
+                        .param("size", "20")
+                        .param("sort", "id")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().json(objectMapper.writeValueAsString(bookings)));
@@ -120,14 +127,15 @@ void getUsersBookings_ValidRequest_ReturnsListOfBookings() throws Exception {
         setAuthentication(user);
 
         List<BookingResponseDto> bookings = Collections.singletonList(createBookingResponseDto());
-        Pageable pageable = PageRequest.of(0, 10);
+        Pageable pageable = PageRequest.of(0, 20, Sort.by("id"));
         given(bookingService.getBookingsByUserId(eq(pageable), eq(user.getId())))
                 .willReturn(bookings);
 
         mockMvc.perform(get("/bookings/my")
                         .with(SecurityMockMvcRequestPostProcessors.user(user))
                         .param("page", "0")
-                        .param("size", "10")
+                        .param("size", "20")
+                        .param("sort", "id")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().json(objectMapper.writeValueAsString(bookings)));

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:tc:postgresql://accommodation_app_test
+spring.datasource.url=jdbc:tc:postgresql:12.19://accommodation_app_test
 spring.datasource.username=test
 spring.datasource.password=test
 spring.jpa.hibernate.ddl-auto=update