Browse Source

Feature: make description optional when save project or group (#113)

* feat: make description field optional

* feat: update frontend resources

* fix: ut failed
master
vran 3 years ago
committed by GitHub
parent
commit
c1f7d1e99d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      api/src/main/resources/static/css/295.b144be0e.css
  2. 0
      api/src/main/resources/static/css/968.82a2f213.css
  3. 2
      api/src/main/resources/static/index.html
  4. 2
      api/src/main/resources/static/js/26.ec146fe6.js
  5. 2
      api/src/main/resources/static/js/26.ec146fe6.js.map
  6. 4
      api/src/main/resources/static/js/295-legacy.341bb4a0.js
  7. 1
      api/src/main/resources/static/js/295-legacy.341bb4a0.js.map
  8. 4
      api/src/main/resources/static/js/295.d0138d5a.js
  9. 1
      api/src/main/resources/static/js/295.d0138d5a.js.map
  10. 2
      api/src/main/resources/static/js/431-legacy.26ebf7ff.js
  11. 1
      api/src/main/resources/static/js/431-legacy.26ebf7ff.js.map
  12. 1
      api/src/main/resources/static/js/431.9f178ab9.js.map
  13. 1
      api/src/main/resources/static/js/559-legacy.ba556ad5.js.map
  14. 1
      api/src/main/resources/static/js/559.dde4a248.js.map
  15. 2
      api/src/main/resources/static/js/698-legacy.44e930b3.js
  16. 2
      api/src/main/resources/static/js/698-legacy.44e930b3.js.map
  17. 2
      api/src/main/resources/static/js/926.e1ce68de.js
  18. 2
      api/src/main/resources/static/js/926.e1ce68de.js.map
  19. 2
      api/src/main/resources/static/js/933-legacy.c8bb02ca.js
  20. 2
      api/src/main/resources/static/js/933-legacy.c8bb02ca.js.map
  21. 2
      api/src/main/resources/static/js/968-legacy.5c2e9093.js
  22. 1
      api/src/main/resources/static/js/968-legacy.5c2e9093.js.map
  23. 4
      api/src/main/resources/static/js/968.179db960.js
  24. 1
      api/src/main/resources/static/js/968.179db960.js.map
  25. 4
      api/src/main/resources/static/js/app-legacy.2730dbc0.js
  26. 2
      api/src/main/resources/static/js/app-legacy.2730dbc0.js.map
  27. 4
      api/src/main/resources/static/js/app.1e655dc8.js
  28. 2
      api/src/main/resources/static/js/app.1e655dc8.js.map
  29. 4
      core/src/main/java/com/databasir/core/domain/group/converter/GroupPojoConverter.java
  30. 1
      core/src/main/java/com/databasir/core/domain/group/data/GroupCreateRequest.java
  31. 1
      core/src/main/java/com/databasir/core/domain/group/data/GroupUpdateRequest.java
  32. 6
      core/src/main/java/com/databasir/core/domain/project/converter/ProjectPojoConverter.java
  33. 4
      core/src/main/java/com/databasir/core/domain/project/data/ProjectCreateRequest.java
  34. 4
      core/src/main/java/com/databasir/core/domain/project/data/ProjectUpdateRequest.java
  35. 5
      core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java

0
api/src/main/resources/static/css/559.b144be0e.css → api/src/main/resources/static/css/295.b144be0e.css

0
api/src/main/resources/static/css/431.82a2f213.css → api/src/main/resources/static/css/968.82a2f213.css

2
api/src/main/resources/static/index.html

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>databasir</title><script defer="defer" type="module" src="/js/chunk-vendors.787360f3.js"></script><script defer="defer" type="module" src="/js/app.c9efd150.js"></script><link href="/css/chunk-vendors.8e1003a6.css" rel="stylesheet"><link href="/css/app.15b40a89.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors-legacy.405c78b5.js" nomodule></script><script defer="defer" src="/js/app-legacy.57eb4513.js" nomodule></script></head><body><noscript><strong>We're sorry but databasir doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>databasir</title><script defer="defer" type="module" src="/js/chunk-vendors.787360f3.js"></script><script defer="defer" type="module" src="/js/app.1e655dc8.js"></script><link href="/css/chunk-vendors.8e1003a6.css" rel="stylesheet"><link href="/css/app.15b40a89.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors-legacy.405c78b5.js" nomodule></script><script defer="defer" src="/js/app-legacy.2730dbc0.js" nomodule></script></head><body><noscript><strong>We're sorry but databasir doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
api/src/main/resources/static/js/26.a6bdf741.js → api/src/main/resources/static/js/26.ec146fe6.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/26.a6bdf741.js.map → api/src/main/resources/static/js/26.ec146fe6.js.map

File diff suppressed because one or more lines are too long

4
api/src/main/resources/static/js/559-legacy.ba556ad5.js → api/src/main/resources/static/js/295-legacy.341bb4a0.js

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/295-legacy.341bb4a0.js.map

File diff suppressed because one or more lines are too long

4
api/src/main/resources/static/js/559.dde4a248.js → api/src/main/resources/static/js/295.d0138d5a.js

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/295.d0138d5a.js.map

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/431-legacy.26ebf7ff.js

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/431-legacy.26ebf7ff.js.map

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/431.9f178ab9.js.map

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/559-legacy.ba556ad5.js.map

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/559.dde4a248.js.map

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/698-legacy.8bbadf41.js → api/src/main/resources/static/js/698-legacy.44e930b3.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/698-legacy.8bbadf41.js.map → api/src/main/resources/static/js/698-legacy.44e930b3.js.map

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/926.361d46e9.js → api/src/main/resources/static/js/926.e1ce68de.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/926.361d46e9.js.map → api/src/main/resources/static/js/926.e1ce68de.js.map

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/933-legacy.bc1bfc26.js → api/src/main/resources/static/js/933-legacy.c8bb02ca.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/933-legacy.bc1bfc26.js.map → api/src/main/resources/static/js/933-legacy.c8bb02ca.js.map

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/968-legacy.5c2e9093.js

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/968-legacy.5c2e9093.js.map

File diff suppressed because one or more lines are too long

4
api/src/main/resources/static/js/431.9f178ab9.js → api/src/main/resources/static/js/968.179db960.js

File diff suppressed because one or more lines are too long

1
api/src/main/resources/static/js/968.179db960.js.map

File diff suppressed because one or more lines are too long

4
api/src/main/resources/static/js/app-legacy.57eb4513.js → api/src/main/resources/static/js/app-legacy.2730dbc0.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/app-legacy.57eb4513.js.map → api/src/main/resources/static/js/app-legacy.2730dbc0.js.map

File diff suppressed because one or more lines are too long

4
api/src/main/resources/static/js/app.c9efd150.js → api/src/main/resources/static/js/app.1e655dc8.js

File diff suppressed because one or more lines are too long

2
api/src/main/resources/static/js/app.c9efd150.js.map → api/src/main/resources/static/js/app.1e655dc8.js.map

File diff suppressed because one or more lines are too long

4
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;
}
}

1
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

1
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

6
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("");
}
}

4
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;

4
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;

5
core/src/test/java/com/databasir/core/domain/project/service/ProjectServiceTest.java

@ -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");

Loading…
Cancel
Save