Merge 3300a24 into f58a6d9

ushahidi · Oct 25, 2018 · 6a4717f · 6a4717f
2 parents f58a6d9 + 3300a24
commit 6a4717f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/app/Http/Controllers/API/Posts/GeoJSONController.php b/app/Http/Controllers/API/Posts/GeoJSONController.php
@@ -73,11 +73,21 @@ public function index(Request $request)
      */
     public function show(Request $request)
     {
+        $isDemoTier = service('site.config')['tier'] === 'demo_1';
+        $identifiers = $this->getIdentifiers($request);
+        if ($isDemoTier) {
+            // Demo deployments are limited to the first 25 posts,
+            // if any thing other more than that or a different offset is request
+            // none will be returned
+            $identifiers['limit'] = $identifiers['offset'] > 0 ? 0 : 25;
+            $identifiers['offset'] = 0;
+        }
+
         $this->prepBoundingBox($request);
 
         $this->usecase = $this->usecaseFactory
             ->get($this->getResource(), 'read')
-            ->setIdentifiers($this->getIdentifiers($request))
+            ->setIdentifiers($identifiers)
             ->setFormatter(service('formatter.entity.post.geojson'));
 
         return $this->prepResponse($this->executeUsecase($request), $request);

diff --git a/app/Http/Controllers/API/Posts/PostsController.php b/app/Http/Controllers/API/Posts/PostsController.php
@@ -101,9 +101,20 @@ public function index(Request $request)
      */
     public function show(Request $request)
     {
+
+        $isDemoTier = service('site.config')['tier'] === 'demo_1';
+        $identifiers = $this->getIdentifiers($request);
+        if ($isDemoTier) {
+            // Demo deployments are limited to the first 25 posts,
+            // if any thing other more than that or a different offset is request
+            // none will be returned
+            $identifiers['limit'] = $identifiers['offset'] > 0 ? 0 : 25;
+            $identifiers['offset'] = 0;
+        }
+
         $this->usecase = $this->usecaseFactory
             ->get($this->getResource(), 'read')
-            ->setIdentifiers($this->getIdentifiers($request));
+            ->setIdentifiers($identifiers);
 
         return $this->prepResponse($this->executeUsecase($request), $request);
     }

diff --git a/app/Http/Middleware/CheckDemoExpiration.php b/app/Http/Middleware/CheckDemoExpiration.php
@@ -18,7 +18,7 @@ class CheckDemoExpiration
     public function handle($request, Closure $next, $guard = null)
     {
         $multisite = config('multisite.enabled');
-        $isDemoTier = service('site.config')['tier'] === 'demo';
+        $isDemoTier = service('site.config')['tier'] === 'demo_1';
         $isNotGet = !$request->isMethod('get');
 
         if ($multisite && $isNotGet && $isDemoTier) {

diff --git a/docs/api/config.apib b/docs/api/config.apib
@@ -60,7 +60,7 @@
                 "date_format": "n/j/Y",
                 "client_url": false,
                 "first_login": true,
-                "tier": "free",
+                "tier": "demo_1",
                 "private": false,
                 "allowed_privileges": [
                     "read",
@@ -188,7 +188,7 @@
             "date_format": "n/j/Y",
             "client_url": false,
             "first_login": true,
-            "tier": "free",
+            "tier": "demo_1",
             "private": false,
             "allowed_privileges": [
                 "read",

diff --git a/src/App/Repository/Config/site.php b/src/App/Repository/Config/site.php
@@ -33,6 +33,6 @@
     'date_format'   => 'n/j/Y',
     'client_url'    => false,
     'first_login'   => true,
-    'tier'          => 'free',
+    'tier'          => 'demo_1',
     'private'       => false,
   ];