Added name field in company document

src/main/java/net/gepafin/tendermanagement/dao/CompanyDocumentDao.java

@@ -86,7 +86,7 @@ public class CompanyDocumentDao {
     @Autowired
     private Validator validator;
 
-    public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, Long userId, List<MultipartFile> files, Long companyId, Long documentCategoryId, CompanyDocumentTypeEnum companyDocumentSourceTypeEnum, LocalDateTime expirationDate){
+    public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, Long userId, List<MultipartFile> files, Long companyId, Long documentCategoryId, CompanyDocumentTypeEnum companyDocumentSourceTypeEnum, LocalDateTime expirationDate,String name){
         DocumentCategoryEntity categoryEntity = categoryDao.validateCategory(documentCategoryId);
         validator.validateUserWithCompany(request,companyId);
         UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userId,companyId);
@@ -106,6 +106,7 @@ public class CompanyDocumentDao {
                 companyDocumentEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath());
                 companyDocumentEntity.setIsDeleted(false);
                 companyDocumentEntity.setUploadedBy(userId);
+                companyDocumentEntity.setName(name);
                 if (expirationDate.isBefore(currentDate.plusDays(7))) {
                     companyDocumentEntity.setStatus(CompanyDocumentStatusEnum.DUE.getValue());
                 } else {
@@ -159,7 +160,7 @@ public class CompanyDocumentDao {
         DocumentCategoryEntity categoryEntity = entity.getCategoryEntity();
         DocumentCategoryResponse responseCategory = categoryDao.convertToResponseBean(categoryEntity);
         responseBean.setId(entity.getId());
-        responseBean.setName(entity.getFileName());
+        responseBean.setFileName(entity.getFileName());
         responseBean.setType(CompanyDocumentTypeEnum.valueOf(entity.getType()));
         responseBean.setFilePath(entity.getFilePath());
         responseBean.setCompanyId(entity.getCompanyId());
@@ -167,9 +168,11 @@ public class CompanyDocumentDao {
         responseBean.setStatus(entity.getStatus());
         responseBean.setUploadedBy(entity.getUploadedBy());
         responseBean.setCategory(responseCategory);
+        responseBean.setName(entity.getName());
         responseBean.setUserWithCompanyId(entity.getUserWithCompany().getId());
         responseBean.setCreatedDate(entity.getCreatedDate());
         responseBean.setUpdatedDate(entity.getUpdatedDate());
+
         return responseBean;
     }
 

src/main/java/net/gepafin/tendermanagement/entities/CompanyDocumentEntity.java

@@ -16,6 +16,9 @@ public class CompanyDocumentEntity extends BaseEntity {
     @Column(name = "FILE_PATH")
     private String filePath;
 
+    @Column(name ="name")
+    private String name;
+
     @Column(name="TYPE")
     private String type;
 

src/main/java/net/gepafin/tendermanagement/model/response/CompanyDocumentResponseBean.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 @Data
 public class CompanyDocumentResponseBean extends BaseBean {
 
-    private String name;
+    private String fileName;
 
     private String filePath;
 
@@ -16,6 +16,8 @@ public class CompanyDocumentResponseBean extends BaseBean {
 
     private Long companyId;
 
+    private String name;
+
     private String status;
 
     private LocalDateTime expirationDate;

src/main/java/net/gepafin/tendermanagement/service/CompanyDocumentService.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 public interface CompanyDocumentService {
-    List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long documentCategoryId, CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate);
+    List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long documentCategoryId, CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate,String name);
 
     CompanyDocumentResponseBean updateCompanyDocument(HttpServletRequest httpServletRequest, Long companyDocumentId, CompanyDocumentRequest companyDocumentRequest);
 

src/main/java/net/gepafin/tendermanagement/service/impl/CompanyDocumentServiceImpl.java

@@ -28,10 +28,10 @@ public class CompanyDocumentServiceImpl implements CompanyDocumentService {
     private CompanyDocumentDao companyDocumentDao;
 
     @Override
-    public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long documentCategoryId , CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate) {
+    public List<CompanyDocumentResponseBean> uploadFileForCompany(HttpServletRequest request, List<MultipartFile> files, Long companyId, Long documentCategoryId , CompanyDocumentTypeEnum documentSourceTypeEnum, LocalDateTime expirationDate,String name) {
         Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
         Long userId = validator.getUserId(userInfo);
-        return companyDocumentDao.uploadFileForCompany(request,userId,files,companyId,documentCategoryId,documentSourceTypeEnum,expirationDate);
+        return companyDocumentDao.uploadFileForCompany(request,userId,files,companyId,documentCategoryId,documentSourceTypeEnum,expirationDate,name);
     }
 
     @Override

src/main/java/net/gepafin/tendermanagement/web/rest/api/CompanyDocumentApi.java

@@ -41,6 +41,7 @@ public interface CompanyDocumentApi {
     default ResponseEntity<Response<List<CompanyDocumentResponseBean>>> uploadFileForCompany(HttpServletRequest httpServletRequest,
                                                                                              @Parameter(description = "Company Id", required = true) @PathVariable("companyId") Long companyId,
                                                                                              @Parameter(description = "The Document Category id", required = true) @RequestParam(value = "documentCategoryId", required = false) Long documentCategoryId,
+                                                                                             @Parameter(description = "The Document Name", required = true) @RequestParam(value = "name", required = false) String name,
                                                                                              @RequestParam("documentType") CompanyDocumentTypeEnum documentTypeEnum,
                                                                                              @RequestParam("expirationDate")  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime expirationDate,
                                                                                              @RequestParam("file") List<MultipartFile> files) {

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CompanyDocumentApiControlller.java

@@ -41,7 +41,7 @@ public class CompanyDocumentApiControlller implements CompanyDocumentApi {
     private CompanyDocumentDao companyDocumentDao;
 
     @Override
-    public ResponseEntity<Response<List<CompanyDocumentResponseBean>>> uploadFileForCompany(HttpServletRequest request, Long companyId, Long documentCategoryId, CompanyDocumentTypeEnum companyDocumentSourceTypeEnum, LocalDateTime expirationDate,
+    public ResponseEntity<Response<List<CompanyDocumentResponseBean>>> uploadFileForCompany(HttpServletRequest request, Long companyId, Long documentCategoryId, String name ,CompanyDocumentTypeEnum companyDocumentSourceTypeEnum, LocalDateTime expirationDate,
                                                                                             List<MultipartFile> files) {
         try {
             UserActionContextEnum userActionContext = companyDocumentDao.getUserActionContextEnum(companyDocumentSourceTypeEnum);
@@ -49,7 +49,7 @@ public class CompanyDocumentApiControlller implements CompanyDocumentApi {
             /** This code is responsible for creating user action logs for the "upload document for company" operation. **/
             loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPLOAD).actionContext(userActionContext).build());
 
-            List<CompanyDocumentResponseBean> responseBeans = companyDocumentService.uploadFileForCompany(request,files, companyId, documentCategoryId ,companyDocumentSourceTypeEnum,expirationDate);
+            List<CompanyDocumentResponseBean> responseBeans = companyDocumentService.uploadFileForCompany(request,files, companyId, documentCategoryId ,companyDocumentSourceTypeEnum,expirationDate,name);
             return ResponseEntity.status(HttpStatus.CREATED)
                     .body(new Response<List<CompanyDocumentResponseBean>>(responseBeans, Status.SUCCESS, Translator.toLocale(GepafinConstant.FILES_UPLOADED_MSG)));
         } catch (CustomValidationException ex) {

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2536,5 +2536,14 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/updated_hub_data_for_email_service_config_25-02-2025.sql"/>
     </changeSet>
+
+
+    <changeSet id="27-02-2025_RK_270225" author="Rajesh Khore">
+        <addColumn tableName="company_document">
+            <column name="name" type="VARCHAR(255)">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+    </changeSet>
     
 </databaseChangeLog>