avniproject/avni-webapp#1257 | Fix for broken tests

avniproject · Sep 24, 2024 · ce290f3 · ce290f3
1 parent 92cd113
commit ce290f3
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -161,7 +161,8 @@ public void validateForm(FormContract formContract) throws InvalidObjectExceptio
                             formContract.getUuid(),
                             conceptUuid));
                 }
-                if (multiSelectTypes.contains(ConceptDataType.valueOf(formElement.getConcept().getDataType()))) {
+                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())) {