From a272163035e795ca9b0ab1e379572cd0b0bf8fa2 Mon Sep 17 00:00:00 2001
From: grantnert48 <tobias.grantner@tuwien.ac.at>
Date: Thu, 15 Jun 2023 22:38:05 +0200
Subject: [PATCH] Specified uri as ID in ConceptDto and UnitDto and
enabled=false option for certain fields
---
.../api/database/table/columns/concepts/ConceptDto.java | 5 +++--
.../tuwien/api/database/table/columns/concepts/UnitDto.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
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 32d98c0a90..cbac7877b0 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 58316c6123..8ccb5bf32a 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;
}
--
GitLab