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-10-14 11:58:13 +05:30
parent 38515ed38b 159c2611d3
commit 58f36c954d
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
View File

@@ -341,6 +341,7 @@ public class ApplicationAmendmentRequestDao {
applicationAmendmentRequestEntity.setIsNotification(applicationAmendmentRequest.getIsSendNotification()); applicationAmendmentRequestEntity.setIsNotification(applicationAmendmentRequest.getIsSendNotification());
applicationAmendmentRequestEntity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); applicationAmendmentRequestEntity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
applicationAmendmentRequestEntity.setStatus(ApplicationAmendmentRequestEnum.AWAITING.getValue()); applicationAmendmentRequestEntity.setStatus(ApplicationAmendmentRequestEnum.AWAITING.getValue());
applicationAmendmentRequestEntity.setType(ApplicationAmendmentRequestTypeEnum.REGULAR.getValue());
ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId); ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId);
//cloned for old data entity //cloned for old data entity
ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(applicationEvaluationEntity); ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(applicationEvaluationEntity);
@@ -349,7 +350,8 @@ public class ApplicationAmendmentRequestDao {
Long applicationId = applicationEvaluationEntity.getApplicationId(); Long applicationId = applicationEvaluationEntity.getApplicationId();
Long assignedApplicationId = applicationEvaluationEntity.getAssignedApplicationsEntity().getId(); Long assignedApplicationId = applicationEvaluationEntity.getAssignedApplicationsEntity().getId();
applicationAmendmentRequestEntity.setApplicationId(applicationId); applicationAmendmentRequestEntity.setApplicationId(applicationId);
ApplicationEntity applicationEntity = applicationService.validateApplication(applicationId);
ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
if (applicationAmendmentRequest.getFormFields() != null) { if (applicationAmendmentRequest.getFormFields() != null) {
List<AmendmentFormField> formFieldRequestBean = applicationAmendmentRequest.getFormFields().stream() List<AmendmentFormField> formFieldRequestBean = applicationAmendmentRequest.getFormFields().stream()
.filter(AmendmentFormFieldResponse::isSelected) .filter(AmendmentFormFieldResponse::isSelected)
@@ -366,7 +368,8 @@ public class ApplicationAmendmentRequestDao {
} }
List<ApplicationAmendmentRequestEntity> amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(applicationEvaluationEntity.getId()); List<ApplicationAmendmentRequestEntity> amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(applicationEvaluationEntity.getId());
// Ensure startDate and initialDays are not null to avoid NullPointerException // Ensure startDate and initialDays are not null to avoid NullPointerException
if (amendmentRequest !=null && amendmentRequest.isEmpty() && applicationEvaluationEntity.getStartDate() != null && applicationEvaluationEntity.getInitialDays() != null ) { if (amendmentRequest !=null && amendmentRequest.isEmpty()) {
if (applicationEvaluationEntity.getStartDate() != null && applicationEvaluationEntity.getInitialDays() != null) {
Long initialDays = applicationEvaluationEntity.getInitialDays(); Long initialDays = applicationEvaluationEntity.getInitialDays();
LocalDateTime startDate = applicationEvaluationEntity.getStartDate(); LocalDateTime startDate = applicationEvaluationEntity.getStartDate();
LocalDateTime nowInUTC = DateTimeUtil.DateServerToUTC(LocalDateTime.now()); LocalDateTime nowInUTC = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
@@ -377,6 +380,9 @@ public class ApplicationAmendmentRequestDao {
//Set stop date time in the entity becuase amendment has started //Set stop date time in the entity becuase amendment has started
applicationEvaluationEntity.setStopDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); applicationEvaluationEntity.setStopDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
} }
applicationEntity.setPreviousStatus(oldApplicationEntity.getStatus());
}
UserEntity userEntity = userService.validateUser(applicationEvaluationEntity.getUserId()); UserEntity userEntity = userService.validateUser(applicationEvaluationEntity.getUserId());
Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub()); Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub());
@@ -408,8 +414,7 @@ public class ApplicationAmendmentRequestDao {
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity).newData(applicationEvaluationEntity).build()); loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity).newData(applicationEvaluationEntity).build());
} }
ApplicationEntity applicationEntity = applicationService.validateApplication(applicationId);
ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
String applicationStatusType = applicationEntity.getStatus(); String applicationStatusType = applicationEntity.getStatus();
if (Boolean.FALSE.equals(applicationStatusType.equals((ApplicationStatusTypeEnum.SOCCORSO.getValue())))) { if (Boolean.FALSE.equals(applicationStatusType.equals((ApplicationStatusTypeEnum.SOCCORSO.getValue())))) {
applicationEntity.setStatus(ApplicationStatusTypeEnum.SOCCORSO.getValue()); applicationEntity.setStatus(ApplicationStatusTypeEnum.SOCCORSO.getValue());
@@ -1153,10 +1158,10 @@ public class ApplicationAmendmentRequestDao {
log.info("Updated ApplicationEvaluation status to OPEN for ID: {}", existingApplicationEvaluationEntity.getId()); log.info("Updated ApplicationEvaluation status to OPEN for ID: {}", existingApplicationEvaluationEntity.getId());
if(Boolean.FALSE.equals(existingApplicationAmendment.getType().equals(ApplicationAmendmentRequestTypeEnum.SPECIAL.getValue()))){ if(Boolean.FALSE.equals(existingApplicationAmendment.getType().equals(ApplicationAmendmentRequestTypeEnum.SPECIAL.getValue()))){
application.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue()); application.setStatus(application.getPreviousStatus());
} }
applicationRepository.save(application); applicationRepository.save(application);
log.info("Updated Application status to EVALUATION for Application ID: {}", application.getId()); log.info("Updated Application status to previous state for Application ID: {}", application.getId());
existingApplicationAmendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().setStatus(AssignedApplicationEnum.OPEN.getValue()); existingApplicationAmendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().setStatus(AssignedApplicationEnum.OPEN.getValue());

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

@@ -82,4 +82,6 @@ public class ApplicationEntity extends BaseEntity {
@Column(name = "EMAIL_JSON") @Column(name = "EMAIL_JSON")
private String emailJson; private String emailJson;
@Column(name = "PREVIOUS_STATUS")
private String previousStatus;
} }

2
src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java
View File

@@ -161,7 +161,7 @@ public class ApplicationAmendmentScheduler {
public void updateApplicationStatus(ApplicationEntity applicationEntity){ public void updateApplicationStatus(ApplicationEntity applicationEntity){
ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity); ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
applicationEntity.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue()); applicationEntity.setStatus(applicationEntity.getPreviousStatus());
applicationRepository.save(applicationEntity); applicationRepository.save(applicationEntity);
log.info("Updated status to EVALUATION for Application with ID: {}",applicationEntity.getId()); log.info("Updated status to EVALUATION for Application with ID: {}",applicationEntity.getId());

2
src/main/resources/application-production.properties
View File

@@ -26,7 +26,7 @@ default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
#Login to Odessa, Appointment Creation, Upload document Configuration #Login to Odessa, Appointment Creation, Upload document Configuration
appointment.base.url=https://prd.galileonetwork.it/gateway/rest appointment.base.url=https://prd.galileonetwork.it/gateway/rest
appointment.portal.user=UtenzaAPIPortal@621 appointment.portal.user=UtenzaAPIPortal@621
appointment.portal.password=Valeria2016!! appointment.portal.password=Valeria2016!
appointment.portal.source=GEPAFINPORTAL appointment.portal.source=GEPAFINPORTAL
appointment.portal.context=GEPAFINPORTAL appointment.portal.context=GEPAFINPORTAL

5
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -3069,4 +3069,9 @@
<where>UNIQUE_UUID = 'p4lk3bcx1RStqTaIVVbXs'</where> <where>UNIQUE_UUID = 'p4lk3bcx1RStqTaIVVbXs'</where>
</update> </update>
</changeSet> </changeSet>
<changeSet id="06-10-2025_RK_142435" author="Rajesh Khore">
<addColumn tableName="application">
<column name="previous_status" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
</databaseChangeLog> </databaseChangeLog>