Merge branch 'feature/async' into async-with-cn

lindyhopchris · lindyhopchris · commit 3201bc9cf079 · 2018-11-20T14:36:01.000Z
diff --git a/src/LaravelJsonApi.php b/src/LaravelJsonApi.php
@@ -10,7 +10,7 @@ class LaravelJsonApi
      *
      * @var bool
      */
-    public static $runMigrations = true;
+    public static $runMigrations = false;
 
     /**
      * Indicates if listeners will be bound to the Laravel queue events.
@@ -22,9 +22,9 @@ class LaravelJsonApi
     /**
      * @return LaravelJsonApi
      */
-    public static function ignoreMigrations(): self
+    public static function runMigrations(): self
     {
-        static::$runMigrations = false;
+        static::$runMigrations = true;
 
         return new self();
     }
diff --git a/src/Queue/ClientJobSchema.php b/src/Queue/ClientJobSchema.php
@@ -15,56 +15,25 @@
  * limitations under the License.
  */
 
-namespace CloudCreativity\LaravelJsonApi\Resources\QueueJobs;
+namespace CloudCreativity\LaravelJsonApi\Queue;
 
-use CloudCreativity\LaravelJsonApi\Queue\ClientJob;
-use DateTime;
 use Neomerx\JsonApi\Schema\SchemaProvider;
 
-class Schema extends SchemaProvider
+abstract class ClientJobSchema extends SchemaProvider
 {
 
     /**
      * @var string
      */
     protected $resourceType = 'queue-jobs';
 
-    /**
-     * @var string
-     */
-    protected $dateFormat = DateTime::ATOM;
-
     /**
      * @param ClientJob $resource
      * @return string
      */
     public function getId($resource)
     {
-        return $resource->getRouteKey();
-    }
-
-    /**
-     * @param ClientJob $resource
-     * @return array
-     */
-    public function getAttributes($resource)
-    {
-        /** @var DateTime|null $completedAt */
-        $completedAt = $resource->completed_at;
-        /** @var DateTime|null $timeoutAt */
-        $timeoutAt = $resource->timeout_at;
-
-        return [
-            'attempts' => $resource->attempts,
-            'created-at' => $resource->created_at->format($this->dateFormat),
-            'completed-at' => $completedAt ? $completedAt->format($this->dateFormat) : null,
-            'failed' => $resource->failed,
-            'resource-type' => $resource->resource_type,
-            'timeout' => $resource->timeout,
-            'timeout-at' => $timeoutAt ? $timeoutAt->format($this->dateFormat) : null,
-            'tries' => $resource->tries,
-            'updated-at' => $resource->updated_at->format($this->dateFormat),
-        ];
+        return (string) $resource->getRouteKey();
     }
 
     /**
diff --git a/src/Resources/ResourceProvider.php b/src/Resources/ResourceProvider.php
diff --git a/tests/dummy/app/JsonApi/QueueJobs/Adapter.php b/tests/dummy/app/JsonApi/QueueJobs/Adapter.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace CloudCreativity\LaravelJsonApi\Resources\QueueJobs;
+namespace DummyApp\JsonApi\QueueJobs;
 
 use CloudCreativity\LaravelJsonApi\Eloquent\AbstractAdapter;
 use CloudCreativity\LaravelJsonApi\Queue\ClientJob;
diff --git a/tests/dummy/app/JsonApi/QueueJobs/Schema.php b/tests/dummy/app/JsonApi/QueueJobs/Schema.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright 2018 Cloud Creativity Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace DummyApp\JsonApi\QueueJobs;
+
+use Carbon\Carbon;
+use CloudCreativity\LaravelJsonApi\Queue\ClientJob;
+use CloudCreativity\LaravelJsonApi\Queue\ClientJobSchema;
+
+class Schema extends ClientJobSchema
+{
+
+    /**
+     * @param ClientJob $resource
+     * @return array
+     */
+    public function getAttributes($resource)
+    {
+        /** @var Carbon|null $completedAt */
+        $completedAt = $resource->completed_at;
+        /** @var Carbon|null $timeoutAt */
+        $timeoutAt = $resource->timeout_at;
+
+        return [
+            'attempts' => $resource->attempts,
+            'completed-at' => $completedAt ? $completedAt->toAtomString() : null,
+            'created-at' => $resource->created_at->toAtomString(),
+            'failed' => $resource->failed,
+            'resource-type' => $resource->resource_type,
+            'timeout' => $resource->timeout,
+            'timeout-at' => $timeoutAt ? $timeoutAt->toAtomString() : null,
+            'tries' => $resource->tries,
+            'updated-at' => $resource->updated_at->toAtomString(),
+        ];
+    }
+
+}
diff --git a/tests/dummy/app/JsonApi/QueueJobs/Validators.php b/tests/dummy/app/JsonApi/QueueJobs/Validators.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace CloudCreativity\LaravelJsonApi\Resources\QueueJobs;
+namespace DummyApp\JsonApi\QueueJobs;
 
 use CloudCreativity\LaravelJsonApi\Exceptions\RuntimeException;
 use CloudCreativity\LaravelJsonApi\Validation\AbstractValidators;
diff --git a/tests/dummy/app/Providers/AppServiceProvider.php b/tests/dummy/app/Providers/AppServiceProvider.php
@@ -18,6 +18,7 @@
 namespace DummyApp\Providers;
 
 use CloudCreativity\LaravelJsonApi\Facades\JsonApi;
+use CloudCreativity\LaravelJsonApi\LaravelJsonApi;
 use DummyApp\Entities\SiteRepository;
 use DummyApp\Policies\PostPolicy;
 use DummyApp\Policies\UserPolicy;
@@ -60,6 +61,7 @@ public function boot()
      */
     public function register()
     {
+        LaravelJsonApi::runMigrations();
         $this->app->singleton(SiteRepository::class);
     }
 
diff --git a/tests/dummy/config/json-api-v1.php b/tests/dummy/config/json-api-v1.php
@@ -59,6 +59,7 @@
         'downloads' => \DummyApp\Download::class,
         'phones' => \DummyApp\Phone::class,
         'posts' => \DummyApp\Post::class,
+        'queue-jobs' => \CloudCreativity\LaravelJsonApi\Queue\ClientJob::class,
         'sites' => \DummyApp\Entities\Site::class,
         'tags' => \DummyApp\Tag::class,
         'users' => \DummyApp\User::class,
@@ -152,7 +153,6 @@
     |
     */
     'providers' => [
-        \CloudCreativity\LaravelJsonApi\Resources\ResourceProvider::class,
         \DummyPackage\ResourceProvider::class,
     ],
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class LaravelJsonApi`
`10`	`10`	`*`
`11`	`11`	`* @var bool`
`12`	`12`	`*/`
`13`		`- public static $runMigrations = true;`
	`13`	`+ public static $runMigrations = false;`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* Indicates if listeners will be bound to the Laravel queue events.`
`@@ -22,9 +22,9 @@ class LaravelJsonApi`
`22`	`22`	`/**`
`23`	`23`	`* @return LaravelJsonApi`
`24`	`24`	`*/`
`25`		`- public static function ignoreMigrations(): self`
	`25`	`+ public static function runMigrations(): self`
`26`	`26`	`{`
`27`		`- static::$runMigrations = false;`
	`27`	`+ static::$runMigrations = true;`
`28`	`28`
`29`	`29`	`return new self();`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`namespace DummyApp\Providers;`
`19`	`19`
`20`	`20`	`use CloudCreativity\LaravelJsonApi\Facades\JsonApi;`
	`21`	`+use CloudCreativity\LaravelJsonApi\LaravelJsonApi;`
`21`	`22`	`use DummyApp\Entities\SiteRepository;`
`22`	`23`	`use DummyApp\Policies\PostPolicy;`
`23`	`24`	`use DummyApp\Policies\UserPolicy;`
`@@ -60,6 +61,7 @@ public function boot()`
`60`	`61`	`*/`
`61`	`62`	`public function register()`
`62`	`63`	`{`
	`64`	`+ LaravelJsonApi::runMigrations();`
`63`	`65`	`$this->app->singleton(SiteRepository::class);`
`64`	`66`	`}`
`65`	`67`