limiter l'ajout de vote stack si la limite par poll a été atteinte

#30
migration from framadate 1 choice name using separator for timeSlices in name
2023-08-25 08:23:11 +02:00 · 2021-05-18 23:46:05 +02:00 · 2021-05-18 23:42:10 +02:00 · 2021-05-18 23:38:13 +02:00 · 2021-05-18 23:27:04 +02:00 · 2021-05-18 23:26:33 +02:00
15 changed files with 607 additions and 503 deletions
--- a/config/packages/dev/mailer.yaml
+++ b/config/packages/dev/mailer.yaml
@ -0,0 +1,8 @@
+# config/packages/dev/mailer.yaml
+framework:
+  mailer:
+    envelope:
+      sender: 'noreply@tktest.com'
+      recipients: ['tykayn@pm.me']
+    headers:
+      from: 'dev framadate funky <noreply@tktest.com>'
--- a/config/packages/framework.yaml
+++ b/config/packages/framework.yaml
@ -1,6 +1,6 @@
 # see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
-    trusted_hosts: ['localhost:4200', 'localhost', 'tktest.lan', 'framadate-api.cipherbliss.com']
+    trusted_hosts: ['localhost:4200', 'localhost', 'tktest.lan', '127.0.0.1', 'framadate-api.cipherbliss.com']
    secret: '%env(APP_SECRET)%'
    #csrf_protection: true
    #http_method_override: true
--- a/migrations/Version20210518212646.php
+++ b/migrations/Version20210518212646.php
@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210518212646 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE poll ADD is_zero_knowledge TINYINT(1) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE poll DROP is_zero_knowledge');
+    }
+}
--- a/src/Controller/EmailsController.php
+++ b/src/Controller/EmailsController.php
@ -9,7 +9,6 @@ use Swift_Mailer;
 use Swift_Message;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
-
 /**
 * sending emails controller
 *
@ -83,7 +82,7 @@ class EmailsController extends AbstractController {
 		$message  = ( new Swift_Message( $config[ 'title' ] ) )
 			->setContentType( "text/html" )
 			->setCharset( 'UTF-8' )
-			->setFrom( [ 'ne-pas-repondre@framadate-api.cipherbliss.com' ] )
+			->setFrom( [ 'ne-pas-repondre@framadate-api.cipherbliss.com'] )
 			->setTo( [ $config[ 'owner' ]->getEmail() ] )
 			->setBody( $htmlbody, 'text/html' );

--- a/src/Controller/MigrationController.php
+++ b/src/Controller/MigrationController.php
@ -97,10 +97,10 @@ class MigrationController extends EmailsController {
 			$moments = explode( ',', $d->moments );
 			foreach ( $moments as $moment ) {
 				$newChoice = new Choice();
+				$dateOfDay = date_create( strtotime( $d->title ) );
 				$newChoice
 					->setPoll( $poll )
-					->setDateTime( date_create( strtotime( $d->title ) ) )
-					->setName( $moment );
+					->setName( $dateOfDay->format('y-m-d'). ' >>> ' . $moment );

 				$pollChoicesOrderedBySlug[ $pollSlug ][] = $newChoice;
 				$poll->addChoice( $newChoice );
--- a/src/Controller/api/v1/PollController.php
+++ b/src/Controller/api/v1/PollController.php
@ -240,9 +240,17 @@ class PollController extends EmailsController {
 		$data = $request->getContent();
 		$data = json_decode( $data, true );

+		// search for existing custom url, which must be unique
+		$custom_url = $data[ 'custom_url' ];
+		$repository = $this->getDoctrine()->getRepository( Poll::class );
+		$poll       = $repository->findOneByCustomUrl( $custom_url );
+		if ( $poll ) {
+			throw new \JsonException( 'NOPE, ce sondage existe déjà: ' . $custom_url );
+		}
+
 		$newpoll = new Poll();
 		$newpoll
-			->setModificationPolicy( $data[ 'modification_policy' ] )
+			->setModificationPolicy( isset( $data[ 'modification_policy' ] ) ? $data[ 'modification_policy' ] : 'everybody' )
 			->setTitle( $data[ 'title' ] )
 			->setKind( $data[ 'kind' ] )
 			->setCustomUrl( $data[ 'custom_url' ] );
@ -294,17 +302,18 @@ class PollController extends EmailsController {
 		if ( $data[ 'password' ] ) {
 			$newpoll->setPassword( $data[ 'password' ] );
 		}
-		// manage choices
+
 		// text kind of answers, dates are below
 		if ( $data[ 'kind' ] == 'text' ) {
-
-			$choices = $data[ 'dateChoices' ];
+			// manage choices
+			$choices = $data[ 'choices' ];
 			foreach ( $choices as $c ) {
 				$newChoice = new Choice();
 				$newChoice
 					->setPoll( $newpoll )
 					->setName( $c[ 'literal' ] );
 				$em->persist( $newChoice );
+				$newpoll->addChoice( $newChoice );
 			}
 		} // date kind of poll
 		elseif ( $data[ 'kind' ] == 'date' ) {
@ -316,7 +325,7 @@ class PollController extends EmailsController {
 				foreach ( $choices as $c ) {
 					$currentDate = $c[ 'literal' ];

-					$timeSlicesOfThisChoice = $c[ 'timeList' ];
+					$timeSlicesOfThisChoice = $c[ 'timeSlices' ];
 					foreach ( $timeSlicesOfThisChoice as $t ) {

 						$newChoice = new Choice();
@ -324,14 +333,16 @@ class PollController extends EmailsController {
 							->setPoll( $newpoll )
 							->setName( $currentDate . ' >>> ' . $t[ 'literal' ] );
 						$em->persist( $newChoice );
+						$newpoll->addChoice( $newChoice );
 					}
+
 				}

 			} else {
 				// all choices will be having the same time slices from timeSlices
 				$timeSlicesForAllChoices = $data[ 'timeSlices' ];
 				foreach ( $choices as $c ) {
-					$currentDate = $c[ 'literal' ];
+					$currentDate = $c[ 'date_object' ];

 					foreach ( $timeSlicesForAllChoices as $t ) {

@ -340,6 +351,7 @@ class PollController extends EmailsController {
 							->setPoll( $newpoll )
 							->setName( $currentDate . ' >>> ' . $t[ 'literal' ] );
 						$em->persist( $newChoice );
+						$newpoll->addChoice( $newChoice );
 					}


@ -347,7 +359,6 @@ class PollController extends EmailsController {

 			}

-
 		}

 		$em->persist( $newpoll );
@ -359,8 +370,11 @@ class PollController extends EmailsController {

 		$this->sendCreationMailAction( $foundOwner, $newpoll );

+		$newChoices = $newpoll->display()[ 'choices' ];
+
 		return $this->json( [
-			'message'            => 'you created a poll ' . $precision,
+			'message'            => 'you created the poll ' . $newpoll->getCustomUrl() . $precision,
+			'id'                 => $newpoll->getId(),
 			'poll'               => $newpoll->displayForAdmin(),
 			'password_protected' => is_string( $newpoll->getPassword() ),

@ -388,19 +402,34 @@ class PollController extends EmailsController {
 	public function testSendCreationMailAction(
 		$emailChoice = 'tktest_commentateur@tktest.com'
 	) {
+		$em         = $this->getDoctrine()->getRepository( Poll::class );
+		$foundPoll  = $em->findOneByCustomUrl( 'dessin-anime' );
 		$em         = $this->getDoctrine()->getRepository( Owner::class );
 		$foundOwner = $em->findOneByEmail( $emailChoice );
-		if ( $foundOwner ) {
-			$poll    = $foundOwner->getPolls()[ 0 ];
-			$comment = $foundOwner->getComments()[ 0 ];

-			$sent = $this->sendOwnerPollsAction( $foundOwner );
-			if ( $sent ) {
-				return $this->json( [ "message" => "test email sent to " . $foundOwner->getEmail() . "!" ], 200 );
-			}
-		}
+		return $this->render( 'emails/creation-mail.html.twig',
+			[ 'poll' => $foundPoll, 'owner' => $foundPoll->getOwner() ] );

-		return $this->json( [ "message" => "user with this email was not found" ], 400 );
+
+//		if ( $foundOwner ) {
+//			$sent = $this->sendOwnerPollsAction( $foundOwner );
+//			if ( $sent ) {
+//				$config = [
+//				'owner'          => $foundOwner,
+//				'title'          => $this->getParameter( 'WEBSITE_NAME' ) . ' | Mes sondages',
+//				'email_template' => 'emails/owner-list.html.twig',
+//			];
+//				return $this->render( 'emails/owner-list.html.twig', $config );
+
+//			}
+//		}
+
+//				return $this->json( [ "message" => "test email sent to " . $foundOwner->getEmail() . "!" ], 200 );
+
+//		$this->sendMailWithVars( $config );
+
+
+//		return $this->json( [ "message" => "user with this email was not found" ], 400 );

 	}

--- a/src/Controller/api/v1/VoteController.php
+++ b/src/Controller/api/v1/VoteController.php
@ -44,17 +44,25 @@ class VoteController extends EmailsController {
 		string $custom_url,
 		Request $request,
 		ChoiceRepository $choice_repository
-		) {
+	) {


+		/***
+		 * checks before persisting
+		 */
 		$em    = $this->getDoctrine()->getManager();
 		$emPol = $em->getRepository( Poll::class );
 		$poll  = $emPol->findOneByCustomUrl( $custom_url );

+		// check : existence of poll
 		if ( ! $poll ) {
 			return $this->json( [ 'message' => 'poll "' . $custom_url . '" not found' ], 404 );
 		}
-
+		// check : limit of number of participation max
+		if ( count( $poll->getStacksOfVotes() ) == $poll->getVotesMax() ) {
+			return $this->json( [ 'message' => 'poll "' . $custom_url . '" not allowed to have more stack of votes than ' . $poll->getVotesMax() ],
+				403 );
+		}
 		$data = $request->getContent();
 		$data = json_decode( $data, true );

@ -63,32 +71,30 @@ class VoteController extends EmailsController {

 		$owner = new Owner();
 		$owner
-			->addPoll( $poll )
-
-		;
+			->addPoll( $poll );
 		$newStack = new StackOfVotes();
 		$newStack
-			->setPoll($poll)
+			->setPoll( $poll )
 			->setIp( $_SERVER[ 'REMOTE_ADDR' ] )
 			->setPseudo( $data[ "pseudo" ] )
 			->setOwner( $owner );
 		$owner
-			->setPseudo($data['owner'][ "pseudo" ])
-			->setPseudo($data['owner'][ "email" ])
-			->addStackOfVote($newStack);
+			->setPseudo( $data[ 'owner' ][ "pseudo" ] )
+			->setPseudo( $data[ 'owner' ][ "email" ] )
+			->addStackOfVote( $newStack );

 		// TODO manage new comment
-		$emChoice = $choice_repository;
+		$emChoice   = $choice_repository;
 		$newComment = new Comment();
-		$newComment->setPseudo($data ['pseudo'])
-			->setPoll($poll)
-			->setText($data['comment']);
-		$owner->addComment($newComment);
+		$newComment->setPseudo( $data [ 'pseudo' ] )
+		           ->setPoll( $poll )
+		           ->setText( $data[ 'comment' ] );
+		$owner->addComment( $newComment );

-		$em->persist($newComment);
+		$em->persist( $newComment );

 		foreach ( $data[ 'votes' ] as $vote ) {
-			if(!$vote[ 'value' ]){
+			if ( ! $vote[ 'value' ] ) {
 				continue;
 			}
 			$newVote = new Vote();
--- a/src/Entity/Poll.php
+++ b/src/Entity/Poll.php
--- a/templates/email-base.html.twig
+++ b/templates/email-base.html.twig
@ -9,9 +9,9 @@
    <header>
        {% block title %}
            {% if  title is defined %}
-                <h1>{{ title }}</h1>
+                <h1 class="text-center">{{ title }}</h1>
            {% else %}
-                <h1>Framadate - email</h1>
+                <h1 class="text-center">Framadate</h1>
            {% endif %}
            <hr>
        {% endblock %}
@ -30,6 +30,9 @@

 </div>
 <style type="text/css">
+    .text-center{
+        text-align:center;
+    }
    html, body, main, header, footer, div {
        font-family: "Open Sans", "Helvetica Neue", sans-serif;
    }
--- a/templates/emails/creation-mail.html.twig
+++ b/templates/emails/creation-mail.html.twig
@ -2,12 +2,12 @@
 {% extends 'email-base.html.twig' %}
 {% block content %}

-
-    Suite à la création de votre sondage {{ title }} vous recevez deux emails afin de ne pas transmettre par erreur aux sondés le lien d'administration de votre sondage.
+<h1>✨ Création de votre sondage {{ poll.title }} </h1>
+    Suite à la création de votre sondage <strong>{{ poll.title }}</strong> vous recevez deux emails afin de ne pas transmettre par erreur aux sondés le lien d'administration de votre sondage.
    <br>
    Ce mail est le premier, comportant le message qui doit être envoyé aux sondés.<br>

-    Vous pouvez maintenant transmettre ce message à toutes les personnes susceptibles de participer au vote.<br>
+    Vous pouvez maintenant transmettre ce message à toutes les personnes susceptibles de participer au vote. ✔️ <br>

    <br>
    <fieldset>
@ -15,7 +15,7 @@
        <blockquote>
            <i>

-                {{ owner.pseudo }} ( {{ owner.email }} ) vient de créer un sondage intitulé : " <strong>{{ title }}
+                💡  {{ owner.pseudo }} ( {{ owner.email }} ) vient de créer un sondage intitulé : " <strong>{{ poll.title }}
                    "</strong>.
                <br>
                <br>
--- a/templates/emails/expiration-mail.html.twig
+++ b/templates/emails/expiration-mail.html.twig
@ -3,13 +3,17 @@
 {% block content %}


-    Ce sondage va bientôt expirer dans 1 jour, <br>
+    <h1> 🎌  Votre sondage {{  poll.title }} va bientôt expirer dans 1 jour,</h1>
    <blockquote>
-      le  {{ poll.expiracyDate | date('D Y-m-d') }}
+      le  {{ poll.expiracyDate | date('D Y-m-d') }} :
    </blockquote>
    il ne sera plus possible d'y voter. <br>
    Dans 31 jours il sera supprimé.<br>
    Vous pouvez exporter ses données à tout moment en vous rendant à ce lien pour l'administrer:
    <br>
    {% include 'emails/partial/admin_link.html.twig' %}
+
+    <hr>
+    Plus de détails sur votre sondage :
+    {% include 'emails/partial/poll.html.twig' %}
 {% endblock %}
--- a/templates/emails/footer.html.twig
+++ b/templates/emails/footer.html.twig
@ -13,10 +13,10 @@
    <a href="https://framagit.org/framasoft/framadate/funky-framadate-front">
        Sources du client Front end,
    </a>
-    <a href="https://framagit.org/framasoft/framadate/framadate">
+    <a href="https://framagit.org/tykayn/date-poll-api">
        API back end.
    </a>
-    <a href="https://framagit.org/framasoft/framadate/funky-framadate-front/-/wikis/home">
+    <a href="https://framagit.org/framasoft/framadate/funky-framadate-front/docs">
        Documentation
    </a>

--- a/templates/emails/partial/admin_link.html.twig
+++ b/templates/emails/partial/admin_link.html.twig
@ -1,2 +1 @@
-<a href="{{ BASE_URL }}/#/poll/{{ poll.id }}/admin/{{ poll.adminKey }}">{{ BASE_URL }}
-    /admin/{{ poll.adminKey }}</a>
+<a href="{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/admin/{{ poll.adminKey }}">{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/admin/{{ poll.adminKey }}</a>
--- a/templates/emails/partial/poll.html.twig
+++ b/templates/emails/partial/poll.html.twig
@ -2,11 +2,9 @@
    <h1>
        Sondage {{ poll.title }}
    </h1>
-
-
    <br>
    <div class="creation">
-        créé le {{ poll.creationDate| date('Y m d ') }}
+        créé le {{ poll.createdAt| date('Y m d ') }}
    </div>
    <div class="creation">
        expirera le {{ poll.expiracyDate| date('Y m d ') }}
@ -18,22 +16,29 @@
                    {{ poll.comments |length }} commentaires
                </span>
    {% if poll.password |length %}
-        (accès avec mot de passe)
+        <div class="protected">
+        🔐 (accès avec mot de passe)
+        </div>
+    {% else %}
+    {% endif %}
+    {% if poll.isZeroKnowledge |length %}
+        <div class="protected-zero-knoledge">
+            🔐 Ce sondage bénéficie du chiffrement Zéro knowledge, nos administrateurs ne sont pas en mesure de connaître les informations du sondage.
+        </div>
    {% else %}
    {% endif %}
-
    <br>

    <div class="public">
-                <span>
+                <div>
                    lien à donner aux votants:
-                </span>
+                </div>
        {% include 'emails/partial/public_link.html.twig' %}
    </div>
    <div class="admin">
-                <span>
+                <div>
                    administration:
-                </span>
+                </div>
        {% include 'emails/partial/admin_link.html.twig' %}
    </div>
 </div>
--- a/templates/emails/partial/public_link.html.twig
+++ b/templates/emails/partial/public_link.html.twig
@ -1,11 +1,10 @@
 <span class="public-link">
 	{% if poll.customUrl |length %}
-        <a href="{{ BASE_URL }}/#/vote/poll/key/{{ poll.customUrl }}">
-                {{ BASE_URL }}/#/vote/poll/key/{{ poll.customUrl }}
+        <a href="{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/consultation">
+
+✉️  {{ BASE_URL }}/#/poll/{{ poll.customUrl }}/consultation
            </a>
        {% else %}
-        <a href="{{ BASE_URL }}/#/vote/poll/id/{{ poll.id }}">
-                {{ BASE_URL }}/#/vote/poll/id/{{ poll.id }}
-            </a>
+        erreur, il manque la customUrl de ce sondage.
    {% endif %}
 </span>
Author	SHA1	Message	Date
Tykayn	f2edaa49f0	limiter l'ajout de vote stack si la limite par poll a été atteinte #30	2021-05-18 23:46:05 +02:00
Tykayn	5716642c09	migration from framadate 1 choice name using separator for timeSlices in name	2021-05-18 23:42:10 +02:00
Tykayn	afef8edd0b	style on creation poll email	2021-05-18 23:38:13 +02:00
Tykayn	623b16a046	add migration for first info on zero knowledge	2021-05-18 23:27:04 +02:00
Tykayn	9a1b8c90a4	up mail templates	2021-05-18 23:26:33 +02:00
Tykayn	03cba297d5	persist date choices on creation	2021-05-18 22:35:32 +02:00