diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 4157f714..04cd95bf 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -233,6 +233,15 @@ public class GepafinConstant { public static final String CANNOT_DELETE_COMPANY_WITH_APPLICATION_SUBMITT = "application.in.submit.status.cannot.delete.company"; public static final String GET_USERS_SUCCESS_MSG = "get.users.success.msg"; public static final String CANNOT_CREATE_BENEFICIARY_USER="cannot.create.beneficiary.user"; + public static final String EVALUATION_CREATED_SUCCESSFULLY = "evaluation.created.successfully"; + public static final String EVALUATION_UPDATED_SUCCESSFULLY = "evaluation.updated.successfully"; + public static final String EVALUATION_FETCHED_SUCCESSFULLY = "evaluation.fetched.successfully"; + public static final String EVALUATION_DELETED_SUCCESSFULLY = "evaluation.deleted.successfully"; + public static final String EVALUATIONS_FETCHED_SUCCESSFULLY = "evaluations.fetched.successfully"; + public static final String APPLICATION_EVALUATION_NOT_FOUND = "application.evaluation.not.found"; + public static final String APPLICATION_EVALUATION_STATUS_UPDATED_SUCCESSFULLY = "application.evaluation.status.updated.successfully"; + public static final String ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG = "assigned.application.not.found.with.id"; + public static final String APPLICATION_ASSIGNED= "application.assigned.success.msg"; public static final String APPLICATION_ALREADY_ASSIGNED = "application.already.assigned.msg"; @@ -250,6 +259,15 @@ public class GepafinConstant { public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid"; public static final String APPLICATION_NOT_IN_DRAFT_STATUS="application.not.in.draft.status"; public static final String GET_ERROR_S3 = "get.error.s3"; + + public static final String ADDED_S3_PATH_STRUCTURE ="added.s3.path.structure"; + public static final String S3_PATH_STRUCTURE_BY_TYPE ="fetched.s3.path.structure.by.type.successfully"; + public static final String S3_PATH_STRUCTURE_NOT_FOUND_BY_TYPE_MSG ="s3.path.not.found.by.type"; + public static final String S3_PATH_STRUCTURE_NOT_FOUND_BY_ID_MSG ="s3.path.not.found.by.id"; + public static final String S3_PATH_DELETE_MSG ="s3.path.config.delete.successfully"; + public static final String S3_PATH_CONFIG_UPDATE_MSG ="s3.path.config.updated.successfully"; + public static final String S3_PATH_CONFIG_DUPLICATE_TYPE_ALREADY_EXIST ="s3.path.config.already.exist."; + public static final String S3_PATH_GENERATION_ERROR_MSG ="s3.path.config.already.exist."; public static final String INVALID_APPLICATION_STATUS = "invalid.application.status"; public static final String APPLICATION_DATA_FOR_AMENDMENT_SUCCESS_MSG = "application.data.amendment.success"; diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 82503677..2332a194 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -6,6 +6,7 @@ import net.gepafin.tendermanagement.entities.*; import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum; import net.gepafin.tendermanagement.enums.ApplicationSignedDocumentStatusEnum; import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; import net.gepafin.tendermanagement.enums.RoleStatusEnum; import net.gepafin.tendermanagement.enums.UserCompanyDelegationStatusEnum; @@ -127,6 +128,9 @@ public class ApplicationDao { @Autowired private UserService userService; + @Autowired + S3PathConfig s3ConfigBean; + public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) { FormEntity formEntity = formService.validateForm(formId); @@ -139,7 +143,7 @@ public class ApplicationDao { } formService.validateFormField(applicationRequestBean.getFormFields(),applicationEntity,formEntity); ApplicationFormEntity applicationFormEntity = getApplicationFormOrCreate(formEntity, applicationEntity); - createOrUpdateMultipleFormFields(applicationRequestBean.getFormFields(), applicationFormEntity,formEntity); + createOrUpdateMultipleFormFields(applicationRequestBean.getFormFields(), applicationFormEntity, formEntity); return getApplicationById(applicationEntity.getId(),formEntity.getId()); } public void validateDelegation(UserEntity user, CompanyEntity company) { @@ -175,6 +179,7 @@ public class ApplicationDao { entity.setUserId(user.getId()); entity.setCompany(companyEntity); entity.setCall(call); + entity.setHubId(call.getHub().getId()); entity.setIsDeleted(false); entity.setStatus(ApplicationStatusTypeEnum.DRAFT.getValue()); return entity; @@ -287,7 +292,7 @@ public class ApplicationDao { log.info("Fetching applications for RoleType: {}", userEntity.getRoleEntity().getRoleType()); - Specification spec = search(userEntity.getId(), callId, companyId,status); + Specification spec = search(userEntity, callId, companyId,status); List applicationEntities = applicationRepository.findAll(spec); @@ -297,12 +302,12 @@ public class ApplicationDao { } - private Specification search(Long userId, Long callId, Long companyId,String status) { + private Specification search(UserEntity userEntity, Long callId, Long companyId,String status) { return (root, query, builder) -> { Boolean isBeneficiary = validator.checkIsBeneficiary(); Predicate predicate = builder.isFalse(root.get("isDeleted")); if (isBeneficiary) { - predicate = builder.and(predicate, builder.equal(root.get("userId"), userId)); + predicate = builder.and(predicate, builder.equal(root.get("userId"), userEntity.getId())); } if (callId != null) { predicate = builder.and(predicate, builder.equal(root.get("call").get("id"), callId)); @@ -313,7 +318,7 @@ public class ApplicationDao { if (status != null) { predicate = builder.and(predicate, builder.equal(root.get("status"), status)); } - + predicate = builder.and(predicate, builder.equal(root.get("hubId"), userEntity.getHub().getId())); return predicate; }; } @@ -600,7 +605,7 @@ public class ApplicationDao { throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_IN_PREVIOUS_STATUS)); } if (status.equals(ApplicationStatusTypeEnum.SUBMIT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) { - callService.validatePublishedCall(applicationEntity.getCall().getId()); + callService.validatePublishedCall(applicationEntity.getCall().getId(), userEntity.getHub().getId()); Long protocolNumber = getProtocolNumber(userEntity.getHub()); ProtocolEntity protocolEntity = createProtocolEntity(applicationEntity,protocolNumber, userEntity.getHub().getId()); applicationEntity.setProtocol(protocolEntity); @@ -788,9 +793,9 @@ public class ApplicationDao { // applicationSignedDocument.setStatus(ApplicationSignedDocumentStatusEnum.INACTIVE.getValue()); // applicationSignedDocumentRepository.save(applicationSignedDocument); } - UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = amazonS3Service.uploadFileOnAmazonS3(signedDocumentS3Folder, - file); - applicationSignedDocument = new ApplicationSignedDocumentEntity(); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3 = uploadFileOnAmazonS3ForUserSignedDocument(file, + applicationEntity.getCall().getId(), applicationId); + applicationSignedDocument = new ApplicationSignedDocumentEntity(); applicationSignedDocument.setApplication(applicationEntity); applicationSignedDocument.setFileName(uploadFileOnAmazonS3.getFileName()); applicationSignedDocument.setFilePath(uploadFileOnAmazonS3.getFilePath()); @@ -800,7 +805,22 @@ public class ApplicationDao { applicationRepository.save(applicationEntity); return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument); } - + private UploadFileOnAmazonS3Response uploadFileOnAmazonS3ForUserSignedDocument(MultipartFile file, Long callId, Long applicationId) { + try { + String s3Path = generateS3PathForDelegation(callId, applicationId); + log.info("S3 Path {}", s3Path); + return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); + } catch (Exception e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); + } + } + private String generateS3PathForDelegation(Long callId, Long applicationId) { + try { + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT, callId, applicationId); + } catch (IllegalArgumentException e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); + } + } private ApplicationSignedDocumentResponse convertApplicationSignedDocumentToApplicationSignedDocumentResponse( ApplicationSignedDocumentEntity applicationSignedDocument) { ApplicationSignedDocumentResponse applicationSignedDocumentResponse = new ApplicationSignedDocumentResponse(); @@ -869,7 +889,7 @@ public class ApplicationDao { throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_IS_INCOMPLETE_MSG)); } - applicationEntity.setStatus(ApplicationStatusTypeEnum.AWAIT.getValue()); + applicationEntity.setStatus(ApplicationStatusTypeEnum.AWAITING.getValue()); applicationEntity = saveApplicationEntity(applicationEntity); return getApplicationResponse(applicationEntity); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java new file mode 100644 index 00000000..cf64291a --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -0,0 +1,852 @@ +package net.gepafin.tendermanagement.dao; + +import com.fasterxml.jackson.core.type.TypeReference; +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.*; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; +import net.gepafin.tendermanagement.enums.DocumentTypeEnum; +import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.ChecklistRequest; +import net.gepafin.tendermanagement.model.request.CriteriaRequest; +import net.gepafin.tendermanagement.model.request.FieldRequest; +import net.gepafin.tendermanagement.model.response.*; +import net.gepafin.tendermanagement.repositories.*; +import net.gepafin.tendermanagement.service.ApplicationService; +import net.gepafin.tendermanagement.service.UserService; +import net.gepafin.tendermanagement.util.Utils; +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.Component; + +import java.util.*; +import java.util.stream.Collectors; + +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; + +@Component +public class ApplicationEvaluationDao { + + @Autowired + private ApplicationEvaluationRepository applicationEvaluationRepository; + @Autowired + private ApplicationService applicationService; + @Autowired + private CallRepository callRepository; + @Autowired + private ApplicationRepository applicationRepository; + @Autowired + private UserService userService; + @Autowired + private EvaluationCriteriaRepository evaluationCriteriaRepository; + @Autowired + private FormRepository formRepository; + @Autowired + private CallTargetAudienceChecklistRepository callTargetAudienceChecklistRepository; + @Autowired + private DocumentRepository documentRepository; + @Autowired + private ApplicationFormRepository applicationFormRepository; + @Autowired + private ApplicationFormFieldRepository applicationFormFieldRepository; + @Autowired + private AssignedApplicationsRepository assignedApplicationsRepository; + @Autowired + private CriteriaFormFieldRepository criteriaFormFieldRepository; + + + private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req,Long applicationId) { + ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); + ApplicationEntity application = applicationService.validateApplication(applicationId); + AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null); + entity.setApplicationId(application.getId()); + entity.setAssignedApplicationsEntity(assignedApplications); + entity.setUserId(user.getId()); + entity.setCriteria(Utils.convertObjectToJson(req.getCriteria())); + entity.setChecklist(Utils.convertObjectToJson(req.getChecklist())); + entity.setFile(Utils.convertObjectToJson(req.getField())); + entity.setNote(req.getNote()); + entity.setIsDeleted(false); + entity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue()); + return entity; + } + + private ApplicationEvaluationResponse convertToResponse(ApplicationEvaluationEntity entity) { + ApplicationEvaluationResponse response = new ApplicationEvaluationResponse(); + populateBasicDetails(entity, response); + + CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId()); + List evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId()); + List checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId()); + List applicationFormEntities = applicationFormRepository.findByApplicationId(entity.getApplicationId()); + + setCriteriaResponses(entity, response, evaluationCriterias); + setChecklistResponses(entity, response, checklistEntities); + setFieldResponses(entity, response, applicationFormEntities); + + setApplicationDetails(response, entity); + + return response; + } + + private void populateBasicDetails(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response) { + response.setId(entity.getId()); + response.setApplicationId(entity.getApplicationId()); + AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(entity.getApplicationId()).orElse(null); + response.setAssignedApplicationId(assignedApplications.getId()); + response.setNote(entity.getNote()); + response.setStatus(ApplicationEvaluationStatusTypeEnum.valueOf(entity.getStatus())); + response.setCreatedDate(entity.getCreatedDate()); + response.setUpdatedDate(entity.getUpdatedDate()); + } + + private void setCriteriaResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List evaluationCriterias) { + List criteriaResponsesFromEntity = entity.getCriteria() != null + ? Utils.convertJsonToList(entity.getCriteria(), new TypeReference>() {}) + : new ArrayList<>(); + + List criteriaResponsesFromDB = getCriteriaResponse(entity.getApplicationId()); + addMissingCriteriaResponses(criteriaResponsesFromEntity, criteriaResponsesFromDB,entity.getApplicationId()); + criteriaResponsesFromEntity.forEach(criteriaResponse -> { + EvaluationCriteriaEntity matchingEvaluationCriteria = evaluationCriterias.stream() + .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId())) + .findFirst() + .orElse(null); + + if (matchingEvaluationCriteria != null) { + criteriaResponse.setLabel(matchingEvaluationCriteria.getLookupData().getValue()); + criteriaResponse.setMaxScore(matchingEvaluationCriteria.getScore()); + + List mappedFields = getMappedFieldsForCriteria(matchingEvaluationCriteria.getId(), entity.getApplicationId()); + criteriaResponse.setCriteriaMappedFields(mappedFields); + } + }); + + response.setCriteria(criteriaResponsesFromEntity); + } + private void addMissingCriteriaResponses(List criteriaResponsesFromEntity, List criteriaResponsesFromDB,Long applicationId) { + Set existingCriteriaIds = criteriaResponsesFromEntity.stream() + .map(CriteriaResponse::getId) + .collect(Collectors.toSet()); + + for (CriteriaResponse dbResponse : criteriaResponsesFromDB) { + if (!existingCriteriaIds.contains(dbResponse.getId())) { + List mappedFields = getMappedFieldsForCriteria(dbResponse.getId(), applicationId); + dbResponse.setCriteriaMappedFields(mappedFields); + criteriaResponsesFromEntity.add(dbResponse); + } + } + } + private List getMappedFieldsForCriteria(Long evaluationCriteriaId, Long applicationId) { + List criteriaFormFields = criteriaFormFieldRepository + .findByEvaluationCriteriaIdAndIsDeletedFalse(evaluationCriteriaId); + List mappedFields = new ArrayList<>(); + + Set uniqueFieldIds = new HashSet<>(); + + List applicationForms = applicationFormRepository.findByApplicationId(applicationId); + for (ApplicationFormEntity applicationForm : applicationForms) { + for (CriteriaFormFieldEntity formField : criteriaFormFields) { + String formFieldId = formField.getFormFieldId(); + + if (!uniqueFieldIds.contains(formFieldId)) { + CriteriaMappedField mappedField = new CriteriaMappedField(); + mappedField.setId(formFieldId); + + FormEntity formEntity = formRepository.findById(formField.getFormId()).orElse(null); + if (formEntity != null) { + List contentBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + contentBeans.stream() + .filter(contentBean -> contentBean.getId().equals(formFieldId)) + .findFirst() + .ifPresent(contentBean -> { + String label = contentBean.getLabel(); + if (contentBean.getSettings() != null) { + for (SettingResponseBean setting : contentBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + mappedField.setFieldLabel(label); + }); + } + + Optional formFieldEntityOptional = applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationForm.getId(), applicationId); + + formFieldEntityOptional.ifPresent(field -> mappedField.setFieldValue(field.getFieldValue())); + + mappedFields.add(mappedField); + uniqueFieldIds.add(formFieldId); + } + } + } + return mappedFields; + } + + private void setChecklistResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List checklistEntities) { + List checklistResponsesFromEntity = entity.getChecklist() != null + ? Utils.convertJsonToList(entity.getChecklist(), new TypeReference>() {}) + : new ArrayList<>(); + + List checklistResponsesFromDB = getChecklistResponse(entity.getApplicationId()); + addMissingChecklistResponses(checklistResponsesFromEntity, checklistResponsesFromDB); + + checklistResponsesFromEntity.forEach(checklistResponse -> { + CallTargetAudienceChecklistEntity matchingChecklist = checklistEntities.stream() + .filter(checklistEntity -> checklistEntity.getId().equals(checklistResponse.getId())) + .findFirst() + .orElse(null); + + if (matchingChecklist != null) { + checklistResponse.setLabel(matchingChecklist.getLookupData().getValue()); + } + }); + + response.setChecklist(checklistResponsesFromEntity); + } + + private void addMissingChecklistResponses(List checklistResponsesFromEntity, List checklistResponsesFromDB) { + Set existingChecklistIds = checklistResponsesFromEntity.stream() + .map(ChecklistResponse::getId) + .collect(Collectors.toSet()); + + for (ChecklistResponse dbResponse : checklistResponsesFromDB) { + if (!existingChecklistIds.contains(dbResponse.getId())) { + checklistResponsesFromEntity.add(dbResponse); + } + } + } + + private void setFieldResponses(ApplicationEvaluationEntity entity, ApplicationEvaluationResponse response, List applicationFormEntities) { + List fieldResponsesFromEntity = entity.getFile() != null + ? Utils.convertJsonToList(entity.getFile(), new TypeReference>() {}) + : new ArrayList<>(); + List fieldResponsesFromDB = getFieldResponses(entity.getApplicationId()); + addMissingFieldResponses(fieldResponsesFromEntity, fieldResponsesFromDB); + + Set processedFieldIds = new HashSet<>(); + + fieldResponsesFromEntity.forEach(fieldResponse -> { + if (processedFieldIds.contains(fieldResponse.getId())) { + return; + } + + applicationFormEntities.forEach(applicationForm -> { + FormEntity formEntity = applicationForm.getForm(); + if (formEntity != null) { + List contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + contentResponseBeans.forEach(contentResponseBean -> { + if ("fileupload".equals(contentResponseBean.getName()) && contentResponseBean.getId().equals(fieldResponse.getId())) { + String label = null; + if (contentResponseBean.getSettings() != null) { + for (SettingResponseBean setting : contentResponseBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + fieldResponse.setLabel(label); + + Optional optionalFormField = applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId( + fieldResponse.getId(), applicationForm.getId(), entity.getApplicationId() + ); + + if (optionalFormField.isPresent()) { + ApplicationFormFieldEntity formField = optionalFormField.get(); + if (formField.getFieldValue() != null) { + String[] documentIds = formField.getFieldValue().split(","); + List documentResponseBeans = new ArrayList<>(); + + for (String docId : documentIds) { + Long documentId = Long.valueOf(docId.trim()); + documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> { + DocumentResponseBean responseBean = new DocumentResponseBean(); + responseBean.setId(documentEntity.getId()); + responseBean.setName(documentEntity.getFileName()); + responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); + responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); + responseBean.setSourceId(documentEntity.getSourceId()); + responseBean.setFilePath(documentEntity.getFilePath()); + responseBean.setCreatedDate(documentEntity.getCreatedDate()); + responseBean.setUpdatedDate(documentEntity.getUpdatedDate()); + documentResponseBeans.add(responseBean); + }); + } + + fieldResponse.setFileDetail(documentResponseBeans); + } + } + processedFieldIds.add(fieldResponse.getId()); + } + }); + } + }); + }); + response.setFiles(fieldResponsesFromEntity); + } + + private void addMissingFieldResponses(List fieldResponsesFromEntity, List fieldResponsesFromDB) { + Set existingFieldIds = fieldResponsesFromEntity.stream() + .map(FieldResponse::getId) + .collect(Collectors.toSet()); + + for (FieldResponse dbResponse : fieldResponsesFromDB) { + if (!existingFieldIds.contains(dbResponse.getId())) { + fieldResponsesFromEntity.add(dbResponse); + } + } + } + + private void setApplicationDetails(ApplicationEvaluationResponse response, ApplicationEvaluationEntity entity) { + ApplicationEntity application = applicationService.validateApplication(entity.getApplicationId() != null ? entity.getApplicationId(): null); + UserEntity user = userService.validateUser(application.getUserId()); + + CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId()); + + String firstName = user.getFirstName() != null ? user.getFirstName() : ""; + String lastName = user.getLastName() != null ? user.getLastName() : ""; + + String beneficiary = String.join(" ", firstName, lastName).trim(); + response.setBeneficiary(beneficiary); + response.setMinScore(call.getThreshold()); + response.setCallName(application.getCall().getName()); + response.setProtocolNumber(application.getProtocol() != null ? application.getProtocol().getProtocolNumber() : null); + response.setSubmissionDate(application.getSubmissionDate()!= null ? application.getSubmissionDate(): null); + response.setEvaluationDate(application.getSubmissionDate()!= null ? application.getSubmissionDate().plusDays(30):null); + + } + + + public ApplicationEvaluationResponse createOrUpdateApplicationEvaluation(UserEntity user, ApplicationEvaluationRequest req,Long applicationId) { + Optional existingEntityOptional = applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(applicationId); + ApplicationEvaluationEntity entity; + + if (existingEntityOptional.isPresent()) { + entity = existingEntityOptional.get(); + entity.setCriteria(Utils.convertObjectToJson(processCriteria(entity, req))); + entity.setChecklist(Utils.convertObjectToJson(processChecklist(entity, req))); + entity.setFile(Utils.convertObjectToJson(processField(entity, req))); + entity.setIsDeleted(false); + setIfUpdated(entity::getNote, entity::setNote, req.getNote()); + } else { + entity = convertToEntity(user, req,applicationId); + } + + ApplicationEvaluationEntity savedEntity = applicationEvaluationRepository.save(entity); + return convertToResponse(savedEntity); + } + private List processCriteria(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) { + List existingCriteriaList = entity.getCriteria() != null ? + Utils.convertJsonToList(entity.getCriteria(), new TypeReference>() {}) : new ArrayList<>(); + + Map existingCriteriaMap = existingCriteriaList.stream() + .collect(Collectors.toMap(CriteriaResponse::getId, criteria -> criteria)); + + List updatedCriteriaList = req.getCriteria().stream() + .map(incoming -> { + CriteriaRequest request = new CriteriaRequest(); + request.setId(incoming.getId()); + request.setScore(incoming.getScore()); + request.setValid(incoming.getValid()); + + CriteriaResponse existingCriteria = existingCriteriaMap.get(incoming.getId()); + if (existingCriteria != null) { + request.setScore(incoming.getScore() != null ? incoming.getScore() : existingCriteria.getScore()); + request.setValid(incoming.getValid() != null ? incoming.getValid() : existingCriteria.getValid()); + } + return request; + }) + .collect(Collectors.toList()); + + List missingCriteriaRequests = existingCriteriaList.stream() + .filter(existing -> !updatedCriteriaList.stream() + .map(CriteriaRequest::getId) + .toList() + .contains(existing.getId())) + .map(existing -> { + CriteriaRequest request = new CriteriaRequest(); + request.setId(existing.getId()); + request.setScore(existing.getScore()); + request.setValid(existing.getValid()); + return request; + }) + .toList(); + + updatedCriteriaList.addAll(missingCriteriaRequests); + return updatedCriteriaList; + } + + private List processChecklist(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) { + List existingChecklistList = entity.getChecklist() != null ? + Utils.convertJsonToList(entity.getChecklist(), new TypeReference>() {}) : new ArrayList<>(); + + Map existingChecklistMap = existingChecklistList.stream() + .collect(Collectors.toMap(ChecklistResponse::getId, checklist -> checklist)); + + List updatedChecklistList = req.getChecklist().stream() + .map(incoming -> { + ChecklistRequest request = new ChecklistRequest(); + request.setId(incoming.getId()); + request.setValid(incoming.getValid()); + + ChecklistResponse existingChecklist = existingChecklistMap.get(incoming.getId()); + if (existingChecklist != null) { + request.setValid(incoming.getValid() != null ? incoming.getValid() : existingChecklist.getValid()); + } + return request; + }) + .collect(Collectors.toList()); + + List missingChecklistRequests = existingChecklistList.stream() + .filter(existing -> !updatedChecklistList.stream() + .map(ChecklistRequest::getId) + .toList() + .contains(existing.getId())) + .map(existing -> { + ChecklistRequest request = new ChecklistRequest(); + request.setId(existing.getId()); + request.setValid(existing.getValid()); + return request; + }) + .toList(); + + updatedChecklistList.addAll(missingChecklistRequests); + return updatedChecklistList; + } + + private List processField(ApplicationEvaluationEntity entity, ApplicationEvaluationRequest req) { + List existingFieldList = entity.getFile() != null ? + Utils.convertJsonToList(entity.getFile(), new TypeReference>() {}) : new ArrayList<>(); + + Map existingFieldMap = existingFieldList.stream() + .collect(Collectors.toMap(FieldResponse::getId, field -> field)); + + List updatedFieldList = req.getField().stream() + .map(incoming -> { + FieldRequest request = new FieldRequest(); + request.setId(incoming.getId()); + request.setValid(incoming.getValid()); + + FieldResponse existingField = existingFieldMap.get(incoming.getId()); + if (existingField != null) { + request.setValid(incoming.getValid() != null ? incoming.getValid() : existingField.getValid()); + } + return request; + }) + .collect(Collectors.toList()); + + List missingFieldRequests = existingFieldList.stream() + .filter(existing -> !updatedFieldList.stream() + .map(FieldRequest::getId) + .toList() + .contains(existing.getId())) + .map(existing -> { + FieldRequest request = new FieldRequest(); + request.setId(existing.getId()); + request.setValid(existing.getValid()); + return request; + }) + .toList(); + + updatedFieldList.addAll(missingFieldRequests); + return updatedFieldList; + } + + private ApplicationEvaluationEntity validateApplicationEvaluation(Long id) { + Optional entityOptional = applicationEvaluationRepository.findById(id); + if (entityOptional.isEmpty()) { + throw new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_NOT_FOUND, id)); + } + return entityOptional.get(); + } + + + public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(UserEntity user, Long applicationId, Long assignedApplicationId) { + + applicationService.validateApplication(applicationId); + + Optional entityOptional; + + if (applicationId != null && assignedApplicationId != null) { + entityOptional = applicationEvaluationRepository.findByApplicationIdAndAssignedApplicationsEntity_IdAndIsDeletedFalse(applicationId, assignedApplicationId); + } else if (applicationId != null) { + entityOptional = applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(applicationId); + } else if (assignedApplicationId != null) { + entityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplicationId); + } else { + entityOptional = applicationEvaluationRepository.findFirstByIsDeletedFalseOrderByCreatedDateDesc(); + } + return entityOptional.map(this::convertToResponse) + .orElseGet(() -> { + return getEvaluationResponseByApplicationid(user, applicationId, assignedApplicationId); + }); + } + + public ApplicationEvaluationResponse getEvaluationResponseByApplicationid(UserEntity user, Long applicationId,Long assignedApplicationId) { + ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity(); + ApplicationEvaluationResponse response = new ApplicationEvaluationResponse(); + CallEntity call=null; + AssignedApplicationsEntity assignedApplications=null; + if (applicationId != null) { + call = callRepository.findCallEntityByApplicationId(applicationId); + assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null); + } else if (assignedApplicationId != null) { + call = callRepository.findCallEntityByApplicationId(assignedApplicationId); + assignedApplications = assignedApplicationsRepository.findByIdAndIsDeletedFalse(assignedApplicationId).orElseThrow(()-> + new ResourceNotFoundException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG))); + } + else { + call = callRepository.findCallEntityByApplicationId(applicationId); + assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);} + List evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId()); + List checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId()); + List applicationFormEntities = applicationFormRepository.findByApplicationId(applicationId); + response.setApplicationId(applicationId); + response.setAssignedApplicationId(assignedApplications.getId()); + response.setNote(null); + response.setStatus(ApplicationEvaluationStatusTypeEnum.valueOf(ApplicationEvaluationStatusTypeEnum.OPEN.getValue())); + response.setMinScore(call.getThreshold()); + setCriteriaResponses(entity, applicationId, response, evaluationCriterias); + setChecklistResponses(entity, applicationId, response, checklistEntities); + setFileResponses(entity, applicationId, response, applicationFormEntities); + + setApplicationDetails(response, applicationId, user); + + return response; + } + + private void setCriteriaResponses(ApplicationEvaluationEntity entity, Long applicationId, ApplicationEvaluationResponse response, List evaluationCriterias) { + List criteriaResponses = entity.getCriteria() != null + ? Utils.convertJsonToList(entity.getCriteria(), new TypeReference>() {}) + : getCriteriaResponse(applicationId); + + criteriaResponses.forEach(criteriaResponse -> { + EvaluationCriteriaEntity matchingEvaluationCriteria = evaluationCriterias.stream() + .filter(evaluationCriteria -> evaluationCriteria.getId().equals(criteriaResponse.getId())) + .findFirst() + .orElse(null); + + List applicationForms = applicationFormRepository.findByApplicationId(applicationId); + Map mappedFieldMap = new HashMap<>(); + + if (matchingEvaluationCriteria != null) { + criteriaResponse.setLabel(matchingEvaluationCriteria.getLookupData().getValue()); + criteriaResponse.setMaxScore(matchingEvaluationCriteria.getScore()); + + List criteriaFormFields = criteriaFormFieldRepository + .findByEvaluationCriteriaIdAndIsDeletedFalse(matchingEvaluationCriteria.getId()); + + for (ApplicationFormEntity applicationForm : applicationForms) { + for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) { + String formFieldId = criteriaFormField.getFormFieldId(); + if (!mappedFieldMap.containsKey(formFieldId)) { + CriteriaMappedField mappedField = new CriteriaMappedField(); + mappedField.setId(formFieldId); + FormEntity formEntity = formRepository.findById(criteriaFormField.getFormId()).orElse(null); + + if (formEntity != null) { + List contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + contentResponseBeans.stream() + .filter(bean -> bean.getId().equals(formFieldId)) + .findFirst() + .ifPresent(contentResponseBean -> { + String label = contentResponseBean.getLabel(); + if (contentResponseBean.getSettings() != null) { + for (SettingResponseBean setting : contentResponseBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + mappedField.setFieldLabel(label); + }); + } + Optional formFieldEntityOptional = applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationForm.getId(), applicationId); + + formFieldEntityOptional.ifPresent(formField -> mappedField.setFieldValue(formField.getFieldValue())); + mappedFieldMap.put(formFieldId, mappedField); + } + } + } + criteriaResponse.setCriteriaMappedFields(new ArrayList<>(mappedFieldMap.values())); + } + }); + + response.setCriteria(criteriaResponses); + } + + private void setChecklistResponses(ApplicationEvaluationEntity entity, Long applicationId, ApplicationEvaluationResponse response, List checklistEntities) { + List checklistResponses = entity.getChecklist() != null + ? Utils.convertJsonToList(entity.getChecklist(), new TypeReference>() {}) + : getChecklistResponse(applicationId); + + checklistResponses.forEach(checklistResponse -> { + CallTargetAudienceChecklistEntity matchingChecklist = checklistEntities.stream() + .filter(checklistEntity -> checklistEntity.getId().equals(checklistResponse.getId())) + .findFirst() + .orElse(null); + + if (matchingChecklist != null) { + checklistResponse.setLabel(matchingChecklist.getLookupData().getValue()); + } + }); + + response.setChecklist(checklistResponses); + } + private void setFileResponses(ApplicationEvaluationEntity entity, Long applicationId, ApplicationEvaluationResponse response, List applicationFormEntities) { + List fieldResponses = entity.getFile() != null + ? Utils.convertJsonToList(entity.getFile(), new TypeReference>() {}) + : getFieldResponses(applicationId); + Set processedFieldIds = new HashSet<>(); + + fieldResponses.forEach(fieldResponse -> { + if (processedFieldIds.contains(fieldResponse.getId())) { + return; + } + + applicationFormEntities.forEach(applicationForm -> { + FormEntity formEntity = applicationForm.getForm(); + if (formEntity != null) { + List contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + contentResponseBeans.forEach(contentResponseBean -> { + if ("fileupload".equals(contentResponseBean.getName()) && contentResponseBean.getId().equals(fieldResponse.getId())) { + String label = null; + if (contentResponseBean.getSettings() != null) { + for (SettingResponseBean setting : contentResponseBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + fieldResponse.setLabel(label); + + Optional optionalFormField = applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(fieldResponse.getId(), applicationForm.getId(), applicationId); + + if (optionalFormField.isPresent() && optionalFormField.get().getFieldValue() != null) { + String[] documentIds = optionalFormField.get().getFieldValue().split(","); + List documentResponseBeans = new ArrayList<>(); + + for (String docId : documentIds) { + Long documentId = Long.valueOf(docId.trim()); + documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> { + DocumentResponseBean responseBean = new DocumentResponseBean(); + responseBean.setId(documentEntity.getId()); + responseBean.setName(documentEntity.getFileName()); + responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); + responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); + responseBean.setSourceId(documentEntity.getSourceId()); + responseBean.setFilePath(documentEntity.getFilePath()); + responseBean.setCreatedDate(documentEntity.getCreatedDate()); + responseBean.setUpdatedDate(documentEntity.getUpdatedDate()); + documentResponseBeans.add(responseBean); + }); + } + + fieldResponse.setFileDetail(documentResponseBeans); + } + + // Mark this field ID as processed to prevent duplicates + processedFieldIds.add(fieldResponse.getId()); + } + }); + } + }); + }); + + response.setFiles(fieldResponses); + } + + + private void setApplicationDetails(ApplicationEvaluationResponse response, Long applicationId, UserEntity user) { + ApplicationEntity application = applicationService.validateApplication(applicationId); + userService.validateUser(application.getUserId()); + String firstName = user.getFirstName() != null ? user.getFirstName() : ""; + String lastName = user.getLastName() != null ? user.getLastName() : ""; + + String beneficiary = String.join(" ", firstName, lastName).trim(); + response.setBeneficiary(beneficiary); + + response.setCallName(application.getCall().getName()); + response.setProtocolNumber(application.getProtocol() != null ? application.getProtocol().getProtocolNumber() : null); + response.setSubmissionDate(application.getSubmissionDate()!= null ? application.getSubmissionDate(): null); + response.setEvaluationDate(application.getSubmissionDate()!= null ? application.getSubmissionDate().plusDays(30):null); + + } + + List getCriteriaResponse(Long applicationId) { + CallEntity call = callRepository.findCallEntityByApplicationId(applicationId); + List evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId()); + + List criteriaResponses = evaluationCriterias.stream().map(criteria -> { + CriteriaResponse response = new CriteriaResponse(); + response.setId(criteria.getId()); + response.setLabel(criteria.getLookupData().getValue()); + response.setScore(null); + response.setMaxScore(criteria.getScore()); + response.setValid(null); + + List criteriaFormFields = criteriaFormFieldRepository + .findByEvaluationCriteriaIdAndIsDeletedFalse(criteria.getId()); + + List mappedFields = new ArrayList<>(); + Set processedFormFieldIds = new HashSet<>(); + + for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) { + if (processedFormFieldIds.contains(criteriaFormField.getFormFieldId())) { + continue; + } + + CriteriaMappedField mappedField = new CriteriaMappedField(); + mappedField.setId(criteriaFormField.getFormFieldId()); + + FormEntity formEntity = formRepository.findById(criteriaFormField.getFormId()).orElse(null); + if (formEntity != null) { + List contentResponseBeans = Utils.convertJsonStringToList( + formEntity.getContent(), ContentResponseBean.class); + contentResponseBeans.stream() + .filter(bean -> bean.getId().equals(criteriaFormField.getFormFieldId())) + .findFirst() + .ifPresent(contentResponseBean -> { + String label = contentResponseBean.getLabel(); + if (contentResponseBean.getSettings() != null) { + for (SettingResponseBean setting : contentResponseBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + mappedField.setFieldLabel(label); + }); + } + + applicationFormRepository.findByApplicationId(applicationId).stream() + .flatMap(applicationForm -> applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId( + criteriaFormField.getFormFieldId(), applicationForm.getId(), applicationId) + .stream()) + .findFirst() + .ifPresent(formField -> mappedField.setFieldValue(formField.getFieldValue())); + + mappedFields.add(mappedField); + processedFormFieldIds.add(criteriaFormField.getFormFieldId()); + } + + response.setCriteriaMappedFields(mappedFields); + return response; + }).collect(Collectors.toList()); + + return criteriaResponses; + } + + List getChecklistResponse(Long applicationId){ CallEntity call = callRepository.findCallEntityByApplicationId(applicationId); + List checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId()); + List checklistResponses = checklistEntities.stream().map(checklist -> { + ChecklistResponse response = new ChecklistResponse(); + response.setId(checklist.getId()); + response.setLabel(checklist.getLookupData().getValue()); + response.setValid(null); + + return response; + }).collect(Collectors.toList()); + + return checklistResponses; + } + public List getFieldResponses(Long applicationId) { + List applicationFormEntities = applicationFormRepository.findByApplicationId(applicationId); + List fieldResponses = new ArrayList<>(); + + for (ApplicationFormEntity applicationForm : applicationFormEntities) { + FormEntity formEntity = applicationForm.getForm(); + + if (formEntity != null) { + List contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); + + for (ContentResponseBean contentResponseBean : contentResponseBeans) { + if ("fileupload".equals(contentResponseBean.getName())) { + String fieldId = contentResponseBean.getId(); + Long applicationFormId = applicationForm.getId(); + + Optional optionalFormField = applicationFormFieldRepository + .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(fieldId, applicationFormId, applicationId); + + if (optionalFormField.isPresent()) { + ApplicationFormFieldEntity formField = optionalFormField.get(); + + if (formField.getFieldValue() != null) { + FieldResponse fieldResponse = new FieldResponse(); + fieldResponse.setId(fieldId); + String label = null; + if (contentResponseBean.getSettings() != null) { + for (SettingResponseBean setting : contentResponseBean.getSettings()) { + if ("label".equals(setting.getName())) { + label = setting.getValue() != null ? setting.getValue().toString() : label; + break; + } + } + } + fieldResponse.setLabel(label); + fieldResponse.setValid(null); + String[] documentIds = formField.getFieldValue().split(","); + List documentResponseBeans = new ArrayList<>(); + + for (String docId : documentIds) { + Long documentId = Long.valueOf(docId.trim()); + documentRepository.findByIdAndNotDeleted(documentId).ifPresent(documentEntity -> { + DocumentResponseBean responseBean = new DocumentResponseBean(); + responseBean.setId(documentEntity.getId()); + responseBean.setName(documentEntity.getFileName()); + responseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); + responseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); + responseBean.setSourceId(documentEntity.getSourceId()); + responseBean.setFilePath(documentEntity.getFilePath()); + responseBean.setCreatedDate(documentEntity.getCreatedDate()); + responseBean.setUpdatedDate(documentEntity.getUpdatedDate()); + documentResponseBeans.add(responseBean); + }); + } + + fieldResponse.setFileDetail(documentResponseBeans); + + // Now add fieldResponse to the list + fieldResponses.add(fieldResponse); + } + } + } + } + } + } + return fieldResponses; + } + + public void deleteById(Long id) { + ApplicationEvaluationEntity applicationEvaluationEntity= validateApplicationEvaluation(id); + applicationEvaluationEntity.setIsDeleted(true); + applicationEvaluationEntity=saveApplicationEvaluationEntity(applicationEvaluationEntity); + } + public ApplicationEvaluationEntity saveApplicationEvaluationEntity(ApplicationEvaluationEntity applicationEvaluationEntityData){ + return applicationEvaluationRepository.save(applicationEvaluationEntityData); + } + + public ApplicationEvaluationResponse updateApplicationEvaluationStatus(Long applicationId, ApplicationEvaluationStatusTypeEnum status) { + ApplicationEvaluationEntity existingEntity = validateApplicationEvaluation(applicationId); + if (status != null && !status.getValue().equals(existingEntity.getStatus())) { + existingEntity.setStatus(status.getValue()); + } + ApplicationEvaluationEntity updatedEntity = applicationEvaluationRepository.save(existingEntity); + return convertToResponse(updatedEntity); + } + +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java index 7ec1dbc4..b3e27da5 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java @@ -1,5 +1,6 @@ package net.gepafin.tendermanagement.dao; import jakarta.persistence.criteria.Predicate; +import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.ApplicationEntity; @@ -9,10 +10,12 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository; import net.gepafin.tendermanagement.service.ApplicationService; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.DateTimeUtil; +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; @@ -31,13 +34,19 @@ import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; public class AssignedApplicationsDao { @Autowired - ApplicationService applicationService; + private ApplicationService applicationService; @Autowired - AssignedApplicationsRepository assignedApplicationsRepository; + private ApplicationRepository applicationRepository; @Autowired - UserService userService; + private AssignedApplicationsRepository assignedApplicationsRepository; + + @Autowired + private UserService userService; + + @Autowired + private Validator validator; public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest){ log.info("Assigning application to pre-Instructor with details: {}", applicationId,userId); @@ -47,9 +56,19 @@ public class AssignedApplicationsDao { throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED)); } ApplicationEntity application = applicationService.validateApplication(applicationId); + + + if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.SUBMIT.getValue().equals(application.getStatus()))) { + throw new CustomValidationException( + Status.BAD_REQUEST, + Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS) + ); + } + application.setStatus(ApplicationStatusTypeEnum.EVALUATION.getValue()); + applicationRepository.save(application); UserEntity user = userService.validateUser(userId); AssignedApplicationsEntity assignment = createAssignmentEntity(application, user.getId(), assignedByUser, assignedApplicationsRequest); - AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment, assignedApplicationsRequest); + AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment); log.info("Application assigned succesfully {}", assignApplicationToInstructorResponse); return assignApplicationToInstructorResponse; @@ -60,7 +79,10 @@ public class AssignedApplicationsDao { assignApplication.setApplication(application); assignApplication.setAssignedBy(assignedByUser.getId()); assignApplication.setUserId(userId); - assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue()); + assignApplication.setStatus(AssignedApplicationEnum.OPEN.getValue()); + if(assignedApplicationsRequest.getStatus() != null) { + assignApplication.setStatus(assignedApplicationsRequest.getStatus().getValue()); + } assignApplication.setNote(assignedApplicationsRequest.getNote()); assignApplication.setIsDeleted(false); assignApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); @@ -73,17 +95,44 @@ public class AssignedApplicationsDao { return assignedApplication; } - public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity application, AssignedApplicationsRequest assignedApplicationsRequest){ + public AssignedApplicationsResponse convertEntityToResponse(AssignedApplicationsEntity assignedApplications){ AssignedApplicationsResponse assignedApplicationsResponse = new AssignedApplicationsResponse(); - assignedApplicationsResponse.setId(application.getId()); - assignedApplicationsResponse.setApplicationId(application.getApplication().getId()); - assignedApplicationsResponse.setAssignedBy(application.getAssignedBy()); - assignedApplicationsResponse.setUserId(application.getUserId()); - assignedApplicationsResponse.setCreatedDate(application.getCreatedDate()); - assignedApplicationsResponse.setUpdatedDate(application.getUpdatedDate()); - assignedApplicationsResponse.setNote(application.getNote()); - assignedApplicationsResponse.setStatus(AssignedApplicationEnum.valueOf(application.getStatus())); - assignedApplicationsResponse.setAssignedAt(application.getAssignedAt()); + assignedApplicationsResponse.setId(assignedApplications.getId()); + assignedApplicationsResponse.setApplicationId(assignedApplications.getApplication().getId()); + + ApplicationEntity application = applicationService.validateApplication(assignedApplications.getApplication().getId()); + String callName = application.getCall() != null ? application.getCall().getName() : ""; + LocalDateTime callEndDate = application.getCall().getEndDate(); + LocalDateTime callStartDate = application.getCall().getStartDate(); + + Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null) + ? application.getProtocol().getProtocolNumber() + : 0; + LocalDateTime submissionDate = application.getSubmissionDate(); + UserEntity userEntity = userService.validateUser(application.getUserId()); + + String firstName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getFirstName() : null; + String lastName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getLastName() : null; + + String beneficiaryName = (firstName != null && !firstName.isBlank() ? firstName : "") + + (lastName != null && !lastName.isBlank() ? " " + lastName : ""); + + beneficiaryName = beneficiaryName.isBlank() ? "" : beneficiaryName; + + assignedApplicationsResponse.setAssignedBy(assignedApplications.getAssignedBy()); + assignedApplicationsResponse.setUserId(assignedApplications.getUserId()); + assignedApplicationsResponse.setCreatedDate(assignedApplications.getCreatedDate()); + assignedApplicationsResponse.setUpdatedDate(assignedApplications.getUpdatedDate()); + assignedApplicationsResponse.setNote(assignedApplications.getNote()); + assignedApplicationsResponse.setStatus(AssignedApplicationEnum.valueOf(assignedApplications.getStatus())); + assignedApplicationsResponse.setAssignedAt(assignedApplications.getAssignedAt()); + assignedApplicationsResponse.setProtocolNumber(protocolNumber); + assignedApplicationsResponse.setCallName(callName); + assignedApplicationsResponse.setBeneficiaryName(beneficiaryName); + assignedApplicationsResponse.setSubmissionDate(submissionDate); + assignedApplicationsResponse.setCallEndDate(callEndDate); + assignedApplicationsResponse.setCallStartDate(callStartDate); + return assignedApplicationsResponse; } @@ -93,38 +142,47 @@ public class AssignedApplicationsDao { return assignedApplication; } - public void deleteById(Long id) { + public void deleteById(HttpServletRequest request, Long id) { log.info("Deleting assigned application with ID: {}", id); AssignedApplicationsEntity assignedApplicationsEntity= validateAssignedApplication(id); + validator.validatePreInstructor(request, assignedApplicationsEntity.getUserId()); assignedApplicationsEntity.setIsDeleted(true); assignedApplicationsEntity= saveAssignedApplication(assignedApplicationsEntity); log.info("Assigned Application deleted with ID: {}", id); } - public List getAllAssignedApplications(Long userId){ - Specification spec = search(userId); + public List getAllAssignedApplications(HttpServletRequest request, Long userId) { + UserEntity user = validator.validateUser(request); + if(validator.checkIsPreInstructor() && userId == null) { + throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.USER_ID_NOT_NULL_MSG)); + } + if(userId != null) { + validator.validatePreInstructor(request, userId); + } + Specification spec = search(user.getHub().getId() ,userId); List assignedApplicationsEntityList = assignedApplicationsRepository.findAll(spec); return assignedApplicationsEntityList.stream() - .map(entity -> convertEntityToResponse(entity, new AssignedApplicationsRequest())) + .map(entity -> convertEntityToResponse(entity)) .collect(Collectors.toList()); } - private Specification search(Long userId) { + private Specification search(Long hubId, Long userId) { return (root, query, builder) -> { Predicate predicate = builder.isFalse(root.get("isDeleted")); if (userId != null) { predicate = builder.and(predicate, builder.equal(root.get("userId"), userId)); } + predicate = builder.and(predicate, builder.equal(root.get("application").get("hubId"), hubId)); return predicate; }; } - public AssignedApplicationsResponse updateAssignedApplication( - Long id, AssignedApplicationsRequest updateRequest, UserEntity updatedByUser) { - + public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, + Long id, AssignedApplicationsRequest updateRequest) { + UserEntity updatedByUser = validator.validateUser(request); log.info("Updating assigned application with ID: {}", id); AssignedApplicationsEntity existingAssignment = validateAssignedApplication(id); - + validator.validatePreInstructor(request, existingAssignment.getUserId()); setIfUpdated(existingAssignment::getNote, existingAssignment::setNote, updateRequest.getNote()); setIfUpdated(existingAssignment::getStatus, existingAssignment::setStatus, updateRequest.getStatus().name()); setIfUpdated(existingAssignment::getAssignedBy, existingAssignment::setAssignedBy, updatedByUser.getId()); @@ -132,15 +190,16 @@ public class AssignedApplicationsDao { existingAssignment.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); AssignedApplicationsEntity updatedAssignment = saveAssignedApplication(existingAssignment); - AssignedApplicationsResponse response = convertEntityToResponse(updatedAssignment, updateRequest); + AssignedApplicationsResponse response = convertEntityToResponse(updatedAssignment); log.info("Assigned application updated successfully: {}", response); return response; } - public AssignedApplicationsResponse getAssignedApplicationById(Long id) { + public AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id) { log.info("Fetching assigned application with ID: {}", id); AssignedApplicationsEntity assignedApplication = validateAssignedApplication(id); - AssignedApplicationsResponse response = convertEntityToResponse(assignedApplication, new AssignedApplicationsRequest()); + validator.validatePreInstructor(request, assignedApplication.getUserId()); + AssignedApplicationsResponse response = convertEntityToResponse(assignedApplication); log.info("Assigned application fetched successfully: {}", response); return response; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java index 13b0f719..285702f1 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java @@ -5,13 +5,11 @@ import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.BeneficiaryPreferredCallEntity; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.BeneficiaryCallStatus; -import net.gepafin.tendermanagement.enums.RoleStatusEnum; -import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.BeneficiaryPreferredCallReq; import net.gepafin.tendermanagement.model.response.BeneficiaryPreferredCallResponseBean; import net.gepafin.tendermanagement.repositories.BeneficiaryPreferredCallRepository; -import net.gepafin.tendermanagement.service.UserService; +import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.slf4j.Logger; @@ -19,10 +17,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import jakarta.servlet.http.HttpServletRequest; + import java.util.List; import java.util.stream.Collectors; -import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @Component public class BeneficiaryPreferredCallDao { @@ -31,11 +30,14 @@ public class BeneficiaryPreferredCallDao { @Autowired private BeneficiaryPreferredCallRepository beneficiaryPreferredCallRepository; + @Autowired - private UserService userService; + private Validator validator; - public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(BeneficiaryPreferredCallReq request,UserEntity user) { + + public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest httpServletRequest, BeneficiaryPreferredCallReq request,UserEntity user) { log.info("Creating new beneficiary preferred call with details: {}", request); + validator.validateUserWithCompany(httpServletRequest, request.getCompanyId()); BeneficiaryPreferredCallEntity entity = convertRequestToEntity(request,user); entity = beneficiaryPreferredCallRepository.save(entity); log.info("Beneficiary preferred call created with ID: {}", entity.getId()); @@ -44,9 +46,8 @@ public class BeneficiaryPreferredCallDao { private BeneficiaryPreferredCallEntity convertRequestToEntity(BeneficiaryPreferredCallReq request,UserEntity userEntity) { BeneficiaryPreferredCallEntity entity = new BeneficiaryPreferredCallEntity(); - UserEntity user= userService.validateUser(userEntity.getId()); - if (user.getBeneficiary()!=null) { - entity.setBeneficiaryId(user.getBeneficiary().getId()); + if (userEntity.getBeneficiary()!=null) { + entity.setBeneficiaryId(userEntity.getBeneficiary().getId()); } entity.setStatus(BeneficiaryCallStatus.ENABLED.getValue()); entity.setCallId(request.getCallId()); @@ -55,9 +56,10 @@ public class BeneficiaryPreferredCallDao { return entity; } - public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(Long id) { + public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(HttpServletRequest request, Long id) { log.info("Fetching beneficiary preferred call with ID: {}", id); BeneficiaryPreferredCallEntity entity = validateBeneficiaryPreferredCall(id); + validator.validateUserId(request, entity.getUserId()); log.info("Beneficiary preferred call found: {}", entity); return convertEntityToResponse(entity); } @@ -74,20 +76,18 @@ public class BeneficiaryPreferredCallDao { // return convertEntityToResponse(existingEntity); // } - private boolean isUserABeneficiary(Long userId) { - UserEntity user=userService.validateUser(userId); - return RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(user.getRoleEntity().getRoleType()); - } - public void deleteBeneficiaryPreferredCallById(Long id) { + public void deleteBeneficiaryPreferredCallById(HttpServletRequest request, Long id) { log.info("Deleting beneficiary preferred call with ID: {}", id); - validateBeneficiaryPreferredCall(id); + BeneficiaryPreferredCallEntity entity = validateBeneficiaryPreferredCall(id); + validator.validateUserId(request, entity.getUserId()); beneficiaryPreferredCallRepository.deleteById(id); log.info("Beneficiary preferred call deleted with ID: {}", id); } - public List getAllBeneficiaryPreferredCalls() { + public List getAllBeneficiaryPreferredCalls(HttpServletRequest request) { + UserEntity userEntity = validator.validateUser(request); log.info("Fetching all beneficiary preferred calls"); - List calls = beneficiaryPreferredCallRepository.findAll() + List calls = beneficiaryPreferredCallRepository.findByUserId(userEntity.getId()) .stream() .map(this::convertEntityToResponse) .collect(Collectors.toList()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 8cee9587..b52aa97b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -230,6 +230,7 @@ public class CallDao { criteriaEntity = new EvaluationCriteriaEntity(); criteriaEntity.setCall(callEntity); criteriaEntity.setLookupData(lookupDataEntity); + criteriaEntity.setScore(0L); criteriaEntity.setIsDeleted(false); } setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore()); @@ -601,6 +602,7 @@ public class CallDao { dates.add(callEntity.getStartDate()); dates.add(callEntity.getEndDate()); callDetailsResponseBean.setDates(dates); + callDetailsResponseBean.setConfidi(callEntity.getConfidi()); callDetailsResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); callDetailsResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); callDetailsResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); @@ -619,6 +621,7 @@ public class CallDao { callDetailsResponseBean.setPhoneNumber(callEntity.getPhoneNumber()); callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate()); callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); + return callDetailsResponseBean; } @@ -651,7 +654,7 @@ public class CallDao { if (Boolean.FALSE.equals(ROLE_SUPER_ADMIN.getValue().equals(type))) { callStatusList = List.of(CallStatusEnum.PUBLISH.getValue()); } - List calls = callRepository.findByStatusIn(callStatusList); + List calls = callRepository.findByStatusInAndHubId(callStatusList, user.getHub().getId()); return calls.stream() .map(this::convertToCallDetailsResponseBean) .collect(Collectors.toList()); @@ -669,13 +672,13 @@ public class CallDao { callResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); return callResponseBean; } - public CallEntity getCallEntityById(Long id){ - CallEntity callEntity=callRepository.findByIdAndStatusNotIn(id,List.of(CallStatusEnum.PUBLISH.getValue())); - if(callEntity==null){ - throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)); - } - return callEntity; - } +// public CallEntity getCallEntityById(Long id){ +// CallEntity callEntity=callRepository.findByIdAndStatusNotInAndHubId(id, List.of(CallStatusEnum.PUBLISH.getValue())); +// if(callEntity==null){ +// throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)); +// } +// return callEntity; +// } public CallResponse updateCallStatus(CallEntity callEntity, CallStatusEnum statusReq) { CallStatusEnum currentStatus = CallStatusEnum.valueOf(callEntity.getStatus()); @@ -715,9 +718,9 @@ public class CallDao { } } - public CallEntity validatePublishedCall(Long callId) { + public CallEntity validatePublishedCall(Long callId, Long hubId) { CallEntity callEntity= callRepository - .findByIdAndStatus(callId, CallStatusEnum.PUBLISH.getValue()); + .findByIdAndStatusAndHubId(callId, CallStatusEnum.PUBLISH.getValue(), hubId); if(callEntity==null){ throw new ResourceNotFoundException( Status.NOT_FOUND, diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java index 2208962b..84b01021 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java @@ -40,7 +40,7 @@ public class CompanyDao { public CompanyResponse createCompany(UserEntity userEntity, CompanyRequest companyRequest) { - CompanyEntity existingCompany = companyRepository.findByVatNumber(companyRequest.getVatNumber()); + CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId()); UserWithCompanyEntity userWithCompanyEntity = null; if (existingCompany != null) { UserWithCompanyEntity existingRelation = userWithCompanyRepository.findByUserIdAndCompanyIdAndIsDeletedFalse(userEntity.getId(), existingCompany.getId()) @@ -53,8 +53,8 @@ public class CompanyDao { } return convertCompanyEntityToCompanyResponse(existingCompany, userWithCompanyEntity); } else { - validateCompany(companyRequest); - CompanyEntity companyEntity = convertCompanyRequestToCompanyEntity(companyRequest); + validateCompany(userEntity, companyRequest); + CompanyEntity companyEntity = convertCompanyRequestToCompanyEntity(userEntity, companyRequest); companyRepository.save(companyEntity); userWithCompanyEntity = createUserWithCompanyRelation(userEntity, companyEntity, companyRequest.getIsLegalRepresentant()); return convertCompanyEntityToCompanyResponse(companyEntity, userWithCompanyEntity); @@ -62,7 +62,7 @@ public class CompanyDao { } - private void validateCompany(CompanyRequest companyRequest) { + private void validateCompany(UserEntity userEntity, CompanyRequest companyRequest) { if (Boolean.FALSE.equals(StringUtils.isEmpty(companyRequest.getEmail())) && Boolean.FALSE.equals(Utils.isValidEmail(companyRequest.getEmail()))) { @@ -73,7 +73,7 @@ public class CompanyDao { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.VATNUMBER_MANDATORY)); } - if (companyRepository.existsByVatNumber(companyRequest.getVatNumber())) { + if (companyRepository.existsByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId())) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS)); } @@ -91,7 +91,7 @@ public class CompanyDao { return userWithCompanyRepository.save(userWithCompanyEntity); } - private CompanyEntity convertCompanyRequestToCompanyEntity(CompanyRequest request) { + private CompanyEntity convertCompanyRequestToCompanyEntity(UserEntity userEntity, CompanyRequest request) { CompanyEntity entity = new CompanyEntity(); entity.setCompanyName(request.getCompanyName()); entity.setVatNumber(request.getVatNumber()); @@ -108,6 +108,7 @@ public class CompanyDao { entity.setAnnualRevenue(request.getAnnualRevenue()); entity.setContactName(request.getContactName()); entity.setContactEmail(request.getContactEmail()); + entity.setHub(userEntity.getHub()); return entity; } @@ -186,7 +187,7 @@ public class CompanyDao { public List getCompanyByUserId(Long userId) { UserEntity userEntity = userService.validateUser(userId); List activeCompanyIds = userWithCompanyRepository.findActiveCompanyIdsByUserId(userEntity.getId()); - List companies = companyRepository.findByIdIn(activeCompanyIds); + List companies = companyRepository.findByIdInAndHubId(activeCompanyIds, userEntity.getHub().getId()); return companies.stream().map(companyEntity -> { UserWithCompanyEntity userWithCompanyEntity = getUserWithCompany(userEntity.getId(), companyEntity.getId()); return convertCompanyEntityToCompanyResponse(companyEntity, userWithCompanyEntity); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java index a849f67d..c76d14c9 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java @@ -60,7 +60,7 @@ public class DashboardDao { } private void setActiveCalls(Widget1 widget1, UserEntity requestedUserEntity) { - Long activeCalls = callRepository.countByStatus(CallStatusEnum.PUBLISH.getValue()); + Long activeCalls = callRepository.countByStatusAndHubId(CallStatusEnum.PUBLISH.getValue(), requestedUserEntity.getHub().getId()); if (activeCalls != null) { widget1.setNumberOfActiveCalls(activeCalls); } @@ -74,27 +74,27 @@ public class DashboardDao { } } - private void setTotalActiveFinancing(Widget1 widget1, UserEntity requestedUserEntity) { - BigDecimal totalActiveFinancing = callRepository.findTotalAmountOfPublishedCalls(); + private void setTotalActiveFinancing(Widget1 widget1, UserEntity requestedUser) { + BigDecimal totalActiveFinancing = callRepository.findTotalAmountOfPublishedCallsAndHubId(requestedUser.getHub().getId()); widget1.setTotalActiveFinancing(totalActiveFinancing); } private void setSubmittedApplications(Widget1 widget1, UserEntity requestedUserEntity) { - Long submittedApplications = applicationRepository.countSubmittedApplications(); + Long submittedApplications = applicationRepository.countSubmittedApplicationsByHubId(requestedUserEntity.getHub().getId()); if (submittedApplications != null) { widget1.setNumberOfSubmittedApplications(submittedApplications); } } private void setDraftApplications(Widget1 widget1, UserEntity requestedUserEntity) { - Long draftApplications = applicationRepository.countDraftApplications(); + Long draftApplications = applicationRepository.countDraftApplicationsByHubId(requestedUserEntity.getHub().getId()); if (draftApplications != null) { widget1.setNumberOfDraftApplications(draftApplications); } } private void setNumberOfCompanies(Widget1 widget1, UserEntity requestedUserEntity) { - Long numberOfCompanies = companyRepository.countTotalCompanies(); + Long numberOfCompanies = companyRepository.countTotalCompaniesByHubId(requestedUserEntity.getHub().getId()); if (numberOfCompanies != null) { widget1.setNumberOfCompany(numberOfCompanies); } @@ -104,7 +104,7 @@ public class DashboardDao { CompanyEntity company) { BeneficiaryWidgetResponseBean beneficiaryWidgetResponseBean = BeneficiaryWidgetResponseBean.builder() .numberOfApplications(0L).numberOfCalls(0L).numberOfIntegratedDocuments(0L).build(); - Long activeCalls = callRepository.countByStatus(CallStatusEnum.PUBLISH.getValue()); + Long activeCalls = callRepository.countByStatusAndHubId(CallStatusEnum.PUBLISH.getValue(), userEntity.getHub().getId()); if (activeCalls != null) { beneficiaryWidgetResponseBean.setNumberOfCalls(activeCalls); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java index f609086f..20ae2cca 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DelegationDao.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.CompanyEntity; @@ -31,6 +33,7 @@ import net.gepafin.tendermanagement.service.AmazonS3Service; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.DateTimeUtil; 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; @@ -38,7 +41,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.Status; @Component public class DelegationDao { - private static final String DEFAULT_PLACEHOLDER = "____________________"; +// private static final String DEFAULT_PLACEHOLDER = "____________________"; @Autowired private UserService userService; @@ -51,12 +54,18 @@ public class DelegationDao { @Autowired private DocumentRepository documentRepository; + + @Autowired + private S3PathConfig s3ConfigBean; @Value("${aws.s3.url.folder.delegation}") private String s3Folder; @Autowired private UserCompanyDelegationRepository userCompanyDelegationRepository; + + @Autowired + private Validator validator; public ByteArrayOutputStream generateDocument(Map placeholders, String templateName) { @@ -89,9 +98,10 @@ public class DelegationDao { return new XWPFDocument(templateStream); } - public ByteArrayOutputStream downloadCompanyDelegation(UserEntity userEntity, Long companyId, CompanyDelegationRequest companyDelegationRequest) { + public ByteArrayOutputStream downloadCompanyDelegation(HttpServletRequest request, Long companyId, CompanyDelegationRequest companyDelegationRequest) { Map placeholders = getDefaultPlaceholders(); - UserResponseBean user = userService.getUserById(userEntity.getId()); + UserEntity userEntity = validator.validateUser(request); + UserResponseBean user = userService.getUserById(request, userEntity.getId()); CompanyEntity companyEntity = companyDao.validateCompany(companyId); companyDao.getUserWithCompany(userEntity.getId(), companyId); updatePlaceholdersForDelegation(user, companyEntity, placeholders, companyDelegationRequest); @@ -179,7 +189,7 @@ public class DelegationDao { userCompanyDelegationEntity.setStatus(UserCompanyDelegationStatusEnum.INACTIVE.getValue()); userCompanyDelegationRepository.save(userCompanyDelegationEntity); } - UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, file); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = uploadFileOnAmazonS3ForCompanyDelegation(file); userCompanyDelegationEntity = new UserCompanyDelegationEntity(); userCompanyDelegationEntity.setCompanyId(companyId); userCompanyDelegationEntity.setUserId(userEntity.getId()); @@ -192,7 +202,21 @@ public class DelegationDao { userCompanyDelegationRepository.save(userCompanyDelegationEntity); return convertUserCompanyDelegationToCompanyDelegationResponse(userCompanyDelegationEntity); } - + private UploadFileOnAmazonS3Response uploadFileOnAmazonS3ForCompanyDelegation(MultipartFile file) { + try { + String s3Path = generateS3PathForDelegation(); + return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); + } catch (Exception e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); + } + } + private String generateS3PathForDelegation() { + try { + return s3ConfigBean.generateDocumentPathForDelegationAndSignedDocument(DocOtherSourceTypeEnum.USER_DELEGATION); + } catch (IllegalArgumentException e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); + } + } private CompanyDelegationResponse convertUserCompanyDelegationToCompanyDelegationResponse( UserCompanyDelegationEntity userCompanyDelegationEntity) { return Utils.convertSourceObjectToDestinationObject(userCompanyDelegationEntity, CompanyDelegationResponse.class); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index 90725964..226848f7 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -2,7 +2,10 @@ package net.gepafin.tendermanagement.dao; import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -24,6 +27,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.Status; import java.util.ArrayList; import java.util.List; +@Slf4j @Component public class DocumentDao { @@ -38,6 +42,12 @@ public class DocumentDao { @Autowired private CallService callService; + + @Autowired + private S3PathConfig s3ConfigBean; + + @Autowired + private ApplicationRepository applicationFormRepository; @Value("${aws.s3.url.folder}") private String s3Folder; @@ -46,8 +56,7 @@ public class DocumentDao { List documentEntities = new ArrayList<>(); Long source = resolveSourceId(sourceId, sourceType); for (MultipartFile file : files) { - UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, - file); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = uploadFileOnAmazonS3(file, sourceType, sourceId); if (uploadFileOnAmazonS3Response != null) { DocumentEntity documentEntity = new DocumentEntity(); documentEntity.setFileName(uploadFileOnAmazonS3Response.getFileName()); @@ -62,6 +71,30 @@ public class DocumentDao { documentRepository.saveAll(documentEntities); return documentEntities.stream().map(callDao::convertToDocumentResponseBean).collect(Collectors.toList()); } + private UploadFileOnAmazonS3Response uploadFileOnAmazonS3(MultipartFile file, DocumentSourceTypeEnum type, Long sourceId) { + + Long applicationId = 0L; + Long callId = sourceId; + if (type == DocumentSourceTypeEnum.APPLICATION) { + applicationId = sourceId; + callId = applicationFormRepository.findCallIdById(applicationId); + } + try { + String s3Path = generateS3Path(type, callId, applicationId); + log.info("Generated S3 path {}", s3Path); + return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); + } catch (Exception e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); + } + } + public String generateS3Path(DocumentSourceTypeEnum typeOfDocument, Long callId, Long applicationId) { + + try { + return s3ConfigBean.generateDocumentPath(typeOfDocument, callId, applicationId); + } catch (IllegalArgumentException e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.S3_PATH_GENERATION_ERROR_MSG)); + } + } private Long resolveSourceId(Long sourceId, DocumentSourceTypeEnum sourceType) { if (sourceType == DocumentSourceTypeEnum.CALL) { CallEntity callEntity = callService.validateCall(sourceId); @@ -91,8 +124,9 @@ public class DocumentDao { public DocumentResponseBean updateDocument(Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { DocumentEntity documentEntity = validateDocument(documentId); - UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = amazonS3Service.uploadFileOnAmazonS3(s3Folder, file); - if (uploadFileOnAmazonS3Response != null) { + String type = documentEntity.getSource(); + UploadFileOnAmazonS3Response uploadFileOnAmazonS3Response = updateFileOnAmazonS3(file, DocumentSourceTypeEnum.valueOf(type), documentEntity.getSourceId()); + if (uploadFileOnAmazonS3Response != null) { documentEntity.setFileName(uploadFileOnAmazonS3Response.getFileName()); documentEntity.setFilePath(uploadFileOnAmazonS3Response.getFilePath()); documentEntity.setType(documentTypeEnum.getValue()); @@ -102,7 +136,25 @@ public class DocumentDao { } return callDao.convertToDocumentResponseBean(documentEntity); } + private UploadFileOnAmazonS3Response updateFileOnAmazonS3(MultipartFile file, DocumentSourceTypeEnum type, Long id) { + try { + Long callId; + Long applicationId; + if(type.equals("APPLICATION")){ + callId = applicationFormRepository.findCallIdById(id); + applicationId = id; + }else{ + callId = id; + applicationId = 0L; + } + String s3Path = generateS3Path(type, callId, applicationId); + log.info("Generated S3 path {}", s3Path); + return amazonS3Service.uploadFileOnAmazonS3(s3Path, file); + } catch (Exception e) { + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.UPLOAD_ERROR_S3)); + } + } public DocumentResponseBean getDocument(Long documentId) { DocumentEntity documentEntity = validateDocument(documentId); return callDao.convertToDocumentResponseBean(documentEntity); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java index b865121e..86a7693f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java @@ -50,7 +50,10 @@ public class EvaluationCriteriaDao { .validateLookUpData(evaluationCriteriaRequest.getLookUpDataId()); entity.setCall(callEntity); entity.setLookupData(looDataEntity); - entity.setScore(evaluationCriteriaRequest.getScore()); + entity.setScore(0L); + if (evaluationCriteriaRequest.getScore() != null) { + entity.setScore(evaluationCriteriaRequest.getScore()); + } entity = evaluationCriteriaRepository.save(entity); return entity; } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/LoginAttemptDao.java b/src/main/java/net/gepafin/tendermanagement/dao/LoginAttemptDao.java index 509d4843..9ff64040 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/LoginAttemptDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/LoginAttemptDao.java @@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.dao; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.LoginAttemptEntity; +import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.model.response.LoginAttemptPageableResponseBean; import net.gepafin.tendermanagement.repositories.LoginAttemptRepository; import net.gepafin.tendermanagement.util.DateTimeUtil; @@ -29,7 +30,7 @@ public class LoginAttemptDao { loginAttemptRepository.save(loginAttemptEntity); } - public LoginAttemptPageableResponseBean> getLoginAttemptsList(Integer pageNo, Integer pageLimit) { + public LoginAttemptPageableResponseBean> getLoginAttemptsList(UserEntity userEntity, Integer pageNo, Integer pageLimit) { if (pageLimit == null || pageLimit <= 0) { pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT; } @@ -38,7 +39,7 @@ public class LoginAttemptDao { pageNo = GepafinConstant.DEFAULT_PAGE; } - Page page = loginAttemptRepository.findAll(PageRequest.of(pageNo - 1, pageLimit, Sort.by(GepafinConstant.ATTEMPT_DATE).descending())); + Page page = loginAttemptRepository.findByHubId(userEntity.getHub().getId(), PageRequest.of(pageNo - 1, pageLimit, Sort.by(GepafinConstant.ATTEMPT_DATE).descending())); List list = new ArrayList<>(); for (LoginAttemptEntity loginAttemptEntity : page.getContent()) { list.add(loginAttemptEntity); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java index 18d3bf1e..a2c03a5b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java @@ -14,13 +14,17 @@ import net.gepafin.tendermanagement.entities.*; import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest; import net.gepafin.tendermanagement.model.response.*; import net.gepafin.tendermanagement.service.CallService; +import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.util.Validator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; //import com.itextpdf.layout.element. import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.*; import java.util.List; import java.util.stream.Collectors; @@ -37,6 +41,7 @@ public class PdfDao { @Autowired private Validator validator; + public static final Logger log = LoggerFactory.getLogger(PdfDao.class); public byte[] generatePdf(HttpServletRequest request,Long applicationId) { try { @@ -55,7 +60,8 @@ public class PdfDao { // writer.setPageEvent(pageEvent); document.open(); // pageEvent.setTotalPages(writer.getPageNumber()); - addLogo(document, "https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/logo.jpg"); // Add your image path here +// addLogo(document, "logo.jpg"); // Add your image path here the migration code after cherry-pick + addLogo(document, "https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/logo.jpg"); BaseColor customColor = new BaseColor(0, 128, 0); // Adjust RGB values as needed @@ -77,18 +83,7 @@ public class PdfDao { ApplicationGetResponseBean applicationGetResponseBean=applicationDao.getApplicationByFormId(request, applicationId, null); for(FormApplicationResponse formApplicationResponse: applicationGetResponseBean.getForm()) { - document.add(new Paragraph(formApplicationResponse.getLabel(),sectionFont)); - document.add(new Paragraph(" ")); // Add line break - List fieldLabelValuePairRequests = getFormFieldsToLabels(formApplicationResponse); - for (FieldLabelValuePairRequest pair : fieldLabelValuePairRequests) { - String label = pair.getLabel(); - Object value = pair.getValue(); - Integer pages=0; - pages=addLabelValuePair(writer,document, label, value, labelFont,valueFont,call.getName(),pages); - if(pages !=0 ){ -// pageEvent.setTotalPages(writer.getPageNumber()); - } - } + List fieldLabelValuePairRequests = getFormFieldsToLabels(formApplicationResponse,writer,document); addColoredLines(writer,document,greenColor); document.add(new Paragraph(" ")); // Add line break } @@ -164,15 +159,6 @@ public class PdfDao { addColoredLines(writer,document,greenColor); -// System.out.println(writer.getPageSize()); -// System.out.println(document.getPageSize()); -// System.out.println(document.getPageNumber()); -// System.out.println(writer.getPageNumber()); -// document.setPageCount(100); -// document.setPageCount(writer.getPageNumber()); -// System.out.println(document.getPageNumber()); - - // Close the document document.close(); // Convert to byte array for response @@ -185,12 +171,13 @@ public class PdfDao { return null; } - private Integer addLabelValuePair(PdfWriter writer,Document document, String label, Object value, Font labelFont,Font valueFont,String title,Integer totalPages) throws DocumentException { + private void addLabelValuePair(PdfWriter writer,Document document, String label, Object value, Font labelFont,Font valueFont,ContentResponseBean contentResponseBean) throws DocumentException { // Add label + Map stateFieldMap= new HashMap<>(); + Paragraph labelParagraph = new Paragraph(label, labelFont); document.add(labelParagraph); float leftMargin = 20f; - PdfContentByte canvas = writer.getDirectContent(); // Setting the color and width of the line @@ -204,8 +191,6 @@ public class PdfDao { if (yPos <= 140) { // If xEnd is less than or equal to 200, generate a new page - - totalPages++; document.newPage(); } // Add a gap between the label and value document.add(new Paragraph(" ")); // Adding an empty paragraph for spacing @@ -235,204 +220,179 @@ public class PdfDao { // Finally, add the table to the document document.add(valueTable); - } else { - boolean containsThreeValues = false; // Variable to track if any map contains three keys - List> dataList = (List>) value; // Cast Object to List of Maps - for (Map entry : dataList) { - if (entry.size() == 3) { // Check if the current map has three keys - containsThreeValues = true; // If found, set the variable to true - break; // No need to check further, exit loop - } - } - List> extractedData = new ArrayList<>(); // To hold extracted data - for (Map entry : dataList) { - Map extractedMap = new HashMap<>(); // To hold the current extracted row of data + } + else if (!list.isEmpty() && list.get(0) instanceof Map) { + Object object = value; + String stringvalue = Utils.convertToString(object); + List> fieldValueList = Utils.convertJsonStringIntoJsonList(stringvalue); - List keys = new ArrayList<>(entry.keySet()); // Get all keys in the current map - - // Handle based on the number of keys in the map - if (Boolean.FALSE.equals(containsThreeValues) && keys.size() == 2) { - // Treat the first key as the "key" and second key as the "value" - String heading = (String) entry.get(keys.get(0)); // Get value of first key - String value1 = (String) entry.get(keys.get(1)); // Get value of second key - extractedMap.put(heading,value1); // Store the first key's value as "heading" - } if (Boolean.TRUE.equals(containsThreeValues) ) { - String amount=""; - // Treat the first as number, second as description, third as amount - if(keys.size()==3){ - amount = (String) entry.get(keys.get(2)); // Third key's value - } - String number = (String) entry.get(keys.get(0)); // First key's value - String description = (String) entry.get(keys.get(1)); // Second key's value - - // Store the combined result as a value in the map, with a suitable key - String combinedValue = number + "; " + description + "; " + amount; // Concatenate them as a single value - extractedMap.put("combined", combinedValue); // Store as a single entry, key as "combined" - } - - extractedData.add(extractedMap); // Add each extracted map to the list - } - document=createPdfTable(extractedData,document); + document = createPdfTable(fieldValueList, document, contentResponseBean); } } else { - PdfPCell valueCell = new PdfPCell(new Phrase(String.valueOf(value), valueFont)); - valueCell.setPadding(5f); // Increase padding for better spacing - valueCell.setPaddingLeft(leftMargin); // Increase left margin for value - valueCell.setBorder(Rectangle.NO_BORDER); // Remove border for value cell - valueCell.setMinimumHeight(30f); - valueCell.setVerticalAlignment(Element.ALIGN_MIDDLE); - valueCell.setCellEvent(new RoundedCorners()); // Apply rounded corners - valueTable.addCell(valueCell); - document.add(valueTable); + String fieldValue=Utils.convertToString(value); + Image img = null; // This may throw MalformedURLException + if (fieldValue.trim().equalsIgnoreCase("true")) { + // Use images for tick and cross + try { +// img = Image.getInstance("true.jpg"); update code after cherry-pick + img = Image.getInstance("https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/true.png"); + } catch (IOException e) { + log.error("Error while uploading image for pdf for true"); + } + img.scaleAbsolute(15, 15); // Resize the image if needed + + PdfPCell cell = new PdfPCell(img); + cell.setPadding(0); // Remove padding + cell.setBorder(Rectangle.NO_BORDER); // Remove border + cell.setMinimumHeight(15f); // Set height to fit checkbox image + cell.setVerticalAlignment(Element.ALIGN_MIDDLE); + cell.setHorizontalAlignment(Element.ALIGN_LEFT); // Align the checkbox image to the left + + valueTable.addCell(cell); // Add cell with checkbox to the table + document.add(valueTable); + } else if (fieldValue.trim().equalsIgnoreCase("false")) { + // Use images for tick and cross + try { + img = Image.getInstance("https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/false.png"); + } catch (IOException e) { + log.error("Error while uploading image for pdf for false"); + } + img.scaleAbsolute(15, 15); // Resize the image if needed + + PdfPCell cell = new PdfPCell(img); + cell.setPadding(0); // Remove padding + cell.setBorder(Rectangle.NO_BORDER); // Remove border + cell.setMinimumHeight(15f); // Set height to fit checkbox image + cell.setVerticalAlignment(Element.ALIGN_MIDDLE); + cell.setHorizontalAlignment(Element.ALIGN_LEFT); // Align the checkbox image to the left + + valueTable.addCell(cell); // Add cell with checkbox to the table + document.add(valueTable); + } + else { + PdfPCell valueCell = new PdfPCell(new Phrase(String.valueOf(value), valueFont)); + valueCell.setPadding(5f); // Increase padding for better spacing + valueCell.setPaddingLeft(leftMargin); // Increase left margin for value + valueCell.setBorder(Rectangle.NO_BORDER); // Remove border for value cell + valueCell.setMinimumHeight(30f); + valueCell.setVerticalAlignment(Element.ALIGN_MIDDLE); + valueCell.setCellEvent(new RoundedCorners()); // Apply rounded corners + + valueTable.addCell(valueCell); + document.add(valueTable); + } + } - document.add(new Paragraph("\n")); // Add line break after each value - return totalPages; } - private Document createPdfTable(List> extractedData,Document document) throws DocumentException { - // Create a PdfPTable with 2 columns - PdfPTable table = new PdfPTable(2); // Initial assumption for 2 columns + private Document createPdfTable(List> extractedData, Document document, ContentResponseBean contentResponseBean) throws DocumentException { + // Create a PdfPTable with dynamic column count based on stateFieldMap size + Map stateFieldMap = new HashMap<>(); + Map stateFieldBoolean = new HashMap<>(); + + // Populate stateFieldMap from contentResponseBean settings + contentResponseBean.getSettings().stream() + .filter(setting -> "table_columns".equals(setting.getName())) // Check for "table_columns" + .map(SettingResponseBean::getValue) + .filter(Objects::nonNull) // Ensure value is not null + .filter(settingValue -> settingValue instanceof Map) // Ensure value is a Map + .map(settingValue -> (Map) settingValue) // Cast to Map + .map(valueMap -> (List>) valueMap.get("stateFieldData")) // Extract stateFieldData list + .filter(Objects::nonNull) // Ensure stateFieldData is not null + .flatMap(List::stream) // Flatten the list of field data maps + .forEach(fieldData -> { + String fieldName = (String) fieldData.get("name"); // Get the name field + String fieldDataValue = (String) fieldData.get("label"); // Get the predefined field + + if (fieldName != null && fieldDataValue != null) { + stateFieldMap.put(fieldName, fieldDataValue); + } + }); + contentResponseBean.getSettings().stream() + .filter(setting -> "table_columns".equals(setting.getName())) // Check for "table_columns" + .map(SettingResponseBean::getValue) + .filter(Objects::nonNull) // Ensure value is not null + .filter(settingValue -> settingValue instanceof Map) // Ensure value is a Map + .map(settingValue -> (Map) settingValue) // Cast to Map + .map(valueMap -> (List>) valueMap.get("stateFieldData")) // Extract stateFieldData list + .filter(Objects::nonNull) // Ensure stateFieldData is not null + .flatMap(List::stream) // Flatten the list of field data maps + .forEach(fieldData -> { + String fieldName = (String) fieldData.get("name"); // Get the name field + Boolean predefined = (Boolean) fieldData.get("predefined"); // Get the predefined field + if (fieldName != null && fieldName != null) { + stateFieldBoolean.put(fieldName, predefined); + } + }); + PdfPTable table = new PdfPTable(stateFieldMap.size()); // Number of columns equals the number of map entries table.setWidthPercentage(100); // Set table width to 100% table.setTableEvent(new RoundedBorderEvent()); + Font textFont = FontFactory.getFont(FontFactory.HELVETICA, 12, Font.NORMAL, new BaseColor(105, 105, 105)); // Gray text - boolean combinedHeaderAdded = false; // Flag to track if headers for combined have been added - float rowHeight = 50f; // Example row height, adjust as necessary + float rowHeight = 20f; // Example row height float maxTableHeight = 700f; // Maximum height of the table before a page break - float[] columnWidths = {0.7f, 0.3f}; - table.setWidths(columnWidths); + boolean headersAdded = false; // Flag to check if headers have been added - -// Add table header -// Populate the table with extracted data and style rows - for (Map row : extractedData) { - for (Map.Entry entry : row.entrySet()) { - String key = entry.getKey(); // This will give you the key - String value = entry.getValue(); // This will give you the value - - // Check if the current entry is for the combined section - if ("combined".equals(key)) { - // Ensure the combined header is added only once - if (!combinedHeaderAdded) { - // Create a new table for combined entries - table = new PdfPTable(3); // 3 columns for combined entries - - PdfPCell headerCell1 = new PdfPCell(new Phrase("Number")); - headerCell1.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align - headerCell1.setVerticalAlignment(Element.ALIGN_MIDDLE); - headerCell1.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header - table.addCell(headerCell1); - - PdfPCell headerCell2 = new PdfPCell(new Phrase("Details")); - headerCell2.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align - headerCell2.setVerticalAlignment(Element.ALIGN_MIDDLE); - headerCell2.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header - table.addCell(headerCell2); - - PdfPCell headerCell3 = new PdfPCell(new Phrase("Amount")); - headerCell3.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align - headerCell3.setVerticalAlignment(Element.ALIGN_MIDDLE); - headerCell3.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header - table.addCell(headerCell3); - - combinedHeaderAdded = true; // Mark header as added - } - - // Split the value for "combined" into separate parts - String[] combinedValues = value.split("; "); - - // Check if we have 3 parts (number, description, amount) - String number = combinedValues[0]; // 1st part (number) - String description = combinedValues[1]; // 2nd part (description) - String amount = ""; - if (combinedValues.length == 3) { - amount = combinedValues[2]; // 3rd part (amount) - } - - // Create PDF cells using the split values - PdfPCell cellNumber = new PdfPCell(new Phrase(number, textFont)); // Cell for number - PdfPCell cellDescription = new PdfPCell(new Phrase(description, textFont)); // Cell for description - PdfPCell cellAmount = new PdfPCell(new Phrase(amount, textFont)); // Cell for amount - - // Set row background color for combined values - cellNumber.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for combined rows - cellDescription.setBackgroundColor(new BaseColor(239, 243, 248)); - cellAmount.setBackgroundColor(new BaseColor(239, 243, 248)); - - // Set cell height and add rounded borders -// cellNumber.setFixedHeight(rowHeight); -// cellDescription.setFixedHeight(rowHeight); -// cellAmount.setFixedHeight(rowHeight); - - cellNumber.setMinimumHeight(20f); // Set minimum height for better appearance - cellDescription.setMinimumHeight(20f); // Set minimum height for better appearance - cellAmount.setMinimumHeight(20f); // Set minimum height for better appearance - - cellNumber.setPadding(7f); - cellDescription.setPadding(7f); - cellAmount.setPadding(7f); - - // Add the cells to the table only once - table.addCell(cellNumber); - table.addCell(cellDescription); - table.addCell(cellAmount); - - - } else { - if (!combinedHeaderAdded) { - // Create a new table for combined entries - table= new PdfPTable(2); // 3 columns for combined entries - table.setWidthPercentage(100); - - PdfPCell headerCell1 = new PdfPCell(new Phrase("Details")); - headerCell1.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align - headerCell1.setVerticalAlignment(Element.ALIGN_MIDDLE); - headerCell1.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header - table.addCell(headerCell1); - - PdfPCell headerCell2 = new PdfPCell(new Phrase("Amount")); - headerCell2.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align - headerCell2.setVerticalAlignment(Element.ALIGN_MIDDLE); - headerCell2.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header - table.addCell(headerCell2); - combinedHeaderAdded=true; -} - // Add cells for regular key-value pairs without headers - PdfPCell cellKey = new PdfPCell(new Phrase(key, textFont)); - PdfPCell cellValue = new PdfPCell(new Phrase(value, textFont)); - - // Set background color for both cells - cellKey.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for other rows - cellValue.setBackgroundColor(new BaseColor(239, 243, 248)); - - cellKey.setPadding(7f); - cellValue.setPadding(7f); - // Set cell height and add rounded borders - cellKey.setFixedHeight(rowHeight); - cellValue.setFixedHeight(rowHeight); - - // Add the cells to the table - table.addCell(cellKey); - table.addCell(cellValue); - } - if (table.getTotalHeight() + rowHeight > maxTableHeight) { - // Start a new page if needed - document.add(table); - table = new PdfPTable(2); // Reset table for new page - table.setWidthPercentage(100); // Reset width percentage - combinedHeaderAdded = false; // Reset header flag - } + List trueKeys = new ArrayList<>(); + List falseKeys = new ArrayList<>(); + for (Map.Entry entry : stateFieldBoolean.entrySet()) { + if (Boolean.TRUE.equals(entry.getValue())) { + trueKeys.add(entry.getKey()); // Store true keys + } else { + falseKeys.add(entry.getKey()); // Store false keys } } - document.add(table); // Add the last table before returning + List orderedKeys = new ArrayList<>(trueKeys); + orderedKeys.addAll(falseKeys); + // Iterate through extracted data to populate the table + for (Map row : extractedData) { + // Add headers once + if (!headersAdded) { + for (String key : orderedKeys) { + String headerValue = stateFieldMap.get(key); // Header text + PdfPCell headerCell = new PdfPCell(new Phrase(headerValue)); // Create a new PdfPCell for the header + headerCell.setHorizontalAlignment(Element.ALIGN_CENTER); // Center align + headerCell.setVerticalAlignment(Element.ALIGN_MIDDLE); + headerCell.setBackgroundColor(new BaseColor(178, 190, 181)); // Light gray background for header + table.addCell(headerCell); // Add the header cell to the table + } + headersAdded = true; // Prevent headers from being added again + } + + // Add data rows matching stateFieldMap keys + for (Map.Entry stateField : stateFieldMap.entrySet()) { + for (String key : orderedKeys) { // Iterate over the ordered keys + Object value = row.getOrDefault(key, ""); // Fetch value or use empty string if key not present + PdfPCell dynamicCell = new PdfPCell(new Phrase(value != null ? value.toString() : "", textFont)); + dynamicCell.setBackgroundColor(new BaseColor(239, 243, 248)); // Light blue for the cell + dynamicCell.setMinimumHeight(rowHeight); + dynamicCell.setPadding(7f); + + table.addCell(dynamicCell); // Add the dynamically created cell to the table + } + } + + // Check if adding another row would exceed max height + if (table.getTotalHeight() + rowHeight > maxTableHeight) { + document.add(table); // Add the table to the document + document.newPage(); // Start a new page + table = new PdfPTable(stateFieldMap.size()); // Create a new table for the new page + table.setWidthPercentage(100); // Reset table width + + headersAdded = false; // Reset the header flag for the new page + } + } + + // Add the last table to the document + document.add(table); - // Check if adding a new row would exceed the maximum height -// Return the populated table return document; } + public static class RoundedBorderEvent implements PdfPTableEvent { @Override public void tableLayout(PdfPTable table, float[][] widths, float[] heights, @@ -453,82 +413,98 @@ public class PdfDao { canvas.stroke(); } } - public List getFormFieldsToLabels(FormApplicationResponse responseBean) { + public List getFormFieldsToLabels(FormApplicationResponse responseBean,PdfWriter writer,Document document) { List labelValuePairs = new ArrayList<>(); - // Iterate through each form in the application response - - List formFields = responseBean.getFormFields(); - List contents = responseBean.getContent(); - - // Iterate through each formField in the current form - for (ApplicationFormFieldResponseBean formField : formFields) { - String fieldId = formField.getFieldId(); - Object fieldValue = formField.getFieldValue(); - - // Find the content in the form that matches the fieldId - Optional matchingContent = contents.stream() - .filter(content -> content.getId().equals(fieldId)) - .findFirst(); + Font labelFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 12,new BaseColor(113,121,126)); // Light grey); + Font valueFont=FontFactory.getFont(FontFactory.HELVETICA_BOLD,10,new BaseColor(178, 190, 181)); - // If the content with the matching fieldId is found, create a label-value pair - if (matchingContent.isPresent()) { - String name = matchingContent.get().getName(); - if (name.equals("fileupload")) { + // Get form fields and contents from the response + List formFields = responseBean.getFormFields(); + List contents = responseBean.getContent(); -// Step 1: Check if fieldValue is an instance of List - if (fieldValue instanceof List && ((List) fieldValue).stream().allMatch(item -> item instanceof DocumentResponseBean)) { - // Step 2: Safely cast to List - List documentList = (List) fieldValue; + // Iterate through each content in the response + for (ContentResponseBean content : contents) { + String contentId = content.getId(); // Content ID + String label = content.getLabel(); // Content label + String name = content.getName(); // Content name + Object fieldValue = null; - // Step 3: Extract names from the document list - List names = documentList.stream() - .map(DocumentResponseBean::getName) // Extract the name from each DocumentResponseBean - .collect(Collectors.toList()); + String contentLabel = content.getSettings().stream() + .filter(setting -> "label".equals(setting.getName())) // Filter settings by name + .map(SettingResponseBean::getValue) // Extract the value from the matching setting + .map(Object::toString) // Convert the value to a string + .findFirst() // Get the first matching value + .orElse(null); // If no match is found, set label to null + // Find the form field in the response that matches the contentId + Optional matchingFormField = formFields.stream() + .filter(formField -> formField.getFieldId().equals(contentId)) + .findFirst(); - fieldValue=names; - } + // If a matching form field is found, process its value + if (matchingFormField.isPresent()) { + ApplicationFormFieldResponseBean formField = matchingFormField.get(); + fieldValue = formField.getFieldValue(); + + // If fieldValue is null, set it to an empty string + if (fieldValue == null) { + fieldValue = ""; + } + + // Process 'fileupload' and 'checkboxes' cases as in the original logic + if (name.equals("fileupload")) { + if (fieldValue instanceof List && ((List) fieldValue).stream().allMatch(item -> item instanceof DocumentResponseBean)) { + List documentList = (List) fieldValue; + List names = documentList.stream() + .map(DocumentResponseBean::getName) + .collect(Collectors.toList()); + fieldValue = names; } - if(name.equals("checkboxes")) { - List check = (List) fieldValue; - List settingResponseBeans = matchingContent.get().getSettings(); - for (SettingResponseBean settingResponseBean : settingResponseBeans) { - // Initialize a list to hold matched labels for each SettingResponseBean - List matchedLabels = new ArrayList<>(); - if (settingResponseBean.getValue() instanceof List) { + } else if (name.equals("checkboxes")) { + List check = (List) fieldValue; + List settingResponseBeans = content.getSettings(); + List matchedLabels = new ArrayList<>(); - List valueList = (List) settingResponseBean.getValue(); - if (!valueList.isEmpty() && valueList.get(0) instanceof Map) { - // Cast to List> - List> options = (List>) valueList; - for (Map field : options) { - for (String val : check) { - String name1=field.get("name"); - if (val.equals(name1)) { // Check if the key exists in the current field map - String label = field.get("label"); // Extract the label - if (field != null) { // Check if the value is not null - matchedLabels.add(label); // Add the value to the matchedValues list - } - } + for (SettingResponseBean settingResponseBean : settingResponseBeans) { + if (settingResponseBean.getValue() instanceof List) { + List> options = (List>) settingResponseBean.getValue(); + + for (Map field : options) { + for (String val : check) { + String name1 = field.get("name"); + if (val.equals(name1)) { + String labelVal = field.get("label"); + if (labelVal != null) { + matchedLabels.add(labelVal); } } - fieldValue = matchedLabels; } } } } - String label = matchingContent.get().getLabel(); - // Add the label-value pair to the list - if (fieldValue != null && !fieldValue.toString().trim().isEmpty()) { - fieldValue = findLabelInOptions(matchingContent.get().getSettings(), fieldValue); - labelValuePairs.add(new FieldLabelValuePairRequest(label, fieldValue)); - } + fieldValue = matchedLabels; } + + // Further processing of field value (e.g., finding labels in options) + fieldValue = findLabelInOptions(content.getSettings(), fieldValue); + } else { + // If no matching form field is found, store contentId with an empty string + fieldValue = ""; } + try { + addLabelValuePair(writer,document, contentLabel, fieldValue, labelFont,valueFont,content); + } catch (DocumentException e) { + log.error("Error checking object: " + e.getMessage(), e); + + } +// } labelValuePairs.add(new FieldLabelValuePairRequest(contentLabel, fieldValue)); + } + return labelValuePairs; } + public static Object findLabelInOptions(List settings, Object valueToFind) { ObjectMapper objectMapper = new ObjectMapper(); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/S3ConfigDao.java b/src/main/java/net/gepafin/tendermanagement/dao/S3ConfigDao.java new file mode 100644 index 00000000..3661ad02 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/S3ConfigDao.java @@ -0,0 +1,104 @@ +package net.gepafin.tendermanagement.dao; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.model.request.S3ConfigReq; +import net.gepafin.tendermanagement.model.response.S3ConfigBean; +import net.gepafin.tendermanagement.repositories.S3ConfigRepository; +import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Optional; + +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; + +@Component +public class S3ConfigDao { + private static final Logger log = LoggerFactory.getLogger(S3ConfigDao.class); + + @Autowired + S3ConfigRepository s3ConfigRepository; + + public S3ConfigBean addS3Path(S3ConfigReq s3PathConfigurationReq) { + + log.info("Adding s3 s3PathConfigurationReq structure with it's type.."); + S3ConfigEntity s3PathConfigurationEntity = convertToS3pathEntity(s3PathConfigurationReq); + s3PathConfigurationEntity = s3ConfigRepository.save(s3PathConfigurationEntity); + log.info("Added s3 path config details {} to DB.", s3PathConfigurationEntity); + return convertToS3pathBean(s3PathConfigurationEntity); + } + private S3ConfigEntity convertToS3pathEntity(S3ConfigReq s3PathConfigReq) { + + S3ConfigEntity s3PathConfigEntity = new S3ConfigEntity(); + s3PathConfigEntity.setPath(s3PathConfigReq.getPath()); + s3PathConfigEntity.setType(s3PathConfigReq.getType()); + s3PathConfigEntity.setBucketName(s3PathConfigReq.getBucketName()); + return s3PathConfigEntity; + } + private S3ConfigBean convertToS3pathBean(S3ConfigEntity s3PathConfigReq) { + + S3ConfigBean s3PathConfigBean = new S3ConfigBean(); + s3PathConfigBean.setPath(s3PathConfigReq.getPath()); + s3PathConfigBean.setType(s3PathConfigReq.getType()); + s3PathConfigBean.setBucketName(s3PathConfigReq.getBucketName()); + return s3PathConfigBean; + } + + public Optional getS3PathByType(String type) { + + log.info("Fetching S3-Path structure by type: {}", type); + Optional s3PathData = s3ConfigRepository.getPathByType(type); + if (s3PathData == null) { + log.error("No S3-Path found for type: {}", type); + throw new CustomValidationException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.S3_PATH_STRUCTURE_NOT_FOUND_BY_TYPE_MSG)); + } + log.info("Fetched S3-Path: {} for type: {}", s3PathData, type); + return s3PathData; + } + + public S3ConfigEntity deleteS3PathConfigById(Long id) { + + log.info("Checking s3-path associated with this id {} to delete....", id); + S3ConfigEntity s3PathConfigData = s3ConfigRepository.findS3PathConfigurationById(id); + if (s3PathConfigData == null) { + log.error("No S3-Path found for id: {}", id); + throw new CustomValidationException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.S3_PATH_STRUCTURE_NOT_FOUND_BY_ID_MSG)); + } else { + log.info("Found s3-path associated with this id {} to delete.", id); + s3ConfigRepository.deleteById(id); + log.error("Deleted s3-path configuration successfully for id: {}", id); + return s3PathConfigData; + } + } + public S3ConfigBean updateS3PathConfiguration(S3ConfigReq s3PathConfigurationReq, Long id) { + + log.info("Updating S3-path Configuration."); + S3ConfigEntity s3PathConfigDataExists = s3ConfigRepository.findS3PathConfigurationById(id); + if (s3PathConfigDataExists == null) { + log.error("No S3-Path found for id: {}", id); + throw new CustomValidationException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.S3_PATH_STRUCTURE_NOT_FOUND_BY_ID_MSG)); + } else { + Optional s3PathData = s3ConfigRepository.getPathByType(s3PathConfigurationReq.getType()); + if(s3PathData != null){ + log.error("S3-Path type already exist. {}", s3PathData); + throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.S3_PATH_CONFIG_DUPLICATE_TYPE_ALREADY_EXIST)); + } + S3ConfigEntity s3PathConfigurationEntity = convertToS3pathEntity(s3PathConfigurationReq); + setIfUpdated(s3PathConfigurationEntity::getPath, s3PathConfigurationEntity::setPath, s3PathConfigurationReq.getPath()); + setIfUpdated(s3PathConfigurationEntity::getBucketName, s3PathConfigurationEntity::setBucketName, s3PathConfigurationReq.getBucketName()); + setIfUpdated(s3PathConfigurationEntity::getType, s3PathConfigurationEntity::setType, s3PathConfigurationReq.getType()); +// s3PathConfigurationEntity.setType(s3PathConfigurationReq.getType()); +// s3PathConfigurationEntity.setPath(s3PathConfigurationReq.getPath()); +// s3PathConfigurationEntity.setBucketName(s3PathConfigurationReq.getBucketName()); + s3ConfigRepository.save(s3PathConfigurationEntity); + log.info("Updated S3-path-configuration successfully."); + return convertToS3pathBean(s3PathConfigurationEntity); + } + + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java new file mode 100644 index 00000000..b127b699 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/S3PathConfig.java @@ -0,0 +1,49 @@ +package net.gepafin.tendermanagement.dao; + +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; +import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; +import net.gepafin.tendermanagement.repositories.S3ConfigRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class S3PathConfig { + + @Autowired + S3ConfigRepository s3ConfigRepository; + + public String generateDocumentPath(DocumentSourceTypeEnum type, Long callId, Long applicationId) { + + S3ConfigEntity config = getDocumentPath(type); + return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId); + } + public String generateDocumentPathForOther(DocOtherSourceTypeEnum type, Long callId, Long applicationId) { + + S3ConfigEntity config = getDocumentPathForOther(type); + return config.getParentFolder() + "/" + buildS3Path(config.getPath(), callId, applicationId); + } + private String buildS3Path(String pathTemplate, Long callId, Long applicationId) { + + return pathTemplate.replace("{call_id}", callId != null && callId != 0L ? "call_" + callId : "").replace("{application_id}", applicationId != null && applicationId != 0L ? "application_" + applicationId : ""); + } + public String generateDocumentPathForDelegationAndSignedDocument(DocOtherSourceTypeEnum type) { + + S3ConfigEntity config = getDocumentPathForOther(type); + return config.getParentFolder() + "/" + config.getPath(); + } + private S3ConfigEntity getDocumentPath(DocumentSourceTypeEnum type) { + + return s3ConfigRepository.getPathByType(type.name()).orElseThrow(() -> new IllegalArgumentException("No path configuration found for type: " + type)); + } + private S3ConfigEntity getDocumentPathForOther(DocOtherSourceTypeEnum type) { + + return s3ConfigRepository.getPathByType(type.name()).orElseThrow(() -> new IllegalArgumentException("No path configuration found for type: " + type)); + } + public String getBucketNameForOtherType(DocOtherSourceTypeEnum type){ + return s3ConfigRepository.getBucketNameByType(type); + } + public String getBucketNameForCallAppType(DocumentSourceTypeEnum type){ + return s3ConfigRepository.getBucketNameByType(type); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java index ae75d8bd..33f235a2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java @@ -6,6 +6,7 @@ import net.gepafin.tendermanagement.config.SamlSuccessHandler; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.BeneficiaryEntity; +import net.gepafin.tendermanagement.entities.HubEntity; import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.RoleStatusEnum; @@ -84,17 +85,17 @@ public class UserDao { if(StringUtils.isEmpty(userReq.getHubUuid())) { userReq.setHubUuid(defaultHubUuid); } - validateUserRequest(request, tempToken, userReq); + HubEntity hub = hubService.getHubByUuid(userReq.getHubUuid()); + validateUserRequest(request, tempToken, userReq, hub); validatePassword(userReq.getPassword(), userReq.getConfPassword(), tempToken); - RoleEntity roleEntity = getRoleEntity(userReq.getRoleId()); - BeneficiaryEntity beneficiary = createBeneficiary(roleEntity, userReq); - UserEntity userEntity = convertUserRequestToUserEntity(beneficiary, roleEntity, userReq); + BeneficiaryEntity beneficiary = createBeneficiary(roleEntity, userReq, hub); + UserEntity userEntity = convertUserRequestToUserEntity(beneficiary, roleEntity, userReq, hub); log.info("User created with ID: {}", userEntity.getId()); return authService.getJWTTokenBean(userEntity, Boolean.TRUE); } - private BeneficiaryEntity createBeneficiary(RoleEntity roleEntity, UserReq userReq) { + private BeneficiaryEntity createBeneficiary(RoleEntity roleEntity, UserReq userReq, HubEntity hub) { BeneficiaryEntity beneficiaryEntity = null; if (RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(roleEntity.getRoleType())) { beneficiaryEntity = new BeneficiaryEntity(); @@ -114,20 +115,22 @@ public class UserDao { beneficiaryEntity.setMarketing(userReq.getMarketing()); beneficiaryEntity.setThirdParty(userReq.getThirdParty()); beneficiaryEntity.setEmailPec(userReq.getEmailPec()); + beneficiaryEntity.setHubId(hub.getId()); beneficiaryEntity =beneficiaryRepository.save(beneficiaryEntity); } return beneficiaryEntity; } - private void validateUserRequest(HttpServletRequest request, String tempToken, UserReq userReq) { + private void validateUserRequest(HttpServletRequest request, String tempToken, UserReq userReq, HubEntity hub) { if (tempToken == null) { validator.validateRequest(request,RoleStatusEnum.ROLE_SUPER_ADMIN); + UserEntity userEntity = validator.validateUser(request); + userReq.setHubUuid(userEntity.getHub().getUniqueUuid()); }else { samlSuccessHandler.validateToken(tempToken, userReq.getCodiceFiscale(), userReq.getHubUuid()); } - RoleEntity role = roleService.validateRole(userReq.getRoleId()); if (Boolean.FALSE.equals(Utils.isValidEmail(userReq.getEmail()))) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.VALIDATE_EMAIL)); @@ -139,7 +142,7 @@ public class UserDao { Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS)); } if (Boolean.FALSE.equals(StringUtils.isEmpty(userReq.getCodiceFiscale())) - && userRepository.existsByBeneficiaryCodiceFiscale(userReq.getCodiceFiscale())) { + && userRepository.existsByBeneficiaryCodiceFiscaleAndHubId(userReq.getCodiceFiscale(), hub.getId())) { log.error("User creation failed: CodiceFiscale {} already exists", userReq.getCodiceFiscale()); throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.CODICE_FISCALE_EXISTS)); @@ -151,10 +154,14 @@ public class UserDao { if (tempToken != null) { userReq.setRoleId(null); } - if(tempToken == null && Boolean.TRUE.equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(role.getRoleType()))){ - throw new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.CANNOT_CREATE_BENEFICIARY_USER)); - } + + if (tempToken == null) { + RoleEntity role = roleService.validateRole(userReq.getRoleId()); + if (Boolean.TRUE.equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(role.getRoleType()))) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.CANNOT_CREATE_BENEFICIARY_USER)); + } + } } private void validatePassword(String password, String confirmPassword, String tempToken) { @@ -206,7 +213,7 @@ public class UserDao { return convertUserEntityToUserResponse(userEntity); } - private UserEntity convertUserRequestToUserEntity(BeneficiaryEntity beneficiary, RoleEntity roleEntity, UserReq userReq) { + private UserEntity convertUserRequestToUserEntity(BeneficiaryEntity beneficiary, RoleEntity roleEntity, UserReq userReq, HubEntity hub) { UserEntity userEntity = new UserEntity(); if(Boolean.FALSE.equals(StringUtils.isEmpty(userReq.getPassword()))) { userEntity.setPassword(passwordEncoder.encode(userReq.getPassword())); @@ -215,7 +222,7 @@ public class UserDao { userEntity.setEmail(userReq.getEmail()); userEntity.setStatus(UserStatusEnum.ACTIVE.getValue()); userEntity.setBeneficiary(beneficiary); - userEntity.setHub(hubService.getHubByUuid(userReq.getHubUuid())); + userEntity.setHub(hub); if (Boolean.FALSE.equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(roleEntity.getRoleType()))) { userEntity.setFirstName(userReq.getFirstName()); userEntity.setLastName(userReq.getLastName()); diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java index cc0f929e..5ddebe5c 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java @@ -39,4 +39,7 @@ public class ApplicationEntity extends BaseEntity { @OneToOne @JoinColumn(name = "PROTOCOL_NUMBER") private ProtocolEntity protocol; + + @Column(name = "HUB_ID") + private Long hubId; } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java new file mode 100644 index 00000000..2ddad5ae --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java @@ -0,0 +1,38 @@ +package net.gepafin.tendermanagement.entities; + +import jakarta.persistence.*; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; +@Data +@Entity +@Table(name = "application_evaluation") +public class ApplicationEvaluationEntity extends BaseEntity{ + @Column(name = "application_Id") + private Long applicationId; + @Column(name = "user_id") + private Long userId; + + @Column(name = "criteria") + private String criteria; + + @Column(name = "checklist") + private String checklist; + + @Column(name = "file") + private String file; + + @Column(name = "note") + private String note; + + @Column(name = "status") + private String status; + + @Column(name="IS_DELETED") + private Boolean isDeleted; + + @ManyToOne + @JoinColumn(name = "assigned_applications_id", nullable = true) + private AssignedApplicationsEntity assignedApplicationsEntity; +} diff --git a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java index bae88c90..2e84dd51 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java @@ -61,4 +61,7 @@ public class BeneficiaryEntity extends BaseEntity { @Column(name = "EMAIL_PEC") private String emailPec; + + @Column(name = "HUB_ID") + private Long hubId; } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java index c35a8cf0..ed50268f 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.Data; @@ -56,4 +58,9 @@ public class CompanyEntity extends BaseEntity{ @Column(name = "CONTACT_EMAIL") private String contactEmail; + + @ManyToOne + @JoinColumn(name = "HUB_ID") + private HubEntity hub; + } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java new file mode 100644 index 00000000..66502bbc --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java @@ -0,0 +1,25 @@ +package net.gepafin.tendermanagement.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.Data; + +@Entity +@Table(name = "s3_path_configuration") +@Data +public class S3ConfigEntity extends BaseEntity { + + @Column(name = "TYPE") + private String type; + + @Column(name = "PATH") + private String path; + + @Column(name = "BUCKET_NAME") + private String bucketName; + + @Column(name = "PARENT_FOLDER") + private String parentFolder; +} + diff --git a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationEvaluationStatusTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationEvaluationStatusTypeEnum.java new file mode 100644 index 00000000..18cfc30d --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationEvaluationStatusTypeEnum.java @@ -0,0 +1,20 @@ +package net.gepafin.tendermanagement.enums; + +import com.fasterxml.jackson.annotation.JsonValue; + +public enum ApplicationEvaluationStatusTypeEnum { + OPEN ("OPEN"), + SOCCORSO("SOCCORSO"), + CLOSE("CLOSE"); + + private String value; + + ApplicationEvaluationStatusTypeEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java index 80420c15..db6fe287 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java @@ -6,9 +6,13 @@ public enum ApplicationStatusTypeEnum { DRAFT("DRAFT"), SUBMIT("SUBMIT"), - AWAIT("AWAIT"), + AWAITING("AWAITING"), READY("READY"), - DISCARD("DISCARD"); + DISCARD("DISCARD"), + SOCCORSO("SOCCORSO"), + APPROVED("APPROVED"), + REJECTED("REJECTED"), + EVALUATION("EVALUATION"); private String value; diff --git a/src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java index e0cba98f..59f8ae1d 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/AssignedApplicationEnum.java @@ -3,9 +3,9 @@ package net.gepafin.tendermanagement.enums; import com.fasterxml.jackson.annotation.JsonValue; public enum AssignedApplicationEnum { - ASSIGNED("ASSIGNED"), - APPROVED("APPROVED"), - REJECTED("REJECTED"); + OPEN ("OPEN"), + SOCCORSO("SOCCORSO"), + CLOSE("CLOSE"); private final String value; diff --git a/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java new file mode 100644 index 00000000..751dfa92 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/enums/DocOtherSourceTypeEnum.java @@ -0,0 +1,17 @@ +package net.gepafin.tendermanagement.enums; + +public enum DocOtherSourceTypeEnum { + USER_SIGNED_DOCUMENT("USER_SIGNED_DOCUMENT"), + USER_DELEGATION("USER_DELEGATION"), + TEMPLATE("TEMPLATE"); + + private String value; + + DocOtherSourceTypeEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java new file mode 100644 index 00000000..12fc7150 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationEvaluationRequest.java @@ -0,0 +1,14 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; + +import java.util.List; +@Data +public class ApplicationEvaluationRequest { + + private List criteria; + private List checklist; + private List field; + private String note; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ChecklistRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ChecklistRequest.java new file mode 100644 index 00000000..2d760ec2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ChecklistRequest.java @@ -0,0 +1,9 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class ChecklistRequest { + private Long id; + private Boolean valid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java index bdc0d015..6ca30e37 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java @@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalTime; import java.util.List; import lombok.Data; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CriteriaRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/CriteriaRequest.java new file mode 100644 index 00000000..ada0d83c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CriteriaRequest.java @@ -0,0 +1,10 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class CriteriaRequest { + private Long id; + private Long score; + private Boolean valid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/FieldRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/FieldRequest.java new file mode 100644 index 00000000..b3b5b3e1 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/FieldRequest.java @@ -0,0 +1,9 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class FieldRequest { + private String id; + private Boolean valid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/S3ConfigReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/S3ConfigReq.java new file mode 100644 index 00000000..859878de --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/S3ConfigReq.java @@ -0,0 +1,20 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class S3ConfigReq { + @NotNull + private String path; + + @NotNull + private String type; + + @NotNull + private String bucketName; + + @NotNull + private String parentFolder; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateApplicationEvaluationRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateApplicationEvaluationRequest.java new file mode 100644 index 00000000..16654fff --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateApplicationEvaluationRequest.java @@ -0,0 +1,2 @@ +package net.gepafin.tendermanagement.model.request;public class UpdateApplicationEvaluationRequest { +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java new file mode 100644 index 00000000..5e4269eb --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -0,0 +1,29 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class ApplicationEvaluationResponse { + + + private Long id; + private Long applicationId; + private Long assignedApplicationId; + private String note; + private ApplicationEvaluationStatusTypeEnum status; + private Long minScore; + private List criteria; + private List checklist; + private List files; + private LocalDateTime createdDate; + private LocalDateTime updatedDate; + private String beneficiary; + private Long protocolNumber; + private String callName; + private LocalDateTime submissionDate; + private LocalDateTime evaluationDate; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java index 8714d94c..b5ad3aae 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java @@ -14,6 +14,13 @@ public class AssignedApplicationsResponse extends BaseBean { private AssignedApplicationEnum status; private String note; private LocalDateTime assignedAt; + private Long protocolNumber; + private String callName; + private String beneficiaryName; + private LocalDateTime submissionDate; + private LocalDateTime callStartDate; + private LocalDateTime callEndDate; + } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java index 51479254..6338949e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java @@ -20,6 +20,8 @@ public class CallDetailsResponseBean { private List dates; + private Boolean confidi; + private CallStatusEnum status; private Long regionId; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ChecklistResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ChecklistResponse.java new file mode 100644 index 00000000..a07bfb52 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ChecklistResponse.java @@ -0,0 +1,11 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +public class ChecklistResponse { + private Long id; + private String label; + private Boolean valid; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaMappedField.java b/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaMappedField.java new file mode 100644 index 00000000..8c62e178 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaMappedField.java @@ -0,0 +1,10 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +@Data +public class CriteriaMappedField { + private String id; + private String fieldLabel; + private String fieldValue; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaResponse.java new file mode 100644 index 00000000..ebbb2f2c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CriteriaResponse.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +import java.util.List; + +@Data +public class CriteriaResponse { + private Long id; + private String label; + private Long score; + private Long maxScore; + private List criteriaMappedFields; + private Boolean valid; +} \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/FieldResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/FieldResponse.java new file mode 100644 index 00000000..07469d6c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/FieldResponse.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +@Data +public class FieldResponse { + private String id; + private String label; + private Boolean valid; + private List fileDetail ; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/S3ConfigBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/S3ConfigBean.java new file mode 100644 index 00000000..798f8b2c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/S3ConfigBean.java @@ -0,0 +1,11 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; + +@Data +public class S3ConfigBean { + private String path; + private String type; + private String bucketName; + private String parentFolder; +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java new file mode 100644 index 00000000..81b9a3ea --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java @@ -0,0 +1,22 @@ +package net.gepafin.tendermanagement.repositories; + +import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface ApplicationEvaluationRepository extends JpaRepository { + + Optional findByApplicationIdAndIsDeletedFalse(Long applicationId); + + Optional findByAssignedApplicationsEntity_IdAndIsDeletedFalse(Long assignedApplicationId); + + Optional findByApplicationIdAndAssignedApplicationsEntity_IdAndIsDeletedFalse(Long applicationId, Long assignedApplicationId); + + Optional findFirstByIsDeletedFalseOrderByCreatedDateDesc(); + +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormFieldRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormFieldRepository.java index 44c3cc3e..f8736d1c 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormFieldRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormFieldRepository.java @@ -23,6 +23,17 @@ public interface ApplicationFormFieldRepository extends JpaRepository findByFieldValueInAndApplicationFormApplicationId( List fieldValue, Long applicationId); + /** + * Find ApplicationFormField entity by Field ID, Form ID, and Application ID. + * + * @param fieldId The Field ID to search. + * @param formId The Form ID to search. + * @param applicationId The Application ID to search. + * @return Optional of ApplicationFormFieldEntity + */ + Optional findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId( + String fieldId, Long formId, Long applicationId); + public ApplicationFormFieldEntity findByFieldId(String FieldId); diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java index 7b57fcf2..158c43fd 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java @@ -32,13 +32,14 @@ public interface ApplicationRepository extends JpaRepository findByCompanyIdAndUserIdAndIsDeletedFalse(Long companyId,Long userId); + @Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.status = 'SUBMIT' And a.hubId = :hubId") + public Long countSubmittedApplicationsByHubId(@Param("hubId") Long hubId); + @Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.status = 'DRAFT' And a.hubId = :hubId") + public Long countDraftApplicationsByHubId(@Param("hubId") Long hubId); + + @Query("SELECT a.call.id FROM ApplicationEntity a WHERE a.id = :id") + Long findCallIdById(@Param("id") Long id); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java index 35322a6a..b9d2bce3 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationSignedDocumentRepository.java @@ -1,13 +1,24 @@ package net.gepafin.tendermanagement.repositories; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import net.gepafin.tendermanagement.entities.ApplicationSignedDocumentEntity; +import java.util.List; + @Repository public interface ApplicationSignedDocumentRepository extends JpaRepository { ApplicationSignedDocumentEntity findByApplicationIdAndStatus(Long applicationId, String status); + Long findApplicationIdById(Long id); + + @Query("SELECT a.id FROM ApplicationSignedDocumentEntity d JOIN d.application a WHERE d.id = :id") + List findApplicationIdIdsById(@Param("id") Long id); + + @Query("SELECT d FROM ApplicationSignedDocumentEntity d WHERE d.status = :status") + List findAllByIsStatus(@Param("status")String status); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java index 076b93a9..6b95b8f8 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/AssignedApplicationsRepository.java @@ -2,6 +2,8 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.Optional; @@ -9,5 +11,11 @@ import java.util.Optional; public interface AssignedApplicationsRepository extends JpaRepository, JpaSpecificationExecutor{ Optional findByApplicationIdAndIsDeletedFalse(Long applicationId); Optional findByIdAndIsDeletedFalse(Long id); + @Query("SELECT aa FROM AssignedApplicationsEntity aa WHERE aa.isDeleted = false " + + "AND (:applicationId IS NULL OR aa.application.id = :applicationId) " + + "AND (:id IS NULL OR aa.id = :id)") + Optional findByApplicationIdOrId(@Param("applicationId") Long applicationId, + @Param("id") Long id); + } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CallRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CallRepository.java index 4e651fe0..27ab57b4 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/CallRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/CallRepository.java @@ -1,8 +1,8 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.CallEntity; -import net.gepafin.tendermanagement.enums.CallStatusEnum; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.math.BigDecimal; @@ -11,18 +11,38 @@ import java.util.List; @Repository public interface CallRepository extends JpaRepository { - public CallEntity findByIdAndStatusNotIn(Long id, List status); - List findByStatusIn(List callStatus); +// public CallEntity findByIdAndStatusNotIn(Long id, List status); + +// List findByStatusIn(List callStatus); - public CallEntity findByIdAndStatus(Long id,String status); +// public CallEntity findByIdAndStatus(Long id,String status); - public Long countByStatus(String status); +// public Long countByStatus(String status); - @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CallEntity c WHERE c.status = 'PUBLISH'") - BigDecimal findTotalAmountOfPublishedCalls(); +// @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CallEntity c WHERE c.status = 'PUBLISH'") +// BigDecimal findTotalAmountOfPublishedCalls(); @Query("SELECT c.name, COUNT(a.id) " + "FROM CallEntity c LEFT JOIN ApplicationEntity a ON c.id = a.call.id " + "GROUP BY c.name") List findApplicationsPerCall(); + + + @Query("SELECT c FROM CallEntity c JOIN ApplicationEntity a ON c.id = a.call.id WHERE a.id = :applicationId") + CallEntity findCallEntityByApplicationId(Long applicationId); +// @Query("SELECT c.name, COUNT(a.id) " + +// "FROM CallEntity c LEFT JOIN ApplicationEntity a ON c.id = a.call.id " + +// "GROUP BY c.name") +// List findApplicationsPerCall(); + + public List findByStatusInAndHubId(List callStatus, Long hubId); + + public CallEntity findByIdAndStatusAndHubId(Long id, String status, Long hubId); + + public Long countByStatusAndHubId(String status, Long hubId); + + public CallEntity findByIdAndStatusNotInAndHubId(Long id, List status, Long hubId); + + @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CallEntity c WHERE c.status = 'PUBLISH' And c.hub.id = :hubId") + BigDecimal findTotalAmountOfPublishedCallsAndHubId(@Param("hubId") Long hubId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java index 62da59a7..d092ea4a 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java @@ -17,4 +17,5 @@ public interface CallTargetAudienceChecklistRepository extends JpaRepository findById(@Param("id") Long id); List findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long id, String type); + List findByCallId(Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java index c0c5f75d..b9395883 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java @@ -4,6 +4,7 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import net.gepafin.tendermanagement.entities.CompanyEntity; @@ -11,13 +12,14 @@ import net.gepafin.tendermanagement.entities.CompanyEntity; @Repository public interface CompanyRepository extends JpaRepository { - List findByIdIn(List companyIds); + List findByIdInAndHubId(List companyIds, Long hubId); - Boolean existsByVatNumber(String vatNumber); - CompanyEntity findByVatNumber(String vatNumber); + Boolean existsByVatNumberAndHubId(String vatNumber, Long hubId); - @Query("SELECT COUNT(c) FROM CompanyEntity c") - long countTotalCompanies(); + @Query("SELECT COUNT(c) FROM CompanyEntity c where c.hub.id = :hubId") + long countTotalCompaniesByHubId(@Param("hubId") Long hubId); + + CompanyEntity findByVatNumberAndHubId(String vatNumber, Long hubId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java index 4f621d38..d3eb3058 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java @@ -13,17 +13,19 @@ import org.springframework.stereotype.Repository; public interface DocumentRepository extends JpaRepository { @Query("SELECT d FROM DocumentEntity d WHERE d.id = :id AND d.isDeleted = false") - Optional findById(@Param("id") Long id); + Optional findByIdAndNotDeleted(@Param("id") Long id); // List findBySourceIdAndTypeAndIsDeletedFalse(Long sourceId, String type); // Optional findByIdAndSourceIdAndIsDeletedFalse(Long id, Long sourceId); List findBySource(String source); - + List findBySourceIdAndSourceAndTypeAndIsDeletedFalse(Long sourceId, String source, String type); Optional findByIdAndSourceIdAndSourceAndIsDeletedFalse(Long id, Long sourceId, String source); + @Query("SELECT d FROM DocumentEntity d WHERE d.isDeleted = false") + List findAllByIsDeleteFalse(); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java index b5b9a231..8b25fc1f 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java @@ -16,4 +16,6 @@ public interface EvaluationCriteriaRepository extends JpaRepository findById(@Param("id") Long id); List findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long callId, String type); + List findByCallId(Long callId); + } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/LoginAttemptRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/LoginAttemptRepository.java index 257b8ed8..3135e7cd 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/LoginAttemptRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/LoginAttemptRepository.java @@ -1,9 +1,19 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.LoginAttemptEntity; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @Repository public interface LoginAttemptRepository extends JpaRepository { + + @Query("SELECT la FROM LoginAttemptEntity la LEFT JOIN UserEntity u ON u.email = la.username WHERE u.hub.id = :hubId") + Page findByHubId(@Param("hubId") Long hubId, PageRequest pageRequest); + + } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/S3ConfigRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/S3ConfigRepository.java new file mode 100644 index 00000000..2349861c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/repositories/S3ConfigRepository.java @@ -0,0 +1,24 @@ +package net.gepafin.tendermanagement.repositories; + +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; +import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface S3ConfigRepository extends JpaRepository { + Optional getPathByType(String type); + + S3ConfigEntity findS3PathConfigurationById(Long id); + + String getBucketNameByType(DocumentSourceTypeEnum type); + + String getBucketNameByType(DocOtherSourceTypeEnum type); + + @Query("Select s3.parentFolder From S3ConfigEntity s3 Where s3.type = :s") + String getPathByTypeOther(String s); +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/UserCompanyDelegationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/UserCompanyDelegationRepository.java index 1224dd70..03067c80 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/UserCompanyDelegationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/UserCompanyDelegationRepository.java @@ -2,9 +2,15 @@ package net.gepafin.tendermanagement.repositories; import org.springframework.data.jpa.repository.JpaRepository; import net.gepafin.tendermanagement.entities.UserCompanyDelegationEntity; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; public interface UserCompanyDelegationRepository extends JpaRepository { UserCompanyDelegationEntity findByUserIdAndCompanyIdAndStatus(Long userId, Long companyId, String status); + @Query("SELECT d FROM UserCompanyDelegationEntity d where d.status = :status") + List findAllByStatus(@Param("status") String status); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java index c9122eb7..47ab16b8 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java @@ -10,21 +10,9 @@ import java.util.Optional; @Repository public interface UserRepository extends JpaRepository { -// Optional findByEmailIgnoreCase(String email); - -// boolean existsByEmailIgnoreCase(String email); - -// UserEntity findByEmail(String email); - - Optional findByBeneficiaryCodiceFiscale(String codiceFiscale); - - boolean existsByBeneficiaryCodiceFiscale(String codiceFiscale); - UserEntity findByBeneficiaryId(Long beneficiaryId); - Long countByStatusAndRoleEntityRoleType(String status, String roleName); - - Optional findByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubId); + Optional findByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid); boolean existsByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid); @@ -35,4 +23,6 @@ public interface UserRepository extends JpaRepository { Long countByStatusAndRoleEntityRoleTypeAndHubId(String status, String roleName, Long hubId); Optional findByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId); + + boolean existsByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/UserWithCompanyRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/UserWithCompanyRepository.java index d17b93e2..ec93f2f6 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/UserWithCompanyRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/UserWithCompanyRepository.java @@ -14,10 +14,8 @@ public interface UserWithCompanyRepository extends JpaRepository findActiveCompanyIdsByUserId(@Param("userId") Long userId); - - + @Query("SELECT u.companyId FROM UserWithCompanyEntity u WHERE u.userId = :userId AND u.isDeleted = false") + List findActiveCompanyIdsByUserId(@Param("userId") Long userId); Optional findByUserIdAndCompanyIdAndIsDeletedFalse(Long userId, Long companyId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java new file mode 100644 index 00000000..8ad33689 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java @@ -0,0 +1,21 @@ +package net.gepafin.tendermanagement.service; + +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; +import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; +import net.gepafin.tendermanagement.model.response.ApplicationResponse; + +import java.util.List; + +public interface ApplicationEvaluationService { + ApplicationEvaluationResponse createOrUpdateApplicationEvaluation(HttpServletRequest request, ApplicationEvaluationRequest applicationEvaluationRequest,Long assignedApplicationsId); + void deleteApplicationEvaluation(HttpServletRequest request,Long id); + + ApplicationEvaluationResponse getApplicationEvaluationByApplicationId(HttpServletRequest request,Long applicationId,Long assignedApplicationId); + ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long applicationEvaluationId, ApplicationEvaluationStatusTypeEnum status); + + +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java b/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java index 2e211916..166e9180 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/AssignedApplicationsService.java @@ -13,7 +13,7 @@ public interface AssignedApplicationsService { void deleteApplication(HttpServletRequest request, Long id); - List getAllAssignedApplications(Long userId); + List getAllAssignedApplications(HttpServletRequest request, Long userId); AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest assignedApplicationsRequest); - AssignedApplicationsResponse getAssignedApplicationById(Long id); + AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/CallService.java b/src/main/java/net/gepafin/tendermanagement/service/CallService.java index 8abe4cb5..92a62f02 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/CallService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/CallService.java @@ -29,6 +29,6 @@ public interface CallService { CallEntity validateCall(Long callId); - CallEntity validatePublishedCall(Long callId); - byte[] downloadCallDocumentsAsZip(Long callId); + CallEntity validatePublishedCall(Long callId, Long hubId); + byte[] downloadCallDocumentsAsZip(HttpServletRequest request, Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/LoginAttemptService.java b/src/main/java/net/gepafin/tendermanagement/service/LoginAttemptService.java index 3e4ed31a..6c8990e1 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/LoginAttemptService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/LoginAttemptService.java @@ -9,7 +9,7 @@ import java.util.List; public interface LoginAttemptService { - LoginAttemptPageableResponseBean> getLoginAttemptsList(Integer pageNo, Integer pageLimit); + LoginAttemptPageableResponseBean> getLoginAttemptsList(HttpServletRequest request, Integer pageNo, Integer pageLimit); void createLoginAttempt(LoginAttemptReq loginAttemptReq, HttpServletRequest request); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/S3ConfigService.java b/src/main/java/net/gepafin/tendermanagement/service/S3ConfigService.java new file mode 100644 index 00000000..d284e649 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/S3ConfigService.java @@ -0,0 +1,19 @@ +package net.gepafin.tendermanagement.service; + +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.model.request.S3ConfigReq; +import net.gepafin.tendermanagement.model.response.S3ConfigBean; +import org.springframework.stereotype.Component; + +import java.util.Optional; + +@Component +public interface S3ConfigService { + S3ConfigBean addS3Path(S3ConfigReq s3Path); + + Optional getS3PathByType(String type); + + S3ConfigEntity deleteS3PathById(Long id); + + S3ConfigBean updateS3PathConfiguration(S3ConfigReq s3PathConfigurationReq, Long id); +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/UserService.java b/src/main/java/net/gepafin/tendermanagement/service/UserService.java index 9a1bdf9a..21109a5e 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java @@ -17,11 +17,11 @@ import java.util.List; public interface UserService { JWTToken createUser(HttpServletRequest request, String tempToken, UserReq userReq); - UserResponseBean updateUser(Long userId, UpdateUserReq userReq); + UserResponseBean updateUser(HttpServletRequest request, Long userId, UpdateUserReq userReq); - UserResponseBean getUserById(Long userId); + UserResponseBean getUserById(HttpServletRequest request, Long userId); - void deleteUser(Long userId); + void deleteUser(HttpServletRequest request, Long userId); JWTToken login(LoginReq loginReq,HttpServletRequest request); diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java new file mode 100644 index 00000000..262f4a83 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java @@ -0,0 +1,87 @@ +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.AssignedApplicationsEntity; +import net.gepafin.tendermanagement.entities.UserEntity; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; +import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; +import net.gepafin.tendermanagement.model.response.ApplicationResponse; +import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository; +import net.gepafin.tendermanagement.service.ApplicationEvaluationService; +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.List; +import java.util.Optional; + +@Service +public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationService { + + @Autowired + private ApplicationEvaluationDao applicationEvaluationDao; + @Autowired + private Validator validator; + @Autowired + private AssignedApplicationsRepository assignedApplicationsRepository; + + @Override + @Transactional(rollbackFor = Exception.class) + public ApplicationEvaluationResponse createOrUpdateApplicationEvaluation(HttpServletRequest request, ApplicationEvaluationRequest req,Long assignedApplicationsId) { + AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository.findByIdAndIsDeletedFalse(assignedApplicationsId).orElseThrow(()-> + new ResourceNotFoundException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG))); + UserEntity user=validator.validatePreInstructor(request,assignedApplication.getUserId()); + return applicationEvaluationDao.createOrUpdateApplicationEvaluation(user,req,assignedApplication.getApplication().getId()); + } + + @Override + @Transactional(readOnly = true) + public ApplicationEvaluationResponse getApplicationEvaluationByApplicationId( + HttpServletRequest request, Long applicationId, Long assignedApplicationId) { + + Optional assignedApplicationsOptional = + assignedApplicationsRepository.findByApplicationIdOrId(applicationId, assignedApplicationId); + + AssignedApplicationsEntity assignedApplications = assignedApplicationsOptional + .orElseThrow(() -> new CustomValidationException( + Status.BAD_REQUEST, + Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG) + )); + UserEntity user = validator.validatePreInstructor(request, assignedApplications.getUserId()); + return applicationEvaluationDao.getApplicationEvaluationByApplicationId( + user, + assignedApplications.getApplication().getId(), + assignedApplications.getId() + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteApplicationEvaluation(HttpServletRequest request,Long id) { + validator.getUserIdFromToken(request); + applicationEvaluationDao.deleteById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long applicationId, ApplicationEvaluationStatusTypeEnum status) { + AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null); + if(assignedApplications==null){ + throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_WITH_ID_MSG)); + } + validator.validatePreInstructor(request, assignedApplications.getUserId()); + return applicationEvaluationDao.updateApplicationEvaluationStatus(applicationId, status); + + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java index e8e8f1f4..779a3d09 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java @@ -65,6 +65,7 @@ public class ApplicationServiceImpl implements ApplicationService { public ApplicationResponse createApplication(HttpServletRequest request, Long companyId, ApplicationRequest applicationRequest, Long callId) { UserEntity userEntity = validator.validateUser(request); CompanyEntity companyEntity = validator.validateUserWithCompany(request, companyId); + validator.validateUserWithCall(userEntity, callId); return applicationDao.createApplicationByCallId(companyEntity, applicationRequest, callId, userEntity); } @@ -114,7 +115,6 @@ public class ApplicationServiceImpl implements ApplicationService { @Transactional(rollbackFor = Exception.class) public ApplicationResponse validateApplication(HttpServletRequest request, Long applicationId) { return applicationDao.validateApplication(request, applicationId); - } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java index 00733f07..e0301dec 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AssignedApplicationsServiceImpl.java @@ -26,32 +26,32 @@ public class AssignedApplicationsServiceImpl implements AssignedApplicationsServ @Transactional(rollbackFor = Exception.class) public AssignedApplicationsResponse createAssignedApplications(HttpServletRequest request, Long applicationId, Long userId, AssignedApplicationsRequest assignedApplicationsRequest) { UserEntity assignedByUser= validator.validateUser(request); + validator.validatePreInstructor(request, userId); return assignedApplicationsDao.createAssignedApplications(applicationId,userId,assignedByUser, assignedApplicationsRequest); } @Override @Transactional(rollbackFor = Exception.class) public void deleteApplication(HttpServletRequest request, Long id) { - assignedApplicationsDao.deleteById(id); + assignedApplicationsDao.deleteById(request, id); } @Override @Transactional(readOnly = true) - public List getAllAssignedApplications(Long userId) { - return assignedApplicationsDao.getAllAssignedApplications(userId); + public List getAllAssignedApplications(HttpServletRequest request, Long userId) { + return assignedApplicationsDao.getAllAssignedApplications(request, userId); } @Override @Transactional(rollbackFor = Exception.class) - public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id , AssignedApplicationsRequest updatedAssignedApplicationRequest) { - UserEntity updatedByUser= validator.validateUser(request); - return assignedApplicationsDao.updateAssignedApplication(id,updatedAssignedApplicationRequest,updatedByUser); + public AssignedApplicationsResponse updateAssignedApplication(HttpServletRequest request, Long id, AssignedApplicationsRequest updatedAssignedApplicationRequest) { + return assignedApplicationsDao.updateAssignedApplication(request, id, updatedAssignedApplicationRequest); } @Override @Transactional(readOnly = true) - public AssignedApplicationsResponse getAssignedApplicationById(Long id) { - return assignedApplicationsDao.getAssignedApplicationById(id); + public AssignedApplicationsResponse getAssignedApplicationById(HttpServletRequest request, Long id) { + return assignedApplicationsDao.getAssignedApplicationById(request, id); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java index 3fe819a4..5a2d9ded 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -77,7 +77,7 @@ public class AuthenticationService { public JWTToken login(LoginReq loginReq, HttpServletRequest request) { UserEntity user=null; - + LoginAttemptEntity loginAttemptEntity = prepareLoginAttemptEntity(loginReq, request); log.info("Attempting login for email: {}", loginReq.getEmail()); String emailWithHubId = loginReq.getEmail()+":"+loginReq.getHubUuid(); @@ -211,10 +211,11 @@ public class AuthenticationService { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_TOKEN_MSG)); } + HubEntity hub = hubService.getHubByUuid(samlResponseLogEntity.getHubUuid()); Map> userAttributes = Utils .convertStringIntoMap(samlResponseLogEntity.getAuthenticationObject()); String cf = userAttributes.get("CodiceFiscale").get(0).toString(); - if (userRepository.existsByBeneficiaryCodiceFiscale(cf)) { + if (userRepository.existsByBeneficiaryCodiceFiscaleAndHubId(cf, hub.getId())) { throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_ALREADY_EXIST_MSG)); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java index 4484027e..01f2648a 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java @@ -9,7 +9,6 @@ import net.gepafin.tendermanagement.enums.BeneficiaryCallStatus; import net.gepafin.tendermanagement.model.request.BeneficiaryPreferredCallReq; import net.gepafin.tendermanagement.model.response.BeneficiaryPreferredCallResponseBean; -import net.gepafin.tendermanagement.repositories.UserRepository; import net.gepafin.tendermanagement.service.BeneficiaryPreferredCallService; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.Validator; @@ -17,7 +16,6 @@ import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationExceptio import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; import java.util.List; @@ -26,10 +24,10 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred @Autowired private BeneficiaryPreferredCallDao beneficiaryPreferredCallDao; + @Autowired private Validator validator; - @Autowired - private UserRepository userRepository; + @Autowired private UserService userService; @@ -37,22 +35,22 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred @Override public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest request, BeneficiaryPreferredCallReq beneficiaryPreferredCallRequest) { UserEntity userEntity = validator.validateUser(request); - return beneficiaryPreferredCallDao.createBeneficiaryPreferredCall(beneficiaryPreferredCallRequest,userEntity); + return beneficiaryPreferredCallDao.createBeneficiaryPreferredCall(request, beneficiaryPreferredCallRequest,userEntity); } @Override public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(HttpServletRequest request, Long id) { - return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallById(id); + return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallById(request, id); } @Override public void deleteBeneficiaryPreferredCall(HttpServletRequest request, Long id) { - beneficiaryPreferredCallDao.deleteBeneficiaryPreferredCallById(id); + beneficiaryPreferredCallDao.deleteBeneficiaryPreferredCallById(request, id); } @Override public List getAllBeneficiaryPreferredCalls(HttpServletRequest request) { - return beneficiaryPreferredCallDao.getAllBeneficiaryPreferredCalls(); + return beneficiaryPreferredCallDao.getAllBeneficiaryPreferredCalls(request); } // @Override @@ -68,6 +66,7 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred @Override public List getBeneficiaryPreferredCallByUserId(HttpServletRequest request,Long userId,Long beneficiaryId,Long companyId) { UserEntity userEntity =validateGetBeneficiaryPreferredCallrequest(request,userId,beneficiaryId); + validator.validateUserId(request, userEntity.getId()); return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallByUserId(userEntity,companyId); } @@ -81,7 +80,7 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred } if(beneficiaryId!=null){ UserEntity user = userService.getUserByBeneficiaryId(beneficiaryId); - return validator.validateUserId(request,user.getId()); + return validator.validateUserId(request, user.getId()); } else{ return validator.validateUserId(request, userId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java index 281b33b1..8004008b 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java @@ -91,13 +91,15 @@ public class CallServiceImpl implements CallService { } @Override - public CallEntity validatePublishedCall(Long callId) { - return callDao.validatePublishedCall(callId); + public CallEntity validatePublishedCall(Long callId, Long hubId) { + return callDao.validatePublishedCall(callId, hubId); } @Override @Transactional(readOnly = true) - public byte[] downloadCallDocumentsAsZip(Long callId) { + public byte[] downloadCallDocumentsAsZip(HttpServletRequest request, Long callId) { + UserEntity user = validator.validateUser(request); + validator.validateUserWithCall(user, callId); return callDao.downloadCallDocumentsAsZip(callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java index 34c8777f..5ab99b13 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java @@ -49,6 +49,7 @@ public class CompanyServiceImpl implements CompanyService { @Transactional(rollbackFor = Exception.class) public CompanyResponse updateCompany(HttpServletRequest request, Long companyId, CompanyRequest companyRequest) { UserEntity userEntity =validator.validateUser(request); + validator.validateUserWithCompany(request, companyId); return companyDao.updateCompany(userEntity, companyId, companyRequest); } @@ -56,6 +57,7 @@ public class CompanyServiceImpl implements CompanyService { @Transactional(readOnly = true) public CompanyResponse getCompany(HttpServletRequest request, Long companyId) { UserEntity userEntity =validator.validateUser(request); + validator.validateUserWithCompany(request, companyId); return companyDao.getCompany(userEntity, companyId); } @@ -63,13 +65,14 @@ public class CompanyServiceImpl implements CompanyService { @Transactional(rollbackFor = Exception.class) public void deleteCompany(HttpServletRequest request, Long companyId) { UserEntity userEntity =validator.validateUser(request); + validator.validateUserWithCompany(request, companyId); companyDao.deleteCompany(userEntity, companyId); } @Override @Transactional(readOnly = true) public List getCompanyByUserId(HttpServletRequest request, Long userId) { - validator.validateUser(request); + validator.validateUserId(request, userId); return companyDao.getCompanyByUserId(userId); } @@ -91,8 +94,7 @@ public class CompanyServiceImpl implements CompanyService { @Override @Transactional(readOnly = true) public ByteArrayOutputStream downloadCompanyDelegation(HttpServletRequest request, Long companyId, CompanyDelegationRequest companyDelegationRequest) { - UserEntity userEntity =validator.validateUser(request); - return delegationDao.downloadCompanyDelegation(userEntity, companyId, companyDelegationRequest); + return delegationDao.downloadCompanyDelegation(request, companyId, companyDelegationRequest); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java index 3b3fa310..235a1244 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java @@ -34,7 +34,7 @@ public class DocumentServiceImpl implements DocumentService { @Override public DocumentResponseBean updateDocument(HttpServletRequest httpServletRequest, Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { - return documentDao.updateDocument(documentId,file,documentTypeEnum); + return documentDao.updateDocument(documentId, file,documentTypeEnum); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/FlowServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/FlowServiceImpl.java index 2ae5546f..5bd9d4d5 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/FlowServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/FlowServiceImpl.java @@ -5,6 +5,8 @@ import net.gepafin.tendermanagement.dao.FlowDao; import net.gepafin.tendermanagement.model.request.FlowRequestBean; import net.gepafin.tendermanagement.model.response.FlowResponseBean; import net.gepafin.tendermanagement.service.FlowService; +import net.gepafin.tendermanagement.util.Validator; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,16 +16,21 @@ public class FlowServiceImpl implements FlowService { @Autowired private FlowDao flowDao; + + @Autowired + private Validator validator; @Override @Transactional(rollbackFor = Exception.class) public FlowResponseBean createOrUpdateFlow(HttpServletRequest httpServletRequest, FlowRequestBean flowRequestBean, Long callId) { + validator.validateUserWithCall(validator.validateUser(httpServletRequest), callId); return flowDao.createOrUpdateFlow(flowRequestBean,callId); } @Override @org.springframework.transaction.annotation.Transactional(readOnly = true) public FlowResponseBean getFlowByCallId(HttpServletRequest request, Long callId) { + validator.validateUserWithCall(validator.validateUser(request), callId); return flowDao.getFlowByCallId(callId); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/LoginAttemptServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/LoginAttemptServiceImpl.java index 1519273f..fb645aac 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/LoginAttemptServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/LoginAttemptServiceImpl.java @@ -3,12 +3,15 @@ package net.gepafin.tendermanagement.service.impl; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.dao.LoginAttemptDao; import net.gepafin.tendermanagement.entities.LoginAttemptEntity; +import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.LoginAttemptResultEnum; import net.gepafin.tendermanagement.enums.LoginAttemptTypeEnum; import net.gepafin.tendermanagement.model.request.LoginAttemptReq; import net.gepafin.tendermanagement.model.response.LoginAttemptPageableResponseBean; import net.gepafin.tendermanagement.service.LoginAttemptService; import net.gepafin.tendermanagement.util.Utils; +import net.gepafin.tendermanagement.util.Validator; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,22 +22,30 @@ public class LoginAttemptServiceImpl implements LoginAttemptService { @Autowired LoginAttemptDao loginAttemptDao; + + @Autowired + private Validator validator; @Override - public LoginAttemptPageableResponseBean> getLoginAttemptsList(Integer pageNo, Integer pageLimit) { - return loginAttemptDao.getLoginAttemptsList(pageNo, pageLimit); + public LoginAttemptPageableResponseBean> getLoginAttemptsList(HttpServletRequest request, Integer pageNo, Integer pageLimit) { + return loginAttemptDao.getLoginAttemptsList(validator.validateUser(request), pageNo, pageLimit); } @Override public void createLoginAttempt(LoginAttemptReq loginAttemptReq, HttpServletRequest request) { String ipAddress = Utils.getClientIpAddress(request); String userAgent = request.getHeader("user-agent"); + LoginAttemptEntity loginAttemptEntity = new LoginAttemptEntity(); loginAttemptEntity.setType(LoginAttemptTypeEnum.SWITCH.getValue()); loginAttemptEntity.setIpAddress(ipAddress); loginAttemptEntity.setUserAgent(userAgent); loginAttemptEntity.setUsername(loginAttemptReq.getUserName()); loginAttemptEntity.setResult(LoginAttemptResultEnum.SUCCESS.getValue()); + if(loginAttemptReq.getUserId() != null) { + UserEntity userEntity = validator.validateUserId(request, loginAttemptReq.getUserId()); + loginAttemptEntity.setUserId(userEntity.getId()); + } loginAttemptDao.createLoginAttempt(loginAttemptEntity); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ConfigServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ConfigServiceImpl.java new file mode 100644 index 00000000..5dfa22de --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ConfigServiceImpl.java @@ -0,0 +1,41 @@ +package net.gepafin.tendermanagement.service.impl; + +import jakarta.transaction.Transactional; +import net.gepafin.tendermanagement.dao.S3ConfigDao; +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.model.request.S3ConfigReq; +import net.gepafin.tendermanagement.model.response.S3ConfigBean; +import net.gepafin.tendermanagement.service.S3ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class S3ConfigServiceImpl implements S3ConfigService { + @Autowired + S3ConfigDao s3ConfigDao; + + @Override + public S3ConfigBean addS3Path(S3ConfigReq s3Path) { + + return s3ConfigDao.addS3Path(s3Path); + } + @Override + public Optional getS3PathByType(String type) { + + return s3ConfigDao.getS3PathByType(type); + } + @Override + @Transactional + public S3ConfigEntity deleteS3PathById(Long id) { + + return s3ConfigDao.deleteS3PathConfigById(id); + } + @Override + @Transactional + public S3ConfigBean updateS3PathConfiguration(S3ConfigReq s3PathConfigurationReq, Long id) { + + return s3ConfigDao.updateS3PathConfiguration(s3PathConfigurationReq, id); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java new file mode 100644 index 00000000..4db4ea12 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/S3ReUploadMigrationService.java @@ -0,0 +1,197 @@ +package net.gepafin.tendermanagement.service.impl; + +import com.amazonaws.AmazonServiceException; +import com.amazonaws.SdkClientException; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.GetObjectRequest; +import com.amazonaws.services.s3.model.ObjectMetadata; +import lombok.extern.slf4j.Slf4j; +import net.gepafin.tendermanagement.dao.S3PathConfig; +import net.gepafin.tendermanagement.entities.DocumentEntity; +import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; +import net.gepafin.tendermanagement.repositories.ApplicationSignedDocumentRepository; +import net.gepafin.tendermanagement.repositories.DocumentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +@Slf4j +@Service +public class S3ReUploadMigrationService { + + private static final String OLD_BUCKET = "mementoresources"; + + private static final String SECURE_KEY = "267163962963"; + + @Autowired + private DocumentRepository documentRepository; + + @Autowired + private AmazonS3Client s3Client; + + @Autowired + private S3PathConfig s3ConfigBean; + + @Autowired + private ApplicationRepository applicationRepository; + + @Autowired + private ApplicationSignedDocumentRepository applicationSignedDocumentRepository; + + @Autowired + private AmazonS3 amazonS3; + + @Value("${aws.s3.url}") + private String s3Url; + + private boolean migrationCompleted = false; + + public String reUploadAndMigrateDocuments(String providedKey) { + + if (migrationCompleted) { + return "Migration already completed."; + } + + // Validate the provided key + if (!isValidKey(providedKey)) { + return "Invalid or missing migration key."; + } + + List documents = documentRepository.findAllByIsDeleteFalse(); + + if (documents.isEmpty()) { + return "No documents found to migrate."; + } + + for (DocumentEntity document : documents) { + String oldUrl = document.getFilePath(); // This should contain the full URL + log.info("Processing {}", oldUrl); + + try { + File localFile = downloadFileFromS3(oldUrl); + String newKey = generateNewS3Path(document); // Make sure this generates the correct new path + String uploadedPath = uploadFileToNewBucket(localFile, newKey); + updateDocumentPathAndDeleteOldEntry(document, uploadedPath); + } catch (Exception e) { + log.error("Error processing document {}: {}", document.getId(), e.getMessage()); + } + } + return "Migrated Successfully."; + } + + private boolean isValidKey(String providedKey) { + + return providedKey != null && providedKey.equals(SECURE_KEY); + } + + private File downloadFileFromS3(String fileUrl) throws Exception { + + String key = extractS3KeyFromUrl(fileUrl); // Get the S3 key from the URL + File localFile = new File("/tmp/" + extractFileName(key)); // Save file locally + + GetObjectRequest getObjectRequest = new GetObjectRequest(OLD_BUCKET, key); // Use the key + + try (InputStream s3Stream = s3Client.getObject(getObjectRequest).getObjectContent(); FileOutputStream outputStream = new FileOutputStream(localFile)) { + s3Stream.transferTo(outputStream); + } + + log.info("Downloaded file from old S3 bucket: {}", key); + return localFile; + } + + private String extractS3KeyFromUrl(String url) { + // Assuming the URL structure is consistent + return url.replace("https://mementoresources.s3.eu-west-1.amazonaws.com/", ""); + } + + private String uploadFileToNewBucket(File localFile, String s3Folder) { + + InputStream inputStream = null; // Declare the InputStream here for cleanup + try { + // Extract file name from the local file + String fileName = extractFileName(localFile.getAbsolutePath()); // Get the file name + String path = s3Folder + "/" + fileName; // Construct the S3 path + + // Create InputStream from the local file + inputStream = new FileInputStream(localFile); + + // Set up object metadata + ObjectMetadata objectMetadata = new ObjectMetadata(); + objectMetadata.setContentType("application/octet-stream"); + objectMetadata.setContentLength(localFile.length()); + + // Upload to S3 + s3Client.putObject(OLD_BUCKET, path, inputStream, objectMetadata); + + // Construct the full S3 URL + String fullUrl = String.format("https://%s.s3.%s.amazonaws.com/%s", OLD_BUCKET, "eu-west-1", path); + log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, fullUrl); + return fullUrl; + + } catch (IOException e) { + log.error("IOException occurred during file upload for '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + s3Folder + "/" + localFile.getName(), e); + } catch (AmazonServiceException e) { + log.error("Amazon service exception while uploading file '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + s3Folder + "/" + localFile.getName(), e); + } catch (SdkClientException e) { + log.error("SDK client exception while uploading file '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + s3Folder + "/" + localFile.getName(), e); + } finally { + // Close InputStream if it was opened + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn("Failed to close InputStream for file '{}': {}", localFile.getName(), e.getMessage()); + } + } + } + } + + private String generateNewS3Path(DocumentEntity document) { + + DocumentSourceTypeEnum sourceType = DocumentSourceTypeEnum.valueOf(document.getSource()); + Long callId; + + if (sourceType.equals(DocumentSourceTypeEnum.CALL)) { + return s3ConfigBean.generateDocumentPath(sourceType, document.getSourceId(), 0L); + } else { + callId = applicationRepository.findCallIdById(document.getSourceId()); + return s3ConfigBean.generateDocumentPath(sourceType, callId, document.getSourceId()); + } + } + + private String extractFileName(String filePath) { + + String[] parts = filePath.split("/"); + return parts[parts.length - 1]; + } + + + private void updateDocumentPathAndDeleteOldEntry(DocumentEntity document, String newPath) { + + String fileName = extractFileName(newPath); + DocumentEntity newDocument = new DocumentEntity(); + newDocument.setFilePath(newPath); + newDocument.setSource(document.getSource()); + newDocument.setType(document.getType()); + newDocument.setIsDeleted(false); + newDocument.setSourceId(document.getSourceId()); + newDocument.setFileName(fileName); + + documentRepository.save(newDocument); + documentRepository.delete(document); + + log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java index 3f325320..5d3640f9 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java @@ -40,19 +40,22 @@ public class UserServiceImpl implements UserService { @Override @Transactional(rollbackFor = Exception.class) - public UserResponseBean updateUser(Long userId, UpdateUserReq userReq) { + public UserResponseBean updateUser(HttpServletRequest request, Long userId, UpdateUserReq userReq) { + validator.validateUserId(request, userId); return userDao.updateUser(userId, userReq); } @Override @Transactional(readOnly = true) - public UserResponseBean getUserById(Long userId) { + public UserResponseBean getUserById(HttpServletRequest request, Long userId) { + validator.validateUserId(request, userId); return userDao.getUserById(userId); } @Override @Transactional(rollbackFor = Exception.class) - public void deleteUser(Long userId) { + public void deleteUser(HttpServletRequest request, Long userId) { + validator.validateUserId(request, userId); userDao.deleteUser(userId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java new file mode 100644 index 00000000..c1228565 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserSignedAndDelegationServiceImpl.java @@ -0,0 +1,261 @@ +package net.gepafin.tendermanagement.service.impl; + +import com.amazonaws.AmazonServiceException; +import com.amazonaws.SdkClientException; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.GetObjectRequest; +import com.amazonaws.services.s3.model.ObjectMetadata; +import lombok.extern.slf4j.Slf4j; +import net.gepafin.tendermanagement.dao.S3PathConfig; +import net.gepafin.tendermanagement.entities.ApplicationSignedDocumentEntity; +import net.gepafin.tendermanagement.entities.UserCompanyDelegationEntity; +import net.gepafin.tendermanagement.enums.DocOtherSourceTypeEnum; +import net.gepafin.tendermanagement.repositories.ApplicationRepository; +import net.gepafin.tendermanagement.repositories.ApplicationSignedDocumentRepository; +import net.gepafin.tendermanagement.repositories.S3ConfigRepository; +import net.gepafin.tendermanagement.repositories.UserCompanyDelegationRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +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.List; + +@Slf4j +@Service +public class UserSignedAndDelegationServiceImpl { + private static final String OLD_BUCKET = "mementoresources"; + + private static final String NEW_BUCKET = "mementoresources"; + + private static final String SECURE_KEY = "267163962963"; + + @Autowired + private UserCompanyDelegationRepository userCompanyDelegationRepository; + + @Autowired + private AmazonS3Client s3Client; + + @Autowired + private S3PathConfig s3ConfigBean; + + @Autowired + private ApplicationSignedDocumentRepository applicationSignedDocumentRepository; + + @Autowired + ApplicationRepository applicationRepository; + + @Autowired + S3ConfigRepository s3ConfigRepository; + + @Value("${aws.s3.url}") + private String s3Url; + + private boolean migrationCompleted = false; + + + public String migrateUserDelegatedDocuments(String providedKey) { + + if (migrationCompleted) { + return "Migration already completed."; + } + + // Validate the provided key + if (isValidKey(providedKey)) { + return "Invalid or missing migration key."; + } + + List documents = userCompanyDelegationRepository.findAllByStatus("ACTIVE"); + + if (documents.isEmpty()) { + return "No documents found to migrate."; + } + + for (UserCompanyDelegationEntity document : documents) { + String oldUrl = document.getFilePath(); + log.info("Processing user designated document: {}", oldUrl); + + try { + File localFile = downloadFileFromS3(oldUrl); + String newKey = generateNewS3PathForDelegationDoc(); + String uploadedPath = uploadFileToNewBucket(localFile, newKey); + updateDelegatedDocumentPathAndDeleteOldEntry(document, uploadedPath); + } catch (Exception e) { + log.error("Error processing user designated document {}: {}", document.getId(), e.getMessage()); + } + } + return "Migrated"; + } + + + public String migrateUserSignedDocuments(String providedKey) { + + if (migrationCompleted) { + return "Migration already completed."; + } + + // Validate the provided key + if (isValidKey(providedKey)) { + return "Invalid or missing migration key."; + } + List documents = applicationSignedDocumentRepository.findAllByIsStatus("ACTIVE"); + + if (documents.isEmpty()) { + return "No documents found to migrate."; + } + + for (ApplicationSignedDocumentEntity document : documents) { + String oldUrl = document.getFilePath(); + log.info("Processing user signed document: {}", oldUrl); + + try { + File localFile = downloadFileFromS3(oldUrl); + String newKey = generateNewS3PathForUserSignedDoc(document); + String uploadedPath = uploadFileToNewBucket(localFile, newKey); + updateDocumentPathAndDeleteOldEntry(document, uploadedPath); + } catch (Exception e) { + log.error("Error processing user signed document {}: {}", document.getId(), e.getMessage()); + } + } + return "Migrated."; + } + + private boolean isValidKey(String providedKey) { + + return providedKey == null || !providedKey.equals(SECURE_KEY); + } + + private String generateNewS3PathForDelegationDoc() { + + return s3ConfigBean.generateDocumentPathForOther(DocOtherSourceTypeEnum.USER_DELEGATION, 0L, 0L); + } + + private String generateNewS3PathForUserSignedDoc(ApplicationSignedDocumentEntity document) { + // Fetch the list of application IDs associated with the document + List applicationIds = applicationSignedDocumentRepository.findApplicationIdIdsById(document.getId()); + List paths = new ArrayList<>(); + + // Loop through the application IDs and generate paths + for (Long applicationId : applicationIds) { + Long callId = applicationRepository.findCallIdById(applicationId); + + // Construct the path for the current application and call ID + String newPath = String.format("%s/call/call_%d/application/application_%d/user_signed_document", s3ConfigRepository.getPathByTypeOther( + String.valueOf(DocOtherSourceTypeEnum.USER_SIGNED_DOCUMENT)) , callId, applicationId); + + log.info("Generated new S3 path: {}", newPath); + paths.add(newPath); + } + + return String.join(",", paths); + } + + private File downloadFileFromS3(String fileUrl) throws Exception { + + String key = extractS3KeyFromUrl(fileUrl); + File localFile = new File("/tmp/" + extractFileName(key)); + + GetObjectRequest getObjectRequest = new GetObjectRequest(OLD_BUCKET, key); + + try (InputStream s3Stream = s3Client.getObject(getObjectRequest).getObjectContent(); FileOutputStream outputStream = new FileOutputStream(localFile)) { + s3Stream.transferTo(outputStream); + } + + log.info("Downloaded file from old S3 bucket: {}", key); + return localFile; + } + + private String extractS3KeyFromUrl(String url) { + + return url.replace("https://mementoresources.s3.eu-west-1.amazonaws.com/", ""); + } + + private String uploadFileToNewBucket(File localFile, String s3Path) { + + InputStream inputStream = null; + try { + String fileName = extractFileName(localFile.getAbsolutePath()); // Extract file name + String fullPath = String.format("%s/%s", s3Path, fileName); // Construct full path + + inputStream = new FileInputStream(localFile); // Create InputStream + + // Set metadata for the file + ObjectMetadata objectMetadata = new ObjectMetadata(); + objectMetadata.setContentLength(localFile.length()); + objectMetadata.setContentType("application/octet-stream"); + + // Upload the file to S3 with the constructed path + s3Client.putObject(NEW_BUCKET, fullPath, inputStream, objectMetadata); + + // Construct the full S3 URL for the uploaded file + String fullUrl = String.format("https://%s.s3.%s.amazonaws.com/%s", NEW_BUCKET, "eu-west-1", fullPath); + log.info("File '{}' uploaded successfully to Amazon S3 with URL: {}", fileName, fullUrl); + return fullUrl; + + } catch (IOException e) { + log.error("IOException occurred during file upload for '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + localFile, e); + } catch (AmazonServiceException e) { + log.error("Amazon service exception while uploading file '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + localFile, e); + } catch (SdkClientException e) { + log.error("SDK client exception while uploading file '{}': {}", localFile.getName(), e.getMessage()); + throw new RuntimeException("Upload failed for: " + localFile, e); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn("Failed to close InputStream for file '{}': {}", localFile.getName(), e.getMessage()); + } + } + } + } + + private String extractFileName(String filePath) { + + String[] parts = filePath.split("/"); + return parts[parts.length - 1]; + } + private String extractFileNameFromPath(String path) { + + return path.substring(path.lastIndexOf('/') + 1); + } + + private void updateDocumentPathAndDeleteOldEntry(ApplicationSignedDocumentEntity document, String newPath) { + + ApplicationSignedDocumentEntity newDocument = new ApplicationSignedDocumentEntity(); + String fileName = extractFileNameFromPath(newPath); + newDocument.setFilePath(newPath); + newDocument.setFileName(fileName); + newDocument.setApplication(document.getApplication()); + newDocument.setStatus("ACTIVE"); + + applicationSignedDocumentRepository.save(newDocument); + applicationSignedDocumentRepository.delete(document); + + log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath); + } + + private void updateDelegatedDocumentPathAndDeleteOldEntry(UserCompanyDelegationEntity document, String newPath) { + + String fileName = extractFileNameFromPath(newPath); + UserCompanyDelegationEntity newDocument = new UserCompanyDelegationEntity(); + newDocument.setFilePath(newPath); + newDocument.setFileName(fileName); + newDocument.setBeneficiaryId(document.getBeneficiaryId()); + newDocument.setUserId(document.getUserId()); + newDocument.setCompanyId(document.getCompanyId()); + newDocument.setStatus("ACTIVE"); + + userCompanyDelegationRepository.save(newDocument); + userCompanyDelegationRepository.delete(document); + + log.info("Migrated document ID: {} to new path: {}", document.getId(), newPath); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index bc8aff6c..828644b0 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -1,5 +1,6 @@ package net.gepafin.tendermanagement.util; +import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; @@ -31,6 +32,8 @@ import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientNotFoundExcep import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientUnauthorizedException; import net.gepafin.tendermanagement.web.rest.api.errors.FeignClientValidationException; +import static org.apache.commons.lang3.StringUtils.isEmpty; + public class Utils { @@ -308,6 +311,22 @@ public class Utils { return new StringTokenizer(header, ",").nextToken().trim(); } + public static List convertJsonToList(String json, TypeReference> typeRef) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + return objectMapper.readValue(json, typeRef); + } catch (IOException e) { + e.printStackTrace(); + return Collections.emptyList(); + } + } + + public static String convertObjectToJson(Object obj) { + try { + return new ObjectMapper().writeValueAsString(obj); + } catch (JsonProcessingException e) { + log.error("Failed to convert object to JSON: {}", e.getMessage(), e); + throw new RuntimeException("Failed to convert object to JSON", e);}} public static String replaceSpacesWithUnderscores(String content) { if (content == null) { @@ -315,4 +334,57 @@ public class Utils { } return content.trim().replace(" ", "_"); } + public static List> convertJsonStringIntoJsonList(String jsonString) { + try { + if(isEmpty(jsonString)) + { + return new ArrayList<>(); + } + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature(), true); + return mapper.readValue(jsonString, List.class); + } catch (Exception e) { + log.error(e.getMessage()); + } + return null; + } + public static String convertToString(Object input) { + if (input == null) { + return "null"; // Return string "null" for null input + } + + if (input instanceof String) { + return (String) input; // Return the string directly if input is a string + } + + if (input instanceof Collection) { + // Handle collections (List, Set, etc.) + return convertCollectionToString((Collection) input); + } + + if (input instanceof Map) { + // Handle maps + return convertMapToString((Map) input); + } + + // For other types (like Integer, Boolean, etc.), use toString() + return input.toString(); + } + + private static String convertCollectionToString(Collection collection) { + try { + return mapper.writeValueAsString(collection); // Convert the collection to a JSON string + } catch (JsonProcessingException e) { + throw new RuntimeException("Error converting collection to string", e); + } + } + + private static String convertMapToString(Map map) { + try { + return mapper.writeValueAsString(map); // Convert the map to a JSON string + } catch (JsonProcessingException e) { + throw new RuntimeException("Error converting map to string", e); + } + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/util/Validator.java b/src/main/java/net/gepafin/tendermanagement/util/Validator.java index 09563378..f8375649 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Validator.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Validator.java @@ -4,7 +4,6 @@ import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.config.jwt.TokenProvider; import net.gepafin.tendermanagement.constants.GepafinConstant; -import net.gepafin.tendermanagement.dao.CallDao; import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.entities.CompanyEntity; import net.gepafin.tendermanagement.entities.UserEntity; @@ -65,6 +64,20 @@ public class Validator { } return false; } + + public Boolean checkIsPreInstructor() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.isAuthenticated()) { + // Check if the user has the ROLE_SUPER_ADMIN authority + for (GrantedAuthority authority : authentication.getAuthorities()) { + if (RoleStatusEnum.ROLE_PRE_INSTRUCTOR.getValue().equals(authority.getAuthority())) { + return true; + } + } + } + return false; + } public void validateRequest(HttpServletRequest request,RoleStatusEnum role) { if (RoleStatusEnum.ROLE_SUPER_ADMIN.equals(role) && Boolean.FALSE.equals(checkIsSuperAdmin())) { @@ -73,13 +86,24 @@ public class Validator { } public CompanyEntity validateUserWithCompany(HttpServletRequest request, Long companyId) { + CompanyEntity companyEntity = companyService.validateCompany(companyId); + validateHubId(request, companyEntity.getHub().getId()); if (checkIsSuperAdmin()) { - return companyService.validateCompany(companyId); + return companyEntity; } Map userInfo = tokenProvider.getUserInfoAndUserIdFromToken(request); companyService.validateUserWithCompny(getUserId(userInfo), companyId); return companyService.validateCompany(companyId); } + + public void validateHubId(HttpServletRequest request, Long hubId) { + UserEntity user = validateUser(request); + Long hubIdFromHttpRequest = user.getHub().getId(); + if (Boolean.FALSE.equals(hubIdFromHttpRequest.equals(hubId))) { + throw new ForbiddenAccessException(Status.FORBIDDEN, + Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); + } + } private Long getUserId(Map userInfo) { return Long.parseLong(userInfo.get("userId").toString()); @@ -100,17 +124,21 @@ public class Validator { public UserEntity validateUserId(HttpServletRequest request, Long userId) { UserEntity user = validateUser(request); - if(user.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue()) && Boolean.FALSE.equals(user.getId().equals(userId))) { - throw new ForbiddenAccessException(Status.FORBIDDEN, Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); + UserEntity requestedUser = userService.validateUser(userId); + + validateHubId(request, requestedUser.getHub().getId()); + if (Boolean.FALSE.equals(user.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_SUPER_ADMIN.getValue())) + && Boolean.FALSE.equals(user.getId().equals(userId))) { + throw new ForbiddenAccessException(Status.FORBIDDEN, + Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); } - return userService.validateUser(userId); + return requestedUser; } - private Long getUserIdFromToken(HttpServletRequest request) { + public Long getUserIdFromToken(HttpServletRequest request) { Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); return Long.parseLong(userInfo.get("userId").toString()); } - public CallEntity validateUserWithCall(UserEntity user, Long callId) { CallEntity callEntity = callService.validateCall(callId); if(Boolean.FALSE.equals(user.getHub().getId().equals(callEntity.getHub().getId()))) { @@ -123,5 +151,20 @@ public class Validator { String[] activeProfiles = environment.getActiveProfiles(); return Arrays.stream(activeProfiles).anyMatch("production"::equals); } + + public UserEntity validatePreInstructor(HttpServletRequest request, Long preInstructorUserId) { + UserEntity preInstructorUser = userService.validateUser(preInstructorUserId); + if (checkIsSuperAdmin()) { + if (preInstructorUserId != null) { + validateHubId(request, preInstructorUser.getHub().getId()); + } + return preInstructorUser; + } else if (checkIsPreInstructor()) { + return validateUserId(request, preInstructorUserId); + } else { + throw new ForbiddenAccessException(Status.FORBIDDEN, + Translator.toLocale(GepafinConstant.PERMISSION_DENIED)); + } + } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java new file mode 100644 index 00000000..800f443f --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java @@ -0,0 +1,78 @@ +package net.gepafin.tendermanagement.web.rest.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; +import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; +import net.gepafin.tendermanagement.model.response.ApplicationResponse; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +public interface ApplicationEvaluationApi { + + @Operation(summary = "API to create or update ApplicationEvaluation", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) + }) + @PutMapping(value = "/{assignedApplicationsId}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> createOrUpdateApplicationEvaluation( + HttpServletRequest request, + @Parameter(required = true) @PathVariable("assignedApplicationsId") Long assignedApplicationsId, + @Parameter( required = true) @Valid @RequestBody ApplicationEvaluationRequest evaluationRequest); + + @Operation(summary = "API to get ApplicationEvaluation data for evaluation process", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })) + }) + @GetMapping(value = "/application", produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> getApplicationEvaluationByApplicationId( + HttpServletRequest request, + @Parameter(description = "Application ID", required = false) @RequestParam(value = "applicationId", required = false) Long applicationId, + @Parameter(description = "Assigned Application ID", required = false) @RequestParam(value = "assignedApplicationId", required = false) Long assignedApplicationId); + + + @Operation(summary = "API to delete ApplicationEvaluation", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })) + }) + @DeleteMapping(value = "/{id}") + ResponseEntity> deleteApplicationEvaluation(HttpServletRequest request, + @Parameter(description = "The evaluation ID", required = true) @PathVariable("id") Long id); + + @Operation(summary = "Api to update application evaluation status", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PutMapping(value = "/{applicationId}/status", produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> updateApplicationEvaluationStatus(HttpServletRequest request, + @Parameter( required = true) @PathVariable("applicationId") Long applicationId, + @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) ApplicationEvaluationStatusTypeEnum status); + +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java index dfbbfc37..1cfbb5c9 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/AssignedApplicationsApi.java @@ -6,9 +6,7 @@ import io.swagger.v3.oas.annotations.media.ExampleObject; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest; -import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean; import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; @@ -66,7 +64,8 @@ public interface AssignedApplicationsApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @GetMapping(value = "", produces = "application/json") - ResponseEntity>> getAllAssignedApplications(@Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId); + ResponseEntity>> getAllAssignedApplications(HttpServletRequest request, + @Parameter(description = "The User ID", required = false) @RequestParam(value = "userId",required = false) Long userId); @Operation(summary = "Api to update assigned application", responses = { @@ -94,7 +93,9 @@ public interface AssignedApplicationsApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @GetMapping(value = "/{id}", produces = "application/json") - ResponseEntity> getAssignedApplicationById(@Parameter(description = "The assigned application id", required = true) @PathVariable(value = "id", required = true) Long id); + ResponseEntity> getAssignedApplicationById(HttpServletRequest request, + @Parameter(description = "The assigned application id", required = true) @PathVariable(value = "id", required = true) Long id); + diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java index 3fcfad5d..c4539e31 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java @@ -74,7 +74,7 @@ public interface CallApi { public ResponseEntity> updateCallStep1(HttpServletRequest request, @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId, @Parameter(description = "Call request object", required = true) @Valid @RequestBody UpdateCallRequestStep1 updateCallRequest); - @Operation(summary = "Api to get call by id", + @Operation(summary = "Api to get call by id updated today to check the bug", responses = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LoginAttemptApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LoginAttemptApi.java index 379a1d05..4a71d545 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LoginAttemptApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LoginAttemptApi.java @@ -41,7 +41,7 @@ public interface LoginAttemptApi { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @GetMapping(value = "/login-attempt", produces = {"application/json"}) @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") - default ResponseEntity>> getLoginAttemptsList( + default ResponseEntity>> getLoginAttemptsList(HttpServletRequest request, @ApiParam(value = "page number") @RequestParam(name = "pageNo", required = false) Integer pageNo, @ApiParam(value = "page limit") @RequestParam(name = "pageLimit", required = false) Integer pageLimit) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3ConfigApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3ConfigApi.java new file mode 100644 index 00000000..61b3bd6c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3ConfigApi.java @@ -0,0 +1,67 @@ +package net.gepafin.tendermanagement.web.rest.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.Valid; +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.model.request.S3ConfigReq; +import net.gepafin.tendermanagement.model.response.S3ConfigBean; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; +import org.springframework.data.repository.query.Param; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Optional; + +@Validated +public interface S3ConfigApi { + + @Operation(summary = "Api to create S3Path structure.", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PostMapping(value = "", produces = { "application/json" }) + ResponseEntity> addS3Path(@Valid @RequestBody S3ConfigReq s3pathReq); + + @Operation(summary = "Api to get S3Path structure. by type", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @GetMapping(value = "", produces = { "application/json" }) + ResponseEntity>> getS3PathByType(@Valid @Param(value = "type") String type); + + @Operation(summary = "Api to delete S3Path structure. by id", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @DeleteMapping(value = "", produces = { "application/json" }) + ResponseEntity> deleteS3PathConfigById(@Valid @Param(value = "id") Long id); + + @Operation(summary = "Api to update S3Path structure. by id", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PutMapping(value = "", produces = { "application/json" }) + ResponseEntity> updateS3PathConfigById(@Valid @RequestBody S3ConfigReq s3PathConfigurationReq, @Param(value = "id") Long id); +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3MigrationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3MigrationApi.java new file mode 100644 index 00000000..4a4d3eb1 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/S3MigrationApi.java @@ -0,0 +1,28 @@ +package net.gepafin.tendermanagement.web.rest.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.Valid; +import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; +import org.springframework.data.repository.query.Param; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; + +@Validated +public interface S3MigrationApi { + + @Operation(summary = "Api to migrate S3 doc to db and update s3 files as per specified folder.", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PutMapping(value = "/{key}", produces = { "application/json" }) + String reUploadAndMigrateDocuments(@Parameter(description = "The secret key", required = true) @PathVariable("key") String key); +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java index 8982e45e..c7b8e530 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java @@ -59,7 +59,7 @@ public interface UserApi { @RequestMapping(value = "/{userId}", produces = {"application/json"}, method = RequestMethod.PUT) - default ResponseEntity> updateUser( + default ResponseEntity> updateUser(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, @Parameter(description = "User request object", required = true) @Valid @RequestBody UpdateUserReq userReq) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); @@ -77,7 +77,7 @@ public interface UserApi { @RequestMapping(value = "/{userId}", produces = {"application/json"}, method = RequestMethod.GET) - default ResponseEntity> getUserById( + default ResponseEntity> getUserById(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } @@ -93,7 +93,7 @@ public interface UserApi { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @RequestMapping(value = "/{userId}", method = RequestMethod.DELETE) - default ResponseEntity> deleteUser( + default ResponseEntity> deleteUser(HttpServletRequest request, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserSignedAndDelegationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserSignedAndDelegationApi.java new file mode 100644 index 00000000..2a3978a1 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserSignedAndDelegationApi.java @@ -0,0 +1,38 @@ +package net.gepafin.tendermanagement.web.rest.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.Valid; +import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants; +import org.springframework.data.repository.query.Param; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +@Validated +public interface UserSignedAndDelegationApi { + @Operation(summary = "Api to migrate S3 doc to db and user-delegated folder", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @GetMapping(value = "/{key}", produces = { "application/json" }) + String migrateUserDelegatedDocuments(@Parameter(description = "The secret key", required = true) @PathVariable("key") String key); + + @Operation(summary = "Api to migrate S3 doc to user-signed.", responses = { @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) + @PostMapping(value = "/{key}", produces = { "application/json" }) + String migrateUserSignedDocuments(@Parameter(description = "The secret key", required = true) @PathVariable("key") String key); +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java new file mode 100644 index 00000000..b523a3ec --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java @@ -0,0 +1,64 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; +import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum; +import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest; +import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse; +import net.gepafin.tendermanagement.model.response.ApplicationResponse; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.service.ApplicationEvaluationService; +import net.gepafin.tendermanagement.web.rest.api.ApplicationEvaluationApi; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/applicationEvaluation}") +public class ApplicationEvaluationApiController implements ApplicationEvaluationApi { + + @Autowired + private ApplicationEvaluationService applicationEvaluationService; + + @Override + public ResponseEntity> createOrUpdateApplicationEvaluation(HttpServletRequest request, + Long assignedApplicationsId,ApplicationEvaluationRequest evaluationRequest) { + ApplicationEvaluationResponse response = applicationEvaluationService.createOrUpdateApplicationEvaluation(request,evaluationRequest,assignedApplicationsId); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CREATED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> getApplicationEvaluationByApplicationId( + HttpServletRequest request, Long applicationId, Long assignedApplicationId) { + + ApplicationEvaluationResponse response = null; + response = applicationEvaluationService.getApplicationEvaluationByApplicationId(request, applicationId,assignedApplicationId); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_FETCHED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> deleteApplicationEvaluation(HttpServletRequest request, + Long id) { + applicationEvaluationService.deleteApplicationEvaluation(request,id); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_DELETED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> updateApplicationEvaluationStatus(HttpServletRequest request, Long applicationId, + ApplicationEvaluationStatusTypeEnum status) { + ApplicationEvaluationResponse applicationEvaluationResponse = applicationEvaluationService.updateApplicationEvaluationStatus(request, applicationId, status); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(applicationEvaluationResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_EVALUATION_STATUS_UPDATED_SUCCESSFULLY))); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java index 9c4f0ad4..90f989de 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AssignedApplicationsController.java @@ -43,9 +43,9 @@ public class AssignedApplicationsController implements AssignedApplicationsApi { } @Override - public ResponseEntity>> getAllAssignedApplications(Long userId) { + public ResponseEntity>> getAllAssignedApplications(HttpServletRequest request, Long userId) { log.info("Get All Assigned Applications"); - List applications = assignedApplicationsService.getAllAssignedApplications(userId); + List applications = assignedApplicationsService.getAllAssignedApplications(request, userId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(applications, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG))); } @@ -59,9 +59,9 @@ public class AssignedApplicationsController implements AssignedApplicationsApi { } @Override - public ResponseEntity> getAssignedApplicationById(Long id) { + public ResponseEntity> getAssignedApplicationById(HttpServletRequest request, Long id) { log.info("Get Assigned Applications By Id"); - AssignedApplicationsResponse application = assignedApplicationsService.getAssignedApplicationById(id); + AssignedApplicationsResponse application = assignedApplicationsService.getAssignedApplicationById(request, id); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(application, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_ASSIGNED_APPLICATION_SUCCESS_MSG))); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java index b06380e4..69154098 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java @@ -88,7 +88,7 @@ public class CallApiController implements CallApi { } @Override public ResponseEntity downloadCallDocumentsAsZip(HttpServletRequest request, Long callId) { - byte[] zipFile = callService.downloadCallDocumentsAsZip(callId); + byte[] zipFile = callService.downloadCallDocumentsAsZip(request, callId); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java index 7141a256..34caa9fd 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DocumentApiController.java @@ -31,7 +31,7 @@ DocumentApiController implements DocumentApi { public ResponseEntity>> uploadFile(HttpServletRequest httpServletRequest, Long sourceId, DocumentSourceTypeEnum sourceType, List files, DocumentTypeEnum fileType) { try { - List responseBeans = documentService.uploadFile(files, sourceId,sourceType, fileType); + List responseBeans = documentService.uploadFile(files, sourceId, sourceType, fileType); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response>(responseBeans, Status.SUCCESS, Translator.toLocale(GepafinConstant.FILES_UPLOADED_MSG))); } catch (CustomValidationException ex) { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LoginAttemptApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LoginAttemptApiController.java index ed3a048b..cfd601b3 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LoginAttemptApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LoginAttemptApiController.java @@ -39,8 +39,8 @@ public class LoginAttemptApiController implements LoginAttemptApi { private UserService userService; @Override - public ResponseEntity>> getLoginAttemptsList(Integer pageNo, Integer pageLimit) { - LoginAttemptPageableResponseBean> response = loginAttemptService.getLoginAttemptsList(pageNo, pageLimit); + public ResponseEntity>> getLoginAttemptsList(HttpServletRequest request, Integer pageNo, Integer pageLimit) { + LoginAttemptPageableResponseBean> response = loginAttemptService.getLoginAttemptsList(request, pageNo, pageLimit); return ResponseEntity.status(HttpStatus.OK).body(response); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3ConfigController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3ConfigController.java new file mode 100644 index 00000000..62f12414 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3ConfigController.java @@ -0,0 +1,59 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.S3ConfigEntity; +import net.gepafin.tendermanagement.model.request.S3ConfigReq; +import net.gepafin.tendermanagement.model.response.S3ConfigBean; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.service.S3ConfigService; +import net.gepafin.tendermanagement.web.rest.api.S3ConfigApi; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Optional; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/s3-path-config}") +public class S3ConfigController implements S3ConfigApi { + + private static final Logger log = LoggerFactory.getLogger(S3ConfigController.class); + + @Autowired + S3ConfigService s3PathService; + + @Override + public ResponseEntity> addS3Path(S3ConfigReq s3pathReq) { + + log.info("Request Body : {}, {}, {}", s3pathReq.getPath(), s3pathReq.getType(), s3pathReq.getBucketName()); + S3ConfigBean s3Path = s3PathService.addS3Path(s3pathReq); + return ResponseEntity.status(HttpStatus.CREATED).body(new Response(s3Path, Status.SUCCESS, Translator.toLocale(GepafinConstant.ADDED_S3_PATH_STRUCTURE))); + } + @Override + public ResponseEntity>> getS3PathByType(String type) { + + log.info("Request to get S3Path by type {}", type); + Optional s3Path = s3PathService.getS3PathByType(type); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response>(s3Path, Status.SUCCESS, Translator.toLocale(GepafinConstant.S3_PATH_STRUCTURE_BY_TYPE))); + } + @Override + public ResponseEntity> deleteS3PathConfigById(Long id) { + log.info("Request to delete S3Path by Id {}", id); + S3ConfigEntity deletedS3PathConfig = s3PathService.deleteS3PathById(id); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response(deletedS3PathConfig, Status.SUCCESS, Translator.toLocale(GepafinConstant.S3_PATH_DELETE_MSG))); + } + @Override + public ResponseEntity> updateS3PathConfigById(S3ConfigReq s3PathConfigurationReq, Long id) { + S3ConfigBean updatedS3PathConfiguration = s3PathService.updateS3PathConfiguration(s3PathConfigurationReq, id); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response(updatedS3PathConfiguration, Status.SUCCESS, Translator.toLocale(GepafinConstant.S3_PATH_CONFIG_UPDATE_MSG))); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3MigrationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3MigrationApiController.java new file mode 100644 index 00000000..7e58800e --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3MigrationApiController.java @@ -0,0 +1,19 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import net.gepafin.tendermanagement.service.impl.S3ReUploadMigrationService; +import net.gepafin.tendermanagement.web.rest.api.S3MigrationApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/s3-migration}") +public class S3MigrationApiController implements S3MigrationApi { + + @Autowired + S3ReUploadMigrationService s3MigrationService; + @Override + public String reUploadAndMigrateDocuments(String providedKey) { + return s3MigrationService.reUploadAndMigrateDocuments(providedKey); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3UserSignedAndDelegationMigrationController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3UserSignedAndDelegationMigrationController.java new file mode 100644 index 00000000..061b731b --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/S3UserSignedAndDelegationMigrationController.java @@ -0,0 +1,24 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import net.gepafin.tendermanagement.service.impl.UserSignedAndDelegationServiceImpl; +import net.gepafin.tendermanagement.web.rest.api.UserSignedAndDelegationApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/s3-user-signed-and-delegation-migration}") +public class S3UserSignedAndDelegationMigrationController implements UserSignedAndDelegationApi { + + @Autowired + UserSignedAndDelegationServiceImpl userSignedAndDelegationService; + + @Override + public String migrateUserDelegatedDocuments(String providedKey) { + return userSignedAndDelegationService.migrateUserDelegatedDocuments(providedKey); + } + @Override + public String migrateUserSignedDocuments(String providedKey) { + return userSignedAndDelegationService.migrateUserSignedDocuments(providedKey); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java index 413feaac..1a3040c1 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java @@ -44,29 +44,29 @@ public class UserApiController implements UserApi { } @Override - public ResponseEntity> updateUser( + public ResponseEntity> updateUser(HttpServletRequest request, @PathVariable("userId") Long userId, @Valid @RequestBody UpdateUserReq userReq) { log.info("Update User - User ID: {}, Request Body: {}", userId, userReq); - UserResponseBean updatedUser = userService.updateUser(userId, userReq); + UserResponseBean updatedUser = userService.updateUser(request, userId, userReq); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(updatedUser, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_UPDATED_SUCCESS_MSG))); } @Override - public ResponseEntity> getUserById( + public ResponseEntity> getUserById(HttpServletRequest request, @PathVariable("userId") Long userId) { log.info("Get User by ID - User ID: {}", userId); - UserResponseBean user = userService.getUserById(userId); + UserResponseBean user = userService.getUserById(request, userId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(user, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_USER_SUCCESS_MSG))); } @Override - public ResponseEntity> deleteUser( + public ResponseEntity> deleteUser(HttpServletRequest request, @PathVariable("userId") Long userId) { log.info("Delete User - User ID: {}", userId); - userService.deleteUser(userId); + userService.deleteUser(request, userId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_DELETED_SUCCESS_MSG))); } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index f7ccb81a..8fa5c7a6 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -8,7 +8,10 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.h2.console.enabled=true isVatCheckGloballyDisabled = false + isMailSendingEnabled = true default_System_Receiver_Email=antonio.manca@bflows.net gepafin_email=rinaldo.bonazzo@bflows.net -rinaldo_email=rinaldo.bonazzo@bflows.net \ No newline at end of file +rinaldo_email=rinaldo.bonazzo@bflows.net +carlo_email=test@test.test +default.hub.uuid=p4lk3bcx1RStqTaIVVbXs diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 6b925e03..76aca344 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -6,4 +6,11 @@ spring.datasource.driver-class-name=org.postgresql.Driver # JPA Configuration spring.jpa.show-sql=true -base-url=http://localhost:8080 \ No newline at end of file +base-url=http://localhost:8080 + +isMailSendingEnabled = false +default_System_Receiver_Email=test@test.test +gepafin_email=test@test.test +rinaldo_email=test@test.test +carlo_email=test@test.test +default.hub.uuid=p4lk3bcx1RStqTaIVVbXs \ No newline at end of file diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index 725d9c8a..be007786 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -14,8 +14,10 @@ fe.base.url=https://bandi.gepafin.it #SPID configuration spid.ipd.base.url=https://login.regione.umbria.it active.profile.folder=production + isMailSendingEnabled = true default_System_Receiver_Email=antonio.manca@bflows.net gepafin_email=bandi@pec.gepafin.it rinaldo_email=rinaldo.bonazzo@bflows.net carlo_email=carlo.mancosu@bflows.net +default.hub.uuid=p4lk3bcx1RStqTaIVVbXs diff --git a/src/main/resources/application-testing.properties b/src/main/resources/application-testing.properties index 12b95acb..1dbc41cc 100644 --- a/src/main/resources/application-testing.properties +++ b/src/main/resources/application-testing.properties @@ -5,4 +5,10 @@ spring.datasource.password=sa # JPA Configuration spring.h2.console.enabled=true -base-url=http://localhost:8080 \ No newline at end of file +base-url=http://localhost:8080 +isMailSendingEnabled = false +default_System_Receiver_Email=test@test.test +gepafin_email=test@test.test +rinaldo_email=test@test.test +carlo_email=test@test.test +default.hub.uuid=p4lk3bcx1RStqTaIVVbXs \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 75ab20cf..2ad3ba65 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,8 @@ spring.application.name=tendermanagement # Multipart Configuration -spring.servlet.multipart.max-file-size=15MB -spring.servlet.multipart.max-request-size=15MB +spring.servlet.multipart.max-file-size=300MB +spring.servlet.multipart.max-request-size=300MB spring.profiles.active=testing @@ -59,10 +59,4 @@ mailGun_base_url=https://api.eu.mailgun.net/ # SendinBlue API key apiKey=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 #senderEmail=mailer@bflows.net -isMailSendingEnabled = false -default_System_Receiver_Email=antonio.manca@bflows.net -gepafin_email=rinaldo.bonazzo@bflows.net -rinaldo_email=rinaldo.bonazzo@bflows.net -carlo_email=rinaldo.bonazzo@bflows.net -default.hub.uuid=p4lk3bcx1RStqTaIVVbXs diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index 83dd126c..83d098bb 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -67,7 +67,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -101,18 +101,18 @@ - - + + - - + + - - + + @@ -122,19 +122,19 @@ - + - + - + - + - + @@ -250,7 +250,8 @@ - + + @@ -270,34 +271,39 @@ - + + - + - + - + + + - - - + + - + @@ -318,7 +324,8 @@ - + @@ -329,7 +336,8 @@ - + @@ -340,7 +348,8 @@ - + @@ -351,7 +360,8 @@ - + @@ -416,7 +426,8 @@ - + + @@ -432,7 +443,8 @@ - + + @@ -454,50 +466,50 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -507,62 +519,62 @@ + path="db/dump/inserted_form_field_data_30_08_2024.sql"/> select setval('gepafin_schema.form_field_id_seq', (select max(id)+1 from gepafin_schema.form_field), false) - - - - - - - - - - + + + + + + + + + + + references="lookup_data(id)"/> - - - - + + + + TRUNCATE TABLE FORM_FIELD RESTART IDENTITY; + path="db/dump/update_form_field_data_04_09_2024.sql"/> - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -586,23 +598,26 @@ - + + - + - + - + - + + @@ -618,9 +633,10 @@ - + + - + @@ -634,12 +650,13 @@ - + + - + - + @@ -658,18 +675,20 @@ - + - + + - + @@ -693,7 +712,7 @@ TRUNCATE TABLE FORM_FIELD RESTART IDENTITY; + path="classpath:db/dump/inserted_form_field_data_13_09_2024.sql"/> @@ -708,7 +727,7 @@ + path="classpath:db/dump/updated_form_field_data_16-09-2024.sql"/> @@ -739,16 +758,16 @@ $$; - - - - - - - - - - + + + + + + + + + + @@ -783,99 +802,99 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + id = 13 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - + - + @@ -890,25 +909,25 @@ - + - - - + + + - - - - + + + + - + - + @@ -924,8 +943,8 @@ - - + + @@ -934,48 +953,48 @@ + path="classpath:db/dump/updated_form_field_data_03-10-2024.sql"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -983,7 +1002,7 @@ + path="classpath:db/dump/updated_form_field_data_03-10-2024_1.sql"/> @@ -994,8 +1013,8 @@ - - + + @@ -1003,16 +1022,16 @@ - - + + + primaryKeyName="protocol_pkey"/> @@ -1058,132 +1077,132 @@ - - - - + + + + + primaryKeyName="system_email_template_pkey"/> - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - name='table' - - + + + + + name='table' + + + path="db/dump/update_system_email_template_of_application_submission.sql"/> - + + primaryKeyName="login_attempt_pkey"/> - - + + - - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + + primaryKeyName="criteria_form_field_pkey"/> - - - - + + + + - - - - + + + + - + @@ -1226,9 +1245,10 @@ - + - + @@ -1244,47 +1264,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -1293,12 +1310,12 @@ - + - - + + @@ -1315,9 +1332,9 @@ - + - + @@ -1362,10 +1379,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/dynamic-triggers.xml b/src/main/resources/db/changelog/dynamic-triggers.xml index 23f1101e..9356279d 100644 --- a/src/main/resources/db/changelog/dynamic-triggers.xml +++ b/src/main/resources/db/changelog/dynamic-triggers.xml @@ -20,7 +20,7 @@ ) LOOP EXECUTE format( - 'CREATE OR REPLACE TRIGGER tg_gepafin_schema_updated_at_%I + 'CREATE OR REPLACE TRIGGER tg_gepafin_schema_updated_date_%I BEFORE UPDATE ON gepafin_schema.%I FOR EACH ROW EXECUTE FUNCTION gepafin_schema.clock_timestamp_updated_date_column()', @@ -37,7 +37,7 @@ ) LOOP EXECUTE format( - 'CREATE OR REPLACE TRIGGER tg_gepafin_schema_created_at_%I + 'CREATE OR REPLACE TRIGGER tg_gepafin_schema_created_date_%I BEFORE INSERT ON gepafin_schema.%I FOR EACH ROW EXECUTE FUNCTION gepafin_schema.clock_timestamp_created_date_column()', diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 4cc3f5f5..6637785e 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -253,7 +253,15 @@ get_login_attempt_se_msg=Login attempts fetched successfully. application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status. get.users.success.msg = Successfully fetched users. cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role. +application.evaluation.not.found=Application Evaluation not found with ID: {0} +evaluation.created.successfully = Application evaluation created successfully. +evaluation.updated.successfully = Application evaluation updated successfully. +evaluation.fetched.successfully = Application evaluation fetched successfully. +evaluation.deleted.successfully = Application evaluation deleted successfully. +evaluations.fetched.successfully = All application evaluations fetched successfully. +application.evaluation.status.updated.successfully=Application evaluation status updated successfully. evaluationCriteria.invalid=This evaluation criterion does not belong to the current call. +assigned.application.not.found.with.id=Assigned application with this application ID not found # Hub Messages diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index 3fec3019..faba7714 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -252,6 +252,14 @@ get.users.success.msg = Utenti recuperati con successo cannot.create.beneficiary.user = La creazione di un utente beneficiario non � consentita. Si prega di assegnare il ruolo appropriato. evaluationCriteria.invalid=Questo criterio di valutazione non appartiene alla chiamata corrente. +application.evaluation.not.found=Valutazione dell'applicazione non trovata con ID: {0} +evaluation.created.successfully = Valutazione dell'applicazione creata con successo. +evaluation.updated.successfully = Valutazione dell'applicazione aggiornata con successo. +evaluation.fetched.successfully = Valutazione dell'applicazione recuperata con successo. +evaluation.deleted.successfully = Valutazione dell'applicazione eliminata con successo. +evaluations.fetched.successfully = Tutte le valutazioni delle applicazioni recuperate con successo. +application.evaluation.status.updated.successfully=Stato della valutazione dell'applicazione aggiornato con successo. +assigned.application.not.found.with.id=Applicazione assegnata con questo ID dell'applicazione non trovata application.assigned.success.msg =Domanda assegnata con successo application.already.assigned.msg =La domanda � gi� assegnata