Merge pull request #192 from Kitzanos/feature/GEPAFINBE-157
GEPAFINBE-157(Remove Criteria Validation for Form Creation)
This commit is contained in:
@@ -36,6 +36,8 @@ import java.util.stream.Collectors;
|
|||||||
@Component
|
@Component
|
||||||
public class FormDao {
|
public class FormDao {
|
||||||
|
|
||||||
|
private final Logger log = LoggerFactory.getLogger(FormDao.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private FormRepository formRepository;
|
private FormRepository formRepository;
|
||||||
|
|
||||||
@@ -203,8 +205,9 @@ public class FormDao {
|
|||||||
String formFieldId,Long evaluationCriteriaId) {
|
String formFieldId,Long evaluationCriteriaId) {
|
||||||
EvaluationCriteriaEntity evaluationCriteria = evaluationCriteriaService.validateEvaluationCriteria(evaluationCriteriaId);
|
EvaluationCriteriaEntity evaluationCriteria = evaluationCriteriaService.validateEvaluationCriteria(evaluationCriteriaId);
|
||||||
if (Boolean.FALSE.equals(evaluationCriteria.getCall().getId().equals(callEntity.getId()))) {
|
if (Boolean.FALSE.equals(evaluationCriteria.getCall().getId().equals(callEntity.getId()))) {
|
||||||
throw new CustomValidationException(Status.VALIDATION_ERROR,
|
log.info("This evaluation criterion does not belong to the current call. Expected Call ID = {}, Found Call ID = {}",
|
||||||
Translator.toLocale(GepafinConstant.EVALUATIONCRITERIA_INVALID));
|
callEntity.getId(), evaluationCriteria.getCall().getId());
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
CriteriaFormFieldEntity criteriaFormField = new CriteriaFormFieldEntity();
|
CriteriaFormFieldEntity criteriaFormField = new CriteriaFormFieldEntity();
|
||||||
criteriaFormField.setCallId(callEntity.getId());
|
criteriaFormField.setCallId(callEntity.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user