Bugfixes

Fixed creation of date in IfmsaPerson entity which was throwing
exceptions.
Fixed nullptr dereference in events presenter.

Author: Neloop

app/forms/ContactPersonsFormsFactory.php

@@ -11,6 +11,7 @@
 use App\Model\Repository\Users;
 use App\Model\Repository\CpAssignedAfs;
 use App\Model\Repository\IfmsaPersons;
+use App\Helpers\Date\DateHelper;
 
 /**
  * Class containing factory methods for forms mainly concerning contact persons
@@ -36,6 +37,8 @@ class ContactPersonsFormsFactory extends Nette\Object
     private $httpRequest;
     /** @var App\Users\MyAuthorizator */
     private $myAuthorizator;
+    /** @var DateHelper */
+    private $dateHelper;
 
     /**
      * DI Constructor.
@@ -48,6 +51,7 @@ class ContactPersonsFormsFactory extends Nette\Object
      * @param IfmsaPersons $ifmsaPersons
      * @param Nette\Http\Request $httpRequest
      * @param App\Users\MyAuthorizator $myAuthorizator
+     * @param DateHelper $dateHelper
      */
     public function __construct(
         UserManager $userManager,
@@ -58,7 +62,8 @@ public function __construct(
         App\Helpers\IfmsaConnectionHelper $ifmsaConnectionHelper,
         IfmsaPersons $ifmsaPersons,
         Nette\Http\Request $httpRequest,
-        App\Users\MyAuthorizator $myAuthorizator
+        App\Users\MyAuthorizator $myAuthorizator,
+        DateHelper $dateHelper
     ) {
 
         $this->user = $userManager->getCurrentUser();
@@ -70,6 +75,7 @@ public function __construct(
         $this->ifmsaPersons = $ifmsaPersons;
         $this->httpRequest = $httpRequest;
         $this->myAuthorizator = $myAuthorizator;
+        $this->dateHelper = $dateHelper;
     }
 
     public function createFindContactPersonForm($afNumber)
@@ -221,7 +227,7 @@ private function getCardAndUpdate($afNumber, $accm, & $personInfo, array & $card
             $person->surname = $personInfo['surname'];
             $person->email = $personInfo['email'];
             $person->photo = $personInfo['jpgPath'];
-            $person->afArrival = new \DateTime($personInfo['arrivalDate']);
+            $person->afArrival = $this->dateHelper->createDateOrDefault($personInfo['arrivalDate'])->typed;
             $this->ifmsaPersons->flush();
         } else {
             $person = new IfmsaPerson(
@@ -231,7 +237,7 @@ private function getCardAndUpdate($afNumber, $accm, & $personInfo, array & $card
                 $personInfo['surname'],
                 $personInfo['email'],
                 $personInfo['jpgPath'],
-                $personInfo['arrivalDate']
+                $this->dateHelper->createDateOrDefault($personInfo['arrivalDate'])->typed
             );
             $this->ifmsaPersons->persist($person);
         }

app/helpers/date/DateHelper.php

@@ -39,4 +39,21 @@ public function createFromDateOrLastDayOfMonth($text): DateTimeHolder
         $holder->textual = $holder->typed->format("j. n. Y");
         return $holder;
     }
+
+    /**
+     * Create date from given string, if not possible create fallback date (0000-00-00 00:00:00)
+     * @param string $text
+     * @return \App\Helpers\Date\DateTimeHolder
+     */
+    public function createDateOrDefault($text): DateTimeHolder {
+        $holder = new DateTimeHolder;
+        try {
+            $date = new \DateTime($text);
+        } catch (\Exception $e) {
+            $date = new \DateTime("0000-00-00 00:00:00");
+        }
+        $holder->typed = $date;
+        $holder->textual = $holder->typed->format("j. n. Y");
+        return $holder;
+    }
 }

app/model/entity/IfmsaPerson.php

@@ -74,18 +74,22 @@ public function __construct(
         $surname = '',
         $email = '',
         $photo = '',
-        $afArrival = '0000-00-00 00:00:00',
+        \DateTime $afArrival = null,
         $accommodation = '',
         $department = ''
     ) {
+        if (!$afArrival) {
+            $afArrival = new \DateTime("0000-00-00 00:00:00");
+        }
+
         $this->afNumber = $afNumber;
         $this->confirmationNumber = $confirmationNumber;
         $this->firstname = $firstname;
         $this->surname = $surname;
         $this->email = $email;
         $this->photo = $photo;
-        $this->afArrival = new \DateTime($afArrival);
         $this->accommodation = $accommodation;
         $this->department = $department;
+        $this->afArrival = $afArrival;
     }
 }

app/model/repository/Users.php

@@ -3,6 +3,7 @@
 namespace App\Model\Repository;
 
 use Kdyby\Doctrine\EntityManager;
+use App\Exceptions\NotFoundException;
 use App\Model\Entity\User;
 use App\Model\Entity\Faculty;
 

app/presenters/EventsPresenter.php

@@ -244,10 +244,8 @@ public function actionModifyEvent($id)
     public function actionSignUp($id)
     {
         $event = $this->events->findOrThrow($id);
-        $signed = $this->currentUser->getParticipatedEvent($event);
         if (!$this->isLoggedIn() ||
-                !$this->user->isAllowed("Event", "sign") ||
-                !$event || $signed ||
+                !$this->user->isAllowed("Event", "sign") || !$event ||
                 !$this->myAuthorizator->isAllowedEvent('signUp', $event)) {
             $this->error('Access Denied');
         }

app/presenters/IfmsaPresenter.php

@@ -8,6 +8,7 @@
 use App\Model\Repository\CpAssignedAfs;
 use App\Model\Repository\IfmsaPersons;
 use App\Exceptions\IfmsaConnectionException;
+use App\Helpers\Date\DateHelper;
 
 /**
  * Ifmsa presenter.
@@ -49,6 +50,11 @@ class IfmsaPresenter extends BasePresenter
      * @inject
      */
     public $ifmsaPersons;
+    /**
+     * @var DateHelper
+     * @inject
+     */
+    public $dateHelper;
 
     protected function startup()
     {
@@ -232,7 +238,7 @@ public function actionPerson($afNumber)
             $person->surname = $personInfo['surname'];
             $person->email = $personInfo['email'];
             $person->photo = $personInfo['jpgPath'];
-            $person->afArrival = $personInfo['arrivalDate'];
+            $person->afArrival = $this->dateHelper->createDateOrDefault($personInfo['arrivalDate'])->typed;
         } else {
             $person = new IfmsaPerson(
                 $afNumber,
@@ -241,7 +247,7 @@ public function actionPerson($afNumber)
                 $personInfo['surname'],
                 $personInfo['email'],
                 $personInfo['jpgPath'],
-                $personInfo['arrivalDate']
+                $this->dateHelper->createDateOrDefault($personInfo['arrivalDate'])->typed
             );
             $this->ifmsaPersons->persist($person);
         }