feat: introduce Grid as a new question type

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Controller/ApiController.php

@@ -1704,7 +1704,6 @@ private function storeAnswersForQuestion(Form $form, $submissionId, array $quest
 
 			$answerText = '';
 			$uploadedFile = null;
-			// fixme: properly handle grid values (consider create new column)
 			// Are we using answer ids as values
 			if (in_array($question['type'], Constants::ANSWER_TYPES_PREDEFINED) && $question['type'] !== Constants::ANSWER_TYPE_LINEARSCALE) {
 				// Search corresponding option, skip processing if not found
@@ -1733,6 +1732,8 @@ private function storeAnswersForQuestion(Form $form, $submissionId, array $quest
 				$file->move($folder->getPath() . '/' . $name);
 
 				$answerText = $name;
+			} elseif ($question['type'] === Constants::ANSWER_TYPE_GRID) {
+				$answerText = json_encode($answer);
 			} else {
 				$answerText = $answer; // Not a multiple-question, answerText is given answer
 			}

lib/ResponseDefinitions.php

@@ -39,7 +39,8 @@
  *   timeMin?: int,
  *   timeRange?: bool,
  *   validationRegex?: string,
- *   validationType?: string
+ *   validationType?: string,
+ *   questionType?: string,
  * }
  *
  * @psalm-type FormsQuestionType = "dropdown"|"multiple"|"multiple_unique"|"date"|"time"|"short"|"long"|"file"|"datetime"|"grid"

lib/Service/SubmissionService.php

@@ -432,7 +432,6 @@ public function validateSubmission(array $questions, array $answers, string $for
 				throw new \InvalidArgumentException(sprintf('Question "%s" can only have two answers.', $question['text']));
 			} elseif ($answersCount > 1
 						&& $question['type'] !== Constants::ANSWER_TYPE_FILE
-						// todo: improve this for grid, add mandatory?
 						&& $question['type'] !== Constants::ANSWER_TYPE_GRID
 						&& !($question['type'] === Constants::ANSWER_TYPE_DATE && isset($question['extraSettings']['dateRange'])
 						|| $question['type'] === Constants::ANSWER_TYPE_TIME && isset($question['extraSettings']['timeRange']))) {

tests/Unit/Service/FormsServiceTest.php

@@ -212,12 +212,14 @@ public function dataGetForm() {
 								'questionId' => 1,
 								'text' => 'Option 1',
 								'order' => null,
+                                'optionType' => null,
 							],
 							[
 								'id' => 2,
 								'questionId' => 1,
 								'text' => 'Option 2',
 								'order' => null,
+                                'optionType' => null,
 							]
 						],
 						'accept' => [],