Implement createSchema (#110)

Author: agilelab-tmnd1991

server/build.gradle.kts

@@ -187,7 +187,7 @@ tasks.jacocoTestCoverageVerification {
  violationRules {
  rule {
  limit {
- minimum = BigDecimal.valueOf(0.79)
+ minimum = BigDecimal.valueOf(0.81)
  }
  }
  }

server/src/main/java/io/whitefox/api/server/ShareV1ApiImpl.java

@@ -35,7 +35,12 @@ public Response addTableToSchema(String share, String schema, TableReference tab
 
  @Override
  public Response createSchema(String share, String schema) {
- return Response.status(501).build();
+ return wrapExceptions(
+ () -> Response.status(Response.Status.CREATED)
+ .entity(WhitefoxMappers.share2api(
+ shareService.createSchema(share, schema, this.getRequestPrincipal())))
+ .build(),
+ exceptionToResponse);
  }
 
  @Override

server/src/main/java/io/whitefox/core/Share.java

@@ -114,6 +114,22 @@ public Share addRecipients(List<Principal> recipients, Principal currentUser, lo
  owner);
  }
 
+ public Share addSchema(Schema schema, Principal currentUser, long now) {
+ var newSchemas = new HashMap<>(schemas);
+ newSchemas.put(schema.name(), schema);
+ return new Share(
+ name,
+ id,
+ Map.copyOf(newSchemas),
+ comment,
+ recipients,
+ createdAt,
+ createdBy,
+ now,
+ currentUser,
+ owner);
+ }
+
  @Override
  @SkipCoverageGenerated
  public boolean equals(Object o) {

server/src/main/java/io/whitefox/core/services/ShareService.java

@@ -4,6 +4,7 @@
 import io.whitefox.core.Schema;
 import io.whitefox.core.Share;
 import io.whitefox.core.actions.CreateShare;
+import io.whitefox.core.services.exceptions.SchemaAlreadyExists;
 import io.whitefox.core.services.exceptions.ShareAlreadyExists;
 import io.whitefox.core.services.exceptions.ShareNotFound;
 import io.whitefox.persistence.StorageManager;
@@ -64,4 +65,16 @@ public Share addRecipientsToShare(
  public Optional<Share> getShare(String share) {
  return storageManager.getShare(share);
  }
+
+ public Share createSchema(String share, String schema, Principal requestPrincipal) {
+ var shareObj = storageManager
+ .getShare(share)
+ .orElseThrow(() -> new ShareNotFound("Share " + share + "not found"));
+ if (shareObj.schemas().containsKey(schema)) {
+ throw new SchemaAlreadyExists("Schema " + schema + " already exists in share " + share);
+ }
+ var newSchema = new Schema(schema, Collections.emptyList(), share);
+ var newShare = shareObj.addSchema(newSchema, requestPrincipal, clock.millis());
+ return storageManager.updateShare(newShare);
+ }
 }

server/src/main/java/io/whitefox/core/services/exceptions/SchemaAlreadyExists.java

@@ -0,0 +1,25 @@
+package io.whitefox.core.services.exceptions;
+
+import io.whitefox.annotations.SkipCoverageGenerated;
+
+@SkipCoverageGenerated
+public class SchemaAlreadyExists extends AlreadyExists {
+ public SchemaAlreadyExists() {}
+
+ public SchemaAlreadyExists(String message) {
+ super(message);
+ }
+
+ public SchemaAlreadyExists(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public SchemaAlreadyExists(Throwable cause) {
+ super(cause);
+ }
+
+ public SchemaAlreadyExists(
+ String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+}

server/src/test/java/io/whitefox/api/server/ShareV1ApiImplTest.java

@@ -141,6 +141,29 @@ public void addRecipientToUnknownShare() {
  addRecipientsToShare("share2", List.of("Paolo")).statusCode(404);
  }
 
+ @Test
+ @Order(5)
+ public void createSchema() {
+ createSchemaInShare("share1", "schema1")
+ .statusCode(201)
+ .body("name", is("share1"))
+ .body("comment", is(nullValue()))
+ .body("recipients", is(hasSize(4)))
+ .body("schemas", is(hasSize(1)))
+ .body("schemas[0]", is("schema1"))
+ .body("createdAt", is(0))
+ .body("createdBy", is("Mr. Fox"))
+ .body("updatedAt", is(0))
+ .body("updatedBy", is("Mr. Fox"))
+ .body("owner", is("Mr. Fox"));
+ }
+
+ @Test
+ @Order(6)
+ public void createSameSchema() {
+ createSchemaInShare("share1", "schema1").statusCode(409);
+ }
+
  ValidatableResponse createEmptyShare(String name) {
  return given()
  .when()
@@ -153,6 +176,14 @@ ValidatableResponse createEmptyShare(String name) {
  .then();
  }
 
+ ValidatableResponse createSchemaInShare(String share, String schema) {
+ return given()
+ .when()
+ .filter(wfFilter)
+ .post("/whitefox-api/v1/shares/{share}/{schema}", share, schema)
+ .then();
+ }
+
  ValidatableResponse addRecipientsToShare(String share, List<String> recipients) {
  return given()
  .when()

server/src/test/java/io/whitefox/core/services/ShareServiceTest.java

@@ -6,6 +6,7 @@
 import io.whitefox.core.Schema;
 import io.whitefox.core.Share;
 import io.whitefox.core.actions.CreateShare;
+import io.whitefox.core.services.exceptions.SchemaAlreadyExists;
 import io.whitefox.core.services.exceptions.ShareAlreadyExists;
 import io.whitefox.core.services.exceptions.ShareNotFound;
 import io.whitefox.persistence.StorageManager;
@@ -125,6 +126,63 @@ public void getShare() throws ExecutionException, InterruptedException {
  assertEquals("key", share.get().id());
  }
 
+ @Test
+ public void createSchema() {
+ var storage = new InMemoryStorageManager();
+ var target = new ShareService(storage, testClock);
+ target.createShare(emptyCreateShare(), testPrincipal);
+ var result = target.createSchema("share1", "schema1", testPrincipal);
+ assertEquals(
+ new Share(
+ "share1",
+ "share1",
+ Map.of("schema1", new Schema("schema1", Collections.emptyList(), "share1")),
+ Optional.empty(),
+ Set.of(),
+ 7,
+ testPrincipal,
+ 7,
+ testPrincipal,
+ testPrincipal),
+ result);
+ }
+
+ @Test
+ public void failToCreateSameSchema() {
+ var storage = new InMemoryStorageManager();
+ var target = new ShareService(storage, testClock);
+ target.createShare(emptyCreateShare(), testPrincipal);
+ target.createSchema("share1", "schema1", testPrincipal);
+ assertThrows(
+ SchemaAlreadyExists.class, () -> target.createSchema("share1", "schema1", testPrincipal));
+ }
+
+ @Test
+ public void createSecondSchema() {
+ var storage = new InMemoryStorageManager();
+ var target = new ShareService(storage, testClock);
+ target.createShare(emptyCreateShare(), testPrincipal);
+ target.createSchema("share1", "schema1", testPrincipal);
+ var result = target.createSchema("share1", "schema2", testPrincipal);
+ assertEquals(
+ new Share(
+ "share1",
+ "share1",
+ Map.of(
+ "schema1",
+ new Schema("schema1", Collections.emptyList(), "share1"),
+ "schema2",
+ new Schema("schema2", Collections.emptyList(), "share1")),
+ Optional.empty(),
+ Set.of(),
+ 7,
+ testPrincipal,
+ 7,
+ testPrincipal,
+ testPrincipal),
+ result);
+ }
+
  private Share createShare(String name, String key, Map<String, Schema> schemas) {
  return new Share(name, key, schemas, testPrincipal, 0L);
  }