tykayn
/
date-poll-api
mirror of https://framagit.org/tykayn/date-poll-api
1
0
Fork 0
Code Issues Releases Wiki Activity

reformat src folder

This commit is contained in:
Tykayn 2021-04-27 10:22:16 +02:00 committed by tykayn
parent 56c8b0a5c4
commit 7f7265c851
27 changed files with 1179 additions and 1203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/AdminController.php
View File

@ -83,14 +83,14 @@ class AdminController extends EmailsController {
// TODO // TODO
// fetch old polls and store their properties in new poll objects // fetch old polls and store their properties in new poll objects
$foundPolls = []; $foundPolls = [];
$database_name = 'symfony'; $database_name = 'symfony';
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$emPoll = $this->getDoctrine()->getRepository( Poll::class ); $emPoll = $this->getDoctrine()->getRepository( Poll::class );
return $this->json( [ return $this->json( [
'message' => 'migration done for: ' . count( $foundPolls ). ' - this feature is not ready to work YET.', 'message' => 'migration done for: ' . count( $foundPolls ) . ' - this feature is not ready to work YET.',
'data' => [ 'data' => [
'count' => count( $foundPolls ), 'count' => count( $foundPolls ),
], ],

5
src/Controller/DefaultController.php
View File

@ -2,14 +2,9 @@
namespace App\Controller; namespace App\Controller;
use App\Entity\Owner;
use App\Entity\Poll; use App\Entity\Poll;
use App\Repository\PollRepository;
use App\Service\MailService;
use FOS\RestBundle\Controller\Annotations\Get; use FOS\RestBundle\Controller\Annotations\Get;
use FOS\RestBundle\Controller\Annotations\Route; use FOS\RestBundle\Controller\Annotations\Route;
use JMS\Serializer\Type\Exception\Exception;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
/** /**

65
src/Controller/EmailsController.php
View File

@ -5,8 +5,10 @@ namespace App\Controller;
use App\Entity\Owner; use App\Entity\Owner;
use App\Entity\Poll; use App\Entity\Poll;
use JMS\Serializer\Type\Exception\Exception; use JMS\Serializer\Type\Exception\Exception;
use Swift_Mailer;
use Swift_Message; use Swift_Message;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
/** /**
* sending emails controller * sending emails controller
@ -18,16 +20,37 @@ class EmailsController extends AbstractController {
private $mail_service; private $mail_service;
public function __construct( \Swift_Mailer $mailer ) { public function __construct( Swift_Mailer $mailer ) {
$this->mail_service = $mailer; $this->mail_service = $mailer;
} }
/**
* send created polls to an owner
*
* @param Owner $owner
*
* @return int|void
* @throws Exception
* @throws TransportExceptionInterface
*/
public function sendOwnerPollsAction( Owner $owner ) {
$config = [
'owner' => $owner,
'title' => $this->getParameter( 'WEBSITE_NAME' ) . ' | Mes sondages',
'email_template' => 'emails/owner-list.html.twig',
];
$this->sendMailWithVars( $config );
return 1;
}
/** /**
* generic way to send email with html template * generic way to send email with html template
* *
* @param $config * @param $config
* *
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendMailWithVars( $config ) { public function sendMailWithVars( $config ) {
@ -57,7 +80,7 @@ class EmailsController extends AbstractController {
$config[ 'email_template' ], $config[ 'email_template' ],
$config $config
); );
$message = ( new Swift_Message( $config[ 'title' ] ) ) $message = ( new Swift_Message( $config[ 'title' ] ) )
->setContentType( "text/html" ) ->setContentType( "text/html" )
->setCharset( 'UTF-8' ) ->setCharset( 'UTF-8' )
->setFrom( [ 'ne-pas-repondre@framadate-api.cipherbliss.com' ] ) ->setFrom( [ 'ne-pas-repondre@framadate-api.cipherbliss.com' ] )
@ -72,33 +95,11 @@ class EmailsController extends AbstractController {
} }
/**
* send created polls to an owner
*
* @param Owner $owner
*
* @return int|void
* @throws Exception
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface
*/
public function sendOwnerPollsAction( Owner $owner ) {
$config = [
'owner' => $owner,
'title' => $this->getParameter( 'WEBSITE_NAME' ) . ' | Mes sondages',
'email_template' => 'emails/owner-list.html.twig',
];
$this->sendMailWithVars( $config );
return 1;
}
/** /**
* @param Owner $foundOwner * @param Owner $foundOwner
* @param Poll|null $poll * @param Poll|null $poll
* *
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendCreationMailAction( Owner $foundOwner, Poll $poll = null ) { public function sendCreationMailAction( Owner $foundOwner, Poll $poll = null ) {
@ -120,14 +121,14 @@ class EmailsController extends AbstractController {
* @param $comment * @param $comment
* *
* @return int * @return int
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendCommentNotificationAction( Owner $owner, $comment ) { public function sendCommentNotificationAction( Owner $owner, $comment ) {
$config = [ $config = [
'owner' => $owner, 'owner' => $owner,
'comment' => $comment, 'comment' => $comment,
'poll' => $comment->getPoll(), 'poll' => $comment->getPoll(),
'title' => 'Framadate | Commentaire de "' . $owner->getPseudo() . '" - sondage ' . $comment->getPoll()->getTitle(), 'title' => 'Framadate | Commentaire de "' . $owner->getPseudo() . '" - sondage ' . $comment->getPoll()->getTitle(),
'email_template' => 'emails/comment-notification.html.twig', 'email_template' => 'emails/comment-notification.html.twig',
]; ];
@ -141,14 +142,14 @@ class EmailsController extends AbstractController {
* @param $stackOfVotes * @param $stackOfVotes
* *
* @return int * @return int
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendVoteNotificationAction( Owner $owner, $stackOfVotes ) { public function sendVoteNotificationAction( Owner $owner, $stackOfVotes ) {
$config = [ $config = [
'owner' => $owner, 'owner' => $owner,
'comment' => $stackOfVotes, 'comment' => $stackOfVotes,
'poll' => $stackOfVotes->getPoll(), 'poll' => $stackOfVotes->getPoll(),
'title' => 'Framadate | Vote de "' . $owner->getPseudo() . '" - sondage ' . $stackOfVotes->getPoll()->getTitle(), 'title' => 'Framadate | Vote de "' . $owner->getPseudo() . '" - sondage ' . $stackOfVotes->getPoll()->getTitle(),
'email_template' => 'emails/vote-notification.html.twig', 'email_template' => 'emails/vote-notification.html.twig',
]; ];

170
src/Controller/MigrationController.php
View File

@ -1,20 +1,19 @@
<?php <?php
namespace App\Controller; namespace App\Controller;
//use FOS\RestBundle\Controller\Annotations\Get; //use FOS\RestBundle\Controller\Annotations\Get;
//use FOS\RestBundle\Controller\Annotations\Route; //use FOS\RestBundle\Controller\Annotations\Route;
use App\Entity\Choice; use App\Entity\Choice;
use App\Entity\Comment; use App\Entity\Comment;
use App\Entity\StackOfVotes;
use App\Entity\Vote;
use App\Repository\PollRepository;
use App\Service\MailService;
use FOS\RestBundle\Controller\Annotations\Get;
use FOS\RestBundle\Controller\Annotations\Route;
use JMS\Serializer\Type\Exception\Exception;
use Symfony\Component\HttpFoundation\JsonResponse;
use App\Entity\Owner; use App\Entity\Owner;
use App\Entity\Poll; use App\Entity\Poll;
use App\Entity\StackOfVotes;
use App\Entity\Vote;
use FOS\RestBundle\Controller\Annotations\Get;
use FOS\RestBundle\Controller\Annotations\Route;
use PDO;
use Symfony\Component\HttpFoundation\JsonResponse;
/** /**
* Class DefaultController * Class DefaultController
@ -34,40 +33,40 @@ class MigrationController extends EmailsController {
return new JsonResponse( [ return new JsonResponse( [
'error' => 'NOPE! veuillez vérifier votre fichier .env', 'error' => 'NOPE! veuillez vérifier votre fichier .env',
] ); ] );
}; }
// fetch old Database // fetch old Database
$debug = ''; $debug = '';
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$pollsBySlug = []; $pollsBySlug = [];
$pdo_options[ \PDO::ATTR_ERRMODE ] = \PDO::ERRMODE_EXCEPTION; $pdo_options[ PDO::ATTR_ERRMODE ] = PDO::ERRMODE_EXCEPTION;
$bdd = new \PDO( 'mysql:host=localhost;dbname=' . $this->getParameter( 'OLD_DATABASE_NAME' ), $bdd = new PDO( 'mysql:host=localhost;dbname=' . $this->getParameter( 'OLD_DATABASE_NAME' ),
$this->getParameter( 'OLD_DATABASE_USER' ), $this->getParameter( 'OLD_DATABASE_USER' ),
$this->getParameter( 'OLD_DATABASE_PASS' ), $this->getParameter( 'OLD_DATABASE_PASS' ),
$pdo_options ); $pdo_options );
$res_polls = $bdd->query( 'SELECT * FROM fd_poll' ); $res_polls = $bdd->query( 'SELECT * FROM fd_poll' );
while ( $d = $res_polls->fetch( \PDO::FETCH_OBJ ) ) { while ( $d = $res_polls->fetch( PDO::FETCH_OBJ ) ) {
$debug .= " <br> ajout de sondage : ".$d->title .' - '. $d->id ; $debug .= " <br> ajout de sondage : " . $d->title . ' - ' . $d->id;
$newPoll = new Poll(); $newPoll = new Poll();
$owner = new Owner(); $owner = new Owner();
$owner->setEmail( $d->admin_mail ) $owner->setEmail( $d->admin_mail )
->setPseudo( $d->admin_name ) ->setPseudo( $d->admin_name )
->addPoll($newPoll); ->addPoll( $newPoll );
$newPoll $newPoll
->setOwner( $owner ) ->setOwner( $owner )
->setCustomURL( $d->id ) ->setCustomURL( $d->id )
->setKind( $d->id === 'D' ? 'date' : 'text' ) ->setKind( $d->id === 'D' ? 'date' : 'text' )
->setHideResults( ! $d->results_publicly_visible ) ->setHideResults( ! $d->results_publicly_visible )
->setAdminKey( $d->admin_id ) ->setAdminKey( $d->admin_id )
->setTitle( $d->title ) ->setTitle( $d->title )
->setVotesAllowed( $d->receiveNewVotes ) ->setVotesAllowed( $d->receiveNewVotes )
@ -84,105 +83,102 @@ class MigrationController extends EmailsController {
$em->persist( $newPoll ); $em->persist( $newPoll );
} }
// get choices, slots and link them with poll by their slug // get choices, slots and link them with poll by their slug
$res_slots = $bdd->query( 'SELECT * FROM fd_slot' ); $res_slots = $bdd->query( 'SELECT * FROM fd_slot' );
$pollChoicesOrderedBySlug = []; $pollChoicesOrderedBySlug = [];
$choicesCreated = []; $choicesCreated = [];
while ( $d = $res_slots->fetch( \PDO::FETCH_OBJ ) ) { while ( $d = $res_slots->fetch( PDO::FETCH_OBJ ) ) {
$debug .= " <br> ajout de slot, converti en choix de réponse : ".$d->poll_id. ' : '. $d->moments; $debug .= " <br> ajout de slot, converti en choix de réponse : " . $d->poll_id . ' : ' . $d->moments;
$pollSlug = $d->poll_id; $pollSlug = $d->poll_id;
$poll = $pollsBySlug[$pollSlug]; $poll = $pollsBySlug[ $pollSlug ];
$moments = explode(',' , $d->moments); $moments = explode( ',', $d->moments );
foreach ( $moments as $moment ) { foreach ( $moments as $moment ) {
$newChoice = new Choice(); $newChoice = new Choice();
$newChoice $newChoice
->setPoll($poll) ->setPoll( $poll )
->setDateTime(date_create( strtotime( $d->title))) ->setDateTime( date_create( strtotime( $d->title ) ) )
->setName($moment); ->setName( $moment );
$pollChoicesOrderedBySlug[$pollSlug][] = $newChoice; $pollChoicesOrderedBySlug[ $pollSlug ][] = $newChoice;
$poll->addChoice($newChoice); $poll->addChoice( $newChoice );
$em->persist( $newChoice ); $em->persist( $newChoice );
$em->persist( $newPoll ); $em->persist( $newPoll );
$choicesCreated[] = $newChoice; $choicesCreated[] = $newChoice;
} }
} }
// get votes // get votes
$stacksOfVote = []; $stacksOfVote = [];
$res_votes = $bdd->query( 'SELECT * FROM fd_vote' ); $res_votes = $bdd->query( 'SELECT * FROM fd_vote' );
while ( $d = $res_votes->fetch( \PDO::FETCH_OBJ ) ) { while ( $d = $res_votes->fetch( PDO::FETCH_OBJ ) ) {
$debug .= " <br> ajout de stack de vote : ".$d->name; $debug .= " <br> ajout de stack de vote : " . $d->name;
$pollSlug = $d->poll_id; $pollSlug = $d->poll_id;
$poll = $pollsBySlug[ $pollSlug ]; $poll = $pollsBySlug[ $pollSlug ];
$newStack = new StackOfVotes(); $newStack = new StackOfVotes();
$newOwner = new Owner(); $newOwner = new Owner();
$newOwner $newOwner
->setPseudo($d->name) ->setPseudo( $d->name )
->setEmail('the_anonymous_email_from_@_migration_offramadate.org') ->setEmail( 'the_anonymous_email_from_@_migration_offramadate.org' )
->setModifierToken($d->uniqId) ->setModifierToken( $d->uniqId );
;
$newStack->setPoll($poll) $newStack->setPoll( $poll )
->setOwner($newOwner) ->setOwner( $newOwner )
->setPseudo($d->name) ->setPseudo( $d->name );
;
// each choice answer is encoded in a value : // each choice answer is encoded in a value :
$voteCodes = str_split($d->choices); $voteCodes = str_split( $d->choices );
// get choices of the poll and answer accordingly // get choices of the poll and answer accordingly
$ii=0; $ii = 0;
foreach ( $voteCodes as $vote_code ) { foreach ( $voteCodes as $vote_code ) {
if($vote_code !== ' '){ if ( $vote_code !== ' ' ) {
$choice = $pollChoicesOrderedBySlug[$pollSlug][$ii]; $choice = $pollChoicesOrderedBySlug[ $pollSlug ][ $ii ];
$newVote = new Vote(); $newVote = new Vote();
$newVote $newVote
->setChoice($choice) ->setChoice( $choice )
->setStacksOfVotes($newStack) ->setStacksOfVotes( $newStack )
->setPoll($poll) ->setPoll( $poll )
->setValue( $this->mapAnswerNumberToWord($vote_code)) ->setValue( $this->mapAnswerNumberToWord( $vote_code ) );
; $newStack->addVote( $newVote );
$newStack->addVote($newVote);
$em->persist( $newVote ); $em->persist( $newVote );
$votes[] = $newVote; $votes[] = $newVote;
} }
$ii++; $ii ++;
} }
$poll->addStackOfVote($newStack); $poll->addStackOfVote( $newStack );
$em->persist( $newStack ); $em->persist( $newStack );
$stacksOfVote[] = $newStack; $stacksOfVote[] = $newStack;
} }
$comments = []; $comments = [];
$res_comments = $bdd->query( 'SELECT * FROM fd_comment' ); $res_comments = $bdd->query( 'SELECT * FROM fd_comment' );
while ( $d = $res_comments->fetch( \PDO::FETCH_OBJ ) ) { while ( $d = $res_comments->fetch( PDO::FETCH_OBJ ) ) {
$debug .= " <br> ajout de commentaire : ".$d->name. ' '. $d->comment; $debug .= " <br> ajout de commentaire : " . $d->name . ' ' . $d->comment;
$pollSlug = $d->poll_id; $pollSlug = $d->poll_id;
$poll = $pollsBySlug[ $pollSlug ]; $poll = $pollsBySlug[ $pollSlug ];
$newComment = new Comment(); $newComment = new Comment();
$poll->addComment($newComment); $poll->addComment( $newComment );
$newComment->setPoll($poll) $newComment->setPoll( $poll )
->setCreatedAt( date_create($d->date)) ->setCreatedAt( date_create( $d->date ) )
->setText( $d->comment) ->setText( $d->comment )
// TODO update entities // TODO update entities
->setPseudo( $d->name); ->setPseudo( $d->name );
$em->persist( $newComment ); $em->persist( $newComment );
$comments[] = $newComment; $comments[] = $newComment;
@ -194,41 +190,45 @@ class MigrationController extends EmailsController {
// failure notice // failure notice
$debug .= " <br> <br> ça c'est fait. "; $debug .= " <br> <br> ça c'est fait. ";
return $this->render('pages/migration.html.twig' , [ return $this->render( 'pages/migration.html.twig',
"message" => "welcome to the framadate migration endpoint, it has yet to be done", [
"debug" => $debug, "message" => "welcome to the framadate migration endpoint, it has yet to be done",
"OLD_DATABASE_NAME" => $this->getParameter( 'OLD_DATABASE_NAME' ), "debug" => $debug,
"OLD_DATABASE_USER" => $this->getParameter( 'OLD_DATABASE_USER' ), "OLD_DATABASE_NAME" => $this->getParameter( 'OLD_DATABASE_NAME' ),
"counters" =>[ "OLD_DATABASE_USER" => $this->getParameter( 'OLD_DATABASE_USER' ),
'polls' => count($pollsBySlug), "counters" => [
'comments' => count($comments), 'polls' => count( $pollsBySlug ),
'choices' => count($choicesCreated), 'comments' => count( $comments ),
'stacks_of_votes' => count($stacksOfVote), 'choices' => count( $choicesCreated ),
'votes' => count($votes), 'stacks_of_votes' => count( $stacksOfVote ),
] 'votes' => count( $votes ),
]); ],
] );
} }
/** /**
* @param $numberToConvert * @param $numberToConvert
* conversion of answer: * conversion of answer:
* space character : no answer, 0 : no , 1 : maybe , 2 : yes * space character : no answer, 0 : no , 1 : maybe , 2 : yes
*
* @return string * @return string
*/ */
public function mapAnswerNumberToWord($numberToConvert){ public function mapAnswerNumberToWord( $numberToConvert ) {
$word = ''; $word = '';
switch ($numberToConvert){ switch ( $numberToConvert ) {
case 0: case 0:
$word = 'no'; $word = 'no';
break; break;
case 1: case 1:
$word = 'maybe'; $word = 'maybe';
break; break;
case 2: case 2:
$word = 'yes'; $word = 'yes';
break; break;
default: default:
$word = 'no'; $word = 'no';
} }
return $word; return $word;
} }

165
src/Controller/PollController.php
View File

@ -9,104 +9,103 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
/** /**
* @Route("/poll") * @Route("/poll")
*/ */
class PollController extends AbstractController class PollController extends AbstractController {
{ /**
/** * @Route("/", name="poll_index", methods={"GET"})
* @Route("/", name="poll_index", methods={"GET"}) */
*/ public function index( PollRepository $pollRepository ): Response {
public function index(PollRepository $pollRepository): Response
{
$polls = $pollRepository->findAll(); $polls = $pollRepository->findAll();
$titles=[]; $titles = [];
foreach ( $polls as $poll ) { foreach ( $polls as $poll ) {
$titles[] = $poll->getTitle(); $titles[] = $poll->getTitle();
} }
return $this->render('poll/index.html.twig', [
'count' => count($polls),
'titles' => $titles,
'polls' => $polls,
]);
}
/** return $this->render( 'poll/index.html.twig',
* @Route("/new", name="poll_new", methods={"GET","POST"}) [
*/ 'count' => count( $polls ),
public function new(Request $request): Response 'titles' => $titles,
{ 'polls' => $polls,
$poll = new Poll(); ] );
$form = $this->createForm(PollType::class, $poll); }
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { /**
$entityManager = $this->getDoctrine()->getManager(); * @Route("/new", name="poll_new", methods={"GET","POST"})
$entityManager->persist($poll); */
$entityManager->flush(); public function new( Request $request ): Response {
$poll = new Poll();
$form = $this->createForm( PollType::class, $poll );
$form->handleRequest( $request );
return $this->redirectToRoute('poll_index'); if ( $form->isSubmitted() && $form->isValid() ) {
} $entityManager = $this->getDoctrine()->getManager();
$entityManager->persist( $poll );
$entityManager->flush();
return $this->render('poll/new.html.twig', [ return $this->redirectToRoute( 'poll_index' );
'poll' => $poll, }
'form' => $form->createView(),
]);
}
/** return $this->render( 'poll/new.html.twig',
* on cherche un sondage par son url personnalisée [
* @Route("/{id}", name="poll_show", methods={"GET"}) 'poll' => $poll,
*/ 'form' => $form->createView(),
public function show($id): Response ] );
{ }
$repository = $this->getDoctrine()->getRepository(Poll::class);
$foundPoll = $repository->findOneByCustomUrl($id);
if(!$foundPoll){
return $this->json([
'message' => $id.' : not found'
], 404);
}
return $this->render('poll/show.html.twig', [ /**
'poll' => $foundPoll, * on cherche un sondage par son url personnalisée
]); * @Route("/{id}", name="poll_show", methods={"GET"})
} */
public function show( $id ): Response {
$repository = $this->getDoctrine()->getRepository( Poll::class );
$foundPoll = $repository->findOneByCustomUrl( $id );
if ( ! $foundPoll ) {
return $this->json( [
'message' => $id . ' : not found',
],
404 );
}
/** return $this->render( 'poll/show.html.twig',
* @Route("/{id}/edit", name="poll_edit", methods={"GET","POST"}) [
*/ 'poll' => $foundPoll,
public function edit(Request $request, Poll $poll): Response ] );
{ }
$form = $this->createForm(PollType::class, $poll);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { /**
$this->getDoctrine()->getManager()->flush(); * @Route("/{id}/edit", name="poll_edit", methods={"GET","POST"})
*/
public function edit( Request $request, Poll $poll ): Response {
$form = $this->createForm( PollType::class, $poll );
$form->handleRequest( $request );
return $this->redirectToRoute('poll_index'); if ( $form->isSubmitted() && $form->isValid() ) {
} $this->getDoctrine()->getManager()->flush();
return $this->render('poll/edit.html.twig', [ return $this->redirectToRoute( 'poll_index' );
'poll' => $poll, }
'form' => $form->createView(),
]);
}
/** return $this->render( 'poll/edit.html.twig',
* @Route("/{id}", name="poll_delete", methods={"DELETE"}) [
*/ 'poll' => $poll,
public function delete(Request $request, Poll $poll): Response 'form' => $form->createView(),
{ ] );
if ($this->isCsrfTokenValid('delete'.$poll->getId(), $request->request->get('_token'))) { }
$entityManager = $this->getDoctrine()->getManager();
$entityManager->remove($poll);
$entityManager->flush();
}
return $this->redirectToRoute('poll_index'); /**
} * @Route("/{id}", name="poll_delete", methods={"DELETE"})
*/
public function delete( Request $request, Poll $poll ): Response {
if ( $this->isCsrfTokenValid( 'delete' . $poll->getId(), $request->request->get( '_token' ) ) ) {
$entityManager = $this->getDoctrine()->getManager();
$entityManager->remove( $poll );
$entityManager->flush();
}
return $this->redirectToRoute( 'poll_index' );
}
} }

28
src/Controller/api/CommentController.php
View File

@ -36,13 +36,15 @@ class CommentController extends EmailsController {
SerializerInterface $serializer, SerializerInterface $serializer,
Poll $poll Poll $poll
) { ) {
$jsonResponse = $serializer->serialize([ $jsonResponse = $serializer->serialize( [
'message' => 'here are your comments of the poll', 'message' => 'here are your comments of the poll',
'data' => $poll->getComments()], 'json'); 'data' => $poll->getComments(),
],
'json' );
$response = new Response($jsonResponse); $response = new Response( $jsonResponse );
$response->headers->set('Content-Type', 'application/json'); $response->headers->set( 'Content-Type', 'application/json' );
$response->setStatusCode(200); $response->setStatusCode( 200 );
return $response; return $response;
@ -72,8 +74,8 @@ class CommentController extends EmailsController {
$em = $this->getDoctrine()->getRepository( Owner::class ); $em = $this->getDoctrine()->getRepository( Owner::class );
$data = json_decode( $data, true ); $data = json_decode( $data, true );
if(!isset($data['email'])) { if ( ! isset( $data[ 'email' ] ) ) {
return $this->json(["message" => "Incorrect JSON in request"], 400); return $this->json( [ "message" => "Incorrect JSON in request" ], 400 );
} }
$foundOwner = $em->findOneByEmail( $data[ 'email' ] ); $foundOwner = $em->findOneByEmail( $data[ 'email' ] );
@ -81,8 +83,8 @@ class CommentController extends EmailsController {
if ( ! $foundOwner ) { if ( ! $foundOwner ) {
$foundOwner = new Owner(); $foundOwner = new Owner();
$foundOwner->setPseudo( $data[ 'email' ] ) $foundOwner->setPseudo( $data[ 'email' ] )
->setEmail( $data[ 'email' ] ) ->setEmail( $data[ 'email' ] )
->setModifierToken( uniqid( '', true ) ); ->setModifierToken( uniqid( '', true ) );
} }
// anti flood // anti flood
$seconds_limit_lastpost = 5; $seconds_limit_lastpost = 5;
@ -118,8 +120,8 @@ class CommentController extends EmailsController {
} }
} }
$comment->setOwner( $foundOwner ) $comment->setOwner( $foundOwner )
->setCreatedAt( new DateTime() ) ->setCreatedAt( new DateTime() )
->setPoll( $poll ); ->setPoll( $poll );
$foundOwner->addComment( $comment ); $foundOwner->addComment( $comment );
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
@ -127,8 +129,8 @@ class CommentController extends EmailsController {
$em->persist( $comment ); $em->persist( $comment );
$em->flush(); $em->flush();
if($poll->getMailOnComment()){ if ( $poll->getMailOnComment() ) {
$this->sendCommentNotificationAction($foundOwner, $comment); $this->sendCommentNotificationAction( $foundOwner, $comment );
} }

49
src/Controller/api/PollController.php
View File

@ -7,6 +7,11 @@ use App\Entity\Choice;
use App\Entity\Owner; use App\Entity\Owner;
use App\Entity\Poll; use App\Entity\Poll;
use App\Repository\PollRepository; use App\Repository\PollRepository;
use FOS\RestBundle\Controller\Annotations\Delete;
use FOS\RestBundle\Controller\Annotations\Get;
use FOS\RestBundle\Controller\Annotations\Post;
use FOS\RestBundle\Controller\Annotations\Put;
use FOS\RestBundle\Controller\Annotations\Route;
use JMS\Serializer\Exception\RuntimeException; use JMS\Serializer\Exception\RuntimeException;
use JMS\Serializer\SerializerBuilder; use JMS\Serializer\SerializerBuilder;
use JMS\Serializer\SerializerInterface; use JMS\Serializer\SerializerInterface;
@ -14,13 +19,6 @@ use Swift_Mailer;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use FOS\RestBundle\Controller\Annotations\Get;
use FOS\RestBundle\Controller\Annotations\Put;
use FOS\RestBundle\Controller\Annotations\Delete;
use FOS\RestBundle\Controller\Annotations\Post;
use FOS\RestBundle\Controller\Annotations\Route;
/** /**
* Class DefaultController * Class DefaultController
@ -63,19 +61,6 @@ class PollController extends EmailsController {
} }
/**
* @param $id
* message when the poll is not found
*
* @return JsonResponse
*/
public function notFoundPoll( $id ): Response {
return $this->json( [
'message' => $id . ' : poll not found',
],
404 );
}
/** /**
* get a poll config by its custom URL, we do not want polls to be reachable by their numeric id * get a poll config by its custom URL, we do not want polls to be reachable by their numeric id
* @Get( * @Get(
@ -104,7 +89,6 @@ class PollController extends EmailsController {
$stacks = $poll->getStacksOfVotes(); $stacks = $poll->getStacksOfVotes();
$pass = $poll->getPassword(); $pass = $poll->getPassword();
@ -125,6 +109,19 @@ class PollController extends EmailsController {
} }
/**
* @param $id
* message when the poll is not found
*
* @return JsonResponse
*/
public function notFoundPoll( $id ): Response {
return $this->json( [
'message' => $id . ' : poll not found',
],
404 );
}
/** /**
* get a poll config by its custom URL, we do not want polls to be reachable by their numeric id * get a poll config by its custom URL, we do not want polls to be reachable by their numeric id
* @Get( * @Get(
@ -196,8 +193,8 @@ class PollController extends EmailsController {
$em->persist( $poll ); $em->persist( $poll );
$em->flush(); $em->flush();
return $this->json( $poll->displayForAdmin() return $this->json( $poll->displayForAdmin()
, ,
200 ); 200 );
} }
@ -305,9 +302,9 @@ class PollController extends EmailsController {
$this->sendCreationMailAction( $foundOwner, $newpoll ); $this->sendCreationMailAction( $foundOwner, $newpoll );
return $this->json( [ return $this->json( [
'message' => 'you created a poll ' . $precision, 'message' => 'you created a poll ' . $precision,
'poll' => $newpoll->displayForAdmin, 'poll' => $newpoll->displayForAdmin,
'password_protected' => is_string( $newpoll->getPassword() ), 'password_protected' => is_string( $newpoll->getPassword() ),
], ],
201 ); 201 );

37
src/Controller/api/VoteController.php
View File

@ -31,6 +31,7 @@ class VoteController extends EmailsController {
* name = "new_vote_stack", * name = "new_vote_stack",
* requirements = {"content"="\w+", "poll_id"="\d+"} * requirements = {"content"="\w+", "poll_id"="\d+"}
* ) * )
*
* @param SerializerInterface $serializer * @param SerializerInterface $serializer
* @param Poll $poll * @param Poll $poll
* @param Request $request * @param Request $request
@ -96,8 +97,8 @@ class VoteController extends EmailsController {
404 ); 404 );
} }
$vote->setPoll( $poll ) $vote->setPoll( $poll )
->setChoice( $foundChoice ) ->setChoice( $foundChoice )
->setValue( $voteInfo[ 'value' ] ); ->setValue( $voteInfo[ 'value' ] );
$vote->setPoll( $poll ); $vote->setPoll( $poll );
$stack->addVote( $vote ); $stack->addVote( $vote );
$poll->addVote( $vote ); $poll->addVote( $vote );
@ -116,17 +117,17 @@ class VoteController extends EmailsController {
} }
$stacks = $poll->getStacksOfVotes(); $stacks = $poll->getStacksOfVotes();
if($poll->getMailOnVote()){ if ( $poll->getMailOnVote() ) {
$this->sendVoteNotificationAction($stack->getOwner(), $stack); $this->sendVoteNotificationAction( $stack->getOwner(), $stack );
} }
$returnedVoteStack = $stack; $returnedVoteStack = $stack;
$jsonResponse = $serializer->serialize($returnedVoteStack, 'json'); $jsonResponse = $serializer->serialize( $returnedVoteStack, 'json' );
$response = new Response($jsonResponse); $response = new Response( $jsonResponse );
$response->headers->set('Content-Type', 'application/json'); $response->headers->set( 'Content-Type', 'application/json' );
$response->setStatusCode(200); $response->setStatusCode( 200 );
return $response; return $response;
@ -139,6 +140,7 @@ class VoteController extends EmailsController {
* name = "update_vote_stack", * name = "update_vote_stack",
* requirements = { "id"="\d+"} * requirements = { "id"="\d+"}
* ) * )
*
* @param SerializerInterface $serializer * @param SerializerInterface $serializer
* @param StackOfVotes $id * @param StackOfVotes $id
* @param $modifierToken * @param $modifierToken
@ -171,15 +173,16 @@ class VoteController extends EmailsController {
// save evrything // save evrything
$jsonResponse = $serializer->serialize([ $jsonResponse = $serializer->serialize( [
'message' => 'ok', 'message' => 'ok',
'modifier_token' => $voteStack->getOwner()->getModifierToken(), 'modifier_token' => $voteStack->getOwner()->getModifierToken(),
'vote_stack' => $voteStack, 'vote_stack' => $voteStack,
], 'json'); ],
'json' );
$response = new Response($jsonResponse); $response = new Response( $jsonResponse );
$response->headers->set('Content-Type', 'application/json'); $response->headers->set( 'Content-Type', 'application/json' );
$response->setStatusCode(200); $response->setStatusCode( 200 );
return $response; return $response;
@ -207,11 +210,13 @@ class VoteController extends EmailsController {
return $this->json( [ return $this->json( [
'message' => 'boom! les ' . $length . ' votes du sondage ont été supprimés', 'message' => 'boom! les ' . $length . ' votes du sondage ont été supprimés',
],200 ); ],
200 );
} else { } else {
return $this->json( [ return $this->json( [
'message' => 'le token d\'autorisation est invalide, vous ne pouvez pas modifier ce sondage' 'message' => 'le token d\'autorisation est invalide, vous ne pouvez pas modifier ce sondage',
],403 ); ],
403 );
} }
} }
} }

14
src/DataFixtures/AppFixtures.php
View File

@ -6,13 +6,11 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Persistence\ObjectManager; use Doctrine\Persistence\ObjectManager;
class AppFixtures extends Fixture class AppFixtures extends Fixture {
{ public function load( ObjectManager $manager ) {
public function load(ObjectManager $manager) // $product = new Product();
{ // $manager->persist($product);
// $product = new Product();
// $manager->persist($product);
$manager->flush(); $manager->flush();
} }
} }

82
src/DataFixtures/AppPollFixtures.php
View File

@ -42,12 +42,12 @@ class AppPollFixtures extends Fixture {
$pollCitronOrange = new Poll(); $pollCitronOrange = new Poll();
$pollCitronOrange->setTitle( 'citron ou orange' ) $pollCitronOrange->setTitle( 'citron ou orange' )
->setCustomUrl('citron') ->setCustomUrl( 'citron' )
->setDescription( 'votre sorbert préféré' ) ->setDescription( 'votre sorbert préféré' )
->setModificationPolicy( 'nobody' ) ->setModificationPolicy( 'nobody' )
->setPassword('le pass woute woute'); ->setPassword( 'le pass woute woute' );
$this->addReference(self::POLL_FIXTURE_ONE, $pollCitronOrange); $this->addReference( self::POLL_FIXTURE_ONE, $pollCitronOrange );
$pollCitronOrange->setMailOnVote( true ); $pollCitronOrange->setMailOnVote( true );
$pollCitronOrange->setOwner( $owner ); $pollCitronOrange->setOwner( $owner );
@ -106,21 +106,21 @@ class AppPollFixtures extends Fixture {
$ownerComment = new Comment(); $ownerComment = new Comment();
$ownerComment $ownerComment
->setText( "trop bien ce sondage wohooo! signé l'auteur." ) ->setText( "trop bien ce sondage wohooo! signé l'auteur." )
->setPseudo('un gens qui commente') ->setPseudo( 'un gens qui commente' )
->setOwner( $owner ); ->setOwner( $owner );
$pollCitronOrange->addComment( $ownerComment ); $pollCitronOrange->addComment( $ownerComment );
$someoneComment = new Comment(); $someoneComment = new Comment();
$someoneComment $someoneComment
->setText( "comme l'auteur se la raconte. PFFFF!" ) ->setText( "comme l'auteur se la raconte. PFFFF!" )
->setPseudo('un gens qui commente') ->setPseudo( 'un gens qui commente' )
->setOwner( $commenterMan ); ->setOwner( $commenterMan );
$pollCitronOrange->addComment( $someoneComment ); $pollCitronOrange->addComment( $someoneComment );
$pollCitronOrange->setTitle( 'démo sondage de texte avec deux commentaires' ) $pollCitronOrange->setTitle( 'démo sondage de texte avec deux commentaires' )
->setCustomUrl('demo') ->setCustomUrl( 'demo' )
->setDescription( 'description du sondage 2' ); ->setDescription( 'description du sondage 2' );
$pollCitronOrange->setModificationPolicy( 'self' ); $pollCitronOrange->setModificationPolicy( 'self' );
$pollCitronOrange->setMailOnComment( true ); $pollCitronOrange->setMailOnComment( true );
@ -138,9 +138,9 @@ class AppPollFixtures extends Fixture {
// voting test with 2 people // voting test with 2 people
// poll with date type // poll with date type
$pollCitronOrange = new Poll(); $pollCitronOrange = new Poll();
$choice = new Choice(); $choice = new Choice();
$firstDate = new DateTime(); $firstDate = new DateTime();
$choice->setName( $firstDate->format( 'Y-m-d H:i:s' ) ); $choice->setName( $firstDate->format( 'Y-m-d H:i:s' ) );
$choice2 = new Choice(); $choice2 = new Choice();
$choice3 = new Choice(); $choice3 = new Choice();
@ -148,42 +148,42 @@ class AppPollFixtures extends Fixture {
$choice3->setName( $pollCitronOrange->addDaysToDate( $firstDate, 2 )->format( 'Y-m-d H:i:s' ) ); $choice3->setName( $pollCitronOrange->addDaysToDate( $firstDate, 2 )->format( 'Y-m-d H:i:s' ) );
$pollCitronOrange->setTitle( "c'est pour aujourdhui ou pour demain" ) $pollCitronOrange->setTitle( "c'est pour aujourdhui ou pour demain" )
->setCustomUrl('aujourdhui-ou-demain') ->setCustomUrl( 'aujourdhui-ou-demain' )
->setDescription( 'Vous avez le choix dans la date' ) ->setDescription( 'Vous avez le choix dans la date' )
->setKind( 'date' ) ->setKind( 'date' )
->setOwner( $owner ) ->setOwner( $owner )
->addChoice( $choice ) ->addChoice( $choice )
->addChoice( $choice2 ) ->addChoice( $choice2 )
->addChoice( $choice3 ) ->addChoice( $choice3 )
->setModificationPolicy( 'everybody' ); ->setModificationPolicy( 'everybody' );
$manager->persist( $pollCitronOrange ); $manager->persist( $pollCitronOrange );
// poll with cartoon choices // poll with cartoon choices
$pollCartoons = new Poll(); $pollCartoons = new Poll();
$pollCartoons->setTitle( 'dessin animé préféré' ) $pollCartoons->setTitle( 'dessin animé préféré' )
->setCustomUrl('dessin-anime') ->setCustomUrl( 'dessin-anime' )
->setDescription( 'choisissez votre animé préféré' ) ->setDescription( 'choisissez votre animé préféré' )
->setOwner( $owner ) ->setOwner( $owner )
->setModificationPolicy( 'nobody' ) ->setModificationPolicy( 'nobody' )
->addTextChoiceArray( [ ->addTextChoiceArray( [
"Vic le viking", "Vic le viking",
"Boumbo petite automobile", "Boumbo petite automobile",
"Les mystérieuses cités d'or", "Les mystérieuses cités d'or",
"Les mondes engloutis", "Les mondes engloutis",
"Foot 2 rue", "Foot 2 rue",
"Le chat, la vache, et l'océan", "Le chat, la vache, et l'océan",
"Digimon", "Digimon",
] ); ] );
$someoneComment = new Comment(); $someoneComment = new Comment();
$someoneComment $someoneComment
->setPseudo('un gens qui commente') ->setPseudo( 'un gens qui commente' )
->setText( "allez boumbo!" ) ->setText( "allez boumbo!" )
->setOwner( $commenterMan ); ->setOwner( $commenterMan );
$pollCartoons->addComment( $someoneComment ); $pollCartoons->addComment( $someoneComment );
$someoneComment2 = new Comment(); $someoneComment2 = new Comment();
$someoneComment2 $someoneComment2
->setPseudo('un gens qui commente') ->setPseudo( 'un gens qui commente' )
->setText( "je suis pour la team rocket de digimon" ) ->setText( "je suis pour la team rocket de digimon" )
->setOwner( $owner ); ->setOwner( $owner );
$pollCartoons->addComment( $someoneComment2 ); $pollCartoons->addComment( $someoneComment2 );
@ -195,7 +195,7 @@ class AppPollFixtures extends Fixture {
$stack $stack
->setPoll( $pollCartoons ) ->setPoll( $pollCartoons )
->setOwner( $voter ); ->setOwner( $voter );
$pollCartoons->addStackOfVote($stack); $pollCartoons->addStackOfVote( $stack );
$vote = new Vote(); $vote = new Vote();
$vote $vote
@ -203,7 +203,7 @@ class AppPollFixtures extends Fixture {
->setStacksOfVotes( $stack ) ->setStacksOfVotes( $stack )
->setValue( "yes" ) ->setValue( "yes" )
->setChoice( $pollCartoons->getChoices()[ 2 ] ); ->setChoice( $pollCartoons->getChoices()[ 2 ] );
$pollCartoons->addVote($vote); $pollCartoons->addVote( $vote );
$vote = new Vote(); $vote = new Vote();
$vote $vote
@ -211,7 +211,7 @@ class AppPollFixtures extends Fixture {
->setStacksOfVotes( $stack ) ->setStacksOfVotes( $stack )
->setValue( "maybe" ) ->setValue( "maybe" )
->setChoice( $pollCartoons->getChoices()[ 1 ] ); ->setChoice( $pollCartoons->getChoices()[ 1 ] );
$pollCartoons->addVote($vote); $pollCartoons->addVote( $vote );
$manager->persist( $stack ); $manager->persist( $stack );
@ -227,7 +227,7 @@ class AppPollFixtures extends Fixture {
->setStacksOfVotes( $stack ) ->setStacksOfVotes( $stack )
->setValue( "yes" ) ->setValue( "yes" )
->setChoice( $pollCartoons->getChoices()[ 1 ] ); ->setChoice( $pollCartoons->getChoices()[ 1 ] );
$pollCartoons->addVote($vote); $pollCartoons->addVote( $vote );
$vote = new Vote(); $vote = new Vote();
$vote $vote
@ -235,7 +235,7 @@ class AppPollFixtures extends Fixture {
->setStacksOfVotes( $stack ) ->setStacksOfVotes( $stack )
->setValue( "yes" ) ->setValue( "yes" )
->setChoice( $pollCartoons->getChoices()[ 2 ] ); ->setChoice( $pollCartoons->getChoices()[ 2 ] );
$pollCartoons->addVote($vote); $pollCartoons->addVote( $vote );
$vote = new Vote(); $vote = new Vote();
$vote $vote
@ -243,7 +243,7 @@ class AppPollFixtures extends Fixture {
->setStacksOfVotes( $stack ) ->setStacksOfVotes( $stack )
->setValue( "no" ) ->setValue( "no" )
->setChoice( $pollCartoons->getChoices()[ 2 ] ); ->setChoice( $pollCartoons->getChoices()[ 2 ] );
$pollCartoons->addVote($vote); $pollCartoons->addVote( $vote );
$manager->persist( $pollCartoons ); $manager->persist( $pollCartoons );
$manager->persist( $stack ); $manager->persist( $stack );

10
src/DataFixtures/VotesStacksFixtures.php
View File

@ -3,16 +3,14 @@
namespace App\DataFixtures; namespace App\DataFixtures;
use App\Entity\Owner; use App\Entity\Owner;
use App\Entity\Poll;
use App\Entity\StackOfVotes; use App\Entity\StackOfVotes;
use App\Entity\Vote; use App\Entity\Vote;
use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\Persistence\ObjectManager; use Doctrine\Persistence\ObjectManager;
class VotesStacksFixtures extends Fixture implements DependentFixtureInterface { class VotesStacksFixtures extends Fixture implements DependentFixtureInterface {
public function getDependencies() public function getDependencies() {
{
return [ return [
AppPollFixtures::class, AppPollFixtures::class,
]; ];
@ -32,8 +30,8 @@ class VotesStacksFixtures extends Fixture implements DependentFixtureInterface
// "citron ou orange" // "citron ou orange"
// add vote stacks on "citron ou orange" // add vote stacks on "citron ou orange"
$pollCitronOrange = $this->getReference(AppPollFixtures::POLL_FIXTURE_ONE); $pollCitronOrange = $this->getReference( AppPollFixtures::POLL_FIXTURE_ONE );
$stack1 = new StackOfVotes(); $stack1 = new StackOfVotes();
$stack1 $stack1
->setPoll( $pollCitronOrange ) ->setPoll( $pollCitronOrange )
->setOwner( $people1 ); ->setOwner( $people1 );

270
src/Entity/Choice.php
View File

@ -1,145 +1,145 @@
<?php <?php
namespace App\Entity; namespace App\Entity;
use DateTime; use DateTime;
use DateTimeInterface; use DateTimeInterface;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer; use JMS\Serializer\Annotation as Serializer;
/**
* one poll choice, could be a text or a date
* @ORM\Entity(repositoryClass="App\Repository\ChoiceRepository")
* @Serializer\ExclusionPolicy("all")
*/
class Choice {
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
* @Serializer\Expose()
*/
public $id;
/** /**
* one poll choice, could be a text or a date * @ORM\Column(type="string", length=255, nullable=true)
* @ORM\Entity(repositoryClass="App\Repository\ChoiceRepository") * @Serializer\Type("string")
* @Serializer\ExclusionPolicy("all") * @Serializer\Expose()
*/ */
class Choice { public $name;
/** /**
* @ORM\Id() * @ORM\Column(type="string", length=1024, nullable=true)
* @ORM\GeneratedValue() * @Serializer\Type("string")
* @ORM\Column(type="integer") * @Serializer\Expose()
* @Serializer\Expose() */
*/ public $url;
public $id;
/** /**
* @ORM\Column(type="string", length=255, nullable=true) * @ORM\Column(type="datetime", nullable=true)
* @Serializer\Type("string") * @Serializer\Type("datetime")
* @Serializer\Expose() */
*/ public $dateTime;
public $name; /**
/** * @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="choice", cascade={"persist"})
* @ORM\Column(type="string", length=1024, nullable=true) * @Serializer\Type("App\Entity\Vote")
* @Serializer\Type("string") */
* @Serializer\Expose() public $votes;
*/ /**
public $url; * @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="choices", cascade={"persist"})
* @Serializer\Type("App\Entity\Poll")
*/
private $poll;
/** public function __construct( $optionalName = null ) {
* @ORM\Column(type="datetime", nullable=true) $this->poll = new ArrayCollection();
* @Serializer\Type("datetime") $this->votes = new ArrayCollection();
*/ $this->setDateTime( new DateTime() );
public $dateTime; if ( $optionalName ) {
/** $this->setName( $optionalName );
* @ORM\OneToMany(targetEntity="App\Entity\Vote", mappedBy="choice", cascade={"persist"})
* @Serializer\Type("App\Entity\Vote")
*/
public $votes;
/**
* @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="choices", cascade={"persist"})
* @Serializer\Type("App\Entity\Poll")
*/
private $poll;
public function __construct( $optionalName = null ) {
$this->poll = new ArrayCollection();
$this->votes = new ArrayCollection();
$this->setDateTime( new DateTime() );
if ( $optionalName ) {
$this->setName( $optionalName );
}
}
public function display() {
return [
'id' => $this->getId(),
'date' => $this->getDateTime(),
'name' => $this->getName(),
'url' => $this->getUrl(),
];
}
public function getId(): ?int {
return $this->id;
}
public function getDateTime(): ?DateTimeInterface {
return $this->dateTime;
}
public function setDateTime( ?DateTimeInterface $dateTime ): self {
$this->dateTime = $dateTime;
return $this;
}
public function getName(): ?string {
return $this->name;
}
public function setName( ?string $name ): self {
$this->name = $name;
return $this;
}
public function getPoll(): ?Poll {
return $this->poll;
}
public function setPoll( ?Poll $poll ): self {
$this->poll = $poll;
return $this;
}
/**
* @return Collection|Vote[]
*/
public function getVotes(): Collection {
return $this->votes;
}
public function addVote( Vote $vote ): self {
if ( ! $this->votes->contains( $vote ) ) {
$this->votes[] = $vote;
$vote->setChoice( $this );
}
return $this;
}
public function removeVote( Vote $vote ): self {
if ( $this->votes->contains( $vote ) ) {
$this->votes->removeElement( $vote );
// set the owning side to null (unless already changed)
if ( $vote->getChoice() === $this ) {
$vote->setChoice( null );
}
}
return $this;
}
public function getUrl(): ?string {
return $this->url;
}
public function setUrl( ?string $url ): self {
$this->url = $url;
return $this;
} }
} }
public function display() {
return [
'id' => $this->getId(),
'date' => $this->getDateTime(),
'name' => $this->getName(),
'url' => $this->getUrl(),
];
}
public function getId(): ?int {
return $this->id;
}
public function getDateTime(): ?DateTimeInterface {
return $this->dateTime;
}
public function setDateTime( ?DateTimeInterface $dateTime ): self {
$this->dateTime = $dateTime;
return $this;
}
public function getName(): ?string {
return $this->name;
}
public function setName( ?string $name ): self {
$this->name = $name;
return $this;
}
public function getUrl(): ?string {
return $this->url;
}
public function setUrl( ?string $url ): self {
$this->url = $url;
return $this;
}
public function getPoll(): ?Poll {
return $this->poll;
}
public function setPoll( ?Poll $poll ): self {
$this->poll = $poll;
return $this;
}
/**
* @return Collection|Vote[]
*/
public function getVotes(): Collection {
return $this->votes;
}
public function addVote( Vote $vote ): self {
if ( ! $this->votes->contains( $vote ) ) {
$this->votes[] = $vote;
$vote->setChoice( $this );
}
return $this;
}
public function removeVote( Vote $vote ): self {
if ( $this->votes->contains( $vote ) ) {
$this->votes->removeElement( $vote );
// set the owning side to null (unless already changed)
if ( $vote->getChoice() === $this ) {
$vote->setChoice( null );
}
}
return $this;
}
}

99
src/Entity/Comment.php
View File

@ -2,6 +2,7 @@
namespace App\Entity; namespace App\Entity;
use DateTime;
use DateTimeInterface; use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer; use JMS\Serializer\Annotation as Serializer;
@ -51,72 +52,70 @@ class Comment {
*/ */
private $poll; private $poll;
function display() {
return [
'id' => $this->getId(),
'text' => $this->getText(),
'pseudo' => $this->getOwner()->getPseudo(),
'date' => $this->getCreatedAt(),
];
}
function __construct() { function __construct() {
$this->setCreatedAt( new \DateTime() ); $this->setCreatedAt( new DateTime() );
} }
function display() {
return [
'id' => $this->getId(),
'text' => $this->getText(),
'pseudo' => $this->getOwner()->getPseudo(),
'date' => $this->getCreatedAt(),
];
}
public function getId(): ?int { public function getId(): ?int {
return $this->id; return $this->id;
} }
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;
}
public function getText(): ?string { public function getText(): ?string {
return $this->text; return $this->text;
} }
public function setText( string $text ): self { public function setText( string $text ): self {
$this->text = $text; $this->text = $text;
return $this; return $this;
} }
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;
}
public function getCreatedAt(): ?DateTimeInterface { public function getCreatedAt(): ?DateTimeInterface {
return $this->createdAt; return $this->createdAt;
} }
public function setCreatedAt( DateTimeInterface $createdAt ): self { public function setCreatedAt( DateTimeInterface $createdAt ): self {
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
return $this; return $this;
} }
public function getPoll(): ?Poll { public function getPoll(): ?Poll {
return $this->poll; return $this->poll;
} }
public function setPoll( ?Poll $poll ): self { public function setPoll( ?Poll $poll ): self {
$this->poll = $poll; $this->poll = $poll;
return $this;
}
public function getPseudo(): ?string return $this;
{ }
return $this->pseudo;
}
public function setPseudo(string $pseudo): self public function getPseudo(): ?string {
{ return $this->pseudo;
$this->pseudo = $pseudo; }
return $this; public function setPseudo( string $pseudo ): self {
} $this->pseudo = $pseudo;
return $this;
}
} }

20
src/Entity/Owner.php
View File

@ -2,6 +2,8 @@
namespace App\Entity; namespace App\Entity;
use DateTime;
use DateTimeInterface;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
@ -17,18 +19,18 @@ class Owner {
* @Serializer\Expose() * @Serializer\Expose()
*/ */
public $pseudo; public $pseudo;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
*/
private $id;
/** /**
* @ORM\Column(type="string", length=255) * @ORM\Column(type="string", length=255)
* @Serializer\Type("string") * @Serializer\Type("string")
* @Serializer\Expose() * @Serializer\Expose()
*/ */
public $email; public $email;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
*/
private $id;
/** /**
* @ORM\OneToMany(targetEntity="App\Entity\Poll", mappedBy="owner",cascade={"persist","remove"},orphanRemoval=true) * @ORM\OneToMany(targetEntity="App\Entity\Poll", mappedBy="owner",cascade={"persist","remove"},orphanRemoval=true)
* @Serializer\Type("App\Entity\Poll") * @Serializer\Type("App\Entity\Poll")
@ -62,7 +64,7 @@ class Owner {
$this->polls = new ArrayCollection(); $this->polls = new ArrayCollection();
$this->comments = new ArrayCollection(); $this->comments = new ArrayCollection();
$this->stackOfVotes = new ArrayCollection(); $this->stackOfVotes = new ArrayCollection();
$this->setCreatedAt( new \DateTime() ); $this->setCreatedAt( new DateTime() );
$this->setModifierToken( uniqid() ); $this->setModifierToken( uniqid() );
} }
@ -206,11 +208,11 @@ class Owner {
return $this; return $this;
} }
public function getCreatedAt(): ?\DateTimeInterface { public function getCreatedAt(): ?DateTimeInterface {
return $this->createdAt; return $this->createdAt;
} }
public function setCreatedAt( \DateTimeInterface $createdAt ): self { public function setCreatedAt( DateTimeInterface $createdAt ): self {
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
return $this; return $this;

553
src/Entity/Poll.php
View File

@ -2,11 +2,14 @@
namespace App\Entity; namespace App\Entity;
use DateTimeInterface; use DateTime;
use Doctrine\Common\Collections\ArrayCollection; use DateTimeInterface;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\Collection;
use JMS\Serializer\Annotation as Serializer; use Doctrine\ORM\Mapping as ORM;
use ErrorException;
use JMS\Serializer\Annotation as Serializer;
use RangeException;
/** /**
* @ORM\Entity(repositoryClass="App\Repository\PollRepository") * @ORM\Entity(repositoryClass="App\Repository\PollRepository")
@ -97,7 +100,7 @@ class Poll {
* @Serializer\Type("smallint") * @Serializer\Type("smallint")
* @Serializer\Expose() * @Serializer\Expose()
*/ */
public $choicesMax = -1; public $choicesMax = - 1;
/** /**
* people can add comments * people can add comments
@ -168,6 +171,12 @@ class Poll {
* @Serializer\Type("ArrayCollection<App\Entity\Comment>") * @Serializer\Type("ArrayCollection<App\Entity\Comment>")
*/ */
public $comments; public $comments;
/**
* number of days from now for default expiracy date
* @var int
* @Serializer\Expose()
*/
public $defaultExpiracyDaysFromNow = 60;
/** /**
* vote restricted by a password in md5 format * vote restricted by a password in md5 format
* @ORM\Column(type="string", length=255, nullable=true) * @ORM\Column(type="string", length=255, nullable=true)
@ -179,142 +188,27 @@ class Poll {
* @Serializer\Type("string") * @Serializer\Type("string")
*/ */
private $adminKey; private $adminKey;
/**
* number of days from now for default expiracy date
* @var int
* @Serializer\Expose()
*/
public $defaultExpiracyDaysFromNow = 60;
private $maxChoicesLimit = 25; private $maxChoicesLimit = 25;
public function computeAnswers() {
// counts each number of answer for this choice
$computedArray = [];
$maxScore = 0;
foreach ( $this->getStacksOfVotes() as $stack_of_vote ) {
foreach ( $stack_of_vote->getVotes() as $vote ) {
$answer = $vote->getValue();
$choice_id = $vote->getChoice()->getId();
$choice_url = $vote->getChoice()->getUrl();
if ( ! isset( $computedArray[ $choice_id ] ) ) {
$computedArray[ $choice_id ] = [
'id' => $choice_id,
'url' => $choice_url,
'name' => $vote->getChoice()->getName(),
'score' => 0,
'yes' => [
'count' => 0,
'people' => [],
],
'maybe' => [
'count' => 0,
'people' => [],
],
'no' => [
'count' => 0,
'people' => [],
],
];
}
$computedArray[ $choice_id ][ $answer ][ 'count' ] ++;
$computedArray[ $choice_id ][ $answer ][ 'people' ][] = $stack_of_vote->getOwner()->getPseudo();
if ( $answer == 'yes' ) {
$computedArray[ $choice_id ][ 'score' ] += 1;
} elseif ( $answer == 'maybe' ) {
$computedArray[ $choice_id ][ 'score' ] += 0.5;
}
// compare with max value
if ( $computedArray[ $choice_id ][ 'score' ] > $maxScore ) {
$maxScore = $computedArray[ $choice_id ][ 'score' ];
}
}
}
$answersWithStats = [];
foreach ( $computedArray as $choice_stat ) {
$answersWithStats[] = $choice_stat;
}
return [
'answers' => $computedArray,
'answersWithStats' => $answersWithStats,
'max_score' => $maxScore,
];
}
public function displayForAdmin() {
$content = $this->display();
$content['owner_modifier_token'] = $this->getOwner()->getModifierToken();
$content['admin_key'] = $this->getAdminKey();
$content['password_hash'] = $this->getPassword();
$content['id'] = $this->getId();
return $content;
}
public function display() {
$computedAnswers = $this->computeAnswers();
$displayedStackOfVotes = [];
foreach ( $this->getStacksOfVotes() as $stack ) {
$displayedStackOfVotes[] = $stack->display();
}
$displayedChoices = [];
foreach ( $this->getChoices() as $choice ) {
$displayedChoices[] = $choice->display();
}
$displayedComments = [];
foreach ( $this->getComments() as $comment ) {
$displayedComments[] = $comment->display();
}
return [
'title' => $this->getTitle(),
'creation_date' => $this->getCreationDate()->format('c'),
'expiracy_date' => $this->getExpiracyDate()->format('c'),
'votes_max' => $this->getVotesMax(),
'choices_max' => $this->getChoicesMax(),
'kind' => $this->getKind(),
'allowed_answers' => $this->getAllowedAnswers(),
'votes_allowed' => $this->getVotesAllowed(),
'modification_policy' => $this->getModificationPolicy(),
'hide_results' => $this->getHideResults(),
'show_results_even_if_password' => $this->getShowResultEvenIfPasswords(),
'owner' => [
'pseudo' => $this->getOwner()->getPseudo()]
,
'password_protected' => $this->getPassword() ? 'yes' : 'no',
'max_score' => $computedAnswers['max_score'],
'choices' => $displayedChoices,
'choices_stats' => $computedAnswers['answersWithStats'],
'stacks' => $displayedStackOfVotes,
'comments' => $displayedComments,
];
}
public function __construct() { public function __construct() {
$this->initiate(); $this->initiate();
} }
private function initiate() { private function initiate() {
$this->votes = new ArrayCollection(); $this->votes = new ArrayCollection();
$this->stacksOfVotes = new ArrayCollection(); $this->stacksOfVotes = new ArrayCollection();
$this->choices = new ArrayCollection(); $this->choices = new ArrayCollection();
$this->comments = new ArrayCollection(); $this->comments = new ArrayCollection();
$this->setAdminKey( $this->generateAdminKey() ); $this->setAdminKey( $this->generateAdminKey() );
$this->setCreationDate( new \DateTime() ); $this->setCreationDate( new DateTime() );
$this->setExpiracyDate( $this->addDaysToDate( $this->setExpiracyDate( $this->addDaysToDate(
new \DateTime(), new DateTime(),
$this->defaultExpiracyDaysFromNow $this->defaultExpiracyDaysFromNow
) ); ) );
$this->setAllowedAnswers( [ 'yes', 'maybe', 'no' ] ); $this->setAllowedAnswers( [ 'yes', 'maybe', 'no' ] );
} }
public function generateAdminKey() { public function generateAdminKey() {
$rand = random_int( PHP_INT_MIN, PHP_INT_MAX ); $rand = random_int( PHP_INT_MIN, PHP_INT_MAX );
@ -342,7 +236,7 @@ class Poll {
string $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' string $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
): string { ): string {
if ( $length < 1 ) { if ( $length < 1 ) {
throw new \RangeException( "Length must be a positive integer" ); throw new RangeException( "Length must be a positive integer" );
} }
$pieces = []; $pieces = [];
$max = mb_strlen( $keyspace, '8bit' ) - 1; $max = mb_strlen( $keyspace, '8bit' ) - 1;
@ -353,33 +247,143 @@ class Poll {
return implode( '', $pieces ); return implode( '', $pieces );
} }
public function findChoiceById( int $id ) { public function addDaysToDate( DateTime $date, int $days ) {
$choices = $this->getChoices();
$counter = 0;
// there must be something cleaner than this in Doctrine ArrayCollection
foreach ( $choices as $choice ) {
$counter ++;
if ( $counter > $this->maxChoicesLimit ) {
throw new \ErrorException( "max number of choices reached for this poll" );
}
if ( $choice && $choice->getId() == $id ) {
return $choice;
}
}
return null;
}
public function addDaysToDate( \DateTime $date, int $days ) {
$st = strtotime( $date->getTimestamp() ); $st = strtotime( $date->getTimestamp() );
return new \DateTime( $st ); return new DateTime( $st );
} }
public function getId(): ?int { public function displayForAdmin() {
return $this->id; $content = $this->display();
$content[ 'owner_modifier_token' ] = $this->getOwner()->getModifierToken();
$content[ 'admin_key' ] = $this->getAdminKey();
$content[ 'password_hash' ] = $this->getPassword();
$content[ 'id' ] = $this->getId();
return $content;
}
public function display() {
$computedAnswers = $this->computeAnswers();
$displayedStackOfVotes = [];
foreach ( $this->getStacksOfVotes() as $stack ) {
$displayedStackOfVotes[] = $stack->display();
}
$displayedChoices = [];
foreach ( $this->getChoices() as $choice ) {
$displayedChoices[] = $choice->display();
}
$displayedComments = [];
foreach ( $this->getComments() as $comment ) {
$displayedComments[] = $comment->display();
}
return [
'title' => $this->getTitle(),
'creation_date' => $this->getCreationDate()->format( 'c' ),
'expiracy_date' => $this->getExpiracyDate()->format( 'c' ),
'votes_max' => $this->getVotesMax(),
'choices_max' => $this->getChoicesMax(),
'kind' => $this->getKind(),
'allowed_answers' => $this->getAllowedAnswers(),
'votes_allowed' => $this->getVotesAllowed(),
'modification_policy' => $this->getModificationPolicy(),
'hide_results' => $this->getHideResults(),
'show_results_even_if_password' => $this->getShowResultEvenIfPasswords(),
'owner' => [
'pseudo' => $this->getOwner()->getPseudo(),
]
,
'password_protected' => $this->getPassword() ? 'yes' : 'no',
'max_score' => $computedAnswers[ 'max_score' ],
'choices' => $displayedChoices,
'choices_stats' => $computedAnswers[ 'answersWithStats' ],
'stacks' => $displayedStackOfVotes,
'comments' => $displayedComments,
];
}
public function computeAnswers() {
// counts each number of answer for this choice
$computedArray = [];
$maxScore = 0;
foreach ( $this->getStacksOfVotes() as $stack_of_vote ) {
foreach ( $stack_of_vote->getVotes() as $vote ) {
$answer = $vote->getValue();
$choice_id = $vote->getChoice()->getId();
$choice_url = $vote->getChoice()->getUrl();
if ( ! isset( $computedArray[ $choice_id ] ) ) {
$computedArray[ $choice_id ] = [
'id' => $choice_id,
'url' => $choice_url,
'name' => $vote->getChoice()->getName(),
'score' => 0,
'yes' => [
'count' => 0,
'people' => [],
],
'maybe' => [
'count' => 0,
'people' => [],
],
'no' => [
'count' => 0,
'people' => [],
],
];
}
$computedArray[ $choice_id ][ $answer ][ 'count' ] ++;
$computedArray[ $choice_id ][ $answer ][ 'people' ][] = $stack_of_vote->getOwner()->getPseudo();
if ( $answer == 'yes' ) {
$computedArray[ $choice_id ][ 'score' ] += 1;
} elseif ( $answer == 'maybe' ) {
$computedArray[ $choice_id ][ 'score' ] += 0.5;
}
// compare with max value
if ( $computedArray[ $choice_id ][ 'score' ] > $maxScore ) {
$maxScore = $computedArray[ $choice_id ][ 'score' ];
}
}
}
$answersWithStats = [];
foreach ( $computedArray as $choice_stat ) {
$answersWithStats[] = $choice_stat;
}
return [
'answers' => $computedArray,
'answersWithStats' => $answersWithStats,
'max_score' => $maxScore,
];
}
public function getStacksOfVotes() {
return $this->stacksOfVotes;
}
public function setStacksOfVotes( ?StackOfVotes $stacksOfVotes ): self {
$this->stacksOfVotes = $stacksOfVotes;
return $this;
}
/**
* @return Collection|Choice[]
*/
public function getChoices(): Collection {
return $this->choices;
}
/**
* @return Collection|Comment[]
*/
public function getComments(): Collection {
return $this->comments;
} }
public function getTitle(): ?string { public function getTitle(): ?string {
@ -402,46 +406,32 @@ class Poll {
return $this; return $this;
} }
public function getExpiracyDate(): ?DateTimeInterface {
return $this->expiracyDate;
}
public function setExpiracyDate( DateTimeInterface $expiracyDate ): self { public function setExpiracyDate( DateTimeInterface $expiracyDate ): self {
$this->expiracyDate = $expiracyDate; $this->expiracyDate = $expiracyDate;
return $this; return $this;
} }
public function getOwner(): ?Owner { public function getVotesMax() {
return $this->owner; return $this->votesMax;
} }
public function setOwner( ?Owner $owner ): self { public function setVotesMax( $votesMax ): self {
$this->owner = $owner; $this->votesMax = $votesMax;
return $this; return $this;
} }
/** public function getChoicesMax() {
* @return Collection|Vote[] return $this->choicesMax;
*/
public function getVotes(): Collection {
return $this->votes;
} }
public function setChoicesMax( $choicesMax ): self {
public function getAdminKey(): ?string { $this->choicesMax = $choicesMax;
return $this->adminKey;
}
public function setAdminKey( string $adminKey ): self {
$this->adminKey = $adminKey;
return $this;
}
public function getDescription(): ?string {
return $this->description;
}
public function setDescription( string $description ): self {
$this->description = $description;
return $this; return $this;
} }
@ -456,22 +446,22 @@ class Poll {
return $this; return $this;
} }
public function getCustomUrl(): ?string { public function getAllowedAnswers(): ?array {
return $this->customUrl; return $this->allowedAnswers;
} }
public function setCustomUrl( string $customUrl ): self { public function setAllowedAnswers( array $allowedAnswers ): self {
$this->customUrl = $customUrl; $this->allowedAnswers = $allowedAnswers;
return $this; return $this;
} }
public function getPassword(): ?string { public function getVotesAllowed(): ?bool {
return $this->password; return $this->votesAllowed;
} }
public function setPassword( string $password ): self { public function setVotesAllowed( ?bool $votesAllowed ): self {
$this->password = md5( $password ); $this->votesAllowed = $votesAllowed;
return $this; return $this;
} }
@ -486,26 +476,6 @@ class Poll {
return $this; return $this;
} }
public function getMailOnComment(): ?bool {
return $this->mailOnComment;
}
public function setMailOnComment( bool $mailOnComment ): self {
$this->mailOnComment = $mailOnComment;
return $this;
}
public function getMailOnVote(): ?bool {
return $this->mailOnVote;
}
public function setMailOnVote( bool $mailOnVote ): self {
$this->mailOnVote = $mailOnVote;
return $this;
}
public function getHideResults(): ?bool { public function getHideResults(): ?bool {
return $this->hideResults; return $this->hideResults;
} }
@ -526,12 +496,104 @@ class Poll {
return $this; return $this;
} }
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;
}
public function getPassword(): ?string {
return $this->password;
}
public function setPassword( string $password ): self {
$this->password = md5( $password );
return $this;
}
public function getAdminKey(): ?string {
return $this->adminKey;
}
public function setAdminKey( string $adminKey ): self {
$this->adminKey = $adminKey;
return $this;
}
public function getId(): ?int {
return $this->id;
}
public function findChoiceById( int $id ) {
$choices = $this->getChoices();
$counter = 0;
// there must be something cleaner than this in Doctrine ArrayCollection
foreach ( $choices as $choice ) {
$counter ++;
if ( $counter > $this->maxChoicesLimit ) {
throw new ErrorException( "max number of choices reached for this poll" );
}
if ( $choice && $choice->getId() == $id ) {
return $choice;
}
}
return null;
}
/** /**
* @return Collection|Comment[] * @return Collection|Vote[]
*/ */
public function getComments(): Collection { public function getVotes(): Collection {
return $this->comments; return $this->votes;
}
public function getDescription(): ?string {
return $this->description;
}
public function setDescription( string $description ): self {
$this->description = $description;
return $this;
}
public function getCustomUrl(): ?string {
return $this->customUrl;
}
public function setCustomUrl( string $customUrl ): self {
$this->customUrl = $customUrl;
return $this;
}
public function getMailOnComment(): ?bool {
return $this->mailOnComment;
}
public function setMailOnComment( bool $mailOnComment ): self {
$this->mailOnComment = $mailOnComment;
return $this;
}
public function getMailOnVote(): ?bool {
return $this->mailOnVote;
}
public function setMailOnVote( bool $mailOnVote ): self {
$this->mailOnVote = $mailOnVote;
return $this;
} }
public function addComment( Comment $comment ): self { public function addComment( Comment $comment ): self {
@ -555,17 +617,6 @@ class Poll {
return $this; return $this;
} }
public function getStacksOfVotes() {
return $this->stacksOfVotes;
}
public function setStacksOfVotes( ?StackOfVotes $stacksOfVotes ): self {
$this->stacksOfVotes = $stacksOfVotes;
return $this;
}
public function addStackOfVote( StackOfVotes $stackOfVote ): self { public function addStackOfVote( StackOfVotes $stackOfVote ): self {
if ( ! $this->stacksOfVotes->contains( $stackOfVote ) ) { if ( ! $this->stacksOfVotes->contains( $stackOfVote ) ) {
$this->stacksOfVotes[] = $stackOfVote; $this->stacksOfVotes[] = $stackOfVote;
@ -587,10 +638,6 @@ class Poll {
return $this; return $this;
} }
public function getExpiracyDate(): ?\DateTimeInterface {
return $this->expiracyDate;
}
public function addVote( Vote $vote ): self { public function addVote( Vote $vote ): self {
if ( ! $this->votes->contains( $vote ) ) { if ( ! $this->votes->contains( $vote ) ) {
$this->votes[] = $vote; $this->votes[] = $vote;
@ -612,13 +659,6 @@ class Poll {
return $this; return $this;
} }
/**
* @return Collection|Choice[]
*/
public function getChoices(): Collection {
return $this->choices;
}
public function addTextChoiceArray( array $choiceTextArray ): self { public function addTextChoiceArray( array $choiceTextArray ): self {
foreach ( $choiceTextArray as $text ) { foreach ( $choiceTextArray as $text ) {
$newChoice = new Choice(); $newChoice = new Choice();
@ -629,13 +669,17 @@ class Poll {
return $this; return $this;
} }
public function addChoice( Choice $choice ): self {
if ( ! is_null( $this->choices ) ) {
if ( ! $this->choices->contains( $choice ) ) {
$this->choices[] = $choice;
$choice->setPoll( $this );
}
} else {
$this->choices[] = $choice;
$choice->setPoll( $this );
}
public function getAllowedAnswers(): ?array {
return $this->allowedAnswers;
}
public function setAllowedAnswers( array $allowedAnswers ): self {
$this->allowedAnswers = $allowedAnswers;
return $this; return $this;
} }
@ -661,21 +705,6 @@ class Poll {
return $this; return $this;
} }
public function addChoice( Choice $choice ): self {
if ( ! is_null( $this->choices ) ) {
if ( ! $this->choices->contains( $choice ) ) {
$this->choices[] = $choice;
$choice->setPoll( $this );
}
} else {
$this->choices[] = $choice;
$choice->setPoll( $this );
}
return $this;
}
public function removeChoice( Choice $choice ): self { public function removeChoice( Choice $choice ): self {
if ( $this->choices->contains( $choice ) ) { if ( $this->choices->contains( $choice ) ) {
$this->choices->removeElement( $choice ); $this->choices->removeElement( $choice );
@ -688,36 +717,6 @@ class Poll {
return $this; return $this;
} }
public function getVotesAllowed(): ?bool {
return $this->votesAllowed;
}
public function setVotesAllowed( ?bool $votesAllowed ): self {
$this->votesAllowed = $votesAllowed;
return $this;
}
public function getVotesMax() {
return $this->votesMax;
}
public function setVotesMax( $votesMax ): self {
$this->votesMax = $votesMax;
return $this;
}
public function getChoicesMax() {
return $this->choicesMax;
}
public function setChoicesMax( $choicesMax ): self {
$this->choicesMax = $choicesMax;
return $this;
}
public function getCommentsAllowed(): ?bool { public function getCommentsAllowed(): ?bool {
return $this->commentsAllowed; return $this->commentsAllowed;
} }

109
src/Entity/StackOfVotes.php
View File

@ -18,12 +18,6 @@ class StackOfVotes {
use TimeStampableTrait; use TimeStampableTrait;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
*/
private $id;
/** /**
* @ORM\Column(type="string", length=255) * @ORM\Column(type="string", length=255)
* @Serializer\Type("string") * @Serializer\Type("string")
@ -35,6 +29,12 @@ class StackOfVotes {
* @Serializer\Expose() * @Serializer\Expose()
*/ */
public $votes; public $votes;
/**
* @ORM\Id()
* @ORM\GeneratedValue()
* @ORM\Column(type="integer")
*/
private $id;
/** /**
* @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="stacksOfVotes", cascade={"persist"}) * @ORM\ManyToOne(targetEntity="App\Entity\Poll", inversedBy="stacksOfVotes", cascade={"persist"})
*/ */
@ -46,6 +46,9 @@ class StackOfVotes {
*/ */
private $owner; private $owner;
public function __construct() {
$this->votes = new ArrayCollection();
}
public function display() { public function display() {
$votes = $this->getVotes(); $votes = $this->getVotes();
@ -53,9 +56,9 @@ class StackOfVotes {
$tab = [ $tab = [
// 'id' => $this->getId(), // 'id' => $this->getId(),
// 'modifier_token' => $this->getOwner()->getModifierToken(), // 'modifier_token' => $this->getOwner()->getModifierToken(),
'pseudo' => $this->getPseudo(), 'pseudo' => $this->getPseudo(),
'created_at' => $this->getCreatedAtAsString(), 'created_at' => $this->getCreatedAtAsString(),
'votes' => [], 'votes' => [],
]; ];
// prefill votes with all choices ids // prefill votes with all choices ids
// foreach ( $this->getPoll()->getChoices() as $choice ) { // foreach ( $this->getPoll()->getChoices() as $choice ) {
@ -66,27 +69,12 @@ class StackOfVotes {
// } // }
foreach ( $votes as $vote ) { foreach ( $votes as $vote ) {
$tab[ 'votes' ][$vote->getChoice()->getId()] = $vote->display(); $tab[ 'votes' ][ $vote->getChoice()->getId() ] = $vote->display();
} }
return $tab; return $tab;
} }
/**
* @ORM\PrePersist
*/
public function prePersist() {
$this->setPseudo( $this->getOwner()->getPseudo() );
}
public function __construct() {
$this->votes = new ArrayCollection();
}
public function getId(): ?int {
return $this->id;
}
/** /**
* @return Collection|poll[] * @return Collection|poll[]
*/ */
@ -94,6 +82,37 @@ class StackOfVotes {
return $this->votes; return $this->votes;
} }
public function getPseudo(): ?string {
return $this->pseudo;
}
public function setPseudo( ?string $pseudo ): self {
$this->pseudo = $pseudo;
return $this;
}
/**
* @ORM\PrePersist
*/
public function prePersist() {
$this->setPseudo( $this->getOwner()->getPseudo() );
}
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;
}
public function getId(): ?int {
return $this->id;
}
public function addVote( Vote $vote ): self { public function addVote( Vote $vote ): self {
if ( ! $this->votes->contains( $vote ) ) { if ( ! $this->votes->contains( $vote ) ) {
$vote->setPoll( $this->getPoll() ); $vote->setPoll( $this->getPoll() );
@ -105,6 +124,16 @@ class StackOfVotes {
return $this; return $this;
} }
public function getPoll(): ?Poll {
return $this->poll;
}
public function setPoll( ?Poll $poll ): self {
$this->poll = $poll;
return $this;
}
public function removeVote( Vote $vote ): self { public function removeVote( Vote $vote ): self {
if ( $this->votes->contains( $vote ) ) { if ( $this->votes->contains( $vote ) ) {
$this->votes->removeElement( $vote ); $this->votes->removeElement( $vote );
@ -116,34 +145,4 @@ class StackOfVotes {
return $this; return $this;
} }
public function getPseudo(): ?string {
return $this->pseudo;
}
public function setPseudo( ?string $pseudo ): self {
$this->pseudo = $pseudo;
return $this;
}
public function getOwner(): ?Owner {
return $this->owner;
}
public function setOwner( ?Owner $owner ): self {
$this->owner = $owner;
return $this;
}
public function getPoll(): ?Poll {
return $this->poll;
}
public function setPoll( ?Poll $poll ): self {
$this->poll = $poll;
return $this;
}
} }

45
src/Entity/Vote.php
View File

@ -2,9 +2,10 @@
namespace App\Entity; namespace App\Entity;
use DateTimeInterface; use DateTime;
use Doctrine\ORM\Mapping as ORM; use DateTimeInterface;
use JMS\Serializer\Annotation as Serializer; use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as Serializer;
/** /**
* @ORM\Entity(repositoryClass="App\Repository\VoteRepository") * @ORM\Entity(repositoryClass="App\Repository\VoteRepository")
@ -52,6 +53,10 @@ class Vote {
*/ */
private $stacksOfVotes; private $stacksOfVotes;
public function __construct() {
$this->setCreationDate( new DateTime() );
}
public function display() { public function display() {
$value = $this->getValue(); $value = $this->getValue();
if ( ! $value ) { if ( ! $value ) {
@ -67,27 +72,20 @@ class Vote {
} }
} }
public function __construct() { public function getValue(): ?string {
$this->setCreationDate( new \DateTime() ); return $this->value;
}
public function setValue( ?string $value ): self {
$this->value = $value;
return $this;
} }
public function getId(): ?int { public function getId(): ?int {
return $this->id; return $this->id;
} }
public function getPoll(): ?Poll {
return $this->poll;
}
public function setPoll( ?Poll $poll ): self {
$this->poll = $poll;
if ( $poll ) {
$poll->addVote( $this );
}
return $this;
}
public function getChoice(): ?Choice { public function getChoice(): ?Choice {
return $this->choice; return $this->choice;
} }
@ -98,12 +96,15 @@ class Vote {
return $this; return $this;
} }
public function getValue(): ?string { public function getPoll(): ?Poll {
return $this->value; return $this->poll;
} }
public function setValue( ?string $value ): self { public function setPoll( ?Poll $poll ): self {
$this->value = $value; $this->poll = $poll;
if ( $poll ) {
$poll->addVote( $this );
}
return $this; return $this;
} }

52
src/Form/PollType.php
View File

@ -7,33 +7,29 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
class PollType extends AbstractType class PollType extends AbstractType {
{ public function buildForm( FormBuilderInterface $builder, array $options ) {
public function buildForm(FormBuilderInterface $builder, array $options) $builder
{ ->add( 'title' )
$builder ->add( 'customUrl' )
->add('title') ->add( 'description' )
->add('customUrl') ->add( 'creationDate' )
->add('description') ->add( 'expiracyDate' )
->add('creationDate') ->add( 'kind' )
->add('expiracyDate') ->add( 'allowedAnswers' )
->add('kind') ->add( 'modificationPolicy' )
->add('allowedAnswers') ->add( 'mailOnComment' )
->add('modificationPolicy') ->add( 'mailOnVote' )
->add('mailOnComment') ->add( 'hideResults' )
->add('mailOnVote') ->add( 'showResultEvenIfPasswords' )
->add('hideResults') ->add( 'password' )
->add('showResultEvenIfPasswords') ->add( 'adminKey' )
->add('password') ->add( 'owner' );
->add('adminKey') }
->add('owner')
;
}
public function configureOptions(OptionsResolver $resolver) public function configureOptions( OptionsResolver $resolver ) {
{ $resolver->setDefaults( [
$resolver->setDefaults([ 'data_class' => Poll::class,
'data_class' => Poll::class, ] );
]); }
}
} }

46
src/Kernel.php
View File

@ -6,33 +6,31 @@ use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\HttpKernel\Kernel as BaseKernel;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
use function dirname;
class Kernel extends BaseKernel class Kernel extends BaseKernel {
{ use MicroKernelTrait;
use MicroKernelTrait;
protected function configureContainer(ContainerConfigurator $container): void protected function configureContainer( ContainerConfigurator $container ): void {
{ $container->import( '../config/{packages}/*.yaml' );
$container->import('../config/{packages}/*.yaml'); $container->import( '../config/{packages}/' . $this->environment . '/*.yaml' );
$container->import('../config/{packages}/'.$this->environment.'/*.yaml');
if (is_file(\dirname(__DIR__).'/config/services.yaml')) { if ( is_file( dirname( __DIR__ ) . '/config/services.yaml' ) ) {
$container->import('../config/services.yaml'); $container->import( '../config/services.yaml' );
$container->import('../config/{services}_'.$this->environment.'.yaml'); $container->import( '../config/{services}_' . $this->environment . '.yaml' );
} elseif (is_file($path = \dirname(__DIR__).'/config/services.php')) { } elseif ( is_file( $path = dirname( __DIR__ ) . '/config/services.php' ) ) {
(require $path)($container->withPath($path), $this); ( require $path )( $container->withPath( $path ), $this );
} }
} }
protected function configureRoutes(RoutingConfigurator $routes): void protected function configureRoutes( RoutingConfigurator $routes ): void {
{ $routes->import( '../config/{routes}/' . $this->environment . '/*.yaml' );
$routes->import('../config/{routes}/'.$this->environment.'/*.yaml'); $routes->import( '../config/{routes}/*.yaml' );
$routes->import('../config/{routes}/*.yaml');
if (is_file(\dirname(__DIR__).'/config/routes.yaml')) { if ( is_file( dirname( __DIR__ ) . '/config/routes.yaml' ) ) {
$routes->import('../config/routes.yaml'); $routes->import( '../config/routes.yaml' );
} elseif (is_file($path = \dirname(__DIR__).'/config/routes.php')) { } elseif ( is_file( $path = dirname( __DIR__ ) . '/config/routes.php' ) ) {
(require $path)($routes->withPath($path), $this); ( require $path )( $routes->withPath( $path ), $this );
} }
} }
} }

70
src/Repository/ChoiceRepository.php
View File

@ -7,44 +7,42 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ManagerRegistry;
/** /**
* @method Choice|null find($id, $lockMode = null, $lockVersion = null) * @method Choice|null find( $id, $lockMode = null, $lockVersion = null )
* @method Choice|null findOneBy(array $criteria, array $orderBy = null) * @method Choice|null findOneBy( array $criteria, array $orderBy = null )
* @method Choice[] findAll() * @method Choice[] findAll()
* @method Choice[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method Choice[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class ChoiceRepository extends ServiceEntityRepository class ChoiceRepository extends ServiceEntityRepository {
{ public function __construct( ManagerRegistry $registry ) {
public function __construct(ManagerRegistry $registry) parent::__construct( $registry, Choice::class );
{ }
parent::__construct($registry, Choice::class);
}
// /** // /**
// * @return Choice[] Returns an array of Choice objects // * @return Choice[] Returns an array of Choice objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('c') return $this->createQueryBuilder('c')
->andWhere('c.exampleField = :val') ->andWhere('c.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('c.id', 'ASC') ->orderBy('c.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?Choice public function findOneBySomeField($value): ?Choice
{ {
return $this->createQueryBuilder('c') return $this->createQueryBuilder('c')
->andWhere('c.exampleField = :val') ->andWhere('c.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

70
src/Repository/CommentRepository.php
View File

@ -7,44 +7,42 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ManagerRegistry;
/** /**
* @method Comment|null find($id, $lockMode = null, $lockVersion = null) * @method Comment|null find( $id, $lockMode = null, $lockVersion = null )
* @method Comment|null findOneBy(array $criteria, array $orderBy = null) * @method Comment|null findOneBy( array $criteria, array $orderBy = null )
* @method Comment[] findAll() * @method Comment[] findAll()
* @method Comment[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method Comment[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class CommentRepository extends ServiceEntityRepository class CommentRepository extends ServiceEntityRepository {
{ public function __construct( ManagerRegistry $registry ) {
public function __construct(ManagerRegistry $registry) parent::__construct( $registry, Comment::class );
{ }
parent::__construct($registry, Comment::class);
}
// /** // /**
// * @return Comment[] Returns an array of Comment objects // * @return Comment[] Returns an array of Comment objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('c') return $this->createQueryBuilder('c')
->andWhere('c.exampleField = :val') ->andWhere('c.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('c.id', 'ASC') ->orderBy('c.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?Comment public function findOneBySomeField($value): ?Comment
{ {
return $this->createQueryBuilder('c') return $this->createQueryBuilder('c')
->andWhere('c.exampleField = :val') ->andWhere('c.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

70
src/Repository/OwnerRepository.php
View File

@ -7,44 +7,42 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ManagerRegistry;
/** /**
* @method Owner|null find($id, $lockMode = null, $lockVersion = null) * @method Owner|null find( $id, $lockMode = null, $lockVersion = null )
* @method Owner|null findOneBy(array $criteria, array $orderBy = null) * @method Owner|null findOneBy( array $criteria, array $orderBy = null )
* @method Owner[] findAll() * @method Owner[] findAll()
* @method Owner[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method Owner[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class OwnerRepository extends ServiceEntityRepository class OwnerRepository extends ServiceEntityRepository {
{ public function __construct( ManagerRegistry $registry ) {
public function __construct(ManagerRegistry $registry) parent::__construct( $registry, Owner::class );
{ }
parent::__construct($registry, Owner::class);
}
// /** // /**
// * @return Owner[] Returns an array of Owner objects // * @return Owner[] Returns an array of Owner objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('o') return $this->createQueryBuilder('o')
->andWhere('o.exampleField = :val') ->andWhere('o.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('o.id', 'ASC') ->orderBy('o.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?Owner public function findOneBySomeField($value): ?Owner
{ {
return $this->createQueryBuilder('o') return $this->createQueryBuilder('o')
->andWhere('o.exampleField = :val') ->andWhere('o.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

74
src/Repository/PollRepository.php
View File

@ -5,48 +5,46 @@ namespace App\Repository;
use App\Entity\Poll; use App\Entity\Poll;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ManagerRegistry;
use MongoDB\Driver\Manager;
/** /**
* @method Poll|null find($id, $lockMode = null, $lockVersion = null) * @method Poll|null find( $id, $lockMode = null, $lockVersion = null )
* @method Poll|null findOneBy(array $criteria, array $orderBy = null) * @method Poll|null findOneBy( array $criteria, array $orderBy = null )
* @method Poll[] findAll() * @method Poll[] findAll()
* @method Poll[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method Poll[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class PollRepository extends ServiceEntityRepository class PollRepository extends ServiceEntityRepository {
{ public function __construct(
public function __construct(ManagerRegistry ManagerRegistry $registry
$registry) ) {
{ parent::__construct( $registry, Poll::class );
parent::__construct($registry, Poll::class); }
}
// /** // /**
// * @return Poll[] Returns an array of Poll objects // * @return Poll[] Returns an array of Poll objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('p') return $this->createQueryBuilder('p')
->andWhere('p.exampleField = :val') ->andWhere('p.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('p.id', 'ASC') ->orderBy('p.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?Poll public function findOneBySomeField($value): ?Poll
{ {
return $this->createQueryBuilder('p') return $this->createQueryBuilder('p')
->andWhere('p.exampleField = :val') ->andWhere('p.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

70
src/Repository/StackOfVotesRepository.php
View File

@ -7,44 +7,42 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ManagerRegistry;
/** /**
* @method StackOfVotes|null find($id, $lockMode = null, $lockVersion = null) * @method StackOfVotes|null find( $id, $lockMode = null, $lockVersion = null )
* @method StackOfVotes|null findOneBy(array $criteria, array $orderBy = null) * @method StackOfVotes|null findOneBy( array $criteria, array $orderBy = null )
* @method StackOfVotes[] findAll() * @method StackOfVotes[] findAll()
* @method StackOfVotes[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method StackOfVotes[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class StackOfVotesRepository extends ServiceEntityRepository class StackOfVotesRepository extends ServiceEntityRepository {
{ public function __construct( ManagerRegistry $registry ) {
public function __construct(ManagerRegistry $registry) parent::__construct( $registry, StackOfVotes::class );
{ }
parent::__construct($registry, StackOfVotes::class);
}
// /** // /**
// * @return StackOfVotes[] Returns an array of StackOfVotes objects // * @return StackOfVotes[] Returns an array of StackOfVotes objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('s') return $this->createQueryBuilder('s')
->andWhere('s.exampleField = :val') ->andWhere('s.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('s.id', 'ASC') ->orderBy('s.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?StackOfVotes public function findOneBySomeField($value): ?StackOfVotes
{ {
return $this->createQueryBuilder('s') return $this->createQueryBuilder('s')
->andWhere('s.exampleField = :val') ->andWhere('s.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

70
src/Repository/VoteRepository.php
View File

@ -7,44 +7,42 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\Common\Persistence\ManagerRegistry;
/** /**
* @method Vote|null find($id, $lockMode = null, $lockVersion = null) * @method Vote|null find( $id, $lockMode = null, $lockVersion = null )
* @method Vote|null findOneBy(array $criteria, array $orderBy = null) * @method Vote|null findOneBy( array $criteria, array $orderBy = null )
* @method Vote[] findAll() * @method Vote[] findAll()
* @method Vote[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) * @method Vote[] findBy( array $criteria, array $orderBy = null, $limit = null, $offset = null )
*/ */
class VoteRepository extends ServiceEntityRepository class VoteRepository extends ServiceEntityRepository {
{ public function __construct( ManagerRegistry $registry ) {
public function __construct(ManagerRegistry $registry) parent::__construct( $registry, Vote::class );
{ }
parent::__construct($registry, Vote::class);
}
// /** // /**
// * @return Vote[] Returns an array of Vote objects // * @return Vote[] Returns an array of Vote objects
// */ // */
/* /*
public function findByExampleField($value) public function findByExampleField($value)
{ {
return $this->createQueryBuilder('v') return $this->createQueryBuilder('v')
->andWhere('v.exampleField = :val') ->andWhere('v.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->orderBy('v.id', 'ASC') ->orderBy('v.id', 'ASC')
->setMaxResults(10) ->setMaxResults(10)
->getQuery() ->getQuery()
->getResult() ->getResult()
; ;
} }
*/ */
/* /*
public function findOneBySomeField($value): ?Vote public function findOneBySomeField($value): ?Vote
{ {
return $this->createQueryBuilder('v') return $this->createQueryBuilder('v')
->andWhere('v.exampleField = :val') ->andWhere('v.exampleField = :val')
->setParameter('val', $value) ->setParameter('val', $value)
->getQuery() ->getQuery()
->getOneOrNullResult() ->getOneOrNullResult()
; ;
} }
*/ */
} }

127
src/Service/MailService.php
View File

@ -12,6 +12,7 @@ use Exception;
use Swift_Mailer; use Swift_Mailer;
use Swift_Message; use Swift_Message;
use Swift_SmtpTransport; use Swift_SmtpTransport;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
class MailService { class MailService {
@ -49,7 +50,7 @@ class MailService {
* @param Owner $foundOwner * @param Owner $foundOwner
* @param Poll|null $poll * @param Poll|null $poll
* *
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendCreationMailAction( Owner $foundOwner, Poll $poll = null ) { public function sendCreationMailAction( Owner $foundOwner, Poll $poll = null ) {
@ -66,74 +67,12 @@ class MailService {
return $this->sendMailWithVars( $config ); return $this->sendMailWithVars( $config );
} }
/**
* anti spam , limit to every minute TODO
*
* @param Owner $owner
*
* @return bool
*/
public function antispamCheck( Owner $owner ) {
// $lastSend = $admin_user->getRequestedPollsDate();
// $now = new \DateTime();
// if ( date_diff( $lastSend, $now ) < 60 ) {
// // too soon!
// die( 'too soon!' );
// }
// $admin_user->setRequestedPollsDate( $now );
// $em->persist( $admin_user );
// $em->flush();
return true;
}
/**
* send created polls to an owner
*
* @param Owner $owner
*
* @return int|void
* @throws Exception
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface
*/
public function sendOwnerPollsAction( Owner $owner ) {
$config = [
'owner' => $owner,
'title' => 'Framadate | Mes sondages',
'email_template' => 'emails/owner-list.html.twig',
];
$this->sendMailWithVars( $config );
return 1;
}
/**
* @param Comment $comment
*
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface
*/
public function sendCommentNotification( Comment $comment ) {
$config = [
'comment' => $comment,
'owner' => $comment->getOwner(),
'title' => 'Framadate | commentaire de ' . $comment->getOwner()->getPseudo() . ' _ sondage ' . $comment->getPoll()->getTitle(),
'email_template' => 'emails/comment-notification.html.twig',
];
$this->sendMailWithVars( $config );
}
/** /**
* generic way to send email with html template * generic way to send email with html template
* *
* @param $config * @param $config
* *
* @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface * @throws TransportExceptionInterface
*/ */
public function sendMailWithVars( $config ) { public function sendMailWithVars( $config ) {
@ -209,4 +148,64 @@ class MailService {
} }
/**
* anti spam , limit to every minute TODO
*
* @param Owner $owner
*
* @return bool
*/
public function antispamCheck( Owner $owner ) {
// $lastSend = $admin_user->getRequestedPollsDate();
// $now = new \DateTime();
// if ( date_diff( $lastSend, $now ) < 60 ) {
// // too soon!
// die( 'too soon!' );
// }
// $admin_user->setRequestedPollsDate( $now );
// $em->persist( $admin_user );
// $em->flush();
return true;
}
/**
* send created polls to an owner
*
* @param Owner $owner
*
* @return int|void
* @throws Exception
* @throws TransportExceptionInterface
*/
public function sendOwnerPollsAction( Owner $owner ) {
$config = [
'owner' => $owner,
'title' => 'Framadate | Mes sondages',
'email_template' => 'emails/owner-list.html.twig',
];
$this->sendMailWithVars( $config );
return 1;
}
/**
* @param Comment $comment
*
* @throws TransportExceptionInterface
*/
public function sendCommentNotification( Comment $comment ) {
$config = [
'comment' => $comment,
'owner' => $comment->getOwner(),
'title' => 'Framadate | commentaire de ' . $comment->getOwner()->getPseudo() . ' _ sondage ' . $comment->getPoll()->getTitle(),
'email_template' => 'emails/comment-notification.html.twig',
];
$this->sendMailWithVars( $config );
}
} }

8
src/Traits/TimeStampableTraitTrait.php
View File

@ -4,7 +4,6 @@ namespace App\Traits;
use DateTimeInterface; use DateTimeInterface;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use PhpParser\Node\Scalar\String_;
trait TimeStampableTrait { trait TimeStampableTrait {
/** /**
@ -15,9 +14,6 @@ trait TimeStampableTrait {
public function getCreatedAt(): ?DateTimeInterface { public function getCreatedAt(): ?DateTimeInterface {
return $this->createdAt; return $this->createdAt;
} }
public function getCreatedAtAsString(): string {
return $this->createdAt->format('c');
}
public function setCreatedAt( DateTimeInterface $createdAt ): self { public function setCreatedAt( DateTimeInterface $createdAt ): self {
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
@ -25,4 +21,8 @@ trait TimeStampableTrait {
return $this; return $this;
} }
public function getCreatedAtAsString(): string {
return $this->createdAt->format( 'c' );
}
} }