refactored code

src/main/java/net/gepafin/tendermanagement/dao/CallDao.java

@@ -98,7 +98,7 @@ public class CallDao {
 		CallEntity callEntity = new CallEntity();
 //		validateCallEntity(createCallRequest);
 		RegionEntity region = regionRepository.findById(createCallRequest.getRegionId())
-				.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.REGION_NOT_FOUND)));
 		callEntity.setRegion(region);
 		callEntity.setName(createCallRequest.getName());
@@ -152,7 +152,7 @@ public class CallDao {
 		LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(criteriaReq, type);
 		if (criteriaReq.getId() != null && criteriaReq.getId() > 0) {
 			criteriaEntity = evaluationCriteriaRepository.findById(criteriaReq.getId())
-					.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 							Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
 		} else {
 			criteriaEntity = new EvaluationCriteriaEntity();
@@ -196,7 +196,7 @@ public class CallDao {
 	private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) {
 		validateDocumentEntity(documentReq.getId());
 		DocumentEntity documentEntity = documentRepository.findByIdAndCallIdAndIsDeletedFalse(documentReq.getId(), callEntity.getId())
-				.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)));
 		return documentEntity;
 	}
@@ -412,7 +412,7 @@ public class CallDao {
 		}
 
 		return lookUpDataRepository.findById(req.getLookUpDataId())
-				.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 						Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG)));
 	}
 
@@ -430,21 +430,17 @@ public class CallDao {
 	}
 
 	public CallEntity validateCall(Long callId) {
-		return callRepository.findById(callId).orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR,
+		return callRepository.findById(callId).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 				Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 	}
 
 	public CallResponse getCallById(Long callId) {
-		CallEntity callEntity = callRepository.findById(callId)
+		CallEntity callEntity = validateCall(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)
+		CallEntity callEntity = validateCall(callId);
-				.orElseThrow(() -> new CustomValidationException(Status.VALIDATION_ERROR,
-						Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 		validateUpdate(callEntity);
 		setIfUpdated(callEntity::getThreshold, callEntity::setThreshold, createCallRequest.getThreshold());
 		callRepository.save(callEntity);
@@ -562,7 +558,7 @@ public class CallDao {
 
 		if (isExistingFaq(faqReq)) {
 			faqEntity = faqRepository.findById(faqReq.getId())
-					.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 							Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND)));
 		} else {
 			faqEntity = new FaqEntity();
@@ -608,7 +604,7 @@ public class CallDao {
 		LookUpDataEntity lookupDataEntity = convertLookUpDataRequestIntoLookUpDataEntity(lookUpDataReq, type);
 		if (lookUpDataReq.getId() != null && lookUpDataReq.getId() > 0) {
 			checklistEntity = callTargetAudienceChecklistRepository.findById(lookUpDataReq.getId())
-					.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR,
+					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 							Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 
 			if (Boolean.FALSE.equals(checklistEntity.getLookupData().getId().equals(lookupDataEntity.getId()))) {
@@ -685,7 +681,7 @@ public class CallDao {
 				.collect(Collectors.toList());
 	}
 
-	public CallResponse validateCall(CallEntity callEntity) {
+	public CallResponse validateCallData(CallEntity callEntity) {
 		validateUpdate(callEntity);
 		CallResponse callResponseBean = getCallResponseBean(callEntity);
 		CallValidatorServiceImpl.validateResponse(callResponseBean);
@@ -704,8 +700,7 @@ public class CallDao {
     }
 
 	public CallResponse updateCallStatus(Long callId, CallStatusEnum statusReq) {
-		CallEntity callEntity = callRepository.findById(callId)
+		CallEntity callEntity = validateCall(callId);
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 		CallStatusEnum currentStatus = CallStatusEnum.valueOf(callEntity.getStatus());
 		validateStatusChange(currentStatus, statusReq);
 		callEntity.setStatus(statusReq.getValue());

src/main/java/net/gepafin/tendermanagement/dao/DocumentDao.java

@@ -1,7 +1,6 @@
 package net.gepafin.tendermanagement.dao;
 
 import java.io.IOException;
-import java.util.*;
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.FilenameUtils;
@@ -16,9 +15,9 @@ import net.gepafin.tendermanagement.entities.CallEntity;
 import net.gepafin.tendermanagement.entities.DocumentEntity;
 import net.gepafin.tendermanagement.enums.DocumentTypeEnum;
 import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
-import net.gepafin.tendermanagement.repositories.CallRepository;
 import net.gepafin.tendermanagement.repositories.DocumentRepository;
 import net.gepafin.tendermanagement.service.AmazonS3Service;
+import net.gepafin.tendermanagement.service.CallService;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
@@ -39,13 +38,11 @@ public class DocumentDao {
 	private CallDao callDao;
 
 	@Autowired
-	private CallRepository callRepository;
+	private CallService callService;
 
 	public List<DocumentResponseBean> uploadFiles(List<MultipartFile> files, Long callId, DocumentTypeEnum fileType) {
 		List<DocumentEntity> documentEntities = new ArrayList<>();
-		CallEntity callEntity = callRepository.findById(callId)
+		CallEntity callEntity = callService.validateCall(callId);
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-						Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 		for (MultipartFile file : files) {
 			try {
 				uploadFileOnAmazonS3 result = uploadFileOnAmazonS3(file);
@@ -79,7 +76,7 @@ public class DocumentDao {
 	}
 
 	public void deleteFile(Long documentId) {
-		DocumentEntity documentEntity = getDocumentEntity(documentId);
+		DocumentEntity documentEntity = validateDocument(documentId);
 //        String fileName= Utils.extractFileName(documentEntity.getFilePath());
 //        deleteFileOnAmazonS3(fileName);
 		documentEntity.setIsDeleted(true);
@@ -94,17 +91,13 @@ public class DocumentDao {
 		return null;
 	}
 
-	private DocumentEntity getDocumentEntity(Long documentId) {
+	public DocumentEntity validateDocument(Long id) {
-		Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId);
+		return documentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-		if (documentEntity.isEmpty()) {
+				Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND)));
-			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);
+		DocumentEntity documentEntity = validateDocument(documentId);
 		String fileName = Utils.extractFileName(documentEntity.getFilePath());
 		deleteFileOnAmazonS3(fileName);
 		uploadFileOnAmazonS3 result = null;
@@ -122,11 +115,7 @@ public class DocumentDao {
 	}
 
 	public DocumentResponseBean getDocument(Long documentId) {
-		Optional<DocumentEntity> documentEntity = documentRepository.findById(documentId);
+		DocumentEntity documentEntity = validateDocument(documentId);
-		if (documentEntity.isEmpty()) {
+		return callDao.convertToDocumentResponseBean(documentEntity);
-			new ResourceNotFoundException(Status.VALIDATION_ERROR,
-					Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND));
-		}
-		return callDao.convertToDocumentResponseBean(documentEntity.orElse(null));
 	}
 }

src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java

@@ -7,77 +7,81 @@ import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity;
 import net.gepafin.tendermanagement.entities.LookUpDataEntity;
 import net.gepafin.tendermanagement.model.request.EvaluationCriteriaRequest;
 import net.gepafin.tendermanagement.model.response.EvaluationCriteriaResponseBean;
-import net.gepafin.tendermanagement.repositories.CallRepository;
 import net.gepafin.tendermanagement.repositories.EvaluationCriteriaRepository;
-import net.gepafin.tendermanagement.repositories.LookUpDataRepository;
+import net.gepafin.tendermanagement.service.CallService;
+import net.gepafin.tendermanagement.service.LookUpDataService;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Component;
 
-
 @Component
 public class EvaluationCriteriaDao {
 
-    @Autowired
+	@Autowired
-    private EvaluationCriteriaRepository evaluationCriteriaRepository;
+	private EvaluationCriteriaRepository evaluationCriteriaRepository;
 
-    @Autowired
+	@Autowired
-    private CallRepository callRepository;
+	private CallService callService;
-    
-    @Autowired
-    private LookUpDataRepository lookUpDataRepository;
 
-    public EvaluationCriteriaResponseBean createEvaluationCriteria(EvaluationCriteriaRequest evaluationCriteriaRequest) {
+	@Autowired
-        EvaluationCriteriaEntity entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(evaluationCriteriaRequest);
+	private LookUpDataService lookUpDataService;
-        return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity);
-    }
 
-    private EvaluationCriteriaEntity convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(EvaluationCriteriaRequest evaluationCriteriaRequest) {
+	public EvaluationCriteriaResponseBean createEvaluationCriteria(
-        EvaluationCriteriaEntity entity = new EvaluationCriteriaEntity();
+			EvaluationCriteriaRequest evaluationCriteriaRequest) {
-        CallEntity callEntity =  callRepository.findById(evaluationCriteriaRequest.getCallId())
+		EvaluationCriteriaEntity entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(
-                .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
+				evaluationCriteriaRequest);
-		LookUpDataEntity looDataEntity = lookUpDataRepository.findById(evaluationCriteriaRequest.getLookUpDataId())
+		return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity);
+	}
+
+	private EvaluationCriteriaEntity convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(
+			EvaluationCriteriaRequest evaluationCriteriaRequest) {
+		EvaluationCriteriaEntity entity = new EvaluationCriteriaEntity();
+		CallEntity callEntity = callService.validateCall(evaluationCriteriaRequest.getCallId());
+		LookUpDataEntity looDataEntity = lookUpDataService
+				.validateLookUpData(evaluationCriteriaRequest.getLookUpDataId());
+		entity.setCall(callEntity);
+		entity.setLookupData(looDataEntity);
+		entity.setScore(evaluationCriteriaRequest.getScore());
+		entity = evaluationCriteriaRepository.save(entity);
+		return entity;
+	}
+
+	public EvaluationCriteriaResponseBean getEvaluationCriteriaById(Long id) {
+		return evaluationCriteriaRepository.findById(id)
+				.map(this::convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean)
 				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-						Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND)));
+						Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
-        entity.setCall(callEntity);
+	}
-        entity.setLookupData(looDataEntity);
-        entity.setScore(evaluationCriteriaRequest.getScore());
-        entity = evaluationCriteriaRepository.save(entity);
-        return entity;
-    }
 
-    public EvaluationCriteriaResponseBean getEvaluationCriteriaById(Long id) {
+	public EvaluationCriteriaResponseBean updateEvaluationCriteria(Long id, EvaluationCriteriaRequest request) {
-        return evaluationCriteriaRepository.findById(id)
+		EvaluationCriteriaEntity entity = evaluationCriteriaRepository.findById(id)
-                .map(this::convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean)
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
+						Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
-    }
+		entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(request);
+		return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity);
+	}
 
-    public EvaluationCriteriaResponseBean updateEvaluationCriteria(Long id, EvaluationCriteriaRequest request) {
+	public void deleteEvaluationCriteria(Long id) {
-        EvaluationCriteriaEntity entity = evaluationCriteriaRepository.findById(id)
+		try {
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND)));
+			evaluationCriteriaRepository.deleteById(id);
-         entity = convertEvaluationCriteriaRequestToEvaluationCriteriaEntity(request);
+		} catch (EmptyResultDataAccessException e) {
-        return convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(entity);
+			throw new ResourceNotFoundException(Status.NOT_FOUND,
-    }
+					Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND));
+		}
+	}
 
-    public void deleteEvaluationCriteria(Long id) {
+	private EvaluationCriteriaResponseBean convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(
-        try {
+			EvaluationCriteriaEntity entity) {
-        	evaluationCriteriaRepository.deleteById(id);
+		EvaluationCriteriaResponseBean response = new EvaluationCriteriaResponseBean();
-        } catch (EmptyResultDataAccessException e) {
+		response.setId(entity.getId());
-            throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.EVALUATION_CRITERIA_NOT_FOUND));
+		response.setScore(entity.getScore());
-        }
+		response.setCreatedDate(entity.getCreatedDate());
-    }
+		response.setUpdatedDate(entity.getUpdatedDate());
-
+		response.setLookUpDataId(entity.getLookupData().getId());
-    private EvaluationCriteriaResponseBean convertEvaluationCriteriaEntityEvaluationCriteriaToResponseBean(EvaluationCriteriaEntity entity) {
+		response.setTitle(entity.getLookupData().getTitle());
-        EvaluationCriteriaResponseBean response = new EvaluationCriteriaResponseBean();
+		response.setValue(entity.getLookupData().getValue());
-        response.setId(entity.getId());
+		return response;
-        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;
-    }
 }

src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java

@@ -8,8 +8,8 @@ import net.gepafin.tendermanagement.entities.LookUpDataEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.FaqReq;
 import net.gepafin.tendermanagement.model.response.FaqResponseBean;
-import net.gepafin.tendermanagement.repositories.CallRepository;
 import net.gepafin.tendermanagement.repositories.FaqRepository;
+import net.gepafin.tendermanagement.service.CallService;
 import net.gepafin.tendermanagement.service.UserService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
@@ -32,15 +32,15 @@ public class FaqDao {
 	private CallDao callDao;
 
 	@Autowired
-	private CallRepository callRepository;
+	private CallService callService;
 
 	public FaqResponseBean createFaq(FaqReq faqRequest, Long userId, Long callId) {
 		FaqEntity entity = new FaqEntity();
-		CallEntity callEntity = callRepository.findById(callId)
+		CallEntity callEntity = callService.validateCall(callId);
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+		;
-						Translator.toLocale(GepafinConstant.CALL_NOT_FOUND)));
 		UserEntity userEntity = userService.validateUser(userId);
-		entity = callDao.convertToFaqEntity(faqRequest, callEntity, userEntity, LookUpDataEntity.LookUpDataTypeEnum.FAQ);
+		entity = callDao.convertToFaqEntity(faqRequest, callEntity, userEntity,
+				LookUpDataEntity.LookUpDataTypeEnum.FAQ);
 		faqRepository.save(entity);
 		return convertFaqEntityToResponseBean(entity);
 	}

src/main/java/net/gepafin/tendermanagement/dao/FormDao.java

@@ -10,7 +10,6 @@ import net.gepafin.tendermanagement.model.response.ContentResponseBean;
 import net.gepafin.tendermanagement.model.response.FormResponseBean;
 import net.gepafin.tendermanagement.repositories.FormRepository;
 import net.gepafin.tendermanagement.service.CallService;
-import net.gepafin.tendermanagement.service.FormService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
@@ -32,9 +31,6 @@ public class FormDao {
     @Autowired
     private CallService callService;
 
-    @Autowired
-    private FormService formService;
-
     public FormEntity saveFormEntity(FormEntity formEntity){
         formEntity=formRepository.save(formEntity);
         return formEntity;
@@ -68,7 +64,7 @@ public class FormDao {
         }
            }
     public FormResponseBean updateForm(Long formId, FormRequest formRequest){
-        FormEntity formEntity = formService.getFormEntityById(formId);
+        FormEntity formEntity = validateForm(formId);
         Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel());
         Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,setContentResponseBean(formRequest.getContent()));
         formEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
@@ -76,18 +72,18 @@ public class FormDao {
         return convertFormEntityToFormResponseBean(formEntity);
     }
 
-    public FormEntity getFormEntity(Long formId) {
+    public FormEntity validateForm(Long formId) {
         FormEntity formEntity = formRepository.findById(formId)
                 .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_NOT_FOUND)));
         return formEntity;
     }
 
     public FormResponseBean getFormEntityById(Long formId) {
-        FormEntity formEntity = formService.getFormEntityById(formId);
+        FormEntity formEntity = validateForm(formId);
      return  convertFormEntityToFormResponseBean(formEntity);
     }
     public void deleteFormById(Long formId){
-        FormEntity formEntity=formService.getFormEntityById(formId);
+        FormEntity formEntity = validateForm(formId);
         formRepository.delete(formEntity);
     }
     public List<FormResponseBean> getFormsByCallId(Long callId){

src/main/java/net/gepafin/tendermanagement/dao/FormFieldDao.java

@@ -8,7 +8,6 @@ import net.gepafin.tendermanagement.model.request.SettingRequestBean;
 import net.gepafin.tendermanagement.model.response.FormFieldResponseBean;
 import net.gepafin.tendermanagement.model.response.SettingResponseBean;
 import net.gepafin.tendermanagement.repositories.FormFieldRepository;
-import net.gepafin.tendermanagement.service.FormFieldService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
@@ -24,79 +23,86 @@ import java.util.stream.Collectors;
 @Component
 public class FormFieldDao {
 
-    @Autowired
+	@Autowired
-    private FormFieldRepository formFieldRepository;
+	private FormFieldRepository formFieldRepository;
 
-    @Autowired
+	public FormFieldEntity convertFormFieldRequestToFormFieldEntity(FormFieldRequest formFieldRequest) {
-    private FormFieldService formFieldService;
+		FormFieldEntity formFieldEntity = new FormFieldEntity();
+		formFieldEntity.setLabel(formFieldRequest.getLabel());
+		formFieldEntity.setName(formFieldRequest.getName());
+		formFieldEntity.setValidators(Utils.convertMapIntoJsonString(formFieldRequest.getValidators()));
+		formFieldEntity.setSettings(setSettingRequestBean(formFieldRequest.getSettings()));
+		formFieldEntity = saveFormFieldEntity(formFieldEntity);
+		return formFieldEntity;
+	}
 
+	public FormFieldResponseBean convertFormFieldEntityToFormFieldResponseBean(FormFieldEntity formFieldEntity) {
+		FormFieldResponseBean formFieldResponseBean = new FormFieldResponseBean();
+		formFieldResponseBean.setId(formFieldEntity.getId());
+		formFieldResponseBean.setName(formFieldEntity.getName());
+		formFieldResponseBean
+				.setSettings(Utils.convertJsonStringToList(formFieldEntity.getSettings(), SettingResponseBean.class));
+		formFieldResponseBean.setLabel(formFieldEntity.getLabel());
+		formFieldResponseBean.setValidators(Utils.convertIntoJson(formFieldEntity.getValidators()));
+		return formFieldResponseBean;
+	}
 
-    public FormFieldEntity convertFormFieldRequestToFormFieldEntity(FormFieldRequest formFieldRequest) {
+	public FormFieldEntity saveFormFieldEntity(FormFieldEntity formFieldEntity) {
-        FormFieldEntity formFieldEntity = new FormFieldEntity();
+		formFieldEntity = formFieldRepository.save(formFieldEntity);
-        formFieldEntity.setLabel(formFieldRequest.getLabel());
+		return formFieldEntity;
-        formFieldEntity.setName(formFieldRequest.getName());
+	}
-        formFieldEntity.setValidators(Utils.convertMapIntoJsonString(formFieldRequest.getValidators()));
-        formFieldEntity.setSettings(setSettingRequestBean(formFieldRequest.getSettings()));
-        formFieldEntity = saveFormFieldEntity(formFieldEntity);
-        return formFieldEntity;
-    }
 
-    public FormFieldResponseBean convertFormFieldEntityToFormFieldResponseBean(FormFieldEntity formFieldEntity) {
+	public void validateFormField(FormFieldRequest formFieldRequest) {
-        FormFieldResponseBean formFieldResponseBean = new FormFieldResponseBean();
+		if (formFieldRequest.getSettings() == null || formFieldRequest.getLabel() == null) {
-        formFieldResponseBean.setId(formFieldEntity.getId());
+			throw new CustomValidationException(Status.VALIDATION_ERROR,
-        formFieldResponseBean.setName(formFieldEntity.getName());
+					Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_FIELD));
-        formFieldResponseBean.setSettings(Utils.convertJsonStringToList(formFieldEntity.getSettings(), SettingResponseBean.class));
+		}
-        formFieldResponseBean.setLabel(formFieldEntity.getLabel());
+	}
-        formFieldResponseBean.setValidators(Utils.convertIntoJson(formFieldEntity.getValidators()));
-        return formFieldResponseBean;
-    }
 
-    public FormFieldEntity saveFormFieldEntity(FormFieldEntity formFieldEntity) {
+	public FormFieldResponseBean createFormField(FormFieldRequest formFieldRequest) {
-        formFieldEntity = formFieldRepository.save(formFieldEntity);
+		validateFormField(formFieldRequest);
-        return formFieldEntity;
+		FormFieldEntity formFieldEntity = convertFormFieldRequestToFormFieldEntity(formFieldRequest);
-    }
+		return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity);
+	}
 
-    public void validateFormField(FormFieldRequest formFieldRequest) {
+	public FormFieldResponseBean updateFormField(Long formFieldId, FormFieldRequest formFieldRequest) {
-        if (formFieldRequest.getSettings() == null || formFieldRequest.getLabel() == null) {
+		FormFieldEntity formFieldEntity = validateFormField(formFieldId);
-            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_FIELD));
+		Utils.setIfUpdated(formFieldEntity::getName, formFieldEntity::setName, formFieldRequest.getName());
-        }
+		Utils.setIfUpdated(formFieldEntity::getLabel, formFieldEntity::setLabel, formFieldRequest.getLabel());
-    }
+		Utils.setIfUpdated(formFieldEntity::getSettings, formFieldEntity::setSettings,
-    public FormFieldResponseBean createFormField(FormFieldRequest formFieldRequest){
+				setSettingRequestBean(formFieldRequest.getSettings()));
-        validateFormField(formFieldRequest);
+		Utils.setIfUpdated(formFieldEntity::getValidators, formFieldEntity::setValidators,
-        FormFieldEntity formFieldEntity=convertFormFieldRequestToFormFieldEntity(formFieldRequest);
+				Utils.convertMapIntoJsonString(formFieldRequest.getValidators()));
-        return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity);
+		formFieldEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-    }
+		formFieldEntity = saveFormFieldEntity(formFieldEntity);
-    public FormFieldResponseBean updateFormField(Long formFieldId,FormFieldRequest formFieldRequest){
+		return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity);
-        FormFieldEntity formFieldEntity = formFieldService.getFormFieldEntityById(formFieldId);
+	}
-        Utils.setIfUpdated(formFieldEntity::getName,formFieldEntity::setName,formFieldRequest.getName());
-        Utils.setIfUpdated(formFieldEntity::getLabel,formFieldEntity::setLabel,formFieldRequest.getLabel());
-        Utils.setIfUpdated(formFieldEntity::getSettings,formFieldEntity::setSettings,setSettingRequestBean(formFieldRequest.getSettings()));
-        Utils.setIfUpdated(formFieldEntity::getValidators,formFieldEntity::setValidators,Utils.convertMapIntoJsonString(formFieldRequest.getValidators()));
-        formFieldEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        formFieldEntity=saveFormFieldEntity(formFieldEntity);
-        return convertFormFieldEntityToFormFieldResponseBean(formFieldEntity);
-    }
-    public FormFieldEntity getFormFieldEntity(Long formFieldId) {
-        FormFieldEntity formFieldEntity=formFieldRepository.findById(formFieldId)
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_FIELD_NOT_FOUND)));
-        return formFieldEntity;
-    }
 
-    public FormFieldResponseBean getFormFieldEntityById(Long formFieldId) {
+	public FormFieldEntity validateFormField(Long formFieldId) {
-        FormFieldEntity formEntity = formFieldService.getFormFieldEntityById(formFieldId);
+		FormFieldEntity formFieldEntity = formFieldRepository.findById(formFieldId)
-        return  convertFormFieldEntityToFormFieldResponseBean(formEntity);
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-    }
+						Translator.toLocale(GepafinConstant.FORM_FIELD_NOT_FOUND)));
-    public void deleteFormById(Long formFieldId){
+		return formFieldEntity;
-        FormFieldEntity formEntity=formFieldService.getFormFieldEntityById(formFieldId);
+	}
-        formFieldRepository.delete(formEntity);
+
-    }
+	public FormFieldResponseBean getFormFieldEntityById(Long formFieldId) {
-    public String setSettingRequestBean(List<SettingRequestBean> settingRequestBeans){
+		FormFieldEntity formEntity = validateFormField(formFieldId);
-        return Utils.convertListToJsonString(settingRequestBeans);
+		return convertFormFieldEntityToFormFieldResponseBean(formEntity);
-    }
+	}
-    public List<FormFieldResponseBean> getAllFormField(){
+
-        List<FormFieldEntity> formFieldEntities=formFieldRepository.findAll();
+	public void deleteFormById(Long formFieldId) {
-        List<FormFieldResponseBean> formFieldResponseBeans = formFieldEntities.stream()
+		FormFieldEntity formEntity = validateFormField(formFieldId);
-                .map(req -> convertFormFieldEntityToFormFieldResponseBean(req)).collect(Collectors.toList());
+		formFieldRepository.delete(formEntity);
-        return formFieldResponseBeans;
+	}
-    }
+
+	public String setSettingRequestBean(List<SettingRequestBean> settingRequestBeans) {
+		return Utils.convertListToJsonString(settingRequestBeans);
+	}
+
+	public List<FormFieldResponseBean> getAllFormField() {
+		List<FormFieldEntity> formFieldEntities = formFieldRepository.findAll();
+		List<FormFieldResponseBean> formFieldResponseBeans = formFieldEntities.stream()
+				.map(req -> convertFormFieldEntityToFormFieldResponseBean(req)).collect(Collectors.toList());
+		return formFieldResponseBeans;
+	}
 }

src/main/java/net/gepafin/tendermanagement/dao/FormTemplateDao.java

@@ -8,7 +8,6 @@ import net.gepafin.tendermanagement.model.request.FormTemplateRequest;
 import net.gepafin.tendermanagement.model.response.ContentResponseBean;
 import net.gepafin.tendermanagement.model.response.FormTemplateResponseBean;
 import net.gepafin.tendermanagement.repositories.FormTemplateRepository;
-import net.gepafin.tendermanagement.service.FormTemplateService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
@@ -24,72 +23,80 @@ import java.util.stream.Collectors;
 @Component
 public class FormTemplateDao {
 
-    @Autowired
+	@Autowired
-    private FormTemplateRepository formTemplateRepository;
+	private FormTemplateRepository formTemplateRepository;
 
-    @Autowired
+	public FormTemplateEntity convertFormTemplateRequestToFormTemplateRequest(FormTemplateRequest formTemplateRequest) {
-    private FormTemplateService formTemplateService;
+		FormTemplateEntity formTemplateEntity = new FormTemplateEntity();
+		formTemplateEntity.setContent(setContentResponseBean(formTemplateRequest.getContent()));
+		formTemplateEntity.setLabel(formTemplateRequest.getLabel());
+		formTemplateEntity = saveFormTemplateEntity(formTemplateEntity);
+		return formTemplateEntity;
+	}
 
+	public FormTemplateEntity saveFormTemplateEntity(FormTemplateEntity formTemplateEntity) {
+		formTemplateEntity = formTemplateRepository.save(formTemplateEntity);
+		return formTemplateEntity;
+	}
 
-    public FormTemplateEntity convertFormTemplateRequestToFormTemplateRequest(FormTemplateRequest formTemplateRequest){
+	public FormTemplateResponseBean convertFormTemplateEntityToFormTemplateResponseBean(
-        FormTemplateEntity formTemplateEntity=new FormTemplateEntity();
+			FormTemplateEntity formTemplateEntity) {
-        formTemplateEntity.setContent(setContentResponseBean(formTemplateRequest.getContent()));
+		FormTemplateResponseBean formTemplateResponseBean = new FormTemplateResponseBean();
-        formTemplateEntity.setLabel(formTemplateRequest.getLabel());
+		formTemplateResponseBean.setId(formTemplateEntity.getId());
-        formTemplateEntity=saveFormTemplateEntity(formTemplateEntity);
+		formTemplateResponseBean
-        return formTemplateEntity;
+				.setContent(Utils.convertJsonStringToList(formTemplateEntity.getContent(), ContentResponseBean.class));
-    }
+		formTemplateResponseBean.setLabel(formTemplateEntity.getLabel());
-    public FormTemplateEntity saveFormTemplateEntity(FormTemplateEntity formTemplateEntity){
+		return formTemplateResponseBean;
-        formTemplateEntity=formTemplateRepository.save(formTemplateEntity);
+	}
-        return formTemplateEntity;
-    }
-    public FormTemplateResponseBean convertFormTemplateEntityToFormTemplateResponseBean(FormTemplateEntity formTemplateEntity){
-        FormTemplateResponseBean formTemplateResponseBean=new FormTemplateResponseBean();
-        formTemplateResponseBean.setId(formTemplateEntity.getId());
-        formTemplateResponseBean.setContent(Utils.convertJsonStringToList(formTemplateEntity.getContent(), ContentResponseBean.class));
-        formTemplateResponseBean.setLabel(formTemplateEntity.getLabel());
-        return formTemplateResponseBean;
-    }
 
-    public FormTemplateResponseBean createFormTemplate(FormTemplateRequest formTemplateRequest){
+	public FormTemplateResponseBean createFormTemplate(FormTemplateRequest formTemplateRequest) {
-        validateFormTemplate(formTemplateRequest);
+		validateFormTemplate(formTemplateRequest);
-        FormTemplateEntity formTemplateEntity=convertFormTemplateRequestToFormTemplateRequest(formTemplateRequest);
+		FormTemplateEntity formTemplateEntity = convertFormTemplateRequestToFormTemplateRequest(formTemplateRequest);
-        return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
+		return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
-    }
+	}
-    public void validateFormTemplate(FormTemplateRequest formTemplateRequest){
-        if(formTemplateRequest.getContent()==null  || formTemplateRequest.getLabel()==null ){
-            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_TEMPLATE));
-        }
-    }
-    public FormTemplateResponseBean updateFormTemplate(Long formTemplateId,FormTemplateRequest formTemplateRequest){
-        FormTemplateEntity formTemplateEntity = formTemplateService.getFormEntityById(formTemplateId);
-        Utils.setIfUpdated(formTemplateEntity::getLabel,formTemplateEntity::setLabel,formTemplateRequest.getLabel());
-        Utils.setIfUpdated(formTemplateEntity::getContent,formTemplateEntity::setContent,setContentResponseBean(formTemplateRequest.getContent()));
-        formTemplateEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        formTemplateEntity=saveFormTemplateEntity(formTemplateEntity);
-        return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
-    }
 
-    public FormTemplateEntity getFormTemplateEntity(Long formTemplateId) {
+	public void validateFormTemplate(FormTemplateRequest formTemplateRequest) {
-        FormTemplateEntity formTemplateEntity = formTemplateRepository.findById(formTemplateId)
+		if (formTemplateRequest.getContent() == null || formTemplateRequest.getLabel() == null) {
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.FORM_TEMPLATE_NOT_FOUND)));
+			throw new CustomValidationException(Status.VALIDATION_ERROR,
-        return formTemplateEntity;
+					Translator.toLocale(GepafinConstant.REQUIRED_PARAMETER_NOT_FOUND_FOR_FORM_TEMPLATE));
-    }
+		}
+	}
 
-    public FormTemplateResponseBean getFormTemplateEntityById(Long formTemplateId) {
+	public FormTemplateResponseBean updateFormTemplate(Long formTemplateId, FormTemplateRequest formTemplateRequest) {
-        FormTemplateEntity formTemplateEntity = formTemplateService.getFormEntityById(formTemplateId);
+		FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId);
-        return  convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
+		Utils.setIfUpdated(formTemplateEntity::getLabel, formTemplateEntity::setLabel, formTemplateRequest.getLabel());
-    }
+		Utils.setIfUpdated(formTemplateEntity::getContent, formTemplateEntity::setContent,
-    public void deleteFormTemplateById(Long formTemplateId){
+				setContentResponseBean(formTemplateRequest.getContent()));
-        FormTemplateEntity formTemplateEntity=formTemplateService.getFormEntityById(formTemplateId);
+		formTemplateEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        formTemplateRepository.delete(formTemplateEntity);
+		formTemplateEntity = saveFormTemplateEntity(formTemplateEntity);
-    }
+		return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
-    public String setContentResponseBean(List<ContentRequestBean> contentRequestBeans){
+	}
-        return Utils.convertListToJsonString(contentRequestBeans);
+
-    }
+	public FormTemplateEntity validateFormTemplate(Long formTemplateId) {
-    public List<FormTemplateResponseBean> getAllFormTemplate(){
+		FormTemplateEntity formTemplateEntity = formTemplateRepository.findById(formTemplateId)
-        List<FormTemplateEntity> formTemplateEntities=formTemplateRepository.findAll();
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-        List<FormTemplateResponseBean> formTemplateResponseBeans=formTemplateEntities.stream()
+						Translator.toLocale(GepafinConstant.FORM_TEMPLATE_NOT_FOUND)));
-                .map(req -> convertFormTemplateEntityToFormTemplateResponseBean(req)).collect(Collectors.toList());
+		return formTemplateEntity;
-        return formTemplateResponseBeans;
+	}
-    }
+
+	public FormTemplateResponseBean getFormTemplateEntityById(Long formTemplateId) {
+		FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId);
+		return convertFormTemplateEntityToFormTemplateResponseBean(formTemplateEntity);
+	}
+
+	public void deleteFormTemplateById(Long formTemplateId) {
+		FormTemplateEntity formTemplateEntity = validateFormTemplate(formTemplateId);
+		formTemplateRepository.delete(formTemplateEntity);
+	}
+
+	public String setContentResponseBean(List<ContentRequestBean> contentRequestBeans) {
+		return Utils.convertListToJsonString(contentRequestBeans);
+	}
+
+	public List<FormTemplateResponseBean> getAllFormTemplate() {
+		List<FormTemplateEntity> formTemplateEntities = formTemplateRepository.findAll();
+		List<FormTemplateResponseBean> formTemplateResponseBeans = formTemplateEntities.stream()
+				.map(req -> convertFormTemplateEntityToFormTemplateResponseBean(req)).collect(Collectors.toList());
+		return formTemplateResponseBeans;
+	}
 }

src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java

@@ -35,23 +35,24 @@ public class LookUpDataDao {
         lookUpDataRepository.save(entity);
         return entity;
     }
-
+    
     public void validateLookUpDataEntity(LookUpDataEntity entity) {
         if (entity.getValue() == null || entity.getValue().trim().isEmpty()) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VALUE_CANNOT_BE_EMPTY));
         }
     }
-
+    
-
+    public LookUpDataEntity validateLookUpData(Long id) {
-    public LookUpDataResponseBean getLookUpDataById(Long id) {
+    	return lookUpDataRepository.findById(id)
-        return lookUpDataRepository.findById(id)
-                .map(this::convertLookUpDataEntityToResponseBean)
                 .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND)));
     }
 
+    public LookUpDataResponseBean getLookUpDataById(Long id) {
+    	return convertLookUpDataEntityToResponseBean(validateLookUpData(id));
+    }
+
     public LookUpDataResponseBean updateLookUpData(Long id, LookUpDataRequest lookUpDataReq) {
-        LookUpDataEntity entity = lookUpDataRepository.findById(id)
+        LookUpDataEntity entity = validateLookUpData(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());
@@ -60,8 +61,7 @@ public class LookUpDataDao {
     }
 
     public void deleteLookUpData(Long id) {
-        LookUpDataEntity entity = lookUpDataRepository.findById(id)
+        LookUpDataEntity entity = validateLookUpData(id);
-                .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.LOOKUP_DATA_NOT_FOUND)));
         lookUpDataRepository.deleteById(entity.getId());
     }
 

src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java

@@ -32,7 +32,7 @@ public class RoleDao {
 
     @Autowired
     private RegionDao regionDao;
-    private RoleEntity roleEntity;
+    
     public RoleResponseBean createRole(RoleReq roleReq) {
         log.info("Creating new role with details: {}", roleReq);
         RoleEntity roleEntity = convertRoleRequestToRoleEntity(roleReq);
@@ -53,7 +53,7 @@ public class RoleDao {
     }
 
     public RoleResponseBean convertRoleEntityToRoleResponse(RoleEntity roleEntity) {
-        this.roleEntity = roleEntity;
+        
         RoleResponseBean roleResponseBean = new RoleResponseBean();
         roleResponseBean.setId(roleEntity.getId());
         roleResponseBean.setCreatedDate(roleEntity.getCreatedDate());

src/main/java/net/gepafin/tendermanagement/model/request/LogoutReq.java

@@ -1,7 +1,5 @@
 package net.gepafin.tendermanagement.model.request;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import lombok.Data;
 
 @Data

src/main/java/net/gepafin/tendermanagement/model/request/RegionReq.java

@@ -1,15 +1,11 @@
 package net.gepafin.tendermanagement.model.request;
 
-import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
-import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
 import net.gepafin.tendermanagement.enums.RegionStatusEnum;
 
 import java.math.BigDecimal;
 
-@Getter
+@Data
-@Setter
 public class RegionReq {
 
     private String regionName;

src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java

@@ -4,12 +4,9 @@ import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
+import lombok.Data;
-import lombok.Setter;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
 
-@Getter
+@Data
-@Setter
 public class UserReq {
 
     @NotBlank

src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java

@@ -1,7 +1,6 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-import net.gepafin.tendermanagement.model.BaseBean;
 
 import java.util.List;
 

src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java

@@ -1,27 +1,24 @@
 package net.gepafin.tendermanagement.model.response;
 
-import lombok.Getter;
+import lombok.Data;
-import lombok.Setter;
 import net.gepafin.tendermanagement.enums.RegionStatusEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
-@Getter
+@Data
-@Setter
 public class RegionResponseBean extends BaseBean {
-    private String regionName;
+	private String regionName;
-    private String description;
+	private String description;
-    private String country;
+	private String country;
-    private RegionStatusEnum status;
+	private RegionStatusEnum status;
-    private String priorityArea;
+	private String priorityArea;
-    private Long population;
+	private Long population;
-    private BigDecimal areaSize;
+	private BigDecimal areaSize;
-    private BigDecimal gdp;
+	private BigDecimal gdp;
-    private BigDecimal unemploymentRate;
+	private BigDecimal unemploymentRate;
-    private BigDecimal infrastructureScore;
+	private BigDecimal infrastructureScore;
-    private BigDecimal educationLevel;
+	private BigDecimal educationLevel;
-    private BigDecimal healthcareAccess;
+	private BigDecimal healthcareAccess;
-    private BigDecimal environmentalScore;
+	private BigDecimal environmentalScore;
 }

src/main/java/net/gepafin/tendermanagement/model/response/RoleResponseBean.java

@@ -1,12 +1,8 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import net.gepafin.tendermanagement.entities.RegionEntity;
 import net.gepafin.tendermanagement.model.BaseBean;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Data

src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java

@@ -1,11 +1,7 @@
 package net.gepafin.tendermanagement.model.response;
 
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 

src/main/java/net/gepafin/tendermanagement/repositories/FaqRepository.java

@@ -1,6 +1,5 @@
 package net.gepafin.tendermanagement.repositories;
 
-import net.gepafin.tendermanagement.entities.EvaluationCriteriaEntity;
 import net.gepafin.tendermanagement.entities.FaqEntity;
 
 import java.util.List;

src/main/java/net/gepafin/tendermanagement/repositories/LookUpDataRepository.java

@@ -5,7 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 @Repository
 public interface LookUpDataRepository extends JpaRepository<LookUpDataEntity,Long> {

src/main/java/net/gepafin/tendermanagement/service/CallService.java

@@ -5,13 +5,11 @@ import java.util.List;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.CallEntity;
 import net.gepafin.tendermanagement.enums.CallStatusEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1;
 import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2;
 import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1;
 import net.gepafin.tendermanagement.model.response.CallDetailsResponseBean;
 import net.gepafin.tendermanagement.model.response.CallResponse;
-import net.gepafin.tendermanagement.model.response.UserResponseBean;
 
 public interface CallService {
 
@@ -25,10 +23,12 @@ public interface CallService {
 	
 	List<CallDetailsResponseBean> getAllCalls();
 
-	CallResponse validateCall(Long callId);
+	CallResponse validateCallData(Long callId);
 
-    public CallEntity getCallEntityById(Long id);
+    CallEntity getCallEntityById(Long id);
     
 	CallResponse updateCallStatus(HttpServletRequest request, Long callId, CallStatusEnum statusReq);
+	
+	CallEntity validateCall(Long callId);
 
 }

src/main/java/net/gepafin/tendermanagement/service/FormFieldService.java

@@ -17,7 +17,7 @@ public interface FormFieldService {
 
     public void deleteFormField(HttpServletRequest request, Long formFieldId);
 
-    public FormFieldEntity getFormFieldEntityById(Long id);
+    public FormFieldEntity validateFormField(Long id);
 
     public List<FormFieldResponseBean> getAllFormField(HttpServletRequest request);
 

src/main/java/net/gepafin/tendermanagement/service/FormService.java

@@ -17,7 +17,7 @@ public interface FormService {
 
     public void deleteForm(HttpServletRequest request, Long formId);
 
-    public FormEntity getFormEntityById(Long id);
+    public FormEntity validateForm(Long id);
 
     public List<FormResponseBean> getFormsByCallId(HttpServletRequest request,Long callId);
 }

src/main/java/net/gepafin/tendermanagement/service/FormTemplateService.java

@@ -17,7 +17,7 @@ public interface FormTemplateService {
 
     public void deleteFormTemplate(HttpServletRequest request, Long formTemplateId);
 
-    public FormTemplateEntity getFormEntityById(Long id);
+    public FormTemplateEntity validateFormTemplate(Long id);
 
     public List<FormTemplateResponseBean> getAllFormTemplate(HttpServletRequest request);
 

src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java

@@ -19,4 +19,6 @@ public interface LookUpDataService {
     void validateLookUpDataEntity(LookUpDataEntity lookUpDataEntity);
    
     List<LookUpDataResponseBean> getLookUpDataByType(List<LookUpDataTypeEnum> type);
+
+	LookUpDataEntity validateLookUpData(Long lookUpDataId);
 }

src/main/java/net/gepafin/tendermanagement/service/RegionService.java

@@ -1,9 +1,7 @@
 package net.gepafin.tendermanagement.service;
 
-import net.gepafin.tendermanagement.entities.RegionEntity;
 import net.gepafin.tendermanagement.model.request.RegionReq;
 import net.gepafin.tendermanagement.model.response.RegionResponseBean;
-import net.gepafin.tendermanagement.model.request.UpdateRegionReq;
 
 import java.util.List;
 

src/main/java/net/gepafin/tendermanagement/service/RoleService.java

@@ -1,6 +1,5 @@
 package net.gepafin.tendermanagement.service;
 
-import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 

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

@@ -9,7 +9,6 @@ import net.gepafin.tendermanagement.dao.RoleDao;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.LoginReq;
-import net.gepafin.tendermanagement.model.request.LogoutReq;
 import net.gepafin.tendermanagement.model.response.LoginResponse;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;

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

@@ -64,18 +64,24 @@ public class CallServiceImpl implements CallService {
     
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CallResponse validateCall(Long callId) {
+    public CallResponse validateCallData(Long callId) {
-    	return callDao.validateCall(callDao.validateCall(callId));
+    	return callDao.validateCallData(callDao.validateCall(callId));
     }
 
     @Override
     public CallEntity getCallEntityById(Long id){
         return callDao.getCallEntityById(id);
     }
+    
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CallResponse updateCallStatus(HttpServletRequest request, Long callId, CallStatusEnum statusReq) {
         return callDao.updateCallStatus(callId, statusReq);
 
     }
+    
+    @Override
+    public CallEntity validateCall(Long callId) {
+    	return callDao.validateCall(callId);
+    }
 }

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

@@ -39,8 +39,8 @@ public class FormFieldServiceImpl implements FormFieldService {
     }
 
     @Override
-    public FormFieldEntity getFormFieldEntityById(Long id) {
+    public FormFieldEntity validateFormField(Long id) {
-        return formFieldDao.getFormFieldEntity(id);
+        return formFieldDao.validateFormField(id);
     }
 
     @Override

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

@@ -39,8 +39,8 @@ public class FormServiceImpl implements FormService {
     }
 
     @Override
-    public FormEntity getFormEntityById(Long id) {
+    public FormEntity validateForm(Long id) {
-        return formDao.getFormEntity(id);
+        return formDao.validateForm(id);
     }
 
     @Override

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

@@ -38,8 +38,8 @@ public class FormTemplateServiceImpl implements FormTemplateService {
     }
 
     @Override
-    public FormTemplateEntity getFormEntityById(Long id) {
+    public FormTemplateEntity validateFormTemplate(Long id) {
-        return formTemplateDao.getFormTemplateEntity(id);
+        return formTemplateDao.validateFormTemplate(id);
     }
 
     @Override

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

@@ -44,4 +44,9 @@ public class LookUpDataServiceImpl implements LookUpDataService {
     public List<LookUpDataResponseBean> getLookUpDataByType( List<LookUpDataTypeEnum> type) {
         return lookUpDataDao.getLookUpDataByTypes(type);
     }
+    
+    @Override
+    public LookUpDataEntity validateLookUpData(Long lookUpDataId) {
+    	return lookUpDataDao.validateLookUpData(lookUpDataId);
+    }
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java

@@ -3,7 +3,6 @@ package net.gepafin.tendermanagement.web.rest.api;
 import java.util.List;
 
 import net.gepafin.tendermanagement.enums.CallStatusEnum;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -116,7 +115,7 @@ public interface CallApi {
             })
     @PostMapping(value = "/validate/{callId}", produces = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')")
-    public ResponseEntity<Response<CallResponse>> validateCall(HttpServletRequest request,
+    public ResponseEntity<Response<CallResponse>> validateCallData(HttpServletRequest request,
     		@Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId);
     @Operation(summary = "Api to update call status",
             responses = {

src/main/java/net/gepafin/tendermanagement/web/rest/api/EvaluationCriteriaApi.java

@@ -44,7 +44,7 @@ public interface EvaluationCriteriaApi {
     @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     ResponseEntity<Response<EvaluationCriteriaResponseBean>> getEvaluationCriteriaById(HttpServletRequest request,
                                                                                        @Parameter(description = "evaluation criteria id", required = true)
-                                                                                       @PathVariable Long id);
+                                                                                       @PathVariable("id") Long id);
 
     @Operation(summary = "API to update evaluation criteria",
             responses = {
@@ -59,7 +59,7 @@ public interface EvaluationCriteriaApi {
     @PutMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     ResponseEntity<Response<EvaluationCriteriaResponseBean>> updateEvaluationCriteria(HttpServletRequest request,
                                                                                       @Parameter(description = "evaluation criteria id", required = true)
-                                                                                      @PathVariable Long id,
+                                                                                      @PathVariable("id") Long id,
                                                                                       @Parameter(description = "Evaluation criteria request object", required = true)
                                                                                       @Valid @RequestBody EvaluationCriteriaRequest evaluationCriteriaRequest);
 
@@ -74,5 +74,5 @@ public interface EvaluationCriteriaApi {
     @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     ResponseEntity<Void> deleteEvaluationCriteria(HttpServletRequest request,
                                                   @Parameter(description = "evaluation criteria id", required = true)
-                                                  @PathVariable Long id);
+                                                  @PathVariable("id") Long id);
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/FaqApi.java

@@ -24,7 +24,7 @@ public interface FaqApi {
             })
     @PostMapping(value = "/call/{callId}", consumes = "application/json", produces = "application/json")
     ResponseEntity<Response<FaqResponseBean>> createFaq(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true)
-    @PathVariable Long id, @Valid @RequestBody FaqReq faqRequest);
+    @PathVariable("callId") Long callId, @Valid @RequestBody FaqReq faqRequest);
 
     @Operation(summary = "API to get FAQ by id",
             responses = {
@@ -33,7 +33,7 @@ public interface FaqApi {
             })
     @GetMapping(value = "/{id}", produces = "application/json")
     ResponseEntity<Response<FaqResponseBean>> getFaqById(HttpServletRequest request,
-                                               @PathVariable Long id);
+                                               @PathVariable("id") Long id);
 
     @Operation(summary = "API to update FAQ",
             responses = {
@@ -43,7 +43,7 @@ public interface FaqApi {
             })
     @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json")
     ResponseEntity<Response<FaqResponseBean>> updateFaq(HttpServletRequest request,
-                                              @PathVariable Long id,
+                                              @PathVariable("id") Long id,
                                               @Valid @RequestBody FaqReq faqRequest);
 
     @Operation(summary = "API to delete FAQ",
@@ -53,5 +53,5 @@ public interface FaqApi {
             })
     @DeleteMapping(value = "/{id}")
     ResponseEntity<Response<Void>> deleteFaq(HttpServletRequest request,
-                                   @PathVariable Long id);
+                                   @PathVariable("id") Long id);
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java

@@ -41,7 +41,7 @@ public interface LookUpDataApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))})
     @GetMapping(value = "/{id}", produces = "application/json")
-    ResponseEntity<Response<LookUpDataResponseBean>> getLookUpDataById(HttpServletRequest request, @PathVariable Long id);
+    ResponseEntity<Response<LookUpDataResponseBean>> getLookUpDataById(HttpServletRequest request, @PathVariable("id") Long id);
 
     @Operation(summary = "Api to update LookUp Data",
             responses = {
@@ -53,7 +53,7 @@ public interface LookUpDataApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))})
     @PutMapping(value = "/{id}", consumes = "application/json", produces = "application/json")
-    ResponseEntity<Response<LookUpDataResponseBean>> updateLookUpData(HttpServletRequest request, @PathVariable Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq);
+    ResponseEntity<Response<LookUpDataResponseBean>> updateLookUpData(HttpServletRequest request, @PathVariable("id") Long id, @Valid @RequestBody LookUpDataRequest lookUpDataReq);
 
     @Operation(summary = "Api to delete LookUp Data",
             responses = {
@@ -65,7 +65,7 @@ public interface LookUpDataApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))})
     @DeleteMapping(value = "/{id}")
-    ResponseEntity<Response<Void>> deleteLookUpData(HttpServletRequest request, @PathVariable Long id);
+    ResponseEntity<Response<Void>> deleteLookUpData(HttpServletRequest request, @PathVariable("id") Long id);
 
     @Operation(summary = "Api to get LookUp Data by type",
             responses = {
@@ -77,5 +77,5 @@ public interface LookUpDataApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))})
     @GetMapping(value = "/type", produces = "application/json")
-    ResponseEntity<Response<List<LookUpDataResponseBean>>> getLookUpDataByType(HttpServletRequest request,  @RequestParam List<LookUpDataTypeEnum> types);
+    ResponseEntity<Response<List<LookUpDataResponseBean>>> getLookUpDataByType(HttpServletRequest request,  @RequestParam("type") List<LookUpDataTypeEnum> types);
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/RegionApi.java

@@ -1,10 +1,7 @@
 package net.gepafin.tendermanagement.web.rest.api;
 
-import net.gepafin.tendermanagement.entities.RegionEntity;
 import net.gepafin.tendermanagement.model.request.RegionReq;
 import net.gepafin.tendermanagement.model.response.RegionResponseBean;
-import net.gepafin.tendermanagement.model.request.UpdateRegionReq;
-import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;

src/main/java/net/gepafin/tendermanagement/web/rest/api/RoleApi.java

@@ -1,6 +1,5 @@
 package net.gepafin.tendermanagement.web.rest.api;
 
-import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;

src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java

@@ -8,10 +8,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
-import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
 import net.gepafin.tendermanagement.model.util.Response;
@@ -23,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 @Validated
 public interface UserApi {

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CallApiController.java

@@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -75,8 +73,8 @@ public class CallApiController implements CallApi {
 
     }
     @Override
-    public ResponseEntity<Response<CallResponse>> validateCall(HttpServletRequest request, Long callId) {
+    public ResponseEntity<Response<CallResponse>> validateCallData(HttpServletRequest request, Long callId) {
-    	CallResponse call = callService.validateCall(callId);
+    	CallResponse call = callService.validateCallData(callId);
 
          return ResponseEntity.status(HttpStatus.OK)
                  .body(new Response<>(call, Status.SUCCESS, Translator.toLocale(GepafinConstant.CALL_FETCH_SUCCESS_MSG)));

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java

@@ -1,12 +1,8 @@
 package net.gepafin.tendermanagement.web.rest.api.impl;
 
-import net.gepafin.tendermanagement.config.Translator;
-import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.repositories.UserRepository;
-import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
-import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RegionApiController.java

@@ -3,10 +3,8 @@ package net.gepafin.tendermanagement.web.rest.api.impl;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.RegionEntity;
 import net.gepafin.tendermanagement.model.request.RegionReq;
 import net.gepafin.tendermanagement.model.response.RegionResponseBean;
-import net.gepafin.tendermanagement.model.request.UpdateRegionReq;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.RegionService;
 import net.gepafin.tendermanagement.web.rest.api.RegionApi;

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/RoleApiController.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java

@@ -4,12 +4,9 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.config.Translator;
-import net.gepafin.tendermanagement.config.jwt.TokenProvider;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
-import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.*;
-import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
 import net.gepafin.tendermanagement.model.util.Response;
@@ -24,7 +21,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 @RestController
 @RequestMapping("${openapi.gepafin.base-path:/v1/user}")
@@ -32,8 +28,7 @@ import java.util.List;
 public class UserApiController implements UserApi {
 
     private final Logger log = LoggerFactory.getLogger(UserApiController.class);
-    @Autowired
+
-    private TokenProvider tokenProvider;
     @Autowired
     private UserService userService;