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

Updated companyId as optional in next-prev API

Browse Source
This commit is contained in:
nisha
2025-02-18 15:19:20 +05:30
parent 651d2008a3
commit f1b311236c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
View File

@@ -76,9 +76,19 @@ public class ApplicationServiceImpl implements ApplicationService {
@Override @Override
public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long companyId, Long formId, public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long companyId, Long formId,
FormActionEnum action) { FormActionEnum action) {
validator.validateUserWithCompany(request, companyId); if (companyId !=null) {
validateApplication(applicationId); validator.validateUserWithCompany(request, companyId);
ApplicationEntity applicationEntity = validateApplicationWithCompany(applicationId, companyId); }
ApplicationEntity applicationEntity =null;
if(validator.checkIsBeneficiary()){
if(companyId==null){
throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.COMPANY_ID_MANDATORY));
}
applicationEntity = validateApplicationWithCompany(applicationId, companyId);
}else {
applicationEntity=validateApplication(applicationId);
}
return flowFormDao.getNextOrPreviousForm(applicationEntity, companyId, formId, action); return flowFormDao.getNextOrPreviousForm(applicationEntity, companyId, formId, action);
} }

2
src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
View File

@@ -114,7 +114,7 @@ public interface ApplicationApi {
@GetMapping(value = "/{applicationId}/form/next-previous", produces = "application/json") @GetMapping(value = "/{applicationId}/form/next-previous", produces = "application/json")
ResponseEntity<Response<NextOrPreviousFormResponse>> getNextOrPreviousForm(HttpServletRequest request, ResponseEntity<Response<NextOrPreviousFormResponse>> getNextOrPreviousForm(HttpServletRequest request,
@Parameter(description = "The applicaltion id", required = true) @PathVariable("applicationId") Long applicationId, @Parameter(description = "The applicaltion id", required = true) @PathVariable("applicationId") Long applicationId,
@Parameter(description = "The company id", required = true) @RequestParam("companyId") Long companyId, @Parameter(description = "The company id", required = false) @RequestParam(value = "companyId",required = false) Long companyId,
@Parameter(description = "The form id", required = false) @RequestParam(value = "formId", required = false) Long formId, @Parameter(description = "The form id", required = false) @RequestParam(value = "formId", required = false) Long formId,
@RequestParam(value = "action", required = false) FormActionEnum action); @RequestParam(value = "action", required = false) FormActionEnum action);