diff --git a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java index fa2b2020..e06c3e4b 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java +++ b/src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java @@ -54,17 +54,17 @@ public class SecurityConfig { } @Bean - MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) { + public MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) { return new MvcRequestMatcher.Builder(introspector); } - + @Bean public WebSecurityCustomizer webSecurityCustomizer(MvcRequestMatcher.Builder mvc) { return (web) -> web.ignoring().requestMatchers(mvc.pattern(HttpMethod.OPTIONS, "/**")) - .requestMatchers(new AntPathRequestMatcher("/i18n/**")) - .requestMatchers(new AntPathRequestMatcher("/content/**")) - .requestMatchers(new AntPathRequestMatcher("/swagger-ui/index.html")) - .requestMatchers(new AntPathRequestMatcher("/swagger-ui/**")); + .requestMatchers(new AntPathRequestMatcher("/i18n/**")) + .requestMatchers(new AntPathRequestMatcher("/content/**")) + .requestMatchers(new AntPathRequestMatcher("/swagger-ui/index.html")) + .requestMatchers(new AntPathRequestMatcher("/swagger-ui/**")); } @@ -87,9 +87,10 @@ public class SecurityConfig { return new CorsFilter(source); } + @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception { - http + http .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(auth -> auth .requestMatchers(mvc.pattern(HttpMethod.POST, "/v1/user/login")).permitAll() diff --git a/src/main/java/net/gepafin/tendermanagement/config/jwt/TokenProvider.java b/src/main/java/net/gepafin/tendermanagement/config/jwt/TokenProvider.java index c3c54d99..3068fefb 100644 --- a/src/main/java/net/gepafin/tendermanagement/config/jwt/TokenProvider.java +++ b/src/main/java/net/gepafin/tendermanagement/config/jwt/TokenProvider.java @@ -48,6 +48,7 @@ public class TokenProvider { public static final String INVALID_USER = "invalid_user"; static final String AUTH_SECRET = "X-Api-Secret"; + private final Set invalidatedTokens = new HashSet<>(); @PostConstruct public void init() { @@ -113,6 +114,10 @@ public class TokenProvider { public boolean validateToken(String authToken) { try { + if (isTokenInvalid(authToken)) { + log.warn("Token is invalidated."); + return false; + } Jwts.parserBuilder() .setSigningKey(key) .build() @@ -124,6 +129,15 @@ public class TokenProvider { return false; } } + + public void invalidateToken(String token) { + invalidatedTokens.add(token); + log.info("Token invalidated: {}", token); + } + + public boolean isTokenInvalid(String token) { + return invalidatedTokens.contains(token); + } public Map getUserInfoAndUserIdFromToken(HttpServletRequest request) { Map userInfo = new HashMap<>(); String authSecretHeader=request.getHeader(AUTH_SECRET); @@ -196,4 +210,12 @@ public class TokenProvider { Claims claims = Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody(); return claims.getSubject(); } + public String extractTokenFromRequest(HttpServletRequest request) { + String bearerToken = request.getHeader("Authorization"); + if (bearerToken != null && bearerToken.startsWith("Bearer ")) { + return bearerToken.substring(7); // Remove "Bearer " prefix + } + return null; // Return null if token is not found or not in Bearer format + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 4d9c9288..1ef08464 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -61,8 +61,42 @@ public class GepafinConstant { public static final String FORM_TEMPLATE_DELETED_SUCCESSFULLY = "form.template.deleted.successfully"; public static final String FORM_TEMPLATE_FETCHED_SUCCESSFULLY = "form.template.fetched.successfully"; public static final String REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_TEMPLATE = "required.parameter.not.found.for.form.template"; - public static final String CALL_NOT_FOUND="call.not.found"; public static final String FORM_NOT_FOUND_FOR_CALL_ID="form.not.found.for.call.id"; + public static final String STEP_1 = "STEP_1"; + public static final String STEP_2 = "STEP_2"; + public static final String VALIDATE_REQUEST = "VALIDATE_REQUEST"; + public static final String CALL_UPDATE_SUCCESSFULLY_MSG = "call.update.successfully"; + public static final String CALL_NOT_FOUND = "call.not.found"; + public static final String CALL_FETCH_SUCCESS_MSG = "call.fetch.success"; + public static final String EVALUATION_CRITERIA_NOT_FOUND = "evaluation.criteria.not.found"; + public static final String EVALUATION_CRITERIA_CREATED_SUCCESSFULLY = "evaluation.criteria.created.successfully"; + public static final String EVALUATION_CRITERIA_FETCH_SUCCESSFULLY = "evaluation.criteria.fetch.successfully"; + public static final String EVALUATION_CRITERIA_UPDATED_SUCCESSFULLY = "evaluation.criteria.updated.successfully"; + public static final String EVALUATION_CRITERIA_DELETED_SUCCESSFULLY = "evaluation.criteria.deleted.successfully"; + public static final String SCORE_NOT_NULL_MSG="score.not.null"; + public static final String FAQ_NOT_FOUND = "faq.not.found"; + public static final String FAQ_CREATED_SUCCESSFULLY = "faq.created.successfully"; + public static final String FAQ_FETCHED_SUCCESSFULLY = "faq.fetched.successfully"; + public static final String FAQ_UPDATED_SUCCESSFULLY = "faq.updated.successfully"; + public static final String FAQ_DELETED_SUCCESSFULLY = "faq.deleted.successfully"; + public static final String LOOKUP_DATA_NOT_FOUND = "lookupdata.not.found"; + public static final String LOOKUP_DATA_CREATED_SUCCESSFULLY = "lookupdata.created.successfully"; + public static final String LOOKUP_DATA_FETCHED_SUCCESSFULLY = "lookupdata.fetched.successfully"; + public static final String LOOKUP_DATA_UPDATED_SUCCESSFULLY = "lookupdata.updated.successfully"; + public static final String LOOKUP_DATA_DELETED_SUCCESSFULLY = "lookupdata.deleted.successfully"; + public static final String DOCUMENT_UPDATED_SUCCESSFULLY = "document.updated.successfully"; + public static final String DOCUMENT_FETCHED_SUCCESSFULLY = "document.fetched.successfully"; + public static final String RESET_PASSWORD_INITIATED = "password.reset.initiated"; + public static final String PASSWORD_RESET_SUCCESS = "password.reset.success"; + public static final String INVALID_TOKEN_MSG = "invalid.token.msg"; + public static final String CURRENT_PASSWORD_INCORRECT = "current.password.incorrect"; + + public static final String LOGOUT_SUCCESSFUL_MSG = "logout.successful.msg"; + public static final String SUCCESS_PASSWORD_CHANGED = "success.password.changed"; + public static final String UPDATE_USER_STATUS_SUCCESS_MSG = "update.user.status.success"; + public static final String FIELD_NOT_NULL = "field.not.null"; + public static final String FIELD_NOT_EMPTY = "field.not.empty"; + } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index d877b1fa..301b0419 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -4,10 +4,11 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; +import net.gepafin.tendermanagement.model.response.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -23,18 +24,15 @@ import net.gepafin.tendermanagement.entities.LookUpDataEntity; import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.entities.UserEntity; -import net.gepafin.tendermanagement.enums.CallTypeEnum; +import net.gepafin.tendermanagement.enums.CallStatusEnum; +import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; import net.gepafin.tendermanagement.model.request.DocumentReq; import net.gepafin.tendermanagement.model.request.EvaluationCriteriaReq; import net.gepafin.tendermanagement.model.request.FaqReq; import net.gepafin.tendermanagement.model.request.LookUpDataReq; -import net.gepafin.tendermanagement.model.response.CreateCallResponseBean; -import net.gepafin.tendermanagement.model.response.DocumentResponseBean; -import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; -import net.gepafin.tendermanagement.model.response.FaqResponseBean; -import net.gepafin.tendermanagement.model.response.LookUpDataResponse; +import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1; import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.CallTargetAudienceChecklistRepository; import net.gepafin.tendermanagement.repositories.DocumentRepository; @@ -42,338 +40,599 @@ import net.gepafin.tendermanagement.repositories.EvaluationCriteriaRepository; import net.gepafin.tendermanagement.repositories.FaqRepository; import net.gepafin.tendermanagement.repositories.LookUpDataRepository; import net.gepafin.tendermanagement.repositories.RegionRepository; -import net.gepafin.tendermanagement.repositories.UserRepository; +import net.gepafin.tendermanagement.service.UserService; +import net.gepafin.tendermanagement.service.impl.CallValidatorServiceImpl; import net.gepafin.tendermanagement.util.DateTimeUtil; 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 static net.gepafin.tendermanagement.util.Utils.setIfUpdated; + @Component public class CallDao { - @Autowired - private CallRepository callRepository; + @Autowired + private CallRepository callRepository; - @Autowired - private DocumentRepository documentRepository; + @Autowired + private DocumentRepository documentRepository; - @Autowired - private EvaluationCriteriaRepository evaluationCriteriaRepository; + @Autowired + private EvaluationCriteriaRepository evaluationCriteriaRepository; - @Autowired - private FaqRepository faqRepository; + @Autowired + private FaqRepository faqRepository; - @Autowired - private RegionRepository regionRepository; + @Autowired + private RegionRepository regionRepository; - @Autowired - private LookUpDataRepository lookUpDataRepository; + @Autowired + private LookUpDataRepository lookUpDataRepository; - @Autowired - private CallTargetAudienceChecklistRepository callTargetAudienceChecklistRepository; + @Autowired + private CallTargetAudienceChecklistRepository callTargetAudienceChecklistRepository; - @Autowired - private UserRepository userRepository; + @Autowired + private UserService userService; - public CreateCallResponseBean createCallStep1(CreateCallRequestStep1 createCallRequest, Long userId) { - CreateCallResponseBean createCallResponseBean = null; + public CallResponse createCallStep1(CreateCallRequestStep1 createCallRequest, Long userId) { CallEntity callEntity = convertToCallEntity(createCallRequest); - List faqEntities = convertToFaqEntities(createCallRequest.getFaq(), callEntity, userId); - List amiedTo = convertLookUpDataEntities(createCallRequest.getAimedTo(), callEntity, + convertToFaqEntities(createCallRequest.getFaq(), callEntity, userId); + convertLookUpDataEntities(createCallRequest.getAimedTo(), callEntity, LookUpDataTypeEnum.AIMED_TO); - createCallResponseBean = assembleCreateCallResponseBean(callEntity, Collections.emptyList(), - Collections.emptyList(), faqEntities, Collections.emptyList()); - createCallResponseBean.setAimedTo(amiedTo); +// createCallResponseBean = assembleCreateCallResponseBean(callEntity, Collections.emptyList(), +// Collections.emptyList(), faqEntities, Collections.emptyList()); +// createCallResponseBean.setAimedTo(amiedTo); +// createCallResponseBean.setCurrentStep(GepafinConstant.STEP_1); + CallResponse createCallResponseBean = getCallResponseBean(callEntity); + createCallResponseBean.setCurrentStep(GepafinConstant.STEP_1); return createCallResponseBean; } + public CallEntity convertToCallEntity(CreateCallRequestStep1 createCallRequest) { + CallEntity callEntity = new CallEntity(); + validateCallEntity(createCallRequest); + RegionEntity region = regionRepository.findById(createCallRequest.getRegionId()) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.REGION_NOT_FOUND))); + callEntity.setRegion(region); + callEntity.setName(createCallRequest.getName()); + callEntity.setDescriptionShort(createCallRequest.getDescriptionShort()); + callEntity.setDescriptionLong(createCallRequest.getDescriptionLong()); + callEntity.setStartDate(createCallRequest.getStartDate()); + callEntity.setEndDate(createCallRequest.getEndDate()); + callEntity.setStatus(CallStatusEnum.DRAFT.getValue()); + callEntity.setAmountMax(createCallRequest.getAmountMax()); + callEntity.setAmount(createCallRequest.getAmountMax()); + callEntity.setConfidi(false); + if (createCallRequest.getConfidi() != null) { + callEntity.setConfidi(createCallRequest.getConfidi()); + } + callEntity.setDocumentationRequested(createCallRequest.getDocumentationRequested()); + callEntity = callRepository.save(callEntity); + return callEntity; + } - public CallEntity convertToCallEntity(CreateCallRequestStep1 createCallRequest) { - CallEntity callEntity = new CallEntity(); - validateCallEntity(createCallRequest); - RegionEntity region = regionRepository.findById(createCallRequest.getRegionId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND))); - callEntity.setRegion(region); - callEntity.setName(createCallRequest.getName()); - callEntity.setDescriptionShort(createCallRequest.getDescriptionShort()); - callEntity.setDescriptionLong(createCallRequest.getDescriptionLong()); - callEntity.setStartDate(createCallRequest.getStartDate()); - callEntity.setEndDate(createCallRequest.getEndDate()); - callEntity.setStatus(String.valueOf(createCallRequest.getStatus())); - callEntity.setAmountMax(createCallRequest.getAmountMax()); - callEntity.setAmount(createCallRequest.getAmountMax()); - callEntity.setConfidi(false); - if(createCallRequest.getConfidi()!=null){ - callEntity.setConfidi(createCallRequest.getConfidi()); - } - callEntity.setDocumentationRequested(createCallRequest.getDocumentationRequested()); - callEntity = callRepository.save(callEntity); - return callEntity; - } + public List convertToEvaluationCriteriaEntities( + List criteriaReqList, CallEntity callEntity, LookUpDataTypeEnum type) { + if (criteriaReqList == null) { + return null; + } + List existingCriteria = evaluationCriteriaRepository.findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), type.getValue()); - public List convertToEvaluationCriteriaEntities(List criteriaReqList, CallEntity callEntity) { - List evaluationCriteriaEntities = criteriaReqList.stream().map(req -> convertToEvaluationCriteriaEntity(req, callEntity)).collect(Collectors.toList()); - evaluationCriteriaRepository.saveAll(evaluationCriteriaEntities); - return evaluationCriteriaEntities; - } + List incomingIds = criteriaReqList.stream().map(EvaluationCriteriaReq::getId) + .filter(id -> id != null && id > 0).collect(Collectors.toList()); - private EvaluationCriteriaEntity convertToEvaluationCriteriaEntity(EvaluationCriteriaReq criteriaReq, CallEntity callEntity) { - EvaluationCriteriaEntity criteriaEntity = new EvaluationCriteriaEntity(); - validateEvolutionCrieteriaEntity(criteriaReq.getName()); - criteriaEntity.setName(criteriaReq.getName()); - criteriaEntity.setDescription(criteriaReq.getValue()); - criteriaEntity.setScore(criteriaReq.getScore()); - criteriaEntity.setCall(callEntity); - return criteriaEntity; - } + existingCriteria.stream().filter(criteria -> !incomingIds.contains(criteria.getId())).forEach(this::softDeleteEvaluationCriteria); + + List evaluationCriteriaEntities = criteriaReqList.stream() + .map(req -> convertToEvaluationCriteriaEntity(req, callEntity, type)).collect(Collectors.toList()); + evaluationCriteriaRepository.saveAll(evaluationCriteriaEntities); + return evaluationCriteriaEntities; + } + + private void softDeleteEvaluationCriteria(EvaluationCriteriaEntity evaluationCriteriaEntity) { + evaluationCriteriaEntity.setIsDeleted(true); + evaluationCriteriaRepository.save(evaluationCriteriaEntity); + } + + private EvaluationCriteriaEntity convertToEvaluationCriteriaEntity(EvaluationCriteriaReq criteriaReq, + CallEntity callEntity, LookUpDataTypeEnum type) { + EvaluationCriteriaEntity criteriaEntity = null; + LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(criteriaReq, type); + if (criteriaReq.getId() == null && criteriaReq.getId().equals(0l)) { + criteriaEntity = evaluationCriteriaRepository.findById(criteriaReq.getId()) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); + } else { + criteriaEntity = new EvaluationCriteriaEntity(); + criteriaEntity.setCall(callEntity); + criteriaEntity.setLookupData(lookupDataEntity); + criteriaEntity.setIsDeleted(false); + } + setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore()); + if (Boolean.FALSE.equals(criteriaEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) { + criteriaEntity.setLookupData(lookupDataEntity); + } + return criteriaEntity; + } - public List convertToDocumentEntities(List documentReqList, CallEntity callEntity) { - List documentEntities = documentReqList.stream().map(req -> convertToDocumentEntity(req, callEntity)).collect(Collectors.toList()); - documentRepository.saveAll(documentEntities); - return documentEntities; - } + public List convertToDocumentEntities(List documentReqList, CallEntity callEntity, + DocumentTypeEnum documentType) { + if (documentReqList == null) { + return null; + } + + List existingDocuments = documentRepository + .findByCallIdAndTypeAndIsDeletedFalse(callEntity.getId(), documentType.getValue()); - private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) { - validateDocumentEntity(documentReq.getId(),documentReq.getFileName()); - DocumentEntity documentEntity = documentRepository.findById(documentReq.getId()) + List incomingIds = documentReqList.stream().map(DocumentReq::getId).filter(id -> id != null && id > 0) + .collect(Collectors.toList()); + + existingDocuments.stream().filter(document -> !incomingIds.contains(document.getId())) + .forEach(this::softDeleteDocument); + List documentEntities = documentReqList.stream() + .map(req -> convertToDocumentEntity(req, callEntity)).collect(Collectors.toList()); + documentRepository.saveAll(documentEntities); + return documentEntities; + } + + private void softDeleteDocument(DocumentEntity documentEntity) { + documentEntity.setIsDeleted(true); + documentRepository.save(documentEntity); + } + + private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) { + validateDocumentEntity(documentReq.getId()); + DocumentEntity documentEntity = documentRepository.findByIdAndCallIdAndIsDeletedFalse(documentReq.getId(), callEntity.getId()) .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); -// if(documentEntity==null){ -// throw ; -// } -// documentEntity.setFileName(documentReq.getFileName()); -// documentEntity.setFilePath(documentReq.getUrl()); -// documentEntity.setCall(callEntity); - return documentEntity; - } + return documentEntity; + } + public List convertToFaqEntities(List faqReqList, CallEntity callEntity, Long userId) { + if (faqReqList == null) { + return null; + } + List faqEntities = faqReqList.stream().map(req -> convertToFaqEntity(req, callEntity, userId)) + .collect(Collectors.toList()); + faqRepository.saveAll(faqEntities); + return faqEntities; + } - public List convertToFaqEntities(List faqReqList, CallEntity callEntity, Long userId) { - List faqEntities = faqReqList.stream().map(req -> convertToFaqEntity(req, callEntity, userId)).collect(Collectors.toList()); - faqRepository.saveAll(faqEntities); - return faqEntities; - } + public FaqEntity convertToFaqEntity(FaqReq faqReq, CallEntity callEntity, Long userId) { + FaqEntity faqEntity = new FaqEntity(); + validateFaqEntity(faqReq.getQuestion()); + UserEntity userEntity = userService.validateUser(userId); + faqEntity.setUser(userEntity); + faqEntity.setIsVisible(true); + if (faqReq.getIsVisible() != null) { + faqEntity.setIsVisible(faqReq.getIsVisible()); + } + faqEntity.setQuestionShort(faqReq.getQuestionShort()); + faqEntity.setQuestion(faqReq.getQuestion()); + if (faqReq.getResponse() != null || faqReq.getResponseShort() != null) { + faqEntity.setResponseDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + } + faqEntity.setResponseShort(faqReq.getResponseShort()); + faqEntity.setResponse(faqReq.getResponse()); + faqEntity.setCall(callEntity); + faqEntity.setIsDeleted(false); + return faqEntity; + } - private FaqEntity convertToFaqEntity(FaqReq faqReq, CallEntity callEntity, Long userId) { - FaqEntity faqEntity = new FaqEntity(); - validateFaqEntity(faqReq.getQuestion()); - UserEntity userEntity= userRepository.findById(userId) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); - faqEntity.setUser(userEntity); - faqEntity.setIsVisible(true); - if(faqReq.getIsVisible()!=null){ - faqEntity.setIsVisible(faqReq.getIsVisible()); - } - faqEntity.setQuestionShort(faqReq.getQuestionShort()); - faqEntity.setQuestion(faqReq.getQuestion()); - if(faqReq.getResponse()!=null ||faqReq.getResponseShort()!=null){ - faqEntity.setResponseDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); - } - faqEntity.setResponseShort(faqReq.getResponseShort()); - faqEntity.setResponse(faqReq.getResponse()); - faqEntity.setCall(callEntity); - return faqEntity; - } + public void validateFaqEntity(String question) { + if (!StringUtils.hasText(question)) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.QUESTION_NOT_EMPTY_MSG)); + } + } - public void validateFaqEntity( String question) { - if (!StringUtils.hasText(question)) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.QUESTION_NOT_EMPTY_MSG)); - } - } + public void validateDocumentEntity(Long documentId) { + if (documentId == null) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.DOCUMENT_ID_NOT_FOUND)); + } + } - public void validateDocumentEntity(Long documentId,String name) { - if(documentId==null){ - throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.DOCUMENT_ID_NOT_FOUND)); - } + public void validateEvaluationCriteriaEntity(String name) { + if (!StringUtils.hasText(name)) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG)); + } + } -// if (!StringUtils.hasText(name)) { -// throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG)); -// } - } + public void validateCallEntity(CreateCallRequestStep1 createCallRequest) { + if (createCallRequest.getRegionId() == null) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)); + } - public void validateEvolutionCrieteriaEntity(String name) { - if (!StringUtils.hasText(name)) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG)); - } - } - - public void validateCallEntity(CreateCallRequestStep1 createCallRequest) { - if (createCallRequest.getRegionId() == null) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG)); - } - - if (createCallRequest.getAmount().compareTo(BigDecimal.ZERO) <= 0||createCallRequest.getAmountMax().compareTo(BigDecimal.ZERO) <= 0) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.AMOUNT_GREATER_THAN_ZERO_MSG)); - } - if (createCallRequest.getStartDate().toLocalDate().isBefore(LocalDate.now()) || createCallRequest.getEndDate().toLocalDate().isBefore(LocalDate.now())) { - throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); - } - } - public CreateCallResponseBean convertToCallResponseBean(CallEntity callEntity) { - CreateCallResponseBean createCallResponseBean = new CreateCallResponseBean(); - createCallResponseBean.setId(callEntity.getId()); - createCallResponseBean.setName(callEntity.getName()); - createCallResponseBean.setDates(List.of(callEntity.getStartDate(), callEntity.getEndDate())); - createCallResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); - createCallResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); - createCallResponseBean.setStatus(CallTypeEnum.valueOf(callEntity.getStatus())); - createCallResponseBean.setRegionId(callEntity.getRegion().getId()); - createCallResponseBean.setAmount(callEntity.getAmount()); - createCallResponseBean.setAmountMax(callEntity.getAmountMax()); - createCallResponseBean.setContactInfo(callEntity.getContactInfo()); - createCallResponseBean.setSubmissionMethod(callEntity.getSubmissionMethod()); - createCallResponseBean.setThreshold(callEntity.getThreshold()); - createCallResponseBean.setDocumentationReqested(callEntity.getDocumentationRequested()); - createCallResponseBean.setPriorityArea(callEntity.getPriorityArea()); - createCallResponseBean.setCreatedDate(callEntity.getCreatedDate()); - createCallResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); - return createCallResponseBean; - } - public EvaluationCriteriaResponseBean convertToEvaluationCriteriaResponseBean(EvaluationCriteriaEntity entity) { - EvaluationCriteriaResponseBean responseBean = new EvaluationCriteriaResponseBean(); - responseBean.setId(entity.getId()); - responseBean.setName(entity.getName()); - responseBean.setDescription(entity.getDescription()); - responseBean.setScore(entity.getScore()); - responseBean.setCreatedDate(entity.getCreatedDate()); - responseBean.setUpdatedDate(entity.getUpdatedDate()); - return responseBean; - } - public DocumentResponseBean convertToDocumentResponseBean(DocumentEntity entity) { - DocumentResponseBean responseBean = new DocumentResponseBean(); - responseBean.setId(entity.getId()); - responseBean.setName(entity.getFileName()); - responseBean.setDescription(entity.getDescription()); - responseBean.setFilePath(entity.getFilePath()); - responseBean.setCreatedDate(entity.getCreatedDate()); - responseBean.setUpdatedDate(entity.getUpdatedDate()); - return responseBean; - } - public FaqResponseBean convertToFaqResponseBean(FaqEntity entity) { - FaqResponseBean responseBean = new FaqResponseBean(); - responseBean.setId(entity.getId()); - responseBean.setQuestionShort(entity.getQuestionShort()); - responseBean.setResponseShort(entity.getResponseShort()); - responseBean.setResponse(entity.getResponse()); - responseBean.setQuestion(entity.getQuestion()); - responseBean.setUserId(entity.getUser().getId()); - responseBean.setIsVisible(entity.getIsVisible()); - responseBean.setCreatedDate(entity.getCreatedDate()); - responseBean.setUpdatedDate(entity.getUpdatedDate()); - return responseBean; - } - public CreateCallResponseBean assembleCreateCallResponseBean( - CallEntity callEntity, - List evaluationCriteriaEntities, - List documentEntities, - List faqEntities,List images) { - - CreateCallResponseBean callResponseBean = convertToCallResponseBean(callEntity); - - List evaluationCriteriaResponseBeans = evaluationCriteriaEntities.stream() - .map(this::convertToEvaluationCriteriaResponseBean) - .collect(Collectors.toList()); - - List documentResponseBeans = documentEntities.stream() - .map(this::convertToDocumentResponseBean) - .collect(Collectors.toList()); - - List faqResponseBeans = faqEntities.stream() - .map(this::convertToFaqResponseBean) - .collect(Collectors.toList()); - - List imagesResponseBean = images.stream() - .map(this::convertToDocumentResponseBean) - .collect(Collectors.toList()); - CreateCallResponseBean createCallResponseBean =callResponseBean; - createCallResponseBean.setCriteria(evaluationCriteriaResponseBeans); - createCallResponseBean.setDocs(documentResponseBeans); - createCallResponseBean.setFaq(faqResponseBeans); - createCallResponseBean.setImages(imagesResponseBean); - return createCallResponseBean; - } - public List convertLookUpDataEntities(List lookUpData, CallEntity callEntity, LookUpDataEntity.LookUpDataTypeEnum type) { - List lookUpDataEntities = lookUpData.stream() - .map(req -> convertLookUpDataRequestIntoLookUpDataEntity(req, type)) - .collect(Collectors.toList()); - - lookUpDataRepository.saveAll(lookUpDataEntities); - - return createCallTargetAudienceCheckList(callEntity, lookUpDataEntities); - } - - private List createCallTargetAudienceCheckList(CallEntity callEntity, List lookUpDataEntities) { - List lookUpDataResponses=new ArrayList<>(); - for(LookUpDataEntity lookUpDataEntity:lookUpDataEntities){ - CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity=new CallTargetAudienceChecklistEntity(); - callTargetAudienceChecklistEntity.setIsValidated(false); - callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity); - callTargetAudienceChecklistEntity.setCall(callEntity); - callTargetAudienceChecklistEntity= callTargetAudienceChecklistRepository.save(callTargetAudienceChecklistEntity); - lookUpDataResponses.add(convertToLookUpDataResponseBean(callTargetAudienceChecklistEntity)); - } - return lookUpDataResponses; - } - - private LookUpDataEntity convertLookUpDataRequestIntoLookUpDataEntity(LookUpDataReq req, LookUpDataEntity.LookUpDataTypeEnum type) { - if (req.getLookUpDataId() == null || req.getLookUpDataId().equals(0l)) { - LookUpDataEntity newEntity = new LookUpDataEntity(); - newEntity.setValue(req.getValue()); - newEntity.setType(type.getValue()); - return newEntity; - } - - return lookUpDataRepository.findById(req.getLookUpDataId()) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); - } - - public LookUpDataResponse convertToLookUpDataResponseBean(CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) { - LookUpDataResponse lookUpDataResponse = new LookUpDataResponse(); - LookUpDataEntity lookUpDataEntity = callTargetAudienceChecklistEntity.getLookupData(); - lookUpDataResponse.setId(callTargetAudienceChecklistEntity.getId()); - lookUpDataResponse.setLookUpDataId(lookUpDataEntity.getId()); - lookUpDataResponse.setValue(lookUpDataEntity.getValue()); - lookUpDataResponse.setTitle(lookUpDataEntity.getTitle()); - lookUpDataResponse.setCreatedDate(lookUpDataEntity.getCreatedDate()); - lookUpDataResponse.setUpdatedDate(lookUpDataEntity.getUpdatedDate()); - return lookUpDataResponse; - } - - - public CreateCallResponseBean createCallStep2(CreateCallRequestStep2 createCallRequest, Long userId) { - CreateCallResponseBean createCallResponseBean = null; - CallEntity callEntity = callRepository.findById(createCallRequest.getCallId()) - .orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG))); + if (createCallRequest.getAmount().compareTo(BigDecimal.ZERO) <= 0 + || createCallRequest.getAmountMax().compareTo(BigDecimal.ZERO) <= 0) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.AMOUNT_GREATER_THAN_ZERO_MSG)); + } + if (createCallRequest.getStartDate().toLocalDate().isBefore(LocalDate.now()) + || createCallRequest.getEndDate().toLocalDate().isBefore(LocalDate.now()) || createCallRequest + .getStartDate().toLocalDate().isAfter(createCallRequest.getEndDate().toLocalDate())) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); + } - callEntity.setThreshold(createCallRequest.getThreshold()); - List evaluationCriteriaEntities = convertToEvaluationCriteriaEntities( - createCallRequest.getCriteria(), callEntity); - List documentEntities = convertToDocumentEntities(createCallRequest.getDocs(), callEntity); - List imageEntities = convertToDocumentEntities(createCallRequest.getImages(), callEntity); - List checkList = convertLookUpDataEntities(createCallRequest.getCheckList(), callEntity, - LookUpDataTypeEnum.CHECKLIST); - List faqEntities = faqRepository.findByCallId(callEntity.getId()); + } + + public CallResponse convertToCallResponseBean(CallEntity callEntity) { + CallResponse createCallResponseBean = new CallResponse(); + createCallResponseBean.setId(callEntity.getId()); + createCallResponseBean.setName(callEntity.getName()); + createCallResponseBean.setStartDate(callEntity.getStartDate()); + createCallResponseBean.setEndDate(callEntity.getEndDate()); + createCallResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); + createCallResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); + createCallResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); + createCallResponseBean.setRegionId(callEntity.getRegion().getId()); + createCallResponseBean.setAmount(callEntity.getAmount()); + createCallResponseBean.setAmountMax(callEntity.getAmountMax()); + createCallResponseBean.setContactInfo(callEntity.getContactInfo()); + createCallResponseBean.setSubmissionMethod(callEntity.getSubmissionMethod()); + createCallResponseBean.setThreshold(callEntity.getThreshold()); + createCallResponseBean.setDocumentationReqested(callEntity.getDocumentationRequested()); + createCallResponseBean.setPriorityArea(callEntity.getPriorityArea()); + createCallResponseBean.setConfidi(callEntity.getConfidi()); + createCallResponseBean.setCreatedDate(callEntity.getCreatedDate()); + createCallResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); + return createCallResponseBean; + } + + public EvaluationCriteriaResponseBean convertToEvaluationCriteriaResponseBean(EvaluationCriteriaEntity entity) { + EvaluationCriteriaResponseBean responseBean = new EvaluationCriteriaResponseBean(); + responseBean.setId(entity.getId()); + responseBean.setLookUpDataId(entity.getLookupData().getId()); + responseBean.setTitle(entity.getLookupData().getTitle()); + responseBean.setValue(entity.getLookupData().getValue()); + responseBean.setScore(entity.getScore()); + responseBean.setCreatedDate(entity.getCreatedDate()); + responseBean.setUpdatedDate(entity.getUpdatedDate()); + return responseBean; + } + + public DocumentResponseBean convertToDocumentResponseBean(DocumentEntity entity) { + DocumentResponseBean responseBean = new DocumentResponseBean(); + responseBean.setId(entity.getId()); + responseBean.setName(entity.getFileName()); + responseBean.setDescription(entity.getDescription()); + responseBean.setFilePath(entity.getFilePath()); + responseBean.setCreatedDate(entity.getCreatedDate()); + responseBean.setUpdatedDate(entity.getUpdatedDate()); + return responseBean; + } + + public FaqResponseBean convertToFaqResponseBean(FaqEntity entity) { + FaqResponseBean responseBean = new FaqResponseBean(); + responseBean.setId(entity.getId()); + responseBean.setQuestionShort(entity.getQuestionShort()); + responseBean.setResponseShort(entity.getResponseShort()); + responseBean.setResponse(entity.getResponse()); + responseBean.setQuestion(entity.getQuestion()); + responseBean.setUserId(entity.getUser().getId()); + responseBean.setIsVisible(entity.getIsVisible()); + responseBean.setCreatedDate(entity.getCreatedDate()); + responseBean.setUpdatedDate(entity.getUpdatedDate()); + return responseBean; + } + + public CallResponse assembleCreateCallResponseBean(CallEntity callEntity, + List evaluationCriteriaEntities, List documentEntities, + List faqEntities, List images) { + + CallResponse callResponseBean = convertToCallResponseBean(callEntity); + + List evaluationCriteriaResponseBeans = evaluationCriteriaEntities.stream() + .map(this::convertToEvaluationCriteriaResponseBean).collect(Collectors.toList()); + + List documentResponseBeans = documentEntities.stream() + .map(this::convertToDocumentResponseBean).collect(Collectors.toList()); + + List faqResponseBeans = faqEntities.stream().map(this::convertToFaqResponseBean) + .collect(Collectors.toList()); + + List imagesResponseBean = images.stream().map(this::convertToDocumentResponseBean) + .collect(Collectors.toList()); + CallResponse createCallResponseBean = callResponseBean; + createCallResponseBean.setCriteria(evaluationCriteriaResponseBeans); + createCallResponseBean.setDocs(documentResponseBeans); + createCallResponseBean.setFaq(faqResponseBeans); + createCallResponseBean.setImages(imagesResponseBean); + return createCallResponseBean; + } + + public List convertLookUpDataEntities(List lookUpData, CallEntity callEntity, + LookUpDataEntity.LookUpDataTypeEnum type) { + List lookUpDataEntities = lookUpData.stream() + .map(req -> convertLookUpDataRequestIntoLookUpDataEntity(req, type)).collect(Collectors.toList()); + + return createCallTargetAudienceCheckList(callEntity, lookUpDataEntities); + } + + private List createCallTargetAudienceCheckList(CallEntity callEntity, + List lookUpDataEntities) { + List lookUpDataResponses = new ArrayList<>(); + for (LookUpDataEntity lookUpDataEntity : lookUpDataEntities) { + CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity = new CallTargetAudienceChecklistEntity(); + callTargetAudienceChecklistEntity.setIsValidated(false); + callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity); + callTargetAudienceChecklistEntity.setCall(callEntity); + callTargetAudienceChecklistEntity.setIsDeleted(false); + callTargetAudienceChecklistEntity = callTargetAudienceChecklistRepository + .save(callTargetAudienceChecklistEntity); + lookUpDataResponses.add(convertToLookUpDataResponseBean(callTargetAudienceChecklistEntity)); + } + return lookUpDataResponses; + } + + private LookUpDataEntity convertLookUpDataRequestIntoLookUpDataEntity(LookUpDataReq req, + LookUpDataEntity.LookUpDataTypeEnum type) { + if (req.getLookUpDataId() == null || req.getLookUpDataId().equals(0l)) { + LookUpDataEntity newEntity = new LookUpDataEntity(); + newEntity.setValue(req.getValue()); + newEntity.setType(type.getValue()); + return lookUpDataRepository.save(newEntity); + } + + return lookUpDataRepository.findById(req.getLookUpDataId()) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); + } + + public LookUpDataResponse convertToLookUpDataResponseBean( + CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) { + LookUpDataResponse lookUpDataResponse = new LookUpDataResponse(); + LookUpDataEntity lookUpDataEntity = callTargetAudienceChecklistEntity.getLookupData(); + lookUpDataResponse.setId(callTargetAudienceChecklistEntity.getId()); + lookUpDataResponse.setLookUpDataId(lookUpDataEntity.getId()); + lookUpDataResponse.setValue(lookUpDataEntity.getValue()); + lookUpDataResponse.setTitle(lookUpDataEntity.getTitle()); + lookUpDataResponse.setCreatedDate(callTargetAudienceChecklistEntity.getCreatedDate()); + lookUpDataResponse.setUpdatedDate(callTargetAudienceChecklistEntity.getUpdatedDate()); + return lookUpDataResponse; + } + + public CallEntity validateCall(Long callId) { + return callRepository.findById(callId).orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR, + 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))); + 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))); + + setIfUpdated(callEntity::getThreshold, callEntity::setThreshold, createCallRequest.getThreshold()); + callRepository.save(callEntity); + convertToEvaluationCriteriaEntities(createCallRequest.getCriteria(), callEntity, LookUpDataTypeEnum.EVALUATION_CRITERIA); + + convertToDocumentEntities(createCallRequest.getDocs(), callEntity, DocumentTypeEnum.DOCUMENT); + + convertToDocumentEntities(createCallRequest.getImages(), callEntity, DocumentTypeEnum.IMAGES); + + updateLookUpData(callEntity, createCallRequest.getCheckList(), LookUpDataTypeEnum.CHECKLIST); + +// List faqEntities = faqRepository.findByCallIdAndIsDeletedFalse(callEntity.getId()); +// List amiedTo = callTargetAudienceChecklistRepository +// .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.AIMED_TO.getValue()).stream() +// .map(this::convertToLookUpDataResponseBean).toList(); +// createCallResponseBean = assembleCreateCallResponseBean(callEntity, evaluationCriteriaEntities, +// documentEntities, faqEntities, imageEntities); +// createCallResponseBean.setAimedTo(amiedTo); +// createCallResponseBean.setCheckList(checkList); + CallResponse createCallResponseBean = getCallResponseBean(callEntity); + createCallResponseBean.setCurrentStep(GepafinConstant.STEP_2); + return createCallResponseBean; + } + + public void isValidDateRange(UpdateCallRequestStep1 updateCallRequest, CallEntity callEntity) { + LocalDate startDate = updateCallRequest.getStartDate() != null ? updateCallRequest.getStartDate().toLocalDate() + : null; + LocalDate endDate = updateCallRequest.getEndDate() != null ? updateCallRequest.getEndDate().toLocalDate() + : null; + Boolean isValid = true; + if (startDate != null && endDate != null && startDate.isAfter(endDate)) { + isValid = false; + } else if (startDate != null && endDate == null && callEntity.getEndDate() != null + && startDate.isAfter(callEntity.getEndDate().toLocalDate())) { + isValid = false; + } else if (startDate == null && endDate != null && callEntity.getStartDate() != null + && callEntity.getStartDate().toLocalDate().isAfter(endDate)) { + isValid = false; + } + + if (Boolean.FALSE.equals(isValid)) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.INVALID_DATE_MSG)); + } + } + + public CallResponse updateCallStep1(Long callId, UpdateCallRequestStep1 updateCallRequest, Long userId) { + CallEntity callEntity = validateCall(callId); + UserEntity userEntity = userService.validateUser(userId); + isValidDateRange(updateCallRequest, callEntity); + setIfUpdated(callEntity::getName, callEntity::setName, updateCallRequest.getName()); + setIfUpdated(callEntity::getDescriptionShort, callEntity::setDescriptionShort, + updateCallRequest.getDescriptionShort()); + setIfUpdated(callEntity::getDescriptionLong, callEntity::setDescriptionLong, + updateCallRequest.getDescriptionLong()); + setIfUpdated(callEntity::getStartDate, callEntity::setStartDate, updateCallRequest.getStartDate()); + setIfUpdated(callEntity::getEndDate, callEntity::setEndDate, updateCallRequest.getEndDate()); + setIfUpdated(callEntity::getAmount, callEntity::setAmount, updateCallRequest.getAmount()); + setIfUpdated(callEntity::getAmountMax, callEntity::setAmountMax, updateCallRequest.getAmountMax()); + setIfUpdated(callEntity::getDocumentationRequested, callEntity::setDocumentationRequested, + updateCallRequest.getDocumentationRequested()); + setIfUpdated(callEntity::getConfidi, callEntity::setConfidi, updateCallRequest.getConfidi()); + updateLookUpData(callEntity, updateCallRequest.getAimedTo(), LookUpDataTypeEnum.AIMED_TO); + updateFaq(callEntity, updateCallRequest.getFaq(), userEntity); + CallResponse createCallResponseBean = getCallResponseBean(callEntity); + createCallResponseBean.setCurrentStep(GepafinConstant.STEP_1); + return createCallResponseBean; + } + + private void updateFaq(CallEntity callEntity, List faqReqList, UserEntity userEntity) { + if(faqReqList==null) { + return; + } + List existingFaqs = faqRepository.findByCallIdAndIsDeletedFalse(callEntity.getId()); + List incomingIds = faqReqList.stream().map(FaqReq::getId).filter(Objects::nonNull).filter(id -> id > 0) + .collect(Collectors.toList()); + existingFaqs.stream().filter(faq -> !incomingIds.contains(faq.getId())).forEach(this::softDeleteFaq); + faqReqList.forEach(faqReq -> createOrUpdateFaq(faqReq, callEntity, userEntity)); + + } + + private void softDeleteFaq(FaqEntity faqEntity) { + faqEntity.setIsDeleted(true); + faqRepository.save(faqEntity); + } + + private void createOrUpdateFaq(FaqReq faqReq, CallEntity callEntity, UserEntity userEntity) { + FaqEntity faqEntity = null; + + if (isExistingFaq(faqReq)) { + faqEntity = faqRepository.findById(faqReq.getId()) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + } else { + faqEntity = new FaqEntity(); + faqEntity.setCall(callEntity); + faqEntity.setUser(userEntity); + faqEntity.setIsDeleted(false); + } + + setIfUpdated(faqEntity::getQuestionShort, faqEntity::setQuestionShort, faqReq.getQuestionShort()); + setIfUpdated(faqEntity::getQuestion, faqEntity::setQuestion, faqReq.getQuestion()); + setIfUpdated(faqEntity::getResponseShort, faqEntity::setResponseShort, faqReq.getResponseShort()); + setIfUpdated(faqEntity::getResponse, faqEntity::setResponse, faqReq.getResponse()); + setIfUpdated(faqEntity::getIsVisible, faqEntity::setIsVisible, faqReq.getIsVisible()); + faqRepository.save(faqEntity); + } + + private boolean isExistingFaq(FaqReq faqReq) { + return faqReq.getId() != null && faqReq.getId() > 0; + } + + private void updateLookUpData(CallEntity callEntity, List lookupDataReqList, LookUpDataTypeEnum type) { + if (lookupDataReqList == null) { + return; + } + List existingChecklist = callTargetAudienceChecklistRepository + .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), type.getValue()); + List incomingIds = lookupDataReqList.stream().map(LookUpDataReq::getLookUpDataId) + .filter(id -> id != null && id > 0).collect(Collectors.toList()); + existingChecklist.stream().filter(checklist -> !incomingIds.contains(checklist.getLookupData().getId())) + .forEach(this::softDeleteCallTargetAudienceChecklist); + lookupDataReqList + .forEach(lookUpDataReq -> createOrUpdateCallTargetAudienceChecklist(lookUpDataReq, callEntity, type)); + } + + private void createOrUpdateCallTargetAudienceChecklist(LookUpDataReq lookUpDataReq, CallEntity callEntity, + LookUpDataTypeEnum type) { + CallTargetAudienceChecklistEntity checklistEntity = null; + LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(lookUpDataReq, type); + if (lookUpDataReq.getId() != null && lookUpDataReq.getId() > 0) { + checklistEntity = callTargetAudienceChecklistRepository.findById(lookUpDataReq.getId()) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.CALL_NOT_FOUND))); + + if (Boolean.FALSE.equals(checklistEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) { + checklistEntity.setLookupData(lookupDataEntity); + } + } else { + checklistEntity = new CallTargetAudienceChecklistEntity(); + checklistEntity.setCall(callEntity); + checklistEntity.setLookupData(lookupDataEntity); + checklistEntity.setIsValidated(false); + checklistEntity.setIsDeleted(false); + } + + callTargetAudienceChecklistRepository.save(checklistEntity); + } + + private void softDeleteCallTargetAudienceChecklist( + CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) { + callTargetAudienceChecklistEntity.setIsDeleted(true); + callTargetAudienceChecklistRepository.save(callTargetAudienceChecklistEntity); + } + + public CallDetailsResponseBean convertToCallDetailsResponseBean(CallEntity callEntity) { + CallDetailsResponseBean callDetailsResponseBean = new CallDetailsResponseBean(); + callDetailsResponseBean.setId(callEntity.getId()); + callDetailsResponseBean.setName(callEntity.getName()); + callDetailsResponseBean.setDates(List.of(callEntity.getStartDate(), callEntity.getEndDate())); + callDetailsResponseBean.setDescriptionShort(callEntity.getDescriptionShort()); + callDetailsResponseBean.setDescriptionLong(callEntity.getDescriptionLong()); + callDetailsResponseBean.setStatus(CallStatusEnum.valueOf(callEntity.getStatus())); + callDetailsResponseBean.setRegionId(callEntity.getRegion().getId()); + callDetailsResponseBean.setAmount(callEntity.getAmount()); + callDetailsResponseBean.setAmountMax(callEntity.getAmountMax()); + callDetailsResponseBean.setContactInfo(callEntity.getContactInfo()); + callDetailsResponseBean.setSubmissionMethod(callEntity.getSubmissionMethod()); + callDetailsResponseBean.setThreshold(callEntity.getThreshold()); + callDetailsResponseBean.setDocumentationReqested(callEntity.getDocumentationRequested()); + callDetailsResponseBean.setPriorityArea(callEntity.getPriorityArea()); + callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate()); + callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate()); + return callDetailsResponseBean; + } + private CallResponse getCallResponseBean(CallEntity callEntity) { + List documentEntities = documentRepository.findByCallIdAndTypeAndIsDeletedFalse(callEntity.getId(), + DocumentTypeEnum.DOCUMENT.getValue()); + List imageEntities = documentRepository.findByCallIdAndTypeAndIsDeletedFalse(callEntity.getId(), + DocumentTypeEnum.DOCUMENT.getValue()); + List faqEntities = faqRepository.findByCallIdAndIsDeletedFalse(callEntity.getId()); List amiedTo = callTargetAudienceChecklistRepository - .findByCallIdAndLookupDataType(callEntity.getId(), LookUpDataTypeEnum.AIMED_TO.getValue()).stream() + .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.AIMED_TO.getValue()).stream() .map(this::convertToLookUpDataResponseBean).toList(); - createCallResponseBean = assembleCreateCallResponseBean(callEntity, evaluationCriteriaEntities, + + List checkList = callTargetAudienceChecklistRepository + .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.CHECKLIST.getValue()).stream() + .map(this::convertToLookUpDataResponseBean).toList(); + List evaluationCriteriaEntities = evaluationCriteriaRepository + .findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), LookUpDataTypeEnum.EVALUATION_CRITERIA.getValue()); + + CallResponse createCallResponseBean = assembleCreateCallResponseBean(callEntity, evaluationCriteriaEntities, documentEntities, faqEntities, imageEntities); createCallResponseBean.setAimedTo(amiedTo); createCallResponseBean.setCheckList(checkList); return createCallResponseBean; + } + public List getAllCalls() { + return callRepository.findAll() + .stream() + .map(this::convertToCallDetailsResponseBean) + .collect(Collectors.toList()); + } + public CallResponse validateCall(CallEntity callEntity) { + CallResponse callResponseBean = getCallResponseBean(callEntity); + CallValidatorServiceImpl.validateResponse(callResponseBean); + callEntity.setStatus(CallStatusEnum.READY_TO_PUBLISH.getValue()); + callRepository.save(callEntity); + callResponseBean.setCurrentStep(GepafinConstant.VALIDATE_REQUEST); + return callResponseBean; } public CallEntity getCallEntityById(Long id){ - CallEntity callEntity=callRepository.findByIdAndStatusNotIn(id,List.of(CallTypeEnum.PUBLISH.getValue())); + 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; } } - - - diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java index f9603b70..3a0b1b9b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java @@ -1,8 +1,7 @@ package net.gepafin.tendermanagement.dao; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import org.apache.commons.io.FilenameUtils; @@ -13,58 +12,121 @@ import org.springframework.web.multipart.MultipartFile; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; +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.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import java.util.ArrayList; +import java.util.List; + @Component public class DocumentDao { - @Autowired - private AmazonS3Service amazonS3Service; + @Autowired + private AmazonS3Service amazonS3Service; - @Autowired - private DocumentRepository documentRepository; + @Autowired + private DocumentRepository documentRepository; - @Autowired - private CallDao callDao; + @Autowired + private CallDao callDao; - public List uploadFiles(List files, DocumentTypeEnum fileType) { - List documentEntities = new ArrayList<>(); + @Autowired + private CallRepository callRepository; - for (MultipartFile file : files) { - try { - String extension = FilenameUtils.getExtension(file.getOriginalFilename()); - String fileName = StringUtils.cleanPath(file.getOriginalFilename()); - String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); - fileName = (firstNameContain + "." + extension); - String filepath = amazonS3Service.upload(fileName,file); - DocumentEntity documentEntity = new DocumentEntity(); - documentEntity.setFileName(fileName); - documentEntity.setType(fileType.getValue()); - documentEntity.setFilePath(filepath); - documentEntities.add(documentEntity); - } catch (IOException e) {} - } - documentRepository.saveAll(documentEntities); - return documentEntities.stream() - .map(callDao::convertToDocumentResponseBean) - .collect(Collectors.toList()); - } + 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))); + for (MultipartFile file : files) { + try { + uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file); + if (result != null) { + DocumentEntity documentEntity = new DocumentEntity(); + documentEntity.setFileName(result.fileName()); + documentEntity.setCall(callEntity); + documentEntity.setType(fileType.getValue()); + documentEntity.setFilePath(result.filepath()); + documentEntity.setIsDeleted(false); + documentEntities.add(documentEntity); + } + } catch (IOException e) { + } + } + documentRepository.saveAll(documentEntities); + return documentEntities.stream().map(callDao::convertToDocumentResponseBean).collect(Collectors.toList()); + } + + private uploadFileOnAmazonS3 uploadFileOnAmazonS3(MultipartFile file) throws IOException { + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + String fileName = StringUtils.cleanPath(file.getOriginalFilename()); + String firstNameContain = fileName.substring(0, fileName.lastIndexOf('.')); + fileName = (firstNameContain + "." + extension); + String filepath = amazonS3Service.upload(fileName, file); + uploadFileOnAmazonS3 result = new uploadFileOnAmazonS3(fileName, filepath); + return result; + } + + private record uploadFileOnAmazonS3(String fileName, String filepath) { + } public void deleteFile(Long documentId) { - DocumentEntity documentEntity = documentRepository.findById(documentId) - .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, - Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND))); + DocumentEntity documentEntity = getDocumentEntity(documentId); +// String fileName= Utils.extractFileName(documentEntity.getFilePath()); +// deleteFileOnAmazonS3(fileName); + documentEntity.setIsDeleted(true); + documentRepository.save(documentEntity); + } + private DocumentEntity deleteFileOnAmazonS3(String fileName) { + try { + amazonS3Service.delete(fileName); + } catch (Exception e) { + } + 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 DocumentResponseBean updateDocument(Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { + DocumentEntity documentEntity = getDocumentEntity(documentId); String fileName = Utils.extractFileName(documentEntity.getFilePath()); - amazonS3Service.delete(fileName); - documentRepository.delete(documentEntity); + deleteFileOnAmazonS3(fileName); + uploadFileOnAmazonS3 result = null; + try { + result = uploadFileOnAmazonS3(file); + } catch (IOException e) { + } + if (result != null) { + documentEntity.setFilePath(result.filepath); + documentEntity.setFileName(result.fileName); + documentEntity.setType(documentTypeEnum.getValue()); + documentRepository.save(documentEntity); + } + return callDao.convertToDocumentResponseBean(documentEntity); + } + 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)); } } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java new file mode 100644 index 00000000..ab5c25b2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java @@ -0,0 +1,83 @@ +package net.gepafin.tendermanagement.dao; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.CallEntity; +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.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 CallRepository callRepository; + + @Autowired + private LookUpDataRepository lookUpDataRepository; + + public EvaluationCriteriaResponseBean createEvaluationCriteria(EvaluationCriteriaRequest evaluationCriteriaRequest) { + EvaluationCriteriaEntity entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(evaluationCriteriaRequest); + return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity); + } + + 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()) + .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; + } + + 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 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; + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java new file mode 100644 index 00000000..c7ad05a2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java @@ -0,0 +1,101 @@ +package net.gepafin.tendermanagement.dao; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.CallEntity; +import net.gepafin.tendermanagement.entities.FaqEntity; +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.repositories.UserRepository; +import net.gepafin.tendermanagement.util.DateTimeUtil; +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.time.LocalDateTime; + +@Component +public class FaqDao { + + @Autowired + private FaqRepository faqRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private CallDao callDao; + + @Autowired + private CallRepository callRepository; + + 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))); + entity = callDao.convertToFaqEntity(faqRequest, callEntity, userId); + faqRepository.save(entity); + return convertFaqEntityToResponseBean(entity); + } + + public FaqResponseBean getFaqById(Long id) { + return faqRepository.findById(id).map(this::convertFaqEntityToResponseBean) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + } + + public FaqResponseBean updateFaq(Long id, FaqReq faqRequest, Long userId) { + FaqEntity entity = faqRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + updateFaqEntity(entity, faqRequest, userId, entity.getCall()); + faqRepository.save(entity); + return convertFaqEntityToResponseBean(entity); + } + + public void deleteFaq(Long id) { + FaqEntity entity = faqRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + faqRepository.deleteById(entity.getId()); + + } + + private FaqResponseBean convertFaqEntityToResponseBean(FaqEntity entity) { + FaqResponseBean response = new FaqResponseBean(); + response.setId(entity.getId()); + response.setUserId(entity.getUser().getId()); + response.setIsVisible(entity.getIsVisible()); + response.setUpdatedDate(entity.getUpdatedDate()); + response.setCreatedDate(entity.getCreatedDate()); + response.setQuestionShort(entity.getQuestionShort()); + response.setQuestion(entity.getQuestion()); + response.setResponseShort(entity.getResponseShort()); + response.setResponse(entity.getResponse()); + response.setResponseDate(entity.getResponseDate()); + return response; + } + + private void updateFaqEntity(FaqEntity faqEntity, FaqReq faqReq, Long userId, CallEntity callEntity) { + faqEntity.setQuestion(faqReq.getQuestion()); + UserEntity userEntity = userRepository.findById(userId) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); + faqEntity.setUser(userEntity); + faqEntity.setIsVisible(true); + if (faqReq.getIsVisible() != null) { + faqEntity.setIsVisible(faqReq.getIsVisible()); + } + faqEntity.setQuestionShort(faqReq.getQuestionShort()); + faqEntity.setQuestion(faqReq.getQuestion()); + if (faqReq.getResponse() != null || faqReq.getResponseShort() != null) { + faqEntity.setResponseDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); + } + faqEntity.setResponseShort(faqReq.getResponseShort()); + faqEntity.setResponse(faqReq.getResponse()); + faqEntity.setCall(callEntity); + } +} \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java index 8bc9cd3e..7902e72e 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java @@ -4,14 +4,12 @@ import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.entities.FormEntity; -import net.gepafin.tendermanagement.entities.LookUpDataEntity; import net.gepafin.tendermanagement.model.request.FormRequest; import net.gepafin.tendermanagement.model.response.FormResponseBean; -import net.gepafin.tendermanagement.repositories.CallRepository; import net.gepafin.tendermanagement.repositories.FormRepository; import net.gepafin.tendermanagement.service.CallService; import net.gepafin.tendermanagement.service.FormService; -import net.gepafin.tendermanagement.util.ObjectUtils; +import net.gepafin.tendermanagement.util.Utils; 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; @@ -39,7 +37,7 @@ public class FormDao { } public FormEntity convertFormRequestToFormEntity(Long callId,FormRequest formRequest){ - FormEntity formEntity=new FormEntity(); + FormEntity formEntity=null; CallEntity callEntity=callService.getCallEntityById(callId); formEntity.setCall(callEntity); formEntity.setLabel(formRequest.getLabel()); @@ -71,10 +69,10 @@ public class FormDao { } public FormResponseBean updateForm(Long formId, FormRequest formRequest){ FormEntity formEntity = formService.getFormEntityById(formId); - ObjectUtils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel()); - ObjectUtils.setIfUpdated(formEntity::getContent,formEntity::setContent,formRequest.getContent()); + Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel()); + Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,formRequest.getContent()); if(formRequest.getOrderNo()!=null && formRequest.getOrderNo() > 0) { - ObjectUtils.setIfUpdated(formEntity::getOrderNo, formEntity::setOrderNo, formRequest.getOrderNo()); + Utils.setIfUpdated(formEntity::getOrderNo, formEntity::setOrderNo, formRequest.getOrderNo()); } formEntity=saveFormEntity(formEntity); return convertFormEntityToFormResponseBean(formEntity); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java index dcda7092..c1f2fedf 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java @@ -7,7 +7,7 @@ import net.gepafin.tendermanagement.model.request.FormFieldRequest; import net.gepafin.tendermanagement.model.response.FormFieldResponseBean; import net.gepafin.tendermanagement.repositories.FormFieldRepository; import net.gepafin.tendermanagement.service.FormFieldService; -import net.gepafin.tendermanagement.util.ObjectUtils; +import net.gepafin.tendermanagement.util.Utils; 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; @@ -25,7 +25,7 @@ public class FormFieldDao { public FormFieldEntity convertFormFieldRequestToFormFieldResponseBean(FormFieldRequest formFieldRequest) { - FormFieldEntity formFieldEntity = new FormFieldEntity(); + FormFieldEntity formFieldEntity = null; formFieldEntity.setLabel(formFieldRequest.getLabel()); formFieldEntity.setDefinition(formFieldRequest.getDefinition()); formFieldEntity.setIsActive(true); @@ -64,9 +64,9 @@ public class FormFieldDao { } public FormFieldResponseBean updateFormField(Long formFieldId,FormFieldRequest formFieldRequest){ FormFieldEntity formFieldEntity = formFieldService.getFormFieldEntityById(formFieldId); - ObjectUtils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel()); - ObjectUtils.setIfUpdated(formFieldEntity::getDefinition,formFieldEntity::setDefinition,formFieldRequest.getDefinition()); - ObjectUtils.setIfUpdated(formFieldEntity::getIsActive,formFieldEntity::setIsActive,formFieldRequest.getIsActive()); + Utils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel()); + Utils.setIfUpdated(formFieldEntity::getDefinition,formFieldEntity::setDefinition,formFieldRequest.getDefinition()); + Utils.setIfUpdated(formFieldEntity::getIsActive,formFieldEntity::setIsActive,formFieldRequest.getIsActive()); formFieldEntity=saveFormFieldEntity(formFieldEntity); return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java index 88efc0c1..9d13ccab 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java @@ -7,7 +7,7 @@ import net.gepafin.tendermanagement.model.request.FormTemplateRequest; import net.gepafin.tendermanagement.model.response.FormTemplateResponseBean; import net.gepafin.tendermanagement.repositories.FormTemplateRepository; import net.gepafin.tendermanagement.service.FormTemplateService; -import net.gepafin.tendermanagement.util.ObjectUtils; +import net.gepafin.tendermanagement.util.Utils; 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; @@ -25,7 +25,7 @@ public class FormTemplateDao { public FormTemplateEntity convertFormTemplateRequestToFormTemplateRequest(FormTemplateRequest formTemplateRequest){ - FormTemplateEntity formTemplateEntity=new FormTemplateEntity(); + FormTemplateEntity formTemplateEntity=null; formTemplateEntity.setContent(formTemplateRequest.getContent()); formTemplateEntity.setLabel(formTemplateRequest.getLabel()); formTemplateEntity=saveFormTemplateEntity(formTemplateEntity); @@ -57,8 +57,8 @@ public class FormTemplateDao { } public FormTemplateResponseBean updateFormTemplate(Long formTemplateId,FormTemplateRequest formTemplateRequest){ FormTemplateEntity formTemplateEntity = formTemplateService.getFormEntityById(formTemplateId); - ObjectUtils.setIfUpdated(formTemplateEntity::getLabel,formTemplateEntity::setLabel,formTemplateRequest.getLabel()); - ObjectUtils.setIfUpdated(formTemplateEntity::getContent,formTemplateEntity::setContent,formTemplateRequest.getContent()); + Utils.setIfUpdated(formTemplateEntity::getLabel,formTemplateEntity::setLabel,formTemplateRequest.getLabel()); + Utils.setIfUpdated(formTemplateEntity::getContent,formTemplateEntity::setContent,formTemplateRequest.getContent()); formTemplateEntity=saveFormTemplateEntity(formTemplateEntity); return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java new file mode 100644 index 00000000..fe51facc --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java @@ -0,0 +1,77 @@ +package net.gepafin.tendermanagement.dao; + +import net.gepafin.tendermanagement.entities.LookUpDataEntity; +import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.request.LookUpDataRequest; +import net.gepafin.tendermanagement.model.response.LookUpDataResponseBean; +import net.gepafin.tendermanagement.repositories.LookUpDataRepository; +import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +@Component +public class LookUpDataDao { + + @Autowired + private LookUpDataRepository lookUpDataRepository; + + public LookUpDataResponseBean createLookUpData(LookUpDataRequest lookUpDataReq) { + LookUpDataEntity entity = convertLookUpDataReqToLookUpDataEntity(lookUpDataReq); + return convertLookUpDataEntityToResponseBean(entity); + } + private LookUpDataEntity convertLookUpDataReqToLookUpDataEntity(LookUpDataRequest lookUpDataReq) { + LookUpDataEntity entity = new LookUpDataEntity(); + entity.setTitle(lookUpDataReq.getTitle()); + entity.setType(lookUpDataReq.getType().getValue()); + entity.setValue(lookUpDataReq.getValue()); + lookUpDataRepository.save(entity); + return entity; + } + + public LookUpDataResponseBean getLookUpDataById(Long id) { + return lookUpDataRepository.findById(id) + .map(this::convertLookUpDataEntityToResponseBean) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + } + + 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))); + entity.setTitle(lookUpDataReq.getTitle()); + entity.setType(lookUpDataReq.getType().getValue()); + entity.setValue(lookUpDataReq.getValue()); + lookUpDataRepository.save(entity); + return convertLookUpDataEntityToResponseBean(entity); + } + + public void deleteLookUpData(Long id) { + LookUpDataEntity entity = lookUpDataRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + lookUpDataRepository.deleteById(entity.getId()); + } + + private LookUpDataResponseBean convertLookUpDataEntityToResponseBean(LookUpDataEntity entity) { + LookUpDataResponseBean response = new LookUpDataResponseBean(); + response.setId(entity.getId()); + response.setTitle(entity.getTitle()); + response.setType(LookUpDataEntity.LookUpDataTypeEnum.valueOf(entity.getType())); + response.setValue(entity.getValue()); + response.setCreatedDate(entity.getCreatedDate()); + response.setUpdatedDate(entity.getUpdatedDate()); + return response; + } + + public List getLookUpDataByType(LookUpDataTypeEnum type) { + return lookUpDataRepository.findByType(type.getValue()) + .stream() + .map(this::convertLookUpDataEntityToResponseBean) + .collect(Collectors.toList()); + } + +} diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java b/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java index 40493b04..5b59f2a5 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java @@ -4,7 +4,6 @@ import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.enums.RegionStatusEnum; -import net.gepafin.tendermanagement.enums.UserStatusEnum; import net.gepafin.tendermanagement.model.request.RegionReq; import net.gepafin.tendermanagement.model.response.RegionResponseBean; import net.gepafin.tendermanagement.repositories.RegionRepository; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Repository; import java.util.List; import java.util.stream.Collectors; -import static net.gepafin.tendermanagement.util.ObjectUtils.setIfUpdated; +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @Repository public class RegionDao { @@ -77,7 +76,7 @@ public class RegionDao { public RegionResponseBean updateRegion(Long id, RegionReq regionReq) { log.info("Updating region with ID: {}", id); - RegionEntity existingRegion = getRegionById(id); + RegionEntity existingRegion = validateRegion(id); log.info("Current region details: {}", existingRegion); log.info("New region details: {}", regionReq); String newStatus = regionReq.getStatus() != null ? regionReq.getStatus().getValue() : null; @@ -103,14 +102,19 @@ public class RegionDao { return Utils.convertObject(existingRegion, RegionResponseBean.class); } - public RegionEntity getRegionById(Long id) { + public RegionEntity validateRegion(Long id) { log.info("Fetching region with ID: {}", id); RegionEntity regionEntity = regionRepository.findById(id) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG))); log.info("Region found: {}", regionEntity); return regionEntity; } - + public RegionResponseBean getRegionById(Long id) { + log.info("Fetching region with ID: {}", id); + RegionEntity regionEntity = regionRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.REGION_NOT_FOUND_MSG))); + return convertRegionEntityToRegionResponse(regionEntity); + } public void deleteById(Long id) { log.info("Deleting region with ID: {}", id); regionRepository.findById(id) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java index d0c6342c..2f5627cc 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java @@ -2,12 +2,12 @@ package net.gepafin.tendermanagement.dao; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.entities.RegionEntity; import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.model.request.RoleReq; import net.gepafin.tendermanagement.model.response.RegionResponseBean; import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.repositories.RoleRepository; -import net.gepafin.tendermanagement.service.RegionService; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.stream.Collectors; -import static net.gepafin.tendermanagement.util.ObjectUtils.setIfUpdated; +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @Component public class RoleDao { @@ -28,9 +28,6 @@ public class RoleDao { @Autowired private RoleRepository roleRepository; - @Autowired - private RegionService regionService; - @Autowired private RegionDao regionDao; @@ -48,7 +45,8 @@ public class RoleDao { roleEntity.setRoleType(roleReq.getRoleType()); roleEntity.setPermissions(roleReq.getPermissions()); roleEntity.setDescription(roleReq.getDescription()); - roleEntity.setRegion(regionService.getRegionById(roleReq.getRegionId())); + RegionEntity regionEntity =regionDao.validateRegion(roleReq.getRegionId()); + roleEntity.setRegion(regionEntity); return roleEntity; } @@ -68,7 +66,7 @@ public class RoleDao { public RoleResponseBean updateRole(Long id, RoleReq roleReq) { log.info("Updating role with ID: {}", id); - RoleEntity existingRole = getRoleById(id); + RoleEntity existingRole = validateRole(id); // Log changes before update log.info("Current role details: {}", existingRole); @@ -85,14 +83,20 @@ public class RoleDao { return Utils.convertObject(existingRole, RoleResponseBean.class); } - public RoleEntity getRoleById(Long id) { + public RoleEntity validateRole(Long id) { log.info("Fetching role with ID: {}", id); RoleEntity roleEntity = roleRepository.findById(id) .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.ROLE_NOT_FOUND))); log.info("Role found: {}", roleEntity); return roleEntity; } - + public RoleResponseBean getRoleById(Long id) { + log.info("Fetching role with ID: {}", id); + RoleEntity roleEntity = roleRepository.findById(id) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.ROLE_NOT_FOUND))); + log.info("Role found: {}", roleEntity); + return convertRoleEntityToRoleResponse(roleEntity); + } public void deleteById(Long id) { log.info("Deleting role with ID: {}", id); roleRepository.findById(id) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java index dc06326f..79cbf0b0 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java @@ -1,18 +1,17 @@ package net.gepafin.tendermanagement.dao; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; 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.enums.UserStatusEnum; -import net.gepafin.tendermanagement.model.request.LoginReq; -import net.gepafin.tendermanagement.model.request.UpdateUserReq; -import net.gepafin.tendermanagement.model.request.UserReq; +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.repositories.UserRepository; -import net.gepafin.tendermanagement.service.RoleService; import net.gepafin.tendermanagement.service.impl.AuthenticationService; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; @@ -22,8 +21,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Repository; +import java.security.SecureRandom; +import java.util.Base64; -import static net.gepafin.tendermanagement.util.ObjectUtils.setIfUpdated; +import static net.gepafin.tendermanagement.util.Utils.setIfUpdated; @Repository public class UserDao { @@ -36,9 +37,6 @@ public class UserDao { @Autowired private AuthenticationService authService; - @Autowired - private RoleService roleService; - @Autowired private PasswordEncoder passwordEncoder; @@ -81,7 +79,7 @@ public class UserDao { setIfUpdated(userEntity::getAddress, userEntity::setAddress, userReq.getAddress()); setIfUpdated(userEntity::getPhoneNumber, userEntity::setPhoneNumber, userReq.getPhoneNumber()); if (userReq.getRoleId() != null) { - RoleEntity roleEntity = roleService.getRoleById(userReq.getRoleId()); + RoleEntity roleEntity = roleDao.validateRole(userReq.getRoleId()); setIfUpdated(userEntity::getRoleEntity, userEntity::setRoleEntity, roleEntity); } userEntity = userRepository.save(userEntity); @@ -99,7 +97,7 @@ public class UserDao { userEntity.setOrganization(userReq.getOrganization()); userEntity.setAddress(userReq.getAddress()); userEntity.setPhoneNumber(userReq.getPhoneNumber()); - userEntity.setRoleEntity(roleService.getRoleById(userReq.getRoleId())); + userEntity.setRoleEntity(roleDao.validateRole(userReq.getRoleId())); return userEntity; } @@ -149,4 +147,88 @@ public class UserDao { log.info("Login successful for email: {}", loginReq.getEmail()); return jwtToken; } + + public UserEntity validateUser(Long userId) { + return userRepository.findById(userId) + .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG))); + } + public String generateSecureToken() { + SecureRandom secureRandom = new SecureRandom(); + byte[] tokenBytes = new byte[24]; + secureRandom.nextBytes(tokenBytes); + String token = Base64.getUrlEncoder().withoutPadding().encodeToString(tokenBytes); + log.debug("Generated secure token: {}", token); + return token; + } + + public String initiatePasswordReset(InitiatePasswordResetReq resetReq) { + UserEntity user = userRepository.findByEmail(resetReq.getEmail()); + if (user == null) { + log.info("Password reset attempt for non-existent user: {}", resetReq.getEmail()); + throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); + } + String token = generateSecureToken(); + user.setResetPasswordToken(token); + userRepository.save(user); + log.info("Password reset token generated for user: {}", resetReq.getEmail()); + return token; + } + + public Boolean resetPassword(ResetPasswordReq resetPasswordReq) { + UserEntity user = userRepository.findByEmail(resetPasswordReq.getEmail()); + if (user == null) { + log.info("Password reset attempt for non-existent user: {}", resetPasswordReq.getEmail()); + throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); + } + if (!resetPasswordReq.getNewPassword().equals(resetPasswordReq.getConfirmPassword())) { + log.info("User creation failed: Passwords do not match for email {}", user.getEmail()); + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH)); + } + String dbToken = user.getResetPasswordToken(); + + if (dbToken == null || !dbToken.equals(resetPasswordReq.getToken())) { + log.info("Invalid password reset token for user: {}", resetPasswordReq.getEmail()); + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.INVALID_TOKEN_MSG)); + } + + user.setPassword(passwordEncoder.encode(resetPasswordReq.getNewPassword())); + user.setResetPasswordToken(null); + userRepository.save(user); + log.info("Password successfully reset for user: {}", resetPasswordReq.getEmail()); + return true; + } + + public Boolean changePassword(ChangePasswordRequest request) { + UserEntity user = userRepository.findByEmail(request.getEmail()); + if (user == null) { + log.info("Password reset attempt for non-existent user: {}", request.getEmail()); + throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); + } + if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) { + throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CURRENT_PASSWORD_INCORRECT)); + } + if (!request.getNewPassword().equals(request.getConfirmPassword())) { + log.info("User creation failed: Passwords do not match for email {}", user.getEmail()); + throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH)); + } + user.setPassword(passwordEncoder.encode(request.getNewPassword())); + userRepository.save(user); + return true; + } + public void logout(HttpServletRequest request, HttpServletResponse response) { + authService.logout(request, response); + log.info("User successfully logged out."); + } + + public UserResponseBean updateUserStatus(Long userId, UserStatusEnum statusReq) { + log.info("Updating status for user with ID: {}", userId); + UserEntity userEntity = userRepository.findById(userId) + .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG))); + userEntity.setStatus(statusReq.getValue()); + userEntity = userRepository.save(userEntity); + log.info("User status updated to {} for user ID: {}", statusReq, userId); + return convertUserEntityToUserResponse(userEntity); + } + } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java index be94ee59..6b14df58 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java @@ -18,6 +18,9 @@ public class CallTargetAudienceChecklistEntity extends BaseEntity{ @Column(name = "IS_VALIDATED") private Boolean isValidated; + + @Column(name ="IS_DELETED", nullable = false) + private Boolean isDeleted = false; } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java index 5a15351c..057ca421 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java @@ -1,17 +1,15 @@ package net.gepafin.tendermanagement.entities; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.Builder; @Entity @Table(name = "DOCUMENT") @Data -@NoArgsConstructor -@AllArgsConstructor -@Builder public class DocumentEntity extends BaseEntity{ @Column(name = "FILE_NAME", length = 255) private String fileName; @@ -28,4 +26,8 @@ public class DocumentEntity extends BaseEntity{ @Column(name = "DESCRIPTION", columnDefinition = "TEXT") private String description; + + @Column(name ="IS_DELETED", nullable = false) + private Boolean isDeleted = false; + } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java index 539d9c30..39b3eb05 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java @@ -1,30 +1,29 @@ package net.gepafin.tendermanagement.entities; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.Builder; @Entity @Table(name = "EVALUATION_CRITERIA") @Data -@NoArgsConstructor -@AllArgsConstructor -@Builder public class EvaluationCriteriaEntity extends BaseEntity { @ManyToOne @JoinColumn(name = "CALL_ID", nullable = false) private CallEntity call; - - @Column(name = "NAME", nullable = false, columnDefinition = "TEXT") - private String name; - - @Column(name = "DESCRIPTION", columnDefinition = "TEXT") - private String description; - + + @ManyToOne + @JoinColumn(name = "LOOKUP_DATA_ID") + private LookUpDataEntity lookupData; + @Column(name = "SCORE", nullable = false) - private Integer score; + private Long score; + + @Column(name ="IS_DELETED", nullable = false) + private Boolean isDeleted = false; } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java index aa521521..d5e47df8 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java @@ -1,19 +1,19 @@ package net.gepafin.tendermanagement.entities; -import jakarta.persistence.*; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.Builder; - import java.time.LocalDateTime; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.Data; + + @Entity @Table(name = "FAQ") @Data -@NoArgsConstructor -@AllArgsConstructor -@Builder public class FaqEntity extends BaseEntity { @ManyToOne @@ -41,6 +41,9 @@ public class FaqEntity extends BaseEntity { @Column(name = "RESPONSE_DATE") private LocalDateTime responseDate; + + @Column(name ="IS_DELETED", nullable = false) + private Boolean isDeleted = false; } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java index aac82db9..5bd88f33 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java @@ -58,4 +58,6 @@ public class UserEntity extends BaseEntity { @Column(name = "COUNTRY", length = 50, nullable = true) private String country; + @Column(name = "RESET_PASSWORD_TOKEN", length = 255, nullable = true) + private String resetPasswordToken; } diff --git a/src/main/java/net/gepafin/tendermanagement/enums/CallTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java similarity index 69% rename from src/main/java/net/gepafin/tendermanagement/enums/CallTypeEnum.java rename to src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java index 46b88869..c31e407f 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/CallTypeEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/CallStatusEnum.java @@ -2,15 +2,16 @@ package net.gepafin.tendermanagement.enums; import com.fasterxml.jackson.annotation.JsonValue; -public enum CallTypeEnum { +public enum CallStatusEnum { DRAFT("DRAFT"), PUBLISH("PUBLISH"), - EXPIRE("EXPIRE"); + EXPIRE("EXPIRED"), + READY_TO_PUBLISH("READY_TO_PUBLISH"); private String value; - CallTypeEnum(String value) { + CallStatusEnum(String value) { this.value = value; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ChangePasswordRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/ChangePasswordRequest.java new file mode 100644 index 00000000..a15f8cfc --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ChangePasswordRequest.java @@ -0,0 +1,16 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class ChangePasswordRequest { + + + private String email; + + private String password; + + private String newPassword; + + private String confirmPassword; +} \ No newline at end of file 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 e6cbc3e9..97e276a4 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java @@ -1,14 +1,12 @@ package net.gepafin.tendermanagement.model.request; -import lombok.Data; -import net.gepafin.tendermanagement.enums.CallTypeEnum; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import lombok.Data; @Data public class CreateCallRequestStep1 { @@ -43,11 +41,8 @@ public class CreateCallRequestStep1 { @NotEmpty private String documentationRequested; - private Boolean Confidi; + private Boolean confidi; private List faq; - @NotNull - private CallTypeEnum status; - } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java index 7908c9ae..3e339d3e 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep2.java @@ -4,14 +4,10 @@ import java.util.List; import jakarta.validation.constraints.NotNull; import lombok.Data; -import net.gepafin.tendermanagement.enums.CallTypeEnum; @Data public class CreateCallRequestStep2 { - @NotNull - private Long callId; - private Long threshold; @NotNull @@ -24,6 +20,4 @@ public class CreateCallRequestStep2 { private List images; - private CallTypeEnum status; - } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaReq.java index a8b90e1c..7d504f7f 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaReq.java @@ -1,11 +1,11 @@ package net.gepafin.tendermanagement.model.request; import lombok.Data; +import lombok.NoArgsConstructor; +@NoArgsConstructor @Data -public class EvaluationCriteriaReq { +public class EvaluationCriteriaReq extends LookUpDataReq{ - private String name; - private String value; - private Integer score; + private Long score; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaRequest.java new file mode 100644 index 00000000..a2e5a92b --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/EvaluationCriteriaRequest.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class EvaluationCriteriaRequest extends LookUpDataReq { + + private Long callId; + + private Long score; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/FaqReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/FaqReq.java index de9f5225..618c03c0 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/FaqReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/FaqReq.java @@ -5,6 +5,7 @@ import lombok.Data; @Data public class FaqReq { + private Long id; private Boolean isVisible; private String questionShort; private String question; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/InitiatePasswordResetReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/InitiatePasswordResetReq.java new file mode 100644 index 00000000..ae2ba0d0 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/InitiatePasswordResetReq.java @@ -0,0 +1,8 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class InitiatePasswordResetReq { + private String email; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java new file mode 100644 index 00000000..00c07a25 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java @@ -0,0 +1,10 @@ +package net.gepafin.tendermanagement.model.request; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.Data; + +@Data +public class LogoutReq { + private String email; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataReq.java index 5fe41b41..441d19b6 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataReq.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataReq.java @@ -1,12 +1,12 @@ package net.gepafin.tendermanagement.model.request; -import jakarta.validation.constraints.NotNull; import lombok.Data; @Data public class LookUpDataReq { - @NotNull + private Long id; + private Long lookUpDataId; private String value; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java new file mode 100644 index 00000000..459e1416 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/LookUpDataRequest.java @@ -0,0 +1,12 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; +import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; + +@Data +public class LookUpDataRequest { + + private String title; + private LookUpDataTypeEnum type; + private String value; +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ResetPasswordReq.java b/src/main/java/net/gepafin/tendermanagement/model/request/ResetPasswordReq.java new file mode 100644 index 00000000..019ca582 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/ResetPasswordReq.java @@ -0,0 +1,13 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +@Data +public class ResetPasswordReq { + private String email; + private String token; + private String newPassword; + private String confirmPassword; + + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java new file mode 100644 index 00000000..cecb7d4c --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java @@ -0,0 +1,43 @@ +package net.gepafin.tendermanagement.model.request; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import lombok.Data; + +@Data +public class UpdateCallRequestStep1 { + + + private String name; + + + private String descriptionShort; + + + private String descriptionLong; + + + private LocalDateTime startDate; + + + private LocalDateTime endDate; + + + private BigDecimal amount; + + + private BigDecimal amountMax; + + + private List aimedTo; + + + private String documentationRequested; + + private Boolean confidi; + + private List faq; + +} diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java similarity index 85% rename from src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java rename to src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java index 56a42a2a..0e19dd69 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CreateCallResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java @@ -1,14 +1,13 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; -import net.gepafin.tendermanagement.enums.CallTypeEnum; +import net.gepafin.tendermanagement.enums.CallStatusEnum; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; - @Data -public class CreateCallResponseBean { +public class CallDetailsResponseBean { private Long id; @@ -20,7 +19,7 @@ public class CreateCallResponseBean { private List dates; - private CallTypeEnum status; + private CallStatusEnum status; private Long regionId; @@ -54,7 +53,5 @@ public class CreateCallResponseBean { private List checkList; + private String currentStep; } - - - diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java new file mode 100644 index 00000000..4deaef67 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java @@ -0,0 +1,66 @@ +package net.gepafin.tendermanagement.model.response; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import lombok.Data; +import net.gepafin.tendermanagement.enums.CallStatusEnum; + +@Data +public class CallResponse { + + private Long id; + + private String name; + + private String descriptionShort; + + private String descriptionLong; + + private LocalDateTime startDate; + + private LocalDateTime endDate; + + private CallStatusEnum status; + + private Long regionId; + + private BigDecimal amount; + + private BigDecimal amountMax; + + private String contactInfo; + + private String submissionMethod; + + private Long threshold; + + private String priorityArea; + + private String documentationReqested; + + private Boolean confidi; + + private LocalDateTime createdDate; + + private LocalDateTime updatedDate; + + private List aimedTo; + + private List criteria; + + private List docs; + + private List faq; + + private List images; + + private List checkList; + + private String currentStep; + +} + + + diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationCriteriaResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationCriteriaResponseBean.java index 29cfed21..50a984cc 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationCriteriaResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/EvaluationCriteriaResponseBean.java @@ -1,21 +1,11 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import net.gepafin.tendermanagement.model.BaseBean; -import java.time.LocalDateTime; @Data -public class EvaluationCriteriaResponseBean { +public class EvaluationCriteriaResponseBean extends LookUpDataResponse{ - private Long id; - - private String name; - - private String description; - - private Integer score; - - private LocalDateTime createdDate; - - private LocalDateTime updatedDate; + private Long score; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/FaqResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/FaqResponseBean.java index fdc4be63..48529d1d 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/FaqResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/FaqResponseBean.java @@ -1,16 +1,15 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import net.gepafin.tendermanagement.model.BaseBean; import java.time.LocalDateTime; @Data -public class FaqResponseBean { +public class FaqResponseBean extends BaseBean { - private Long id; - - private Long userId; + private Long userId; private Boolean isVisible; @@ -24,7 +23,4 @@ public class FaqResponseBean { private LocalDateTime responseDate; - private LocalDateTime createdDate; - - private LocalDateTime updatedDate; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java index 27811e63..4fb3f5d9 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponse.java @@ -1,13 +1,10 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; - -import java.time.LocalDateTime; +import net.gepafin.tendermanagement.model.BaseBean; @Data -public class LookUpDataResponse { - - private Long id; +public class LookUpDataResponse extends BaseBean { private Long lookUpDataId; @@ -15,8 +12,4 @@ public class LookUpDataResponse { private String value; - private LocalDateTime createdDate; - - private LocalDateTime updatedDate; - } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java new file mode 100644 index 00000000..554db7bd --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/response/LookUpDataResponseBean.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.model.response; + +import lombok.Data; +import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.BaseBean; + +@Data +public class LookUpDataResponseBean extends BaseBean { + + private String title; + + private String value; + + private LookUpDataTypeEnum type; +} diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java index 8d4912fe..62da59a7 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java @@ -1,14 +1,20 @@ package net.gepafin.tendermanagement.repositories; import java.util.List; +import java.util.Optional; 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.CallTargetAudienceChecklistEntity; @Repository public interface CallTargetAudienceChecklistRepository extends JpaRepository { + + @Query("SELECT c FROM CallTargetAudienceChecklistEntity c WHERE c.id = :id AND c.isDeleted = false") + Optional findById(@Param("id") Long id); - List findByCallIdAndLookupDataType(Long id, String value); + List findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long id, String type); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java index 9a2a4639..d6d86138 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/DocumentRepository.java @@ -1,10 +1,23 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.DocumentEntity; + +import java.util.List; +import java.util.Optional; + 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 DocumentRepository extends JpaRepository { + + @Query("SELECT d FROM DocumentEntity d WHERE d.id = :id AND d.isDeleted = false") + Optional findById(@Param("id") Long id); + + List findByCallIdAndTypeAndIsDeletedFalse(Long callId, String type); + + Optional findByIdAndCallIdAndIsDeletedFalse(Long id, Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java index 057566a6..b5b9a231 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java @@ -1,7 +1,19 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity; -import org.springframework.data.jpa.repository.JpaRepository; -public interface EvaluationCriteriaRepository extends JpaRepository { +import java.util.List; +import java.util.Optional; + +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 EvaluationCriteriaRepository extends JpaRepository { + @Query("SELECT ec FROM EvaluationCriteriaEntity ec WHERE ec.id = :id AND ec.isDeleted = false") + Optional findById(@Param("id") Long id); + + List findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long callId, String type); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java index 7b4b7610..4d4927a3 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java @@ -3,12 +3,18 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.FaqEntity; import java.util.List; +import java.util.Optional; 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 FaqRepository extends JpaRepository { +public interface FaqRepository extends JpaRepository { + + @Query("SELECT f FROM FaqEntity f WHERE f.id = :id AND f.isDeleted = false") + Optional findById(@Param("id") Long id); - List findByCallId(Long callId); + List findByCallIdAndIsDeletedFalse(Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java index e4ffb08a..3d3d6d70 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java @@ -2,6 +2,12 @@ package net.gepafin.tendermanagement.repositories; import net.gepafin.tendermanagement.entities.LookUpDataEntity; 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 { + List findByType(String type); } diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java index 6b6fcbe0..7720430c 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java @@ -8,4 +8,5 @@ import java.util.Optional; public interface UserRepository extends JpaRepository { Optional findByEmailIgnoreCase(String email); boolean existsByEmailIgnoreCase(String email); + UserEntity findByEmail(String email); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/CallService.java b/src/main/java/net/gepafin/tendermanagement/service/CallService.java index 30022ebd..73a01c76 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/CallService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/CallService.java @@ -1,16 +1,28 @@ package net.gepafin.tendermanagement.service; +import java.util.List; + import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; -import net.gepafin.tendermanagement.model.response.CreateCallResponseBean; +import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1; +import net.gepafin.tendermanagement.model.response.CallDetailsResponseBean; +import net.gepafin.tendermanagement.model.response.CallResponse; public interface CallService { - CreateCallResponseBean createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest); + CallResponse createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest); - CreateCallResponseBean createCallStep2(HttpServletRequest request, CreateCallRequestStep2 createCallRequest); + CallResponse createCallStep2(HttpServletRequest request, Long callId, CreateCallRequestStep2 createCallRequest); + + CallResponse updateCallStep1(HttpServletRequest request, Long callId, UpdateCallRequestStep1 updateCallRequest); + + CallResponse getCallById (Long callId); + + List getAllCalls(); + + CallResponse validateCall(Long callId); public CallEntity getCallEntityById(Long id); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java b/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java index 4081af53..f55636df 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/DocumentService.java @@ -1,5 +1,6 @@ package net.gepafin.tendermanagement.service; +import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.response.DocumentResponseBean; import org.springframework.web.multipart.MultipartFile; @@ -8,7 +9,11 @@ import java.util.List; public interface DocumentService { - public List uploadFile(List files, DocumentTypeEnum fileType); + public List uploadFile(List files,Long callId, DocumentTypeEnum fileType); public void deleteFile(Long documentId); + + public DocumentResponseBean updateDocument(HttpServletRequest httpServletRequest, Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum); + + public DocumentResponseBean getDocument(HttpServletRequest httpServletRequest,Long documentId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/EvaluationCriteriaService.java b/src/main/java/net/gepafin/tendermanagement/service/EvaluationCriteriaService.java new file mode 100644 index 00000000..3c1e2b85 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/EvaluationCriteriaService.java @@ -0,0 +1,16 @@ +package net.gepafin.tendermanagement.service; + +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.model.request.EvaluationCriteriaRequest; +import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; + +public interface EvaluationCriteriaService { + + public EvaluationCriteriaResponseBean createEvaluationCriteria(HttpServletRequest request,EvaluationCriteriaRequest evaluationCriteriaRequest); + + public EvaluationCriteriaResponseBean getEvaluationCriteria(HttpServletRequest request,Long id); + + public EvaluationCriteriaResponseBean updateEvaluationCriteria(HttpServletRequest request,Long id, EvaluationCriteriaRequest evaluationCriteriaRequest); + + public void deleteEvaluationCriteria(HttpServletRequest request,Long id); +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/FaqService.java b/src/main/java/net/gepafin/tendermanagement/service/FaqService.java new file mode 100644 index 00000000..58ca8234 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/FaqService.java @@ -0,0 +1,15 @@ +package net.gepafin.tendermanagement.service; +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.model.request.FaqReq; +import net.gepafin.tendermanagement.model.response.FaqResponseBean; + +public interface FaqService { + + FaqResponseBean createFaq(HttpServletRequest request,Long callId, FaqReq faqRequest); + + FaqResponseBean getFaqById(HttpServletRequest request, Long id); + + FaqResponseBean updateFaq(HttpServletRequest request, Long id, FaqReq faqRequest); + + void deleteFaq(HttpServletRequest request, Long id); +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java new file mode 100644 index 00000000..c7fde0f6 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java @@ -0,0 +1,20 @@ +package net.gepafin.tendermanagement.service; + +import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.request.LookUpDataRequest; +import net.gepafin.tendermanagement.model.response.LookUpDataResponseBean; + +import java.util.List; + +public interface LookUpDataService { + + LookUpDataResponseBean createLookUpData(LookUpDataRequest lookUpDataReq); + + LookUpDataResponseBean getLookUpDataById(Long id); + + LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq); + + void deleteLookUpData(Long id); + + List getLookUpDataByType(LookUpDataTypeEnum type); +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/RegionService.java b/src/main/java/net/gepafin/tendermanagement/service/RegionService.java index 2288fa17..02551552 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/RegionService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/RegionService.java @@ -14,7 +14,7 @@ public interface RegionService { RegionResponseBean updateRegion(Long regionId, RegionReq regionReq); - RegionEntity getRegionById(Long regionId); + RegionResponseBean getRegionById(Long regionId); void deleteRegion(Long regionId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/RoleService.java b/src/main/java/net/gepafin/tendermanagement/service/RoleService.java index 448197b4..d0da5c48 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/RoleService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/RoleService.java @@ -11,7 +11,7 @@ public interface RoleService { RoleResponseBean updateRole(Long roleId, RoleReq roleReq); - RoleEntity getRoleById(Long roleId); + RoleResponseBean getRoleById(Long roleId); void deleteRole(Long roleId); diff --git a/src/main/java/net/gepafin/tendermanagement/service/UserService.java b/src/main/java/net/gepafin/tendermanagement/service/UserService.java index 68912240..7764c98f 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java @@ -1,8 +1,13 @@ package net.gepafin.tendermanagement.service; +import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.model.request.LoginReq; import net.gepafin.tendermanagement.model.request.UpdateUserReq; import net.gepafin.tendermanagement.model.request.UserReq; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import net.gepafin.tendermanagement.enums.UserStatusEnum; +import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; @@ -16,4 +21,16 @@ public interface UserService { void deleteUser(Long userId); JWTToken login(LoginReq loginReq); + + UserEntity validateUser(Long userId); + + String initiatePasswordReset(InitiatePasswordResetReq resetReq); + + Boolean resetPassword(ResetPasswordReq resetPasswordReq); + + Boolean changePassword(ChangePasswordRequest request); + + void logoutUser(HttpServletRequest request, HttpServletResponse response); + + UserResponseBean updateUserStatus(Long userId, UserStatusEnum statusReq); } 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 6955edf4..62ead6f2 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java @@ -1,5 +1,7 @@ package net.gepafin.tendermanagement.service.impl; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.gepafin.tendermanagement.config.Translator; import net.gepafin.tendermanagement.config.jwt.TokenProvider; import net.gepafin.tendermanagement.constants.GepafinConstant; @@ -7,6 +9,7 @@ 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; @@ -21,7 +24,9 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; import org.springframework.stereotype.Service; + import java.time.LocalDateTime; @Service @@ -54,8 +59,8 @@ public class AuthenticationService { UserEntity user = userRepository.findByEmailIgnoreCase(loginReq.getEmail()).orElseThrow(()-> new CustomValidationException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG))); if (Boolean.FALSE.equals(UserStatusEnum.ACTIVE.getValue().equals(user.getStatus()))) { - new CustomValidationException(Status.NOT_FOUND, - Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); + throw new CustomValidationException(Status.NOT_FOUND, + Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); } user.setLastLogin(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); userRepository.save(user); @@ -67,10 +72,10 @@ public class AuthenticationService { JWTToken jwtToken = new JWTToken(token, loginResponse); - log.info("Login successful for email: {}", loginReq.getEmail()); - return jwtToken; - } - + log.info("Login successful for email: {}", loginReq.getEmail()); + return jwtToken; + } + private static LoginResponse getLoginResponse(UserEntity user, RoleResponseBean roleResponseBean) { LoginResponse loginResponse = new LoginResponse(); loginResponse.setId(user.getId()); @@ -89,5 +94,15 @@ public class AuthenticationService { loginResponse.setUpdatedDate(user.getUpdatedDate()); return loginResponse; } + public void logout(HttpServletRequest request, HttpServletResponse response) + { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth != null) { + String token = tokenProvider.extractTokenFromRequest(request); + tokenProvider.invalidateToken(token); + new SecurityContextLogoutHandler().logout(request, response, auth); + } + SecurityContextHolder.getContext().setAuthentication(null); + SecurityContextHolder.clearContext(); +} } 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 58ee7be2..27421fb2 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java @@ -6,11 +6,15 @@ import net.gepafin.tendermanagement.dao.CallDao; import net.gepafin.tendermanagement.entities.CallEntity; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; -import net.gepafin.tendermanagement.model.response.CreateCallResponseBean; +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.service.CallService; 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.Map; @@ -24,15 +28,43 @@ public class CallServiceImpl implements CallService { private TokenProvider tokenProvider; @Override - public CreateCallResponseBean createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest) { + @Transactional(rollbackFor = Exception.class) + public CallResponse createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest) { Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); return callDao.createCallStep1(createCallRequest, Long.parseLong(userInfo.get("userId").toString())); } @Override - public CreateCallResponseBean createCallStep2(HttpServletRequest request, CreateCallRequestStep2 createCallRequest) { + @Transactional(rollbackFor = Exception.class) + public CallResponse createCallStep2(HttpServletRequest request, Long callId, CreateCallRequestStep2 createCallRequest) { Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); - return callDao.createCallStep2(createCallRequest, Long.parseLong(userInfo.get("userId").toString())); + return callDao.createCallStep2(callId, createCallRequest, Long.parseLong(userInfo.get("userId").toString())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public CallResponse updateCallStep1(HttpServletRequest request, Long callId, + UpdateCallRequestStep1 updateCallRequest) { + Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); + return callDao.updateCallStep1(callId, updateCallRequest, Long.parseLong(userInfo.get("userId").toString())); + } + @Override + @Transactional(readOnly = true) + public CallResponse getCallById(Long callId) { + return callDao.getCallById(callId); + } + + @Override + @Transactional(readOnly = true) + public List getAllCalls() { + return callDao.getAllCalls(); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public CallResponse validateCall(Long callId) { + return callDao.validateCall(callDao.validateCall(callId)); } @Override diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java new file mode 100644 index 00000000..d2079cdf --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallValidatorServiceImpl.java @@ -0,0 +1,31 @@ +package net.gepafin.tendermanagement.service.impl; + +import net.gepafin.tendermanagement.model.response.CallResponse; +import net.gepafin.tendermanagement.util.FieldValidator; + +public class CallValidatorServiceImpl { + + public static void validateResponse(CallResponse response) { + FieldValidator.create() + .notNull(response.getId(), "id") + .notNull(response.getName(), "name") + .notNull(response.getDescriptionShort(), "descriptionShort") + .notNull(response.getDescriptionLong(), "descriptionLong") + .notNull(response.getStartDate(), "startDate") + .notNull(response.getEndDate(), "endDate") + .notNull(response.getStatus(), "status") + .notNull(response.getRegionId(), "regionId") + .notNull(response.getAmount(), "amount") + .notNull(response.getAmountMax(), "amountMax") + .notNull(response.getThreshold(), "threshold") + .notNull(response.getDocumentationReqested(), "documentationReqested") + .notEmpty(response.getAimedTo(), "aimedTo") + .notEmpty(response.getCriteria(), "criteria") + .notEmpty(response.getDocs(), "docs") + .notEmpty(response.getFaq(), "faq") + .notEmpty(response.getImages(), "images") + .notEmpty(response.getCheckList(), "checkList") + .validate(); + } + +} 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 55c6165b..15e278bf 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/DocumentServiceImpl.java @@ -2,28 +2,41 @@ package net.gepafin.tendermanagement.service.impl; import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - +import jakarta.servlet.http.HttpServletRequest; import net.gepafin.tendermanagement.dao.DocumentDao; import net.gepafin.tendermanagement.enums.DocumentTypeEnum; import net.gepafin.tendermanagement.model.response.DocumentResponseBean; import net.gepafin.tendermanagement.service.DocumentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + + @Service public class DocumentServiceImpl implements DocumentService { @Autowired - private DocumentDao fileDao; + private DocumentDao documentDao; @Override - public List uploadFile(List files, DocumentTypeEnum fileType) { - return fileDao.uploadFiles(files,fileType); + public List uploadFile(List files,Long callId,DocumentTypeEnum fileType) { + return documentDao.uploadFiles(files,callId,fileType); } @Override public void deleteFile(Long documentId){ - fileDao.deleteFile(documentId); + documentDao.deleteFile(documentId); + return ; + } + + @Override + public DocumentResponseBean updateDocument(HttpServletRequest httpServletRequest, Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { + return documentDao.updateDocument(documentId,file,documentTypeEnum); + } + + @Override + public DocumentResponseBean getDocument(HttpServletRequest httpServletRequest, Long documentId) { + return documentDao.getDocument(documentId); } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/EvaluationCriteriaServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/EvaluationCriteriaServiceImpl.java new file mode 100644 index 00000000..2aef9e5f --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/EvaluationCriteriaServiceImpl.java @@ -0,0 +1,36 @@ +package net.gepafin.tendermanagement.service.impl; + +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.dao.EvaluationCriteriaDao; +import net.gepafin.tendermanagement.model.request.EvaluationCriteriaRequest; +import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; +import net.gepafin.tendermanagement.service.EvaluationCriteriaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class EvaluationCriteriaServiceImpl implements EvaluationCriteriaService { + + @Autowired + private EvaluationCriteriaDao evaluationCriteriaDao; + + @Override + public EvaluationCriteriaResponseBean createEvaluationCriteria(HttpServletRequest request,EvaluationCriteriaRequest evaluationCriteriaRequest) { + return evaluationCriteriaDao.createEvaluationCriteria(evaluationCriteriaRequest); + } + + @Override + public EvaluationCriteriaResponseBean getEvaluationCriteria(HttpServletRequest request,Long id) { + return evaluationCriteriaDao.getEvaluationCriteriaById(id); + } + + @Override + public EvaluationCriteriaResponseBean updateEvaluationCriteria(HttpServletRequest request,Long id, EvaluationCriteriaRequest evaluationCriteriaRequest) { + return evaluationCriteriaDao.updateEvaluationCriteria(id,evaluationCriteriaRequest); + } + + @Override + public void deleteEvaluationCriteria(HttpServletRequest request,Long id) { + evaluationCriteriaDao.deleteEvaluationCriteria(id); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/FaqServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/FaqServiceImpl.java new file mode 100644 index 00000000..252935f2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/FaqServiceImpl.java @@ -0,0 +1,44 @@ +package net.gepafin.tendermanagement.service.impl; +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.config.jwt.TokenProvider; +import net.gepafin.tendermanagement.dao.FaqDao; +import net.gepafin.tendermanagement.model.request.FaqReq; +import net.gepafin.tendermanagement.model.response.FaqResponseBean; +import net.gepafin.tendermanagement.service.FaqService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class FaqServiceImpl implements FaqService { + + @Autowired + private FaqDao faqDao; + + @Autowired + private TokenProvider tokenProvider; + + @Override + public FaqResponseBean createFaq(HttpServletRequest request,Long callId, FaqReq faqRequest) { + Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); + return faqDao.createFaq(faqRequest,Long.parseLong(userInfo.get("userId").toString()),callId); + } + + @Override + public FaqResponseBean getFaqById(HttpServletRequest request, Long id) { + return faqDao.getFaqById(id); + } + + @Override + public FaqResponseBean updateFaq(HttpServletRequest request, Long id, FaqReq faqRequest) { + Map userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request); + return faqDao.updateFaq(id, faqRequest,Long.parseLong(userInfo.get("userId").toString())); + } + + @Override + public void deleteFaq(HttpServletRequest request, Long id) { + faqDao.deleteFaq(id); + } +} + diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java new file mode 100644 index 00000000..bba01b91 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java @@ -0,0 +1,42 @@ +package net.gepafin.tendermanagement.service.impl; + +import net.gepafin.tendermanagement.dao.LookUpDataDao; +import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.request.LookUpDataRequest; +import net.gepafin.tendermanagement.model.response.LookUpDataResponseBean; +import net.gepafin.tendermanagement.service.LookUpDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class LookUpDataServiceImpl implements LookUpDataService { + + @Autowired + private LookUpDataDao lookUpDataDao; + + @Override + public LookUpDataResponseBean createLookUpData(LookUpDataRequest lookUpDataReq) { + return lookUpDataDao.createLookUpData(lookUpDataReq); + } + + @Override + public LookUpDataResponseBean getLookUpDataById(Long id) { + return lookUpDataDao.getLookUpDataById(id); + } + + @Override + public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) { + return lookUpDataDao.updateLookUpData(id, lookUpDataReq); + } + + @Override + public void deleteLookUpData(Long id) { + lookUpDataDao.deleteLookUpData(id); + } + @Override + public List getLookUpDataByType(LookUpDataTypeEnum type) { + return lookUpDataDao.getLookUpDataByType(type); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/RegionServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/RegionServiceImpl.java index 345362d3..cd6776a9 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/RegionServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/RegionServiceImpl.java @@ -3,10 +3,8 @@ package net.gepafin.tendermanagement.service.impl; import java.util.List; import net.gepafin.tendermanagement.dao.RegionDao; -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.service.RegionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,7 +30,7 @@ public class RegionServiceImpl implements RegionService { @Override @Transactional(readOnly = true) - public RegionEntity getRegionById(Long regionId) { + public RegionResponseBean getRegionById(Long regionId) { return regionDao.getRegionById(regionId); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/RoleServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/RoleServiceImpl.java index 9f66415a..49fd86c4 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/RoleServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/RoleServiceImpl.java @@ -3,7 +3,6 @@ package net.gepafin.tendermanagement.service.impl; import java.util.List; import net.gepafin.tendermanagement.dao.RoleDao; -import net.gepafin.tendermanagement.entities.RoleEntity; import net.gepafin.tendermanagement.model.request.RoleReq; import net.gepafin.tendermanagement.model.response.RoleResponseBean; import net.gepafin.tendermanagement.service.RoleService; @@ -31,7 +30,7 @@ public class RoleServiceImpl implements RoleService { @Override @Transactional(readOnly = true) - public RoleEntity getRoleById(Long roleId) { + public RoleResponseBean getRoleById(Long roleId) { return roleDao.getRoleById(roleId); } 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 c6205aae..bb2446b7 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java @@ -1,10 +1,14 @@ package net.gepafin.tendermanagement.service.impl; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.gepafin.tendermanagement.dao.UserDao; +import net.gepafin.tendermanagement.entities.UserEntity; import net.gepafin.tendermanagement.model.request.LoginReq; import net.gepafin.tendermanagement.model.request.UpdateUserReq; import net.gepafin.tendermanagement.model.request.UserReq; -import net.gepafin.tendermanagement.model.response.LoginResponse; +import net.gepafin.tendermanagement.enums.UserStatusEnum; +import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; import net.gepafin.tendermanagement.service.UserService; @@ -12,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.format.DateTimeFormatter; @Service public class UserServiceImpl implements UserService { @@ -49,5 +52,33 @@ public class UserServiceImpl implements UserService { return userDao.login(loginReq); } + + @Override + public UserEntity validateUser(Long userId) { + return userDao.validateUser(userId); + } + @Override + public String initiatePasswordReset(InitiatePasswordResetReq resetReq) { + return userDao.initiatePasswordReset(resetReq); + } + + @Override + public Boolean resetPassword(ResetPasswordReq resetPasswordReq) { + return userDao.resetPassword(resetPasswordReq); + } + @Override + public Boolean changePassword(ChangePasswordRequest request){ + return userDao.changePassword(request); + } + @Override + public void logoutUser(HttpServletRequest request, HttpServletResponse response) { + userDao.logout(request,response); + } + @Override + @Transactional(rollbackFor = Exception.class) + public UserResponseBean updateUserStatus(Long userId, UserStatusEnum statusReq) { + return userDao.updateUserStatus(userId, statusReq); + + } } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java new file mode 100644 index 00000000..e57909d2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java @@ -0,0 +1,40 @@ +package net.gepafin.tendermanagement.util; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import net.gepafin.tendermanagement.web.rest.api.errors.ValidationException; + +public class FieldValidator { + + private final List errors = new ArrayList<>(); + + public static FieldValidator create() { + return new FieldValidator(); + } + + public FieldValidator notNull(Object object, String fieldName) { + if (Objects.isNull(object)) { + errors.add(MessageFormat.format(Translator.toLocale(GepafinConstant.FIELD_NOT_NULL), fieldName)); + } + return this; + } + + public FieldValidator notEmpty(List list, String fieldName) { + if (list == null || list.isEmpty()) { + errors.add(MessageFormat.format(Translator.toLocale(GepafinConstant.FIELD_NOT_EMPTY), fieldName)); + } + return this; + } + + public void validate() { + if (!errors.isEmpty()) { + throw new ValidationException(Status.VALIDATION_ERROR, errors); + } + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/util/ObjectUtils.java b/src/main/java/net/gepafin/tendermanagement/util/ObjectUtils.java deleted file mode 100644 index 1f7d1215..00000000 --- a/src/main/java/net/gepafin/tendermanagement/util/ObjectUtils.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.gepafin.tendermanagement.util; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -public class ObjectUtils { - - public static void setIfNotNull(Consumer setter, T value) { - if (value != null) { - setter.accept(value); - } - } - public static void setIfUpdated(Supplier getter, Consumer setter, T newValue) { - T currentValue = getter.get(); - if (newValue != null && !newValue.equals(currentValue)) { - setter.accept(newValue); - } - } - -} diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java index 21392d61..d0cba04c 100644 --- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java +++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java @@ -10,6 +10,8 @@ import org.slf4j.LoggerFactory; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; import java.util.stream.Collectors; public class Utils { @@ -68,5 +70,17 @@ public class Utils { byte[] decode = Base64.getDecoder().decode(decodedString.getBytes(StandardCharsets.UTF_8)); return new String(decode, StandardCharsets.UTF_8); } + + public static void setIfNotNull(Consumer setter, T value) { + if (value != null) { + setter.accept(value); + } + } + public static void setIfUpdated(Supplier getter, Consumer setter, T newValue) { + T currentValue = getter.get(); + if (newValue != null && !newValue.equals(currentValue)) { + setter.accept(newValue); + } + } } 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 3da8bab6..1b4771a8 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 @@ -1,5 +1,17 @@ package net.gepafin.tendermanagement.web.rest.api; +import java.util.List; + +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +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; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; @@ -9,15 +21,11 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1; import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; -import net.gepafin.tendermanagement.model.response.CreateCallResponseBean; +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.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.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; @Validated public interface CallApi { @@ -34,7 +42,7 @@ public interface CallApi { }) @PostMapping(value = "/step1", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") - public ResponseEntity> createCallStep1(HttpServletRequest request, + public ResponseEntity> createCallStep1(HttpServletRequest request, @Parameter(description = "Call request object", required = true) @Valid @RequestBody CreateCallRequestStep1 createCallRequest); @@ -48,10 +56,69 @@ public interface CallApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) - @PostMapping(value = "/step2", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @PutMapping(value = "/step2/{callId}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") - public ResponseEntity> createCallStep2(HttpServletRequest request, - @Parameter(description = "Call request object", required = true) - @Valid @RequestBody CreateCallRequestStep2 createCallRequest); + public ResponseEntity> createCallStep2(HttpServletRequest request, + @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId, + @Parameter(description = "Call request object", required = true) @Valid @RequestBody CreateCallRequestStep2 createCallRequest); + + @Operation(summary = "Api to update call step 1", + 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 = "/step1/{callId}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + 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", + 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 = "/{callId}", + produces = { "application/json" }) + ResponseEntity> getCallById( + @Parameter(description = "The call ID", required = true) @PathVariable("callId") Long callId); + + + @Operation(summary = "Api to get all calls", + 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>> getAllCalls(); + + + @Operation(summary = "Api to validate call", + 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 = "/validate/{callId}", produces = MediaType.APPLICATION_JSON_VALUE) + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + public ResponseEntity> validateCall(HttpServletRequest request, + @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/DocumentApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/DocumentApi.java index 4c3386c6..a9354dbf 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/DocumentApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/DocumentApi.java @@ -1,6 +1,7 @@ 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; @@ -27,14 +28,12 @@ public interface DocumentApi { @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 = "/uploadFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - default ResponseEntity>> uploadFile(HttpServletRequest httpServletRequest, - @RequestParam("file") List files, - @RequestParam("documentType") DocumentTypeEnum documentTypeEnum) { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) }))}) + @PostMapping(value = "/uploadFile/call/{callId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + default ResponseEntity>> uploadFile(HttpServletRequest httpServletRequest, @Parameter(description = "call id", required = true) @PathVariable Long callId, @RequestParam("file") List files, @RequestParam("documentType") DocumentTypeEnum documentTypeEnum) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } + @Operation(summary = "API to delete a file by document id", responses = { @ApiResponse(responseCode = "200", description = "File deleted successfully"), @@ -50,4 +49,30 @@ public interface DocumentApi { @RequestParam( "id") Long id) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } + @Operation(summary = "Api to update document", + 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 = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + default ResponseEntity> updateDocument(HttpServletRequest httpServletRequest, @Parameter(description = "document id", required = true) @PathVariable Long documentId, @RequestParam("file") MultipartFile file, @RequestParam("documentType") DocumentTypeEnum documentTypeEnum) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } + @Operation(summary = "API to get document 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) })) + }) + @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> getDocumentById(HttpServletRequest request, + @Parameter(description = "document id", required = true) + @PathVariable Long id); + } 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 new file mode 100644 index 00000000..c102f42a --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.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.model.request.EvaluationCriteriaRequest; +import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; +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.web.bind.annotation.*; + +public interface EvaluationCriteriaApi { + + + @Operation(summary = "Api to create evaluation criteria", + 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 = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> createEvaluationCriteria(HttpServletRequest request, + @Parameter(description = "Evaluation criteria request object", required = true) + @Valid @RequestBody EvaluationCriteriaRequest createCallRequest); + + @Operation(summary = "Api to get evaluation criteria 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) })) + }) + @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity> getEvaluationCriteriaById(HttpServletRequest request, + @Parameter(description = "evaluation criteria id", required = true) + @PathVariable Long id); + + @Operation(summary = "API to update evaluation criteria", + 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 = "/{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, + @Parameter(description = "Evaluation criteria request object", required = true) + @Valid @RequestBody EvaluationCriteriaRequest evaluationCriteriaRequest); + + @Operation(summary = "API to delete evaluation criteria", + responses = { + @ApiResponse(responseCode = "204", description = "No Content"), + @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) })) + }) + @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity deleteEvaluationCriteria(HttpServletRequest request, + @Parameter(description = "evaluation criteria id", required = true) + @PathVariable 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 new file mode 100644 index 00000000..2d76f286 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java @@ -0,0 +1,57 @@ +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 net.gepafin.tendermanagement.model.request.FaqReq; +import net.gepafin.tendermanagement.model.response.FaqResponseBean; +import net.gepafin.tendermanagement.model.util.Response; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; +import javax.validation.Valid; + +public interface FaqApi { + + @Operation(summary = "API to create FAQ", + responses = { + @ApiResponse(responseCode = "201", description = "Created"), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Bad Request\" }"))), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Unauthorized\" }"))), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Not Found\" }"))) + }) + @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); + + @Operation(summary = "API to get FAQ by id", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Not Found\" }"))) + }) + @GetMapping(value = "/{id}", produces = "application/json") + ResponseEntity> getFaqById(HttpServletRequest request, + @PathVariable Long id); + + @Operation(summary = "API to update FAQ", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Not Found\" }"))), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Bad Request\" }"))) + }) + @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json") + ResponseEntity> updateFaq(HttpServletRequest request, + @PathVariable Long id, + @Valid @RequestBody FaqReq faqRequest); + + @Operation(summary = "API to delete FAQ", + responses = { + @ApiResponse(responseCode = "204", description = "No Content"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = "application/json", examples = @ExampleObject(value = "{ \"error\": \"Not Found\" }"))) + }) + @DeleteMapping(value = "/{id}") + ResponseEntity> deleteFaq(HttpServletRequest request, + @PathVariable 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 new file mode 100644 index 00000000..5497d9a4 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java @@ -0,0 +1,81 @@ +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 net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.request.LookUpDataRequest; +import net.gepafin.tendermanagement.model.response.LookUpDataResponseBean; +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.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; + +public interface LookUpDataApi { + + @Operation(summary = "Api to create LookUp Data", + 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 = "", consumes = "application/json", produces = "application/json") + ResponseEntity> createLookUpData(HttpServletRequest request, @Valid @RequestBody LookUpDataRequest lookUpDataReq); + + @Operation(summary = "Api to get LookUp Data 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)}))}) + @GetMapping(value = "/{id}", produces = "application/json") + ResponseEntity> getLookUpDataById(HttpServletRequest request, @PathVariable Long id); + + @Operation(summary = "Api to update LookUp Data", + 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 = "/{id}", consumes = "application/json", produces = "application/json") + ResponseEntity> updateLookUpData(HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq); + + @Operation(summary = "Api to delete LookUp Data", + responses = { + @ApiResponse(responseCode = "204", description = "No Content"), + @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 = "/{id}") + ResponseEntity> deleteLookUpData(HttpServletRequest request, @PathVariable Long id); + + @Operation(summary = "Api to get LookUp Data 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 = "/type", produces = "application/json") + ResponseEntity>> getLookUpDataByType(HttpServletRequest request, @RequestParam LookUpDataTypeEnum type); +} 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 3c9237a6..d49924a0 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 @@ -61,7 +61,7 @@ public interface RegionApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @GetMapping(value = "/{regionId}", produces = "application/json") - ResponseEntity> getRegionById( + ResponseEntity> getRegionById( @Parameter(description = "The region id", required = true) @PathVariable("regionId") Long regionId); @Operation(summary = "Api to get all regions", 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 7225d87e..04bff191 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 @@ -62,7 +62,7 @@ public interface RoleApi { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @GetMapping(value = "/{roleId}", produces = { "application/json" }) - ResponseEntity> getRoleById( + ResponseEntity> getRoleById( @Parameter(description = "The role ID", required = true) @PathVariable("roleId") Long roleId); @Operation(summary = "Api to get all roles", 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 cca0b247..c60cef58 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 @@ -5,10 +5,12 @@ 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.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; -import net.gepafin.tendermanagement.model.request.LoginReq; -import net.gepafin.tendermanagement.model.request.UpdateUserReq; -import net.gepafin.tendermanagement.model.request.UserReq; +import net.gepafin.tendermanagement.entities.UserEntity; +import net.gepafin.tendermanagement.enums.UserStatusEnum; +import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; import net.gepafin.tendermanagement.model.util.Response; @@ -18,10 +20,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.*; @Validated public interface UserApi { @@ -105,4 +104,77 @@ public interface UserApi { method = RequestMethod.POST) ResponseEntity> login( @Parameter(description = "Login request object", required = true) @Valid @RequestBody LoginReq loginReq); + @Operation(summary = "Api to initiate password reset request", + 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)}))}) + @RequestMapping(value = "/reset-password/initiate", + produces = {"application/json"}, + method = RequestMethod.POST) + ResponseEntity> initiatePasswordReset( + @Parameter(description = "Initiate password reset request object", required = true) @Valid @RequestBody InitiatePasswordResetReq initiatePasswordResetReq); + + @Operation(summary = "Api to reset password", + 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)}))}) + @RequestMapping(value = "/reset-password", + produces = {"application/json"}, + method = RequestMethod.POST) + ResponseEntity> resetPassword( + @Parameter(description = "Reset password request object", required = true) @Valid @RequestBody ResetPasswordReq resetPasswordReq); + @Operation(summary = "Api to change user password", + responses = { + @ApiResponse(responseCode = "200", description = "Password Changed Successfully", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = "{ \"message\": \"Password changed successfully.\" }")})), + @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)}))}) + @RequestMapping(value = "/change-password", + produces = {"application/json"}, + method = RequestMethod.POST) + ResponseEntity> changePassword( + @Parameter(description = "Change password request object", required = true) @Valid @RequestBody ChangePasswordRequest changePasswordRequest); @Operation(summary = "Api to logout user", + 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)}))}) + @RequestMapping(value = "/logout", + method = RequestMethod.POST) + ResponseEntity> logoutUser( + @Parameter(description = "The request object is not needed for logout", required = false) HttpServletRequest request, + @Parameter(description = "The response object is not needed for logout", required = false) HttpServletResponse response); + @Operation(summary = "Api to update user active/deactive 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)})) + }) + @RequestMapping(value = "/{userId}/status", + produces = {"application/json"}, + method = RequestMethod.PUT) + @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") + default ResponseEntity> updateUserStatus( + @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, + @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) UserStatusEnum status) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } + + } + diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/ValidationException.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/ValidationException.java new file mode 100644 index 00000000..855177db --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/errors/ValidationException.java @@ -0,0 +1,27 @@ +package net.gepafin.tendermanagement.web.rest.api.errors; + +import java.util.List; + +public class ValidationException extends CustomValidationException { + + private final Status status; + private static final long serialVersionUID = 1L; + private final List errors; + + public ValidationException(Status status, List errors) { + super(status, errors.toString()); + this.errors = errors; + this.status = status; + } + + + public List getErrors() { + return errors; + } + + public Status getStatus() { + return status; + } + + +} 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 0ff654bc..7c96aa7e 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 @@ -1,15 +1,7 @@ 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.model.request.CreateCallRequestStep1; -import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2; -import net.gepafin.tendermanagement.model.response.CreateCallResponseBean; -import net.gepafin.tendermanagement.model.util.Response; -import net.gepafin.tendermanagement.service.CallService; -import net.gepafin.tendermanagement.web.rest.api.CallApi; -import net.gepafin.tendermanagement.web.rest.api.errors.Status; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,6 +9,19 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletRequest; +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +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.util.Response; +import net.gepafin.tendermanagement.service.CallService; +import net.gepafin.tendermanagement.web.rest.api.CallApi; +import net.gepafin.tendermanagement.web.rest.api.errors.Status; + @RestController @RequestMapping("${openapi.gepafin.base-path:/v1/call}") @@ -28,17 +33,49 @@ public class CallApiController implements CallApi { @Override @Transactional(rollbackFor=Exception.class) - public ResponseEntity> createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest) { - CreateCallResponseBean createCallResponseBean = callService.createCallStep1(request, createCallRequest); + public ResponseEntity> createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest) { + CallResponse createCallResponseBean = callService.createCallStep1(request, createCallRequest); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response<>(createCallResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_CREATED_SUCCESSFULLY_MSG))); } @Override @Transactional(rollbackFor=Exception.class) - public ResponseEntity> createCallStep2(HttpServletRequest request, CreateCallRequestStep2 createCallRequest) { - CreateCallResponseBean createCallResponseBean = callService.createCallStep2(request, createCallRequest); + public ResponseEntity> createCallStep2(HttpServletRequest request, Long callId, CreateCallRequestStep2 createCallRequest) { + CallResponse createCallResponseBean = callService.createCallStep2(request, callId, createCallRequest); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response<>(createCallResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_CREATED_SUCCESSFULLY_MSG))); } + + @Override + @Transactional(rollbackFor=Exception.class) + public ResponseEntity> updateCallStep1(HttpServletRequest request, Long callId, UpdateCallRequestStep1 updateCallRequest) { + CallResponse createCallResponseBean = callService.updateCallStep1(request, callId, updateCallRequest); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response<>(createCallResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_UPDATE_SUCCESSFULLY_MSG))); + } + @Override + @Transactional(readOnly = true) + public ResponseEntity> getCallById(Long callId) { + CallResponse createCallResponseBean = callService.getCallById(callId); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(createCallResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_FETCH_SUCCESS_MSG))); + } + + @Override + @Transactional(readOnly = true) + public ResponseEntity>> getAllCalls() { + List calls = callService.getAllCalls(); + + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(calls, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_FETCH_SUCCESS_MSG))); + + } + @Override + public ResponseEntity> validateCall(HttpServletRequest request, Long callId) { + CallResponse call = callService.validateCall(callId); + + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(call, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_FETCH_SUCCESS_MSG))); + } } \ No newline at end of file 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 d4a151b0..5f986716 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 @@ -20,16 +20,17 @@ import java.util.List; @RestController @RequestMapping("${openapi.swaggerBflowsMiddleware.base-path:/v1/document}") -public class DocumentApiController implements DocumentApi { +public class +DocumentApiController implements DocumentApi { @Autowired - private DocumentService fileService; + private DocumentService documentService; @Override - public ResponseEntity>> uploadFile(HttpServletRequest httpServletRequest, - List files, DocumentTypeEnum fileType) { + public ResponseEntity>> uploadFile(HttpServletRequest httpServletRequest, Long callId, + List files, DocumentTypeEnum fileType) { try { - List responseBeans=fileService.uploadFile(files,fileType); + List responseBeans = documentService.uploadFile(files, callId, fileType); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response>(responseBeans, Status.SUCCESS, Translator.toLocale(GepafinConstant.FILES_UPLOADED_MSG))); } catch (CustomValidationException ex) { @@ -38,8 +39,22 @@ public class DocumentApiController implements DocumentApi { } @Override public ResponseEntity> deleteFile(HttpServletRequest httpServletRequest, Long documentId) { - fileService.deleteFile(documentId); + documentService.deleteFile(documentId); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.FILE_DELETED_SUCCESSFULLY_MSG))); - } + } + + @Override + public ResponseEntity> updateDocument(HttpServletRequest httpServletRequest, Long documentId, MultipartFile file, DocumentTypeEnum documentTypeEnum) { + DocumentResponseBean responseBeans = documentService.updateDocument(httpServletRequest, documentId, file, documentTypeEnum); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response(responseBeans, Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPDATED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> getDocumentById(HttpServletRequest request, Long id) { + DocumentResponseBean documentResponseBean= documentService.getDocument(request,id); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response(documentResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_FETCHED_SUCCESSFULLY))); } +} \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/EvaluationCriteriaApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/EvaluationCriteriaApiController.java new file mode 100644 index 00000000..6c6286ae --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/EvaluationCriteriaApiController.java @@ -0,0 +1,66 @@ +package net.gepafin.tendermanagement.web.rest.api.impl; + +import net.gepafin.tendermanagement.config.Translator; +import net.gepafin.tendermanagement.constants.GepafinConstant; +import net.gepafin.tendermanagement.model.request.EvaluationCriteriaRequest; +import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.service.EvaluationCriteriaService; +import net.gepafin.tendermanagement.web.rest.api.EvaluationCriteriaApi; +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 jakarta.servlet.http.HttpServletRequest; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/evaluationCriteria}") +public class EvaluationCriteriaApiController implements EvaluationCriteriaApi { + + @Autowired + private EvaluationCriteriaService service; + + @Override + public ResponseEntity> createEvaluationCriteria(HttpServletRequest request, EvaluationCriteriaRequest evaluationCriteriaRequest) { + EvaluationCriteriaResponseBean responseBean = service.createEvaluationCriteria(request,evaluationCriteriaRequest); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response<>(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_CREATED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> getEvaluationCriteriaById(HttpServletRequest request, Long id) { + EvaluationCriteriaResponseBean responseBean = service.getEvaluationCriteria(request,id); + if (responseBean != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_FETCH_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response<>(null, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); + } + } + + @Override + @Transactional(rollbackFor=Exception.class) + public ResponseEntity> updateEvaluationCriteria(HttpServletRequest request, Long id, EvaluationCriteriaRequest evaluationCriteriaRequest) { + EvaluationCriteriaResponseBean responseBean = service.updateEvaluationCriteria(request,id, evaluationCriteriaRequest); + if (responseBean != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_UPDATED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response<>(null, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND))); + } + } + + @Override + public ResponseEntity deleteEvaluationCriteria(HttpServletRequest request, Long id) { + service.deleteEvaluationCriteria(request,id); + return ResponseEntity.status(HttpStatus.OK) + .header("Message", Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_DELETED_SUCCESSFULLY)) + .build(); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/FaqApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/FaqApiController.java new file mode 100644 index 00000000..142e5614 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/FaqApiController.java @@ -0,0 +1,61 @@ +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.model.request.FaqReq; +import net.gepafin.tendermanagement.model.response.FaqResponseBean; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.service.FaqService; +import net.gepafin.tendermanagement.web.rest.api.FaqApi; +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; + +@RestController +@RequestMapping("${openapi.gepafin.base-path:/v1/faq}") +public class FaqApiController implements FaqApi { + + @Autowired + private FaqService faqService; + + @Override + public ResponseEntity> createFaq(HttpServletRequest request, Long callId,FaqReq faqRequest) { + FaqResponseBean response = faqService.createFaq(request,callId, faqRequest); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.FAQ_CREATED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> getFaqById(HttpServletRequest request, Long id) { + FaqResponseBean response = faqService.getFaqById(request, id); + if (response != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.FAQ_FETCHED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response<>(null, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + } + } + + @Override + public ResponseEntity> updateFaq(HttpServletRequest request, Long id, FaqReq faqRequest) { + FaqResponseBean response = faqService.updateFaq(request, id, faqRequest); + if (response != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(response, Status.SUCCESS, Translator.toLocale(GepafinConstant.FAQ_UPDATED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response<>(null, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND))); + } + } + + @Override + public ResponseEntity> deleteFaq(HttpServletRequest request, Long id) { + faqService.deleteFaq(request, id); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.FAQ_DELETED_SUCCESSFULLY))); + } +} diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java new file mode 100644 index 00000000..f07f75e2 --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java @@ -0,0 +1,76 @@ +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.entities.LookUpDataEntity.LookUpDataTypeEnum; +import net.gepafin.tendermanagement.model.request.LookUpDataRequest; +import net.gepafin.tendermanagement.model.response.LookUpDataResponseBean; +import net.gepafin.tendermanagement.model.util.Response; +import net.gepafin.tendermanagement.service.LookUpDataService; +import net.gepafin.tendermanagement.web.rest.api.LookUpDataApi; +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/lookUpData}") +public class LookUpDataApiController implements LookUpDataApi { + + @Autowired + private LookUpDataService lookUpDataService; + + @Override + public ResponseEntity> createLookUpData(HttpServletRequest request, LookUpDataRequest lookUpDataReq) { + LookUpDataResponseBean responseBean = lookUpDataService.createLookUpData(lookUpDataReq); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new Response(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_CREATED_SUCCESSFULLY))); + } + + @Override + public ResponseEntity> getLookUpDataById(HttpServletRequest request, Long id) { + LookUpDataResponseBean responseBean = lookUpDataService.getLookUpDataById(id); + if (responseBean != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_FETCHED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response(responseBean, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + } + } + + @Override + public ResponseEntity> updateLookUpData(HttpServletRequest request, Long id, LookUpDataRequest lookUpDataReq) { + LookUpDataResponseBean responseBean = lookUpDataService.updateLookUpData(id, lookUpDataReq); + if (responseBean != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_UPDATED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response(responseBean, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + } + } + + @Override + public ResponseEntity> deleteLookUpData(HttpServletRequest request, Long id) { + lookUpDataService.deleteLookUpData(id); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_DELETED_SUCCESSFULLY))); + } + @Override + public ResponseEntity>> getLookUpDataByType(HttpServletRequest request, LookUpDataTypeEnum type) { + List responseBean = lookUpDataService.getLookUpDataByType(type); + if (responseBean != null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new Response>(responseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_FETCHED_SUCCESSFULLY))); + } else { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new Response>(responseBean, Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND))); + } + } +} 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 e7387562..c64258e5 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 @@ -52,10 +52,10 @@ public class RegionApiController implements RegionApi { } @Override - public ResponseEntity> getRegionById( + public ResponseEntity> getRegionById( @PathVariable("regionId") Long regionId) { log.info("Get Region by ID - Region ID: {}", regionId); - RegionEntity region = regionService.getRegionById(regionId); + RegionResponseBean region = regionService.getRegionById(regionId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(region, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_REGION_SUCCESS_MSG))); } 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 a720bf3c..4f4c5633 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 @@ -57,11 +57,11 @@ public class RoleApiController implements RoleApi { } @Override - public ResponseEntity> getRoleById(Long roleId) { + public ResponseEntity> getRoleById(Long roleId) { log.info("Get Role by ID - Role ID: {}", roleId); - RoleEntity roleEntity = roleService.getRoleById(roleId); + RoleResponseBean roleResponseBean = roleService.getRoleById(roleId); return ResponseEntity.status(HttpStatus.OK) - .body(new Response<>(roleEntity, Status.SUCCESS, Translator.toLocale(GepafinConstant.ROLE_FETCH_SUCCESS_MSG))); + .body(new Response<>(roleResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.ROLE_FETCH_SUCCESS_MSG))); } @Override 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 f44c2e87..fb4801b7 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 @@ -1,17 +1,19 @@ package net.gepafin.tendermanagement.web.rest.api.impl; +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.model.request.LoginReq; -import net.gepafin.tendermanagement.model.request.UpdateUserReq; -import net.gepafin.tendermanagement.model.request.UserReq; +import net.gepafin.tendermanagement.entities.UserEntity; +import net.gepafin.tendermanagement.enums.UserStatusEnum; +import net.gepafin.tendermanagement.model.request.*; import net.gepafin.tendermanagement.model.response.UserResponseBean; import net.gepafin.tendermanagement.model.util.JWTToken; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.UserService; import net.gepafin.tendermanagement.web.rest.api.UserApi; - import net.gepafin.tendermanagement.web.rest.api.errors.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +29,8 @@ import org.springframework.web.bind.annotation.*; public class UserApiController implements UserApi { private final Logger log = LoggerFactory.getLogger(UserApiController.class); - + @Autowired + private TokenProvider tokenProvider; @Autowired private UserService userService; @@ -74,4 +77,46 @@ public class UserApiController implements UserApi { JWTToken jwtToken = userService.login(loginReq); return ResponseEntity.ok(new Response<>(jwtToken, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOGIN_SUCCESS_MSG))); } -} + @Override + public ResponseEntity> changePassword(@Valid @RequestBody ChangePasswordRequest request) { + log.info("Change Password attempt for email: {}", request.getEmail()); + userService.changePassword(request); + return ResponseEntity.ok(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.SUCCESS_PASSWORD_CHANGED))); + } + @Override + public ResponseEntity> initiatePasswordReset(InitiatePasswordResetReq request) { + log.info("Initiating password reset for email: {}", request.getEmail()); + String resetToken = userService.initiatePasswordReset(request); + log.info("Password reset token generated for email: {}", request.getEmail()); + return ResponseEntity.ok(new Response<>(resetToken, Status.SUCCESS, Translator.toLocale(GepafinConstant.RESET_PASSWORD_INITIATED))); + } + + @Override + public ResponseEntity> resetPassword(ResetPasswordReq request) { + log.info("Resetting password for username: {}", request.getEmail()); + Boolean success = userService.resetPassword(request); + if (success) { + log.info("Password reset successfully for username: {}", request.getEmail()); + } else { + log.error("Password reset failed for username: {}", request.getEmail()); + } + return ResponseEntity.ok(new Response<>(success, Status.SUCCESS, Translator.toLocale(GepafinConstant.PASSWORD_RESET_SUCCESS))); + } + + @Override + public ResponseEntity> logoutUser(HttpServletRequest request, HttpServletResponse response) { + userService.logoutUser(request, response); + + log.info("User has successfully logged"); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOGOUT_SUCCESSFUL_MSG))); + } + + @Override + public ResponseEntity> updateUserStatus(@PathVariable Long userId, @RequestParam UserStatusEnum status) { + log.info("Update User Status for- User ID: {}, Request Body: {}", userId, status); + UserResponseBean updatedUser = userService.updateUserStatus(userId, status); + return ResponseEntity.ok(new Response<>(updatedUser, Status.SUCCESS, Translator.toLocale(GepafinConstant.UPDATE_USER_STATUS_SUCCESS_MSG))); + } + +} \ No newline at end of file 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 c1999952..5ff6deb7 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 @@ -456,4 +456,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index ebacb43f..a94d07f6 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -44,8 +44,13 @@ file.deleted.successfully=File deleted successfully. document.not.found=Document not found. document.id.not.found=Document ID not found. call.invalid.date=Invalid start or end date. -call.not.found=Call not found. call.id.not.null=Call id cannot be null. +call.update.successfully=Call updated successfully. +call.fetch.success=Call details fetched successfully. +call.not.found=Call not found. +score.not.null=Score cannot be null or cannot be zero. +field.not.null={0} cannot be null. +field.not.empty={0} cannot be empty. # Login-related messages login.successfully=Login successfully. @@ -66,6 +71,23 @@ form.deleted.successfully=Form deleted successfully. form.fetched.successfully=Form fetched successfully. required.parameter.not.found.for.form=Label, content, or orderNo cannot be null. form.not.found.for.call.id=Form not found for corresponding call. +#EvaluationCriteria-related messages +evaluation.criteria.not.found=EvaluationCriteria not found. +evaluation.criteria.created.successfully=EvaluationCriteria created successfully. +evaluation.criteria.fetch.successfully=EvaluationCriteria fetched successfully. +evaluation.criteria.updated.successfully=EvaluationCriteria updated successfully. +evaluation.criteria.deleted.successfully=EvaluationCriteria deleted successfully. +# Password reset messages +password.reset.initiated=Password reset initiated. +password.reset.success=Password has been successfully reset. +#Change Password +invalid.token.msg=The token provided is invalid or expired. Please request a new token. +current.password.incorrect = Current password is incorrect. +success.password.changed=Password changed successfully. +#Logout +logout.successful.msg=Logout successful. You have been logged out successfully. +#Update user Active or Deactive status +update.user.status.success=User status has been successfully updated. #Form-field-related messages @@ -83,4 +105,21 @@ form.template.created.successfully=Form template created successfully. form.template.updated.suucessfully=Form template updated successfully. form.template.deleted.successfully=Form template deleted successfully. form.template.fetched.successfully=Form template fetched successfully. -required.parameter.not.found.for.form.template=Label or content cannot be null. \ No newline at end of file +required.parameter.not.found.for.form.template=Label or content cannot be null. +#Faq-related messages +faq.not.found=Faq not found. +faq.created.successfully=Faq created successfully. +faq.fetched.successfully=Faq fetched successfully. +faq.updated.successfully=Faq updated successfully. +faq.deleted.successfully=Faq deleted successfully. + +#LookUpData-related message +lookupdata.not.found=LookUpData not found. +lookupdata.created.successfully=LookUpData created successfully. +lookupdata.fetched.successfully=LookUpData fetched successfully. +lookupdata.updated.successfully=LookUpData updated successfully. +lookupdata.deleted.successfully=LookUpData deleted successfully. + +#Document-related message +document.updated.successfully=Document updated successfully. +document.fetched.successfully=Document fetched successfully. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index f53b6d0f..a8f35314 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -44,8 +44,13 @@ file.deleted.successfully=File eliminato con successo. document.not.found=Documento non trovato. document.id.not.found=ID documento non trovato. call.invalid.date=Data di inizio o fine non valida. +call.id.not.null=L'ID della chiamata non pu� essere nullo. +call.update.successfully=Chiamata aggiornata con successo. +call.fetch.success=Dettagli della chiamata recuperati con successo. call.not.found=Chiamata non trovata. -call.id.not.null=L'ID della chiamata non può essere nullo. +score.not.null=Il punteggio non pu� essere nullo o zero. +field.not.null={0} non pu� essere nullo. +field.not.empty=la {0} non pu� essere vuota. # Login-related messages login.successfully=Accesso effettuato con successo. @@ -82,3 +87,37 @@ form.template.updated.suucessfully=Modello di modulo aggiornato correttamente. form.template.deleted.successfully=Modello di modulo eliminato correttamente. form.template.fetched.successfully=Modello di modulo recuperato correttamente. required.parameter.not.found.for.form.template=Etichetta o contenuto non possono essere nulli. +#EvaluationCriteria-related messages +evaluation.criteria.not.found=EvaluationCriteria non trovato. +evaluation.criteria.created.successfully=EvaluationCriteria creato con successo. +evaluation.criteria.fetch.successfully=Recupero EvaluationCriteria riuscito. +evaluation.criteria.updated.successfully=EvaluationCriteria aggiornato con successo. +evaluation.criteria.deleted.successfully=EvaluationCriteria eliminato con successo. + +#faq-related messages +faq.not.found=Faq non trovata. +faq.created.successfully=Faq creata con successo. +faq.fetched.successfully=Faq recuperata con successo. +faq.updated.successfully=Faq aggiornata con successo. +faq.deleted.successfully=Faq eliminata con successo. + +#LookUpData-related message +lookupdata.not.found=LookUpData non trovato. +lookupdata.created.successfully=LookUpData creato correttamente. +lookupdata.fetched.successfully=LookUpData recuperato correttamente. +lookupdata.updated.successfully=LookUpData aggiornato correttamente. +lookupdata.deleted.successfully=LookUpData eliminato correttamente. + +#Document-related message +document.updated.successfully=Documento aggiornato con successo. +document.fetched.successfully=Documento recuperato con successo. +# Password reset messages +password.reset.initiated=Reimpostazione della password avviata. +password.reset.success=La password � stata reimpostata con successo. +invalid.token.msg=Il token fornito � invalido o scaduto. Si prega di richiedere un nuovo token. +current.password.incorrect = La password attuale non � corretta. +success.password.changed=Password cambiata con successo. +logout.successful.msg=Logout riuscito. Sei stato disconnesso con successo. + +update.user.status.success=Lo stato dell'utente � stato aggiornato con successo. +