Resolved conflicts

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

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Builder
 public class CallEntity extends BaseEntity {
 
-    @Column(name = "NAME", nullable = false, length = 255)
+    @Column(name = "NAME", length = 255)
     private String name;
 
     @Column(name = "DESCRIPTION_SHORT", columnDefinition = "TEXT")
@@ -26,23 +26,23 @@ public class CallEntity extends BaseEntity {
     @Column(name = "DESCRIPTION_LONG", columnDefinition = "TEXT")
     private String descriptionLong;
 
-    @Column(name = "START_DATE", nullable = false)
+    @Column(name = "START_DATE")
     private LocalDateTime startDate;
 
-    @Column(name = "END_DATE", nullable = false)
+    @Column(name = "END_DATE")
     private LocalDateTime endDate;
 
-    @Column(name = "STATUS", nullable = false, length = 255)
+    @Column(name = "STATUS", length = 255)
     private String status;
 
     @ManyToOne
-    @JoinColumn(name = "REGION_ID", nullable = false, foreignKey = @ForeignKey(name = "fk_region_call"))
+    @JoinColumn(name = "REGION_ID", foreignKey = @ForeignKey(name = "fk_region_call"))
     private RegionEntity region;
 
-    @Column(name = "AMOUNT", nullable = false)
+    @Column(name = "AMOUNT")
     private BigDecimal amount;
 
-    @Column(name = "AMOUNT_MAX", nullable = false)
+    @Column(name = "AMOUNT_MAX")
     private BigDecimal amountMax;
 
     @Column(name = "CONTACT_INFO", columnDefinition = "TEXT")
@@ -51,7 +51,7 @@ public class CallEntity extends BaseEntity {
     @Column(name = "SUBMISSION_METHOD", columnDefinition = "TEXT")
     private String submissionMethod;
 
-    @Column(name = "THRESHOLD", nullable = false)
+    @Column(name = "THRESHOLD")
     private Long threshold;
 
     @Column(name="DOCUMENTATION_REQUESTED",columnDefinition = "TEXT")

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

@@ -39,6 +39,10 @@ public class FaqEntity extends BaseEntity {
     @Column(name = "RESPONSE", columnDefinition = "TEXT")
     private String response;
 
+    @ManyToOne
+    @JoinColumn(name = "LOOKUP_DATA_ID")
+    private LookUpDataEntity lookupData;
+
     @Column(name = "RESPONSE_DATE")
     private LocalDateTime responseDate;
     

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

@@ -21,7 +21,8 @@ public class LookUpDataEntity extends BaseEntity{
     public enum LookUpDataTypeEnum {
         CHECKLIST("CHECKLIST"),
         AIMED_TO("AIMED_TO"),
-        EVALUATION_CRITERIA("EVALUATION_CRITERIA");
+        EVALUATION_CRITERIA("EVALUATION_CRITERIA"),
+        FAQ("FAQ");
 
         private String value;