CARDS-2571: Reference Questions do not work inside Conditional Sections

Fix bug where incorrect form would be prioritized
data-team-uhn · Nov 8, 2024 · 2dc5c5b · 2dc5c5b
1 parent 2987bc3
commit 2dc5c5b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...odel/forms/impl/src/main/java/io/uhndata/cards/forms/internal/ReferenceAnswersEditor.java b/...odel/forms/impl/src/main/java/io/uhndata/cards/forms/internal/ReferenceAnswersEditor.java
@@ -222,8 +222,7 @@ private void iterateAnswers(final NodeBuilder node, Set<NodeBuilder> unlinkedRef
                     Node sourceAnswer = this.serviceSession.getNode(
                         node.getProperty("copiedFrom").getValue(Type.REFERENCE));
                     Node form = this.formUtils.getForm(sourceAnswer);
-                    String questionnaireId = this.formUtils.getQuestionnaireIdentifier(form);
-                    sourceForms.add(questionnaireId);
+                    sourceForms.add(form.getIdentifier());
                 }
             } catch (RepositoryException e) {
                 // Unable to process answer - do nothing
@@ -382,7 +381,7 @@ private ReferenceAnswer getAnswer(String questionPath, Set<String> sourceForms)
                 Node answer;
                 // Prioritize answers in forms that are already referenced
                 Optional<Node> priorityAnswer = answers.stream().filter(a ->
-                    sourceForms.contains(this.formUtils.getQuestionnaireIdentifier(this.formUtils.getForm(a))))
+                    sourceForms.contains(getIdentifierOrNull(this.formUtils.getForm(a))))
                     .findAny();
                 if (priorityAnswer.isPresent()) {
                     answer = priorityAnswer.get();
@@ -401,6 +400,15 @@ private ReferenceAnswer getAnswer(String questionPath, Set<String> sourceForms)
         return null;
     }
 
+    private String getIdentifierOrNull(Node node)
+    {
+        try {
+            return node.getIdentifier();
+        } catch (RepositoryException e) {
+            return null;
+        }
+    }
+
     private Object serializeValue(final Object rawValue)
     {
         if (rawValue instanceof Calendar) {