Merge pull request #386 from nextcloud/fix/result_order

lib/Controller/ApiController.php

@@ -648,16 +648,8 @@ class ApiController extends Controller {
 			$submissions[] = $submission;
 		}
 
-		// Load question-texts, including deleted ones.
-		try {
-			$questionEntities = $this->questionMapper->findByForm($form->getId());
-		} catch (DoesNotExistException $e) {
-			//handle silently
-		}
-		$questions = [];
-		foreach ($questionEntities as $questionEntity) {
-			$questions[] = $questionEntity->read();
-		}
+		// Load currently active questions
+		$questions = $this->formsService->getQuestions($form->getId());
 
 		$response = [
 			'submissions' => $submissions,

lib/Service/FormsService.php

@@ -85,7 +85,12 @@ class FormsService {
 		$this->currentUser = $userSession->getUser();
 	}
 
-
+	/**
+	 * Load options corresponding to question
+	 *
+	 * @param integer $questionId
+	 * @return array
+	 */
 	public function getOptions(int $questionId): array {
 		$optionList = [];
 		try {
@@ -100,6 +105,12 @@ class FormsService {
 		}
 	}
 
+	/**
+	 * Load questions corresponding to form
+	 *
+	 * @param integer $formId
+	 * @return array
+	 */
 	public function getQuestions(int $formId): array {
 		$questionList = [];
 		try {