AYS-340 | Role Creation Service Validation Errors Have Been Resolved (#…

…346)
afet-yonetim-sistemi · Jul 22, 2024 · 8789f5c · 8789f5c
1 parent 8316c43
commit 8789f5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/ays/auth/model/request/AysRoleCreateRequest.java b/src/main/java/org/ays/auth/model/request/AysRoleCreateRequest.java
@@ -5,7 +5,7 @@
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
-import org.ays.common.util.validation.NoSpecialCharacters;
+import org.ays.common.util.validation.Name;
 import org.hibernate.validator.constraints.UUID;
 
 import java.util.Set;
@@ -22,12 +22,12 @@
 @Setter
 public class AysRoleCreateRequest {
 
+    @Name
     @NotBlank
     @Size(min = 2, max = 255)
-    @NoSpecialCharacters
     private String name;
 
     @NotEmpty
-    private Set<@UUID String> permissionIds;
+    private Set<@NotBlank @UUID String> permissionIds;
 
 }
diff --git a/src/test/java/org/ays/auth/controller/AysRoleControllerTest.java b/src/test/java/org/ays/auth/controller/AysRoleControllerTest.java
@@ -39,6 +39,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -342,6 +343,9 @@ void givenValidRoleCreateRequest_whenUserUnauthorized_thenReturnAccessDeniedExce
     @ParameterizedTest
     @ValueSource(strings = {
             "",
+            "  Kurum yöneticisi",
+            "!Kurum",
+            "12Kurum",
             "A",
             "% fsdh     ",
             "493268349068342",
@@ -425,6 +429,7 @@ void givenInvalidRoleCreateRequest_whenPermissionIdsAreEmpty_thenReturnValidatio
     }
 
     @ParameterizedTest
+    @NullSource
     @ValueSource(strings = {
             "",
             "55aed4c4facb4b66bdb5-309eaaef4453"
@@ -433,7 +438,7 @@ void givenInvalidRoleCreateRequest_whenPermissionIdIsNotValid_thenReturnValidati
         // Given
         AysRoleCreateRequest mockCreateRequest = new AysRoleCreateRequestBuilder()
                 .withValidValues()
-                .withPermissionIds(Set.of(invalidPermissionId))
+                .withPermissionIds(Collections.singleton(invalidPermissionId))
                 .build();
 
         // Then