Resolved conflicts

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

@@ -29,6 +29,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -87,9 +90,11 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
         if(Boolean.FALSE.equals(isTestProfileActivated())) {
             amazonS3.putObject(bucketName, path, inputStream, objectMetadata);
         }
-        path =s3Url + s3Folder +"/"+ fileName;
-        log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, path);
-        return path;
+        //getting actual encoded s3 file path
+        URL amazonS3Url = amazonS3.getUrl(bucketName, path);
+        String fileUrl = amazonS3Url.toString();
+        log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, fileUrl);
+        return fileUrl;
     }
 
     @Override
@@ -115,12 +120,15 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
     public InputStream getFile(String s3Folder, String filePath) {
         try {
         	String fileName = Utils.extractFileName(filePath);
-            String path = s3Folder + "/" + fileName;
+        	 // Decode the file name to handle special characters like '+' correctly
+            String decodedFileName = URLDecoder.decode(fileName, StandardCharsets.UTF_8.toString());
+
+            String path = s3Folder + "/" + decodedFileName;
             GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, path);
             S3Object s3Object = amazonS3.getObject(getObjectRequest);
             log.info("File fetched successfully from Amazon S3: {}", fileName);
             return s3Object.getObjectContent();
-        } catch (AmazonS3Exception e) {
+        } catch (Exception e) {
         	log.error("Error occurred while getting file from Amazon S3: {}", e);
             throw new CustomValidationException(Status.VALIDATION_ERROR,
                     Translator.toLocale(GepafinConstant.GET_ERROR_S3));

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

@@ -91,13 +91,6 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ApplicationAmendmentRequestResponse updateApplicationAmendment(HttpServletRequest request, Long id, ApplicationAmendmentRequestBean applicationAmendmentRequestBean) {
-        ApplicationAmendmentRequestEntity amendment = applicationAmendmentRequestDao.validateApplicationAmendmentRequest(id);
-
-        if (Boolean.FALSE.equals(validator.checkIsBeneficiary())) {
-            validator.validatePreInstructor(request, amendment.getApplicationEvaluationEntity().getUserId());
-        } else {
-            validator.validateUserId(request, amendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().getApplication().getUserId());
-        }
             return applicationAmendmentRequestDao.updateApplicationAmendment(id,applicationAmendmentRequestBean);
     }
 

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

@@ -1,29 +1,24 @@
 package net.gepafin.tendermanagement.service.impl;
 
 import jakarta.servlet.http.HttpServletRequest;
-import net.gepafin.tendermanagement.config.Translator;
-import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.dao.ApplicationEvaluationDao;
 
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
-import net.gepafin.tendermanagement.enums.ApplicationStatusForEvaluation;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
 
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
 import net.gepafin.tendermanagement.util.Validator;
-import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
-import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
-import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
+import java.util.List;
 
 @Service
 public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationService {
@@ -36,6 +31,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     private AssignedApplicationsService assignedApplicationsService;
     @Autowired
     private AssignedApplicationsRepository assignedApplicationsRepository;
+    @Autowired
+    private ApplicationEvaluationService applicationEvaluationService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ApplicationEvaluationResponse createOrUpdateApplicationEvaluation(
@@ -54,31 +52,12 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     @Transactional(readOnly = true)
     public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(
             HttpServletRequest request, Long applicationId, Long assignedApplicationId) {
-
-        if (applicationId == null && assignedApplicationId == null) {
-            throw new CustomValidationException(
-                    Status.BAD_REQUEST,
-                    Translator.toLocale(GepafinConstant.EITHER_APPLICATION_OR_ASSIGNED_APPLICATION_ID_REQUIRED_MSG)
-            );
-        }
         UserEntity preInstructor = validator.validateUser(request);
-        Optional<AssignedApplicationsEntity> assignedApplicationsOptional =
-                assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId);
-
-        if (assignedApplicationId != null) {
-            assignedApplicationsOptional = assignedApplicationsOptional.filter(a -> a.getId().equals(assignedApplicationId));
-        }
-        AssignedApplicationsEntity assignedApplications = assignedApplicationsOptional
-                .orElseThrow(() -> new CustomValidationException(
-                        Status.BAD_REQUEST,
-                        Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG)
-                ));
-        validator.validatePreInstructor(request, assignedApplications.getUserId());
-
         return applicationEvaluationDao.getApplicationEvaluationByApplicationId(
+                request,
                 preInstructor,
-                assignedApplications.getApplication().getId(),
-                assignedApplications.getId()
+                applicationId,
+                assignedApplicationId
         );
     }
 
@@ -93,4 +72,10 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     public ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId) {
         return applicationEvaluationDao.validateApplicationEvaluation(applicationEvaluationId);
     }
+    
+    @Override
+    public ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId) {
+    	return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId);
+    }
+
 }

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

@@ -0,0 +1,37 @@
+package net.gepafin.tendermanagement.service.impl;
+
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.dao.AppointmentDao;
+import net.gepafin.tendermanagement.model.request.CreateAppointmentRequest;
+import net.gepafin.tendermanagement.model.request.UploadDocToExternalSystemRequest;
+import net.gepafin.tendermanagement.model.response.AppointmentCreationResponse;
+import net.gepafin.tendermanagement.model.response.DocumentUploadResponse;
+import net.gepafin.tendermanagement.model.response.NdgResponse;
+import net.gepafin.tendermanagement.service.AppointmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppointmentServiceImpl implements AppointmentService {
+
+    @Autowired
+    private AppointmentDao appointmentDao;
+
+    @Override
+    public NdgResponse checkNdgForAppointment(HttpServletRequest request, Long applicationId) {
+
+        return appointmentDao.checkNdgForAppointment(applicationId);
+    }
+
+    @Override
+    public AppointmentCreationResponse createAppointmentForApplication(HttpServletRequest request, Long applicationId, CreateAppointmentRequest createAppointmentRequest) {
+
+        return appointmentDao.createAppointment(applicationId, createAppointmentRequest);
+    }
+
+    @Override
+    public DocumentUploadResponse uploadDocToExternalSystem(HttpServletRequest request, Long documentId, UploadDocToExternalSystemRequest docToExternalSystemRequest) {
+
+        return appointmentDao.uploadDocumentToExternalSystem(documentId, docToExternalSystemRequest);
+    }
+}

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

@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.dao.AssignedApplicationsDao;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
+import net.gepafin.tendermanagement.model.request.UpdateAssignedApplicationRequest;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
 import net.gepafin.tendermanagement.util.Validator;
@@ -45,7 +46,7 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest updatedAssignedApplicationRequest) {
+    public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, UpdateAssignedApplicationRequest updatedAssignedApplicationRequest) {
         return assignedApplicationsDao.updateAssignedApplication(request, id, updatedAssignedApplicationRequest);
     }
 

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

@@ -111,9 +111,8 @@ public class CompanyServiceImpl implements CompanyService {
 	
 	@Override
 	@Transactional
-	public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId) {
-		UserEntity userEntity =validator.validateUser(request);
-		return delegationDao.getCompanyDelegation(userEntity, companyId);
+	public CompanyDelegationResponse getCompanyDelegation(HttpServletRequest request, Long companyId,Long applicationId) {
+		return delegationDao.getCompanyDelegation(request, companyId,applicationId);
 	}
 	@Override
 	@Transactional(rollbackFor = Exception.class)

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

@@ -1,14 +1,17 @@
 package net.gepafin.tendermanagement.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.DocumentDao;
 import net.gepafin.tendermanagement.entities.DocumentEntity;
+import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
 import net.gepafin.tendermanagement.enums.DocumentTypeEnum;
 import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
 import net.gepafin.tendermanagement.service.DocumentService;
+import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,9 +25,13 @@ public class DocumentServiceImpl implements DocumentService {
     @Autowired
     private DocumentDao documentDao;
 
+    @Autowired
+    private Validator validator;
     @Override
-    public List<DocumentResponseBean> uploadFile(List<MultipartFile> files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) {
-        return documentDao.uploadFiles(files,sourceId,sourceType,fileType);
+    public List<DocumentResponseBean> uploadFile(HttpServletRequest request,List<MultipartFile> files, Long sourceId, DocumentSourceTypeEnum sourceType, DocumentTypeEnum fileType) {
+        Map<String, Object> userInfo = validator.getUserInfoFromToken(request);
+        Long userId = validator.getUserId(userInfo);
+        return documentDao.uploadFiles(userId,files,sourceId,sourceType,fileType);
     }
     @Override
     public void deleteFile(Long documentId) {

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

@@ -0,0 +1,62 @@
+package net.gepafin.tendermanagement.service.impl;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import net.gepafin.tendermanagement.dao.NotificationDao;
+import net.gepafin.tendermanagement.enums.NotificationEnum;
+import net.gepafin.tendermanagement.model.request.NotificationReq;
+import net.gepafin.tendermanagement.model.response.NotificationResponse;
+import net.gepafin.tendermanagement.service.NotificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static org.hibernate.internal.util.collections.CollectionHelper.listOf;
+
+@Service
+@Slf4j
+public class NotificationServiceImpl implements NotificationService {
+
+    @Autowired
+    private NotificationDao notificationDao;
+
+    @Override
+    public NotificationResponse sendNotification(Long userId, NotificationReq notificationReq, Long companyId) {
+
+        log.info("Sending notification to user {} with content: {}", userId, notificationReq.getMessage());
+        notificationReq.setUserId(userId);
+        notificationReq.setCompanyIds(listOf(companyId));
+        return notificationDao.sendNotification(notificationReq);
+    }
+
+    @Override
+    public NotificationResponse getNotificationById(HttpServletRequest servletRequest, Long id) {
+
+        return notificationDao.getNotificationById(id);
+    }
+
+    @Override
+    public List<NotificationResponse> getNotificationByUserId(HttpServletRequest servletRequest, Long userId, Long companyId, List<NotificationEnum> statuses) {
+
+        return notificationDao.getNotificationByUserId(userId, companyId, statuses);
+    }
+
+    @Override
+    public NotificationResponse updateNotificationStatus(HttpServletRequest request, Long id, NotificationEnum status) {
+
+        return notificationDao.updateNotificationStatus(id, status);
+    }
+
+    @Override
+    public void deleteNotification(HttpServletRequest request, Long id) {
+
+        notificationDao.deleteNotification(id);
+        return;
+    }
+
+    @Override
+    public List<NotificationResponse> getNotificationsByCompanyIdAndUserId(Long userId, Long companyId, List<NotificationEnum> statuses) {
+        return notificationDao.getNotificationByCompanyIdAndUserId(userId, companyId, statuses);
+    }
+}

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

@@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.dao.S3PathConfig;
 import net.gepafin.tendermanagement.entities.ApplicationEntity;
 import net.gepafin.tendermanagement.entities.DocumentEntity;
 import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
-import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
-import net.gepafin.tendermanagement.repositories.ApplicationRepository;
-import net.gepafin.tendermanagement.repositories.ApplicationSignedDocumentRepository;
-import net.gepafin.tendermanagement.repositories.DocumentRepository;
+import net.gepafin.tendermanagement.repositories.*;
 import net.gepafin.tendermanagement.service.AmazonS3Service;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +70,9 @@ public class S3ReUploadMigrationService {
     @Autowired
     private ApplicationAmendmentRequestRepository applicationAmendmentRequestRepository;
 
+    @Autowired
+    private ApplicationEvaluationRepository applicationEvaluationRepository;
+
     @Autowired
     private DocumentDao documentDao;
 
@@ -107,7 +107,7 @@ public class S3ReUploadMigrationService {
             Long callId = null;
             Long applicationId = null;
             Long amendmentId = null;
-
+            Long evaluationId = null;
             if (DocumentSourceTypeEnum.CALL.getValue().equalsIgnoreCase(document.getSource())) {
                 callId = document.getSourceId();
             } else if (DocumentSourceTypeEnum.APPLICATION.getValue().equalsIgnoreCase(document.getSource())) {
@@ -120,8 +120,14 @@ public class S3ReUploadMigrationService {
                 ApplicationEntity applicationEntity = applicationAmendmentRequestRepository.findApplicationByAmendmentId(amendmentId);
                 applicationId = applicationEntity.getId();
                 callId = applicationEntity.getCall().getId();
+            } else if(DocumentSourceTypeEnum.EVALUATION.getValue().equalsIgnoreCase(document.getSource())){
+                evaluationId = document.getSourceId();
+                ApplicationEntity applicationEntity = applicationEvaluationRepository.findApplicationByEvaluationId(evaluationId);
+                applicationId = applicationEntity.getId();
+                callId = applicationEntity.getCall().getId();
             }
 
+
                 documentDao.deleteFileFromS3(document,callId,applicationId,amendmentId);
                 processDocuments++;
 

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

@@ -126,8 +126,8 @@ public class UserServiceImpl implements UserService {
     }
     @Override
     @Transactional(readOnly = true)
-    public List<UserResponseBean> getAllUsers(HttpServletRequest request, Long roleId) {
+    public List<UserResponseBean> getAllUsers(HttpServletRequest request, List<Long> roleIds) {
     	UserEntity user=validator.validateUser(request);
-        return userDao.getAllUsers(user, roleId);
+        return userDao.getAllUsers(user, roleIds);
     }
 }