Merge pull request #142 from phpminds/develop

Use meetup OAuth client

Author: pavlakis

.travis.yml

@@ -1,5 +1,5 @@
 language: php
 php: '7.1'
 install: composer install
-script: phpunit --configuration tests/phpunit/phpunit.xml
+script: bin/phpunit --configuration tests/phpunit/phpunit.xml
 

README.md

@@ -20,34 +20,6 @@ Integrations with
 - [x] meetup.com
 - [x] joind.in
 
-
-## Tests
-
-Running Behat:
-
-`bin/behat -c tests/behat/behat.yml `
--Running everything without the browser:		
- -		
- -`/bin/behat -c tests/behat/behat.yml --tags ~@javascript		
- -`		
- -		
- -Running Selenium:		
- -		
- -`java  -Dwebdriver.chrome.driver=./tests/drivers/linux/chromedriver -jar ./vendor/se/selenium-server-standalone/bin/selenium-server-standalone.jar -port 4444`		
- -		
- -*Server Dependencies*		
- -		
- -Java 8		
- -		
- -Installation		
- -		
- -```		
- -add-apt-repository ppa:webupd8team/java		
- -apt update		
- -apt install oracle-java8-installer		
- -```		
- -
-
 ## Contributors
 Created by the @phpminds team - contributions welcomed
 

app/configs/settings.php.example

@@ -30,6 +30,8 @@ return [
 
         'meetups' => [
             "apiKey" => "add-your-key-here",
+            'consumerKey'    => 'THE-CONSUMER-KEY',
+            'consumerSecret' => 'THE-CONSUMER-SECRET',
             "baseUrl" => "https://api.meetup.com/2",
             "publish_status" => 'draft', // always draft for Development
             "PHPMinds" =>  ["group_urlname" => "PHPMiNDS-in-Nottingham"]

app/dependencies.php

@@ -87,16 +87,14 @@
 
     $options = array('path' => __DIR__ . '/../cache/');
     $driver = new FileSystem($options);
-    $client = new MeetupCache( \DMS\Service\Meetup\MeetupKeyAuthClient::factory(
-        [
-            'key' => $c->get('meetup.config')->apiKey,
-            'base_url' => $c->get('meetup.config')->baseUrl,
-            'group_urlname' => $c->get('meetup.config')->groupUrlName,
-            'publish_status' => $c->get('meetup.config')->publishStatus
-        ]
-    ), new \Stash\Pool($driver));
+    $meetupClient =  \DMS\Service\Meetup\MeetupOAuthClient::factory([
+        'consumer_key'    => $c->get('meetup.config')->consumerKey,
+        'consumer_secret'    => $c->get('meetup.config')->consumerSecret,
+    ]);
+    $meetupCacheClient = new MeetupCache($meetupClient, new \Stash\Pool($driver));
+
     return new \PHPMinds\Service\MeetupService(
-        $client,
+        $meetupCacheClient,
         $c->get('meetup.event'),
         $c->get('meetup.config')
     );

app/src/Action/HomeAction.php

@@ -47,12 +47,13 @@ public function __construct(Twig $view, LoggerInterface $logger, EventsService $
     public function dispatch($request, $response, $args)
     {
         $event = null;
-        $eventExists = true;
         $previousEvents = null;
         try  {
 
             $event = $this->eventService->getLatestEvent();
 
+            $eventExists = strlen($event->getDescription()) > 0 ?? false;
+
             $previousEvents = $this->eventService->getPastEvents();
 
             $response = $this->cache->withETag($response, $event->getMeetupID());

app/src/Model/Event/Entity/Event.php

@@ -22,7 +22,7 @@ class Event
 
     private $meetupDate;
 
-    public function __construct($meetupID, $meetupVenueID, $joindinEventName, $joindinTalkID, $joindinURL, $speakerID, $supporterID, \DateTime $meetupDate)
+    public function __construct($meetupID, $meetupVenueID, $joindinEventName, $joindinTalkID, $joindinURL, $speakerID, $supporterID, ?\DateTime $meetupDate)
     {
         $this->meetupID         = $meetupID;
         $this->meetupVenueID    = $meetupVenueID;

app/src/Repository/EventsRepository.php

@@ -122,8 +122,8 @@ public function getAllEventDetails()
             . ', supp.email AS supporter_email, supp.logo AS supporter_logo'
             . " FROM {$this->table} AS ev"
             . " LEFT JOIN `speakers` AS sp ON sp.id = ev.speaker_id"
-            . " LEFT JOIN `supporters` AS supp ON supp.id = ev.supporter_id";
-
+            . " LEFT JOIN `supporters` AS supp ON supp.id = ev.supporter_id"
+            . " ORDER BY ev.`meetup_date` DESC";
 
         $stmt = $this->db->prepare($sql);
 

app/src/Service/EventsService.php

@@ -91,7 +91,7 @@ public function getEventById($eventID = null)
     }
 
     /**
-     * @return \PHPMinds\Model\Event\EventModel
+     * @return array
      */
     public function getAll()
     {

app/src/Service/MeetupService.php

@@ -13,7 +13,7 @@ class MeetupService
 {
 
     /**
-     * @var MeetupKeyAuthClient
+     * @var MeetupCache
      */
     protected $client;
 

app/templates/home.twig

@@ -22,9 +22,11 @@
             </div>
             {% else %}
                 <div class="p-summary">
-                    <h3>
-                        There are no published events. Please check again soon.
-                    </h3>
+                    <p>
+                        There are no details for the next event at the moment. Please check again soon. Or drop along to meetup
+                        to find out future dates and or events.
+                    </p>
+                    <p class="right"><a class="button alert" href="https://www.meetup.com/PHPMiNDS-in-Nottingham">Visit Meetup</a></p>
                 </div>
             {% endif %}
         </div>