Resolved conflicts

src/main/java/net/gepafin/tendermanagement/entities/LoginAttemptEntity.java

@@ -1,21 +1,14 @@
 package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "LOGIN_ATTEMPT")
-@Getter
-@Setter
-public class LoginAttemptEntity {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "ID", unique = true)
-    private Long id;
+@Data
+public class LoginAttemptEntity extends BaseEntity{
 
     @Column(name = "USERNAME")
     private String username;

src/main/java/net/gepafin/tendermanagement/entities/UserActionEntity.java

@@ -0,0 +1,46 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "user_action")
+public class UserActionEntity extends BaseEntity {
+
+    @Column(name = "USER_ID")
+    private Long userId;
+
+    @Column(name = "ACTION_TYPE")
+    private String actionType;
+
+    @Column(name = "REQUEST_BODY")
+    private String requestBody;
+
+    @Column(name = "LOGIN_ATTEMPT_ID")
+    private Long loginAttemptId;
+
+    @Column(name = "IP_ADDRESS")
+    private String ipAddress;
+
+    @Column(name = "METHOD_TYPE")
+    private String methodType;
+
+    @Column(name = "HUB_ID")
+    private Long hubId;
+
+    @Column(name = "URL")
+    private String url;
+
+    @Column(name = "ACTION_CONTEXT")
+    private String actionContext;
+
+    @Column(name = "RESPONSE")
+    private String response;
+
+    @Column(name = "IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
+
+}

src/main/java/net/gepafin/tendermanagement/entities/VersionHistoryEntity.java

@@ -0,0 +1,36 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "version_history")
+public class VersionHistoryEntity extends BaseEntity {
+
+    @Column(name = "OLD_DATA", columnDefinition = "LONGTEXT")
+    private String oldData;
+
+    @Column(name = "NEW_DATA", columnDefinition = "LONGTEXT")
+    private String newData;
+
+    @Column(name = "TABLE_NAME")
+    private String tableName;
+
+    @Column(name = "ACTION_TYPE")
+    private String actionType;
+
+    @Column(name = "RECORD_ID")
+    private Long recordId;
+
+    @Column(name = "USER_ACTION_ID")
+    private Long userActionId;
+
+    @Column(name = "USER_ID")
+    private Long userId;
+
+    @Column(name = "IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
+}