avniproject/avni-webapp#1257 | User friendly error messages

avniproject · Sep 27, 2024 · ac536da · ac536da
1 parent e3a21e2
commit ac536da
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/service/FormService.java b/avni-server-api/src/main/java/org/avni/server/service/FormService.java
@@ -157,24 +157,24 @@ public void validateForm(FormContract formContract) throws InvalidObjectExceptio
                         !conceptUuid.equals(PLACEHOLDER_CONCEPT_UUID) &&
                         !uniqueConcepts.add(conceptUuid)) {
                     throw new InvalidObjectException(String.format(
-                            "Cannot use same concept twice. Form{uuid='%s',..} uses Concept{uuid='%s',..} twice",
+                            "Cannot use same concept twice. Form{uuid='%s',..} uses Concept{name='%s',..} twice",
                             formContract.getUuid(),
-                            conceptUuid));
+                            conceptName));
                 }
                 String conceptDataType = formElement.getConcept().getDataType();
                 if (conceptDataType != null && multiSelectTypes.contains(ConceptDataType.valueOf(conceptDataType))) {
                     FormElement existingFormElement = formElementRepository.findByUuid(formElement.getUuid());
                     if (existingFormElement != null) {
                         if (!existingFormElement.getType().equals(formElement.getType())) {
-                            throw new InvalidObjectException("Cannot change from Single to Multi Select or vice versa");
+                            throw new InvalidObjectException(String.format("Cannot change from Single to Multi Select or vice versa for form element: %s", existingFormElement.getName()));
                         }
                     }
                 }
                 if  (formElement.getConcept().isQuestionGroup()) {
                     FormElement existingFormElement = formElementRepository.findByUuid(formElement.getUuid());
                     if (existingFormElement != null) {
                         if (!existingFormElement.getKeyValues().get(KeyType.repeatable).equals(formElement.getKeyValues().get(KeyType.repeatable))) {
-                            throw new InvalidObjectException("Cannot change from Repeatable to Non Repeatable or vice versa");
+                            throw new InvalidObjectException(String.format("Cannot change from Repeatable to Non Repeatable or vice versa for form element: %s", existingFormElement.getName()));
                         }
                     }
                 }