Merge pull request #4 from AmsterdamPHP/task/assign-host

Assign Host to Event

Author: rdohms

.circleci/config.yml

@@ -0,0 +1,62 @@
+version: 2
+
+jobs:
+  unit-tests:
+    docker:
+      - image: circleci/php:7.0
+    steps:
+      - run: sudo composer self-update && sudo composer self-update --1
+      - checkout
+      - restore_cache:
+          keys:
+            - dependencies-{{ checksum "composer.lock" }}
+            - composer-cache
+
+      - run: composer install -n -o --no-scripts
+      - save_cache:
+          key: dependencies-{{ checksum "composer.lock" }}
+          paths:
+            - vendor
+      - save_cache:
+          key: composer-cache
+          paths:
+            - ~/.composer/cache
+
+      - run: mkdir phpunit
+      - run: ./vendor/bin/phpunit --log-junit phpunit/junit.xml
+      - store_test_results:
+          path: phpunit
+      - store_artifacts:
+          path: phpunit
+
+  deploy:
+    machine:
+      enabled: true
+    docker:
+      - image: circleci/php:7.0
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "00:49:b0:d3:41:35:99:f2:a7:d1:02:46:02:07:06:09"
+      - run: sudo composer self-update && sudo composer self-update --1
+      - checkout
+      - restore_cache:
+          keys:
+            - dependencies-{{ checksum "composer.lock" }}
+            - composer-cache
+
+      - run: composer install -n -o --no-scripts
+      - run: ./vendor/bin/dep deploy
+
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - unit-tests
+      - deploy:
+          requires:
+            - unit-tests
+          filters:
+            branches:
+              only: master
+

circle.yml

@@ -1,4 +1,6 @@
 <?php
+
+use AmsterdamPHP\Console\Api\JoindInClient;
 use Crummy\Phlack\Phlack;
 use DI\ContainerBuilder;
 use DMS\Service\Meetup\AbstractMeetupClient;
@@ -13,6 +15,7 @@
 
 // Define services
 $container->set(Client::class, new Client($config['joindin']));
+$container->set(JoindInClient::class, new JoindInClient($config['joindin']));
 $container->set(AbstractMeetupClient::class, \DMS\Service\Meetup\MeetupKeyAuthClient::factory([
     'key' => $config['meetup_api_key']
 ]));

config/container.php

@@ -4,15 +4,15 @@
 require 'recipe/composer.php';
 
 // Set configurations
-set('repository', 'git@github.com:AmsterdamPHP/console.git');
+set('repository', 'https://github.com/AmsterdamPHP/console.git');
 set('shared_files', ['.env']);
 set('shared_dirs', []);
 set('writable_dirs', []);
 
 // Configure servers
-server('production', 'amsterdamphp.nl')
-    ->user('phpamst01')
-    ->identityFile()
+server('production', '87.233.177.218')
+    ->user('webdev')
+    ->identityFile(null, '~/.ssh/id_rsa_0049b0d3413599f2a7d1024602070609')
     ->env('deploy_path', '/data/www/console');
 
 after('deploy:update_code', 'deploy:shared');

deploy.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace AmsterdamPHP\Console\Api;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Collection;
+use function json_encode;
+use function var_dump;
+
+final class JoindInClient extends Client
+{
+    const DEFAULT_BASE_URL = 'https://api.joind.in/v2.1';
+
+    /**
+     * Constructor
+     */
+    public function __construct(array $config) {
+        $defaults = array('base_url' => self::DEFAULT_BASE_URL);
+        $required = array('base_url');
+
+        $configuration = Collection::fromConfig($config, $defaults, $required);
+
+        parent::__construct($configuration->toArray());
+
+        if ($configuration->get('access_token')) {
+            $this->setDefaultOption('headers/Authorization', 'OAuth ' . $configuration->get('access_token'));
+        }
+        $this->setDefaultOption('headers/Accept-Charset', 'utf-8');
+        $this->setDefaultOption('headers/Accept', 'application/json');
+        $this->setDefaultOption('headers/Content-Type', 'application/json');
+    }
+
+    public function addEventHost($eventId, $eventHost)
+    {
+        $result = $this->post('v2.1/events/'.$eventId.'/hosts', ['body' => json_encode(['host_name' => $eventHost])]);
+        return $result;
+    }
+}

src/Api/JoindInClient.php

@@ -2,6 +2,7 @@
 
 namespace AmsterdamPHP\Console\Command;
 
+use AmsterdamPHP\Console\Api\JoindInClient;
 use Codeliner\ArrayReader\ArrayReader;
 use Crummy\Phlack\Phlack;
 use DMS\Service\Meetup\AbstractMeetupClient;
@@ -10,6 +11,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use function var_dump;
 
 class CreateJoindInCommand extends Command
 {
@@ -29,18 +31,25 @@ class CreateJoindInCommand extends Command
      */
     protected $joindinEvents;
 
+    /**
+     * @var JoindInClient
+     */
+    private $joindinApi;
+
     /**
      * CreateJoindInCommand constructor.
      *
      * @param AbstractMeetupClient $meetup
      * @param Phlack               $slack
      * @param Client               $joindin
+     * @param JoindInClient        $joindinApi
      */
-    public function __construct(AbstractMeetupClient $meetup, Phlack $slack, Client $joindin)
+    public function __construct(AbstractMeetupClient $meetup, Phlack $slack, Client $joindin, JoindInClient $joindinApi)
     {
         $this->meetup = $meetup;
         $this->slack = $slack;
         $this->joindinEvents = $joindin->getService(new Events());
+        $this->joindinApi = $joindinApi;
         parent::__construct();
     }
 
@@ -97,8 +106,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         ];
 
         $result = $this->joindinEvents->submit($event);
+        $output->writeln(sprintf("<comment>=> Joind.in event created.</comment>"));
 
-        $output->writeln(sprintf("<comment>=> Joind.in event created, awaiting approval</comment>"));
+        $hostResult = $this->joindinApi->addEventHost($this->extractIdFromLocation($result['url']), 'amsterdamphp');
+        $output->writeln("<comment>=> Host Add request returned " . $hostResult->getStatusCode() . "</comment>");
 
         $this->sendSlackMsg(
             sprintf(
@@ -151,4 +162,16 @@ protected function getCurrentMonthlyMeetingCandidates()
             return strpos($event['name'], 'Monthly Meeting') !== false;
         });
     }
+
+    protected function extractIdFromLocation($locationUrl)
+    {
+        $matches = [];
+        preg_match(
+            "/events\/([0-9]*)/",
+            $locationUrl,
+            $matches
+        );
+
+        return $matches[1];
+    }
 }

src/Command/CreateJoindInCommand.php

@@ -1,12 +1,17 @@
 <?php
 namespace AmsterdamPHP\Console;
 
+use AmsterdamPHP\Console\Api\JoindInClient;
 use AmsterdamPHP\Console\Command\CreateJoindInCommand;
 use Crummy\Phlack\Builder\MessageBuilder;
 use Crummy\Phlack\Message\Message;
 use Crummy\Phlack\Phlack;
 use DMS\Service\Meetup\AbstractMeetupClient;
 use DMS\Service\Meetup\Response\MultiResultResponse;
+use Guzzle\Http\Message\Header;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Adapter\MockAdapter;
+use GuzzleHttp\Event\Emitter;
 use Joindin\Api\Client;
 use Mockery\Mock;
 use Mockery\MockInterface;
@@ -36,20 +41,36 @@ class CreateJoindInCommandTest extends \PHPUnit_Framework_TestCase
      */
     protected $command;
 
+    /**
+     * @var MockAdapter
+     */
+    protected $adapter;
+
+    /**
+     * @var JoindInClient
+     */
+    protected $joindinClient;
+
     protected function setUp()
     {
         parent::setUp();
         $this->meetup = \Mockery::mock(AbstractMeetupClient::class);
         $this->slack  = \Mockery::mock(Phlack::class);
         $this->joindinEvents = \Mockery::mock(Client::class);
         $this->joindinEvents->shouldReceive('getService')->andReturnSelf();
+        $this->adapter         = new MockAdapter();
+        $this->joindinClient = new JoindInClient([
+            'adapter' => $this->adapter,
+            'emitter' => new Emitter()
+                                                 ]);
 
-        $this->command = new CreateJoindInCommand($this->meetup, $this->slack, $this->joindinEvents);
+        $this->command = new CreateJoindInCommand($this->meetup, $this->slack, $this->joindinEvents, $this->joindinClient);
     }
 
     public function testCommand()
     {
         $meetupResponse = \Mockery::mock(MultiResultResponse::class)->shouldDeferMissing();
+        $meetupResponse->addHeader('Content-Type', new Header('Content-Type', 'application/json'));
         $meetupResponse->setData([
             [
                 'name' => 'Monthly Meeting',
@@ -61,7 +82,9 @@ public function testCommand()
 
         $this->meetup->shouldReceive('getEvents')->andReturn($meetupResponse)->once();
 
-        $this->joindinEvents->shouldReceive('submit')->once();
+        $this->joindinEvents->shouldReceive('submit')
+                            ->andReturn(['url' => 'http://some.path.to.api/v2.1/events/34'])
+                            ->once();
 
         $this->slack->shouldReceive('getMessageBuilder')->andReturn(new MessageBuilder())->once();
         $this->slack->shouldReceive('send')->with(
@@ -73,6 +96,8 @@ function (Message $param) {
             )
         );
 
+        $this->adapter->setResponse(new Response(200));
+
         $input = new ArrayInput([]);
         $output = new DummyOutput();