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

Done ticket GEPADINBE-6144

Browse Source
This commit is contained in:
rajesh
2025-10-28 17:17:10 +05:30
parent a0a31ca0cc
commit 42ca415f43
10 changed files with 123 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/gepafin/tendermanagement/service/AmazonS3Service.java
View File

@@ -1,4 +1,5 @@
package net.gepafin.tendermanagement.service;
import com.amazonaws.services.s3.AmazonS3;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

2
src/main/java/net/gepafin/tendermanagement/service/AppointmentService.java
View File

@@ -12,7 +12,7 @@ public interface AppointmentService {
AppointmentCreationResponse createAppointmentForApplication(HttpServletRequest request, Long applicationId, CreateAppointmentRequest createAppointmentRequest);
DocumentUploadResponse uploadDocToExternalSystem(HttpServletRequest request, Long documentId, UploadDocToExternalSystemRequest docToExternalSystemRequest);
DocumentUploadResponse uploadDocToExternalSystem(HttpServletRequest request, Long documentId,Boolean isSignedDocument,UploadDocToExternalSystemRequest docToExternalSystemRequest);
NdgResponse getNdgByVatNumber(HttpServletRequest request,String vatNumber);

14
src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
View File

@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -138,10 +139,15 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
@Override
public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file) {
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
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 originalFileName = org.springframework.util.StringUtils.cleanPath(file.getOriginalFilename());
String firstNameContain = originalFileName.substring(0, originalFileName.lastIndexOf('.'));
firstNameContain = Utils.replaceSpacesWithUnderscores(firstNameContain);
if(extension.equals("p7m")){
firstNameContain =Utils.randomKey(7)+"_"+firstNameContain;
}else {
firstNameContain += "_" + Utils.randomKey(7);
}
String fileName = (firstNameContain + "." + extension);
try {
String filepath = upload(fileName, s3Folder, file);

4
src/main/java/net/gepafin/tendermanagement/service/impl/AppointmentServiceImpl.java
View File

@@ -35,9 +35,9 @@ public class AppointmentServiceImpl implements AppointmentService {
}
@Override
public DocumentUploadResponse uploadDocToExternalSystem(HttpServletRequest request, Long documentId, UploadDocToExternalSystemRequest docToExternalSystemRequest) {
public DocumentUploadResponse uploadDocToExternalSystem(HttpServletRequest request, Long documentId,Boolean isSignedDocument, UploadDocToExternalSystemRequest docToExternalSystemRequest) {
return appointmentDao.uploadDocumentToExternalSystem(documentId, docToExternalSystemRequest);
return appointmentDao.uploadDocumentToExternalSystem(documentId,isSignedDocument, docToExternalSystemRequest);
}
@Override

3
src/main/java/net/gepafin/tendermanagement/service/impl/CompanyDocumentServiceImpl.java
View File

@@ -33,7 +33,8 @@ public class CompanyDocumentServiceImpl implements CompanyDocumentService {
Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
Long userId = validator.getUserId(userInfo);
files.forEach(Utils::validateFileType);
return companyDocumentDao.uploadFileForCompany(request,userId,files,companyId,documentCategoryId,documentSourceTypeEnum,expirationDate,name);
validator.validateUserWithCompany(request,companyId);
return companyDocumentDao.uploadFileForCompany(userId,files,companyId,documentCategoryId,documentSourceTypeEnum,expirationDate,name);
}
@Override