mirror of
https://github.com/vran-dev/databasir.git
synced 2025-08-09 06:10:06 +08:00
Feature: make description optional when save project or group (#113)
* feat: make description field optional * feat: update frontend resources * fix: ut failed
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
@@ -14,7 +14,6 @@ public class GroupCreateRequest {
|
||||
@NotBlank
|
||||
private String name;
|
||||
|
||||
@NotBlank
|
||||
private String description;
|
||||
|
||||
@NotEmpty
|
||||
|
@@ -17,7 +17,6 @@ public class GroupUpdateRequest {
|
||||
@NotBlank
|
||||
private String name;
|
||||
|
||||
@NotBlank
|
||||
private String description;
|
||||
|
||||
@NotEmpty
|
||||
|
@@ -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("");
|
||||
}
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -20,6 +20,7 @@ import org.springframework.test.context.jdbc.Sql;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@Transactional
|
||||
class ProjectServiceTest extends BaseTest {
|
||||
@@ -46,7 +47,7 @@ class ProjectServiceTest extends BaseTest {
|
||||
void create() {
|
||||
ProjectCreateRequest request = new ProjectCreateRequest();
|
||||
request.setName("ut");
|
||||
request.setDescription("integration test");
|
||||
request.setDescription(Optional.of("integration test"));
|
||||
request.setGroupId(-1000);
|
||||
|
||||
DataSourceCreateRequest dataSource = new DataSourceCreateRequest();
|
||||
@@ -76,7 +77,7 @@ class ProjectServiceTest extends BaseTest {
|
||||
ProjectUpdateRequest request = new ProjectUpdateRequest();
|
||||
request.setId(-1000);
|
||||
request.setName("ut");
|
||||
request.setDescription("integration test");
|
||||
request.setDescription(Optional.of("integration test"));
|
||||
|
||||
var dataSource = new ProjectUpdateRequest.DataSourceUpdateRequest();
|
||||
dataSource.setUsername("root");
|
||||
|
Reference in New Issue
Block a user