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

Added applicationEvalutionId in application table

Browse Source
This commit is contained in:
rajesh
2025-01-27 12:00:32 +05:30
parent 0ebd33e544
commit 9f6adf7b92
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
View File

@@ -634,16 +634,33 @@ public class ApplicationEvaluationDao {
application.setAmountAccepted(req.getAmountAccepted()); application.setAmountAccepted(req.getAmountAccepted());
} }
actionType = VersionActionTypeEnum.UPDATE; actionType = VersionActionTypeEnum.UPDATE;
entity = applicationEvaluationRepository.save(entity);
} else { } else {
AssignedApplicationsEntity assignedApplicationsEntity = assignedApplicationsService.validateAssignedApplication(assignedApplicationId); AssignedApplicationsEntity assignedApplicationsEntity = assignedApplicationsService.validateAssignedApplication(assignedApplicationId);
entity = convertToEntity(user, req, assignedApplicationId); entity = convertToEntity(user, req, assignedApplicationId);
actionType = VersionActionTypeEnum.INSERT; actionType = VersionActionTypeEnum.INSERT;
entity = applicationEvaluationRepository.save(entity);
ApplicationEntity oldApplication = Utils.getClonedEntityForData(application);
application.setApplicationEvaluationId(entity.getId());
/** This code is responsible for adding a version history log for the "Update Application" operation. **/
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplication).newData(application).build());
Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_CREATION); Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_CREATION);
notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_CREATION); notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_CREATION);
notificationDao.sendNotificationToInstructor(placeHolders,entity,NotificationTypeEnum.EVALUATION_CREATION); notificationDao.sendNotificationToInstructor(placeHolders,entity,NotificationTypeEnum.EVALUATION_CREATION);
} }
/** This code is responsible for adding a version history log for the "Update Application Evaluation" operation. **/
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationEvaluation).newData(entity).build());
ApplicationStatusForEvaluation status = req.getApplicationStatus(); ApplicationStatusForEvaluation status = req.getApplicationStatus();
// Fetch all amendment request entities associated with the evaluation ID // Fetch all amendment request entities associated with the evaluation ID
List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities = List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities =
@@ -658,16 +675,11 @@ public class ApplicationEvaluationDao {
updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests); updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests);
} }
ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity);
/** This code is responsible for adding a version history log for the "Update Application Evaluation" operation. **/
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationEvaluation).newData(entity).build());
if (status != null) { if (status != null) {
AssignedApplicationsEntity assignedApplicationsEntity = assignedApplications.get(); AssignedApplicationsEntity assignedApplicationsEntity = assignedApplications.get();
return updateApplicationEvaluationStatus(application, assignedApplicationsEntity, status); return updateApplicationEvaluationStatus(application, assignedApplicationsEntity, status);
} else { } else {
return convertToResponse(savedEntity); return convertToResponse(entity);
} }
} }

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

@@ -71,4 +71,7 @@ public class ApplicationEntity extends BaseEntity {
@Column(name = "evaluationVersion") @Column(name = "evaluationVersion")
private String evaluationVersion; private String evaluationVersion;
@Column(name = "APPLICATION_EVALUATION_ID")
private Long applicationEvaluationId;
} }

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

@@ -2293,4 +2293,17 @@
</addColumn> </addColumn>
</changeSet> </changeSet>
<changeSet id="24-01-2025_RK_194615" author="Rajesh Khore">
<addColumn tableName="application">
<column name="application_evaluation_id" type="INTEGER"> </column>
</addColumn>
<!-- Updating the new column with data from 'application_evaluation' -->
<update tableName="application">
<column name="application_evaluation_id" valueComputed="(SELECT ae.id FROM application_evaluation ae WHERE ae.application_id = application.id)"/>
<where>EXISTS (SELECT 1 FROM application_evaluation ae WHERE ae.application_id = application.id)</where>
</update>
</changeSet>
</databaseChangeLog> </databaseChangeLog>