Skip to content

Commit

Permalink
CARDS-1937: Computed answers: implement deletion the value of depende…
Browse files Browse the repository at this point in the history 
…nt on change reference answers computed answers

changed the logic of searching dependent computed answers
  • Loading branch information
@sofi2002sofi
sofi2002sofi committed Feb 4, 2023
1 parent 6859057 commit f89e336
Showing 1 changed file with 47 additions and 37 deletions.
84 changes: 47 additions & 37 deletions ...s/impl/src/main/java/io/uhndata/cards/forms/internal/ReferenceAnswersChangedListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package io.uhndata.cards.forms.internal;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -65,12 +64,6 @@ public class ReferenceAnswersChangedListener implements ResourceChangeListener
public static final String VALUE = "value";
private static final Logger LOGGER = LoggerFactory.getLogger(ReferenceAnswersChangedListener.class);

/** Computed answers' paths that values need to be changed, with appropriate parent form path. **/
private final Map<String, String> toBeDeleted = new HashMap<>();

/** Set of changed reference answers' paths per form. **/
private final Map<Node, Set<String>> changedReferenceAnswers = new HashMap<>();

/** Provides access to resources. */
@Reference
private volatile ResourceResolverFactory resolverFactory;
Expand Down Expand Up @@ -116,9 +109,13 @@ private void handleEvent(final ResourceChange event)
this.rrp.push(localResolver);
NodeIterator children = form.getNodes();
final VersionManager versionManager = session.getWorkspace().getVersionManager();
checkAndUpdateAnswersValues(children, localResolver, session, versionManager);
searchComputedReferenceAnswers();
deleteComputedReferenceAnswersValues(session, versionManager);
Set<Node> nodesToBeDeleted = new HashSet<>();
Set<String> updatedReferenceAnswersPaths = checkAndUpdateAnswersValues(children, localResolver, session,
versionManager);
for (String answerPath : updatedReferenceAnswersPaths) {
nodesToBeDeleted.addAll(searchComputedReferenceAnswers(answerPath, session));
}
deleteComputedReferenceAnswersValues(nodesToBeDeleted, session, versionManager);
} catch (RepositoryException e) {
LOGGER.error(e.getMessage(), e);
} finally {
Expand All @@ -141,10 +138,11 @@ private void handleEvent(final ResourceChange event)
* @param serviceResolver a ResourceResolver that can be used for querying the JCR
* @param session a service session providing access to the repository
*/
private void checkAndUpdateAnswersValues(final NodeIterator nodeIterator, final ResourceResolver serviceResolver,
final Session session, final VersionManager versionManager)
throws RepositoryException
private Set<String> checkAndUpdateAnswersValues(final NodeIterator nodeIterator,
final ResourceResolver serviceResolver, final Session session,
final VersionManager versionManager) throws RepositoryException
{
Set<String> changedReferenceAnswersPaths = new HashSet<>();
Set<String> checkoutPaths = new HashSet<>();
while (nodeIterator.hasNext()) {
final Node node = nodeIterator.nextNode();
Expand Down Expand Up @@ -174,7 +172,7 @@ private void checkAndUpdateAnswersValues(final NodeIterator nodeIterator, final
Node changingAnswer = this.formUtils.getAnswer(formNode,
getQuestionNode(referenceAnswer, session, serviceResolver));
changingAnswer.setProperty(VALUE, sourceAnswerValue.getValue());
addChangedReferenceAnswer(formNode, referenceAnswer.getPath());
changedReferenceAnswersPaths.add(referenceAnswer.getPath());
}
}
}
Expand All @@ -183,26 +181,28 @@ private void checkAndUpdateAnswersValues(final NodeIterator nodeIterator, final
for (String path : checkoutPaths) {
versionManager.checkin(path);
}
return changedReferenceAnswersPaths;
}

private void searchComputedReferenceAnswers() throws RepositoryException
private Set<Node> searchComputedReferenceAnswers(String computedFromAnswerPath, Session session)
throws RepositoryException
{
for (Map.Entry<Node, Set<String>> changedReferenceAnswersPerForm : this.changedReferenceAnswers.entrySet()) {
final Node formNode = changedReferenceAnswersPerForm.getKey();
final NodeIterator children = formNode.getNodes();
final Set<String> changedReferenceAnswersPaths = changedReferenceAnswersPerForm.getValue();
searchForComputedReferencesAnswers(formNode, children, changedReferenceAnswersPaths);
}
final Node formNode = getParentFormNode(session.getNode(computedFromAnswerPath));
final NodeIterator children = formNode.getNodes();
return searchForComputedReferencesAnswers(children, computedFromAnswerPath);
}

private void searchForComputedReferencesAnswers(final Node parentFormNode, final NodeIterator nodes,
final Set<String> changedReferenceAnswersPaths)
private Set<Node> searchForComputedReferencesAnswers(final NodeIterator nodes,
final String changedReferenceAnswerPath)
throws RepositoryException
{
Set<Node> nodesToBeDeleted = new HashSet<>();
while (nodes.hasNext()) {
final Node node = nodes.nextNode();
if (node.isNodeType("cards:AnswerSection")) {
searchForComputedReferencesAnswers(parentFormNode, node.getNodes(), changedReferenceAnswersPaths);
nodesToBeDeleted.addAll(
searchForComputedReferencesAnswers(node.getNodes(), changedReferenceAnswerPath));
continue;
}

if (!node.hasProperty("computedFrom")) {
Expand All @@ -211,25 +211,25 @@ private void searchForComputedReferencesAnswers(final Node parentFormNode, final
Value[] computedFromPropertyValues = node.getProperty("computedFrom").getValues();

for (Value computedFromPropertyValue : computedFromPropertyValues) {
if (changedReferenceAnswersPaths.contains(computedFromPropertyValue.getString())) {
if (!changedReferenceAnswerPath.equals(computedFromPropertyValue.getString())) {
continue;
}
this.toBeDeleted.put(node.getPath(), parentFormNode.getPath());
nodesToBeDeleted.add(node);
break;
}
}
return nodesToBeDeleted;
}

private void deleteComputedReferenceAnswersValues(final Session session, final VersionManager versionManager)
throws RepositoryException
private void deleteComputedReferenceAnswersValues(final Set<Node> nodesToBeDeleted, final Session session,
final VersionManager versionManager) throws RepositoryException
{
Set<String> checkoutPaths = new HashSet<>();
for (Map.Entry<String, String> changedComputedReferenceAnswer : this.toBeDeleted.entrySet()) {
final String formPath = changedComputedReferenceAnswer.getValue();
for (Node node : nodesToBeDeleted) {
final String formPath = getParentFormNode(node).getPath();
versionManager.checkout(formPath);
checkoutPaths.add(formPath);
Node changingComputerAnswer = session.getNode(changedComputedReferenceAnswer.getKey());
changingComputerAnswer.remove();
node.remove();
}
session.save();
for (String path : checkoutPaths) {
Expand Down Expand Up @@ -278,12 +278,22 @@ private String getParentFormPath(Resource child)
return parent.getPath();
}

private void addChangedReferenceAnswer(final Node formNode, final String path)
/**
* Gets the node of the parent Form for a given descendant node.
*
* @param child node for which the parent form is sought
* @return node of the parent form
*/
private Node getParentFormNode(Node child) throws RepositoryException
{
if (this.changedReferenceAnswers.containsKey(formNode)) {
this.changedReferenceAnswers.get(formNode).add(path);
} else {
this.changedReferenceAnswers.put(formNode, Set.of(path));
Node parent = child.getParent();

if (parent == null) {
return null;
}
if (!parent.isNodeType("cards:Form")) {
return getParentFormNode(parent);
}
return parent;
}
}

0 comments on commit f89e336

Please sign in to comment.