[Poll] Added New Route, RespondPoll, Poll Response, PollResponseForm

plugins/PollPlugin/Controller/NewPoll.php

@@ -23,6 +23,7 @@ namespace Plugin\PollPlugin\Controller;
 
 use App\Core\DB\DB;
 use App\Entity\Poll;
+use App\Util\Common;
 use Plugin\PollPlugin\Forms\NewPollForm;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -30,18 +31,32 @@ class NewPoll
 {
     public function newpoll(Request $request)
     {
-        $form = NewPollForm::make(3);
+        $user = Common::ensureLoggedIn();
+
+        $numOptions = 3; //temporary
+        $form       = NewPollForm::make($numOptions);
 
         $form->handleRequest($request);
+        $question = 'Test Question?';
+        $opt      = [];
         if ($form->isSubmitted()) {
             $data = $form->getData();
             //var_dump($data);
+            for ($i = 1; $i <= $numOptions; ++$i) {
+                array_push($opt,$data['Option_' . $i]);
+            }
+            $testPoll = Poll::make($question,$opt);
+            DB::persist($testPoll);
+            DB::flush();
+            //var_dump($testPoll);
         }
 
-        /* testing
-        $test = Poll::create(['id' => '0', 'uri' => 'a']);
-        DB::persist($test);
-        DB::flush();
+        // testing
+
+        //$test = Poll::create(['id' => '0', 'uri' => 'a']);
+        //DB::persist($test);
+        //DB::flush();
+        /*
         $loadpoll = Poll::getFromId('0');
         var_dump($loadpoll);
         */

plugins/PollPlugin/Controller/RespondPoll.php

@@ -0,0 +1,56 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Plugin\PollPlugin\Controller;
+
+use App\Entity\Poll;
+use App\Util\Common;
+use Plugin\PollPlugin\Forms\PollResponseForm;
+use Symfony\Component\HttpFoundation\Request;
+
+class RespondPoll
+{
+    public function respondpoll(Request $request, string $id)
+    {
+        $user = Common::ensureLoggedIn();
+
+        $poll = Poll::getFromId((int) $id);
+        //var_dump($poll);
+
+        if ($poll == null) {//|| !$poll->isVisibleTo($user)) { todo
+            throw new NoSuchPollException(); //?
+        }
+        $opts = $poll->getOptionsArr();
+        //var_dump($opts);
+
+        $form = PollResponseForm::make($opts);
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted()) {
+            $data   = $form->getData();
+            $choice = array_values($data)[1];
+            //echo $choice;
+        }
+
+        //return ['_template' => 'base.html.twig'];
+        return ['_template' => 'Poll/newpoll.html.twig', 'form' => $form->createView()];
+    }
+}

plugins/PollPlugin/Forms/PollResponseForm.php

@@ -0,0 +1,47 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Plugin\PollPlugin\Forms;
+
+use App\Core\Form;
+use function App\Core\I18n\_m;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form as SymfForm;
+
+class PollResponseForm extends Form
+{
+    public static function make(array $opts): SymfForm
+    {
+        $formOptions = [];
+        $options     = [];
+        for ($i = 0; $i < count($opts); ++$i) {
+            $options[$opts[$i]] = $i;
+        }
+        array_push($formOptions, ['Question', ChoiceType::class, [
+            'choices'  => $options,
+            'expanded' => true,
+        ]]);
+        array_push($formOptions, ['save', SubmitType::class, ['label' => _m('Submit')]]);
+
+        return parent::create($formOptions);
+    }
+}

plugins/PollPlugin/PollPlugin.php

@@ -66,6 +66,7 @@ class PollPlugin extends Module
         $r->connect('newpoll', 'main/poll/new', [Controller\NewPoll::class, 'newpoll']);
         //$r->connect('showpoll', 'main/poll/:{id<' . ID_FMT . '>}' , [Controller\ShowPoll::class, 'showpoll']); //doesnt work
         $r->connect('showpoll', 'main/poll/{id<\\d*>}',[Controller\ShowPoll::class, 'showpoll']);
+        $r->connect('showpoll', 'main/poll/{id<\\d*>}/respond',[Controller\RespondPoll::class, 'respondpoll']);
 
         return Event::next;
     }

src/Entity/Poll.php

@@ -30,8 +30,8 @@ class Poll extends Entity
     // {{{ Autocode
 
     private int $id;
-    private string $uri;
-    private ?int $profile_id;
+    private ?string $uri;
+    private ?int $gsactor_id;
     private ?string $question;
     private ?string $options;
     private DateTimeInterface $created;
@@ -47,26 +47,26 @@ class Poll extends Entity
         return $this->id;
     }
 
-    public function setUri(string $uri): self
+    public function setUri(?string $uri): self
     {
         $this->uri = $uri;
         return $this;
     }
 
-    public function getUri(): string
+    public function getUri(): ?string
     {
         return $this->uri;
     }
 
-    public function setProfileId(?int $profile_id): self
+    public function setGsactorId(?int $gsactor_id): self
     {
-        $this->profile_id = $profile_id;
+        $this->gsactor_id = $gsactor_id;
         return $this;
     }
 
-    public function getProfileId(): ?int
+    public function getGsactorId(): ?int
     {
-        return $this->profile_id;
+        return $this->gsactor_id;
     }
 
     public function setQuestion(?string $question): self
@@ -113,17 +113,18 @@ class Poll extends Entity
             'name'        => 'poll',
             'description' => 'Per-notice poll data for Poll plugin',
             'fields'      => [
-                'id'         => ['type' => 'int', 'not null' => true],
-                'uri'        => ['type' => 'varchar', 'length' => 191, 'not null' => true],
-                'profile_id' => ['type' => 'int'], //-> gsactor id?
+                'id'  => ['type' => 'serial', 'not null' => true],
+                'uri' => ['type' => 'varchar', 'length' => 191],
+                //    'uri'        => ['type' => 'varchar', 'length' => 191, 'not null' => true],
+                'gsactor_id' => ['type' => 'int'], //-> gsactor id?
                 'question'   => ['type' => 'text'],
                 'options'    => ['type' => 'text'],
                 'created'    => ['type' => 'datetime', 'not null' => true],
             ],
             'primary key' => ['id'],
-            'unique keys' => [
-                'poll_uri_key' => ['uri'],
-            ],
+            //  'unique keys' => [
+            //      'poll_uri_key' => ['uri'],
+            //  ],
         ];
     }
 
@@ -132,6 +133,17 @@ class Poll extends Entity
         return DB::find('poll', ['id' => $id]);
     }
 
+    public static function make(string $question, array $opt): self
+    {
+        $options = implode("\n",$opt);
+        return self::create(['question' => $question, 'options' => $options]);
+    }
+
+    public function getOptionsArr()
+    {
+        return explode("\n", $this->options);
+    }
+
     //from old version
     /**
      * Get a bookmark based on a notice
@@ -146,12 +158,6 @@ class Poll extends Entity
         return self::getKV('uri', $notice->uri);
     }
     */
-    /*
-    public function getOptions()
-    {
-        return explode("\n", $this->options);
-    }
-    */
 
     /**
      * Is this a valid selection index?

src/Entity/PollResponse.php

@@ -0,0 +1,136 @@
+<?php
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace App\Entity;
+
+use App\Core\Entity;
+use DateTimeInterface;
+
+class PollResponse extends Entity
+{
+    // {{{ Autocode
+
+    private int $id;
+    private ?string $uri;
+    private string $poll_id;
+    private ?int $gsactor_id;
+    private ?int $selection;
+    private DateTimeInterface $created;
+
+    public function setId(int $id): self
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setUri(?string $uri): self
+    {
+        $this->uri = $uri;
+        return $this;
+    }
+
+    public function getUri(): ?string
+    {
+        return $this->uri;
+    }
+
+    public function setPollId(string $poll_id): self
+    {
+        $this->poll_id = $poll_id;
+        return $this;
+    }
+
+    public function getPollId(): string
+    {
+        return $this->poll_id;
+    }
+
+    public function setGsactorId(?int $gsactor_id): self
+    {
+        $this->gsactor_id = $gsactor_id;
+        return $this;
+    }
+
+    public function getGsactorId(): ?int
+    {
+        return $this->gsactor_id;
+    }
+
+    public function setSelection(?int $selection): self
+    {
+        $this->selection = $selection;
+        return $this;
+    }
+
+    public function getSelection(): ?int
+    {
+        return $this->selection;
+    }
+
+    public function setCreated(DateTimeInterface $created): self
+    {
+        $this->created = $created;
+        return $this;
+    }
+
+    public function getCreated(): DateTimeInterface
+    {
+        return $this->created;
+    }
+
+    // }}} Autocode
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return [
+            'name'        => 'pollresponse',
+            'description' => 'Record of responses to polls',
+            'fields'      => [
+                'id' => ['type' => 'serial', 'not null' => true],
+                //'uri' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'UUID to the response notice'),
+                'uri'        => ['type' => 'varchar', 'length' => 191, 'description' => 'UUID to the response notice'],
+                'poll_id'    => ['type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID of poll being responded to'],
+                'gsactor_id' => ['type' => 'int'],
+                'selection'  => ['type' => 'int'],
+                'created'    => ['type' => 'datetime', 'not null' => true],
+            ],
+            'primary key' => ['id'],
+            /*
+            'unique keys' => array(
+                'poll_uri_key' => array('uri'),
+                'poll_response_poll_id_profile_id_key' => array('poll_id', 'profile_id'),
+            ),
+
+            'indexes' => array(
+                'poll_response_profile_id_poll_id_index' => array('profile_id', 'poll_id'),
+            )
+           */
+        ];
+    }
+}