diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java index 32d98c0a90b0b24db1621c27790dbb2d79965a2e..cbac7877b0ddf32f54bf41996f67430e2ee82567 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java @@ -9,6 +9,7 @@ import lombok.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.extern.jackson.Jacksonized; +import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; @@ -25,6 +26,8 @@ import java.util.List; @Document(indexName = "concept") public class ConceptDto { + @Id + @Field(name = "id") @NotBlank private String uri; @@ -33,11 +36,9 @@ public class ConceptDto { private String description; @NotNull - @Field(enabled = false) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") private Instant created; @NotNull - @Field(enabled = false) private List<ColumnBriefDto> columns; } diff --git a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java index 58316c6123a8aed638d56676cf7c7b1dd10db6dc..8ccb5bf32ae9a96706a5e31f9fbc4bdd72b177a2 100644 --- a/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java +++ b/dbrepo-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java @@ -7,6 +7,7 @@ import lombok.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.extern.jackson.Jacksonized; +import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; @@ -23,6 +24,8 @@ import java.util.List; @Document(indexName = "unit") public class UnitDto { + @Id + @Field(name = "id") @NotBlank private String uri; @@ -31,11 +34,9 @@ public class UnitDto { private String description; @NotNull - @Field(enabled = false) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") private Instant created; @NotNull - @Field(enabled = false) private List<ColumnBriefDto> columns; }