Merge pull request #36 from phpminds/develop

Added new supporter and showing Speaker info.
phpminds · Jan 5, 2016 · 512cf49 · 512cf49
2 parents 7b01bbc + 4a69dcb
commit 512cf49
Show file tree

Hide file tree

Showing 26 changed files with 754 additions and 85 deletions.
diff --git a/app/src/Action/AdminDashboardAction.php b/app/src/Action/AdminDashboardAction.php
@@ -39,11 +39,8 @@ public function __construct(Twig $view, LoggerInterface $logger, EventsService $
 
     public function dispatch($request, $response, $args)
     {
-        $events     = $this->eventService->getAll();
-        $speakers   = $this->eventManager->getSpeakers();
-        $venues     = $this->eventService->getVenues();
 
-        $this->eventService->mergeEvents($events, $speakers, $venues);
+        $events     = $this->eventService->getAll();
 
         $this->view->render($response, 'admin/dashboard.twig', [
             'events' => $events

diff --git a/app/src/Action/HomeAction.php b/app/src/Action/HomeAction.php
@@ -55,7 +55,7 @@ public function dispatch($request, $response, $args)
 
 
 
-        $resWithETag = $this->cache->withETag($response, $event['id']);
+        $resWithETag = $this->cache->withETag($response, $event->getMeetupID());
 
         $this->view->render($response, 'home.twig', ['event' => $event,'previousEvents'=>$previousEvents]);
         return $resWithETag;

diff --git a/app/src/Action/PastEventsAction.php b/app/src/Action/PastEventsAction.php
@@ -61,6 +61,7 @@ public function eventByYearMonth(Request $request, Response $response, $args)
 
         $eventMeta = $this->eventManager->getByYearMonth($year,$month);
         $event = $this->eventService->getEventById($eventMeta[0]['meetup_id']);
+
         $resWithETag = $this->cache->withETag($response, $eventMeta[0]['meetup_id']);
         $previousEvents= $this->eventService->getPastEvents();
 

diff --git a/app/src/Factory/EventFactory.php b/app/src/Factory/EventFactory.php
@@ -2,8 +2,13 @@
 
 namespace PHPMinds\Factory;
 
+use PHPMinds\Model\Email;
+use PHPMinds\Model\Event\Entity\Speaker;
+use PHPMinds\Model\Event\Entity\Supporter;
 use PHPMinds\Model\Event\Entity\Talk;
-use PHPMinds\Model\Event\Event;
+use PHPMinds\Model\Event\Entity\Venue;
+use PHPMinds\Model\Event\EventModel;
+use PHPMinds\Model\Twitter;
 use Slim\Http\Request;
 
 class EventFactory
@@ -16,7 +21,7 @@ public static function getEvent($talkTitle, $talkDescription, $date, $speaker, $
             $speaker
         );
 
-        $event = new Event(
+        $event = new EventModel(
             $talk,
             $date,
             $venue,
@@ -28,4 +33,42 @@ public static function getEvent($talkTitle, $talkDescription, $date, $speaker, $
 
         return $event;
     }
-}
+
+    public static function getMergedFromArrays(array $meetupEvent = [], array $dbEvent = [])
+    {
+        $speaker = new Speaker(
+            $dbEvent['first_name'], $dbEvent['last_name'],
+            new Email($dbEvent['email']),
+            new Twitter($dbEvent['twitter']),
+            $dbEvent['avatar']
+        );
+
+
+        $talk = new Talk($meetupEvent['subject'], $meetupEvent['description'], $speaker);
+
+        $venue = new Venue($meetupEvent['venue_name'], $meetupEvent['venue_address']);
+
+        $date = \DateTime::createFromFormat('F jS Y', $meetupEvent['date']);
+
+        $supporter = new Supporter(
+            $dbEvent['supporter_name'], $dbEvent['supporter_url'],
+            new Twitter($dbEvent['supporter_twitter']),
+            new Email($dbEvent['supporter_email']),
+            $dbEvent['supporter_logo']
+        );
+
+        $event = new EventModel(
+            $talk,
+            $date,
+            $venue,
+            $supporter
+        );
+
+        $event->setName($meetupEvent['group']);
+        $event->setMindsUrl($meetupEvent['minds_url']);
+        $event->setMeetupID($meetupEvent['id']);
+        $event->setMeetupURL($meetupEvent['event_url']);
+
+        return $event;
+    }
+}
diff --git a/app/src/Model/Event/Entity/Event.php b/app/src/Model/Event/Entity/Event.php
@@ -20,7 +20,9 @@ class Event
 
     private $supporterID;
 
-    public function __construct($meetupID, $meetupVenueID, $joindinEventName, $joindinTalkID, $joindinURL, $speakerID, $supporterID)
+    private $meetupDate;
+
+    public function __construct($meetupID, $meetupVenueID, $joindinEventName, $joindinTalkID, $joindinURL, $speakerID, $supporterID, \DateTime $meetupDate)
     {
         $this->meetupID         = $meetupID;
         $this->meetupVenueID    = $meetupVenueID;
@@ -29,6 +31,7 @@ public function __construct($meetupID, $meetupVenueID, $joindinEventName, $joind
         $this->joindinURL       = $joindinURL;
         $this->speakerID        = $speakerID;
         $this->supporterID      = $supporterID;
+        $this->meetupDate       = $meetupDate;
     }
 
     /**
@@ -112,6 +115,16 @@ public function getSupporterID()
         return $this->supporterID;
     }
 
+    /**
+     * @return \DateTime
+     */
+    public function getMeetupDate()
+    {
+        return $this->meetupDate;
+    }
+
+
+
     public static function create(array $params = []) : Event
     {
         $class = new self(
@@ -121,7 +134,8 @@ public static function create(array $params = []) : Event
             $params['joindin_talk_id'] ?? null,
             $params['joindin_url'] ?? null,
             $params['speaker_id'] ?? null,
-            $params['supporter_id'] ?? null
+            $params['supporter_id'] ?? null,
+            $params['meetup_date'] ?? null
         );
 
         $class->setId($params['id']  ?? null);

diff --git a/app/src/Model/Event/EventManager.php b/app/src/Model/Event/EventManager.php
@@ -76,6 +76,14 @@ public function getDetailsByMeetupID($meetupID)
         return $this->eventsRepo->getByMeetupID($meetupID);
     }
 
+    /**
+     * @return mixed
+     */
+    public function getAllEventDetails()
+    {
+        return $this->eventsRepo->getAllEventDetails();
+    }
+
     /**
      * @param EventEntity $event
      */

diff --git a/app/src/Model/Event/Event.php → app/src/Model/Event/EventModel.php b/app/src/Model/Event/Event.php → app/src/Model/Event/EventModel.php
@@ -6,7 +6,7 @@
 use PHPMinds\Model\Event\Entity\Venue;
 use PHPMinds\Model\Event\Entity\Talk;
 
-class Event
+class EventModel
 {
     private $name;
 
@@ -31,6 +31,20 @@ class Event
      */
     private $supporter;
 
+    /**
+     * @var string
+     */
+    private $mindsUrl;
+
+    /**
+     * @var
+     */
+    private $meetupID;
+
+    /**
+     * @var
+     */
+    private $meetupURL;
 
     public function __construct(Talk $talk, \DateTime $date, Venue $venue, Supporter $supporter)
     {
@@ -93,6 +107,14 @@ public function getEndDate()
         return $this->date->add($this->talk->getDuration());
     }
 
+    /**
+     * @return string
+     */
+    public function getDateTimeAsString()
+    {
+        return $this->date->format('F jS Y');
+    }
+
     /**
      * @return Venue
      */
@@ -108,4 +130,52 @@ public function getSupporter() : Supporter
     {
         return $this->supporter;
     }
+
+    /**
+     * @return string
+     */
+    public function getMindsUrl()
+    {
+        return $this->mindsUrl;
+    }
+
+    /**
+     * @param string $mindsUrl
+     */
+    public function setMindsUrl($mindsUrl)
+    {
+        $this->mindsUrl = $mindsUrl;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMeetupID()
+    {
+        return $this->meetupID;
+    }
+
+    /**
+     * @param mixed $meetupID
+     */
+    public function setMeetupID($meetupID)
+    {
+        $this->meetupID = $meetupID;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMeetupURL()
+    {
+        return $this->meetupURL;
+    }
+
+    /**
+     * @param mixed $meetupURL
+     */
+    public function setMeetupURL($meetupURL)
+    {
+        $this->meetupURL = $meetupURL;
+    }
 }
diff --git a/app/src/Model/JoindinEvent.php b/app/src/Model/JoindinEvent.php
@@ -3,7 +3,7 @@
 namespace PHPMinds\Model;
 
 use PHPMinds\Config\JoindinConfig;
-use PHPMinds\Model\Event\Event;
+use PHPMinds\Model\Event\EventModel;
 use PHPMinds\Repository\FileRepository;
 
 class JoindinEvent
@@ -96,10 +96,10 @@ public function getUrl($action = 'events', $end = '/')
     }
 
     /**
-     * @param Event $event
+     * @param EventModel $event
      * @return array
      */
-    public function getCreateEventPayload(Event $event)
+    public function getCreateEventPayload(EventModel $event)
     {
         return [
             'name' => $event->getName(),
@@ -113,11 +113,11 @@ public function getCreateEventPayload(Event $event)
     }
 
     /**
-     * @param Event $event
+     * @param EventModel $event
      * @param string $language
      * @return array
      */
-    public function getCreateEventTitlePayload(Event $event, $language = 'English - UK')
+    public function getCreateEventTitlePayload(EventModel $event, $language = 'English - UK')
     {
         $speakers = [$event->getTalk()->getSpeaker()->getFirstName() . ' ' . $event->getTalk()->getSpeaker()->getLastName()];
 

diff --git a/app/src/Model/MeetupEvent.php b/app/src/Model/MeetupEvent.php
@@ -5,7 +5,7 @@
 use PHPMinds\Config\MeetupConfig;
 use PHPMinds\Model\Event\Entity\Talk;
 use PHPMinds\Model\Event\Entity\Venue;
-use PHPMinds\Model\Event\Event;
+use PHPMinds\Model\Event\EventModel;
 
 class MeetupEvent
 {
@@ -110,17 +110,19 @@ public function formatResponse(array $event = [])
             'time'      => $eventTime,
             'location'  => $eventLocation,
             'venue_id'  => $venue['id'] ?? '',
-            'event_url' => $eventUrl,
-            'description' => $eventDescription,
-            'minds_url'=>$mindsUrl
+            'venue_name' => $venue['name'] ?? '',
+            'venue_address' => $venue['address_1'] ?? '',
+            'event_url'     => $eventUrl,
+            'description'   => $eventDescription,
+            'minds_url'     =>  $mindsUrl
         ];
     }
 
     /**
-     * @param Event     $event
+     * @param EventModel     $event
      * @return array
      */
-    public function getCreateEventPayload(Event $event)
+    public function getCreateEventPayload(EventModel $event)
     {
         // x-www-form-urlencoded
         // have not tried using json