From 8f4c5122c3d111f58a5283ae5f1d33c9404f5c5b Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Thu, 2 Apr 2015 22:56:31 +0200 Subject: [PATCH 1/5] Add protection not to generate 2 identical IDs --- admin/stdout.log | 19 --- app/classes/Framadate/FramaDB.php | 10 +- .../Framadate/Services/PollService.php | 6 +- creation_sondage.php | 122 ------------------ 4 files changed, 13 insertions(+), 144 deletions(-) delete mode 100644 admin/stdout.log delete mode 100644 creation_sondage.php diff --git a/admin/stdout.log b/admin/stdout.log deleted file mode 100644 index 9bbf676..0000000 --- a/admin/stdout.log +++ /dev/null @@ -1,19 +0,0 @@ -20150228 182306 [EXPIRATION] Going to purge 13 poll(s)... -20150228 182307 [EXPIRATION_SUCCESS] id: 4hivgatchum83trk, title:Essai Beta, format: D, admin: Olivier -20150228 182307 [EXPIRATION_SUCCESS] id: 5pcnnw15pi2vkk3p, title:dsdfds, format: D, admin: kjlkj -20150228 182307 [EXPIRATION_SUCCESS] id: bsr43n7u7e9wd149, title:Verre de l'amitié, format: D, admin: Hub -20150228 182307 [EXPIRATION_SUCCESS] id: cnz4nzqy9s88fxp2, title:Sortie Bergère le 31 octobre 2014, format: D, admin: Sophie -20150228 182307 [EXPIRATION_SUCCESS] id: gq1jz2f6hz93vdma, title:Signature Formats Ouverts Éducation, format: A, admin: Quentin -20150228 182308 [EXPIRATION_SUCCESS] id: huubu9csxjai36t5, title:Révision des salaires des permantents framasoft, format: A, admin: Luc -20150228 182308 [EXPIRATION_SUCCESS] id: jtk2bwokdzgk2u8g, title:Formation borne, format: D, admin: Maxime -20150228 182308 [EXPIRATION_SUCCESS] id: k9qefueia6b78u6n, title:Déj ou bière, format: D, admin: Valentin -20150228 182308 [EXPIRATION_SUCCESS] id: lk9hiju93fvodb7x, title:Réunion carnet hypothèse , format: D, admin: Jocelyn Aznar -20150228 182308 [EXPIRATION_SUCCESS] id: qtu6l5rpp6umwhbr, title:Réunion Gitoyen d'octobre 2014, format: D, admin: olive -20150228 182308 [EXPIRATION_SUCCESS] id: rz3kt5wajmyxhv4h, title:AJIL Paris novembre 2014, format: D, admin: olive -20150228 182309 [EXPIRATION_SUCCESS] id: v9whjlr77txwa24b, title:Présentation du Projet Santé Trans' pour les UEEH, format: D, admin: Lou -20150228 182309 [EXPIRATION_SUCCESS] id: wor85ej6td1b7v3c, title:test, format: D, admin: test -20150228 182405 [DELETE_SLOT] id:kczrqvormnd34n23, slot:toto -20150228 182437 [EXPIRATION] Going to purge 1 poll(s)... -20150228 182437 [EXPIRATION_SUCCESS] id: yzno16w3x423kguz, title:Atelier audit JS, format: A, admin: Armony -20150228 191645 [EXPIRATION] Going to purge 1 poll(s)... -20150228 191645 [EXPIRATION_SUCCESS] id: 3tkz9zcfs7odkdk5, title:aaa, format: A, admin: moimoi diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php index d9743be..0cd4478 100644 --- a/app/classes/Framadate/FramaDB.php +++ b/app/classes/Framadate/FramaDB.php @@ -82,13 +82,21 @@ class FramaDB { function findPollById($poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?'); - $prepared->execute([$poll_id]); + $prepared->execute(array($poll_id)); $poll = $prepared->fetch(); $prepared->closeCursor(); return $poll; } + public function existsById($poll_id) { + $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?'); + + $prepared->execute(array($poll_id)); + + return $prepared->rowCount() > 0; + } + function updatePoll($poll) { $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=? WHERE id = ?'); diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php index cf32713..70371eb 100644 --- a/app/classes/Framadate/Services/PollService.php +++ b/app/classes/Framadate/Services/PollService.php @@ -129,8 +129,10 @@ class PollService { */ function createPoll(Form $form) { - // Generate poll IDs - $poll_id = $this->random(16); + // Generate poll IDs, loop while poll ID already exists + do { + $poll_id = $this->random(16); + } while ($this->connect->existsById($poll_id)); $admin_poll_id = $poll_id . $this->random(8); // Insert poll + slots diff --git a/creation_sondage.php b/creation_sondage.php deleted file mode 100644 index 469ed75..0000000 --- a/creation_sondage.php +++ /dev/null @@ -1,122 +0,0 @@ -Param('id_sondage') ; - $sql = $connect->Prepare($sql); - $poll = $connect->Execute($sql, [$id]); - - if ($poll === false) { - return false; - } - - $dbpoll = $poll->FetchObject(false); - - return $dbpoll->id_sondage; -} - -function ajouter_sondage() -{ - global $connect; - global $config; - - $sondage = random(16); - while(check_poll_id($sondage) == $sondage) { - $sondage = random(16); - } - $sondage_admin = $sondage.random(8); - - $date_fin = $_SESSION["champdatefin"]; // provided by create_classic_poll.php or create_date_poll.php - $_SESSION["champdatefin"]=""; //clean param cause 2 polls created by the same user in the same session can be affected by this param during the 2nd creation. - $sql = 'INSERT INTO sondage - (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) - VALUES ( - '.$connect->Param('id_sondage').', - '.$connect->Param('commentaires').', - '.$connect->Param('mail_admin').', - '.$connect->Param('nom_admin').', - '.$connect->Param('titre').', - '.$connect->Param('id_sondage_admin').', - FROM_UNIXTIME('.$date_fin.'), - '.$connect->Param('format').', - '.$connect->Param('mailsonde').' - )'; - $sql = $connect->Prepare($sql); - $res = $connect->Execute($sql, array($sondage, $_SESSION['commentaires'], $_SESSION['adresse'], $_SESSION['nom'], $_SESSION['titre'], $sondage_admin, $_SESSION['formatsondage'], $_SESSION['mailsonde'])); - - $sql = 'INSERT INTO sujet_studs values ('.$connect->Param('sondage').', '.$connect->Param('choix').')'; - $sql = $connect->Prepare($sql); - $connect->Execute($sql, array($sondage, $_SESSION['toutchoix'])); - - if($config['use_smtp']==true){ - $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); - $message .= "\n\n"; - $message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; - $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION; - - $message_admin = _("This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); - $message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION; - - $message = sprintf($message, Utils::getUrlSondage($sondage)); - $message_admin = sprintf($message_admin, Utils::getUrlSondage($sondage_admin, true)); - - if (Utils::isValidEmail($_SESSION['adresse'])) { - Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $_SESSION['adresse'] ); - Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $_SESSION['adresse'] ); - } - } - error_log(date('H:i:s d/m/Y:') . ' CREATION: '.$sondage."\t".$_SESSION[formatsondage]."\t".$_SESSION[nom]."\t".$_SESSION[adresse]."\t \t".$_SESSION[toutchoix]."\n", 3, 'admin/logs_studs.txt'); - //Utils::cleaning_polls($connect, 'admin/logs_studs.txt'); - - // Don't keep days, hours and choices in memory (in order to make new polls) - for ($i = 0; $i < count($_SESSION["totalchoixjour"]); $i++) { - unset($_SESSION['horaires'.$i]); - } - unset($_SESSION["totalchoixjour"]); - unset($_SESSION['choices']); - - header("Location:".Utils::getUrlSondage($sondage_admin, true)); - - exit(); -} From 7ad74ae03af44ad4b653ae9cc74fe89c8bb3ad46 Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Thu, 2 Apr 2015 23:10:41 +0200 Subject: [PATCH 2/5] Create PollRepository + Extract creation poll code from Service to Repository --- .../Framadate/Repositories/PollRepository.php | 69 +++++++++++++++++++ .../Repositories/RepositoryFactory.php | 46 +++++++++++++ .../Framadate/Services/PollService.php | 44 +++--------- app/inc/init.php | 2 + 4 files changed, 125 insertions(+), 36 deletions(-) create mode 100644 app/classes/Framadate/Repositories/PollRepository.php create mode 100644 app/classes/Framadate/Repositories/RepositoryFactory.php diff --git a/app/classes/Framadate/Repositories/PollRepository.php b/app/classes/Framadate/Repositories/PollRepository.php new file mode 100644 index 0000000..fecc4e3 --- /dev/null +++ b/app/classes/Framadate/Repositories/PollRepository.php @@ -0,0 +1,69 @@ +connect = $connect; + } + + public function beginTransaction() { + $this->connect->beginTransaction(); + } + + public function commit() { + $this->connect->commit(); + } + + public function insertPoll($poll_id, $admin_poll_id, $form) { + $sql = 'INSERT INTO `' . Utils::table('poll') . '` + (id, admin_id, title, description, admin_name, admin_mail, end_date, format, editable, receiveNewVotes, receiveNewComments) + VALUES (?,?,?,?,?,?,FROM_UNIXTIME(?),?,?,?,?)'; + $prepared = $this->connect->prepare($sql); + $prepared->execute(array($poll_id, $admin_poll_id, $form->title, $form->description, $form->admin_name, $form->admin_mail, $form->end_date, $form->format, $form->editable, $form->receiveNewVotes, $form->receiveNewComments)); + } + + /** + * @param int $poll_id + * @param array $choices + */ + public function insertSlots($poll_id, $choices) { + $prepared = $this->connect->prepare('INSERT INTO ' . Utils::table('slot') . ' (poll_id, title, moments) VALUES (?, ?, ?)'); + + foreach ($choices as $choice) { + + // We prepared the slots (joined by comas) + $joinedSlots = ''; + $first = true; + foreach ($choice->getSlots() as $slot) { + if ($first) { + $joinedSlots = $slot; + $first = false; + } else { + $joinedSlots .= ',' . $slot; + } + } + + // We execute the insertion + if (empty($joinedSlots)) { + $prepared->execute(array($poll_id, $choice->getName(), null)); + } else { + $prepared->execute(array($poll_id, $choice->getName(), $joinedSlots)); + } + + } + } + +} diff --git a/app/classes/Framadate/Repositories/RepositoryFactory.php b/app/classes/Framadate/Repositories/RepositoryFactory.php new file mode 100644 index 0000000..f52ba8c --- /dev/null +++ b/app/classes/Framadate/Repositories/RepositoryFactory.php @@ -0,0 +1,46 @@ +connect = $connect; $this->logService = $logService; + $this->pollRepository = RepositoryFactory::pollRepository(); } /** @@ -136,46 +139,15 @@ class PollService { $admin_poll_id = $poll_id . $this->random(8); // Insert poll + slots - $this->connect->beginTransaction(); - - // TODO Extract this to FramaDB (or repository layer) - $sql = 'INSERT INTO ' . Utils::table('poll') . ' - (id, admin_id, title, description, admin_name, admin_mail, end_date, format, editable, receiveNewVotes, receiveNewComments) - VALUES (?,?,?,?,?,?,FROM_UNIXTIME(?),?,?,?,?)'; - $prepared = $this->connect->prepare($sql); - $prepared->execute(array($poll_id, $admin_poll_id, $form->title, $form->description, $form->admin_name, $form->admin_mail, $form->end_date, $form->format, $form->editable, $form->receiveNewVotes, $form->receiveNewComments)); - - $prepared = $this->connect->prepare('INSERT INTO ' . Utils::table('slot') . ' (poll_id, title, moments) VALUES (?, ?, ?)'); - - foreach ($form->getChoices() as $choice) { - - // We prepared the slots (joined by comas) - $joinedSlots = ''; - $first = true; - foreach ($choice->getSlots() as $slot) { - if ($first) { - $joinedSlots = $slot; - $first = false; - } else { - $joinedSlots .= ',' . $slot; - } - } - - // We execute the insertion - if (empty($joinedSlots)) { - $prepared->execute(array($poll_id, $choice->getName(), null)); - } else { - $prepared->execute(array($poll_id, $choice->getName(), $joinedSlots)); - } - - } - - $this->connect->commit(); + $this->pollRepository->beginTransaction(); + $this->pollRepository->insertPoll($poll_id, $admin_poll_id, $form); + $this->pollRepository->insertSlots($poll_id, $form->getChoices()); + $this->pollRepository->commit(); $this->logService->log('CREATE_POLL', 'id:' . $poll_id . ', title: ' . $form->title . ', format:' . $form->format . ', admin:' . $form->admin_name . ', mail:' . $form->admin_mail); - return [$poll_id, $admin_poll_id]; + return array($poll_id, $admin_poll_id); } private function random($car) { diff --git a/app/inc/init.php b/app/inc/init.php index 9e17515..63379ef 100644 --- a/app/inc/init.php +++ b/app/inc/init.php @@ -17,6 +17,7 @@ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ use Framadate\FramaDB; +use Framadate\Repositories\RepositoryFactory; // Autoloading of dependencies with Composer require_once __DIR__ . '/../../vendor/autoload.php'; @@ -41,4 +42,5 @@ require_once __DIR__ . '/smarty.php'; // Connection to database $connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD); +RepositoryFactory::init($connect); $err = 0; From 7d84ec1e73595315d92c89693c528060c6615624 Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Thu, 2 Apr 2015 23:23:34 +0200 Subject: [PATCH 3/5] Create SlotRepository + AbstractRepository --- app/classes/Framadate/FramaDB.php | 31 --------- .../Repositories/AbstractRepository.php | 33 +++++++++ .../Framadate/Repositories/PollRepository.php | 69 ++++++------------- .../Repositories/RepositoryFactory.php | 15 +++- .../Framadate/Repositories/SlotRepository.php | 67 ++++++++++++++++++ .../Framadate/Services/PollService.php | 54 +++++++-------- 6 files changed, 163 insertions(+), 106 deletions(-) create mode 100644 app/classes/Framadate/Repositories/AbstractRepository.php create mode 100644 app/classes/Framadate/Repositories/SlotRepository.php diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php index 0cd4478..00a1b83 100644 --- a/app/classes/Framadate/FramaDB.php +++ b/app/classes/Framadate/FramaDB.php @@ -79,30 +79,6 @@ class FramaDB { return $this->pdo->query($sql); } - function findPollById($poll_id) { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?'); - - $prepared->execute(array($poll_id)); - $poll = $prepared->fetch(); - $prepared->closeCursor(); - - return $poll; - } - - public function existsById($poll_id) { - $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?'); - - $prepared->execute(array($poll_id)); - - return $prepared->rowCount() > 0; - } - - function updatePoll($poll) { - $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=? WHERE id = ?'); - - return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->id]); - } - function allCommentsByPollId($poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute(array($poll_id)); @@ -117,13 +93,6 @@ class FramaDB { return $prepared->fetchAll(); } - function allSlotsByPollId($poll_id) { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY title'); - $prepared->execute(array($poll_id)); - - return $prepared->fetchAll(); - } - function insertDefaultVote($poll_id, $insert_position) { $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), "0", SUBSTRING(choices, ?)) WHERE poll_id = ?'); diff --git a/app/classes/Framadate/Repositories/AbstractRepository.php b/app/classes/Framadate/Repositories/AbstractRepository.php new file mode 100644 index 0000000..35c0344 --- /dev/null +++ b/app/classes/Framadate/Repositories/AbstractRepository.php @@ -0,0 +1,33 @@ +connect = $connect; + } + + public function beginTransaction() { + $this->connect->beginTransaction(); + } + + public function commit() { + $this->connect->commit(); + } + + public function prepare($sql) { + return $this->connect->prepare($sql); + } + +} diff --git a/app/classes/Framadate/Repositories/PollRepository.php b/app/classes/Framadate/Repositories/PollRepository.php index fecc4e3..041b3e7 100644 --- a/app/classes/Framadate/Repositories/PollRepository.php +++ b/app/classes/Framadate/Repositories/PollRepository.php @@ -1,69 +1,44 @@ connect = $connect; - } - - public function beginTransaction() { - $this->connect->beginTransaction(); - } - - public function commit() { - $this->connect->commit(); + function __construct(FramaDB $connect) { + parent::__construct($connect); } public function insertPoll($poll_id, $admin_poll_id, $form) { $sql = 'INSERT INTO `' . Utils::table('poll') . '` (id, admin_id, title, description, admin_name, admin_mail, end_date, format, editable, receiveNewVotes, receiveNewComments) VALUES (?,?,?,?,?,?,FROM_UNIXTIME(?),?,?,?,?)'; - $prepared = $this->connect->prepare($sql); + $prepared = $this->prepare($sql); $prepared->execute(array($poll_id, $admin_poll_id, $form->title, $form->description, $form->admin_name, $form->admin_mail, $form->end_date, $form->format, $form->editable, $form->receiveNewVotes, $form->receiveNewComments)); } - /** - * @param int $poll_id - * @param array $choices - */ - public function insertSlots($poll_id, $choices) { - $prepared = $this->connect->prepare('INSERT INTO ' . Utils::table('slot') . ' (poll_id, title, moments) VALUES (?, ?, ?)'); + function findById($poll_id) { + $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?'); - foreach ($choices as $choice) { + $prepared->execute(array($poll_id)); + $poll = $prepared->fetch(); + $prepared->closeCursor(); - // We prepared the slots (joined by comas) - $joinedSlots = ''; - $first = true; - foreach ($choice->getSlots() as $slot) { - if ($first) { - $joinedSlots = $slot; - $first = false; - } else { - $joinedSlots .= ',' . $slot; - } - } + return $poll; + } - // We execute the insertion - if (empty($joinedSlots)) { - $prepared->execute(array($poll_id, $choice->getName(), null)); - } else { - $prepared->execute(array($poll_id, $choice->getName(), $joinedSlots)); - } + public function existsById($poll_id) { + $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?'); - } + $prepared->execute(array($poll_id)); + + return $prepared->rowCount() > 0; + } + + function update($poll) { + $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=? WHERE id = ?'); + + return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->id]); } } diff --git a/app/classes/Framadate/Repositories/RepositoryFactory.php b/app/classes/Framadate/Repositories/RepositoryFactory.php index f52ba8c..2c0821b 100644 --- a/app/classes/Framadate/Repositories/RepositoryFactory.php +++ b/app/classes/Framadate/Repositories/RepositoryFactory.php @@ -23,12 +23,14 @@ use Framadate\FramaDB; class RepositoryFactory { private static $connect; + private static $pollRepository; + private static $slotRepository; /** * @param FramaDB $connect */ - static function init($connect) { + static function init(FramaDB $connect) { self::$connect = $connect; } @@ -43,4 +45,15 @@ class RepositoryFactory { return self::$pollRepository; } + /** + * @return SlotRepository The singleton of SlotRepository + */ + static function slotRepository() { + if (self::$slotRepository == null) { + self::$slotRepository = new SlotRepository(self::$connect); + } + + return self::$slotRepository; + } + } diff --git a/app/classes/Framadate/Repositories/SlotRepository.php b/app/classes/Framadate/Repositories/SlotRepository.php new file mode 100644 index 0000000..b816a6e --- /dev/null +++ b/app/classes/Framadate/Repositories/SlotRepository.php @@ -0,0 +1,67 @@ +prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?, ?, ?)'); + + foreach ($choices as $choice) { + + // We prepared the slots (joined by comas) + $joinedSlots = ''; + $first = true; + foreach ($choice->getSlots() as $slot) { + if ($first) { + $joinedSlots = $slot; + $first = false; + } else { + $joinedSlots .= ',' . $slot; + } + } + + // We execute the insertion + if (empty($joinedSlots)) { + $prepared->execute(array($poll_id, $choice->getName(), null)); + } else { + $prepared->execute(array($poll_id, $choice->getName(), $joinedSlots)); + } + + } + } + + function listByPollId($poll_id) { + $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY title'); + $prepared->execute(array($poll_id)); + + return $prepared->fetchAll(); + } + +} diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php index 7ff0820..a5301de 100644 --- a/app/classes/Framadate/Services/PollService.php +++ b/app/classes/Framadate/Services/PollService.php @@ -21,18 +21,19 @@ namespace Framadate\Services; use Framadate\Form; use Framadate\FramaDB; use Framadate\Repositories\RepositoryFactory; -use Framadate\Utils; class PollService { private $connect; private $logService; private $pollRepository; + private $slotRepository; function __construct(FramaDB $connect, LogService $logService) { $this->connect = $connect; $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); + $this->slotRepository = RepositoryFactory::slotRepository(); } /** @@ -43,7 +44,7 @@ class PollService { */ function findById($poll_id) { if (preg_match('/^[\w\d]{16}$/i', $poll_id)) { - return $this->connect->findPollById($poll_id); + return $this->pollRepository->findById($poll_id); } return null; @@ -58,7 +59,7 @@ class PollService { } function allSlotsByPollId($poll_id) { - return $this->connect->allSlotsByPollId($poll_id); + return $this->slotRepository->listByPollId($poll_id); } public function updateVote($poll_id, $vote_id, $name, $choices) { @@ -82,6 +83,29 @@ class PollService { return $this->connect->countVotesByPollId($poll_id); } + /** + * @param Form $form + * @return string + */ + function createPoll(Form $form) { + + // Generate poll IDs, loop while poll ID already exists + do { + $poll_id = $this->random(16); + } while ($this->pollRepository->existsById($poll_id)); + $admin_poll_id = $poll_id . $this->random(8); + + // Insert poll + slots + $this->pollRepository->beginTransaction(); + $this->pollRepository->insertPoll($poll_id, $admin_poll_id, $form); + $this->slotRepository->insertSlots($poll_id, $form->getChoices()); + $this->pollRepository->commit(); + + $this->logService->log('CREATE_POLL', 'id:' . $poll_id . ', title: ' . $form->title . ', format:' . $form->format . ', admin:' . $form->admin_name . ', mail:' . $form->admin_mail); + + return array($poll_id, $admin_poll_id); + } + function computeBestChoices($votes) { $result = []; foreach ($votes as $vote) { @@ -126,30 +150,6 @@ class PollService { return $splitted; } - /** - * @param Form $form - * @return string - */ - function createPoll(Form $form) { - - // Generate poll IDs, loop while poll ID already exists - do { - $poll_id = $this->random(16); - } while ($this->connect->existsById($poll_id)); - $admin_poll_id = $poll_id . $this->random(8); - - // Insert poll + slots - $this->pollRepository->beginTransaction(); - $this->pollRepository->insertPoll($poll_id, $admin_poll_id, $form); - $this->pollRepository->insertSlots($poll_id, $form->getChoices()); - $this->pollRepository->commit(); - - $this->logService->log('CREATE_POLL', 'id:' . $poll_id . ', title: ' . $form->title . ', format:' . $form->format . ', admin:' . $form->admin_name . ', mail:' . $form->admin_mail); - - - return array($poll_id, $admin_poll_id); - } - private function random($car) { // TODO Better random ? $string = ''; From 612e47ffa3cb72d82a7c48e37945eb008560243e Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Thu, 2 Apr 2015 23:32:24 +0200 Subject: [PATCH 4/5] Create CommentRepository --- app/classes/Framadate/FramaDB.php | 31 ---------- .../Repositories/CommentRepository.php | 59 +++++++++++++++++++ .../Repositories/RepositoryFactory.php | 12 ++++ .../Framadate/Services/AdminPollService.php | 20 ++++--- .../Framadate/Services/PollService.php | 11 +++- 5 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 app/classes/Framadate/Repositories/CommentRepository.php diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php index 00a1b83..b8c6c79 100644 --- a/app/classes/Framadate/FramaDB.php +++ b/app/classes/Framadate/FramaDB.php @@ -79,13 +79,6 @@ class FramaDB { return $this->pdo->query($sql); } - function allCommentsByPollId($poll_id) { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id'); - $prepared->execute(array($poll_id)); - - return $prepared->fetchAll(); - } - function allUserVotesByPollId($poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute(array($poll_id)); @@ -205,36 +198,12 @@ class FramaDB { return $prepared->execute([$poll_id]); } - /** - * Delete all comments of a given poll. - * - * @param $poll_id int The ID of the given poll. - * @return bool|null true if action succeeded. - */ - function deleteCommentsByPollId($poll_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?'); - - return $prepared->execute([$poll_id]); - } - function updateVote($poll_id, $vote_id, $name, $choices) { $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?'); return $prepared->execute([$choices, $name, $poll_id, $vote_id]); } - function insertComment($poll_id, $name, $comment) { - $prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)'); - - return $prepared->execute([$poll_id, $name, $comment]); - } - - function deleteComment($poll_id, $comment_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?'); - - return $prepared->execute([$poll_id, $comment_id]); - } - function deletePollById($poll_id) { $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?'); diff --git a/app/classes/Framadate/Repositories/CommentRepository.php b/app/classes/Framadate/Repositories/CommentRepository.php new file mode 100644 index 0000000..4511390 --- /dev/null +++ b/app/classes/Framadate/Repositories/CommentRepository.php @@ -0,0 +1,59 @@ +prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id'); + $prepared->execute(array($poll_id)); + + return $prepared->fetchAll(); + } + + /** + * Insert a new comment. + * + * @param $poll_id + * @param $name + * @param $comment + * @return bool + */ + function insert($poll_id, $name, $comment) { + $prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)'); + + return $prepared->execute([$poll_id, $name, $comment]); + } + + function delete($poll_id, $comment_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?'); + + return $prepared->execute([$poll_id, $comment_id]); + } + + /** + * Delete all comments of a given poll. + * + * @param $poll_id int The ID of the given poll. + * @return bool|null true if action succeeded. + */ + function deleteByPollId($poll_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?'); + + return $prepared->execute([$poll_id]); + } + + public function exists($poll_id, $name, $comment) { + $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? QND name = ? AND comment = ?'); + $prepared->execute(array($poll_id, $name, $comment)); + + return $prepared->rowCount() > 0; + } + +} diff --git a/app/classes/Framadate/Repositories/RepositoryFactory.php b/app/classes/Framadate/Repositories/RepositoryFactory.php index 2c0821b..6e2437d 100644 --- a/app/classes/Framadate/Repositories/RepositoryFactory.php +++ b/app/classes/Framadate/Repositories/RepositoryFactory.php @@ -26,6 +26,7 @@ class RepositoryFactory { private static $pollRepository; private static $slotRepository; + private static $commentRepository; /** * @param FramaDB $connect @@ -56,4 +57,15 @@ class RepositoryFactory { return self::$slotRepository; } + /** + * @return CommentRepository The singleton of CommentRepository + */ + static function commentRepository() { + if (self::$commentRepository == null) { + self::$commentRepository = new CommentRepository(self::$connect); + } + + return self::$commentRepository; + } + } diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php index 70699bb..4e4f9d6 100644 --- a/app/classes/Framadate/Services/AdminPollService.php +++ b/app/classes/Framadate/Services/AdminPollService.php @@ -2,7 +2,7 @@ namespace Framadate\Services; use Framadate\FramaDB; -use Framadate\Utils; +use Framadate\Repositories\RepositoryFactory; /** * Class AdminPollService @@ -14,17 +14,23 @@ class AdminPollService { private $connect; private $pollService; private $logService; + private $pollRepository; + private $slotRepository; + private $commentRepository; function __construct(FramaDB $connect, PollService $pollService, LogService $logService) { $this->connect = $connect; $this->pollService = $pollService; $this->logService = $logService; + $this->pollRepository = RepositoryFactory::pollRepository(); + $this->slotRepository = RepositoryFactory::slotRepository(); + $this->commentRepository = RepositoryFactory::commentRepository(); } function updatePoll($poll) { global $config; if ($poll->end_date > $poll->creation_date && $poll->end_date <= strtotime($poll->creation_date) + (86400 * $config['default_poll_duration'])) { - return $this->connect->updatePoll($poll); + return $this->pollRepository->update($poll); } else { return false; } @@ -38,7 +44,7 @@ class AdminPollService { * @return mixed true is action succeeded */ function deleteComment($poll_id, $comment_id) { - return $this->connect->deleteComment($poll_id, $comment_id); + return $this->commentRepository->delete($poll_id, $comment_id); } /** @@ -49,7 +55,7 @@ class AdminPollService { */ function cleanComments($poll_id) { $this->logService->log("CLEAN_COMMENTS", "id:$poll_id"); - return $this->connect->deleteCommentsByPollId($poll_id); + return $this->commentRepository->deleteByPollId($poll_id); } /** @@ -81,12 +87,12 @@ class AdminPollService { * @return bool true is action succeeded */ function deleteEntirePoll($poll_id) { - $poll = $this->connect->findPollById($poll_id); + $poll = $this->pollRepository->findById($poll_id); $this->logService->log('DELETE_POLL', "id:$poll->id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail"); // Delete the entire poll $this->connect->deleteVotesByPollId($poll_id); - $this->connect->deleteCommentsByPollId($poll_id); + $this->commentRepository->deleteByPollId($poll_id); $this->connect->deleteSlotsByPollId($poll_id); $this->connect->deletePollById($poll_id); @@ -179,7 +185,7 @@ class AdminPollService { * @return bool true if added */ public function addSlot($poll_id, $datetime, $new_moment) { - $slots = $this->connect->allSlotsByPollId($poll_id); + $slots = $this->slotRepository->listByPollId($poll_id); $result = $this->findInsertPosition($slots, $datetime, $new_moment); // Begin transaction diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php index a5301de..4cc7fa1 100644 --- a/app/classes/Framadate/Services/PollService.php +++ b/app/classes/Framadate/Services/PollService.php @@ -28,12 +28,14 @@ class PollService { private $logService; private $pollRepository; private $slotRepository; + private $commentRepository; function __construct(FramaDB $connect, LogService $logService) { $this->connect = $connect; $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); $this->slotRepository = RepositoryFactory::slotRepository(); + $this->commentRepository = RepositoryFactory::commentRepository(); } /** @@ -51,7 +53,7 @@ class PollService { } function allCommentsByPollId($poll_id) { - return $this->connect->allCommentsByPollId($poll_id); + return $this->commentRepository->allCommentsByPollId($poll_id); } function allVotesByPollId($poll_id) { @@ -75,8 +77,11 @@ class PollService { } function addComment($poll_id, $name, $comment) { - // TODO Check if there is no duplicate before to add a new comment - return $this->connect->insertComment($poll_id, $name, $comment); + if ($this->commentRepository->exists($poll_id, $name, $comment)) { + return true; + } else { + return $this->commentRepository->insert($poll_id, $name, $comment); + } } public function countVotesByPollId($poll_id) { From b47c153aaea1d862ce6bdfdfdbf8e78ac5fc11e5 Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Fri, 3 Apr 2015 00:11:36 +0200 Subject: [PATCH 5/5] More Splitting between Services and Repositories --- admin/polls.php | 2 +- adminstuds.php | 2 - app/classes/Framadate/FramaDB.php | 196 +----------------- .../Repositories/AbstractRepository.php | 12 ++ .../Repositories/CommentRepository.php | 6 +- .../Framadate/Repositories/PollRepository.php | 63 ++++++ .../Repositories/RepositoryFactory.php | 12 ++ .../Framadate/Repositories/SlotRepository.php | 65 ++++++ .../Framadate/Repositories/VoteRepository.php | 86 ++++++++ .../Framadate/Services/AdminPollService.php | 31 +-- .../Framadate/Services/InputService.php | 4 + .../Framadate/Services/MailService.php | 2 +- .../Framadate/Services/PollService.php | 13 +- .../Framadate/Services/PurgeService.php | 27 ++- .../Framadate/Services/SuperAdminService.php | 12 +- 15 files changed, 297 insertions(+), 236 deletions(-) create mode 100644 app/classes/Framadate/Repositories/VoteRepository.php diff --git a/admin/polls.php b/admin/polls.php index 3759347..198b7cf 100644 --- a/admin/polls.php +++ b/admin/polls.php @@ -52,7 +52,7 @@ $poll_to_delete = null; $logService = new LogService(); $pollService = new PollService($connect, $logService); $adminPollService = new AdminPollService($connect, $pollService, $logService); -$superAdminService = new SuperAdminService($connect); +$superAdminService = new SuperAdminService(); $securityService = new SecurityService(); /* GET */ diff --git a/adminstuds.php b/adminstuds.php index 38c92bf..cefbac1 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -21,7 +21,6 @@ use Framadate\Services\AdminPollService; use Framadate\Services\InputService; use Framadate\Services\LogService; use Framadate\Message; -use Framadate\Utils; include_once __DIR__ . '/app/inc/init.php'; @@ -105,7 +104,6 @@ if (isset($_POST['update_poll_info'])) { } } elseif ($field == 'expiration_date') { $expiration_date = filter_input(INPUT_POST, 'expiration_date', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]+[-/][0-9]+[-/][0-9]+#']]); - $expiration_date = strtotime($expiration_date); if ($expiration_date) { $poll->end_date = $expiration_date; $updated = true; diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php index b8c6c79..7c5101b 100644 --- a/app/classes/Framadate/FramaDB.php +++ b/app/classes/Framadate/FramaDB.php @@ -79,199 +79,7 @@ class FramaDB { return $this->pdo->query($sql); } - function allUserVotesByPollId($poll_id) { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id'); - $prepared->execute(array($poll_id)); - - return $prepared->fetchAll(); - } - - function insertDefaultVote($poll_id, $insert_position) { - $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), "0", SUBSTRING(choices, ?)) WHERE poll_id = ?'); - - return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]); - } - - function insertVote($poll_id, $name, $choices) { - $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices) VALUES (?,?,?)'); - $prepared->execute([$poll_id, $name, $choices]); - - $newVote = new \stdClass(); - $newVote->poll_id = $poll_id; - $newVote->id = $this->pdo->lastInsertId(); - $newVote->name = $name; - $newVote->choices = $choices; - - return $newVote; - } - - function deleteVote($poll_id, $vote_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?'); - - return $prepared->execute([$poll_id, $vote_id]); - } - - /** - * Delete all votes of a given poll. - * - * @param $poll_id int The ID of the given poll. - * @return bool|null true if action succeeded. - */ - function deleteVotesByPollId($poll_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?'); - - return $prepared->execute([$poll_id]); - } - - /** - * Delete all votes made on given moment index. - * - * @param $poll_id int The ID of the poll - * @param $index int The index of the vote into the poll - * @return bool|null true if action succeeded. - */ - function deleteVotesByIndex($poll_id, $index) { - $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTR(choices, 1, ?), SUBSTR(choices, ?)) WHERE poll_id = ?'); - - return $prepared->execute([$index, $index + 2, $poll_id]); - } - - /** - * Find the slot into poll for a given datetime. - * - * @param $poll_id int The ID of the poll - * @param $datetime int The datetime of the slot - * @return mixed Object The slot found, or null - */ - function findSlotByPollIdAndDatetime($poll_id, $datetime) { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?'); - - $prepared->execute([$poll_id, $datetime]); - $slot = $prepared->fetch(); - $prepared->closeCursor(); - - return $slot; - } - - /** - * Insert a new slot into a given poll. - * - * @param $poll_id int The ID of the poll - * @param $title mixed The title of the slot - * @param $moments mixed|null The moments joined with "," - * @return bool true if action succeeded - */ - function insertSlot($poll_id, $title, $moments) { - $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)'); - - return $prepared->execute([$poll_id, $title, $moments]); - } - - /** - * Update a slot into a poll. - * - * @param $poll_id int The ID of the poll - * @param $datetime int The datetime of the slot to update - * @param $newMoments mixed The new moments - * @return bool|null true if action succeeded. - */ - function updateSlot($poll_id, $datetime, $newMoments) { - $prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?'); - - return $prepared->execute([$newMoments, $poll_id, $datetime]); - } - - /** - * Delete a entire slot from a poll. - * - * @param $poll_id int The ID of the poll - * @param $datetime mixed The datetime of the slot - */ - function deleteSlot($poll_id, $datetime) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?'); - $prepared->execute([$poll_id, $datetime]); - } - - function deleteSlotsByPollId($poll_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?'); - - return $prepared->execute([$poll_id]); - } - - function updateVote($poll_id, $vote_id, $name, $choices) { - $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?'); - - return $prepared->execute([$choices, $name, $poll_id, $vote_id]); - } - - function deletePollById($poll_id) { - $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?'); - - return $prepared->execute([$poll_id]); - } - - /** - * Find old polls. Limit: 20. - * - * @return array Array of old polls - */ - public function findOldPolls() { - $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE DATE_ADD(`end_date`, INTERVAL ' . PURGE_DELAY . ' DAY) < NOW() AND `end_date` != 0 LIMIT 20'); - $prepared->execute([]); - - return $prepared->fetchAll(); - } - - /** - * Search polls in databse. - * - * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...] - * @return array The found polls - */ - public function findAllPolls($search) { - // Polls - $prepared = $this->prepare(' -SELECT p.*, - (SELECT count(1) FROM `' . Utils::table('vote') . '` v WHERE p.id=v.poll_id) votes - FROM `' . Utils::table('poll') . '` p - WHERE (:id = "" OR p.id LIKE :id) - AND (:title = "" OR p.title LIKE :title) - AND (:name = "" OR p.admin_name LIKE :name) - ORDER BY p.title ASC - '); - - $poll = $search['poll'] . '%'; - $title = '%' . $search['title'] . '%'; - $name = '%' . $search['name'] . '%'; - $prepared->bindParam(':id', $poll, PDO::PARAM_STR); - $prepared->bindParam(':title', $title, PDO::PARAM_STR); - $prepared->bindParam(':name', $name, PDO::PARAM_STR); - $prepared->execute(); - - return $prepared->fetchAll(); - } - - /** - * Get the total number of polls in databse. - * - * @return int The number of polls - */ - public function countPolls() { - // Total count - $stmt = $this->query('SELECT count(1) nb FROM `' . Utils::table('poll') . '`'); - $count = $stmt->fetch(); - $stmt->closeCursor(); - - return $count->nb; - } - - public function countVotesByPollId($poll_id) { - $prepared = $this->prepare('SELECT count(1) nb FROM `' . Utils::table('vote') . '` WHERE poll_id = ?'); - - $prepared->execute([$poll_id]); - $result = $prepared->fetch(); - $prepared->closeCursor(); - - return $result->nb; + public function lastInsertId() { + return $this->pdo->lastInsertId(); } } diff --git a/app/classes/Framadate/Repositories/AbstractRepository.php b/app/classes/Framadate/Repositories/AbstractRepository.php index 35c0344..736436f 100644 --- a/app/classes/Framadate/Repositories/AbstractRepository.php +++ b/app/classes/Framadate/Repositories/AbstractRepository.php @@ -26,8 +26,20 @@ abstract class AbstractRepository { $this->connect->commit(); } + function rollback() { + $this->connect->rollback(); + } + public function prepare($sql) { return $this->connect->prepare($sql); } + function query($sql) { + return $this->connect->query($sql); + } + + function lastInsertId() { + return $this->connect->lastInsertId(); + } + } diff --git a/app/classes/Framadate/Repositories/CommentRepository.php b/app/classes/Framadate/Repositories/CommentRepository.php index 4511390..4fb5fd9 100644 --- a/app/classes/Framadate/Repositories/CommentRepository.php +++ b/app/classes/Framadate/Repositories/CommentRepository.php @@ -10,7 +10,7 @@ class CommentRepository extends AbstractRepository { parent::__construct($connect); } - function allCommentsByPollId($poll_id) { + function findAllByPollId($poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute(array($poll_id)); @@ -31,7 +31,7 @@ class CommentRepository extends AbstractRepository { return $prepared->execute([$poll_id, $name, $comment]); } - function delete($poll_id, $comment_id) { + function deleteById($poll_id, $comment_id) { $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?'); return $prepared->execute([$poll_id, $comment_id]); @@ -50,7 +50,7 @@ class CommentRepository extends AbstractRepository { } public function exists($poll_id, $name, $comment) { - $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? QND name = ? AND comment = ?'); + $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND name = ? AND comment = ?'); $prepared->execute(array($poll_id, $name, $comment)); return $prepared->rowCount() > 0; diff --git a/app/classes/Framadate/Repositories/PollRepository.php b/app/classes/Framadate/Repositories/PollRepository.php index 041b3e7..76013e9 100644 --- a/app/classes/Framadate/Repositories/PollRepository.php +++ b/app/classes/Framadate/Repositories/PollRepository.php @@ -1,7 +1,9 @@ execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, $poll->editable, $poll->id]); } + function deleteById($poll_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?'); + + return $prepared->execute([$poll_id]); + } + + /** + * Find old polls. Limit: 20. + * + * @return array Array of old polls + */ + public function findOldPolls() { + $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE DATE_ADD(`end_date`, INTERVAL ' . PURGE_DELAY . ' DAY) < NOW() AND `end_date` != 0 LIMIT 20'); + $prepared->execute([]); + + return $prepared->fetchAll(); + } + + /** + * Search polls in databse. + * + * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...] + * @return array The found polls + */ + public function findAll($search) { + // Polls + $prepared = $this->prepare(' +SELECT p.*, + (SELECT count(1) FROM `' . Utils::table('vote') . '` v WHERE p.id=v.poll_id) votes + FROM `' . Utils::table('poll') . '` p + WHERE (:id = "" OR p.id LIKE :id) + AND (:title = "" OR p.title LIKE :title) + AND (:name = "" OR p.admin_name LIKE :name) + ORDER BY p.title ASC + '); + + $poll = $search['poll'] . '%'; + $title = '%' . $search['title'] . '%'; + $name = '%' . $search['name'] . '%'; + $prepared->bindParam(':id', $poll, PDO::PARAM_STR); + $prepared->bindParam(':title', $title, PDO::PARAM_STR); + $prepared->bindParam(':name', $name, PDO::PARAM_STR); + $prepared->execute(); + + return $prepared->fetchAll(); + } + + /** + * Get the total number of polls in databse. + * + * @return int The number of polls + */ + public function count() { + // Total count + $stmt = $this->query('SELECT count(1) nb FROM `' . Utils::table('poll') . '`'); + $count = $stmt->fetch(); + $stmt->closeCursor(); + + return $count->nb; + } + } diff --git a/app/classes/Framadate/Repositories/RepositoryFactory.php b/app/classes/Framadate/Repositories/RepositoryFactory.php index 6e2437d..f7a6fbf 100644 --- a/app/classes/Framadate/Repositories/RepositoryFactory.php +++ b/app/classes/Framadate/Repositories/RepositoryFactory.php @@ -26,6 +26,7 @@ class RepositoryFactory { private static $pollRepository; private static $slotRepository; + private static $voteRepository; private static $commentRepository; /** @@ -57,6 +58,17 @@ class RepositoryFactory { return self::$slotRepository; } + /** + * @return VoteRepository The singleton of VoteRepository + */ + static function voteRepository() { + if (self::$voteRepository == null) { + self::$voteRepository = new VoteRepository(self::$connect); + } + + return self::$voteRepository; + } + /** * @return CommentRepository The singleton of CommentRepository */ diff --git a/app/classes/Framadate/Repositories/SlotRepository.php b/app/classes/Framadate/Repositories/SlotRepository.php index b816a6e..fcd11c2 100644 --- a/app/classes/Framadate/Repositories/SlotRepository.php +++ b/app/classes/Framadate/Repositories/SlotRepository.php @@ -18,6 +18,9 @@ */ namespace Framadate\Repositories; +use Framadate\FramaDB; +use Framadate\Utils; + class SlotRepository extends AbstractRepository { function __construct(FramaDB $connect) { @@ -64,4 +67,66 @@ class SlotRepository extends AbstractRepository { return $prepared->fetchAll(); } + /** + * Find the slot into poll for a given datetime. + * + * @param $poll_id int The ID of the poll + * @param $datetime int The datetime of the slot + * @return mixed Object The slot found, or null + */ + function findByPollIdAndDatetime($poll_id, $datetime) { + $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?'); + + $prepared->execute([$poll_id, $datetime]); + $slot = $prepared->fetch(); + $prepared->closeCursor(); + + return $slot; + } + + /** + * Insert a new slot into a given poll. + * + * @param $poll_id int The ID of the poll + * @param $title mixed The title of the slot + * @param $moments mixed|null The moments joined with "," + * @return bool true if action succeeded + */ + function insert($poll_id, $title, $moments) { + $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)'); + + return $prepared->execute([$poll_id, $title, $moments]); + } + + /** + * Update a slot into a poll. + * + * @param $poll_id int The ID of the poll + * @param $datetime int The datetime of the slot to update + * @param $newMoments mixed The new moments + * @return bool|null true if action succeeded. + */ + function update($poll_id, $datetime, $newMoments) { + $prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?'); + + return $prepared->execute([$newMoments, $poll_id, $datetime]); + } + + /** + * Delete a entire slot from a poll. + * + * @param $poll_id int The ID of the poll + * @param $datetime mixed The datetime of the slot + */ + function deleteByDateTime($poll_id, $datetime) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?'); + $prepared->execute([$poll_id, $datetime]); + } + + function deleteByPollId($poll_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?'); + + return $prepared->execute([$poll_id]); + } + } diff --git a/app/classes/Framadate/Repositories/VoteRepository.php b/app/classes/Framadate/Repositories/VoteRepository.php new file mode 100644 index 0000000..467dd0a --- /dev/null +++ b/app/classes/Framadate/Repositories/VoteRepository.php @@ -0,0 +1,86 @@ +prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id'); + $prepared->execute(array($poll_id)); + + return $prepared->fetchAll(); + } + + function insertDefault($poll_id, $insert_position) { + $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), "0", SUBSTRING(choices, ?)) WHERE poll_id = ?'); + + return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]); + } + + function insert($poll_id, $name, $choices) { + $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices) VALUES (?,?,?)'); + $prepared->execute([$poll_id, $name, $choices]); + + $newVote = new \stdClass(); + $newVote->poll_id = $poll_id; + $newVote->id = $this->lastInsertId(); + $newVote->name = $name; + $newVote->choices = $choices; + + return $newVote; + } + + function deleteById($poll_id, $vote_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?'); + + return $prepared->execute([$poll_id, $vote_id]); + } + + /** + * Delete all votes of a given poll. + * + * @param $poll_id int The ID of the given poll. + * @return bool|null true if action succeeded. + */ + function deleteByPollId($poll_id) { + $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?'); + + return $prepared->execute([$poll_id]); + } + + /** + * Delete all votes made on given moment index. + * + * @param $poll_id int The ID of the poll + * @param $index int The index of the vote into the poll + * @return bool|null true if action succeeded. + */ + function deleteByIndex($poll_id, $index) { + $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTR(choices, 1, ?), SUBSTR(choices, ?)) WHERE poll_id = ?'); + + return $prepared->execute([$index, $index + 2, $poll_id]); + } + + function update($poll_id, $vote_id, $name, $choices) { + $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?'); + + return $prepared->execute([$choices, $name, $poll_id, $vote_id]); + } + + public function countByPollId($poll_id) { + $prepared = $this->prepare('SELECT count(1) nb FROM `' . Utils::table('vote') . '` WHERE poll_id = ?'); + + $prepared->execute([$poll_id]); + $result = $prepared->fetch(); + $prepared->closeCursor(); + + return $result->nb; + } + +} diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php index 4e4f9d6..b4b47d5 100644 --- a/app/classes/Framadate/Services/AdminPollService.php +++ b/app/classes/Framadate/Services/AdminPollService.php @@ -14,8 +14,10 @@ class AdminPollService { private $connect; private $pollService; private $logService; + private $pollRepository; private $slotRepository; + private $voteRepository; private $commentRepository; function __construct(FramaDB $connect, PollService $pollService, LogService $logService) { @@ -24,6 +26,7 @@ class AdminPollService { $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); $this->slotRepository = RepositoryFactory::slotRepository(); + $this->voteRepository = RepositoryFactory::voteRepository(); $this->commentRepository = RepositoryFactory::commentRepository(); } @@ -44,7 +47,7 @@ class AdminPollService { * @return mixed true is action succeeded */ function deleteComment($poll_id, $comment_id) { - return $this->commentRepository->delete($poll_id, $comment_id); + return $this->commentRepository->deleteById($poll_id, $comment_id); } /** @@ -66,7 +69,7 @@ class AdminPollService { * @return mixed true is action succeeded */ function deleteVote($poll_id, $vote_id) { - return $this->connect->deleteVote($poll_id, $vote_id); + return $this->voteRepository->deleteById($poll_id, $vote_id); } /** @@ -77,7 +80,7 @@ class AdminPollService { */ function cleanVotes($poll_id) { $this->logService->log('CLEAN_VOTES', 'id:' . $poll_id); - return $this->connect->deleteVotesByPollId($poll_id); + return $this->voteRepository->deleteByPollId($poll_id); } /** @@ -91,10 +94,10 @@ class AdminPollService { $this->logService->log('DELETE_POLL', "id:$poll->id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail"); // Delete the entire poll - $this->connect->deleteVotesByPollId($poll_id); + $this->voteRepository->deleteByPollId($poll_id); $this->commentRepository->deleteByPollId($poll_id); - $this->connect->deleteSlotsByPollId($poll_id); - $this->connect->deletePollById($poll_id); + $this->slotRepository->deleteByPollId($poll_id); + $this->pollRepository->deleteById($poll_id); return true; } @@ -136,11 +139,11 @@ class AdminPollService { // Remove votes $this->connect->beginTransaction(); - $this->connect->deleteVotesByIndex($poll_id, $indexToDelete); + $this->voteRepository->deleteByIndex($poll_id, $indexToDelete); if (count($newMoments) > 0) { - $this->connect->updateSlot($poll_id, $datetime, implode(',', $newMoments)); + $this->slotRepository->update($poll_id, $datetime, implode(',', $newMoments)); } else { - $this->connect->deleteSlot($poll_id, $datetime); + $this->slotRepository->deleteByDateTime($poll_id, $datetime); } $this->connect->commit(); @@ -165,8 +168,8 @@ class AdminPollService { // Remove votes $this->connect->beginTransaction(); - $this->connect->deleteVotesByIndex($poll_id, $indexToDelete); - $this->connect->deleteSlot($poll_id, $slot_title); + $this->voteRepository->deleteByIndex($poll_id, $indexToDelete); + $this->slotRepository->deleteByDateTime($poll_id, $slot_title); $this->connect->commit(); return true; @@ -206,13 +209,13 @@ class AdminPollService { // Update found slot $moments[] = $new_moment; sort($moments); - $this->connect->updateSlot($poll_id, $datetime, implode(',', $moments)); + $this->slotRepository->update($poll_id, $datetime, implode(',', $moments)); } else { - $this->connect->insertSlot($poll_id, $datetime, $new_moment); + $this->slotRepository->insert($poll_id, $datetime, $new_moment); } - $this->connect->insertDefaultVote($poll_id, $result->insert); + $this->voteRepository->insertDefault($poll_id, $result->insert); // Commit transaction $this->connect->commit(); diff --git a/app/classes/Framadate/Services/InputService.php b/app/classes/Framadate/Services/InputService.php index aafed00..cf3b55e 100644 --- a/app/classes/Framadate/Services/InputService.php +++ b/app/classes/Framadate/Services/InputService.php @@ -28,6 +28,10 @@ class InputService { /** * This method filter an array calling "filter_var" on each items. * Only items validated are added at their own indexes, the others are not returned. + * @param array $arr The array to filter + * @param int $type The type of filter to apply + * @param array|null $options The associative array of options + * @return array The filtered array */ function filterArray(array $arr, $type, $options = null) { $newArr = []; diff --git a/app/classes/Framadate/Services/MailService.php b/app/classes/Framadate/Services/MailService.php index c8ce77d..3095869 100644 --- a/app/classes/Framadate/Services/MailService.php +++ b/app/classes/Framadate/Services/MailService.php @@ -39,7 +39,7 @@ class MailService { $headers .= "Auto-Submitted:auto-generated\n"; $headers .= 'Return-Path: <>'; - $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8') . _("\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org."); + $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8') . __('Mail', "\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org."); mail($to, $subject, $body, $headers, $param); } diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php index 4cc7fa1..832dfe5 100644 --- a/app/classes/Framadate/Services/PollService.php +++ b/app/classes/Framadate/Services/PollService.php @@ -26,8 +26,10 @@ class PollService { private $connect; private $logService; + private $pollRepository; private $slotRepository; + private $voteRepository; private $commentRepository; function __construct(FramaDB $connect, LogService $logService) { @@ -35,6 +37,7 @@ class PollService { $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); $this->slotRepository = RepositoryFactory::slotRepository(); + $this->voteRepository = RepositoryFactory::voteRepository(); $this->commentRepository = RepositoryFactory::commentRepository(); } @@ -53,11 +56,11 @@ class PollService { } function allCommentsByPollId($poll_id) { - return $this->commentRepository->allCommentsByPollId($poll_id); + return $this->commentRepository->findAllByPollId($poll_id); } function allVotesByPollId($poll_id) { - return $this->connect->allUserVotesByPollId($poll_id); + return $this->voteRepository->allUserVotesByPollId($poll_id); } function allSlotsByPollId($poll_id) { @@ -67,13 +70,13 @@ class PollService { public function updateVote($poll_id, $vote_id, $name, $choices) { $choices = implode($choices); - return $this->connect->updateVote($poll_id, $vote_id, $name, $choices); + return $this->voteRepository->update($poll_id, $vote_id, $name, $choices); } function addVote($poll_id, $name, $choices) { $choices = implode($choices); - return $this->connect->insertVote($poll_id, $name, $choices); + return $this->voteRepository->insert($poll_id, $name, $choices); } function addComment($poll_id, $name, $comment) { @@ -85,7 +88,7 @@ class PollService { } public function countVotesByPollId($poll_id) { - return $this->connect->countVotesByPollId($poll_id); + return $this->voteRepository->countByPollId($poll_id); } /** diff --git a/app/classes/Framadate/Services/PurgeService.php b/app/classes/Framadate/Services/PurgeService.php index fc05365..c901173 100644 --- a/app/classes/Framadate/Services/PurgeService.php +++ b/app/classes/Framadate/Services/PurgeService.php @@ -1,6 +1,7 @@ connect = $connect; $this->logService = $logService; + $this->pollRepository = RepositoryFactory::pollRepository(); + $this->slotRepository = RepositoryFactory::slotRepository(); + $this->voteRepository = RepositoryFactory::voteRepository(); + $this->commentRepository = RepositoryFactory::commentRepository(); } /** @@ -23,7 +30,7 @@ class PurgeService { * @return bool true is action succeeded */ function purgeOldPolls() { - $oldPolls = $this->connect->findOldPolls(); + $oldPolls = $this->pollRepository->findOldPolls(); $count = count($oldPolls); if ($count > 0) { @@ -50,16 +57,16 @@ class PurgeService { function purgePollById($poll_id) { $done = true; - $this->connect->beginTransaction(); - $done &= $this->connect->deleteCommentsByPollId($poll_id); - $done &= $this->connect->deleteVotesByPollId($poll_id); - $done &= $this->connect->deleteSlotsByPollId($poll_id); - $done &= $this->connect->deletePollById($poll_id); + $this->pollRepository->beginTransaction(); + $done &= $this->commentRepository->deleteByPollId($poll_id); + $done &= $this->voteRepository->deleteByPollId($poll_id); + $done &= $this->slotRepository->deleteByPollId($poll_id); + $done &= $this->pollRepository->deleteById($poll_id); if ($done) { - $this->connect->commit(); + $this->pollRepository->commit(); } else { - $this->connect->rollback(); + $this->pollRepository->rollback(); } return $done; diff --git a/app/classes/Framadate/Services/SuperAdminService.php b/app/classes/Framadate/Services/SuperAdminService.php index 066af95..a4b7850 100644 --- a/app/classes/Framadate/Services/SuperAdminService.php +++ b/app/classes/Framadate/Services/SuperAdminService.php @@ -1,7 +1,7 @@ connect = $connect; + function __construct() { + $this->pollRepository = RepositoryFactory::pollRepository(); } /** @@ -26,8 +26,8 @@ class SuperAdminService { */ public function findAllPolls($search, $page, $limit) { $start = $page * $limit; - $polls = $this->connect->findAllPolls($search); - $total = $this->connect->countPolls(); + $polls = $this->pollRepository->findAll($search); + $total = $this->pollRepository->count(); return ['polls' => array_slice($polls, $start, $limit), 'count' => count($polls), 'total' => $total];