diff --git a/faircommons-services/api-service/src/main/java/eu/fairkom/faircommons/api_service/api/WorksApi.java b/faircommons-services/api-service/src/main/java/eu/fairkom/faircommons/api_service/api/WorksApi.java index 20f668cf5e24a4babe256d0f4a1c7df0cc72064b..1662208e5a2511177a6062f0cec128c6dd60ee9d 100644 --- a/faircommons-services/api-service/src/main/java/eu/fairkom/faircommons/api_service/api/WorksApi.java +++ b/faircommons-services/api-service/src/main/java/eu/fairkom/faircommons/api_service/api/WorksApi.java @@ -38,7 +38,6 @@ public class WorksApi { @PostMapping("/register") public ResponseEntity<Void> registerWork(@PathVariable String userId, @RequestBody WorkCreateView workCreateView) { var message = new HashingMessage(); - message.setName("Test Hashing Message"); rabbitMqService.sendMessage(message); diff --git a/faircommons-services/api-service/src/main/resources/application-local.yml b/faircommons-services/api-service/src/main/resources/application-local.yml index c6ed299ac89c4a00f032537dae83a5d1f39c033e..e0b3084fd6c0e33382fd16de7ee6044a25a9ce43 100644 --- a/faircommons-services/api-service/src/main/resources/application-local.yml +++ b/faircommons-services/api-service/src/main/resources/application-local.yml @@ -7,5 +7,5 @@ spring: minio: url: http://localhost:9000 - accessKey: P6pHbLlcQhxd0Gok - secretKey: S9JjmoQg2aJzZyG6XklsPlPqjAfAvOLC \ No newline at end of file + accessKey: r12kaxQS56GrGHfZ + secretKey: YiM6r4ySUdJfEzqBbCAZfNYFs4FssM7Q \ No newline at end of file diff --git a/faircommons-services/common/src/main/java/eu/fairkom/faircommons/common/rabbitmq/RabbitMqConfiguration.java b/faircommons-services/common/src/main/java/eu/fairkom/faircommons/common/rabbitmq/RabbitMqConfiguration.java index cd76cca18ddfa09f51a7f9c875cd1ef76bf3092e..c7cc2aae7f66942120fe0799e3b08e481d3af272 100644 --- a/faircommons-services/common/src/main/java/eu/fairkom/faircommons/common/rabbitmq/RabbitMqConfiguration.java +++ b/faircommons-services/common/src/main/java/eu/fairkom/faircommons/common/rabbitmq/RabbitMqConfiguration.java @@ -1,13 +1,7 @@ package eu.fairkom.faircommons.common.rabbitmq; -import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.annotation.EnableRabbit; -import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; -import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/StorageOption.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/StorageOption.java index de7f34f818018bd59cc0b4db7a788cf0fa5a5a5c..428d23043559e86be353d178fd76c5283488b244 100644 --- a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/StorageOption.java +++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/StorageOption.java @@ -1,5 +1,5 @@ package eu.fairkom.faircommons.common.model; -public class StorageOption { - +public enum StorageOption { + OBJECT_STORAGE, IPFS } diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkCreateView.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkCreateView.java index d3bcaf7e84dd6f995bbd48c8e09313629c272bab..80f693c42ddae8fee6c01c13847d0fcd03537fa5 100644 --- a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkCreateView.java +++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkCreateView.java @@ -4,13 +4,20 @@ import java.time.ZonedDateTime; import java.util.List; public class WorkCreateView { - private String type; + private WorkType type; private String title; private String description; private List<String> tags; + private String language; private ZonedDateTime creationDate; private String registrar; + private String creator; //TODO clarify if the attribute is needed + private String creatorUrl; + private String publisher; //TODO what data are collected? email, name? + private List<String> attribution; //TODO what data are collected? email, name? + private String workUrl; //TODO ?? + private String identifier; private String filename; private WorkVisibility visibility; - private StorageOption storageOption; + private List<StorageOption> storageOptions; } diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/Work.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkEntity.java similarity index 82% rename from faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/Work.java rename to faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkEntity.java index 1f3cac48f15239c6136e515ffc097c803a2df762..f0029be7b69a823c8104c72ca53afe9b50696d29 100644 --- a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/Work.java +++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkEntity.java @@ -1,18 +1,17 @@ package eu.fairkom.faircommons.common.model; -import java.time.LocalDateTime; import java.time.ZonedDateTime; import java.util.List; -public class Work { - private String type; +public class WorkEntity { + private WorkType type; private String title; //immutable private String description; private List<String> tags; private String language; private ZonedDateTime creationDate; //immutable private ZonedDateTime registrationDate; //immutable - + private ZonedDateTime publishingDate; //TODO ?? private String registrar; //keycloak userId, immutable private String publisher; //immutable private List<String> attribution; @@ -29,4 +28,6 @@ public class Work { private IpfsEntry ipfsMeta; //immutable private String status; + + private String publicCertificate; //immutable, TODO url to pdf?? } diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkType.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkType.java new file mode 100644 index 0000000000000000000000000000000000000000..95a3cd9b7daeae7ab8ea71bc7f0fc697eb03e20c --- /dev/null +++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/model/WorkType.java @@ -0,0 +1,5 @@ +package eu.fairkom.faircommons.common.model; + +public enum WorkType { + DOCUMENT, AUDIO, PICTURE, VIDEO, SOFTWARE +} diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/rabbitmq/message/HashingMessage.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/rabbitmq/message/HashingMessage.java index 7e5f4493b7d4afac40c3ed8c3140b168e10edc11..722b0dc95d453cfd44003a992bdbe422c74d57b8 100644 --- a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/rabbitmq/message/HashingMessage.java +++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/rabbitmq/message/HashingMessage.java @@ -1,5 +1,6 @@ package eu.fairkom.faircommons.common.rabbitmq.message; +import eu.fairkom.faircommons.common.model.WorkCreateView; import lombok.Data; import java.io.Serializable; @@ -7,5 +8,5 @@ import java.io.Serializable; @Data public class HashingMessage implements Serializable { private HashingMessageType type; - private String name; + private WorkCreateView workCreateView; }