consolidate requests upon voting

Signed-off-by: dartcafe <[email protected]>
nextcloud · Aug 31, 2024 · 5ac9ce2 · 5ac9ce2
1 parent 8f1961b
commit 5ac9ce2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/Controller/VoteController.php b/lib/Controller/VoteController.php
@@ -8,6 +8,8 @@
 
 namespace OCA\Polls\Controller;
 
+use OCA\Polls\Service\OptionService;
+use OCA\Polls\Service\PollService;
 use OCA\Polls\Service\VoteService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
@@ -21,7 +23,9 @@ class VoteController extends BaseController {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private VoteService $voteService
+		private VoteService $voteService,
+		private PollService $pollService,
+		private OptionService $optionService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -44,7 +48,12 @@ public function list(int $pollId): JSONResponse {
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	public function set(int $optionId, string $setTo): JSONResponse {
-		return $this->response(fn () => ['vote' => $this->voteService->set($optionId, $setTo)]);
+		$option = $this->optionService->get($optionId);
+		return $this->response(fn () => [
+			'vote' => $this->voteService->set($optionId, $setTo),
+			'poll' => $this->pollService->get($option->getPollId()),
+			'options' => $this->optionService->list($option->getPollId()),
+			]);
 	}
 
 	/**

diff --git a/lib/Service/OptionService.php b/lib/Service/OptionService.php
@@ -47,6 +47,9 @@ public function __construct(
 		$this->options = [];
 	}
 
+	public function get(int $optionId): Option {
+		return $this->optionMapper->find($optionId);
+	}
 	/**
 	 * Get all options of given poll
 	 *

diff --git a/src/js/store/modules/votes.js b/src/js/store/modules/votes.js
@@ -101,8 +101,10 @@ const actions = {
 				response = await VotesAPI.setVote(payload.option.id, payload.setTo)
 			}
 			context.commit('setItem', { option: payload.option, pollId: context.rootState.poll.id, vote: response.data.vote })
-			context.dispatch('options/list', null, { root: true })
-			context.dispatch('poll/get', null, { root: true })
+			context.commit('options/set', { options: response.data.options }, { root: true })
+			context.commit('poll/set', { poll: response.data.poll }, { root: true })
+			// context.dispatch('options/list', null, { root: true })
+			// context.dispatch('poll/get', null, { root: true })
 			return response
 		} catch (error) {
 			if (error?.code === 'ERR_CANCELED') return