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

updated code

Browse Source
This commit is contained in:
rajesh
2024-08-28 12:46:41 +05:30
parent a9adc41f76
commit 1b9359971a
2 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java
View File

@@ -43,7 +43,9 @@ public class DocumentDao {
public List<DocumentResponseBean> uploadFiles(List<MultipartFile> files, Long callId, DocumentTypeEnum fileType) { public List<DocumentResponseBean> uploadFiles(List<MultipartFile> files, Long callId, DocumentTypeEnum fileType) {
List<DocumentEntity> documentEntities = new ArrayList<>(); List<DocumentEntity> documentEntities = new ArrayList<>();
CallEntity callEntity=callRepository.findById(callId).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); CallEntity callEntity = callRepository.findById(callId)
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
for (MultipartFile file : files) { for (MultipartFile file : files) {
try { try {
uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file); uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file);
@@ -56,12 +58,11 @@ public class DocumentDao {
documentEntity.setIsDeleted(false); documentEntity.setIsDeleted(false);
documentEntities.add(documentEntity); documentEntities.add(documentEntity);
} }
} catch (IOException e) {} } catch (IOException e) {
}
} }
documentRepository.saveAll(documentEntities); documentRepository.saveAll(documentEntities);
return documentEntities.stream() return documentEntities.stream().map(callDao::convertToDocumentResponseBean).collect(Collectors.toList());
.map(callDao::convertToDocumentResponseBean)
.collect(Collectors.toList());
} }
private uploadFileOnAmazonS3 uploadFileOnAmazonS3(MultipartFile file) throws IOException { private uploadFileOnAmazonS3 uploadFileOnAmazonS3(MultipartFile file) throws IOException {
@@ -79,22 +80,25 @@ public class DocumentDao {
public void deleteFile(Long documentId) { public void deleteFile(Long documentId) {
DocumentEntity documentEntity = getDocumentEntity(documentId); DocumentEntity documentEntity = getDocumentEntity(documentId);
String fileName= Utils.extractFileName(documentEntity.getFilePath()); // String fileName= Utils.extractFileName(documentEntity.getFilePath());
deleteFileOnAmazonS3(fileName); // deleteFileOnAmazonS3(fileName);
documentRepository.delete(documentEntity); documentEntity.setIsDeleted(true);
documentRepository.save(documentEntity);
} }
private DocumentEntity deleteFileOnAmazonS3(String fileName) { private DocumentEntity deleteFileOnAmazonS3(String fileName) {
try { try {
amazonS3Service.delete(fileName); amazonS3Service.delete(fileName);
}catch (Exception e){} } catch (Exception e) {
}
return null; return null;
} }
private DocumentEntity getDocumentEntity(Long documentId) { private DocumentEntity getDocumentEntity(Long documentId) {
Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId); Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId);
if (documentEntity.isEmpty()) { if (documentEntity.isEmpty()) {
throw new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)); throw new ResourceNotFoundException(Status.VALIDATION_ERROR,
Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND));
} }
return documentEntity.orElse(null); return documentEntity.orElse(null);
} }
@@ -106,7 +110,8 @@ public class DocumentDao {
uploadFileOnAmazonS3 result = null; uploadFileOnAmazonS3 result = null;
try { try {
result = uploadFileOnAmazonS3(file); result = uploadFileOnAmazonS3(file);
} catch (IOException e) {} } catch (IOException e) {
}
if (result != null) { if (result != null) {
documentEntity.setFilePath(result.filepath); documentEntity.setFilePath(result.filepath);
documentEntity.setFileName(result.fileName); documentEntity.setFileName(result.fileName);
@@ -115,10 +120,12 @@ public class DocumentDao {
} }
return callDao.convertToDocumentResponseBean(documentEntity); return callDao.convertToDocumentResponseBean(documentEntity);
} }
public DocumentResponseBean getDocument(Long documentId) { public DocumentResponseBean getDocument(Long documentId) {
Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId); Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId);
if (documentEntity.isEmpty()) { if (documentEntity.isEmpty()) {
new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)); new ResourceNotFoundException(Status.VALIDATION_ERROR,
Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND));
} }
return callDao.convertToDocumentResponseBean(documentEntity.orElse(null)); return callDao.convertToDocumentResponseBean(documentEntity.orElse(null));
} }

10
src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java
View File

@@ -19,7 +19,7 @@ import java.util.List;
public interface LookUpDataApi { public interface LookUpDataApi {
@Operation(summary = "API to create LookUp Data", @Operation(summary = "Api to create LookUp Data",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -31,7 +31,7 @@ public interface LookUpDataApi {
@PostMapping(value = "", consumes = "application/json", produces = "application/json") @PostMapping(value = "", consumes = "application/json", produces = "application/json")
ResponseEntity<Response<LookUpDataResponseBean>> createLookUpData(HttpServletRequest request, @Valid @RequestBody LookUpDataRequest lookUpDataReq); ResponseEntity<Response<LookUpDataResponseBean>> createLookUpData(HttpServletRequest request, @Valid @RequestBody LookUpDataRequest lookUpDataReq);
@Operation(summary = "API to get LookUp Data by id", @Operation(summary = "Api to get LookUp Data by id",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -43,7 +43,7 @@ public interface LookUpDataApi {
@GetMapping(value = "/{id}", produces = "application/json") @GetMapping(value = "/{id}", produces = "application/json")
ResponseEntity<Response<LookUpDataResponseBean>> getLookUpDataById(HttpServletRequest request, @PathVariable Long id); ResponseEntity<Response<LookUpDataResponseBean>> getLookUpDataById(HttpServletRequest request, @PathVariable Long id);
@Operation(summary = "API to update LookUp Data", @Operation(summary = "Api to update LookUp Data",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -55,7 +55,7 @@ public interface LookUpDataApi {
@PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json") @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json")
ResponseEntity<Response<LookUpDataResponseBean>> updateLookUpData(HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq); ResponseEntity<Response<LookUpDataResponseBean>> updateLookUpData(HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq);
@Operation(summary = "API to delete LookUp Data", @Operation(summary = "Api to delete LookUp Data",
responses = { responses = {
@ApiResponse(responseCode = "204", description = "No Content"), @ApiResponse(responseCode = "204", description = "No Content"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -67,7 +67,7 @@ public interface LookUpDataApi {
@DeleteMapping(value = "/{id}") @DeleteMapping(value = "/{id}")
ResponseEntity<Response<Void>> deleteLookUpData(HttpServletRequest request, @PathVariable Long id); ResponseEntity<Response<Void>> deleteLookUpData(HttpServletRequest request, @PathVariable Long id);
@Operation(summary = "API to get LookUp Data by type", @Operation(summary = "Api to get LookUp Data by type",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {