Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

refactoring vote checks

Browse Source
This commit is contained in:
m 2018-04-06 21:16:28 +02:00
parent c4f27dc6e0
commit 179235eaf9
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/classes/Framadate/Services/PollService.php
View File

@ -88,23 +88,13 @@ class PollService {
* @param $name * @param $name
* @param $choices * @param $choices
* @param $slots_hash * @param $slots_hash
* @throws AlreadyExistsException
* @throws ConcurrentEditionException * @throws ConcurrentEditionException
* @throws ConcurrentVoteException * @throws ConcurrentVoteException
* @return bool * @return bool
*/ */
public function updateVote($poll_id, $vote_id, $name, $choices, $slots_hash) { public function updateVote($poll_id, $vote_id, $name, $choices, $slots_hash) {
$poll = $this->findById($poll_id); $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id);
// Check that no-one voted in the meantime and it conflicts the maximum votes constraint
$this->checkMaxVotes($choices, $poll, $poll_id);
// Check if slots are still the same
$this->checkThatSlotsDidntChanged($poll, $slots_hash);
// Check if vote already exists with the same name
if ($this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id)) {
throw new AlreadyExistsException();
}
// Update vote // Update vote
$choices = implode($choices); $choices = implode($choices);
@ -122,18 +112,7 @@ class PollService {
* @return \stdClass * @return \stdClass
*/ */
function addVote($poll_id, $name, $choices, $slots_hash) { function addVote($poll_id, $name, $choices, $slots_hash) {
$poll = $this->findById($poll_id); $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, NULL);
// Check that no-one voted in the meantime and it conflicts the maximum votes constraint
$this->checkMaxVotes($choices, $poll, $poll_id);
// Check if slots are still the same
$this->checkThatSlotsDidntChanged($poll, $slots_hash);
// Check if vote already exists
if ($this->voteRepository->existsByPollIdAndName($poll_id, $name)) {
throw new AlreadyExistsException();
}
// Insert new vote // Insert new vote
$choices = implode($choices); $choices = implode($choices);
@ -145,7 +124,8 @@ class PollService {
if ($this->commentRepository->exists($poll_id, $name, $comment)) { if ($this->commentRepository->exists($poll_id, $name, $comment)) {
return true; return true;
} }
return $this->commentRepository->insert($poll_id, $name, $comment);
return $this->commentRepository->insert($poll_id, $name, $comment);
} }
/** /**
@ -313,6 +293,37 @@ class PollService {
return Token::getToken($length); return Token::getToken($length);
} }
/**
* @param $choices
* @param $poll_id
* @param $slots_hash
* @param $name
* @param string|NULL $vote_id
* @throws AlreadyExistsException
* @throws ConcurrentVoteException
* @throws ConcurrentEditionException
*/
private function checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id) {
// Check if vote already exists with the same name
if (!isset($vote_id)) {
$exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name);
} else {
$exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id);
}
if ($exists) {
throw new AlreadyExistsException();
}
$poll = $this->findById($poll_id);
// Check that no-one voted in the meantime and it conflicts the maximum votes constraint
$this->checkMaxVotes($choices, $poll, $poll_id);
// Check if slots are still the same
$this->checkThatSlotsDidntChanged($poll, $slots_hash);
}
/** /**
* This method checks if the hash send by the user is the same as the computed hash. * This method checks if the hash send by the user is the same as the computed hash.
* *