Resolve Conflicts

src/main/java/net/gepafin/tendermanagement/model/request/UserActionRequest.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.Builder;
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+
+@Data
+@Builder
+public class UserActionRequest {
+    private HttpServletRequest request;
+    private UserActionLogsEnum actionType;
+    private UserActionContextEnum actionContext;
+    private Object response;
+}

src/main/java/net/gepafin/tendermanagement/model/request/VersionHistoryRequest.java

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.request;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.Builder;
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.BaseEntity;
+import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
+
+@Data
+@Builder
+public class VersionHistoryRequest {
+    private BaseEntity oldData;
+    private BaseEntity newData;
+    private VersionActionTypeEnum actionType;
+    private HttpServletRequest request;
+}

src/main/java/net/gepafin/tendermanagement/model/response/CommunicationResponseBean.java

@@ -10,6 +10,8 @@ public class CommunicationResponseBean {
 
     private String comment;
 
+    private Long id;
+
     private String title;
 
     private LocalDateTime createdDate;
@@ -21,7 +23,8 @@ public class CommunicationResponseBean {
     private Long receiverUserId;
 
     private Long amendmentId;
-    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId) {
+    
+    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId, Long id) {
 
         this.commentedDate = commentedDate;
         this.comment = comment;
@@ -29,9 +32,10 @@ public class CommunicationResponseBean {
         this.createdDate = createdDate;
         this.updatedDate = updatedDate;
         this.amendmentId = amendmentId;
+        this.id = id;
     }
 
-    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId,Long senderUserId,Long receiverUserId) {
+    public CommunicationResponseBean(LocalDateTime commentedDate, String comment, String title, LocalDateTime createdDate, LocalDateTime updatedDate, Long amendmentId,Long senderUserId,Long receiverUserId, Long id) {
 
         this.commentedDate = commentedDate;
         this.comment = comment;
@@ -41,6 +45,7 @@ public class CommunicationResponseBean {
         this.amendmentId = amendmentId;
         this.senderUserId = senderUserId;
         this.receiverUserId = receiverUserId;
+        this.id = id;
     }
 
     public CommunicationResponseBean() {

src/main/java/net/gepafin/tendermanagement/model/util/LogResponse.java

@@ -0,0 +1,28 @@
+package net.gepafin.tendermanagement.model.util;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import net.gepafin.tendermanagement.web.rest.api.errors.Status;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class LogResponse<T> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Integer status;
+
+    private String statusCode;
+
+    private String message;
+}