fix: backend support for multiple active branches

Signed-off-by: TimedIn <git@timedin.net>

Author: timedin-de

lib/Controller/ApiController.php

@@ -2169,9 +2169,8 @@ private function storeConditionalAnswer(Form $form, int $submissionId, array $qu
 			}
 		}
 
-		// Store subquestion answers only for the branch the trigger activated
-		$activeBranch = $this->submissionService->getActiveBranch($question, $triggerAnswers);
-		$branches = $activeBranch === null ? [] : [$activeBranch];
+		// Store subquestion answers only for the branches the trigger activated
+		$branches = $this->submissionService->getActiveBranches($question, $triggerAnswers);
 		foreach ($branches as $branch) {
 			$branchSubQuestions = $branch['subQuestions'] ?? [];
 			foreach ($branchSubQuestions as $subQuestion) {

lib/Service/SubmissionService.php

@@ -473,7 +473,7 @@ private function escapeCSV(string $value): string {
 	 * @param array $questions Array of the questions of the form
 	 * @param array $answers Array of the submitted answers
 	 * @param string $formOwnerId Owner of the form
-	 * @throw \InvalidArgumentException if validation failed
+	 * @throws \InvalidArgumentException if validation failed
 	 */
 	public function validateSubmission(array $questions, array $answers, string $formOwnerId): void {
 		// Check by questions
@@ -767,10 +767,10 @@ private function validateConditionalQuestion(array $question, array $answerData,
 			throw new \InvalidArgumentException(sprintf('Conditional question "%s" is missing trigger type configuration.', $question['text']));
 		}
 
-		// Find the active branch based on trigger answer
-		$activeBranch = $this->findActiveBranch($triggerType, $triggerAnswer, $branches, $question['options'] ?? []);
+		// Find the active branches based on trigger answer
+		$activeBranches = $this->findActiveBranches($triggerType, $triggerAnswer, $branches, $question['options'] ?? []);
 
-		if ($activeBranch === null && !empty($branches)) {
+		if (\count($activeBranches) === 0 && !empty($branches)) {
 			// No branch matched but branches are defined - this might be okay if trigger has no value yet
 			// Only throw if trigger has a value that doesn't match any branch
 			if (!empty($triggerAnswer)) {
@@ -783,8 +783,10 @@ private function validateConditionalQuestion(array $question, array $answerData,
 		}
 
 		// Validate the active branch's subquestions with the full per-question rules
-		if ($activeBranch !== null && isset($activeBranch['subQuestions'])) {
-			$this->validateSubmission($activeBranch['subQuestions'], $subQuestionAnswers, $formOwnerId);
+		if (\count($activeBranches) > 0) {
+			// Merge subquestion of all active branches
+			$subQuestions = array_merge(...array_column($activeBranches, 'subQuestions'));
+			$this->validateSubmission($subQuestions, $subQuestionAnswers, $formOwnerId);
 		}
 	}
 
@@ -793,11 +795,11 @@ private function validateConditionalQuestion(array $question, array $answerData,
 	 *
 	 * @param array $question The conditional question
 	 * @param array $triggerAnswer The trigger answer values
-	 * @return array|null The active branch or null if none matches
+	 * @return array The active branches or empty array if none matches
 	 */
-	public function getActiveBranch(array $question, array $triggerAnswer): ?array {
+	public function getActiveBranches(array $question, array $triggerAnswer): ?array {
 		$extraSettings = $question['extraSettings'] ?? [];
-		return $this->findActiveBranch(
+		return $this->findActiveBranches(
 			$extraSettings['triggerType'] ?? '',
 			$triggerAnswer,
 			$extraSettings['branches'] ?? [],
@@ -806,30 +808,22 @@ public function getActiveBranch(array $question, array $triggerAnswer): ?array {
 	}
 
 	/**
-	 * Find the active branch based on trigger answer
+	 * Find the active branches based on trigger answer
 	 *
 	 * @param string $triggerType The type of the trigger question
 	 * @param array $triggerAnswer The trigger answer values
 	 * @param array $branches The available branches
 	 * @param array $options The options for the trigger question
-	 * @return array|null The active branch or null if none matches
+	 * @return array The active branches or empty array if none matches
 	 */
-	private function findActiveBranch(string $triggerType, array $triggerAnswer, array $branches, array $options): ?array {
-		foreach ($branches as $branch) {
+	private function findActiveBranches(string $triggerType, array $triggerAnswer, array $branches, array $options): ?array {
+		return array_filter($branches, function ($branch) use ($triggerType, $triggerAnswer) {
 			$conditions = $branch['conditions'] ?? [];
-
 			if (empty($conditions)) {
-				continue;
-			}
-
-			$matches = $this->evaluateBranchConditions($triggerType, $triggerAnswer, $conditions);
-
-			if ($matches) {
-				return $branch;
+				return false;
 			}
-		}
-
-		return null;
+			return $this->evaluateBranchConditions($triggerType, $triggerAnswer, $conditions);
+		});
 	}
 
 	/**