BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved Conflicts

Browse Source
This commit is contained in:
rajesh
2025-06-03 19:23:46 +05:30
parent ba261783b5 5df897680a
commit a3aab4d488
125 changed files with 4072 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
View File

@@ -3,8 +3,10 @@ package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Data;
import org.hibernate.annotations.Where;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import java.time.LocalDateTime;
import java.util.List;
@Entity
@Table(name="application_amendment_request")
@@ -53,7 +55,10 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
@Column(name = "amendment_document")
private String amendmentDocument;
@Column(name = "CLOSING_DATE")
private LocalDateTime closingDate;
@Convert(converter = EmailSendResponseConverter.class)
@Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
private List<EmailSendResponse> emailSendResponse;
}

26
src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestView.java
View File

@@ -3,9 +3,12 @@ package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import net.gepafin.tendermanagement.model.BaseBean;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import org.hibernate.annotations.Immutable;
import java.time.LocalDateTime;
import java.util.List;
@Entity
@Immutable
@@ -13,12 +16,12 @@ import java.time.LocalDateTime;
@Getter
@Setter
@IdClass(ApplicationAmendmentRequestViewId.class)
public class ApplicationAmendmentRequestView {
public class ApplicationAmendmentRequestView extends BaseEntity {
@Id
@Column(name = "ID")
private Long id;
// @Id
// @Column(name = "ID")
// private Long id;
@Column(name = "APPLICATION_ID")
private Long applicationId;
@@ -56,12 +59,17 @@ public class ApplicationAmendmentRequestView {
@Column(name = "APPLICATION_USER_ID")
private Long applicationUserId;
@Column(name = "CREATED_DATE")
private String createdDate;
@Column(name = "UPDATED_DATE")
private String updatedDate;
// @Column(name = "CREATED_DATE")
// private String createdDate;
//
// @Column(name = "UPDATED_DATE")
// private String updatedDate;
@Column(name = "IS_DELETED")
private Boolean isDeleted;
@Convert(converter = EmailSendResponseConverter.class)
@Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
private List<EmailSendResponse> emailSendResponse;
}

5
src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java
View File

@@ -3,8 +3,10 @@ package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Data;
import org.hibernate.annotations.Where;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import java.time.LocalDateTime;
import java.util.List;
@Data
@Entity
@@ -70,4 +72,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{
@Column(name = "evaluationVersion")
private String evaluationVersion;
@Convert(converter = EmailSendResponseConverter.class)
@Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
private List<EmailSendResponse> emailSendResponse;
}

118
src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormView.java Normal file
View File

@@ -0,0 +1,118 @@
package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.Immutable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalTime;
@Entity
@Immutable
@Table(name = "application_form_view")
@Getter
@Setter
@IdClass(ApplicationFormViewId.class)
public class ApplicationFormView {
@Id
@Column(name = "id")
private Long id;
@Column(name = "application_id")
private Long applicationId;
@Column(name = "call_id")
private Long callId;
@Column(name = "form_id")
private Long formId;
@Column(name = "application_form_id")
private Long applicationFormId;
@Column(name = "field_id")
private String fieldId;
@Column(name = "field_label")
private String fieldLabel;
@Column(name = "field_type")
private String fieldType;
@Column(name = "field_value")
private String fieldValue;
@Column(name = "report_enable")
private Boolean reportEnable;
@Column(name = "report_header")
private String reportHeader;
@Column(name = "status")
private String status;
@Column(name = "amount_requested")
private BigDecimal amountRequested;
@Column(name = "amount_accepted")
private BigDecimal amountAccepted;
@Column(name = "is_deleted")
private boolean isDeleted;
@Column(name = "hub_id")
private Long hubId;
@Column(name = "user_id")
private Long userId;
@Column(name = "evaluation_version")
private String evaluationVersion;
@Column(name = "company_id")
private Long companyId;
@Column(name = "company_name")
private String companyName;
@Column(name = "company_vat_number")
private String companyVatNumber;
@Column(name = "codice_ateco")
private String codiceAteco;
@Column(name = "company_codice_fiscale")
private String companyCodiceFiscale;
@Column(name = "protocol_number")
private Long protocolNumber;
@Column(name = "user_codice_fiscale")
private String userCodiceFiscale;
@Column(name = "user_name")
private String userName;
@Column(name = "legal_representative")
private Boolean legalRepresentative;
@Column(name = "call_title")
private String callTitle;
@Column(name = "call_end_date")
private LocalDate callEndDate;
@Column(name = "call_end_time")
private LocalTime callEndTime;
@Column(name = "call_start_date")
private LocalDate callStartDate;
@Column(name = "call_start_time")
private LocalTime callStartTime;
}

20
src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormViewId.java Normal file
View File

@@ -0,0 +1,20 @@
package net.gepafin.tendermanagement.entities;
import lombok.Data;
import java.io.Serializable;
import java.util.Objects;
@Data
public class ApplicationFormViewId implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
public ApplicationFormViewId() {
}
public ApplicationFormViewId(Long id) {
this.id = id;
}
}

2
src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java
View File

@@ -27,4 +27,6 @@ public class ApplicationSignedDocumentEntity extends BaseEntity {
@Column(name="STATUS")
private String status;
@Column(name="FILE_HASH")
private String fileHash;
}

70
src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsView.java Normal file
View File

@@ -0,0 +1,70 @@
package net.gepafin.tendermanagement.entities;
import jakarta.persistence.*;
import lombok.Data;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import org.hibernate.annotations.Immutable;
import java.time.LocalDateTime;
import java.util.List;
@Entity
@Immutable
@Data
@Table(name = "assigned_applications_view")
@IdClass(AssignedApplicationsViewId.class)
public class AssignedApplicationsView{
@Id
@Column(name = "ID")
private Long id;
@Column(name = "APPLICATION_ID")
private Long applicationId;
@Column(name = "USER_ID")
private Long userId;
@Column(name = "PROTOCOL_NUMBER")
private Long protocolNumber;
@Column(name = "CALL_NAME")
private String callName;
@Column(name = "COMPANY_NAME")
private String companyName;
@Column(name = "STATUS")
private String status;
@Column(name = "NDG")
private String ndg;
@Column(name = "APPOINTMENT_ID")
private String appointmentId;
@Column(name = "APPLICATION_STATUS")
private String applicationStatus;
@Column(name = "SUBMISSION_DATE")
private LocalDateTime submissionDate;
@Column(name = "EVALUATION_END_DATE")
private LocalDateTime evaluationEndDate;
@Column(name = "CREATED_DATE")
private LocalDateTime createdDate;
@Column(name = "UPDATED_DATE")
private LocalDateTime updatedDate;
@Column(name = "IS_DELETED")
private Boolean isDeleted;
@Convert(converter = EmailSendResponseConverter.class)
@Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
private List<EmailSendResponse> emailSendResponse;
@Column(name = "HUB_ID")
private Long hubId;
}

17
src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsViewId.java Normal file
View File

@@ -0,0 +1,17 @@
package net.gepafin.tendermanagement.entities;
import lombok.Data;
import java.io.Serializable;
@Data
public class AssignedApplicationsViewId implements Serializable{
private static final long serialVersionUID = 1L;
private Long id;
public AssignedApplicationsViewId() {}
public AssignedApplicationsViewId(Long id) {
this.id = id;
}
}

6
src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
View File

@@ -53,9 +53,6 @@ public class CompanyEntity extends BaseEntity{
@JoinColumn(name = "HUB_ID")
private HubEntity hub;
// @Column(name = "JSON")
// private String json;
@Column(name = "NDG")
private String ndg;
@@ -64,4 +61,7 @@ public class CompanyEntity extends BaseEntity{
@Column(name = "JSON")
private String json;
@Column(name = "PEC")
private String pec;
}

4
src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
View File

@@ -55,5 +55,9 @@ public class EmailLogEntity extends BaseEntity{
@Column(name = "call_id")
private Long callId;
@ManyToOne
@JoinColumn(name = "user_action_id")
private UserActionEntity userAction;
}

43
src/main/java/net/gepafin/tendermanagement/entities/EmailSendResponseConverter.java Normal file
View File

@@ -0,0 +1,43 @@
package net.gepafin.tendermanagement.entities;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Converter;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import java.io.IOException;
import java.util.List;
@Converter
public class EmailSendResponseConverter implements AttributeConverter<List<EmailSendResponse>, String> {
private final ObjectMapper objectMapper = new ObjectMapper();
@Override
public String convertToDatabaseColumn(List<EmailSendResponse> attribute) {
try {
if (attribute == null) {
attribute = List.of();
}
return objectMapper.writeValueAsString(attribute);
} catch (JsonProcessingException e) {
throw new IllegalArgumentException("Error converting list to JSON", e);
}
}
@Override
public List<EmailSendResponse> convertToEntityAttribute(String dbData) {
if (dbData == null || dbData.isBlank()) {
return List.of(); // or null if you prefer
}
try {
return objectMapper.readValue(dbData, new TypeReference<List<EmailSendResponse>>() {});
} catch (IOException e) {
throw new IllegalArgumentException("Error reading JSON from database", e);
}
}
}

5
src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
View File

@@ -7,6 +7,9 @@ import jakarta.persistence.Table;
import lombok.Data;
import org.hibernate.annotations.Where;
import java.math.BigDecimal;
@Entity
@Table(name = "EVALUATION_CRITERIA")
@Data
@@ -22,6 +25,6 @@ public class EvaluationCriteriaEntity extends BaseEntity {
private LookUpDataEntity lookupData;
@Column(name = "SCORE", nullable = false)
private Long score;
private BigDecimal score;
}

11
src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
import net.gepafin.tendermanagement.config.LocalTimeAttributeConverter;
import org.hibernate.annotations.Where;
import java.time.LocalDateTime;
import java.time.LocalTime;
@Entity
@@ -35,4 +36,14 @@ public class ProtocolEntity extends BaseEntity {
@Column(name = "type")
private String type;
@Column(name = "external_protocol_year")
private Integer externalProtocolYear;
@Column(name = "external_protocol_date")
private LocalDateTime externalProtocolDate;
@Column(name = "external_protocol_number")
private String externalProtocolNumber;
}

3
src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
View File

@@ -54,7 +54,8 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
USER_ONBOARDING_CONFIDI("USER_ONBOARDING_CONFIDI"),
USER_ONBOARDING_BANDI("USER_ONBOARDING_BANDI"),
PASSWORD_RESET("PASSWORD_RESET"),
INADMISSIBILITY_TEMPLATE("INADMISSIBILITY_NOTIFICATION");
INADMISSIBILITY_TEMPLATE("INADMISSIBILITY_NOTIFICATION"),
APPLICATION_SUBMISSION_FAILURE_NOTIFICATION("APPLICATION_SUBMISSION_FAILURE_NOTIFICATION");
private String value;
SystemEmailTemplatesEntityTypeEnum(String value) {

7
src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
View File

@@ -8,8 +8,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.Where;
import net.gepafin.tendermanagement.model.response.EmailSendResponse;
import java.time.LocalDateTime;
import java.util.List;
@Entity
@Table(name = "GEPAFIN_USER")
@@ -71,4 +73,9 @@ public class UserEntity extends BaseEntity {
@ManyToOne
@JoinColumn(name = "HUB_ID")
private HubEntity hub;
@Convert(converter = EmailSendResponseConverter.class)
@Column(name = "EMAIL_SEND_RESPONSE", columnDefinition = "TEXT")
private List<EmailSendResponse> emailSendResponse;
}