Resolved conflicts

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

@@ -18,6 +18,9 @@ public class CallTargetAudienceChecklistEntity extends BaseEntity{
 
     @Column(name = "IS_VALIDATED")
     private Boolean isValidated;
+    
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
 
 
 }

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

@@ -1,17 +1,15 @@
 package net.gepafin.tendermanagement.entities;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 
 @Entity
 @Table(name = "DOCUMENT")
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class DocumentEntity extends BaseEntity{
     @Column(name = "FILE_NAME", length = 255)
     private String fileName;
@@ -28,4 +26,8 @@ public class DocumentEntity extends BaseEntity{
 
     @Column(name = "DESCRIPTION", columnDefinition = "TEXT")
     private String description;
+    
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
+    
 }

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

@@ -1,30 +1,29 @@
 package net.gepafin.tendermanagement.entities;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 
 
 @Entity
 @Table(name = "EVALUATION_CRITERIA")
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class EvaluationCriteriaEntity extends BaseEntity {
 
     @ManyToOne
     @JoinColumn(name = "CALL_ID", nullable = false)
     private CallEntity call;
-
-    @Column(name = "NAME", nullable = false, columnDefinition = "TEXT")
-    private String name;
-
-    @Column(name = "DESCRIPTION", columnDefinition = "TEXT")
-    private String description;
-
+    
+    @ManyToOne
+    @JoinColumn(name = "LOOKUP_DATA_ID")
+    private LookUpDataEntity lookupData;
+    
     @Column(name = "SCORE", nullable = false)
-    private Integer score;
+    private Long score;
+    
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
 
 }

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

@@ -1,19 +1,19 @@
 package net.gepafin.tendermanagement.entities;
 
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-
 import java.time.LocalDateTime;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+
 @Entity
 @Table(name = "FAQ")
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class FaqEntity extends BaseEntity {
 
     @ManyToOne
@@ -41,6 +41,9 @@ public class FaqEntity extends BaseEntity {
 
     @Column(name = "RESPONSE_DATE")
     private LocalDateTime responseDate;
+    
+    @Column(name ="IS_DELETED", nullable = false)
+    private Boolean isDeleted = false;
 
 }
 

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

@@ -58,4 +58,6 @@ public class UserEntity extends BaseEntity {
     @Column(name = "COUNTRY", length = 50, nullable = true)
     private String country;
 
+    @Column(name = "RESET_PASSWORD_TOKEN", length = 255, nullable = true)
+    private String resetPasswordToken;
 }