Merge 212e6c2 into 16fba85

.env.testing

@@ -11,7 +11,7 @@ DB_DATABASE=ushahidi
 DB_USERNAME=ushahidi
 DB_PASSWORD=ushahidi
 
-CACHE_DRIVER=file
+CACHE_DRIVER=array
 QUEUE_DRIVER=sync
 MAIL_DRIVER=array
 

.env.travis

@@ -11,7 +11,7 @@ DB_DATABASE=ushahidi
 DB_USERNAME=travis
 DB_PASSWORD=
 
-CACHE_DRIVER=file
+CACHE_DRIVER=array
 QUEUE_DRIVER=sync
 
 MEDIA_MAX_UPLOAD=1048576

app/Console/Commands/TestMultisiteJob.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Ushahidi\App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class TestMultisiteJob extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'test:multisitejob';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Queue a TestMultisiteJob.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        dispatch(new \Ushahidi\App\Jobs\TestMultisiteJob());
+    }
+}

app/Console/Kernel.php

@@ -34,6 +34,7 @@ class Kernel extends ConsoleKernel
         \Ushahidi\Console\Command\SavedSearch::class,
         \Ushahidi\Console\Command\Webhook::class,
         \Ushahidi\Console\Command\ObfuscateData::class,
+        Commands\TestMultisiteJob::class,
     ];
 
     /**

app/Http/Middleware/CheckDemoExpiration.php

@@ -3,36 +3,57 @@
 namespace Ushahidi\App\Http\Middleware;
 
 use Closure;
+use Ushahidi\App\Multisite\MultisiteManager;
 
 class CheckDemoExpiration
 {
 
+    /**
+     * @var \Ushahidi\App\Multisite\MultisiteManager;
+     */
+    protected $multisite;
+
+    /**
+     * Create a new middleware instance.
+     *
+     * @param  \Illuminate\Contracts\Auth\Factory  $auth
+     * @return void
+     */
+    public function __construct(MultisiteManager $multisite)
+    {
+        $this->multisite = $multisite;
+    }
+
    /**
     * Handle an incoming request.
     *
     * @param  \Illuminate\Http\Request  $request
     * @param  \Closure  $next
-    * @param  string|null  $guard
     * @return mixed
     */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next)
     {
-        $multisite = config('multisite.enabled');
-        $isDemoTier = service('site.config')['tier'] === 'demo';
-        $isNotGet = !$request->isMethod('get');
-
-        if ($multisite && $isNotGet && $isDemoTier) {
-            $now = strtotime('now');
-            $config = service('site.config');
-            if ($config) {
-                $expiration_date = array_key_exists('expiration_date', $config) ?
-                    strtotime($config['expiration_date']) : null;
-                $extension_date = array_key_exists('extension_date', $config) ?
-                    strtotime($config['extension_date']) : null;
-
-                if ($expiration_date < $now && (!$extension_date || $extension_date < $now)) {
-                    abort(503, 'The demo period for this deployment has expired.');
-                }
+        // If multisite is disabled, skip entirely
+        if (!$this->multisite->enabled()) {
+            return $next($request);
+        }
+
+        // If request is get, skip entirely
+        if ($request->isMethod('get')) {
+            return $next($request);
+        }
+
+        $site = $this->multisite->getSite();
+        $isDemoTier = $site->tier === 'demo';
+
+        if ($isDemoTier) {
+            $now = time();
+            // Move time conversion to Site model
+            $expiration_date = strtotime($site->expiration_date);
+            $extension_date = strtotime($site->extension_date);
+
+            if ($expiration_date < $now && (!$extension_date || $extension_date < $now)) {
+                abort(503, 'The demo period for this deployment has expired.');
             }
         }
         return $next($request);

app/Http/Middleware/MaintenanceMode.php

@@ -20,8 +20,8 @@ public function handle($request, Closure $next, $guard = null)
         $maintenanceMode = env('MAINTENANCE_MODE');
         if ($maintenanceMode) {
             $maintenanceMessage = 'This site is down for maintenance';
-            if (service('site.config')) {
-                $maintenanceMessage = service('site.config')['name'] . ' is down for maintenance.';
+            if ($site = app('multisite')->getSite()) {
+                $maintenanceMessage = $site->getName() . ' is down for maintenance.';
             }
             abort(
                 503,

app/Jobs/CombineExportedPostBatchesJob.php

@@ -7,6 +7,7 @@
 use Ushahidi\Core\Entity\ExportJob;
 use Ushahidi\Core\Entity\ExportJobRepository;
 use Ushahidi\Core\Entity\ExportBatchRepository;
+use Ushahidi\App\Multisite\MultisiteAwareJob;
 use Illuminate\Http\File;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
@@ -16,6 +17,7 @@
 
 class CombineExportedPostBatchesJob extends Job
 {
+    use MultisiteAwareJob;
     use RecordsExportJobFailure;
 
     protected $jobId;

app/Jobs/ExportPostsBatchJob.php

@@ -6,10 +6,12 @@
 use Ushahidi\Factory\UsecaseFactory;
 use Ushahidi\Core\Entity\ExportJob;
 use Ushahidi\Core\Entity\ExportJobRepository;
+use Ushahidi\App\Multisite\MultisiteAwareJob;
 use Ushahidi\Core\Usecase\Post\Export;
 
 class ExportPostsBatchJob extends Job
 {
+    use MultisiteAwareJob;
     use RecordsExportJobFailure;
 
     protected $jobId;

app/Jobs/ExportPostsJob.php

@@ -5,10 +5,12 @@
 use Ushahidi\Core\Usecase\Export\Job\PostCount;
 use Ushahidi\Core\Entity\ExportJob;
 use Ushahidi\Core\Entity\ExportJobRepository;
+use Ushahidi\App\Multisite\MultisiteAwareJob;
 use Illuminate\Support\Facades\Log;
 
 class ExportPostsJob extends Job
 {
+    use MultisiteAwareJob;
     use RecordsExportJobFailure;
 
     protected $batchSize;

app/Jobs/TestMultisiteJob.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Ushahidi\App\Jobs;
+
+use Illuminate\Support\Facades\Log;
+use Ushahidi\App\Multisite\MultisiteAwareJob;
+
+class TestMultisiteJob extends Job
+{
+    use MultisiteAwareJob;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(\Ushahidi\App\Multisite\MultisiteManager $multisite)
+    {
+        // Get deployment ID
+        Log::debug('Site', [$multisite->getSite()]);
+
+        // Get config
+        Log::debug(
+            'Site config',
+            [app(\Ushahidi\Core\Entity\ConfigRepository::class)->get('site')->asArray()]
+        );
+
+        // Get an ohanzee DB connection
+        // Get an illuminate DB connection
+        Log::debug(
+            'Export batch',
+            [app(\Ushahidi\Core\Entity\ExportBatchRepository::class)->getByJobId(10)]
+        );
+    }
+}

app/Providers/AppServiceProvider.php

@@ -26,10 +26,9 @@ public function register()
         $this->registerFilesystem();
         $this->registerMailer();
 
+        $this->registerMultisite();
         $this->registerDataSources();
 
-        $this->setupMultisiteIlluminateDB();
-
         $this->registerFeatures();
     }
 
@@ -45,6 +44,11 @@ public function registerServicesFromAura()
             return service('repository.message');
         });
 
+        $this->app->singleton(\Ushahidi\Core\Entity\ConfigRepository::class, function ($app) {
+            // Just return it from AuraDI
+            return service('repository.config');
+        });
+
         $this->app->singleton(\Ushahidi\Core\Entity\ContactRepository::class, function ($app) {
             // Just return it from AuraDI
             return service('repository.contact');
@@ -121,64 +125,20 @@ public function registerFilesystem()
         });
     }
 
-    public function registerDataSources()
-    {
-        $this->app->register(\Ushahidi\App\DataSource\DataSourceServiceProvider::class);
-    }
-
-    protected function getDbConfig()
+    public function registerMultisite()
     {
-        // Kohana injection
-        // DB config
-        $config = config('ohanzee-db');
-        $config = $config['default'];
-
-        // Is this a multisite install?
-        $multisite = config('multisite.enabled');
-        if ($multisite) {
-            $config = service('multisite')->getDbConfig();
-        }
-
-        return $config;
+        $this->app->register(\Ushahidi\App\Multisite\MultisiteServiceProvider::class);
     }
 
-    protected function getClientUrl($config, $multisite)
-    {
-        $clientUrl = env('CLIENT_URL', false);
-
-        if (env("MULTISITE_DOMAIN", false)) {
-            try {
-                $clientUrl = $multisite()->getClientUrl();
-            } catch (Exception $e) {
-            }
-        }
-
-        // Or overwrite from config
-        if (!$clientUrl && $config['client_url']) {
-            $client_url = $config['client_url'];
-        }
-
-        return $clientUrl;
-    }
-
-    protected function setupMultisiteIlluminateDB()
+    public function registerDataSources()
     {
-        $config = $this->getDbConfig();
-
-        $existing = config('database.connections.mysql');
-
-        config(['database.connections.mysql' => [
-            'database'  => $config['connection']['database'],
-            'username'  => $config['connection']['username'],
-            'password'  => $config['connection']['password'],
-            'host'      => $config['connection']['hostname'],
-        ] + $existing]);
+        $this->app->register(\Ushahidi\App\DataSource\DataSourceServiceProvider::class);
     }
 
     public function registerFeatures()
     {
         $this->app->singleton('features', function ($app) {
-            return new \Ushahidi\App\Tools\Features(service('repository.config'));
+            return new \Ushahidi\App\Tools\Features($app[\Ushahidi\Core\Entity\ConfigRepository::class]);
         });
     }
 }