Fix editing schema

CHANGELOG.md

@@ -18,6 +18,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Prevent duplicate workflow runs by @dennisvang in #628
 - Clean up Dockerfile by @dennisvang in #626
 - Fix index API by @dennisvang in #637 (backward incompatible)
+- Fix saving metadata schema (draft and publish) by @MarekSuchanek in #XXX
 
 ## [1.17.2]
 

src/main/java/org/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java

@@ -76,6 +76,7 @@ public class ExceptionControllerAdvice {
             )
     )
     public ErrorDTO handleConstraintViolation(Exception exception) {
+        exception.printStackTrace();
         log.warn(exception.getMessage());
         log.debug("Handling bad request (ConstraintViolation)", exception);
         return new ErrorDTO(HttpStatus.BAD_REQUEST, exception.getMessage());

src/main/java/org/fairdatapoint/service/schema/MetadataSchemaMapper.java

@@ -78,7 +78,7 @@ public MetadataSchemaDraftDTO toDraftDTO(
             MetadataSchemaVersion draft
     ) {
         return MetadataSchemaDraftDTO.builder()
-                .uuid(draft.getUuid())
+                .uuid(draft.getSchema().getUuid())
                 .name(draft.getName())
                 .description(draft.getDescription())
                 .abstractSchema(draft.isAbstractSchema())
@@ -231,6 +231,10 @@ public MetadataSchemaVersion toDraft(MetadataSchemaVersion schema) {
                 .definition(schema.getDefinition())
                 .suggestedResourceName(schema.getSuggestedResourceName())
                 .suggestedUrlPrefix(schema.getSuggestedUrlPrefix())
+                .schema(schema.getSchema())
+                .state(MetadataSchemaState.DRAFT)
+                .type(MetadataSchemaType.CUSTOM)
+                .version(schema.getVersion())
                 .build();
     }
 

src/main/java/org/fairdatapoint/service/schema/MetadataSchemaService.java

@@ -186,6 +186,7 @@ public Optional<MetadataSchemaDTO> releaseDraft(UUID uuid, MetadataSchemaRelease
         if (reqDto.isPublished()) {
             final List<MetadataSchemaVersion> parents = resolveExtends(newLatest);
             if (!parents.stream().allMatch(MetadataSchemaVersion::isPublished)) {
+                System.out.println("aaaa");
                 throw new ValidationException(MSG_ERROR_PARENTS_PUBLISH);
             }
         }
@@ -237,6 +238,7 @@ public Optional<MetadataSchemaVersionDTO> updateVersion(
         if (!schema.isPublished() && reqDto.isPublished()) {
             final List<MetadataSchemaVersion> parents = resolveExtends(schema);
             if (!parents.stream().allMatch(MetadataSchemaVersion::isPublished)) {
+                System.out.println("bbbb");
                 throw new ValidationException(MSG_ERROR_PARENTS_PUBLISH);
             }
         }

src/test/java/org/fairdatapoint/acceptance/schema/Common.java

@@ -84,7 +84,7 @@ public static void compare(MetadataSchemaVersion entity, MetadataSchemaVersionDT
     }
 
     public static void compare(MetadataSchemaVersion entity, MetadataSchemaDraftDTO dto) {
-        assertThat(dto.getUuid(), is(equalTo(entity.getUuid())));
+        assertThat(dto.getUuid(), is(equalTo(entity.getSchema().getUuid())));
         assertThat(dto.getName(), is(equalTo(entity.getName())));
         assertThat(dto.getDefinition(), is(equalTo(entity.getDefinition())));
     }