From 43cbadfce992623fa6d13f34ded593cc4bc8855f Mon Sep 17 00:00:00 2001 From: rbonazzo-kz Date: Mon, 14 Oct 2024 07:14:05 +0200 Subject: [PATCH 1/8] change TimeZone --- .../java/net/gepafin/tendermanagement/util/DateTimeUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java index 92da73eb..1fdf6c1a 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java +++ b/src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java @@ -24,7 +24,7 @@ public class DateTimeUtil { public static LocalDateTime DateServerToUTC(LocalDateTime systemDate) { ZonedDateTime ldtZoned = systemDate.atZone(ZoneId.systemDefault()); - LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("UTC")).toLocalDateTime(); + LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalDateTime(); return localDatetime; } From 37e6f6cc33408b07f24aae57770587bab9530903 Mon Sep 17 00:00:00 2001 From: rajesh Date: Sat, 19 Oct 2024 12:43:59 +0530 Subject: [PATCH 2/8] updated file size configation --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0206cb11..99b70232 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,8 @@ spring.application.name=tendermanagement # Multipart Configuration -spring.servlet.multipart.max-file-size=15MB -spring.servlet.multipart.max-request-size=15MB +spring.servlet.multipart.max-file-size=300MB +spring.servlet.multipart.max-request-size=300MB spring.profiles.active=testing From 3eee4dda149ba591b7167e87a60b5ffe22d36078 Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 22 Oct 2024 17:18:49 +0530 Subject: [PATCH 3/8] Fixed prod Document issue --- .../net/gepafin/tendermanagement/dao/CallDao.java | 12 ++++++------ .../repositories/DocumentRepository.java | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 0827b62a..0277b678 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -239,7 +239,7 @@ public class CallDao { } List existingDocuments = documentRepository - .findBySourceIdAndTypeAndIsDeletedFalse(sourceId, documentType.getValue()); + .findBySourceIdAndSourceAndTypeAndIsDeletedFalse(sourceId, DocumentSourceTypeEnum.CALL.getValue(), documentType.getValue()); List incomingIds = documentReqList.stream().map(DocumentReq::getId).filter(id -> id != null && id > 0) .collect(Collectors.toList()); @@ -259,7 +259,7 @@ public class CallDao { private DocumentEntity convertToDocumentEntity(DocumentReq documentReq,Long sourceId) { validateDocumentEntity(documentReq.getId()); - DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndIsDeletedFalse(documentReq.getId(),sourceId) + DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(documentReq.getId(),sourceId, DocumentSourceTypeEnum.CALL.getValue()) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); return documentEntity; @@ -618,10 +618,10 @@ public class CallDao { } private CallResponse getCallResponseBean(CallEntity callEntity) { - List documentEntities = documentRepository.findBySourceIdAndTypeAndIsDeletedFalse(callEntity.getId(), - DocumentTypeEnum.DOCUMENT.getValue()); - List imageEntities = documentRepository.findBySourceIdAndTypeAndIsDeletedFalse(callEntity.getId(), - DocumentTypeEnum.IMAGES.getValue()); + List documentEntities = documentRepository.findBySourceIdAndSourceAndTypeAndIsDeletedFalse(callEntity.getId(),DocumentSourceTypeEnum.CALL.getValue() + , DocumentTypeEnum.DOCUMENT.getValue()); + List imageEntities = documentRepository.findBySourceIdAndSourceAndTypeAndIsDeletedFalse(callEntity.getId(), DocumentSourceTypeEnum.CALL.getValue() + , DocumentTypeEnum.IMAGES.getValue()); List amiedTo = callTargetAudienceChecklistRepository .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.AIMED_TO.getValue()).stream() .map(this::convertToLookUpDataResponseBean).toList(); diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java index 1543def3..a86ef8fd 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java @@ -15,12 +15,15 @@ public interface DocumentRepository extends JpaRepository @Query("SELECT d FROM DocumentEntity d WHERE d.id = :id AND d.isDeleted = false") Optional findById(@Param("id") Long id); - List findBySourceIdAndTypeAndIsDeletedFalse(Long sourceId, String type); +// List findBySourceIdAndTypeAndIsDeletedFalse(Long sourceId, String type); - Optional findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId); +// Optional findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId); List findBySource(String source); + List findBySourceIdAndSourceAndTypeAndIsDeletedFalse(Long sourceId, String source, String type); + Optional findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(Long id, Long sourceId, String source); + } From 4a1bd18478e1365fcf778e7838553387027ac353 Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 22 Oct 2024 17:24:19 +0530 Subject: [PATCH 4/8] updated code --- src/main/java/net/gepafin/tendermanagement/dao/CallDao.java | 2 +- .../tendermanagement/repositories/DocumentRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 0277b678..a1d16fd1 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -259,7 +259,7 @@ public class CallDao { private DocumentEntity convertToDocumentEntity(DocumentReq documentReq,Long sourceId) { validateDocumentEntity(documentReq.getId()); - DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(documentReq.getId(),sourceId, DocumentSourceTypeEnum.CALL.getValue()) + DocumentEntity documentEntity = documentRepository.findByIdAndSourceIdAndSourceAndIsDeletedFalse(documentReq.getId(),sourceId, DocumentSourceTypeEnum.CALL.getValue()) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); return documentEntity; diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java index a86ef8fd..4f621d38 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java @@ -23,7 +23,7 @@ public interface DocumentRepository extends JpaRepository List findBySourceIdAndSourceAndTypeAndIsDeletedFalse(Long sourceId, String source, String type); - Optional findByIdAndSourceIdAndAndSourceAndIsDeletedFalse(Long id, Long sourceId, String source); + Optional findByIdAndSourceIdAndSourceAndIsDeletedFalse(Long id, Long sourceId, String source); } From 4386aaafddde319276386d90366409262dc66e3e Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 23 Oct 2024 00:14:01 +0530 Subject: [PATCH 5/8] resolved conflicts --- .../constants/GepafinConstant.java | 3 + .../gepafin/tendermanagement/dao/CallDao.java | 5 +- .../tendermanagement/dao/DelegationDao.java | 29 ++------- .../tendermanagement/dao/DocumentDao.java | 63 +++++-------------- .../service/AmazonS3Service.java | 9 ++- .../service/impl/AmazonS3ServiceImpl.java | 40 ++++++++---- .../gepafin/tendermanagement/util/Utils.java | 7 +++ src/main/resources/message_en.properties | 2 +- src/main/resources/message_it.properties | 1 + 9 files changed, 67 insertions(+), 92 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index c21cceaf..d59010ea 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -226,5 +226,8 @@ public class GepafinConstant { public static final String DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY="dashboard.widget.fetched.successfully"; + public static final String GET_ERROR_S3 = "get.error.s3"; + + } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index a1d16fd1..e3d4d932 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -127,8 +127,9 @@ public class CallDao { ZipOutputStream zos = new ZipOutputStream(zipOutputStream)) { for (DocumentEntity document : documents) { - try (InputStream fileInputStream = amazonS3Service.getFile(s3Folder, document.getFileName())) { - ZipEntry zipEntry = new ZipEntry(document.getFileName()); + try (InputStream fileInputStream = amazonS3Service.getFile(s3Folder, document.getFilePath())) { + String fileName = Utils.extractFileName(document.getFilePath()); + ZipEntry zipEntry = new ZipEntry(fileName); zos.putNextEntry(zipEntry); IOUtils.copy(fileInputStream, zos); zos.closeEntry(); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index ca58f8be..f609086f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -7,7 +7,6 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +23,7 @@ import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.UserCompanyDelegationStatusEnum; import net.gepafin.tendermanagement.model.request.CompanyDelegationRequest; import net.gepafin.tendermanagement.model.response.CompanyDelegationResponse; +import net.gepafin.tendermanagement.model.response.UploadFileOnAmazonS3Response; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.repositories.DocumentRepository; import net.gepafin.tendermanagement.repositories.UserCompanyDelegationRepository; @@ -96,7 +96,7 @@ public class DelegationDao { companyDao.getUserWithCompany(userEntity.getId(), companyId); updatePlaceholdersForDelegation(user, companyEntity, placeholders, companyDelegationRequest); DocumentEntity documentEntity = documentRepository.findBySource(GepafinConstant.DELEGATION_TEMPLATE).get(0); - return generateDocument(placeholders, documentEntity.getFileName()); + return generateDocument(placeholders, documentEntity.getFilePath()); } private Map updatePlaceholdersForDelegation(UserResponseBean user, CompanyEntity companyEntity, @@ -179,7 +179,7 @@ public class DelegationDao { userCompanyDelegationEntity.setStatus(UserCompanyDelegationStatusEnum.INACTIVE.getValue()); userCompanyDelegationRepository.save(userCompanyDelegationEntity); } - UploadFileOnAmazonS3 uploadFileOnAmazonS3 = uploadFileOnAmazonS3(file); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, file); userCompanyDelegationEntity = new UserCompanyDelegationEntity(); userCompanyDelegationEntity.setCompanyId(companyId); userCompanyDelegationEntity.setUserId(userEntity.getId()); @@ -187,8 +187,8 @@ public class DelegationDao { userCompanyDelegationEntity.setBeneficiaryId(userEntity.getBeneficiary().getId()); } userCompanyDelegationEntity.setStatus(UserCompanyDelegationStatusEnum.ACTIVE.getValue()); - userCompanyDelegationEntity.setFileName(uploadFileOnAmazonS3.fileName()); - userCompanyDelegationEntity.setFilePath(uploadFileOnAmazonS3.filepath()); + userCompanyDelegationEntity.setFileName(uploadFileOnAmazonS3Response.getFileName()); + userCompanyDelegationEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath()); userCompanyDelegationRepository.save(userCompanyDelegationEntity); return convertUserCompanyDelegationToCompanyDelegationResponse(userCompanyDelegationEntity); } @@ -197,25 +197,6 @@ public class DelegationDao { UserCompanyDelegationEntity userCompanyDelegationEntity) { return Utils.convertSourceObjectToDestinationObject(userCompanyDelegationEntity, CompanyDelegationResponse.class); } - - private UploadFileOnAmazonS3 uploadFileOnAmazonS3(MultipartFile file){ - String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - String fileName = org.springframework.util.StringUtils.cleanPath(file.getOriginalFilename()); - String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); - firstNameContain+=Utils.randomKey(5); - fileName = (firstNameContain + "." + extension); - try { - String filepath = amazonS3Service.upload(fileName, s3Folder, file); - return new UploadFileOnAmazonS3(fileName, filepath); - } catch (Exception e) { - throw new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); - } - - } - - private record UploadFileOnAmazonS3(String fileName, String filepath) { - } private void validateFileType(MultipartFile file) { if (file.isEmpty()) { diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index 224a21ec..90725964 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -1,14 +1,11 @@ package net.gepafin.tendermanagement.dao; -import java.io.IOException; import java.util.stream.Collectors; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; -import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import net.gepafin.tendermanagement.config.Translator; @@ -17,10 +14,10 @@ import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.entities.DocumentEntity; import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.response.DocumentResponseBean; +import net.gepafin.tendermanagement.model.response.UploadFileOnAmazonS3Response; import net.gepafin.tendermanagement.repositories.DocumentRepository; import net.gepafin.tendermanagement.service.AmazonS3Service; import net.gepafin.tendermanagement.service.CallService; -import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -49,19 +46,17 @@ public class DocumentDao { List documentEntities = new ArrayList<>(); Long source = resolveSourceId(sourceId, sourceType); for (MultipartFile file : files) { - try { - uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file); - if (result != null) { - DocumentEntity documentEntity = new DocumentEntity(); - documentEntity.setFileName(result.fileName()); - documentEntity.setSource(sourceType.getValue()); - documentEntity.setSourceId(source); - documentEntity.setType(fileType.getValue()); - documentEntity.setFilePath(result.filepath()); - documentEntity.setIsDeleted(false); - documentEntities.add(documentEntity); - } - } catch (IOException e) { + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, + file); + if (uploadFileOnAmazonS3Response != null) { + DocumentEntity documentEntity = new DocumentEntity(); + documentEntity.setFileName(uploadFileOnAmazonS3Response.getFileName()); + documentEntity.setSource(sourceType.getValue()); + documentEntity.setSourceId(source); + documentEntity.setType(fileType.getValue()); + documentEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath()); + documentEntity.setIsDeleted(false); + documentEntities.add(documentEntity); } } documentRepository.saveAll(documentEntities); @@ -80,19 +75,6 @@ public class DocumentDao { return sourceId; } - private uploadFileOnAmazonS3 uploadFileOnAmazonS3(MultipartFile file) throws IOException { - String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - String fileName = StringUtils.cleanPath(file.getOriginalFilename()); - String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); - fileName = (firstNameContain + "." + extension); - String filepath = amazonS3Service.upload(fileName, s3Folder, file); - uploadFileOnAmazonS3 result = new uploadFileOnAmazonS3(fileName, filepath); - return result; - } - - private record uploadFileOnAmazonS3(String fileName, String filepath) { - } - public void deleteFile(Long documentId) { DocumentEntity documentEntity = validateDocument(documentId); // String fileName= Utils.extractFileName(documentEntity.getFilePath()); @@ -101,13 +83,6 @@ public class DocumentDao { documentRepository.save(documentEntity); } - private DocumentEntity deleteFileOnAmazonS3(String fileName) { - try { - amazonS3Service.delete(s3Folder, fileName); - } catch (Exception e) { - } - return null; - } public DocumentEntity validateDocument(Long id) { return documentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, @@ -116,16 +91,10 @@ public class DocumentDao { public DocumentResponseBean updateDocument(Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { DocumentEntity documentEntity = validateDocument(documentId); - String fileName = Utils.extractFileName(documentEntity.getFilePath()); - deleteFileOnAmazonS3(fileName); - uploadFileOnAmazonS3 result = null; - try { - result = uploadFileOnAmazonS3(file); - } catch (IOException e) { - } - if (result != null) { - documentEntity.setFilePath(result.filepath); - documentEntity.setFileName(result.fileName); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, file); + if (uploadFileOnAmazonS3Response != null) { + documentEntity.setFileName(uploadFileOnAmazonS3Response.getFileName()); + documentEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath()); documentEntity.setType(documentTypeEnum.getValue()); documentEntity.setSource(documentEntity.getSource()); documentEntity.setSourceId(documentEntity.getSourceId()); diff --git a/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java b/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java index ea3937a3..6cc27000 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java +++ b/src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java @@ -11,11 +11,10 @@ import java.io.InputStream; @Component public interface AmazonS3Service { - public String upload(String fileName, String s3Folder, MultipartFile file) throws IOException; - - public Boolean delete(String s3Folder, String fileName); - + UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file); + + Boolean delete(String s3Folder, String filePath); + InputStream getFile(String s3Folder, String filePath) throws IOException; - public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file); } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java index a0470c15..56141be2 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java @@ -12,6 +12,8 @@ import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationExceptio import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.env.Environment; @@ -28,6 +30,8 @@ import java.util.Optional; @Service public class AmazonS3ServiceImpl implements AmazonS3Service { + + private final Logger log = LoggerFactory.getLogger(AmazonS3ServiceImpl.class); @Autowired private AmazonS3 amazonS3; @@ -42,11 +46,9 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { private String s3Url; - @Override - public String upload(String fileName, String s3Folder, + private String upload(String fileName, String s3Folder, MultipartFile file) throws IOException { -// String path = bucketName+"/"+s3Folder; String path = s3Folder +"/"+fileName; InputStream inputStream = file.getInputStream(); @@ -66,17 +68,23 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { if(Boolean.FALSE.equals(isTestProfileActivated())) { amazonS3.putObject(bucketName, path, inputStream, objectMetadata); } - return s3Url + s3Folder +"/"+ fileName; + path =s3Url + s3Folder +"/"+ fileName; + log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, path); + return path; } @Override - public Boolean delete(String s3Folder, String fileName) { + public Boolean delete(String s3Folder, String filePath) { + + String fileName = Utils.extractFileName(filePath); String path = s3Folder +"/"+fileName; final DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(bucketName, path); if(Boolean.FALSE.equals(isTestProfileActivated())) { amazonS3.deleteObject(deleteObjectRequest); } + log.info("File '{}' deleted successfully from Amazon S3", fileName); return true; + } public Boolean isTestProfileActivated() { @@ -85,28 +93,34 @@ public class AmazonS3ServiceImpl implements AmazonS3Service { } @Override - public InputStream getFile(String s3Folder, String filePath) throws IOException { + public InputStream getFile(String s3Folder, String filePath) { try { - String path = s3Folder +"/"+filePath; + String fileName = Utils.extractFileName(filePath); + String path = s3Folder + "/" + fileName; GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, path); S3Object s3Object = amazonS3.getObject(getObjectRequest); + log.info("File fetched successfully from Amazon S3: {}", fileName); return s3Object.getObjectContent(); } catch (AmazonS3Exception e) { - throw new IOException("Error getting file from Amazon S3", e); + log.error("Error occurred while getting file from Amazon S3: {}", e); + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.GET_ERROR_S3)); } } @Override public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file) { String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - String fileName = org.springframework.util.StringUtils.cleanPath(file.getOriginalFilename()); - String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); - firstNameContain+=Utils.randomKey(5); - fileName = (firstNameContain + "." + extension); + String originalFileName = org.springframework.util.StringUtils.cleanPath(file.getOriginalFilename()); + String firstNameContain = originalFileName.substring(0, originalFileName.lastIndexOf('.')); + firstNameContain = Utils.replaceSpacesWithUnderscores(firstNameContain); + firstNameContain += "_" + Utils.randomKey(7); + String fileName = (firstNameContain + "." + extension); try { String filepath = upload(fileName, s3Folder, file); - return UploadFileOnAmazonS3Response.builder().fileName(fileName).filePath(filepath).build(); + return UploadFileOnAmazonS3Response.builder().fileName(originalFileName).filePath(filepath).build(); } catch (Exception e) { + log.error("Error occurred while uploading file from Amazon S3: {}", e); throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index d7da174b..bde1e006 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -303,4 +303,11 @@ public class Utils { return text.replace(target, replacement != null ? replacement : ""); } + public static String replaceSpacesWithUnderscores(String content) { + if (content == null) { + return null; + } + return content.trim().replace(" ", "_"); + } + } diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 31a22928..f5d04b80 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -248,5 +248,5 @@ application.signed.document.not.found=Signed document for the application not fo delete.signed.document.file.success=Signed document deleted successfully. dashboard.widget.fetched.successfully=Dasboard widget fetched sucessfully. - +get.error.s3=Failed to fetch the file from S3. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 74b6e2b7..3ef4b992 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -244,4 +244,5 @@ application.signed.document.not.found=Documento firmato per l'applicazione non t delete.signed.document.file.success=Documento firmato eliminato con successo. dashboard.widget.fetched.successfully=Widget dashboard recuperato correttamente. +get.error.s3=Impossibile recuperare il file da S3. From 9b496d7b960d729ad740b156001e7e6fba0a9af7 Mon Sep 17 00:00:00 2001 From: harish Date: Wed, 23 Oct 2024 19:42:58 +0530 Subject: [PATCH 6/8] Added confidi in get all call response --- src/main/java/net/gepafin/tendermanagement/dao/CallDao.java | 2 ++ .../model/response/CallDetailsResponseBean.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index e3d4d932..5a8a604a 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -597,6 +597,7 @@ public class CallDao { dates.add(callEntity.getStartDate()); dates.add(callEntity.getEndDate()); callDetailsResponseBean.setDates(dates); + callDetailsResponseBean.setConfidi(callEntity.getConfidi()); callDetailsResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); callDetailsResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); callDetailsResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); @@ -615,6 +616,7 @@ public class CallDao { callDetailsResponseBean.setPhoneNumber(callEntity.getPhoneNumber()); callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate()); callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); + return callDetailsResponseBean; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java index 51479254..6338949e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java @@ -20,6 +20,8 @@ public class CallDetailsResponseBean { private List dates; + private Boolean confidi; + private CallStatusEnum status; private Long regionId; From f238790f26e35659bfd6343693d03448936cbf11 Mon Sep 17 00:00:00 2001 From: harish Date: Wed, 23 Oct 2024 21:11:17 +0530 Subject: [PATCH 7/8] resolved conflicts --- src/main/java/net/gepafin/tendermanagement/dao/CallDao.java | 1 + .../gepafin/tendermanagement/dao/EvaluationCriteriaDao.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 5a8a604a..e7b303d2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -223,6 +223,7 @@ public class CallDao { criteriaEntity = new EvaluationCriteriaEntity(); criteriaEntity.setCall(callEntity); criteriaEntity.setLookupData(lookupDataEntity); + criteriaEntity.setScore(0L); criteriaEntity.setIsDeleted(false); } setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java index f747d38f..1be3cf7d 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java @@ -43,7 +43,10 @@ public class EvaluationCriteriaDao { .validateLookUpData(evaluationCriteriaRequest.getLookUpDataId()); entity.setCall(callEntity); entity.setLookupData(looDataEntity); - entity.setScore(evaluationCriteriaRequest.getScore()); + entity.setScore(0L); + if (evaluationCriteriaRequest.getScore() != null) { + entity.setScore(evaluationCriteriaRequest.getScore()); + } entity = evaluationCriteriaRepository.save(entity); return entity; } From 5818eff39650a61536da56041f10cb307606a1fb Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 24 Oct 2024 13:00:10 -0700 Subject: [PATCH 8/8] updated code to check call document --- .../java/net/gepafin/tendermanagement/web/rest/api/CallApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java index 3e2861ff..a15ede62 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java @@ -74,7 +74,7 @@ public interface CallApi { public ResponseEntity> updateCallStep1(HttpServletRequest request, @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId, @Parameter(description = "Call request object", required = true) @Valid @RequestBody UpdateCallRequestStep1 updateCallRequest); - @Operation(summary = "Api to get call by id", + @Operation(summary = "Api to get call by id updated today to check the bug", responses = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {