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:
nisha
2025-03-27 14:40:54 +05:30
parent 4958dd549c 782b7dbe75
commit 29dc2869d8
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -965,6 +965,13 @@ public class ApplicationDao {
applicationEntity.setStatus(status.getValue()); applicationEntity.setStatus(status.getValue());
log.info("Status updated to DRAFT for applicationId: " + applicationId); log.info("Status updated to DRAFT for applicationId: " + applicationId);
} }
if (status.equals(ApplicationStatusTypeEnum.AWAITING) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) {
ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository.findByApplicationIdAndStatus(applicationId,
ApplicationSignedDocumentStatusEnum.ACTIVE.getValue());
deleteSignedDocumentFromS3(applicationSignedDocument);
applicationEntity.setStatus(status.getValue());
log.info("Status updated to AWAITING for applicationId: " + applicationId);
}
applicationEntity = applicationRepository.save(applicationEntity); applicationEntity = applicationRepository.save(applicationEntity);
log.info("Application status updated successfully | applicationId: {}, newStatus: {}", applicationId, applicationEntity.getStatus()); log.info("Application status updated successfully | applicationId: {}, newStatus: {}", applicationId, applicationEntity.getStatus());
@@ -1181,9 +1188,7 @@ public class ApplicationDao {
ApplicationSignedDocumentEntity oldApplicationSingedDocumentData = Utils.getClonedEntityForData(applicationSignedDocument); ApplicationSignedDocumentEntity oldApplicationSingedDocumentData = Utils.getClonedEntityForData(applicationSignedDocument);
if (applicationSignedDocument != null) { if (applicationSignedDocument != null) {
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED)); deleteSignedDocumentFromS3(applicationSignedDocument);
// applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue());
// applicationSignedDocumentRepository.save(applicationSignedDocument);
} }
UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = uploadFileOnAmazonS3ForUserSignedDocument(file, applicationEntity.getCall().getId(), applicationId); UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = uploadFileOnAmazonS3ForUserSignedDocument(file, applicationEntity.getCall().getId(), applicationId);
applicationSignedDocument = new ApplicationSignedDocumentEntity(); applicationSignedDocument = new ApplicationSignedDocumentEntity();
@@ -1206,6 +1211,19 @@ public class ApplicationDao {
return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument); return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument);
} }
public void deleteSignedDocumentFromS3(ApplicationSignedDocumentEntity applicationSignedDocumentEntity){
ApplicationSignedDocumentEntity oldApplicationSignedDocument = Utils.getClonedEntityForData(applicationSignedDocumentEntity);
String oldS3Path = applicationSignedDocumentEntity.getFilePath();
String newS3Path = s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.DELETED_USER_SIGNED_DOCUMENT,applicationSignedDocumentEntity.getApplication().getCall().getId(),applicationSignedDocumentEntity.getApplication().getId(),0L);
UploadFileOnAmazonS3Response response = amazonS3Service.moveFile(applicationSignedDocumentEntity.getFileName(), oldS3Path, newS3Path);
applicationSignedDocumentEntity.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue());
applicationSignedDocumentEntity.setFileName(response.getFileName());
applicationSignedDocumentEntity.setFilePath(response.getFilePath());
applicationSignedDocumentRepository.save(applicationSignedDocumentEntity);
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.SOFT_DELETE).oldData(oldApplicationSignedDocument).newData(applicationSignedDocumentEntity).build());
}
private void validateFileTypeForCall(MultipartFile file, ApplicationEntity applicationEntity) { private void validateFileTypeForCall(MultipartFile file, ApplicationEntity applicationEntity) {
List<String> validCallIds = Arrays.asList(callId.split(",")); List<String> validCallIds = Arrays.asList(callId.split(","));

3
src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java
View File

@@ -8,7 +8,8 @@ public enum DocOtherSourceTypeEnum {
DELETED_APPLICATION("DELETED_APPLICATION"), DELETED_APPLICATION("DELETED_APPLICATION"),
DELETED_EVALUATION("DELETED_EVALUATION"), DELETED_EVALUATION("DELETED_EVALUATION"),
DELETED_CALL("DELETED_CALL"), DELETED_CALL("DELETED_CALL"),
DELETED_AMENDMENT("DELETED_AMENDMENT"); DELETED_AMENDMENT("DELETED_AMENDMENT"),
DELETED_USER_SIGNED_DOCUMENT("DELETED_USER_SIGNED_DOCUMENT");
private String value; private String value;

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

@@ -2679,5 +2679,15 @@
<sqlFile dbms="postgresql" <sqlFile dbms="postgresql"
path="db/dump/create_application_view.sql"/> path="db/dump/create_application_view.sql"/>
</changeSet> </changeSet>
<changeSet id="25-03-2025_PK_193115" author="Piyush Kag">
<insert tableName="s3_path_configuration">
<column name="type" value="DELETED_USER_SIGNED_DOCUMENT"/>
<column name="path" value="call/{call_id}/application/{application_id}/user_signed_document/deleted"/>
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2025-03-25 03:00:00"/>
<column name="updated_date" value="2024-03-25 03:00:00"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
</changeSet>
</databaseChangeLog> </databaseChangeLog>