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

Merge pull request #375 from Kitzanos/company-document-prod

Browse Source 
Cherry-pick (Enabled permission for accessing company documents)
This commit is contained in:
Antonio Manca
2025-11-20 10:50:19 +01:00
committed by GitHub
parent 97a992083b 551c4b04df
commit 6f3d3ac4b2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,7 +314,9 @@ public class CompanyDocumentDao {
public List<CompanyDocumentResponseBean> getAllCompanyDocument(UserEntity user , Long companyId, CompanyDocumentTypeEnum typeEnum){ public List<CompanyDocumentResponseBean> getAllCompanyDocument(UserEntity user , Long companyId, CompanyDocumentTypeEnum typeEnum){
log.info("Fetching all company documents for Company ID '{}', User ID '{}', Type '{}'", companyId, user.getId(), typeEnum); log.info("Fetching all company documents for Company ID '{}', User ID '{}', Type '{}'", companyId, user.getId(), typeEnum);
validator.validateUserWithCompany(request, companyId); if(Boolean.TRUE.equals(validator.checkIsBeneficiary())) {
validator.validateUserWithCompany(request, companyId);
}
companyService.validateCompany(companyId); companyService.validateCompany(companyId);
Specification<CompanyDocumentEntity> spec = filterCompanyDocuments(companyId, user.getId(), typeEnum); Specification<CompanyDocumentEntity> spec = filterCompanyDocuments(companyId, user.getId(), typeEnum);

2
src/main/java/net/gepafin/tendermanagement/util/Validator.java
View File

@@ -92,6 +92,8 @@ public class Validator {
return companyEntity; return companyEntity;
} else if (checkIsInstructorManager()) { } else if (checkIsInstructorManager()) {
return companyEntity; return companyEntity;
}else if (checkIsPreInstructor()) {
return companyEntity;
} }
Map<String, Object> userInfo = tokenProvider.getUserInfoAndUserIdFromToken(request); Map<String, Object> userInfo = tokenProvider.getUserInfoAndUserIdFromToken(request);
companyService.validateUserWithCompny(getUserId(userInfo), companyId); companyService.validateUserWithCompny(getUserId(userInfo), companyId);