update submission

Signed-off-by: Christian Hartmann <[email protected]>

Author: Chartman123

lib/Controller/ApiController.php

@@ -1346,7 +1346,7 @@ public function newSubmission(int $formId, array $answers, string $shareHash = '
 				continue;
 			}
 
-			$this->storeAnswersForQuestion($form, $submission->getId(), $questions[$questionIndex], $answerArray, false);
+			$this->storeAnswersForQuestion($form, $submission->getId(), $questions[$questionIndex], $answerArray);
 		}
 
 		$this->formMapper->update($form);
@@ -1393,47 +1393,45 @@ public function updateSubmission(int $formId, int $submissionId, array $answers,
 		}
 
 		$questions = $this->formsService->getQuestions($formId);
-		// Is the submission valid
-		$isSubmissionValid = $this->submissionService->validateSubmission($questions, $answers, $form->getOwnerId());
-		if (is_string($isSubmissionValid)) {
-			throw new OCSBadRequestException($isSubmissionValid);
-		}
-		if ($isSubmissionValid === false) {
-			throw new OCSBadRequestException('At least one submitted answer is not valid');
+		try {
+			// Is the submission valid
+			$this->submissionService->validateSubmission($questions, $answers, $form->getOwnerId());
+		} catch (\InvalidArgumentException $e) {
+			throw new OCSBadRequestException($e->getMessage());
 		}
 
 		// get existing submission of this user
 		try {
-			$submission = $this->submissionMapper->findById($form->getId());
+			$submission = $this->submissionMapper->findById($submissionId);
 		} catch (DoesNotExistException $e) {
-			throw new OCSBadRequestException('Cannot update a non existing submission');
+			throw new OCSBadRequestException('Submission doesn\'t exist');
+		}
+
+		if ($formId !== $submission->getFormId()) {
+			throw new OCSBadRequestException('Submission doesn\'t belong to given form');
 		}
 
-		if ($this->currentUser->getUID() != $submission->getUserId()) {
+		if ($this->currentUser->getUID() !== $submission->getUserId()) {
 			throw new OCSForbiddenException('Can only update your own submissions');
 		}
 
 		$submission->setTimestamp(time());
 		$this->submissionMapper->update($submission);
 
-		if (empty($answers)) {
-			// Clear Answers
-			foreach ($questions as $question) {
-				$this->storeAnswersForQuestion($form, $submission->getId(), $question, [''], true);
+		// Delete current answers
+		$this->answerMapper->deleteBySubmission($submissionId);
+
+		// Process Answers
+		foreach ($answers as $questionId => $answerArray) {
+			// Search corresponding Question, skip processing if not found
+			$questionIndex = array_search($questionId, array_column($questions, 'id'));
+			if ($questionIndex === false) {
+				continue;
 			}
-		} else {
-			// Process Answers
-			foreach ($answers as $questionId => $answerArray) {
-				// Search corresponding Question, skip processing if not found
-				$questionIndex = array_search($questionId, array_column($questions, 'id'));
-				if ($questionIndex === false) {
-					continue;
-				}
 
-				$question = $questions[$questionIndex];
+			$question = $questions[$questionIndex];
 
-				$this->storeAnswersForQuestion($form, $submission->getId(), $question, $answerArray, true);
-			}
+			$this->storeAnswersForQuestion($form, $submission->getId(), $question, $answerArray);
 		}
 
 		//Create Activity
@@ -1655,23 +1653,14 @@ public function uploadFiles(int $formId, int $questionId, string $shareHash = ''
 	// private functions
 
 	/**
-	 * Insert or update answers for a question
+	 * Insert answers for a question
 	 *
 	 * @param Form $form
 	 * @param int $submissionId
 	 * @param array $question
 	 * @param string[]|array<array{uploadedFileId: string, uploadedFileName: string}> $answerArray
-	 * @param bool $update
 	 */
-	private function storeAnswersForQuestion(Form $form, int $submissionId, array $question, array $answerArray, bool $update): void {
-		// get stored answers for this question
-		$storedAnswers = [];
-		if ($update) {
-			$storedAnswers = $this->answerMapper->findBySubmissionAndQuestion($submissionId, $question['id']);
-		}
-
-		$newAnswerTexts = [];
-		
+	private function storeAnswersForQuestion(Form $form, $submissionId, array $question, array $answerArray): void {
 		foreach ($answerArray as $answer) {
 			$answerEntity = new Answer();
 			$answerEntity->setSubmissionId($submissionId);
@@ -1688,33 +1677,6 @@ private function storeAnswersForQuestion(Form $form, int $submissionId, array $q
 				} elseif (!empty($question['extraSettings']['allowOtherAnswer']) && strpos($answer, Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX) === 0) {
 					$answerText = str_replace(Constants::QUESTION_EXTRASETTINGS_OTHER_PREFIX, '', $answer);
 				}
-
-				if (!array_key_exists($question['id'], $newAnswerTexts)) {
-					$newAnswerTexts[$question['id']] = [];
-				}
-				$newAnswerTexts[$question['id']][] = $answerText;
-
-				// has this answer already been stored?
-				$foundAnswer = false;
-				foreach ($storedAnswers as $storedAnswer) {
-					if ($storedAnswer->getText() == $answerText) {
-						// nothing to be changed
-						$foundAnswer = true;
-						break;
-					}
-				}
-				if (!$foundAnswer) {
-					if ($answerText === '') {
-						continue;
-					}
-					// need to add answer
-					$answerEntity = new Answer();
-					$answerEntity->setSubmissionId($submissionId);
-					$answerEntity->setQuestionId($question['id']);
-					$answerEntity->setText($answerText);
-					$this->answerMapper->insert($answerEntity);
-				}
-
 			} elseif ($question['type'] === Constants::ANSWER_TYPE_FILE) {
 				$uploadedFile = $this->uploadedFileMapper->getByUploadedFileId($answer['uploadedFileId']);
 				$answerEntity->setFileId($uploadedFile->getFileId());
@@ -1734,43 +1696,20 @@ private function storeAnswersForQuestion(Form $form, int $submissionId, array $q
 				$file->move($folder->getPath() . '/' . $name);
 
 				$answerText = $name;
-
-				$answerEntity->setText($answerText);
-				$this->answerMapper->insert($answerEntity);
 			} else {
 				$answerText = $answer; // Not a multiple-question, answerText is given answer
+			}
 
-				if (!empty($storedAnswers)) {
-					$answerEntity = $storedAnswers[0];
-					$answerEntity->setText($answerText);
-					$this->answerMapper->update($answerEntity);
-				} else {
-					if ($answerText === '') {
-						continue;
-					}
-					$answerEntity = new Answer();
-					$answerEntity->setSubmissionId($submissionId);
-					$answerEntity->setQuestionId($question['id']);
-					$answerEntity->setText($answerText);
-					$this->answerMapper->insert($answerEntity);
-				}
+			if ($answerText === '') {
+				continue;
 			}
 
+			$answerEntity->setText($answerText);
+			$this->answerMapper->insert($answerEntity);
 			if ($uploadedFile) {
 				$this->uploadedFileMapper->delete($uploadedFile);
 			}
 		}
-
-		if (in_array($question['type'], Constants::ANSWER_TYPES_PREDEFINED)) {
-			// drop all answers that are not in new set of answers
-			foreach ($storedAnswers as $storedAnswer) {
-				$questionId = $storedAnswer->getQuestionId();
-
-				if (empty($newAnswerTexts[$questionId]) || !in_array($storedAnswer->getText(), $newAnswerTexts[$questionId])) {
-					$this->answerMapper->delete($storedAnswer);
-				}
-			}
-		}
 	}
 
 	private function loadFormForSubmission(int $formId, string $shareHash): Form {

lib/Db/AnswerMapper.php

@@ -41,26 +41,6 @@ public function findBySubmission(int $submissionId): array {
 		return $this->findEntities($qb);
 	}
 
-	/**
-	 * @param int $submissionId
-	 * @param int $questionId
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
-	 * @return Answer[]
-	 */
-
-	public function findBySubmissionAndQuestion(int $submissionId, int $questionId): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('submission_id', $qb->createNamedParameter($submissionId, IQueryBuilder::PARAM_INT)),
-				$qb->expr()->eq('question_id', $qb->createNamedParameter($questionId, IQueryBuilder::PARAM_INT))
-			);
-
-		return $this->findEntities($qb);
-	}
-
 	/**
 	 * @param int $submissionId
 	 */

lib/Service/FormsService.php

@@ -375,9 +375,9 @@ public function canSubmit(Form $form): bool {
 			return true;
 		}
 
-		// Refuse access, if submitMultiple is not set and allowEdit is not set and user already has taken part.
+		// Refuse access, if submitMultiple is not set and user already has taken part.
 		if (
-			!$form->getSubmitMultiple() && !$form->getAllowEdit() &&
+			!$form->getSubmitMultiple() &&
 			$this->submissionMapper->hasFormSubmissionsByUser($form, $this->currentUser->getUID())
 		) {
 			return false;