Applied validation

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -128,4 +128,8 @@ public class GepafinConstant {
     public static final String FLOW_NOT_FOUND = "flow.not.found";
 	public static final String VALIDATION_MESSAGE = "validation.message";
 	public static final String ACTION_REQUIRED = "action.required";
+    public static final String CALL_NOT_PUBLISHED="call.not.published";
+    public static final String APPLICATION_ALREADY_SUBMITTED="application.already.submitted";
+    public static final String INITAL_AND_FINAL_FORM_CANNOT_NULL="initial.and.final.form.cannot.null";
+
 }

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

@@ -50,8 +50,11 @@ public class ApplicationDao {
 
     public ApplicationResponseBean createApplication(ApplicationRequestBean applicationRequestBean, UserEntity userEntity, Long formId,Long applicationId) {
         FormEntity formEntity = formService.validateForm(formId);
-        CallEntity call = callService.validateCall(formEntity.getCall().getId());
+        CallEntity call = callService.validatePublishedCall(formEntity.getCall().getId());
         ApplicationEntity applicationEntity = validateApplication(applicationId);
+        if(Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.SUBMIT.getValue()))){
+            throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_SUBMITTED));
+        }
         formService.validateFormField(applicationRequestBean.getFormFields(),applicationEntity,formEntity);
         ApplicationFormEntity applicationFormEntity =  getApplicationFormOrCreate(formEntity, applicationEntity);
         createOrUpdateMultipleFormFields(applicationRequestBean.getFormFields(), applicationFormEntity);
@@ -326,7 +329,8 @@ public class ApplicationDao {
 
     public ApplicationResponse createApplicationByCallId(ApplicationRequest applicationRequest,Long callId,UserEntity userEntity){
             CallEntity call=callService.validateCall(callId);
-            checkIfApplicationExists(call,userEntity);
+         call = callService.validatePublishedCall(call.getId());
+        checkIfApplicationExists(call,userEntity);
         ApplicationEntity applicationEntity=createApplicationEntity(userEntity,call);
         applicationEntity.setComments(applicationRequest.getComments());
         applicationEntity=saveApplicationEntity(applicationEntity);

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

@@ -387,7 +387,7 @@ public class CallDao {
 		return createCallResponseBean;
 	}
 
-	private void validateUpdate(CallEntity callEntity) {
+	public void validateUpdate(CallEntity callEntity) {
 		if(callEntity.getStatus().equals(CallStatusEnum.PUBLISH.getValue())) {
 			throw new CustomValidationException(Status.VALIDATION_ERROR,
 					Translator.toLocale(GepafinConstant.PUBLISHED_CALL_NOT_UPDATE));
@@ -622,5 +622,15 @@ public class CallDao {
 
 		}
 	}
+	public CallEntity validatePublishedCall(Long callId) {
+		CallEntity callEntity= callRepository
+				.findByIdAndStatus(callId, CallStatusEnum.PUBLISH.getValue());
+		if(callEntity==null){
+			throw new ResourceNotFoundException(
+						Status.NOT_FOUND,
+						Translator.toLocale(GepafinConstant.CALL_NOT_PUBLISHED));
+		}
+		return callEntity;
+	}
 
 }

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

@@ -21,6 +21,7 @@ import net.gepafin.tendermanagement.repositories.FlowEdgesRepository;
 import net.gepafin.tendermanagement.service.CallService;
 import net.gepafin.tendermanagement.service.FormService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
+import net.gepafin.tendermanagement.util.FieldValidator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +50,9 @@ public class FlowDao {
     @Autowired
     private FormService formService;
 
+    @Autowired
+    private CallDao callDao;
+
     public FlowResponseBean createOrUpdateFlow(FlowRequestBean flowRequestBean, Long callId) {
         validateFlowRequestBean(flowRequestBean);
         CallEntity call = callService.validateCall(callId);
@@ -62,12 +66,17 @@ public class FlowDao {
     }
 
     public void validateFlowRequestBean(FlowRequestBean flowRequestBean){
+        if (FieldValidator.isNullOrZero(flowRequestBean.getInitialForm()) || FieldValidator.isNullOrZero(flowRequestBean.getFinalForm())) {
+            throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.INITAL_AND_FINAL_FORM_CANNOT_NULL));
+        }
+
         if (flowRequestBean.getFlowEdges() == null || flowRequestBean.getFlowEdges().isEmpty()) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.FLOW_REQUEST_NOT_PROPER));
         }
     }
 
     public void checkIfFlowExits(CallEntity call) {
+        callDao.validateUpdate(call);
         List<FlowDataEntity> flowDataEntities = flowDataRepository.findByCallId(call.getId());
         List<FlowEdgesEntity> flowEdgesEntities = flowEdgesRepository.findByCallId(call.getId());
         if (Boolean.FALSE.equals(flowDataEntities.isEmpty())  || Boolean.FALSE.equals(flowEdgesEntities.isEmpty())) {

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

@@ -38,6 +38,9 @@ public class FormDao {
     @Autowired
     private ApplicationFormRepository applicationFormRepository;
 
+    @Autowired
+    private CallDao callDao;
+
     public FormEntity saveFormEntity(FormEntity formEntity){
         formEntity=formRepository.save(formEntity);
         return formEntity;
@@ -72,6 +75,7 @@ public class FormDao {
            }
     public FormResponseBean updateForm(Long formId, FormRequest formRequest){
         FormEntity formEntity = validateForm(formId);
+        callDao.validateUpdate(formEntity.getCall());
         Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel());
         Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,setContentResponseBean(formRequest.getContent()));
         formEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));

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

@@ -7,8 +7,6 @@ import net.gepafin.tendermanagement.entities.ApplicationFormEntity;
 @Data
 public class ApplicationFormFieldRequestBean  {
     
-    private Long id;
-
     private String fieldId;
 
     private String fieldValue;

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

@@ -11,4 +11,6 @@ public interface CallRepository extends JpaRepository<CallEntity, Long> {
 
     public CallEntity findByIdAndStatusNotIn(Long id, List<String> status);
     List<CallEntity> findByStatusIn(List<String> callStatus);
+
+  public  CallEntity findByIdAndStatus(Long id,String status);
 }

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

@@ -31,4 +31,6 @@ public interface CallService {
 	
 	CallEntity validateCall(Long callId);
 
-}
+	 CallEntity validatePublishedCall(Long callId);
+
+	}

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

@@ -87,4 +87,9 @@ public class CallServiceImpl implements CallService {
     public CallEntity validateCall(Long callId) {
     	return callDao.validateCall(callId);
     }
-}
+
+    @Override
+    public CallEntity validatePublishedCall(Long callId) {
+    return   callDao.validatePublishedCall(callId);
+    }
+    }

src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java

@@ -62,4 +62,7 @@ public class FieldValidator {
 		errors.add(errorMessage);
 		return this;
 	}
+	public static boolean isNullOrZero(Long value) {
+		return value == null || value == 0L;
+	}
 }

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

@@ -28,7 +28,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 @Validated
 public interface ApplicationApi {
 
-    @Operation(summary = "Api to create application form",
+    @Operation(summary = "Api to create or update application form",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {

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

@@ -23,7 +23,7 @@ public interface FaqApi {
                     @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<Response<FaqResponseBean>> createFaq(HttpServletRequest request, @Parameter(description = "evaluation criteria id", required = true)
+    ResponseEntity<Response<FaqResponseBean>> createFaq(HttpServletRequest request, @Parameter(description = "call id", required = true)
     @PathVariable("callId") Long callId, @Valid @RequestBody FaqReq faqRequest);
 
     @Operation(summary = "API to get FAQ by id",

src/main/resources/message_en.properties

@@ -139,6 +139,7 @@ flow.created.successfully=Flow created successfully.
 flow.fetched.successfully=Flow fetched successfully.
 flow.already.exists= Flow already exist for this call.
 flow.request.not.complete=Flow request is not complete.
+initial.and.final.form.cannot.null=Initial and final form cannot be null.
 
 # Application related messages
 application.created.success=Application successfully created.
@@ -149,6 +150,7 @@ application.not.found=Application not found with the given ID.
 application.form.field.not.found=Application form field not found.
 Form.not.matches.to.call.initial.form=Form id does not matches to initial form id of call.
 application.already.exists=Application already exists for this call.
+application.already.submitted=Application is already submitted.
 
 #Validation related messages
 validation.field.required=Field {0} is required.
@@ -162,3 +164,4 @@ current.form.incomplete=Current form is not filled.
 flow.not.found=Flow not found.
 validation.message=Validation messages.
 action.required=Action field required.
+call.not.published=Call is not published.

src/main/resources/message_it.properties

@@ -135,6 +135,7 @@ flow.created.successfully=Flusso creato con successo.
 flow.fetched.successfully=Flusso recuperato con successo.
 flow.already.exists= Il flusso esiste gi� per questa chiamata.
 flow.request.not.complete=La richiesta di flusso non � completa.
+initial.and.final.form.cannot.null=La forma iniziale e finale non possono essere nulle.
 
 # Application related messages
 application.created.success=Applicazione creata con successo.
@@ -145,6 +146,7 @@ application.not.found=Applicazione non trovata con l'ID fornito.
 application.form.field.not.found=Campo del modulo di domanda non trovato.
 Form.not.matches.to.call.initial.form=L'ID del modulo non corrisponde all'ID del modulo iniziale della chiamata.
 application.already.exists=L'applicazione esiste gi� per questa chiamata.
+application.already.submitted=La domanda è già stata inviata.
 
 #Validation related messages
 validation.field.required=Il campo {0} � obbligatorio.
@@ -157,3 +159,4 @@ current.form.incomplete=il modulo corrente non <20> compilato
 flow.not.found=Flow not found.
 validation.message=Messaggi di convalida.
 action.required=Campo azione obbligatorio.
+call.not.published=La chiamata non è stata pubblicata.