Resolve Conflicts

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

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Entity
@@ -55,4 +56,16 @@ public class ApplicationEntity extends BaseEntity {
     @Column(name = "APPOINTMENT_ID")
     private String appointmentId;
 
-    }
+    @Column(name="AMOUNT_REQUESTED")
+    private BigDecimal amountRequested;
+
+    @Column(name="AMOUNT_ACCEPTED")
+    private BigDecimal amountAccepted;
+
+    @Column(name="DATE_ACCEPTED")
+    private LocalDateTime dateAccepted;
+
+    @Column(name="DATE_REJECTED")
+    private LocalDateTime dateRejected;
+
+}

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

@@ -65,4 +65,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "CLOSING_DATE")
     private LocalDateTime closingDate;
 
+    @Column(name = "ACTIVE_DAYS")
+    private Long activeDays;
+
 }

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

@@ -41,28 +41,19 @@ public class CompanyEntity extends BaseEntity{
     @Column(name = "COUNTRY")
     private String country;
     
-    @Column(name = "PEC")
-    private String pec;
-    
-    @Column(name = "EMAIL")
-    private String email;
-    
     @Column(name = "NUMBER_OF_EMPLOYEES")
     private String numberOfEmployees;
     
     @Column(name = "ANNUAL_REVENUE")
     private BigDecimal annualRevenue;
-
-    @Column(name = "CONTACT_NAME")
-    private String contactName;
-
-    @Column(name = "CONTACT_EMAIL")
-    private String contactEmail;
     
     @ManyToOne
     @JoinColumn(name = "HUB_ID")
     private HubEntity hub;
 
+//    @Column(name = "JSON")
+//    private String json;
+
     @Column(name = "NDG")
     private String ndg;
 }

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

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "expiration_config")
+@Data
+public class ExpirationConfigEntity extends BaseEntity {
+
+    @Column(name="INTERVAL_DAYS")
+    private Long intervalDays;
+
+    @Column(name="TYPE")
+    private String type;
+
+    @Column(name="IS_DELETED")
+    private Boolean isDeleted;
+}

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

@@ -47,6 +47,8 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 		INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE("INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE"),
 		ADMISSIBILITY_NOTIFICATION("ADMISSIBILITY_NOTIFICATION"),
 		AMENDMENT_REMINDER("AMENDMENT_REMINDER"),
+		USER_ONBOARDING("USER_ONBOARDING"),
+		PASSWORD_RESET("PASSWORD_RESET"),
 		INADMISSIBILITY_TEMPLATE("INADMISSIBILITY_NOTIFICATION");
 		
 		private String value;

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

@@ -22,6 +22,22 @@ public class UserWithCompanyEntity extends BaseEntity{
     @Column(name = "IS_LEGAL_REPRESENTANT")
     private Boolean isLegalRepresentant;
 
+
+	@Column(name = "CONTACT_NAME")
+	private String contactName;
+
+	@Column(name = "CONTACT_EMAIL")
+	private String contactEmail;
+
+	@Column(name = "PEC")
+	private String pec;
+
+	@Column(name = "EMAIL")
+	private String email;
+
+	@Column(name = "JSON")
+	private String json;
+
 	@Column(name = "IS_DELETED")
 	private Boolean isDeleted = false;