use PATCH for reorder and omit subroute

Signed-off-by: Christian Hartmann <[email protected]>
nextcloud · Aug 14, 2024 · 2cb1b86 · 2cb1b86
1 parent 429c7c6
commit 2cb1b86
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -76,15 +76,15 @@
 		['name' => 'api#getQuestion', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}', 'verb' => 'GET', 'requirements' => $requirements_v3],
 		['name' => 'api#updateQuestion', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}', 'verb' => 'PATCH', 'requirements' => $requirements_v3],
 		['name' => 'api#deleteQuestion', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}', 'verb' => 'DELETE', 'requirements' => $requirements_v3],
-		['name' => 'api#reorderQuestions', 'url' => $apiBase . 'forms/{formId}/questions/reorder', 'verb' => 'PUT', 'requirements' => $requirements_v3],
+		['name' => 'api#reorderQuestions', 'url' => $apiBase . 'forms/{formId}/questions', 'verb' => 'PATCH', 'requirements' => $requirements_v3],
 
 		// Options
 		// ['name' => 'api#getOptions', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options', 'verb' => 'GET', 'requirements' => $requirements_v3],
 		['name' => 'api#newOption', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options', 'verb' => 'POST', 'requirements' => $requirements_v3],
 		// ['name' => 'api#getOption', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options/{optionId}', 'verb' => 'GET', 'requirements' => $requirements_v3],
 		['name' => 'api#updateOption', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options/{optionId}', 'verb' => 'PATCH', 'requirements' => $requirements_v3],
 		['name' => 'api#deleteOption', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options/{optionId}', 'verb' => 'DELETE', 'requirements' => $requirements_v3],
-		// ['name' => 'api#reorderOptions', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options/reorder', 'verb' => 'PUT', 'requirements' => $requirements_v3],
+		// ['name' => 'api#reorderOptions', 'url' => $apiBase . 'forms/{formId}/questions/{questionId}/options', 'verb' => 'PATCH', 'requirements' => $requirements_v3],
 
 		// Shares
 		// ['name' => 'shareApi#getUserShares', 'url' => $apiBase . 'shares', 'verb' => 'GET', 'requirements' => $requirements_v3],

diff --git a/src/views/Create.vue b/src/views/Create.vue
@@ -541,13 +541,10 @@ export default {
 			const newOrder = this.form.questions.map((question) => question.id)
 
 			try {
-				await axios.put(
-					generateOcsUrl(
-						'apps/forms/api/v3/forms/{id}/questions/reorder',
-						{
-							id: this.form.id,
-						},
-					),
+				await axios.patch(
+					generateOcsUrl('apps/forms/api/v3/forms/{id}/questions', {
+						id: this.form.id,
+					}),
 					{
 						newOrder,
 					},

diff --git a/tests/Integration/Api/ApiV3Test.php b/tests/Integration/Api/ApiV3Test.php
@@ -828,7 +828,7 @@ public function dataReorderQuestions() {
 	 * @param array $fullFormExpected
 	 */
 	public function testReorderQuestions(array $fullFormExpected): void {
-		$resp = $this->http->request('PUT', "api/v3/forms/{$this->testForms[0]['id']}/questions/reorder", [
+		$resp = $this->http->request('PATCH', "api/v3/forms/{$this->testForms[0]['id']}/questions", [
 			'json' => [
 				'newOrder' => [
 					$this->testForms[0]['questions'][1]['id'],

diff --git a/tests/Unit/Service/SubmissionServiceTest.php b/tests/Unit/Service/SubmissionServiceTest.php
@@ -138,6 +138,7 @@ public function setUp(): void {
 			$this->questionMapper,
 			$this->submissionMapper,
 			$this->answerMapper,
+			$this->uploadedFileMapper,
 			$this->storage,
 			$this->config,
 			$this->l10n,
@@ -148,7 +149,6 @@ public function setUp(): void {
 			$this->tempManager,
 			$this->formsService,
 			$this->urlGenerator,
-			$this->uploadedFileMapper,
 		);
 	}