Merge remote-tracking branch 'origin/main' into AYS-501/user-role-update

Author: MenekseYuncu

src/main/java/org/ays/common/model/AysPageable.java

@@ -35,10 +35,10 @@ public class AysPageable extends AysSort {
     private int page;
 
     /**
-     * Represents the page size.
-     * This value should be between 10 and 10, specifying the number of items per page.
+     * Represents the size of the page.
+     * The value must be between 10 and 10, specifying the number of items per page.
      */
-    @Range(min = 1, max = 99999999)
+    @Range(min = 10, max = 10)
     private int pageSize;
 
     /**

src/test/java/org/ays/auth/controller/AysRoleControllerTest.java

@@ -23,6 +23,7 @@
 import org.ays.auth.util.exception.AysRoleAssignedToUserException;
 import org.ays.common.model.AysPage;
 import org.ays.common.model.AysPageBuilder;
+import org.ays.common.model.AysPageableBuilder;
 import org.ays.common.model.response.AysErrorResponse;
 import org.ays.common.model.response.AysPageResponse;
 import org.ays.common.model.response.AysResponse;
@@ -174,6 +175,42 @@ void givenRoleListRequest_whenNameDoesNotValid_thenReturnValidationError(String
                 .findAll(Mockito.any(AysRoleListRequest.class));
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "1",
+            "109",
+            "99999",
+            "15"
+    })
+    void givenInvalidRoleListRequest_whenPageSizeNotTen_thenReturnValidationError(int invalidPageSize) throws Exception {
+
+        // Given
+        AysRoleListRequest mockListRequest = new AysRoleListRequestBuilder()
+                .withPageable(new AysPageableBuilder()
+                        .withPage(1)
+                        .withPageSize(invalidPageSize)
+                        .build()
+                )
+                .build();
+
+        // Then
+        String endpoint = BASE_PATH.concat("/roles");
+        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
+                .post(endpoint, mockSuperAdminToken.getAccessToken(), mockListRequest);
+
+        AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.VALIDATION_ERROR;
+
+        aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
+                .andExpect(AysMockResultMatchersBuilders.status()
+                        .isBadRequest())
+                .andExpect(AysMockResultMatchersBuilders.subErrors()
+                        .isNotEmpty());
+
+        // Verify
+        Mockito.verify(roleReadService, Mockito.never())
+                .findAll(Mockito.any(AysRoleListRequest.class));
+    }
+
     @Test
     void givenValidRoleListRequest_whenUserUnauthorized_thenReturnAccessDeniedException() throws Exception {
         // Given

src/test/java/org/ays/auth/controller/AysUserControllerTest.java

@@ -19,6 +19,7 @@
 import org.ays.auth.service.AysUserUpdateService;
 import org.ays.common.model.AysPage;
 import org.ays.common.model.AysPageBuilder;
+import org.ays.common.model.AysPageableBuilder;
 import org.ays.common.model.response.AysErrorResponse;
 import org.ays.common.model.response.AysPageResponse;
 import org.ays.common.model.response.AysResponse;
@@ -205,6 +206,42 @@ void givenUserListRequest_whenCityDoesNotValid_thenReturnValidationError(String
                 .findAll(Mockito.any(AysUserListRequest.class));
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "1",
+            "109",
+            "99999",
+            "15"
+    })
+    void givenInvalidUserListRequest_whenPageSizeNotTen_thenReturnValidationError(int invalidPageSize) throws Exception {
+
+        // Given
+        AysUserListRequest mockListRequest = new AysUserListRequestBuilder()
+                .withPageable(new AysPageableBuilder()
+                        .withPage(1)
+                        .withPageSize(invalidPageSize)
+                        .build()
+                )
+                .build();
+
+        // Then
+        String endpoint = BASE_PATH.concat("/users");
+        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
+                .post(endpoint, mockSuperAdminToken.getAccessToken(), mockListRequest);
+
+        AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.VALIDATION_ERROR;
+
+        aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
+                .andExpect(AysMockResultMatchersBuilders.status()
+                        .isBadRequest())
+                .andExpect(AysMockResultMatchersBuilders.subErrors()
+                        .isNotEmpty());
+
+        // Verify
+        Mockito.verify(userReadService, Mockito.never())
+                .findAll(Mockito.any(AysUserListRequest.class));
+    }
+
     @Test
     void givenValidUserListRequest_whenUserUnauthorized_thenReturnAccessDeniedException() throws Exception {
         // Given

src/test/java/org/ays/auth/port/impl/AysRoleAdapterTest.java

@@ -55,9 +55,7 @@ void givenValidAysPageableWithoutFilter_whenApplicationsFound_thenReturnApplicat
                 .withValidValues()
                 .withoutOrders()
                 .build();
-        AysRoleFilter mockFilter = new AysRoleFilterBuilder()
-                .withValidValues()
-                .build();
+        AysRoleFilter mockFilter = new AysRoleFilterBuilder().build();
 
         // When
         List<AysRoleEntity> mockEntities = List.of(

src/test/java/org/ays/auth/port/impl/AysUserAdapterTest.java

@@ -54,9 +54,7 @@ void givenValidAysPageableWithoutFilter_whenApplicationsFound_thenReturnApplicat
                 .withValidValues()
                 .withoutOrders()
                 .build();
-        AysUserFilter mockFilter = new AysUserFilterBuilder()
-                .withValidValues()
-                .build();
+        AysUserFilter mockFilter = new AysUserFilterBuilder().build();
 
         // When
         List<AysUserEntity> mockEntities = List.of(

src/test/java/org/ays/common/model/AysPageBuilder.java

@@ -10,7 +10,7 @@ public static <C> AysPage<C> from(List<C> content, AysPageable aysPageable) {
         return AysPage.<C>builder()
                 .content(content)
                 .pageNumber(aysPageable.getPage())
-                .pageSize(aysPageable.getPageSize())
+                .pageSize(content.size())
                 .totalPageCount(aysPageable.getPage())
                 .totalElementCount((long) aysPageable.getPageSize())
                 .orderedBy(aysPageable.getOrders())
@@ -21,7 +21,7 @@ public static <C> AysPage<C> from(List<C> content, AysPageable aysPageable, AysF
         return AysPage.<C>builder()
                 .content(content)
                 .pageNumber(aysPageable.getPage())
-                .pageSize(aysPageable.getPageSize())
+                .pageSize(content.size())
                 .totalPageCount(aysPageable.getPage())
                 .totalElementCount((long) aysPageable.getPageSize())
                 .orderedBy(aysPageable.getOrders())

src/test/java/org/ays/common/model/AysPageableBuilder.java

@@ -9,7 +9,7 @@ public AysPageableBuilder() {
     public AysPageableBuilder withValidValues() {
         return new AysPageableBuilder()
                 .withPage(1)
-                .withPageSize(1);
+                .withPageSize(10);
     }
 
     public AysPageableBuilder withPage(int page) {