diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java index aa0f98e06..ded6a3c48 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java @@ -5,6 +5,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.time.Instant; import java.util.UUID; @Entity @@ -26,6 +27,15 @@ public class DmpReferenceEntity { @Column(name = "data") private String data; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + public static final String _createdAt = "createdAt"; + + @Column(name = "updated_at", nullable = false) + private Instant updatedAt; + public static final String _updatedAt = "updatedAt"; + public static final String _data = "data"; public UUID getId() { @@ -59,4 +69,20 @@ public class DmpReferenceEntity { public void setData(String data) { this.data = data; } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/DmpReference.java b/dmp-backend/core/src/main/java/eu/eudat/model/DmpReference.java index 30b4eaeb3..e194011a4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/DmpReference.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/DmpReference.java @@ -1,5 +1,6 @@ package eu.eudat.model; +import java.time.Instant; import java.util.UUID; public class DmpReference { @@ -16,6 +17,13 @@ public class DmpReference { private String data; public static final String _data = "data"; + private Instant createdAt; + + public static final String _createdAt = "createdAt"; + private Instant updatedAt; + + public static final String _updatedAt = "updatedAt"; + public UUID getId() { return id; } @@ -47,4 +55,12 @@ public class DmpReference { public void setData(String data) { this.data = data; } + + public Instant getCreatedAt() { return createdAt;} + + public void setCreatedAt(Instant createdAt) {this.createdAt = createdAt;} + + public Instant getUpdatedAt() {return updatedAt;} + + public void setUpdatedAt(Instant updatedAt) {this.updatedAt = updatedAt;} } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpReferenceBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpReferenceBuilder.java index 16460d303..35995dabc 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpReferenceBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpReferenceBuilder.java @@ -63,6 +63,8 @@ public class DmpReferenceBuilder extends BaseBuilder { item.setReferenceId(QueryBase.convertSafe(tuple, columns, DmpReferenceEntity._dmpId, UUID.class)); item.setReferenceId(QueryBase.convertSafe(tuple, columns, DmpReferenceEntity._referenceId, UUID.class)); item.setData(QueryBase.convertSafe(tuple, columns, DmpReferenceEntity._data, String.class)); + item.setCreatedAt(QueryBase.convertSafe(tuple, columns, DmpReferenceEntity._createdAt, Instant.class)); + item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, DmpReferenceEntity._updatedAt, Instant.class)); return item; } @Override protected String fieldNameOf(FieldResolver item) { - if (item.match(DmpReferenceEntity._id)) return DmpReferenceEntity._id; - else if (item.prefix(DmpReferenceEntity._dmpId)) return DmpReferenceEntity._dmpId; - else if (item.prefix(DmpReferenceEntity._referenceId)) return DmpReferenceEntity._referenceId; - else if (item.match(DmpReferenceEntity._data)) return DmpReferenceEntity._data; + if (item.match(DmpReference._id)) return DmpReferenceEntity._id; + else if (item.prefix(DmpReference._dmp)) return DmpReferenceEntity._dmpId; + else if (item.prefix(DmpReference._reference)) return DmpReferenceEntity._referenceId; + else if (item.match(DmpReference._data)) return DmpReferenceEntity._data; + else if (item.match(DmpReference._createdAt)) return DmpReferenceEntity._createdAt; + else if (item.match(DmpReference._updatedAt)) return DmpReferenceEntity._updatedAt; else return null; }