Merge pull request #60 from GroupEat/develop

Release 1.0.0

Author: tibdex

.gitignore

@@ -2,7 +2,7 @@
 .DS_Store
 Thumbs.db
 .env
-APNS.pem
+.apns.pem
 .phpstorm.meta.php
 _ide_helper.php
 _ide_helper_models.php

.rocketeer/events.php

@@ -3,9 +3,22 @@
 use Rocketeer\Facades\Rocketeer;
 
 Rocketeer::listenTo('deploy.before-symlink', function ($task) {
-    $path = $task->releasesManager->getCurrentReleasePath();
+    $commands = [
+        'optimize',
+        'api:cache',
+        'config:cache',
+        'opcache:clear',
+        'docs',
+        'adminer',
+        'db:backup --s3',
+    ];
 
-    foreach (['optimize', 'route:cache', 'config:cache', 'opcache:clear', 'docs', 'adminer'] as $command) {
-        $task->run("cd $path; php artisan $command");
-    }
+    array_map(function ($command) use ($task) {
+        $task->runForCurrentRelease("php artisan $command");
+
+        if (!$task->status()) {
+            $task->explainer->error("Cancelling release because command '$command' failed");
+            exit(1);
+        }
+    }, $commands);
 });

.rocketeer/hooks.php

@@ -27,12 +27,16 @@
             function ($task) {
                 $sharedFolder = $task->paths->getFolder('shared');
 
-                foreach (['.env', 'APNS.pem'] as $file) {
+                foreach (['.env', '.apns.pem'] as $file) {
                     $task->run("ln -s ~vagrant/$file $sharedFolder/$file");
                 }
             },
         ],
-        'deploy'  => [],
+        'deploy'  => [
+            function ($task) {
+                $task->runForCurrentRelease('php artisan migrate --force');
+            }
+        ],
         'cleanup' => [],
     ],
 

.rocketeer/remote.php

@@ -31,7 +31,7 @@
     // user uploaded data, file-based databases, etc.
     'shared'         => [
         '.env',
-        'APNS.pem',
+        '.apns.pem',
         'storage/logs',
     ],
 
@@ -61,7 +61,6 @@
         // permissions on the folder above. The Closure can return
         // a single command as a string or an array of commands
         'callback' => function ($task, $file) {
-            var_dump($file);
             return [
                 sprintf('chmod -R 775 %s', $file),
                 sprintf('chmod -R g+s %s', $file),

app/Admin/Console/Adminer.php

@@ -1,25 +1,63 @@
 <?php
 namespace Groupeat\Admin\Console;
 
-use Groupeat\Admin\Services\GenerateAdminerFiles;
 use Groupeat\Support\Console\Abstracts\Command;
+use GuzzleHttp\Client;
+use Illuminate\Contracts\Filesystem\Filesystem;
 
 class Adminer extends Command
 {
-    protected $name = 'adminer';
+    const THEME = 'pappu687';
+    const RED = '#ff4e50';
+    const GREEN = '#23AF50';
+
+    protected $signature = 'adminer';
     protected $description = "Generate the Adminer files to manage the DB";
 
-    private $generateAdminerFiles;
+    private $client;
+    private $filesystem;
 
-    public function __construct(GenerateAdminerFiles $generateAdminerFiles)
+    public function __construct(Filesystem $filesystem)
     {
         parent::__construct();
 
-        $this->generateAdminerFiles = $generateAdminerFiles;
+        $this->client = new Client;
+        $this->filesystem = $filesystem;
     }
 
-    public function fire()
+    public function handle()
     {
-        $this->generateAdminerFiles->call($this->getOutput());
+        $this->line("Listing available versions");
+
+        $response = $this->client->get('https://api.github.com/repos/vrana/adminer/tags');
+
+        $latestVersion = collect(json_decode($response->getBody(), true))
+            ->map(function ($tag) {
+                return trim($tag['name'], 'v');
+            })
+            ->sortByDesc(null)
+            ->first();
+
+        $this->line("Latest version found: $latestVersion");
+        $this->line("Downloading PHP file");
+
+        $this->client->get("http://downloads.sourceforge.net/adminer/adminer-$latestVersion-en.php", [
+            'save_to' => storage_path('app/adminer.php'),
+        ]);
+
+        $this->line("Downloading CSS file");
+
+        $css = (string) $this->client
+            ->get('https://raw.github.com/vrana/adminer/master/designs/' . static::THEME . '/adminer.css')
+            ->getBody();
+
+        $this->line("Applying GroupEat theme");
+
+        $css = str_replace('#34495e', static::RED, $css);
+        $css = str_replace(['#48A5BF', '#65ADC3', 'rgb(85, 112, 139)', '#2980b9'], static::GREEN, $css);
+
+        $this->line("Saving CSS file");
+
+        $this->filesystem->put('adminer.css', $css);
     }
 }

app/Admin/Console/DetectUncomfirmedGroupOrders.php

@@ -0,0 +1,38 @@
+<?php
+namespace Groupeat\Admin\Console;
+
+use Carbon\Carbon;
+use Groupeat\Admin\Events\GroupOrderHasNotBeenConfirmed;
+use Groupeat\Admin\Values\MaxConfirmationDurationInMinutes;
+use Groupeat\Orders\Entities\GroupOrder;
+use Groupeat\Support\Console\Abstracts\Command;
+use Illuminate\Contracts\Events\Dispatcher;
+
+class DetectUncomfirmedGroupOrders extends Command
+{
+    protected $signature = 'group-orders:detect-uncomfirmed';
+    protected $description = "Detect group orders that should have been confirmed and fire events if found";
+
+    private $events;
+    private $maxConfirmationDurationInMinutes;
+
+    public function __construct(
+        Dispatcher $events,
+        MaxConfirmationDurationInMinutes $maxConfirmationDurationInMinutes
+    ) {
+        parent::__construct();
+
+        $this->events = $events;
+        $this->maxConfirmationDurationInMinutes = $maxConfirmationDurationInMinutes;
+    }
+
+    public function handle()
+    {
+        GroupOrder::unconfirmed($this->maxConfirmationDurationInMinutes)
+            ->get()
+            ->each(function (GroupOrder $groupOrder) {
+                $this->comment($groupOrder->toShortString() . ' is unconfirmed');
+                $this->events->fire(new GroupOrderHasNotBeenConfirmed($groupOrder));
+            });
+    }
+}

app/Admin/Entities/Admin.php

@@ -10,7 +10,7 @@ class Admin extends Entity implements User
 {
     use HasCredentials, SoftDeletes;
 
-    protected $dates = ['deletedAt'];
+    protected $dates = [self::DELETED_AT];
 
     public function getRules()
     {

app/Admin/Events/GroupOrderHasNotBeenConfirmed.php

@@ -0,0 +1,31 @@
+<?php
+namespace Groupeat\Admin\Events;
+
+use Groupeat\Orders\Entities\GroupOrder;
+use Groupeat\Support\Events\Abstracts\Event;
+
+class GroupOrderHasNotBeenConfirmed extends Event
+{
+    private $groupOrder;
+
+    public function __construct(GroupOrder $groupOrder)
+    {
+        $this->groupOrder = $groupOrder;
+    }
+
+    public function getGroupOrder()
+    {
+        return $this->groupOrder;
+    }
+
+    public function __toString()
+    {
+        $groupOrderPresenter = $this->groupOrder->getPresenter();
+        $restaurant = $this->groupOrder->restaurant;
+
+        return 'The ' . $this->groupOrder->toShortString()
+            . ' has been closed at ' . $groupOrderPresenter->closedAtTime
+            . ' but has not been confirmed yet by ' . $restaurant->toShortString()
+            . ' (' . $restaurant->phoneNumber . ').';
+    }
+}

app/Admin/Migrations/AdminsMigration.php

@@ -2,13 +2,23 @@
 namespace Groupeat\Admin;
 
 use Groupeat\Admin\Entities\Admin;
+use Groupeat\Admin\Services\ShareNoteworthyEventsOnSlack;
+use Groupeat\Admin\Values\MaxConfirmationDurationInMinutes;
 use Groupeat\Auth\Auth;
 use Groupeat\Support\Providers\Abstracts\WorkbenchPackageProvider;
 
 class PackageProvider extends WorkbenchPackageProvider
 {
+    protected $configValues = [
+        MaxConfirmationDurationInMinutes::class => 'admin.max_confirmation_duration_in_minutes',
+    ];
+
     protected function bootPackage()
     {
         $this->app[Auth::class]->addUserType(new Admin);
+
+        foreach (ShareNoteworthyEventsOnSlack::EVENT_CLASSES as $eventClass) {
+            $this->listen($eventClass, ShareNoteworthyEventsOnSlack::class, 'share');
+        }
     }
 }

app/Admin/PackageProvider.php

@@ -0,0 +1,56 @@
+<?php
+namespace Groupeat\Admin\Services;
+
+use Groupeat\Admin\Events\GroupOrderHasNotBeenConfirmed;
+use Groupeat\Auth\Events\UserHasRegistered;
+use Groupeat\Orders\Events\GroupOrderHasBeenCreated;
+use Groupeat\Orders\Events\GroupOrderHasBeenJoined;
+use Groupeat\Support\Events\Abstracts\Event;
+use Groupeat\Support\Listeners\Abstracts\QueuedListener;
+use Groupeat\Support\Values\Environment;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class ShareNoteworthyEventsOnSlack extends QueuedListener
+{
+    const URL = 'https://hooks.slack.com/services/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';
+
+    const EVENT_CLASSES = [
+        UserHasRegistered::class,
+        GroupOrderHasBeenCreated::class,
+        GroupOrderHasBeenJoined::class,
+        GroupOrderHasNotBeenConfirmed::class,
+    ];
+
+    private $client;
+    private $environment;
+    private $logger;
+
+    public function __construct(Environment $environment, LoggerInterface $logger)
+    {
+        $this->client = new Client;
+        $this->environment = $environment;
+        $this->logger = $logger;
+    }
+
+    public function share($event)
+    {
+        foreach (static::EVENT_CLASSES as $eventClass) {
+            if ($event instanceof $eventClass) {
+                if ($this->environment->isProduction()) {
+                    $json = ['text' => (string) $event];
+
+                    try {
+                        $response = $this->client->post(static::URL, compact('json'));
+                    } catch (ClientException $e) {
+                        $this->logger->error("Could not share event [$event] on Slack.");
+                    }
+                } else {
+                    $this->logger->debug("Event [$event] would have been shared on Slack.");
+                }
+            }
+        }
+    }
+}

app/Admin/Services/GenerateAdminerFiles.php

@@ -0,0 +1,9 @@
+<?php
+namespace Groupeat\Admin\Values;
+
+use Groupeat\Support\Values\Abstracts\Value;
+
+class MaxConfirmationDurationInMinutes extends Value
+{
+    //
+}