Merge branch 'master' into sendingMails

IEEE-RVCE · Jun 12, 2024 · fb03574 · fb03574
2 parents a78c8bf + 243dfe2
commit fb03574
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/src/main/java/org/ieeervce/gatekeeper/dto/ReviewLog/ReviewLogDTO.java b/src/main/java/org/ieeervce/gatekeeper/dto/ReviewLog/ReviewLogDTO.java
@@ -3,10 +3,13 @@
 import org.ieeervce.gatekeeper.dto.User.UserInternalDTO;
 import org.ieeervce.gatekeeper.entity.StatusEnum;
 
+import java.time.LocalDateTime;
+
 public class ReviewLogDTO {
     private UserInternalDTO user;
     private StatusEnum status;
     private String comments;
+    private LocalDateTime createdAt;
 
     public UserInternalDTO getUser() {
         return user;
@@ -31,4 +34,12 @@ public String getComments() {
     public void setComments(String comments) {
         this.comments = comments;
     }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
 }
diff --git a/src/main/java/org/ieeervce/gatekeeper/dto/User/UserResponseDTO.java b/src/main/java/org/ieeervce/gatekeeper/dto/User/UserResponseDTO.java
@@ -1,6 +1,8 @@
 package org.ieeervce.gatekeeper.dto.User;
 
 import org.ieeervce.gatekeeper.dto.RequestForm.RequestDTO;
+import org.ieeervce.gatekeeper.dto.Role.RoleDTO;
+import org.ieeervce.gatekeeper.entity.Role;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -10,7 +12,7 @@ public class UserResponseDTO {
     private String email;
 
     private Integer societyId;
-    private Integer roleId;
+    private RoleDTO role;
 
     private boolean enabled;
     private boolean unsubscribed;
@@ -64,12 +66,12 @@ public void setEmail(String email) {
     }
 
 
-    public Integer getRoleId() {
-        return roleId;
+    public RoleDTO getRole() {
+        return role;
     }
 
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
+    public void setRole(RoleDTO role) {
+        this.role = role;
     }
 
     public Integer getSocietyId() {

diff --git a/src/main/java/org/ieeervce/gatekeeper/entity/ReviewLog.java b/src/main/java/org/ieeervce/gatekeeper/entity/ReviewLog.java
@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.LocalDateTime;
 
 @Entity
 public class ReviewLog {
@@ -21,6 +24,9 @@ public class ReviewLog {
     private StatusEnum status;
     @Column(nullable = true)
     private String comments;
+    @CreationTimestamp
+    @Column(nullable = false)
+    private LocalDateTime createdAt;
 
     public Long getReviewLogId() {
         return reviewLogId;
@@ -61,4 +67,12 @@ public String getComments() {
     public void setComments(String comments) {
         this.comments = comments;
     }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
 }