API updates

GrafiteInc · Aug 24, 2018 · 6b4a68d · 6b4a68d
1 parent cb04fb7
commit 6b4a68d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
@@ -45,9 +45,16 @@ public function all()
     {
         $query = $this->model;
 
+        if (Schema::hasColumn(str_plural($this->modelName), 'is_published')) {
+            $query = $query->where('is_published', true);
+        }
+
         if (Schema::hasColumn(str_plural($this->modelName), 'published_at')) {
-            $query = $query->where('is_published', 1)
-                ->where('published_at', '<=', Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'));
+            $query = $query->where('published_at', '<=', Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'));
+        }
+
+        if (Schema::hasColumn(str_plural($this->modelName), 'finished_at')) {
+            $query = $query->where('finished_at', '>=', Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'));
         }
 
         return $query