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:
harish
2024-10-28 17:31:49 +05:30
parent 47613daf61 e1b6ec6c02
commit 4330dcaab5
4 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,8 @@ public class ApplicationEvaluationDao {
if (assignedApplicationsList.isEmpty()) {
response.setAssignedApplicationId(null);
} else {
AssignedApplicationsEntity assignedApplications = assignedApplicationsList.get(0);
response.setAssignedApplicationId(assignedApplications.getId());
// AssignedApplicationsEntity assignedApplications = assignedApplicationsList.get(0);
response.setAssignedApplicationId(entity.getAssignedApplicationsEntity().getId());
}
response.setNote(entity.getNote());

12
src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java
View File

@@ -80,7 +80,7 @@ public class S3ReUploadMigrationService {
File localFile = downloadFileFromS3(oldUrl);
String newKey = generateNewS3Path(document); // Make sure this generates the correct new path
String uploadedPath = uploadFileToNewBucket(localFile, newKey);
updateDocumentPathAndDeleteOldEntry(document, uploadedPath);
updateDocumentPathAndNameEntry(document, uploadedPath);
} catch (Exception e) {
log.error("Error processing document {}: {}", document.getId(), e.getMessage());
}
@@ -178,14 +178,12 @@ public class S3ReUploadMigrationService {
}
private void updateDocumentPathAndDeleteOldEntry(DocumentEntity document, String newPath) {
private void updateDocumentPathAndNameEntry(DocumentEntity document, String newPath) {
String fileName = extractFileName(newPath);
DocumentEntity newDocument = document;
newDocument.setFilePath(newPath);
newDocument.setFileName(fileName);
documentRepository.save(newDocument);
document.setFilePath(newPath);
document.setFileName(fileName);
documentRepository.save(document);
log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath);
}
}

29
src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java
View File

@@ -32,7 +32,7 @@ public class UserSignedAndDelegationServiceImpl {
private static final String OLD_BUCKET = "mementoresources";
private static final String NEW_BUCKET = "mementoresources";
private static final String SECURE_KEY = "267163962963";
@Autowired
@@ -49,7 +49,7 @@ public class UserSignedAndDelegationServiceImpl {
@Autowired
ApplicationRepository applicationRepository;
@Autowired
S3ConfigRepository s3ConfigRepository;
@@ -58,7 +58,6 @@ public class UserSignedAndDelegationServiceImpl {
private boolean migrationCompleted = false;
public String migrateUserDelegatedDocuments(String providedKey) {
if (migrationCompleted) {
@@ -84,7 +83,7 @@ public class UserSignedAndDelegationServiceImpl {
File localFile = downloadFileFromS3(oldUrl);
String newKey = generateNewS3PathForDelegationDoc();
String uploadedPath = uploadFileToNewBucket(localFile, newKey);
updateDelegatedDocumentPathAndDeleteOldEntry(document, uploadedPath);
updateDelegatedDocumentPathAndNameEntry(document, uploadedPath);
} catch (Exception e) {
log.error("Error processing user designated document {}: {}", document.getId(), e.getMessage());
}
@@ -92,7 +91,6 @@ public class UserSignedAndDelegationServiceImpl {
return "Migrated";
}
public String migrateUserSignedDocuments(String providedKey) {
if (migrationCompleted) {
@@ -117,7 +115,7 @@ public class UserSignedAndDelegationServiceImpl {
File localFile = downloadFileFromS3(oldUrl);
String newKey = generateNewS3PathForUserSignedDoc(document);
String uploadedPath = uploadFileToNewBucket(localFile, newKey);
updateDocumentPathAndDeleteOldEntry(document, uploadedPath);
updateDocumentPathAndNameEntry(document, uploadedPath);
} catch (Exception e) {
log.error("Error processing user signed document {}: {}", document.getId(), e.getMessage());
}
@@ -227,24 +225,21 @@ public class UserSignedAndDelegationServiceImpl {
return path.substring(path.lastIndexOf('/') + 1);
}
private void updateDocumentPathAndDeleteOldEntry(ApplicationSignedDocumentEntity document, String newPath) {
private void updateDocumentPathAndNameEntry(ApplicationSignedDocumentEntity document, String newPath) {
ApplicationSignedDocumentEntity newDocument = document;
String fileName = extractFileNameFromPath(newPath);
newDocument.setFilePath(newPath);
newDocument.setFileName(fileName);
applicationSignedDocumentRepository.save(newDocument);
document.setFilePath(newPath);
document.setFileName(fileName);
applicationSignedDocumentRepository.save(document);
log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath);
}
private void updateDelegatedDocumentPathAndDeleteOldEntry(UserCompanyDelegationEntity document, String newPath) {
private void updateDelegatedDocumentPathAndNameEntry(UserCompanyDelegationEntity document, String newPath) {
String fileName = extractFileNameFromPath(newPath);
UserCompanyDelegationEntity newDocument = document;
newDocument.setFilePath(newPath);
newDocument.setFileName(fileName);
userCompanyDelegationRepository.save(newDocument);
document.setFilePath(newPath);
document.setFileName(fileName);
userCompanyDelegationRepository.save(document);
log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath);
}
}

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

@@ -1443,7 +1443,7 @@
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-10-25 03:00:00"/>
<column name="updated_date" value="2024-10-25 03:00:00"/>
<column name="parent_folder" value="gepafin/staging"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<insert tableName="s3_path_configuration">
@@ -1452,7 +1452,7 @@
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-10-25 03:00:00"/>
<column name="updated_date" value="2024-10-25 03:00:00"/>
<column name="parent_folder" value="gepafin/staging"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<insert tableName="s3_path_configuration">
@@ -1461,7 +1461,7 @@
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-10-25 03:00:00"/>
<column name="updated_date" value="2024-10-25 03:00:00"/>
<column name="parent_folder" value="gepafin/staging"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<insert tableName="s3_path_configuration">
@@ -1470,7 +1470,7 @@
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-10-25 03:00:00"/>
<column name="updated_date" value="2024-10-25 03:00:00"/>
<column name="parent_folder" value="gepafin/staging"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<insert tableName="s3_path_configuration">
@@ -1479,7 +1479,7 @@
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-10-25 03:00:00"/>
<column name="updated_date" value="2024-10-25 03:00:00"/>
<column name="parent_folder" value="gepafin/staging"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
</changeSet>