Added Dto Validation

Author: MarcelCoding

admin-panel/build.gradle

@@ -17,7 +17,6 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'io.netty:netty-tcnative-boringssl-static'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation "org.springdoc:springdoc-openapi-webflux-ui:${springDocVersion}"
     implementation "org.springdoc:springdoc-openapi-security:${springDocVersion}"
 

admin-panel/src/main/java/net/cryptic_game/backend/admin/converter/website/BlogPostConverter.java

@@ -23,7 +23,7 @@ public BlogPostModel toModel(final BlogPost dto) {
                 dto.getImage(),
                 dto.getCreated(),
                 dto.getUpdated(),
-                dto.isPublished(),
+                dto.getPublished(),
                 dto.getDescription(),
                 dto.getContent()
         );
@@ -53,7 +53,7 @@ public void override(final BlogPostModel model, final BlogPost dto) {
         model.setTitle(dto.getTitle());
         model.setImage(dto.getImage());
         model.setContent(dto.getContent());
-        model.setPublished(dto.isPublished());
+        model.setPublished(dto.getPublished());
         model.setDescription(dto.getDescription());
         model.setContent(dto.getContent());
     }

admin-panel/src/main/java/net/cryptic_game/backend/admin/service/server/EndpointServiceImpl.java

@@ -1,9 +1,11 @@
 package net.cryptic_game.backend.admin.service.server;
 
-import lombok.Data;
+import java.util.Map;
+
 import lombok.RequiredArgsConstructor;
 import net.cryptic_game.backend.dto.server.ServerEndpoint;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -29,29 +31,22 @@ public Flux<ServerEndpoint> findEndpoints() {
     public Mono<ServerEndpoint> disableEndpoint(final String id) {
         return this.client.post()
                 .uri("/admin_panel/disable")
-                .bodyValue(new ServerEndpointRequest(id))
-                .exchangeToMono((response) ->
-                        response.statusCode().is2xxSuccessful()
-                                ? response.bodyToMono(ServerEndpoint.class)
-                                : response.createException().flatMap(Mono::error)
-                );
+                .bodyValue(Map.of("id", id))
+                .exchangeToMono(this::handleResponse);
+
     }
 
     @Override
     public Mono<ServerEndpoint> enableEndpoint(final String id) {
         return this.client.post()
                 .uri("/admin_panel/enable")
-                .bodyValue(new ServerEndpointRequest(id))
-                .exchangeToMono((response) ->
-                        response.statusCode().is2xxSuccessful()
-                                ? response.bodyToMono(ServerEndpoint.class)
-                                : response.createException().flatMap(Mono::error)
-                );
+                .bodyValue(Map.of("id", id))
+                .exchangeToMono(this::handleResponse);
     }
 
-    @Data
-    private static final class ServerEndpointRequest {
-
-        private final String id;
+    private Mono<ServerEndpoint> handleResponse(final ClientResponse response) {
+        return response.statusCode().is2xxSuccessful()
+                ? response.bodyToMono(ServerEndpoint.class)
+                : response.createException().flatMap(Mono::error);
     }
 }

java-dto/build.gradle

@@ -11,7 +11,8 @@ dependencyManagement {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-json'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    implementation("net.getnova.framework:nova-core:${novaVersion}") { changing true }
 
     // TODO: remove this
     implementation 'org.jsoup:jsoup:1.13.1'

java-dto/src/main/java/net/cryptic_game/backend/dto/website/BlogPost.java

@@ -4,17 +4,18 @@
 
 import java.time.OffsetDateTime;
 import java.util.Set;
-import javax.validation.constraints.Pattern;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import net.getnova.framework.core.Validatable;
+import net.getnova.framework.core.exception.ValidationException;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document.OutputSettings;
 import org.jsoup.safety.Whitelist;
 
 @Data
 @AllArgsConstructor
-public class BlogPost {
+public class BlogPost implements Validatable {
 
     private static final String LANGUAGE_REGEX = "[a-z]{2}";
     private static final String POST_ID_REGEX = "[a-z-]+";
@@ -29,11 +30,10 @@ public class BlogPost {
 
     private final Id id;
     private final String title;
-    @Pattern(regexp = IMAGE_REGEX)
     private final String image;
     private final OffsetDateTime created;
     private final OffsetDateTime updated;
-    private final boolean published;
+    private final Boolean published;
     private final String description;
     private final String content;
     private final Set<String> languages;
@@ -44,7 +44,7 @@ public BlogPost(
             @JsonProperty("image") final String image,
             @JsonProperty("created") final OffsetDateTime created,
             @JsonProperty("updated") final OffsetDateTime updated,
-            @JsonProperty("published") final boolean published,
+            @JsonProperty("published") final Boolean published,
             @JsonProperty("description") final String description,
             @JsonProperty("content") final String content
     ) {
@@ -59,12 +59,39 @@ public BlogPost(
         this.languages = null;
     }
 
+    @Override
+    public void validate() throws ValidationException {
+        if (this.id == null) {
+            throw new ValidationException("id", "NOT_NULL");
+        }
+
+        this.id.validate();
+
+        if (this.title == null || this.title.isBlank()) {
+            throw new ValidationException("title", "NOT_BLANK");
+        }
+
+        if (this.image == null) {
+            throw new ValidationException("image", "NOT_NULL");
+        }
+
+        if (IMAGE_REGEX.matches(this.image)) {
+            throw new ValidationException("image", "MATCH_REGEX");
+        }
+
+        if (this.published == null) {
+            throw new ValidationException("published", "NOT_NULL");
+        }
+
+        if (this.description == null || this.description.isBlank()) {
+            throw new ValidationException("description", "NOT_BLANK");
+        }
+    }
+
     @Data
-    public static final class Id {
+    public static final class Id implements Validatable {
 
-        @Pattern(regexp = LANGUAGE_REGEX)
         private final String language; // TODO java.util.Locale;
-        @Pattern(regexp = POST_ID_REGEX)
         private final String postId;
 
         public Id(
@@ -74,5 +101,24 @@ public Id(
             this.language = language;
             this.postId = postId;
         }
+
+        @Override
+        public void validate() throws ValidationException {
+            if (this.language == null) {
+                throw new ValidationException("language", "NOT_NULL");
+            }
+
+            if (LANGUAGE_REGEX.matches(this.language)) {
+                throw new ValidationException("language", "MATCH_REGEX");
+            }
+
+            if (this.postId == null) {
+                throw new ValidationException("postId", "NOT_NULL");
+            }
+
+            if (POST_ID_REGEX.matches(this.postId)) {
+                throw new ValidationException("postId", "MATCH_REGEX");
+            }
+        }
     }
 }

java-dto/src/main/java/net/cryptic_game/backend/dto/website/BlogPostSmall.java

@@ -13,7 +13,7 @@ public class BlogPostSmall {
     private final String image;
     private final OffsetDateTime created;
     private final OffsetDateTime updated;
-    private final boolean published;
+    private final Boolean published;
     private final String description;
 
     public BlogPostSmall(
@@ -22,7 +22,7 @@ public BlogPostSmall(
             /* @JsonProperty("image") */ final String image,
             /* @JsonProperty("created") */ final OffsetDateTime created,
             /* @JsonProperty("updated") */ final OffsetDateTime updated,
-            /* @JsonProperty("published") */ final boolean published,
+            /* @JsonProperty("published") */ final Boolean published,
             /* @JsonProperty("description") */ final String description
     ) {
         this.id = id;

java-dto/src/main/java/net/cryptic_game/backend/dto/website/TeamDepartment.java

@@ -6,9 +6,12 @@
 
 import java.util.UUID;
 
+import net.getnova.framework.core.Validatable;
+import net.getnova.framework.core.exception.ValidationException;
+
 @Data
 @AllArgsConstructor
-public class TeamDepartment {
+public class TeamDepartment implements Validatable {
 
     private final UUID id;
     private final String name;
@@ -22,4 +25,11 @@ public TeamDepartment(
         this.name = name;
         this.description = description;
     }
+
+    @Override
+    public void validate() throws ValidationException {
+        if (this.name == null || this.name.isBlank()) {
+            throw new ValidationException("name", "NOT_BLANK");
+        }
+    }
 }

java-dto/src/main/java/net/cryptic_game/backend/dto/website/TeamMember.java

@@ -1,15 +1,18 @@
 package net.cryptic_game.backend.dto.website;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import net.getnova.framework.core.Validatable;
+import net.getnova.framework.core.exception.ValidationException;
+
 @Data
 @AllArgsConstructor
-public class TeamMember {
+public class TeamMember implements Validatable {
 
     private final UUID id;
     private final String name;
@@ -29,4 +32,23 @@ public TeamMember(
         this.departmentId = departmentId;
         this.joined = joined;
     }
+
+    @Override
+    public void validate() throws ValidationException {
+        if (this.name == null || this.name.isBlank()) {
+            throw new ValidationException("name", "NOT_BLANK");
+        }
+
+        if (this.githubId == null) {
+            throw new ValidationException("githubId", "NOT_NULL");
+        }
+
+        if (this.departmentId == null) {
+            throw new ValidationException("departmentId", "NOT_NULL");
+        }
+
+        if (this.joined == null) {
+            throw new ValidationException("joined", "NOT_NULL");
+        }
+    }
 }