diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index 33260c52..265061dc 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -98,7 +98,7 @@ public class CallDao { CallEntity callEntity = new CallEntity(); // validateCallEntity(createCallRequest); RegionEntity region = regionRepository.findById(createCallRequest.getRegionId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND))); callEntity.setRegion(region); callEntity.setName(createCallRequest.getName()); @@ -152,7 +152,7 @@ public class CallDao { LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(criteriaReq, type); if (criteriaReq.getId() != null && criteriaReq.getId() > 0) { criteriaEntity = evaluationCriteriaRepository.findById(criteriaReq.getId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); } else { criteriaEntity = new EvaluationCriteriaEntity(); @@ -196,7 +196,7 @@ public class CallDao { private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) { validateDocumentEntity(documentReq.getId()); DocumentEntity documentEntity = documentRepository.findByIdAndCallIdAndIsDeletedFalse(documentReq.getId(), callEntity.getId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); return documentEntity; } @@ -412,7 +412,7 @@ public class CallDao { } return lookUpDataRepository.findById(req.getLookUpDataId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); } @@ -430,21 +430,17 @@ public class CallDao { } public CallEntity validateCall(Long callId) { - return callRepository.findById(callId).orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, + return callRepository.findById(callId).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); } public CallResponse getCallById(Long callId) { - CallEntity callEntity = callRepository.findById(callId) - .orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + CallEntity callEntity = validateCall(callId); return getCallResponseBean(callEntity); } public CallResponse createCallStep2(Long callId, CreateCallRequestStep2 createCallRequest, Long userId) { - CallEntity callEntity = callRepository.findById(callId) - .orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + CallEntity callEntity = validateCall(callId); validateUpdate(callEntity); setIfUpdated(callEntity::getThreshold, callEntity::setThreshold, createCallRequest.getThreshold()); callRepository.save(callEntity); @@ -562,7 +558,7 @@ public class CallDao { if (isExistingFaq(faqReq)) { faqEntity = faqRepository.findById(faqReq.getId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); } else { faqEntity = new FaqEntity(); @@ -608,7 +604,7 @@ public class CallDao { LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(lookUpDataReq, type); if (lookUpDataReq.getId() != null && lookUpDataReq.getId() > 0) { checklistEntity = callTargetAudienceChecklistRepository.findById(lookUpDataReq.getId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); if (Boolean.FALSE.equals(checklistEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) { @@ -685,7 +681,7 @@ public class CallDao { .collect(Collectors.toList()); } - public CallResponse validateCall(CallEntity callEntity) { + public CallResponse validateCallData(CallEntity callEntity) { validateUpdate(callEntity); CallResponse callResponseBean = getCallResponseBean(callEntity); CallValidatorServiceImpl.validateResponse(callResponseBean); @@ -704,8 +700,7 @@ public class CallDao { } public CallResponse updateCallStatus(Long callId, CallStatusEnum statusReq) { - CallEntity callEntity = callRepository.findById(callId) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + CallEntity callEntity = validateCall(callId); CallStatusEnum currentStatus = CallStatusEnum.valueOf(callEntity.getStatus()); validateStatusChange(currentStatus, statusReq); callEntity.setStatus(statusReq.getValue()); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index 3a0b1b9b..c079a40f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -1,7 +1,6 @@ package net.gepafin.tendermanagement.dao; import java.io.IOException; -import java.util.*; import java.util.stream.Collectors; import org.apache.commons.io.FilenameUtils; @@ -16,9 +15,9 @@ import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.entities.DocumentEntity; import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.response.DocumentResponseBean; -import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.DocumentRepository; import net.gepafin.tendermanagement.service.AmazonS3Service; +import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -39,13 +38,11 @@ public class DocumentDao { private CallDao callDao; @Autowired - private CallRepository callRepository; + private CallService callService; public List uploadFiles(List files, Long callId, DocumentTypeEnum fileType) { List documentEntities = new ArrayList<>(); - CallEntity callEntity = callRepository.findById(callId) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, - Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + CallEntity callEntity = callService.validateCall(callId); for (MultipartFile file : files) { try { uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file); @@ -79,7 +76,7 @@ public class DocumentDao { } public void deleteFile(Long documentId) { - DocumentEntity documentEntity = getDocumentEntity(documentId); + DocumentEntity documentEntity = validateDocument(documentId); // String fileName= Utils.extractFileName(documentEntity.getFilePath()); // deleteFileOnAmazonS3(fileName); documentEntity.setIsDeleted(true); @@ -94,17 +91,13 @@ public class DocumentDao { return null; } - private DocumentEntity getDocumentEntity(Long documentId) { - Optional documentEntity = documentRepository.findById(documentId); - if (documentEntity.isEmpty()) { - throw new ResourceNotFoundException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)); - } - return documentEntity.orElse(null); + public DocumentEntity validateDocument(Long id) { + return documentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); } public DocumentResponseBean updateDocument(Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { - DocumentEntity documentEntity = getDocumentEntity(documentId); + DocumentEntity documentEntity = validateDocument(documentId); String fileName = Utils.extractFileName(documentEntity.getFilePath()); deleteFileOnAmazonS3(fileName); uploadFileOnAmazonS3 result = null; @@ -122,11 +115,7 @@ public class DocumentDao { } public DocumentResponseBean getDocument(Long documentId) { - Optional documentEntity = documentRepository.findById(documentId); - if (documentEntity.isEmpty()) { - new ResourceNotFoundException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)); - } - return callDao.convertToDocumentResponseBean(documentEntity.orElse(null)); + 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 ab5c25b2..f747d38f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java @@ -7,77 +7,81 @@ import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity; import net.gepafin.tendermanagement.entities.LookUpDataEntity; import net.gepafin.tendermanagement.model.request.EvaluationCriteriaRequest; import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; -import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.EvaluationCriteriaRepository; -import net.gepafin.tendermanagement.repositories.LookUpDataRepository; +import net.gepafin.tendermanagement.service.CallService; +import net.gepafin.tendermanagement.service.LookUpDataService; 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.dao.EmptyResultDataAccessException; import org.springframework.stereotype.Component; - @Component public class EvaluationCriteriaDao { - @Autowired - private EvaluationCriteriaRepository evaluationCriteriaRepository; + @Autowired + private EvaluationCriteriaRepository evaluationCriteriaRepository; - @Autowired - private CallRepository callRepository; - - @Autowired - private LookUpDataRepository lookUpDataRepository; + @Autowired + private CallService callService; - public EvaluationCriteriaResponseBean createEvaluationCriteria(EvaluationCriteriaRequest evaluationCriteriaRequest) { - EvaluationCriteriaEntity entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(evaluationCriteriaRequest); - return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity); - } + @Autowired + private LookUpDataService lookUpDataService; - private EvaluationCriteriaEntity convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(EvaluationCriteriaRequest evaluationCriteriaRequest) { - EvaluationCriteriaEntity entity = new EvaluationCriteriaEntity(); - CallEntity callEntity = callRepository.findById(evaluationCriteriaRequest.getCallId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); - LookUpDataEntity looDataEntity = lookUpDataRepository.findById(evaluationCriteriaRequest.getLookUpDataId()) + public EvaluationCriteriaResponseBean createEvaluationCriteria( + EvaluationCriteriaRequest evaluationCriteriaRequest) { + EvaluationCriteriaEntity entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity( + evaluationCriteriaRequest); + return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity); + } + + private EvaluationCriteriaEntity convertEvaluationCriteriaRequestToEvaluationCriteriaEntity( + EvaluationCriteriaRequest evaluationCriteriaRequest) { + EvaluationCriteriaEntity entity = new EvaluationCriteriaEntity(); + CallEntity callEntity = callService.validateCall(evaluationCriteriaRequest.getCallId()); + LookUpDataEntity looDataEntity = lookUpDataService + .validateLookUpData(evaluationCriteriaRequest.getLookUpDataId()); + entity.setCall(callEntity); + entity.setLookupData(looDataEntity); + entity.setScore(evaluationCriteriaRequest.getScore()); + entity = evaluationCriteriaRepository.save(entity); + return entity; + } + + public EvaluationCriteriaResponseBean getEvaluationCriteriaById(Long id) { + return evaluationCriteriaRepository.findById(id) + .map(this::convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, - Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); - entity.setCall(callEntity); - entity.setLookupData(looDataEntity); - entity.setScore(evaluationCriteriaRequest.getScore()); - entity = evaluationCriteriaRepository.save(entity); - return entity; - } + Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); + } - public EvaluationCriteriaResponseBean getEvaluationCriteriaById(Long id) { - return evaluationCriteriaRepository.findById(id) - .map(this::convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); - } + public EvaluationCriteriaResponseBean updateEvaluationCriteria(Long id, EvaluationCriteriaRequest request) { + EvaluationCriteriaEntity entity = evaluationCriteriaRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); + entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(request); + return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity); + } - public EvaluationCriteriaResponseBean updateEvaluationCriteria(Long id, EvaluationCriteriaRequest request) { - EvaluationCriteriaEntity entity = evaluationCriteriaRepository.findById(id) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); - entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(request); - return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity); - } + public void deleteEvaluationCriteria(Long id) { + try { + evaluationCriteriaRepository.deleteById(id); + } catch (EmptyResultDataAccessException e) { + throw new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)); + } + } - public void deleteEvaluationCriteria(Long id) { - try { - evaluationCriteriaRepository.deleteById(id); - } catch (EmptyResultDataAccessException e) { - throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)); - } - } - - private EvaluationCriteriaResponseBean convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(EvaluationCriteriaEntity entity) { - EvaluationCriteriaResponseBean response = new EvaluationCriteriaResponseBean(); - response.setId(entity.getId()); - response.setScore(entity.getScore()); - response.setCreatedDate(entity.getCreatedDate()); - response.setUpdatedDate(entity.getUpdatedDate()); - response.setLookUpDataId(entity.getLookupData().getId()); - response.setTitle(entity.getLookupData().getTitle()); - response.setValue(entity.getLookupData().getValue()); - return response; - } + private EvaluationCriteriaResponseBean convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean( + EvaluationCriteriaEntity entity) { + EvaluationCriteriaResponseBean response = new EvaluationCriteriaResponseBean(); + response.setId(entity.getId()); + response.setScore(entity.getScore()); + response.setCreatedDate(entity.getCreatedDate()); + response.setUpdatedDate(entity.getUpdatedDate()); + response.setLookUpDataId(entity.getLookupData().getId()); + response.setTitle(entity.getLookupData().getTitle()); + response.setValue(entity.getLookupData().getValue()); + return response; + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java index 0b8d02c6..dcd60c65 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java @@ -8,8 +8,8 @@ import net.gepafin.tendermanagement.entities.LookUpDataEntity; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.model.request.FaqReq; import net.gepafin.tendermanagement.model.response.FaqResponseBean; -import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.FaqRepository; +import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; @@ -32,15 +32,15 @@ public class FaqDao { private CallDao callDao; @Autowired - private CallRepository callRepository; + private CallService callService; public FaqResponseBean createFaq(FaqReq faqRequest, Long userId, Long callId) { FaqEntity entity = new FaqEntity(); - CallEntity callEntity = callRepository.findById(callId) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, - Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + CallEntity callEntity = callService.validateCall(callId); + ; UserEntity userEntity = userService.validateUser(userId); - entity = callDao.convertToFaqEntity(faqRequest, callEntity, userEntity, LookUpDataEntity.LookUpDataTypeEnum.FAQ); + entity = callDao.convertToFaqEntity(faqRequest, callEntity, userEntity, + LookUpDataEntity.LookUpDataTypeEnum.FAQ); faqRepository.save(entity); return convertFaqEntityToResponseBean(entity); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java index 1c3f3dec..dd11b579 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java @@ -10,7 +10,6 @@ import net.gepafin.tendermanagement.model.response.ContentResponseBean; import net.gepafin.tendermanagement.model.response.FormResponseBean; import net.gepafin.tendermanagement.repositories.FormRepository; import net.gepafin.tendermanagement.service.CallService; -import net.gepafin.tendermanagement.service.FormService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; @@ -32,9 +31,6 @@ public class FormDao { @Autowired private CallService callService; - @Autowired - private FormService formService; - public FormEntity saveFormEntity(FormEntity formEntity){ formEntity=formRepository.save(formEntity); return formEntity; @@ -68,7 +64,7 @@ public class FormDao { } } public FormResponseBean updateForm(Long formId, FormRequest formRequest){ - FormEntity formEntity = formService.getFormEntityById(formId); + FormEntity formEntity = validateForm(formId); Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel()); Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,setContentResponseBean(formRequest.getContent())); formEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); @@ -76,18 +72,18 @@ public class FormDao { return convertFormEntityToFormResponseBean(formEntity); } - public FormEntity getFormEntity(Long formId) { + public FormEntity validateForm(Long formId) { FormEntity formEntity = formRepository.findById(formId) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_NOT_FOUND))); return formEntity; } public FormResponseBean getFormEntityById(Long formId) { - FormEntity formEntity = formService.getFormEntityById(formId); + FormEntity formEntity = validateForm(formId); return convertFormEntityToFormResponseBean(formEntity); } public void deleteFormById(Long formId){ - FormEntity formEntity=formService.getFormEntityById(formId); + FormEntity formEntity = validateForm(formId); formRepository.delete(formEntity); } public List getFormsByCallId(Long callId){ diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java index c69e777d..beda3eaa 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java @@ -8,7 +8,6 @@ import net.gepafin.tendermanagement.model.request.SettingRequestBean; import net.gepafin.tendermanagement.model.response.FormFieldResponseBean; import net.gepafin.tendermanagement.model.response.SettingResponseBean; import net.gepafin.tendermanagement.repositories.FormFieldRepository; -import net.gepafin.tendermanagement.service.FormFieldService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; @@ -24,79 +23,86 @@ import java.util.stream.Collectors; @Component public class FormFieldDao { - @Autowired - private FormFieldRepository formFieldRepository; + @Autowired + private FormFieldRepository formFieldRepository; - @Autowired - private FormFieldService formFieldService; + public FormFieldEntity convertFormFieldRequestToFormFieldEntity(FormFieldRequest formFieldRequest) { + FormFieldEntity formFieldEntity = new FormFieldEntity(); + formFieldEntity.setLabel(formFieldRequest.getLabel()); + formFieldEntity.setName(formFieldRequest.getName()); + formFieldEntity.setValidators(Utils.convertMapIntoJsonString(formFieldRequest.getValidators())); + formFieldEntity.setSettings(setSettingRequestBean(formFieldRequest.getSettings())); + formFieldEntity = saveFormFieldEntity(formFieldEntity); + return formFieldEntity; + } + public FormFieldResponseBean convertFormFieldEntityToFormFieldResponseBean(FormFieldEntity formFieldEntity) { + FormFieldResponseBean formFieldResponseBean = new FormFieldResponseBean(); + formFieldResponseBean.setId(formFieldEntity.getId()); + formFieldResponseBean.setName(formFieldEntity.getName()); + formFieldResponseBean + .setSettings(Utils.convertJsonStringToList(formFieldEntity.getSettings(), SettingResponseBean.class)); + formFieldResponseBean.setLabel(formFieldEntity.getLabel()); + formFieldResponseBean.setValidators(Utils.convertIntoJson(formFieldEntity.getValidators())); + return formFieldResponseBean; + } - public FormFieldEntity convertFormFieldRequestToFormFieldEntity(FormFieldRequest formFieldRequest) { - FormFieldEntity formFieldEntity = new FormFieldEntity(); - formFieldEntity.setLabel(formFieldRequest.getLabel()); - formFieldEntity.setName(formFieldRequest.getName()); - formFieldEntity.setValidators(Utils.convertMapIntoJsonString(formFieldRequest.getValidators())); - formFieldEntity.setSettings(setSettingRequestBean(formFieldRequest.getSettings())); - formFieldEntity = saveFormFieldEntity(formFieldEntity); - return formFieldEntity; - } + public FormFieldEntity saveFormFieldEntity(FormFieldEntity formFieldEntity) { + formFieldEntity = formFieldRepository.save(formFieldEntity); + return formFieldEntity; + } - public FormFieldResponseBean convertFormFieldEntityToFormFieldResponseBean(FormFieldEntity formFieldEntity) { - FormFieldResponseBean formFieldResponseBean = new FormFieldResponseBean(); - formFieldResponseBean.setId(formFieldEntity.getId()); - formFieldResponseBean.setName(formFieldEntity.getName()); - formFieldResponseBean.setSettings(Utils.convertJsonStringToList(formFieldEntity.getSettings(), SettingResponseBean.class)); - formFieldResponseBean.setLabel(formFieldEntity.getLabel()); - formFieldResponseBean.setValidators(Utils.convertIntoJson(formFieldEntity.getValidators())); - return formFieldResponseBean; - } + public void validateFormField(FormFieldRequest formFieldRequest) { + if (formFieldRequest.getSettings() == null || formFieldRequest.getLabel() == null) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_FIELD)); + } + } - public FormFieldEntity saveFormFieldEntity(FormFieldEntity formFieldEntity) { - formFieldEntity = formFieldRepository.save(formFieldEntity); - return formFieldEntity; - } + public FormFieldResponseBean createFormField(FormFieldRequest formFieldRequest) { + validateFormField(formFieldRequest); + FormFieldEntity formFieldEntity = convertFormFieldRequestToFormFieldEntity(formFieldRequest); + return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity); + } - public void validateFormField(FormFieldRequest formFieldRequest) { - if (formFieldRequest.getSettings() == null || formFieldRequest.getLabel() == null) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_FIELD)); - } - } - public FormFieldResponseBean createFormField(FormFieldRequest formFieldRequest){ - validateFormField(formFieldRequest); - FormFieldEntity formFieldEntity=convertFormFieldRequestToFormFieldEntity(formFieldRequest); - return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity); - } - public FormFieldResponseBean updateFormField(Long formFieldId,FormFieldRequest formFieldRequest){ - FormFieldEntity formFieldEntity = formFieldService.getFormFieldEntityById(formFieldId); - Utils.setIfUpdated(formFieldEntity::getName,formFieldEntity::setName,formFieldRequest.getName()); - Utils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel()); - Utils.setIfUpdated(formFieldEntity::getSettings,formFieldEntity::setSettings,setSettingRequestBean(formFieldRequest.getSettings())); - Utils.setIfUpdated(formFieldEntity::getValidators,formFieldEntity::setValidators,Utils.convertMapIntoJsonString(formFieldRequest.getValidators())); - formFieldEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); - formFieldEntity=saveFormFieldEntity(formFieldEntity); - return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity); - } - public FormFieldEntity getFormFieldEntity(Long formFieldId) { - FormFieldEntity formFieldEntity=formFieldRepository.findById(formFieldId) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_FIELD_NOT_FOUND))); - return formFieldEntity; - } + public FormFieldResponseBean updateFormField(Long formFieldId, FormFieldRequest formFieldRequest) { + FormFieldEntity formFieldEntity = validateFormField(formFieldId); + Utils.setIfUpdated(formFieldEntity::getName, formFieldEntity::setName, formFieldRequest.getName()); + Utils.setIfUpdated(formFieldEntity::getLabel, formFieldEntity::setLabel, formFieldRequest.getLabel()); + Utils.setIfUpdated(formFieldEntity::getSettings, formFieldEntity::setSettings, + setSettingRequestBean(formFieldRequest.getSettings())); + Utils.setIfUpdated(formFieldEntity::getValidators, formFieldEntity::setValidators, + Utils.convertMapIntoJsonString(formFieldRequest.getValidators())); + formFieldEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + formFieldEntity = saveFormFieldEntity(formFieldEntity); + return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity); + } - public FormFieldResponseBean getFormFieldEntityById(Long formFieldId) { - FormFieldEntity formEntity = formFieldService.getFormFieldEntityById(formFieldId); - return convertFormFieldEntityToFormFieldResponseBean(formEntity); - } - public void deleteFormById(Long formFieldId){ - FormFieldEntity formEntity=formFieldService.getFormFieldEntityById(formFieldId); - formFieldRepository.delete(formEntity); - } - public String setSettingRequestBean(List settingRequestBeans){ - return Utils.convertListToJsonString(settingRequestBeans); - } - public List getAllFormField(){ - List formFieldEntities=formFieldRepository.findAll(); - List formFieldResponseBeans = formFieldEntities.stream() - .map(req -> convertFormFieldEntityToFormFieldResponseBean(req)).collect(Collectors.toList()); - return formFieldResponseBeans; - } + public FormFieldEntity validateFormField(Long formFieldId) { + FormFieldEntity formFieldEntity = formFieldRepository.findById(formFieldId) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.FORM_FIELD_NOT_FOUND))); + return formFieldEntity; + } + + public FormFieldResponseBean getFormFieldEntityById(Long formFieldId) { + FormFieldEntity formEntity = validateFormField(formFieldId); + return convertFormFieldEntityToFormFieldResponseBean(formEntity); + } + + public void deleteFormById(Long formFieldId) { + FormFieldEntity formEntity = validateFormField(formFieldId); + formFieldRepository.delete(formEntity); + } + + public String setSettingRequestBean(List settingRequestBeans) { + return Utils.convertListToJsonString(settingRequestBeans); + } + + public List getAllFormField() { + List formFieldEntities = formFieldRepository.findAll(); + List formFieldResponseBeans = formFieldEntities.stream() + .map(req -> convertFormFieldEntityToFormFieldResponseBean(req)).collect(Collectors.toList()); + return formFieldResponseBeans; + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java index e9bb787c..2042f2fa 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java @@ -8,7 +8,6 @@ import net.gepafin.tendermanagement.model.request.FormTemplateRequest; import net.gepafin.tendermanagement.model.response.ContentResponseBean; import net.gepafin.tendermanagement.model.response.FormTemplateResponseBean; import net.gepafin.tendermanagement.repositories.FormTemplateRepository; -import net.gepafin.tendermanagement.service.FormTemplateService; import net.gepafin.tendermanagement.util.DateTimeUtil; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; @@ -24,72 +23,80 @@ import java.util.stream.Collectors; @Component public class FormTemplateDao { - @Autowired - private FormTemplateRepository formTemplateRepository; + @Autowired + private FormTemplateRepository formTemplateRepository; - @Autowired - private FormTemplateService formTemplateService; + public FormTemplateEntity convertFormTemplateRequestToFormTemplateRequest(FormTemplateRequest formTemplateRequest) { + FormTemplateEntity formTemplateEntity = new FormTemplateEntity(); + formTemplateEntity.setContent(setContentResponseBean(formTemplateRequest.getContent())); + formTemplateEntity.setLabel(formTemplateRequest.getLabel()); + formTemplateEntity = saveFormTemplateEntity(formTemplateEntity); + return formTemplateEntity; + } + public FormTemplateEntity saveFormTemplateEntity(FormTemplateEntity formTemplateEntity) { + formTemplateEntity = formTemplateRepository.save(formTemplateEntity); + return formTemplateEntity; + } - public FormTemplateEntity convertFormTemplateRequestToFormTemplateRequest(FormTemplateRequest formTemplateRequest){ - FormTemplateEntity formTemplateEntity=new FormTemplateEntity(); - formTemplateEntity.setContent(setContentResponseBean(formTemplateRequest.getContent())); - formTemplateEntity.setLabel(formTemplateRequest.getLabel()); - formTemplateEntity=saveFormTemplateEntity(formTemplateEntity); - return formTemplateEntity; - } - public FormTemplateEntity saveFormTemplateEntity(FormTemplateEntity formTemplateEntity){ - formTemplateEntity=formTemplateRepository.save(formTemplateEntity); - return formTemplateEntity; - } - public FormTemplateResponseBean convertFormTemplateEntityToFormTemplateResponseBean(FormTemplateEntity formTemplateEntity){ - FormTemplateResponseBean formTemplateResponseBean=new FormTemplateResponseBean(); - formTemplateResponseBean.setId(formTemplateEntity.getId()); - formTemplateResponseBean.setContent(Utils.convertJsonStringToList(formTemplateEntity.getContent(), ContentResponseBean.class)); - formTemplateResponseBean.setLabel(formTemplateEntity.getLabel()); - return formTemplateResponseBean; - } + public FormTemplateResponseBean convertFormTemplateEntityToFormTemplateResponseBean( + FormTemplateEntity formTemplateEntity) { + FormTemplateResponseBean formTemplateResponseBean = new FormTemplateResponseBean(); + formTemplateResponseBean.setId(formTemplateEntity.getId()); + formTemplateResponseBean + .setContent(Utils.convertJsonStringToList(formTemplateEntity.getContent(), ContentResponseBean.class)); + formTemplateResponseBean.setLabel(formTemplateEntity.getLabel()); + return formTemplateResponseBean; + } - public FormTemplateResponseBean createFormTemplate(FormTemplateRequest formTemplateRequest){ - validateFormTemplate(formTemplateRequest); - FormTemplateEntity formTemplateEntity=convertFormTemplateRequestToFormTemplateRequest(formTemplateRequest); - return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); - } - public void validateFormTemplate(FormTemplateRequest formTemplateRequest){ - if(formTemplateRequest.getContent()==null || formTemplateRequest.getLabel()==null ){ - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_TEMPLATE)); - } - } - public FormTemplateResponseBean updateFormTemplate(Long formTemplateId,FormTemplateRequest formTemplateRequest){ - FormTemplateEntity formTemplateEntity = formTemplateService.getFormEntityById(formTemplateId); - Utils.setIfUpdated(formTemplateEntity::getLabel,formTemplateEntity::setLabel,formTemplateRequest.getLabel()); - Utils.setIfUpdated(formTemplateEntity::getContent,formTemplateEntity::setContent,setContentResponseBean(formTemplateRequest.getContent())); - formTemplateEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); - formTemplateEntity=saveFormTemplateEntity(formTemplateEntity); - return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); - } + public FormTemplateResponseBean createFormTemplate(FormTemplateRequest formTemplateRequest) { + validateFormTemplate(formTemplateRequest); + FormTemplateEntity formTemplateEntity = convertFormTemplateRequestToFormTemplateRequest(formTemplateRequest); + return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); + } - public FormTemplateEntity getFormTemplateEntity(Long formTemplateId) { - FormTemplateEntity formTemplateEntity = formTemplateRepository.findById(formTemplateId) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_TEMPLATE_NOT_FOUND))); - return formTemplateEntity; - } + public void validateFormTemplate(FormTemplateRequest formTemplateRequest) { + if (formTemplateRequest.getContent() == null || formTemplateRequest.getLabel() == null) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_TEMPLATE)); + } + } - public FormTemplateResponseBean getFormTemplateEntityById(Long formTemplateId) { - FormTemplateEntity formTemplateEntity = formTemplateService.getFormEntityById(formTemplateId); - return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); - } - public void deleteFormTemplateById(Long formTemplateId){ - FormTemplateEntity formTemplateEntity=formTemplateService.getFormEntityById(formTemplateId); - formTemplateRepository.delete(formTemplateEntity); - } - public String setContentResponseBean(List contentRequestBeans){ - return Utils.convertListToJsonString(contentRequestBeans); - } - public List getAllFormTemplate(){ - List formTemplateEntities=formTemplateRepository.findAll(); - List formTemplateResponseBeans=formTemplateEntities.stream() - .map(req -> convertFormTemplateEntityToFormTemplateResponseBean(req)).collect(Collectors.toList()); - return formTemplateResponseBeans; - } + public FormTemplateResponseBean updateFormTemplate(Long formTemplateId, FormTemplateRequest formTemplateRequest) { + FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId); + Utils.setIfUpdated(formTemplateEntity::getLabel, formTemplateEntity::setLabel, formTemplateRequest.getLabel()); + Utils.setIfUpdated(formTemplateEntity::getContent, formTemplateEntity::setContent, + setContentResponseBean(formTemplateRequest.getContent())); + formTemplateEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + formTemplateEntity = saveFormTemplateEntity(formTemplateEntity); + return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); + } + + public FormTemplateEntity validateFormTemplate(Long formTemplateId) { + FormTemplateEntity formTemplateEntity = formTemplateRepository.findById(formTemplateId) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.FORM_TEMPLATE_NOT_FOUND))); + return formTemplateEntity; + } + + public FormTemplateResponseBean getFormTemplateEntityById(Long formTemplateId) { + FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId); + return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); + } + + public void deleteFormTemplateById(Long formTemplateId) { + FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId); + formTemplateRepository.delete(formTemplateEntity); + } + + public String setContentResponseBean(List contentRequestBeans) { + return Utils.convertListToJsonString(contentRequestBeans); + } + + public List getAllFormTemplate() { + List formTemplateEntities = formTemplateRepository.findAll(); + List formTemplateResponseBeans = formTemplateEntities.stream() + .map(req -> convertFormTemplateEntityToFormTemplateResponseBean(req)).collect(Collectors.toList()); + return formTemplateResponseBeans; + } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java index 4d6c8455..0c700b00 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java @@ -35,23 +35,24 @@ public class LookUpDataDao { lookUpDataRepository.save(entity); return entity; } - + public void validateLookUpDataEntity(LookUpDataEntity entity) { if (entity.getValue() == null || entity.getValue().trim().isEmpty()) { throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VALUE_CANNOT_BE_EMPTY)); } } - - - public LookUpDataResponseBean getLookUpDataById(Long id) { - return lookUpDataRepository.findById(id) - .map(this::convertLookUpDataEntityToResponseBean) + + public LookUpDataEntity validateLookUpData(Long id) { + return lookUpDataRepository.findById(id) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); } + public LookUpDataResponseBean getLookUpDataById(Long id) { + return convertLookUpDataEntityToResponseBean(validateLookUpData(id)); + } + public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) { - LookUpDataEntity entity = lookUpDataRepository.findById(id) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + LookUpDataEntity entity = validateLookUpData(id); entity.setTitle(lookUpDataReq.getTitle()); entity.setType(lookUpDataReq.getType().getValue()); entity.setValue(lookUpDataReq.getValue()); @@ -60,8 +61,7 @@ public class LookUpDataDao { } public void deleteLookUpData(Long id) { - LookUpDataEntity entity = lookUpDataRepository.findById(id) - .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + LookUpDataEntity entity = validateLookUpData(id); lookUpDataRepository.deleteById(entity.getId()); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java index b3e93971..ef80acbb 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java @@ -32,7 +32,7 @@ public class RoleDao { @Autowired private RegionDao regionDao; - private RoleEntity roleEntity; + public RoleResponseBean createRole(RoleReq roleReq) { log.info("Creating new role with details: {}", roleReq); RoleEntity roleEntity = convertRoleRequestToRoleEntity(roleReq); @@ -53,7 +53,7 @@ public class RoleDao { } public RoleResponseBean convertRoleEntityToRoleResponse(RoleEntity roleEntity) { - this.roleEntity = roleEntity; + RoleResponseBean roleResponseBean = new RoleResponseBean(); roleResponseBean.setId(roleEntity.getId()); roleResponseBean.setCreatedDate(roleEntity.getCreatedDate()); diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java index 00c07a25..e655f6bb 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java @@ -1,7 +1,5 @@ package net.gepafin.tendermanagement.model.request; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.Data; @Data diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/RegionReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/RegionReq.java index d078155c..1fd415ee 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/RegionReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/RegionReq.java @@ -1,15 +1,11 @@ package net.gepafin.tendermanagement.model.request; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; import net.gepafin.tendermanagement.enums.RegionStatusEnum; import java.math.BigDecimal; -@Getter -@Setter +@Data public class RegionReq { private String regionName; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java index 54841e9b..7dacab15 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java @@ -4,12 +4,9 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.Getter; -import lombok.Setter; -import net.gepafin.tendermanagement.enums.UserStatusEnum; +import lombok.Data; -@Getter -@Setter +@Data public class UserReq { @NotBlank diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java index 0be2957d..7e3ebce1 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java @@ -1,7 +1,6 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; -import net.gepafin.tendermanagement.model.BaseBean; import java.util.List; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java index 23a4088a..2a5459a4 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java @@ -1,27 +1,24 @@ package net.gepafin.tendermanagement.model.response; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; import net.gepafin.tendermanagement.enums.RegionStatusEnum; import net.gepafin.tendermanagement.model.BaseBean; import java.math.BigDecimal; -import java.time.LocalDateTime; -@Getter -@Setter +@Data public class RegionResponseBean extends BaseBean { - private String regionName; - private String description; - private String country; - private RegionStatusEnum status; - private String priorityArea; - private Long population; - private BigDecimal areaSize; - private BigDecimal gdp; - private BigDecimal unemploymentRate; - private BigDecimal infrastructureScore; - private BigDecimal educationLevel; - private BigDecimal healthcareAccess; - private BigDecimal environmentalScore; + private String regionName; + private String description; + private String country; + private RegionStatusEnum status; + private String priorityArea; + private Long population; + private BigDecimal areaSize; + private BigDecimal gdp; + private BigDecimal unemploymentRate; + private BigDecimal infrastructureScore; + private BigDecimal educationLevel; + private BigDecimal healthcareAccess; + private BigDecimal environmentalScore; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/RoleResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/RoleResponseBean.java index 93917e99..0f0cda0d 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/RoleResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/RoleResponseBean.java @@ -1,12 +1,8 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.model.BaseBean; -import java.time.LocalDateTime; import java.util.List; @Data diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java index f23b6978..5c1a8ef2 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java @@ -1,11 +1,7 @@ package net.gepafin.tendermanagement.model.response; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.BaseBean; diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java index 7c1faaad..6ceec35f 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.repositories; -import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity; import net.gepafin.tendermanagement.entities.FaqEntity; import java.util.List; diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java index 3d3d6d70..67edec0a 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java @@ -5,7 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; @Repository public interface LookUpDataRepository extends JpaRepository { diff --git a/src/main/java/net/gepafin/tendermanagement/service/CallService.java b/src/main/java/net/gepafin/tendermanagement/service/CallService.java index 4e52e945..cc961ba5 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/CallService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/CallService.java @@ -5,13 +5,11 @@ import java.util.List; import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.enums.CallStatusEnum; -import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1; import net.gepafin.tendermanagement.model.response.CallDetailsResponseBean; import net.gepafin.tendermanagement.model.response.CallResponse; -import net.gepafin.tendermanagement.model.response.UserResponseBean; public interface CallService { @@ -25,10 +23,12 @@ public interface CallService { List getAllCalls(); - CallResponse validateCall(Long callId); + CallResponse validateCallData(Long callId); - public CallEntity getCallEntityById(Long id); + CallEntity getCallEntityById(Long id); CallResponse updateCallStatus(HttpServletRequest request, Long callId, CallStatusEnum statusReq); + + CallEntity validateCall(Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/FormFieldService.java b/src/main/java/net/gepafin/tendermanagement/service/FormFieldService.java index 94c67190..87261dfe 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/FormFieldService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/FormFieldService.java @@ -17,7 +17,7 @@ public interface FormFieldService { public void deleteFormField(HttpServletRequest request, Long formFieldId); - public FormFieldEntity getFormFieldEntityById(Long id); + public FormFieldEntity validateFormField(Long id); public List getAllFormField(HttpServletRequest request); diff --git a/src/main/java/net/gepafin/tendermanagement/service/FormService.java b/src/main/java/net/gepafin/tendermanagement/service/FormService.java index 743b4b36..7945c753 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/FormService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/FormService.java @@ -17,7 +17,7 @@ public interface FormService { public void deleteForm(HttpServletRequest request, Long formId); - public FormEntity getFormEntityById(Long id); + public FormEntity validateForm(Long id); public List getFormsByCallId(HttpServletRequest request,Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/FormTemplateService.java b/src/main/java/net/gepafin/tendermanagement/service/FormTemplateService.java index 7f69ae2e..c50cd8c6 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/FormTemplateService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/FormTemplateService.java @@ -17,7 +17,7 @@ public interface FormTemplateService { public void deleteFormTemplate(HttpServletRequest request, Long formTemplateId); - public FormTemplateEntity getFormEntityById(Long id); + public FormTemplateEntity validateFormTemplate(Long id); public List getAllFormTemplate(HttpServletRequest request); diff --git a/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java index 29c18203..1a3e448b 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java @@ -19,4 +19,6 @@ public interface LookUpDataService { void validateLookUpDataEntity(LookUpDataEntity lookUpDataEntity); List getLookUpDataByType(List type); + + LookUpDataEntity validateLookUpData(Long lookUpDataId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/RegionService.java b/src/main/java/net/gepafin/tendermanagement/service/RegionService.java index 02551552..aba66fe5 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/RegionService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/RegionService.java @@ -1,9 +1,7 @@ package net.gepafin.tendermanagement.service; -import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.model.request.RegionReq; import net.gepafin.tendermanagement.model.response.RegionResponseBean; -import net.gepafin.tendermanagement.model.request.UpdateRegionReq; import java.util.List; diff --git a/src/main/java/net/gepafin/tendermanagement/service/RoleService.java b/src/main/java/net/gepafin/tendermanagement/service/RoleService.java index d0da5c48..6c9c519d 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/RoleService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/RoleService.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.service; -import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.model.request.RoleReq; import net.gepafin.tendermanagement.model.response.RoleResponseBean; 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 62ead6f2..bf853124 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -9,7 +9,6 @@ import net.gepafin.tendermanagement.dao.RoleDao; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.LoginReq; -import net.gepafin.tendermanagement.model.request.LogoutReq; import net.gepafin.tendermanagement.model.response.LoginResponse; import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; 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 bbf15bbb..85b3086d 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java @@ -64,18 +64,24 @@ public class CallServiceImpl implements CallService { @Override @Transactional(rollbackFor = Exception.class) - public CallResponse validateCall(Long callId) { - return callDao.validateCall(callDao.validateCall(callId)); + public CallResponse validateCallData(Long callId) { + return callDao.validateCallData(callDao.validateCall(callId)); } @Override public CallEntity getCallEntityById(Long id){ return callDao.getCallEntityById(id); } + @Override @Transactional(rollbackFor = Exception.class) public CallResponse updateCallStatus(HttpServletRequest request, Long callId, CallStatusEnum statusReq) { return callDao.updateCallStatus(callId, statusReq); } + + @Override + public CallEntity validateCall(Long callId) { + return callDao.validateCall(callId); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/FormFieldServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/FormFieldServiceImpl.java index 07b7bdcc..37741e6e 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/FormFieldServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/FormFieldServiceImpl.java @@ -39,8 +39,8 @@ public class FormFieldServiceImpl implements FormFieldService { } @Override - public FormFieldEntity getFormFieldEntityById(Long id) { - return formFieldDao.getFormFieldEntity(id); + public FormFieldEntity validateFormField(Long id) { + return formFieldDao.validateFormField(id); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/FormServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/FormServiceImpl.java index 378a4dce..b8c9ab39 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/FormServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/FormServiceImpl.java @@ -39,8 +39,8 @@ public class FormServiceImpl implements FormService { } @Override - public FormEntity getFormEntityById(Long id) { - return formDao.getFormEntity(id); + public FormEntity validateForm(Long id) { + return formDao.validateForm(id); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/FormTemplateServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/FormTemplateServiceImpl.java index a4bf1cdf..f594cf20 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/FormTemplateServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/FormTemplateServiceImpl.java @@ -38,8 +38,8 @@ public class FormTemplateServiceImpl implements FormTemplateService { } @Override - public FormTemplateEntity getFormEntityById(Long id) { - return formTemplateDao.getFormTemplateEntity(id); + public FormTemplateEntity validateFormTemplate(Long id) { + return formTemplateDao.validateFormTemplate(id); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java index f6381e59..420e4372 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java @@ -44,4 +44,9 @@ public class LookUpDataServiceImpl implements LookUpDataService { public List getLookUpDataByType( List type) { return lookUpDataDao.getLookUpDataByTypes(type); } + + @Override + public LookUpDataEntity validateLookUpData(Long lookUpDataId) { + return lookUpDataDao.validateLookUpData(lookUpDataId); + } } 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 78c19c8d..357176db 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 @@ -3,7 +3,6 @@ package net.gepafin.tendermanagement.web.rest.api; import java.util.List; import net.gepafin.tendermanagement.enums.CallStatusEnum; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -116,7 +115,7 @@ public interface CallApi { }) @PostMapping(value = "/validate/{callId}", produces = MediaType.APPLICATION_JSON_VALUE) @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") - public ResponseEntity> validateCall(HttpServletRequest request, + public ResponseEntity> validateCallData(HttpServletRequest request, @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId); @Operation(summary = "Api to update call status", responses = { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.java index c102f42a..4274cccb 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.java @@ -44,7 +44,7 @@ public interface EvaluationCriteriaApi { @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) ResponseEntity> getEvaluationCriteriaById(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true) - @PathVariable Long id); + @PathVariable("id") Long id); @Operation(summary = "API to update evaluation criteria", responses = { @@ -59,7 +59,7 @@ public interface EvaluationCriteriaApi { @PutMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) ResponseEntity> updateEvaluationCriteria(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true) - @PathVariable Long id, + @PathVariable("id") Long id, @Parameter(description = "Evaluation criteria request object", required = true) @Valid @RequestBody EvaluationCriteriaRequest evaluationCriteriaRequest); @@ -74,5 +74,5 @@ public interface EvaluationCriteriaApi { @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) ResponseEntity deleteEvaluationCriteria(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true) - @PathVariable Long id); + @PathVariable("id") Long id); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java index 2d76f286..e174621d 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java @@ -24,7 +24,7 @@ public interface FaqApi { }) @PostMapping(value = "/call/{callId}", consumes = "application/json", produces = "application/json") ResponseEntity> createFaq(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true) - @PathVariable Long id, @Valid @RequestBody FaqReq faqRequest); + @PathVariable("callId") Long callId, @Valid @RequestBody FaqReq faqRequest); @Operation(summary = "API to get FAQ by id", responses = { @@ -33,7 +33,7 @@ public interface FaqApi { }) @GetMapping(value = "/{id}", produces = "application/json") ResponseEntity> getFaqById(HttpServletRequest request, - @PathVariable Long id); + @PathVariable("id") Long id); @Operation(summary = "API to update FAQ", responses = { @@ -43,7 +43,7 @@ public interface FaqApi { }) @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json") ResponseEntity> updateFaq(HttpServletRequest request, - @PathVariable Long id, + @PathVariable("id") Long id, @Valid @RequestBody FaqReq faqRequest); @Operation(summary = "API to delete FAQ", @@ -53,5 +53,5 @@ public interface FaqApi { }) @DeleteMapping(value = "/{id}") ResponseEntity> deleteFaq(HttpServletRequest request, - @PathVariable Long id); + @PathVariable("id") Long id); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java index 5a2cd19f..d4044016 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java @@ -41,7 +41,7 @@ public interface LookUpDataApi { @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> getLookUpDataById(HttpServletRequest request, @PathVariable Long id); + ResponseEntity> getLookUpDataById(HttpServletRequest request, @PathVariable("id") Long id); @Operation(summary = "Api to update LookUp Data", responses = { @@ -53,7 +53,7 @@ public interface LookUpDataApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json") - ResponseEntity> updateLookUpData(HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq); + ResponseEntity> updateLookUpData(HttpServletRequest request, @PathVariable("id") Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq); @Operation(summary = "Api to delete LookUp Data", responses = { @@ -65,7 +65,7 @@ public interface LookUpDataApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @DeleteMapping(value = "/{id}") - ResponseEntity> deleteLookUpData(HttpServletRequest request, @PathVariable Long id); + ResponseEntity> deleteLookUpData(HttpServletRequest request, @PathVariable("id") Long id); @Operation(summary = "Api to get LookUp Data by type", responses = { @@ -77,5 +77,5 @@ public interface LookUpDataApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @GetMapping(value = "/type", produces = "application/json") - ResponseEntity>> getLookUpDataByType(HttpServletRequest request, @RequestParam List types); + ResponseEntity>> getLookUpDataByType(HttpServletRequest request, @RequestParam("type") List types); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/RegionApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/RegionApi.java index d49924a0..3876250f 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/RegionApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/RegionApi.java @@ -1,10 +1,7 @@ package net.gepafin.tendermanagement.web.rest.api; -import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.model.request.RegionReq; import net.gepafin.tendermanagement.model.response.RegionResponseBean; -import net.gepafin.tendermanagement.model.request.UpdateRegionReq; -import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.util.Response; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/RoleApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/RoleApi.java index 04bff191..fbee0b1e 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/RoleApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/RoleApi.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.web.rest.api; -import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.model.request.RoleReq; import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.util.Response; 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 fcf6b41e..8eaeca2d 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 @@ -8,10 +8,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; -import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.*; -import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; import net.gepafin.tendermanagement.model.util.Response; @@ -23,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; @Validated public interface UserApi { 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 9885aa84..34ea5fd6 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 @@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import jakarta.servlet.http.HttpServletRequest; @@ -75,8 +73,8 @@ public class CallApiController implements CallApi { } @Override - public ResponseEntity> validateCall(HttpServletRequest request, Long callId) { - CallResponse call = callService.validateCall(callId); + public ResponseEntity> validateCallData(HttpServletRequest request, Long callId) { + CallResponse call = callService.validateCallData(callId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(call, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_FETCH_SUCCESS_MSG))); diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java index 7345d13e..71f60387 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java @@ -1,12 +1,8 @@ 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.RoleEntity; import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.repositories.UserRepository; -import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; -import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RegionApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RegionApiController.java index c64258e5..b3f3a4bf 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RegionApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RegionApiController.java @@ -3,10 +3,8 @@ package net.gepafin.tendermanagement.web.rest.api.impl; import jakarta.validation.Valid; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; -import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.model.request.RegionReq; import net.gepafin.tendermanagement.model.response.RegionResponseBean; -import net.gepafin.tendermanagement.model.request.UpdateRegionReq; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.RegionService; import net.gepafin.tendermanagement.web.rest.api.RegionApi; diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RoleApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RoleApiController.java index 4f4c5633..284552ba 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RoleApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RoleApiController.java @@ -4,7 +4,6 @@ import java.util.List; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; -import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.model.request.RoleReq; import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.util.Response; 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 b42c869d..d036a7f0 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 @@ -4,12 +4,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import net.gepafin.tendermanagement.config.Translator; -import net.gepafin.tendermanagement.config.jwt.TokenProvider; import net.gepafin.tendermanagement.constants.GepafinConstant; -import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.*; -import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; import net.gepafin.tendermanagement.model.util.Response; @@ -24,7 +21,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; @RestController @RequestMapping("${openapi.gepafin.base-path:/v1/user}") @@ -32,8 +28,7 @@ import java.util.List; public class UserApiController implements UserApi { private final Logger log = LoggerFactory.getLogger(UserApiController.class); - @Autowired - private TokenProvider tokenProvider; + @Autowired private UserService userService;