Done ticket GEPAFINBE-167
This commit is contained in:
@@ -153,7 +153,7 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
|
||||
}
|
||||
}
|
||||
|
||||
private String decodeS3Key(String key) {
|
||||
public String decodeS3Key(String key) {
|
||||
return URLDecoder.decode(key, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
@@ -186,11 +186,11 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
|
||||
}
|
||||
}
|
||||
|
||||
private String cleanNewPath(String oldPath, String newPath) {
|
||||
public String cleanNewPath(String oldPath, String newPath) {
|
||||
return newPath + "/" + oldPath.substring(oldPath.lastIndexOf("/") + 1);
|
||||
}
|
||||
|
||||
private String cleanOldPath(String oldPath) {
|
||||
public String cleanOldPath(String oldPath) {
|
||||
return oldPath.replace(s3Url, "");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package net.gepafin.tendermanagement.service.impl;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import net.gepafin.tendermanagement.dao.CategoryDao;
|
||||
import net.gepafin.tendermanagement.model.request.CategoryRequest;
|
||||
import net.gepafin.tendermanagement.model.response.CategoryResponse;
|
||||
import net.gepafin.tendermanagement.service.CategoryService;
|
||||
import net.gepafin.tendermanagement.util.Validator;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
public class CategoryServiceImpl implements CategoryService {
|
||||
|
||||
@Autowired
|
||||
CategoryDao categoryDao;
|
||||
|
||||
@Autowired
|
||||
private Validator validator;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public CategoryResponse createDocumentCategory(HttpServletRequest request, CategoryRequest categoryRequest) {
|
||||
validator.validateUser(request);
|
||||
return categoryDao.createDocumentCategory(request,categoryRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public CategoryResponse getDocumentCategoryById(HttpServletRequest request, Long id) {
|
||||
validator.validateUser(request);
|
||||
return categoryDao.getDocumentCategoryById(request,id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void deleteCategory(HttpServletRequest request, Long id) {
|
||||
validator.validateUser(request);
|
||||
categoryDao.deleteCategory(request,id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public CategoryResponse updateCategory(HttpServletRequest request, Long id, CategoryRequest categoryRequest) {
|
||||
validator.validateUser(request);
|
||||
return categoryDao.updateCategory(request,id,categoryRequest);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package net.gepafin.tendermanagement.service.impl;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import net.gepafin.tendermanagement.dao.CompanyDocumentDao;
|
||||
import net.gepafin.tendermanagement.entities.UserEntity;
|
||||
import net.gepafin.tendermanagement.enums.CompanyDocumentTypeEnum;
|
||||
import net.gepafin.tendermanagement.enums.DocumentTypeEnum;
|
||||
import net.gepafin.tendermanagement.model.request.CompanyDocumentRequest;
|
||||
import net.gepafin.tendermanagement.model.response.CompanyDocumentResponseBean;
|
||||
import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
|
||||
import net.gepafin.tendermanagement.service.CompanyDocumentService;
|
||||
import net.gepafin.tendermanagement.util.Validator;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class CompanyDocumentServiceImpl implements CompanyDocumentService {
|
||||
|
||||
@Autowired
|
||||
private Validator validator;
|
||||
|
||||
@Autowired
|
||||
private CompanyDocumentDao companyDocumentDao;
|
||||
|
||||
@Override
|
||||
public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long categoryId , CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate) {
|
||||
Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
|
||||
Long userId = validator.getUserId(userInfo);
|
||||
return companyDocumentDao.uploadFileForCompany(request,userId,files,companyId,categoryId,documentSourceTypeEnum,expirationDate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyDocumentResponseBean updateCompanyDocument(HttpServletRequest request, Long companyDocumentId, CompanyDocumentRequest companyDocumentRequest) {
|
||||
validator.validateUser(request);
|
||||
return companyDocumentDao.updateCompanyDocument(request,companyDocumentId, companyDocumentRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompanyDocumentResponseBean getCompanyDocument(HttpServletRequest request, Long companyDocumentId) {
|
||||
UserEntity user = validator.validateUser(request);
|
||||
return companyDocumentDao.getCompanyDocument(user , companyDocumentId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteCompanyFile(HttpServletRequest request,Long companyDocumentId) {
|
||||
validator.validateUser(request);
|
||||
companyDocumentDao.deleteCompanyFile(companyDocumentId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DocumentResponseBean validateAndDuplicateCompanyDocument(HttpServletRequest request, Long companyDocumentId, Long applicationId, DocumentTypeEnum typeEnum) {
|
||||
UserEntity user = validator.validateUser(request);
|
||||
return companyDocumentDao.validateAndDuplicateCompanyDocument(request, user.getId(), companyDocumentId,applicationId,typeEnum);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CompanyDocumentResponseBean> getAllCompanyDocument(HttpServletRequest request, Long companyId, CompanyDocumentTypeEnum typeEnum) {
|
||||
UserEntity user = validator.validateUser(request);
|
||||
return companyDocumentDao.getAllCompanyDocument(user,companyId,typeEnum);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user