AYS-438 | Usage of boolean Variable Has Been Fixed in AysPermission and AysPermissionEntity (#373)

agitrubard · web-flow · commit 816473961290 · 2024-09-11T16:34:12.000+03:00
diff --git a/src/main/java/org/ays/auth/model/AysPermission.java b/src/main/java/org/ays/auth/model/AysPermission.java
@@ -21,6 +21,10 @@ public class AysPermission extends BaseDomainModel {
     private String id;
     private String name;
     private AysPermissionCategory category;
-    private boolean isSuper;
+    private Boolean isSuper;
+
+    public boolean isSuper() {
+        return isSuper;
+    }
 
 }
diff --git a/src/main/java/org/ays/auth/model/entity/AysPermissionEntity.java b/src/main/java/org/ays/auth/model/entity/AysPermissionEntity.java
@@ -37,6 +37,6 @@ public class AysPermissionEntity extends BaseEntity {
     private AysPermissionCategory category;
 
     @Column(name = "IS_SUPER")
-    private boolean isSuper;
+    private Boolean isSuper;
 
 }
diff --git a/src/test/java/org/ays/auth/controller/AysRoleEndToEndTest.java b/src/test/java/org/ays/auth/controller/AysRoleEndToEndTest.java
@@ -18,9 +18,12 @@
 import org.ays.auth.port.AysPermissionReadPort;
 import org.ays.auth.port.AysRoleReadPort;
 import org.ays.auth.port.AysRoleSavePort;
+import org.ays.common.model.response.AysErrorResponse;
 import org.ays.common.model.response.AysPageResponse;
 import org.ays.common.model.response.AysResponse;
 import org.ays.common.model.response.AysResponseBuilder;
+import org.ays.common.util.AysRandomUtil;
+import org.ays.common.util.exception.model.response.AysErrorResponseBuilder;
 import org.ays.institution.model.Institution;
 import org.ays.institution.model.InstitutionBuilder;
 import org.ays.util.AysMockMvcRequestBuilders;
@@ -369,6 +372,40 @@ void givenValidRoleCreateRequest_whenRoleCreated_thenReturnSuccess() throws Exce
         ));
     }
 
+    @Test
+    void givenRoleCreateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnBadRequestError() throws Exception {
+
+        // Initialize
+        List<AysPermission> permissions = permissionReadPort.findAll();
+        Set<String> permissionIds = permissions.stream()
+                .map(AysPermission::getId)
+                .collect(Collectors.toSet());
+
+        // Given
+        AysRoleCreateRequest createRequest = new AysRoleCreateRequestBuilder()
+                .withName(AysRandomUtil.generateText(10))
+                .withPermissionIds(permissionIds)
+                .build();
+
+        // Then
+        String endpoint = BASE_PATH.concat("/role");
+        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
+                .post(endpoint, adminToken.getAccessToken(), createRequest);
+
+        AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.BAD_REQUEST;
+
+        aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
+                .andExpect(AysMockResultMatchersBuilders.status()
+                        .isBadRequest())
+                .andExpect(AysMockResultMatchersBuilders.subErrors()
+                        .doesNotHaveJsonPath());
+
+        // Verify
+        Optional<AysRole> role = roleReadPort.findByName(createRequest.getName());
+
+        Assertions.assertFalse(role.isPresent());
+    }
+
 
     @Test
     void givenValidIdAndRoleUpdateRequest_whenSuperRoleUpdated_thenReturnSuccess() throws Exception {
@@ -476,6 +513,54 @@ void givenValidRoleUpdateRequest_whenRoleUpdated_thenReturnSuccess() throws Exce
         ));
     }
 
+    @Test
+    void givenValidIdAndRoleUpdateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnBadRequestError() throws Exception {
+
+        // Initialize
+        List<AysPermission> permissions = permissionReadPort.findAll();
+        Set<String> permissionIds = permissions.stream()
+                .map(AysPermission::getId)
+                .collect(Collectors.toSet());
+
+        AysRole role = roleSavePort.save(
+                new AysRoleBuilder()
+                        .withValidValues()
+                        .withoutId()
+                        .withName(AysRandomUtil.generateText(10))
+                        .withPermissions(permissions)
+                        .withInstitution(new InstitutionBuilder().withId(AysValidTestData.Admin.INSTITUTION_ID).build())
+                        .build()
+        );
+
+        // Given
+        String id = role.getId();
+        AysRoleUpdateRequest updateRequest = new AysRoleUpdateRequestBuilder()
+                .withPermissionIds(permissionIds)
+                .build();
+
+        // Then
+        String endpoint = BASE_PATH.concat("/role/").concat(id);
+        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
+                .put(endpoint, adminToken.getAccessToken(), updateRequest);
+
+        AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.BAD_REQUEST;
+
+        aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
+                .andExpect(AysMockResultMatchersBuilders.status()
+                        .isBadRequest())
+                .andExpect(AysMockResultMatchersBuilders.subErrors()
+                        .doesNotHaveJsonPath());
+
+        // Verify
+        Optional<AysRole> roleFromDatabase = roleReadPort.findById(id);
+
+        Assertions.assertTrue(roleFromDatabase.isPresent());
+        Assertions.assertNotEquals(updateRequest.getName(), roleFromDatabase.get().getName());
+        Assertions.assertNull(roleFromDatabase.get().getUpdatedUser());
+        Assertions.assertNull(roleFromDatabase.get().getUpdatedAt());
+    }
+
+
     @Test
     void givenId_whenRoleActivated_thenReturnSuccess() throws Exception {
 
diff --git a/src/test/java/org/ays/auth/model/AdminRegistrationApplicationBuilder.java b/src/test/java/org/ays/auth/model/AdminRegistrationApplicationBuilder.java
@@ -2,7 +2,6 @@
 
 import org.ays.auth.model.enums.AdminRegistrationApplicationStatus;
 import org.ays.common.model.TestDataBuilder;
-import org.ays.common.util.AysRandomTestUtil;
 import org.ays.common.util.AysRandomUtil;
 import org.ays.institution.model.Institution;
 import org.ays.institution.model.InstitutionBuilder;
@@ -27,7 +26,7 @@ public AdminRegistrationApplicationBuilder withValidValues() {
                 .withId(AysRandomUtil.generateUUID())
                 .withInstitution(institution)
                 .withUser(user)
-                .withReason(AysRandomTestUtil.generateString(41))
+                .withReason(AysRandomUtil.generateText(41))
                 .withStatus(AdminRegistrationApplicationStatus.WAITING);
     }
 
diff --git a/src/test/java/org/ays/auth/model/AysPermissionBuilder.java b/src/test/java/org/ays/auth/model/AysPermissionBuilder.java
@@ -32,7 +32,7 @@ public AysPermissionBuilder withCategory(AysPermissionCategory category) {
     }
 
     public AysPermissionBuilder withIsSuper(boolean isSuper) {
-        data.setSuper(isSuper);
+        data.setIsSuper(isSuper);
         return this;
     }
 
diff --git a/src/test/java/org/ays/auth/model/entity/AdminRegistrationApplicationEntityBuilder.java b/src/test/java/org/ays/auth/model/entity/AdminRegistrationApplicationEntityBuilder.java
@@ -2,7 +2,6 @@
 
 import org.ays.auth.model.enums.AdminRegistrationApplicationStatus;
 import org.ays.common.model.TestDataBuilder;
-import org.ays.common.util.AysRandomTestUtil;
 import org.ays.common.util.AysRandomUtil;
 import org.ays.institution.model.entity.InstitutionEntity;
 import org.ays.institution.model.entity.InstitutionEntityBuilder;
@@ -27,7 +26,7 @@ public AdminRegistrationApplicationEntityBuilder withValidValues() {
                 .withStatus(AdminRegistrationApplicationStatus.WAITING)
                 .withUser(userEntity)
                 .withInstitution(institutionEntity)
-                .withReason(AysRandomTestUtil.generateString(41));
+                .withReason(AysRandomUtil.generateText(41));
     }
 
     public AdminRegistrationApplicationEntityBuilder withId(String id) {
diff --git a/src/test/java/org/ays/auth/model/entity/AysPermissionEntityBuilder.java b/src/test/java/org/ays/auth/model/entity/AysPermissionEntityBuilder.java
@@ -33,7 +33,7 @@ public AysPermissionEntityBuilder withCategory(AysPermissionCategory category) {
     }
 
     public AysPermissionEntityBuilder withIsSuper(boolean isSuper) {
-        data.setSuper(isSuper);
+        data.setIsSuper(isSuper);
         return this;
     }
 
diff --git a/src/test/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequestBuilder.java b/src/test/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequestBuilder.java
@@ -1,7 +1,6 @@
 package org.ays.auth.model.request;
 
 import org.ays.common.model.TestDataBuilder;
-import org.ays.common.util.AysRandomTestUtil;
 import org.ays.common.util.AysRandomUtil;
 
 public class AdminRegistrationApplicationCreateRequestBuilder extends TestDataBuilder<AdminRegistrationApplicationCreateRequest> {
@@ -13,7 +12,7 @@ public AdminRegistrationApplicationCreateRequestBuilder() {
     public AdminRegistrationApplicationCreateRequestBuilder withValidValues() {
         return this
                 .withInstitutionId(AysRandomUtil.generateUUID())
-                .withReason(AysRandomTestUtil.generateString(50));
+                .withReason(AysRandomUtil.generateText(50));
     }
 
     public AdminRegistrationApplicationCreateRequestBuilder withInstitutionId(String institutionId) {
diff --git a/src/test/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequestBuilder.java b/src/test/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequestBuilder.java
@@ -1,7 +1,7 @@
 package org.ays.auth.model.request;
 
 import org.ays.common.model.TestDataBuilder;
-import org.ays.common.util.AysRandomTestUtil;
+import org.ays.common.util.AysRandomUtil;
 
 public class AdminRegistrationApplicationRejectRequestBuilder extends TestDataBuilder<AdminRegistrationApplicationRejectRequest> {
 
@@ -11,10 +11,9 @@ public AdminRegistrationApplicationRejectRequestBuilder() {
 
     public AdminRegistrationApplicationRejectRequestBuilder withValidValues() {
         return this
-                .withRejectReason(AysRandomTestUtil.generateString(50));
+                .withRejectReason(AysRandomUtil.generateText(50));
     }
 
-
     public AdminRegistrationApplicationRejectRequestBuilder withRejectReason(String rejectReason) {
         data.setRejectReason(rejectReason);
         return this;
diff --git a/src/test/java/org/ays/common/util/AysRandomTestUtil.java b/src/test/java/org/ays/common/util/AysRandomTestUtil.java

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public class AysPermissionEntity extends BaseEntity {`
`37`	`37`	`private AysPermissionCategory category;`
`38`	`38`
`39`	`39`	`@Column(name = "IS_SUPER")`
`40`		`- private boolean isSuper;`
	`40`	`+ private Boolean isSuper;`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public AysPermissionBuilder withCategory(AysPermissionCategory category) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public AysPermissionBuilder withIsSuper(boolean isSuper) {`
`35`		`- data.setSuper(isSuper);`
	`35`	`+ data.setIsSuper(isSuper);`
`36`	`36`	`return this;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public AysPermissionEntityBuilder withCategory(AysPermissionCategory category) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public AysPermissionEntityBuilder withIsSuper(boolean isSuper) {`
`36`		`- data.setSuper(isSuper);`
	`36`	`+ data.setIsSuper(isSuper);`
`37`	`37`	`return this;`
`38`	`38`	`}`
`39`	`39`