Merge pull request #3822 from nextcloud/fix/vote-limit-check/master

fix vote limit check

lib/Service/VoteService.php

@@ -15,6 +15,7 @@
 use OCA\Polls\Db\Vote;
 use OCA\Polls\Db\VoteMapper;
 use OCA\Polls\Event\VoteSetEvent;
+use OCA\Polls\Exceptions\NotFoundException;
 use OCA\Polls\Exceptions\VoteLimitExceededException;
 use OCA\Polls\Model\Acl as Acl;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -42,7 +43,7 @@ public function __construct(
 	public function list(int $pollId): array {
 		$poll = $this->pollMapper->find($pollId);
 		$poll->request(Poll::PERMISSION_POLL_VIEW);
-		
+
 		if (!$poll->getIsAllowed(Poll::PERMISSION_POLL_RESULTS_VIEW)) {
 			// Just return the participants votes, no further anoymizing or obfuscating is nessecary
 			return $this->voteMapper->findByPollAndUser($pollId, ($this->acl->getCurrentUserId()));
@@ -65,6 +66,18 @@ private function checkLimits(Option $option): void {
 		return;
 	}
 
+	private function checkVoteLimit(Option $option): void {
+		// check, if the optionlimit is reached or exceeded, if one is set
+		if ($option->getIsLockedByOptionLimit()) {
+			throw new VoteLimitExceededException();
+		}
+
+		if ($option->getIsLockedByVotesLimit()) {
+			throw new VoteLimitExceededException;
+		}
+		return;
+	}
+
 	/**
 	 * Set vote
 	 */
@@ -73,6 +86,11 @@ public function set(int $optionId, string $setTo): ?Vote {
 		$poll = $this->pollMapper->find($option->getPollId());
 		$poll->request(Poll::PERMISSION_VOTE_EDIT);
 
+		if ($option->getIsLocked()) {
+			$this->checkVoteLimit($option);
+			throw new NotFoundException();
+		}
+
 		try {
 			$this->vote = $this->voteMapper->findSingleVote($poll->getId(), $option->getPollOptionText(), $this->acl->getCurrentUserId());
 

src/js/components/VoteTable/VoteItem.vue

@@ -102,6 +102,10 @@ export default {
 				})
 				showSuccess(t('polls', 'Vote saved'), { timeout: 2000 })
 			} catch (e) {
+				if (e.response.status === 409 && e.response.data.message === 'Vote limit exceeded') {
+					showError(t('polls', 'Vote already booked out'))
+					return
+				}
 				showError(t('polls', 'Error saving vote'))
 			}
 		},

src/js/store/modules/votes.js

@@ -112,6 +112,7 @@ const actions = {
 				context.dispatch('list')
 				context.dispatch('options/list', null, { root: true })
 				context.dispatch('poll/get', null, { root: true })
+				throw error
 			} else {
 				Logger.error('Error setting vote', { error, payload })
 				throw error