From 5d5876a13ae39fa366508b68f776ec898b24c16e Mon Sep 17 00:00:00 2001
From: vran <vran_dev@foxmail.com>
Date: Wed, 20 Apr 2022 19:00:17 +0800
Subject: [PATCH] feat: make description field optional

---
 .../core/domain/group/converter/GroupPojoConverter.java     | 4 ++++
 .../core/domain/group/data/GroupCreateRequest.java          | 1 -
 .../core/domain/group/data/GroupUpdateRequest.java          | 1 -
 .../core/domain/project/converter/ProjectPojoConverter.java | 6 ++++++
 .../core/domain/project/data/ProjectCreateRequest.java      | 4 ++--
 .../core/domain/project/data/ProjectUpdateRequest.java      | 4 ++--
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java b/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java
index cb955f1..c9c53b2 100644
--- a/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java
+++ b/core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java
@@ -19,4 +19,8 @@ public interface GroupPojoConverter {
     @Mapping(target = "createAt", ignore = true)
     @Mapping(target = "updateAt", ignore = true)
     GroupPojo of(GroupUpdateRequest groupUpdateRequest);
+
+    default String nullToEmpty(String description) {
+        return description == null ? "" : description;
+    }
 }
diff --git a/core/src/main/java/com/databasir/core/domain/group/data/GroupCreateRequest.java b/core/src/main/java/com/databasir/core/domain/group/data/GroupCreateRequest.java
index 30ff2cd..c59cc97 100644
--- a/core/src/main/java/com/databasir/core/domain/group/data/GroupCreateRequest.java
+++ b/core/src/main/java/com/databasir/core/domain/group/data/GroupCreateRequest.java
@@ -14,7 +14,6 @@ public class GroupCreateRequest {
     @NotBlank
     private String name;
 
-    @NotBlank
     private String description;
 
     @NotEmpty
diff --git a/core/src/main/java/com/databasir/core/domain/group/data/GroupUpdateRequest.java b/core/src/main/java/com/databasir/core/domain/group/data/GroupUpdateRequest.java
index 08b9827..e9d5b3c 100644
--- a/core/src/main/java/com/databasir/core/domain/group/data/GroupUpdateRequest.java
+++ b/core/src/main/java/com/databasir/core/domain/group/data/GroupUpdateRequest.java
@@ -17,7 +17,6 @@ public class GroupUpdateRequest {
     @NotBlank
     private String name;
 
-    @NotBlank
     private String description;
 
     @NotEmpty
diff --git a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java
index 38f4e3e..6b58b81 100644
--- a/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java
+++ b/core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java
@@ -9,6 +9,8 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 
+import java.util.Optional;
+
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = JsonConverter.class)
 public interface ProjectPojoConverter {
 
@@ -25,4 +27,8 @@ public interface ProjectPojoConverter {
     @Mapping(target = "ignoreColumnNameRegexArray", source = "request.ignoreColumnNameRegexes")
     ProjectSyncRulePojo of(ProjectUpdateRequest.ProjectSyncRuleUpdateRequest request,
                            Integer projectId);
+
+    default String optionToEmpty(Optional<String> optional) {
+        return optional.orElse("");
+    }
 }
diff --git a/core/src/main/java/com/databasir/core/domain/project/data/ProjectCreateRequest.java b/core/src/main/java/com/databasir/core/domain/project/data/ProjectCreateRequest.java
index 45e6214..216a058 100644
--- a/core/src/main/java/com/databasir/core/domain/project/data/ProjectCreateRequest.java
+++ b/core/src/main/java/com/databasir/core/domain/project/data/ProjectCreateRequest.java
@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Data
 public class ProjectCreateRequest {
@@ -13,8 +14,7 @@ public class ProjectCreateRequest {
     @NotBlank
     private String name;
 
-    @NotBlank
-    private String description;
+    private Optional<String> description = Optional.empty();
 
     @NotNull
     private Integer groupId;
diff --git a/core/src/main/java/com/databasir/core/domain/project/data/ProjectUpdateRequest.java b/core/src/main/java/com/databasir/core/domain/project/data/ProjectUpdateRequest.java
index 715ce6b..e1a6476 100644
--- a/core/src/main/java/com/databasir/core/domain/project/data/ProjectUpdateRequest.java
+++ b/core/src/main/java/com/databasir/core/domain/project/data/ProjectUpdateRequest.java
@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Data
 public class ProjectUpdateRequest {
@@ -16,8 +17,7 @@ public class ProjectUpdateRequest {
     @NotBlank
     private String name;
 
-    @NotBlank
-    private String description;
+    private Optional<String> description = Optional.empty();
 
     @NotNull
     private ProjectUpdateRequest.DataSourceUpdateRequest dataSource;