diff --git a/pom.xml b/pom.xml
index f3424e44..93a592ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,8 @@
com.amazonaws
- aws-java-sdk-s3
- 1.12.312
+ aws-java-sdk
+ 1.12.563
diff --git a/src/main/java/net/gepafin/tendermanagement/constants/AppointmentApiConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/AppointmentApiConstant.java
new file mode 100644
index 00000000..15a3444e
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/constants/AppointmentApiConstant.java
@@ -0,0 +1,27 @@
+package net.gepafin.tendermanagement.constants;
+
+public class AppointmentApiConstant {
+
+ public static final String ODESSA_LOGIN = "/WSGatewayLogin.apiLogin";
+ public static final String GET_NDG_BY_VAT_NUMBER = "/WSAnagrafica.getListaNdg";
+ public static final String CREATE_VISURA = "/WSAnagrafica.createVisura";
+ public static final String GET_VISURA_LIST = "/WSAnagrafica.getVisuraList";
+ public static final String GET_APPOINTMENT_TEMPLATE = "/WSCrmConsulenza.getAppuntamentoTemplate?idAppuntamentoTemplate=7";
+ public static final String CREATE_APPOINTMENT_FROM_TEMPLATE = "/WSCrmConsulenza.createAppointmentFromTemplate";
+ public static final String UPLOAD_APOOINTMENT_DOCUMENT = "/WSDocumentDetail.createStream";
+
+ //get ndg number
+ public static final int TARGET_PAGE_SIZE = 1;
+ public static final int RECORD_PER_PAGE_SIZE = 10;
+
+//create visura request Body constant
+ public static final boolean CREA_ANAGRAFICA = Boolean.TRUE;
+ public static final boolean SALVA_DOCUMENTI = Boolean.TRUE;
+ public static final String VISURA_PROVIDER = "cerved";
+ public static final String VISURA_TYPE = "StandardReport";
+ public static final String VISURA_MODE = "visure";
+ public static final String COD_AGENTE = "UtenzaAPIPortal";
+ public static final boolean IS_FROM_RATING = Boolean.FALSE;
+ public static final boolean IS_ANAGRAFICA_LEGAME = Boolean.FALSE;
+
+}
diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index d60b0da7..42a9cd41 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -306,5 +306,41 @@ public class GepafinConstant {
public static final String LOGIN_ATTEMPT_ID = "loginAttemptId";
public static final String USER_ACTION_ID = "userActionId";
public static final String ATLEAST_ONE_ID_REQUIRED="atleast.one.id.required";
+
+ //Appointment
+ public static final String NDG_IN_PROGRESS = "IN_PROGRESS";
+ public static final String NDG_AVAILABLE = "ndg.available";
+ public static final String NDG_GENERATION_IS_IN_PROGRESS = "ndg.generation.in.progress";
+ public static final String NDG_GENERATED = "NDG_GENERATED";
+ public static final String NDG_FAILED = "FAILED";
+ public static final String NDG_NOT_FOUND_FOR_APPLICATION = "ndg.not.found.for.this.application.or.invalid";
+ public static final String APPOINTMENT_ALREADY_CREATED = "appointment.already.created";
+ public static final String EXTERNAL_DOCUMENT_UPLOAD_FAILURE_MSG = "document.not.uploaded.to.external.system.please.try.again";
+ public static final String PROVIDE_VALID_APPLICATION_DOC_ID = "provide.valid.application.document.id";
+ public static final String DOCUMENT_UPLOADED_SUCCESSFULLY_TO_EXTERNAL_SYSTEM = "document.uploaded.successfully.to.external.system";
+ public static final String ERROR_UPLOADING_DOCUMENT = "error.in.uploading.document.check.input";
+ public static final String DOCUMENT_ALREADY_UPLOADED = "document.already.uploaded";
+ public static final String NDG_NOT_MATCHED_OR_NOT_FOUND = "ndg.not.found.or.not.matched";
+ public static final String NO_NDG_FOR_ANOTHER_HUB = "ndg.generation.is.only.for.gepafin";
+ public static final String NO_APPOINTMENT_FOR_ANOTHER_HUB = "appointment.creation.is.only.for.gepafin";
+ public static final String NO_DOCUMENT_UPLOAD_FOR_ANOTHER_HUB = "upload.document.is.only.for.gepafin";
+ public static final String APPOINTMENT_CREATED = "appointment.created.successfully";
+ public static final String DATA_STRING = "data";
+ public static final String DOCUMENT_ATTACHMENT_ID_STRING = "documentAttachmentId";
+ public static final String TEMP_FILE_PATH = "/tmp/";
+ public static final String RICHIESTA_CLIENTE_STRING = "richiestaCliente";
+ public static final String ID_STRING = "id";
+ public static final String NULL_STRING = "null";
+ public static final String NDG_STRING = "ndg";
+ public static final String ID_VISURA_STRING = "idVisura";
+ public static final String NDG_FETCH_SUCCESSFULLY = "ndg.fetch.successfully";
+ public static final String AUTH_JWT_SECRET_KEY = "hTa5qe$af/4',BFs";
+ public static final String JWT_ALGO_HEADER = "{\"alg\":\"HS256\",\"typ\":\"JWT\"}";
+ public static final String HMAC_ALGO = "HmacSHA256";
+ public static final String ERROR_IN_GENERATING_NDG_TRY_AGAIN = "error.try.again";
+ public static final String POLLING_THREAD_NAME = "Ndg-Polling-Thread-";
+ public static final String DOCUMENT_UPLOADING_IN_PROGRESS = "document.uploading.is.in.progress";
+ public static final String ASYNC_DOCUMENT_UPLOAD_NAME = "AsyncDocumentUpload-";
+ public static final String All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED="all.document.checked.and.one.checklist.checked";
}
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index c9c19708..9345b0da 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -105,12 +105,36 @@ public class ApplicationAmendmentRequestDao {
@Autowired
private AssignedApplicationsDao assignedApplicationsDao;
+ @Autowired
+ private ApplicationEvaluationDao applicationEvaluationDao;
+
+ @Autowired
+ private DocumentRepository documentRepository;
+
public ApplicationAmendmentRequestResponse getApplicationDataForAmendment(Long applicationEvaluationId) {
log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId);
ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId);
Long applicationId = applicationEvaluationEntity.getApplicationId();
- ApplicationEntity application = applicationService.validateApplication(applicationId);
+ List evaluationFileRequests=new ArrayList<>();
+ List checklistRequests=new ArrayList<>();
+ ApplicationEntity application = applicationService.validateApplication(applicationId);
+ String file=applicationEvaluationEntity.getFile();
+ String checkList=applicationEvaluationEntity.getChecklist();
+ if(file != null){
+ evaluationFileRequests=Utils.convertJsonStringToList(file,FieldRequest.class);
+ }
+ Boolean allValid = evaluationFileRequests.stream()
+ .anyMatch(fieldRequest -> fieldRequest.getValid() == null);
+ if(checkList != null) {
+ checklistRequests=Utils.convertJsonStringToList(checkList,ChecklistRequest.class);
+ }
+ boolean resultCheckList = checklistRequests.stream()
+ .anyMatch(checklistRequest -> Boolean.TRUE.equals(checklistRequest.getValid())) ? false : true;
+
+ if(Boolean.TRUE.equals(allValid) || Boolean.TRUE.equals(resultCheckList)){
+ throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.All_DOCUMENT_CHECKED_AND_ONE_CHECKLIST_CHECKED));
+ }
// Set common application-level details
String callName = application.getCall().getName();
Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null)
@@ -135,11 +159,18 @@ public class ApplicationAmendmentRequestDao {
List forms = applicationFormRepository.findByApplicationId(applicationId);
List allFormFields = new ArrayList<>();
-
+ Map fieldRequestMap = evaluationFileRequests.stream()
+ .collect(Collectors.toMap(FieldRequest::getId, fieldRequest -> fieldRequest));
for (ApplicationFormEntity form : forms) {
String content = form.getForm().getContent();
List> result = filterByName(content, "fileupload");
- allFormFields.addAll(getIdAndLabelFromResult(result));
+ List amendmentFormFieldResponses= getIdAndLabelFromResult(result);
+ amendmentFormFieldResponses.removeIf(amendmentFormFieldResponse -> {
+ FieldRequest matchingRequest = fieldRequestMap.get(amendmentFormFieldResponse.getFieldId());
+ // Remove if no matching FieldRequest exists or if valid is true
+ return matchingRequest == null || Boolean.TRUE.equals(matchingRequest.getValid());
+ });
+ allFormFields.addAll(amendmentFormFieldResponses);
}
response.setFormFields(allFormFields);
@@ -237,6 +268,7 @@ public class ApplicationAmendmentRequestDao {
AmendmentFormField formField = new AmendmentFormField();
formField.setFieldId(amendmentFormFieldRequest.getFieldId());
formField.setFieldValue(null);
+ formField.setLabel(amendmentFormFieldRequest.getLabel());
return formField;
})
.collect(Collectors.toList());
@@ -261,7 +293,7 @@ public class ApplicationAmendmentRequestDao {
Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub());
ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(
applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication(), protocolNumber,
- userEntity.getHub().getId());
+ userEntity.getHub().getId(),false);
applicationAmendmentRequestEntity.setProtocol(protocolEntity);
ApplicationAmendmentRequestEntity applicationAmendment = saveApplicationAmendmentRequestEntity(applicationAmendmentRequestEntity, null, VersionActionTypeEnum.INSERT);
String evaluationStatusType = applicationEvaluationEntity.getStatus();
@@ -301,6 +333,25 @@ public class ApplicationAmendmentRequestDao {
return applicationAmendment;
}
+ private void setAmendmentDocuments(String amendmentNotes, String amendmentFieldRequest,
+ ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity) {
+ AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean();
+ if (amendmentFieldRequest != null && !amendmentFieldRequest.trim().isEmpty()) {
+ String[] documentIds = amendmentFieldRequest.split(",");
+ String validDocumentIds = Arrays.stream(documentIds)
+ .map(String::trim)
+ .filter(id -> !id.isEmpty())
+ .collect(Collectors.joining(","));
+
+ amendmentDetails.setAmendmentDocuments(validDocumentIds);
+ }
+ if (amendmentNotes != null && !amendmentNotes.trim().isEmpty()) {
+ amendmentDetails.setAmendmentNotes(amendmentNotes.trim());
+ }
+ amendmentDetails.setValid(null);
+ String amendmentDetailsJson = Utils.convertObjectToString(amendmentDetails);
+ applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson);
+ }
public ApplicationAmendmentRequestEntity saveApplicationAmendmentRequestEntity(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity,ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity,VersionActionTypeEnum actionTypeEnum) {
ApplicationAmendmentRequestEntity applicationAmendmentRequest = applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity);
@@ -316,16 +367,70 @@ public class ApplicationAmendmentRequestDao {
List forms = applicationFormRepository.findByApplicationId(applicationAmendmentRequestEntity.getApplicationId());
Map fieldIdToLabelMap = extractFieldIdToLabelMap(forms);
-
+// List amendmentFieldRequests= new ArrayList<>();
List amendmentFormFields = Utils.convertJsonStringToList(
applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class);
Map formFieldEntityMap = getApplicationFormFieldEntityMap(applicationAmendmentRequestEntity, amendmentFormFields);
+ if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) {
+
+// List amendmentDetailsList =
+// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(),
+// AmendmentDetailsResponseBean.class);
+ AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(applicationAmendmentRequestEntity.getAmendmentDocument() ,AmendmentDetailsResponseBean.class);
+ if(amendmentDetails!=null) {
+ List documentResponseBeans = new ArrayList<>();
+ if (amendmentDetails.getAmendmentDocuments() != null) {
+ // Extract the comma-separated document IDs as a string
+ String documentIdsString = amendmentDetails.getAmendmentDocuments();
+
+ if (documentIdsString != null && !documentIdsString.trim().isEmpty()) {
+ // Split the comma-separated values and process them
+ List documentIds = Arrays.stream(documentIdsString.split(","))
+ .map(String::trim)
+ .filter(id -> !id.isEmpty())
+ .collect(Collectors.toList());
+
+ documentResponseBeans.addAll(
+ documentIds.stream()
+ .map(id -> {
+ try {
+ return createDocumentResponseBean(id); // Convert to Long
+ } catch (NumberFormatException e) {
+ // Handle invalid document IDs gracefully
+ return null;
+ }
+ })
+ .filter(Objects::nonNull) // Skip null responses
+ .collect(Collectors.toList())
+ );
+ response.setAmendmentNotes(amendmentDetails.getAmendmentNotes());
+ response.setValid(amendmentDetails.getValid());
+ }
+ }
+ response.setAmendmentDocuments(documentResponseBeans);
+ }
+
+
+
+ }
+
processFormFields(amendmentFormFields, fieldIdToLabelMap, formFieldEntityMap, response);
return response;
}
+ public DocumentResponseBean createDocumentResponseBean(String documentId) {
+
+ if (!StringUtils.isEmpty(documentId)) {
+ Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(documentId));
+ if(documentEntity.isPresent()){
+ return applicationEvaluationDao.createDocumentResponseBean(documentEntity.get());
+ }}
+ return null;
+ }
+
+
private ApplicationAmendmentRequestResponse initializeBasicResponse(ApplicationAmendmentRequestEntity entity) {
ApplicationAmendmentRequestResponse response = new ApplicationAmendmentRequestResponse();
response.setId(entity.getId());
@@ -397,6 +502,7 @@ public class ApplicationAmendmentRequestDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
return responseBean;
})
.toList();
@@ -510,14 +616,16 @@ public class ApplicationAmendmentRequestDao {
if(updateRequest.getApplicationFormFields() != null) {
updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{
AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId());
- ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId());
- updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField);
+// ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId());
+// updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField);
updateFormField(applicationFormFieldRequest, amendmentFormField);
});
existingApplicationAmendment.setFormFields(Utils.convertListToJsonString(amendmentFormFieldMap.values().stream().toList()));
}
existingApplicationAmendment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-
+ if(updateRequest.getAmendmentDocuments()!=null && Boolean.FALSE.equals(updateRequest.getAmendmentDocuments().isEmpty())) {
+ setAmendmentDocuments(updateRequest.getAmendmentNotes(),updateRequest.getAmendmentDocuments(), existingApplicationAmendment);
+ }
ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment,oldApplicationAmendmentEntity,VersionActionTypeEnum.UPDATE);
ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment);
log.info("Application Amendment updated successfully: {}", response);
@@ -584,13 +692,13 @@ public class ApplicationAmendmentRequestDao {
String fieldId) {
AmendmentFormField amendmentFormField = amendmentFormFieldMap.get(fieldId);
if (amendmentFormField == null) {
- throw new CustomValidationException(Status.BAD_REQUEST, GepafinConstant.APPLICATION_FORM_FIELD_NOT_FOUND);
+ throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_FORM_FIELD_NOT_FOUND));
}
return amendmentFormField;
}
- private void updateFormField(ApplicationFormFieldRequestBean applicationFormFieldRequest,
+ private void updateFormField(AmendmentFormFieldRequest applicationFormFieldRequest,
AmendmentFormField amendmentFormField) {
List requestedDocumentIds = extractIds(applicationFormFieldRequest.getFieldValue());
List existingDocumentIds = extractIds(amendmentFormField.getFieldValue());
@@ -599,7 +707,8 @@ public class ApplicationAmendmentRequestDao {
if (!existingDocumentIds.isEmpty()) {
existingDocumentIds.forEach(this::softDeleteDocument);
amendmentFormField.setFieldValue(null);
- setIsUploadedBy(amendmentFormField);
+ amendmentFormField.setValid(applicationFormFieldRequest.getValid());
+// setIsUploadedBy(amendmentFormField);
}
return;
}
@@ -613,11 +722,12 @@ public class ApplicationAmendmentRequestDao {
if (!newFieldValue.equals(amendmentFormField.getFieldValue())) {
amendmentFormField.setFieldValue(newFieldValue);
- setIsUploadedBy(amendmentFormField);
+ amendmentFormField.setValid(applicationFormFieldRequest.getValid());
+// setIsUploadedBy(amendmentFormField);
}
}
- private List extractIds(Object fieldValue) {
+ public List extractIds(Object fieldValue) {
if (fieldValue instanceof String && !StringUtils.isEmpty((String) fieldValue)) {
return Arrays.stream(((String) fieldValue).split(","))
.map(Long::valueOf)
@@ -628,14 +738,14 @@ public class ApplicationAmendmentRequestDao {
- private void setIsUploadedBy(AmendmentFormField amendmentFormField) {
- if(validator.checkIsBeneficiary()) {
- amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.BENEFICIARY.getValue());
- }else {
- amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.PRE_INSTRUCTOR.getValue());
- }
-
- }
+// private void setIsUploadedBy(AmendmentFormField amendmentFormField) {
+// if(validator.checkIsBeneficiary()) {
+// amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.BENEFICIARY.getValue());
+// }else {
+// amendmentFormField.setIsUploadedBy(AmendmentFormField.AmendmentIsUploadedByEnum.PRE_INSTRUCTOR.getValue());
+// }
+//
+// }
// private void updateApplicationFormFields(ApplicationAmendmentRequestEntity applicationAmendment, ApplicationFormFieldRequestBean updatedFormField) {
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 0feafec8..3b1a11b3 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -836,7 +836,7 @@ public class ApplicationDao {
if (status.equals(ApplicationStatusTypeEnum.SUBMIT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) {
callService.validatePublishedCall(applicationEntity.getCall().getId(), userEntity.getHub().getId());
Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub());
- ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId());
+ ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId(),true);
applicationEntity.setProtocol(protocolEntity);
applicationEntity.setStatus(ApplicationStatusTypeEnum.SUBMIT.getValue());
applicationEntity.setSubmissionDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -853,6 +853,9 @@ public class ApplicationDao {
if (status.equals(ApplicationStatusTypeEnum.DRAFT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.AWAITING.getValue()))) {
applicationEntity.setStatus(status.getValue());
}
+ if(status.equals(ApplicationStatusTypeEnum.ADMISSIBLE) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.APPOINTMENT.getValue()))){
+ applicationEntity.setStatus(status.getValue());
+ }
applicationEntity = applicationRepository.save(applicationEntity);
if (!status.equals(ApplicationStatusTypeEnum.SUBMIT)) {
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 72ba3ad2..7f5e3a56 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.dao;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest;
import net.gepafin.tendermanagement.config.Translator;
@@ -16,18 +15,21 @@ import net.gepafin.tendermanagement.service.*;
import net.gepafin.tendermanagement.util.DateTimeUtil;
import net.gepafin.tendermanagement.util.LoggingUtil;
import net.gepafin.tendermanagement.util.Utils;
+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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
-import static org.apache.commons.lang3.StringUtils.isNumeric;
@Component
public class ApplicationEvaluationDao {
@@ -93,6 +95,15 @@ public class ApplicationEvaluationDao {
@Autowired
private CompanyService companyService;
+ @Autowired
+ private Validator validator;
+
+ @Autowired
+ private DocumentService documentService;
+
+ @Autowired
+ private ApplicationAmendmentRequestDao applicationAmendmentRequestDao;
+
private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) {
ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity();
@@ -112,7 +123,7 @@ public class ApplicationEvaluationDao {
entity.setRemainingDays(30L);
entity.setSuspendedDays(0L);
entity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
- entity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now().plusDays(30)));
+ entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(30)));
entity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue());
return entity;
}
@@ -128,16 +139,103 @@ public class ApplicationEvaluationDao {
List checklistEntities = callTargetAudienceChecklistRepository
.findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue());
List applicationFormEntities = applicationFormRepository.findByApplicationId(entity.getApplicationId());
+ setAmendmentDetails(entity,response);
setCriteriaResponses(entity, response, evaluationCriterias);
setChecklistResponses(entity, response, checklistEntities);
setFieldResponses(entity, response, applicationFormEntities);
-
+ List allDocs = prepareEvaluationDocumentBeanList(entity);
+ setEvaluationDocResponse(response, allDocs);
setApplicationDetails(response, entity);
return response;
}
+ private void setAmendmentDetails(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response) {
+ List amendmentRequests=applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId());
+ List amendmentDocumentResponseBeans=new ArrayList<>();
+ for(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity:amendmentRequests){
+ AmendmentDocumentResponseBean amendmentDocumentResponseBean=new AmendmentDocumentResponseBean();
+ amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId());
+ String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument();
+ String formField=applicationAmendmentRequestEntity.getFormFields();
+ AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class);
+ if (amendmentDetails != null) {
+ if (amendmentDetails.getAmendmentDocuments() != null) {
+ List documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(","))
+ .map(String::trim)
+ .filter(id -> !id.isEmpty())
+ .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId))
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ amendmentDocumentResponseBean.setFileDetail(documentResponseBeans);
+ }
+ amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId());
+ amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes());
+ amendmentDocumentResponseBean.setValid(amendmentDetails.getValid());
+ amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
+ }
+ List amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class);
+ if (amendmentFormFields != null) {
+ for (AmendmentFormField amendmentFormField : amendmentFormFields) {
+ // Skip fields with null or empty fieldValue
+ if (StringUtils.isEmpty(amendmentFormField.getFieldValue())) {
+ continue;
+ }
+
+ AmendmentDocumentResponseBean formFieldResponseBean = new AmendmentDocumentResponseBean();
+ formFieldResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId());
+ formFieldResponseBean.setFieldId(amendmentFormField.getFieldId());
+ formFieldResponseBean.setLabel(amendmentFormField.getLabel());
+ formFieldResponseBean.setValid(amendmentFormField.getValid());
+
+ List fileIds = applicationAmendmentRequestDao.extractIds(amendmentFormField.getFieldValue());
+ List documentResponseBeans = fileIds.stream()
+ .map(fileId -> createDocumentResponseBean(documentService.validateDocument(fileId)))
+ .collect(Collectors.toList());
+
+ formFieldResponseBean.setFileDetail(documentResponseBeans);
+ amendmentDocumentResponseBeans.add(formFieldResponseBean);
+ }
+ }
+ }
+
+ response.setAmendmentDetails(amendmentDocumentResponseBeans);
+ }
+
+ private void setEvaluationDocResponse(ApplicationEvaluationResponse response, List docRequest) {
+ List evaluationDocResponses = new ArrayList<>();
+
+ for (EvaluationDocumentRequest doc : docRequest) {
+ EvaluationDocumentResponse evaluationDocResponse = new EvaluationDocumentResponse();
+ if (doc.getFileValue() != null) {
+ Long fileId = Long.valueOf(doc.getFileValue().toString());
+ documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> {
+ DocumentResponseBean documentResponseBean = new DocumentResponseBean();
+ documentResponseBean.setId(documentEntity.getId());
+ documentResponseBean.setName(documentEntity.getFileName());
+ documentResponseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
+ documentResponseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
+ documentResponseBean.setSourceId(documentEntity.getSourceId());
+ documentResponseBean.setFilePath(documentEntity.getFilePath());
+ documentResponseBean.setCreatedDate(documentEntity.getCreatedDate());
+ documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
+ evaluationDocResponse.setFileValue(List.of(documentResponseBean));
+ evaluationDocResponse.setNameValue(doc.getNameValue());
+ evaluationDocResponse.setValid(doc.getValid());
+ evaluationDocResponse.setFieldId(doc.getFieldId());
+ });
+ }
+ if (evaluationDocResponse.getFileValue() == null) {
+ continue;
+ }
+ evaluationDocResponses.add(evaluationDocResponse);
+ }
+ response.setEvaluationDocument(evaluationDocResponses);
+ }
+
private void populateBasicDetails(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response) {
response.setId(entity.getId());
@@ -286,6 +384,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
documentResponseBeans.add(responseBean);
});
}
@@ -399,6 +498,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
documentResponseBeans.add(responseBean);
allDocumentsDeleted[0] = false;
}
@@ -448,6 +548,8 @@ public class ApplicationEvaluationDao {
String beneficiary = String.join(" ", firstName, lastName).trim();
response.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus()));
response.setBeneficiary(beneficiary);
+ response.setNdg(application.getNdg() != null ? application.getNdg() : null);
+ response.setAppointmentId(application.getAppointmentId() != null ? application.getAppointmentId() : null);
response.setSubmissionDate(application.getSubmissionDate());
response.setMinScore(call.getThreshold() != null ? call.getThreshold() : null);
response.setCallName(application.getCall().getName() != null ? application.getCall().getName() : null);
@@ -481,9 +583,15 @@ public class ApplicationEvaluationDao {
if (existingEntityOptional.isPresent()) {
entity = existingEntityOptional.get();
oldApplicationEvaluation = Utils.getClonedEntityForData(entity);
- entity.setCriteria(Utils.convertObjectToJson(filterNonNullCriteria(processCriteria(entity, req))));
- entity.setChecklist(Utils.convertObjectToJson(filterNonNullChecklist(processChecklist(entity, req))));
- entity.setFile(Utils.convertObjectToJson(filterNonNullFields(processField(entity, req))));
+ if(req.getCriteria()!=null) {
+ entity.setCriteria(Utils.convertObjectToJson(processCriteria(entity, req)));
+ }
+ if(req.getChecklist()!=null) {
+ entity.setChecklist(Utils.convertObjectToJson(processChecklist(entity, req)));
+ }
+ if(req.getFiles()!=null) {
+ entity.setFile(Utils.convertObjectToJson(processField(entity, req)));
+ }
entity.setIsDeleted(false);
setIfUpdated(entity::getNote, entity::setNote, req.getNote());
setIfUpdated(entity::getMotivation, entity::setMotivation, req.getMotivation());
@@ -493,6 +601,18 @@ public class ApplicationEvaluationDao {
actionType = VersionActionTypeEnum.INSERT;
}
ApplicationStatusForEvaluation status = req.getApplicationStatus();
+ // Fetch all amendment request entities associated with the evaluation ID
+ List applicationAmendmentRequestEntities =
+ applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndIsDeletedFalse(entity.getId());
+ if(req.getEvaluationDocument()!=null) {
+ updateApplicationEvaluation(assignedApplicationId, req.getEvaluationDocument());
+ }
+// Fetch amendment details from the request
+ if(req.getAmendmentDetails()!=null) {
+ List amendmentDetailsRequests = req.getAmendmentDetails();
+
+ updateAmendmentDocumentsAndFormFields(applicationAmendmentRequestEntities, amendmentDetailsRequests);
+}
ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity);
@@ -508,22 +628,210 @@ public class ApplicationEvaluationDao {
}
}
+ private void updateAmendmentDocumentsAndFormFields(List applicationAmendmentRequestEntities, List amendmentFormFields) {
+ // Iterate through amendment request entities
- private List filterNonNullChecklist(List checklistRequests) {
+//
+ Map> amendmentFormFieldsMap = amendmentFormFields.stream().collect(Collectors.groupingBy(AmendmentDetailsRequest::getAmendmentId,HashMap::new,Collectors.toCollection(ArrayList::new)));
+// amendmentFormFields.forEach(data->{
+// ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = applicationAmendmentRequestMap.get(data.getAmendmentId());
+// if (data.getFieldId().contains("amend_")){
+// updateAmendmentDocument(applicationAmendmentRequestEntity, data);
+// }
+// });
+ applicationAmendmentRequestEntities.forEach(applicationAmendmentRequestEntity->{
+ updateAmendment(applicationAmendmentRequestEntity, amendmentFormFieldsMap.get(applicationAmendmentRequestEntity.getId()));
+ });
+ applicationAmendmentRequestRepository.saveAll(applicationAmendmentRequestEntities);
- return checklistRequests.stream().filter(request -> request.getValid() != null).collect(Collectors.toList());
+
+// for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) {
+// // Process form fields if present
+// if (applicationAmendmentRequestEntity.getFormFields() != null) {
+// // Parse existing form fields from JSON
+// List existingFormFields =
+// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormFieldRequest.class);
+//
+// // Prepare a new list to hold updated form fields
+// List updatedFormFields = new ArrayList<>();
+//
+// // Map amendment details for quick lookup by amendment ID
+// Map amendmentDetailsMap = amendmentFormFields.stream()
+// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId()))
+// .filter(details -> details.getFieldValue() != null) // Null check for getFormFieldDocuments
+// .collect(Collectors.toMap(
+// AmendmentDetailsRequest::getAmendmentId,
+// AmendmentDetailsRequest::getFieldValue
+// ));
+// // Get corresponding amendment documents for the current entity
+// List amendmentDocuments = (List) amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId());
+// if (amendmentDocuments != null) {
+// // Update existing form fields with new values
+// for (AmendmentFormFieldRequest existingField : existingFormFields) {
+// for (AmendmentFormFieldRequest newField : amendmentDocuments) {
+// if (existingField.getFieldId().equals(newField.getFieldId())) {
+// // Update fields if there are changes
+// Utils.setIfUpdated(existingField::getValid, existingField::setValid, newField.getValid());
+// Utils.setIfUpdated(existingField::getFieldValue, existingField::setFieldValue, newField.getFieldValue());
+//
+// updatedFormFields.add(existingField);
+// break; // Move to the next existing field
+// }
+// }
+// }
+//
+// // Convert updated form fields back to JSON and save to the database
+// applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(updatedFormFields));
+// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity);
+// }
+// }
+//
+// // Process amendment documents if present
+// if (applicationAmendmentRequestEntity.getAmendmentDocument() != null) {
+// String existingDocumentIds = applicationAmendmentRequestEntity.getAmendmentDocument();
+//
+// // Split comma-separated document IDs into a list
+// List existingDocumentIdList = Arrays.stream(existingDocumentIds.split(","))
+// .map(String::trim)
+// .filter(id -> !id.isEmpty())
+// .collect(Collectors.toList());
+//
+// List updatedDocumentIdList = new ArrayList<>();
+// Map amendmentDetailsMap = amendmentFormFields.stream()
+// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId()))
+// .collect(Collectors.toMap(
+// AmendmentDetailsRequest::getAmendmentId,
+// AmendmentDetailsRequest::getFieldValue
+// ));
+//
+// String amendmentDocumentIds = (String) amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId());
+// if (amendmentDocumentIds != null) {
+// // Split and validate new document IDs
+// List newDocumentIdList = Arrays.stream(amendmentDocumentIds.split(","))
+// .map(String::trim)
+// .filter(id -> !id.isEmpty())
+// .collect(Collectors.toList());
+//
+// for (String existingId : existingDocumentIdList) {
+// for (String newId : newDocumentIdList) {
+// if (existingId.equals(newId)) {
+// Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId));
+// if(documentEntity.isPresent()) {
+// updatedDocumentIdList.add(newId);
+// break;
+// }
+// }
+// }
+// }
+//
+// // Add any new IDs not in the existing list
+// for (String newId : newDocumentIdList) {
+// if (!existingDocumentIdList.contains(newId)) {
+// Optional documentEntity = documentRepository.findByIdAndNotDeleted(Long.valueOf(newId));
+// if(documentEntity.isPresent()) {
+// updatedDocumentIdList.add(newId);
+// }
+// }
+// }
+// String updatedDocumentIds = String.join(",", updatedDocumentIdList);
+//
+// // Create the AmendmentDetailsResponseBean for structured data
+// AmendmentDetailsResponseBean amendmentDetails = new AmendmentDetailsResponseBean();
+// amendmentDetails.setAmendmentDocuments(updatedDocumentIds);
+// AmendmentDetailsRequest amendmentDetailsRequest = amendmentFormFields.stream()
+// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId()))
+// .findFirst()
+// .orElse(null);
+//
+// if (amendmentDetailsRequest != null) {
+// amendmentDetails.setValid(amendmentDetailsRequest.getValid());
+// } else {
+// amendmentDetails.setValid(false);
+// }
+// String amendmentDetailsJson = Utils.convertListToJsonString(Collections.singletonList(amendmentDetails));
+// applicationAmendmentRequestEntity.setAmendmentDocument(amendmentDetailsJson);
+// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity);
+// }
+// }
+// }
}
- private List filterNonNullCriteria(List criteriaRequests) {
+ private void updateAmendment(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity, List amendmentDetailsRequestList) {
+ if (CollectionUtils.isEmpty(amendmentDetailsRequestList)) {
+ return;
+ }
+ Map formFieldsMap = null;
+ List formFieldList = Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getFormFields(), AmendmentFormField.class);
+ if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldList))){
+ formFieldsMap = formFieldList.stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity()));
+ }
+ updateAmendmentData(applicationAmendmentRequestEntity, amendmentDetailsRequestList, formFieldsMap);
- return criteriaRequests.stream().filter(request -> request.getScore() != null && request.getValid() != null).collect(Collectors.toList());
}
- private List filterNonNullFields(List fieldRequests) {
-
- return fieldRequests.stream().filter(request -> request.getValid() != null).collect(Collectors.toList());
+ private static void updateAmendmentData(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity, List amendmentDetailsRequestList, Map formFieldsMap) {
+ amendmentDetailsRequestList.forEach(amendmentDetailsRequest -> {
+ if (amendmentDetailsRequest.getFieldId().contains("amend_")) {
+ AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentDetailsResponseBean.class);
+ if(amendmentDetails!=null) {
+ amendmentDetails.setValid(amendmentDetailsRequest.getValid());
+ applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertObjectToString(amendmentDetails));
+ }
+ } else if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldsMap))){
+ AmendmentFormField amendmentFormField = formFieldsMap.get(amendmentDetailsRequest.getFieldId());
+ amendmentFormField.setValid(amendmentDetailsRequest.getValid());
+ }
+ });
+ applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList()));
}
+
+// private void updateAmendmentDocuments(List applicationAmendmentRequestEntities, List amendmentFormFields) {
+// for (ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity : applicationAmendmentRequestEntities) {
+// // Skip if there are no amendment documents
+// if (applicationAmendmentRequestEntity.getAmendmentDocument() == null) {
+// continue;
+// }
+//
+// // Parse existing amendment fields from JSON
+// List existingAmendmentFields =
+// Utils.convertJsonStringToList(applicationAmendmentRequestEntity.getAmendmentDocument(), AmendmentFieldRequest.class);
+//
+// // Prepare a new list to hold updated amendment fields
+// List updatedAmendmentFields = new ArrayList<>();
+//
+// // Map amendment details for quick lookup by amendment ID
+// Map> amendmentDetailsMap = amendmentFormFields.stream()
+// .filter(details -> applicationAmendmentRequestEntity.getId().equals(details.getAmendmentId()))
+// .collect(Collectors.toMap(AmendmentDetailsRequest::getAmendmentId, AmendmentDetailsRequest::getAmendmentDocuments));
+//
+// // Get corresponding amendment documents for the current entity
+// List amendmentDocuments = amendmentDetailsMap.get(applicationAmendmentRequestEntity.getId());
+// if (amendmentDocuments == null) {
+// continue;
+// }
+//
+// // Update existing amendment fields with new values
+// for (AmendmentFieldRequest existingField : existingAmendmentFields) {
+// for (AmendmentFieldRequest newField : amendmentDocuments) {
+// if (existingField.getFieldId().equals(newField.getFieldId())) {
+// // Update fields if there are changes
+// Utils.setIfUpdated(existingField::getIsValid, existingField::setIsValid, newField.getIsValid());
+// Utils.setIfUpdated(existingField::getFileValue, existingField::setFileValue, newField.getFileValue());
+// Utils.setIfUpdated(existingField::getNameValue, existingField::setNameValue, newField.getNameValue());
+//
+// updatedAmendmentFields.add(existingField);
+// break; // Move to the next existing field
+// }
+// }
+// }
+//
+// // Convert updated fields back to JSON and save to the database
+// applicationAmendmentRequestEntity.setAmendmentDocument(Utils.convertListToJsonString(updatedAmendmentFields));
+// applicationAmendmentRequestRepository.save(applicationAmendmentRequestEntity);
+// }
+// }
+
private List processCriteria(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) {
List incomingCriteriaList = Optional.ofNullable(req.getCriteria()).orElse(new ArrayList<>());
@@ -643,11 +951,52 @@ public class ApplicationEvaluationDao {
return entityOptional.get();
}
+ public void validatePreinstructor(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)
+ );
+ }
+ Optional assignedApplicationsOptional =
+ assignedApplicationsRepository.findByApplicationIdOrIdAndIsDeletedFalse(applicationId,assignedApplicationId);
- public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(UserEntity user, Long applicationId, Long 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)
+ ));
+ if (applicationId == null) {
+ applicationId = assignedApplications.getApplication().getId();
+ }
+ validator.validatePreInstructor(request, assignedApplications.getUserId());
+ }
+ public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(HttpServletRequest request, UserEntity user, Long applicationID, Long assignedApplicationID) {
+ Long applicationId;
+ Long assignedApplicationId;
+ validatePreinstructor(request, applicationID, assignedApplicationID);
+ if (applicationID == null && assignedApplicationID != null) {
+ assignedApplicationId = assignedApplicationID;
+ Optional assignedApplicationsOptional =
+ assignedApplicationsRepository.findByIdAndIsDeletedFalse(assignedApplicationId);
+
+ applicationId = assignedApplicationsOptional.map(a -> a.getApplication().getId()).orElse(null);
+ } else {
+ applicationId = applicationID;
+ if (assignedApplicationID == null && applicationID != null) {
+ Optional assignedApplicationsOptional =
+ assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId);
+
+ assignedApplicationId = assignedApplicationsOptional.map(AssignedApplicationsEntity::getId).orElse(null);
+ } else {
+ assignedApplicationId = assignedApplicationID;
+ }
+ }
applicationService.validateApplication(applicationId);
-
Optional entityOptional;
if (applicationId != null && assignedApplicationId != null) {
@@ -659,11 +1008,19 @@ public class ApplicationEvaluationDao {
} else {
entityOptional = applicationEvaluationRepository.findFirstByIsDeletedFalseOrderByCreatedDateDesc();
}
- return entityOptional.map(this::convertToResponse)
+ return entityOptional.map(this::convertToResponse)
.orElseGet(() -> {
return getEvaluationResponseByApplicationid(user, applicationId, assignedApplicationId);
});
}
+ private List prepareEvaluationDocumentBeanList(ApplicationEvaluationEntity entity) {
+ List docRequest = new ArrayList<>();
+
+ if (entity != null && entity.getEvaluationDocument() != null) {
+ docRequest = Utils.convertJsonToList(entity.getEvaluationDocument(), new TypeReference>() {});
+ }
+ return docRequest;
+ }
public ApplicationEvaluationResponse getEvaluationResponseByApplicationid(UserEntity user, Long applicationId, Long assignedApplicationId) {
@@ -761,7 +1118,7 @@ public class ApplicationEvaluationDao {
if (!mappedFieldMap.containsKey(formFieldId)) {
// CriteriaMappedField mappedField = new CriteriaMappedField();
CriteriaMappedField mappedField = populateMappedField(formFieldId, criteriaFormField, applicationForm, applicationId);
- if(mappedField != null) {
+ if(mappedField != null) {
mappedFieldMap.put(formFieldId, mappedField);
}
}
@@ -890,7 +1247,7 @@ public class ApplicationEvaluationDao {
}
- private DocumentResponseBean createDocumentResponseBean(DocumentEntity documentEntity) {
+ public DocumentResponseBean createDocumentResponseBean(DocumentEntity documentEntity) {
DocumentResponseBean responseBean = new DocumentResponseBean();
responseBean.setId(documentEntity.getId());
responseBean.setName(documentEntity.getFileName());
@@ -900,6 +1257,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
return responseBean;
}
@@ -972,6 +1330,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
documentResponseBeans.add(responseBean);
});
}
@@ -1002,6 +1361,8 @@ public class ApplicationEvaluationDao {
String beneficiary = String.join(" ", firstName, lastName).trim();
response.setBeneficiary(beneficiary);
response.setSubmissionDate(application.getSubmissionDate());
+ response.setNdg(application.getNdg() != null ? application.getNdg() : null);
+ response.setAppointmentId(application.getAppointmentId() != null ? application.getAppointmentId() : null);
response.setCallName(application.getCall().getName() != null ? application.getCall().getName() : null);
response.setProtocolNumber((application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) ? application.getProtocol().getProtocolNumber() : null);
if (assignedApplications != null) {
@@ -1220,6 +1581,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
return responseBean;
}
@@ -1346,6 +1708,7 @@ public class ApplicationEvaluationDao {
responseBean.setFilePath(documentEntity.getFilePath());
responseBean.setCreatedDate(documentEntity.getCreatedDate());
responseBean.setUpdatedDate(documentEntity.getUpdatedDate());
+ responseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
documentResponseBeans.add(responseBean);
});
}
@@ -1403,6 +1766,10 @@ public class ApplicationEvaluationDao {
ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(existingEntity);
AssignedApplicationsEntity oldAssignedApplication = Utils.getClonedEntityForData(assignedApplicationsEntity);
+ List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),ApplicationAmendmentRequestEnum.AWAITING.getValue());
+ if(amendmentRequest !=null && Boolean.FALSE.equals(amendmentRequest.isEmpty())){
+ throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_CANNOT_APPROVED_OR_REJECTED));
+ }
String statusType = application.getStatus();
if (application.getStatus().equals(ApplicationStatusTypeEnum.APPROVED.getValue()) || application.getStatus().equals(ApplicationStatusTypeEnum.REJECTED.getValue())) {
existingEntity.setStatus(ApplicationEvaluationStatusTypeEnum.CLOSE.getValue());
@@ -1421,11 +1788,6 @@ public class ApplicationEvaluationDao {
}
- List amendmentRequest = applicationAmendmentRequestRepository.findAllByApplicationEvaluationIdAndStatusAndIsDeletedFalse(existingEntity.getId(),ApplicationAmendmentRequestEnum.AWAITING.getValue());
- if(amendmentRequest !=null && Boolean.FALSE.equals(amendmentRequest.isEmpty())){
- throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_CANNOT_APPROVED_OR_REJECTED));
- }
-
if (Boolean.TRUE.equals(statusType.equals((ApplicationStatusTypeEnum.APPROVED.getValue())))) {
emailNotificationDao.sendAdmissibilityNotificationEmailForApprovedApplication(application);
}
@@ -1443,5 +1805,33 @@ public class ApplicationEvaluationDao {
.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND)));
}
+
+ public ApplicationEvaluationResponse updateApplicationEvaluation(
+ Long assignedApplicationId,
+ List docRequest) {
+ Optional entityOptional=applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplicationId);
+ ApplicationEvaluationEntity applicationEvaluationEntity =null;
+ ApplicationEvaluationEntity oldApplicationEvaluation = Utils.getClonedEntityForData(entityOptional.get());
+ applicationEvaluationEntity = entityOptional.get();
+
+ if (docRequest != null) {
+ List existingDocs = new ArrayList<>();
+
+ for (EvaluationDocumentRequest doc : docRequest) {
+ if (doc.getFileValue() != null) {
+ Long fileId = Long.valueOf(doc.getFileValue());
+ documentService.validateDocument(fileId);
+ existingDocs.add(doc);
+ }
+ }
+ String updatedEvaluationDocJson = Utils.convertObjectToJson(existingDocs);
+ applicationEvaluationEntity.setEvaluationDocument(updatedEvaluationDocJson);
+ }
+ ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(applicationEvaluationEntity);
+
+ /** This code is responsible for adding a version history log for the "Upload Document in Application Evaluation" operation. **/
+ loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluation).newData(savedEntity).build());
+ return convertToResponse(savedEntity);
+ }
}
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
new file mode 100644
index 00000000..f1fb2b8f
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
@@ -0,0 +1,904 @@
+package net.gepafin.tendermanagement.dao;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.GetObjectRequest;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import feign.FeignException;
+import io.jsonwebtoken.Claims;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import net.gepafin.tendermanagement.config.Translator;
+import net.gepafin.tendermanagement.config.jwt.TokenProvider;
+import net.gepafin.tendermanagement.constants.AppointmentApiConstant;
+import net.gepafin.tendermanagement.constants.GepafinConstant;
+import net.gepafin.tendermanagement.entities.ApplicationEntity;
+import net.gepafin.tendermanagement.entities.CompanyEntity;
+import net.gepafin.tendermanagement.entities.DocumentEntity;
+import net.gepafin.tendermanagement.entities.HubEntity;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
+import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
+import net.gepafin.tendermanagement.model.request.AppointmentCreationRequest;
+import net.gepafin.tendermanagement.model.request.AppointmentNdgRequest;
+import net.gepafin.tendermanagement.model.request.AppointmentVisuraListRequest;
+import net.gepafin.tendermanagement.model.request.AppointmentVisuraRequest;
+import net.gepafin.tendermanagement.model.request.CreateAppointmentRequest;
+import net.gepafin.tendermanagement.model.request.UploadDocToExternalSystemRequest;
+import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
+import net.gepafin.tendermanagement.model.response.AppointmentCreationResponse;
+import net.gepafin.tendermanagement.model.response.AppointmentLoginResponse;
+import net.gepafin.tendermanagement.model.response.DocumentUploadResponse;
+import net.gepafin.tendermanagement.model.response.NdgResponse;
+import net.gepafin.tendermanagement.repositories.ApplicationRepository;
+import net.gepafin.tendermanagement.repositories.CompanyRepository;
+import net.gepafin.tendermanagement.repositories.DocumentRepository;
+import net.gepafin.tendermanagement.repositories.HubRepository;
+import net.gepafin.tendermanagement.service.ApplicationService;
+import net.gepafin.tendermanagement.service.CompanyService;
+import net.gepafin.tendermanagement.service.feignClient.AppointmentApiService;
+import net.gepafin.tendermanagement.util.LoggingUtil;
+import net.gepafin.tendermanagement.util.Utils;
+import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
+import net.gepafin.tendermanagement.web.rest.api.errors.Status;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class AppointmentDao {
+
+ @Value("${appointment.portal.user}")
+ private String user;
+
+ @Value("${appointment.portal.password}")
+ private String password;
+
+ @Value("${appointment.portal.source}")
+ private String source;
+
+ @Value("${appointment.portal.context}")
+ private String context;
+
+ @Value("${default.hub.uuid}")
+ private String defaultHubUuid;
+
+ @Value("${aws.s3.url}")
+ private String s3Url;
+
+ @Value("${aws.s3.bucket.name}")
+ private String OLD_BUCKET;
+
+ @Value("${flagDaFirmare}")
+ private Boolean flagDaFirmare;
+
+ @Autowired
+ private HubRepository hubRepository;
+
+ @Autowired
+ private AppointmentApiService appointmentApiService;
+
+ @Autowired
+ private ApplicationService applicationService;
+
+ @Autowired
+ private CompanyService companyService;
+
+ @Autowired
+ private ApplicationRepository applicationRepository;
+
+ @Autowired
+ private CompanyRepository companyRepository;
+
+ @Autowired
+ private DocumentDao documentDao;
+
+ @Autowired
+ private AmazonS3Client s3Client;
+
+ @Autowired
+ private DocumentRepository documentRepository;
+
+ @Autowired
+ private HttpServletRequest request;
+
+ @Autowired
+ private LoggingUtil loggingUtil;
+
+ @Autowired
+ private TokenProvider tokenProvider;
+
+ private final Map executorMap = new ConcurrentHashMap<>();
+
+ private final ConcurrentHashMap threadForDocumentMap = new ConcurrentHashMap<>();
+
+ private static final ThreadLocal threadLocalHubId = new ThreadLocal<>();
+
+ public NdgResponse checkNdgForAppointment(Long applicationId) {
+
+ ApplicationEntity application = applicationService.validateApplication(applicationId);
+ NdgResponse ndgResponse = new NdgResponse();
+ if (application.getNdgStatus() != null && application.getNdgStatus().equalsIgnoreCase(GepafinConstant.NDG_IN_PROGRESS)) {
+ throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.NDG_GENERATION_IS_IN_PROGRESS));
+ }
+
+ if (application.getNdgStatus() != null && application.getNdgStatus().equalsIgnoreCase(GepafinConstant.NDG_GENERATED) && application.getNdg() != null) {
+ ndgResponse.setNdg(application.getNdg());
+ return ndgResponse;
+ }
+
+ // Update application status
+ application.setNdgStatus(GepafinConstant.NDG_IN_PROGRESS);
+ applicationRepository.save(application);
+
+ // Start async processing
+ startAsyncNdgProcessing(applicationId);
+
+ throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.NDG_GENERATION_IS_IN_PROGRESS));
+ }
+
+ private void startAsyncNdgProcessing(Long applicationId) {
+ // Check if a thread is already running for this application
+ if (executorMap.containsKey(applicationId)) {
+ log.warn("Async processing already running for applicationId: {}", applicationId);
+ return;
+ }
+
+ // Create a dedicated thread for asynchronous processing
+ ExecutorService executor = Executors.newSingleThreadExecutor(runnable -> {
+ Thread thread = new Thread(runnable);
+ thread.setName("AsyncNdgProcessing-" + applicationId);
+ return thread;
+ });
+ executorMap.put(applicationId, executor);
+
+ executor.submit(() -> {
+ try {
+ log.info("Starting async processing for applicationId: {}", applicationId);
+ processNdgGeneration(applicationId);
+ } catch (Exception e) {
+ log.error("Error in async NDG processing for applicationId: {}", applicationId, e);
+ } finally {
+ // Cleanup resources
+ ExecutorService executorToShutdown = executorMap.remove(applicationId);
+ if (executorToShutdown != null) {
+ executorToShutdown.shutdown();
+ }
+ log.info("Async processing completed for applicationId: {}", applicationId);
+ }
+ });
+ }
+
+ private void processNdgGeneration(Long applicationId) {
+ // Validate application, company, and hub
+ ApplicationEntity application = applicationService.validateApplication(applicationId);
+ CompanyEntity company = companyService.validateCompany(application.getCompanyId());
+ HubEntity hub = hubRepository.findByHubId(application.getHubId());
+
+ if (!hub.getUniqueUuid().equals(defaultHubUuid)) {
+ log.info("Ndg cannot be created for another Hub, it is default for Gepafin.");
+ throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.NO_NDG_FOR_ANOTHER_HUB));
+ }
+
+ try {
+ // Authenticate and fetch token if required
+ if (hub.getAppointmentAuthTokenId() == null || hub.getAreaCode() == null) {
+ authenticateAndSaveToken(hub);
+ }
+
+ String authorizationToken = getBearerToken(hub);
+
+ // Try retrieving NDG by VAT number
+ AppointmentLoginResponse ndgResponse = retrieveNdgByVatNumber(company.getVatNumber(), authorizationToken, hub, application);
+ if (isNdgValid(ndgResponse.getNdg())) {
+ saveNdgAndIdVisura(application, company, ndgResponse.getNdg(), null);
+ log.info("NDG successfully generated for applicationId: {}", applicationId);
+ } else {
+ // If NDG isn't immediately available, start polling
+ handleNdgPolling(application, company, hub, authorizationToken);
+ }
+ } catch (Exception e) {
+ log.error("Error during NDG generation for applicationId: {}", applicationId, e);
+ }
+ }
+
+ private void handleNdgPolling(ApplicationEntity application, CompanyEntity company, HubEntity hub, String authorizationToken) {
+
+ try {
+ log.info("Starting NDG polling for applicationId: {}", application.getId());
+ long startTime = System.currentTimeMillis();
+
+ while (true) {
+ if (application.getNdg() != null) {
+ log.info("NDG retrieved for applicationId: {}", application.getId());
+ break;
+ }
+
+ try {
+ // Fetch Visura list and attempt to parse NDG
+ String visuraListJson = getVisuraList(application.getIdVisura(), authorizationToken, application, hub);
+ String ndg = parseNdgFromVisuraListResponse(visuraListJson);
+
+ if (isNdgValid(ndg)) {
+ // CompanyEntity oldCompanyData = Utils.getClonedEntityForData(company);
+ // ApplicationEntity oldApplicationData = Utils.getClonedEntityForData(application);
+
+ company.setNdg(ndg);
+ application.setNdg(ndg);
+ application.setNdgStatus(GepafinConstant.NDG_GENERATED);
+ application.setStatus(ApplicationStatusTypeEnum.NDG.getValue());
+ applicationRepository.save(application);
+ companyRepository.save(company);
+ log.info("NDG saved successfully for applicationId: {}", application.getId());
+
+ // /** This code is responsible for adding a version history log for the "update application ndg code, status, and Id visura"
+ // operation. **/
+ // loggingUtil.addVersionHistory(
+ // VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationData)
+ // .newData(application).build());
+ //
+ // /** This code is responsible for adding a version history log for the "update company ndg code" operation. **/
+ // loggingUtil.addVersionHistory(
+ // VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldCompanyData)
+ // .newData(company).build());
+ break;
+ }
+
+ // Check if polling has timed out
+ if (System.currentTimeMillis() - startTime > TimeUnit.HOURS.toMillis(2)) {
+ log.warn("NDG polling timed out for applicationId: {}", application.getId());
+ application.setNdgStatus(GepafinConstant.NDG_FAILED);
+ applicationRepository.save(application);
+ break;
+ }
+
+ // Wait before the next polling attempt
+ Thread.sleep(TimeUnit.MINUTES.toMillis(15));
+ } catch (InterruptedException e) {
+ log.warn("NDG polling interrupted for applicationId: {}", application.getId());
+ Thread.currentThread().interrupt();
+ break;
+ } catch (Exception e) {
+ log.error("Error during NDG polling for applicationId: {}", application.getId(), e);
+ }
+ }
+ } finally {
+ log.info("NDG polling completed for applicationId: {}", application.getId());
+ }
+ }
+
+ private static String getBearerToken(HubEntity hub) {
+
+ return "Bearer " + hub.getAppointmentAuthTokenId();
+ }
+
+ private boolean isNdgValid(String ndg) {
+
+ return ndg != null && !ndg.isEmpty();
+ }
+
+ private void saveNdgAndIdVisura(ApplicationEntity application, CompanyEntity company, String ndg, String idVisura) {
+
+ //cloned for old application and company data
+ // ApplicationEntity oldApplicationData = Utils.getClonedEntityForData(application);
+ // CompanyEntity oldCompanyData = Utils.getClonedEntityForData(company);
+
+ application.setNdg(ndg);
+ application.setIdVisura(idVisura);
+ application.setNdgStatus(GepafinConstant.NDG_GENERATED);
+ application.setStatus(ApplicationStatusTypeEnum.NDG.getValue());
+ company.setNdg(ndg);
+ companyRepository.save(company);
+ applicationRepository.save(application);
+
+ // /** This code is responsible for adding a version history log for the "update application ndg code, status, and Id visura" operation. **/
+ // loggingUtil.addVersionHistory(
+ // VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationData).newData(application).build());
+ //
+ // /** This code is responsible for adding a version history log for the "update company ndg code" operation. **/
+ // loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldCompanyData).newData
+ // (company).build());
+
+ log.info("NDG saved for applicationId: {}, {}", application.getId(), application.getNdg());
+ }
+
+ private String getVisuraList(String idVisura, String authorizationToken, ApplicationEntity application, HubEntity hub) {
+
+ AppointmentVisuraListRequest visuraListRequest = new AppointmentVisuraListRequest();
+ AppointmentVisuraListRequest.VisuraFilter filter = new AppointmentVisuraListRequest.VisuraFilter();
+ filter.setIdVisura(idVisura);
+ visuraListRequest.setFilter(filter);
+
+ try {
+ String requestJson = Utils.convertObjectToJson(visuraListRequest);
+ ResponseEntity