feat: make description field optional

This commit is contained in:
vran 2022-04-20 19:00:17 +08:00
parent 0badba566a
commit 5d5876a13a
6 changed files with 14 additions and 6 deletions

View File

@ -19,4 +19,8 @@ public interface GroupPojoConverter {
@Mapping(target = "createAt", ignore = true) @Mapping(target = "createAt", ignore = true)
@Mapping(target = "updateAt", ignore = true) @Mapping(target = "updateAt", ignore = true)
GroupPojo of(GroupUpdateRequest groupUpdateRequest); GroupPojo of(GroupUpdateRequest groupUpdateRequest);
default String nullToEmpty(String description) {
return description == null ? "" : description;
}
} }

View File

@ -14,7 +14,6 @@ public class GroupCreateRequest {
@NotBlank @NotBlank
private String name; private String name;
@NotBlank
private String description; private String description;
@NotEmpty @NotEmpty

View File

@ -17,7 +17,6 @@ public class GroupUpdateRequest {
@NotBlank @NotBlank
private String name; private String name;
@NotBlank
private String description; private String description;
@NotEmpty @NotEmpty

View File

@ -9,6 +9,8 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import java.util.Optional;
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = JsonConverter.class) @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = JsonConverter.class)
public interface ProjectPojoConverter { public interface ProjectPojoConverter {
@ -25,4 +27,8 @@ public interface ProjectPojoConverter {
@Mapping(target = "ignoreColumnNameRegexArray", source = "request.ignoreColumnNameRegexes") @Mapping(target = "ignoreColumnNameRegexArray", source = "request.ignoreColumnNameRegexes")
ProjectSyncRulePojo of(ProjectUpdateRequest.ProjectSyncRuleUpdateRequest request, ProjectSyncRulePojo of(ProjectUpdateRequest.ProjectSyncRuleUpdateRequest request,
Integer projectId); Integer projectId);
default String optionToEmpty(Optional<String> optional) {
return optional.orElse("");
}
} }

View File

@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional;
@Data @Data
public class ProjectCreateRequest { public class ProjectCreateRequest {
@ -13,8 +14,7 @@ public class ProjectCreateRequest {
@NotBlank @NotBlank
private String name; private String name;
@NotBlank private Optional<String> description = Optional.empty();
private String description;
@NotNull @NotNull
private Integer groupId; private Integer groupId;

View File

@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional;
@Data @Data
public class ProjectUpdateRequest { public class ProjectUpdateRequest {
@ -16,8 +17,7 @@ public class ProjectUpdateRequest {
@NotBlank @NotBlank
private String name; private String name;
@NotBlank private Optional<String> description = Optional.empty();
private String description;
@NotNull @NotNull
private ProjectUpdateRequest.DataSourceUpdateRequest dataSource; private ProjectUpdateRequest.DataSourceUpdateRequest dataSource;