From 667feda5c27db47656784a4c4359a5c30203ca0c Mon Sep 17 00:00:00 2001
From: Kfilippopolitis <kostasfilippop@gmail.com>
Date: Tue, 21 Dec 2021 10:34:46 +0200
Subject: [PATCH] Now a userDto is being displayed instead of username
---
.../eu/hbp/mip/models/DTOs/ExperimentDTO.java | 4 +--
.../java/eu/hbp/mip/models/DTOs/UserDTO.java | 31 +++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
index 0dd28c1d6..378bb5126 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
+++ b/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
@@ -18,7 +18,7 @@ public class ExperimentDTO {
private UUID uuid;
private String name;
- private String createdBy;
+ private UserDTO createdBy;
private Date created;
private Date updated;
private Date finished;
@@ -41,7 +41,7 @@ public class ExperimentDTO {
this.created = experimentDAO.getCreated();
this.updated = experimentDAO.getUpdated();
this.finished = experimentDAO.getFinished();
- this.createdBy = experimentDAO.getCreatedBy().getUsername();
+ this.createdBy = new UserDTO(experimentDAO.getCreatedBy());
this.name = experimentDAO.getName();
if(includeResult){
this.result = JsonConverters.convertJsonStringToObject(String.valueOf(experimentDAO.getResult()), new ArrayList<>().getClass());
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java
new file mode 100644
index 000000000..755080724
--- /dev/null
+++ b/src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java
@@ -0,0 +1,31 @@
+package eu.hbp.mip.models.DTOs;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.google.gson.annotations.SerializedName;
+import eu.hbp.mip.models.DAOs.ExperimentDAO;
+import eu.hbp.mip.models.DAOs.UserDAO;
+import eu.hbp.mip.utils.JsonConverters;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UserDTO {
+
+ @SerializedName("username")
+ private String username;
+
+ @SerializedName("fullname")
+ private String fullname;
+
+ public UserDTO(){
+
+ }
+
+ public UserDTO(UserDAO userdao) {
+ this.username = userdao.getUsername();
+ this.fullname = userdao.getFullname();
+ }
+}
+
--
GitLab