[Feature] Allow dot notation for soft delete field name (cloudcreativity#361)

JeanLucEsser · lindyhopchris · commit 0a74dad49907 · 2019-06-05T17:23:32.000+01:00
If the soft delete field is a nested attribute (e.g. `status.deleted-at`), use Laravel array helpers to use the attribute.
diff --git a/src/Eloquent/Concerns/SoftDeletesModels.php b/src/Eloquent/Concerns/SoftDeletesModels.php
@@ -21,6 +21,7 @@
 use CloudCreativity\LaravelJsonApi\Utils\Str;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Builder;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Neomerx\JsonApi\Contracts\Encoder\Parameters\EncodingParametersInterface;
 
@@ -61,13 +62,14 @@ protected function findQuery($resourceId)
     protected function fillAttributes($record, Collection $attributes)
     {
         $field = $this->getSoftDeleteField($record);
+        $attributesArr = $attributes->toArray();
 
-        if ($attributes->has($field)) {
-            $this->fillSoftDelete($record, $field, $attributes->get($field));
+        if (Arr::has($attributesArr, $field)) {
+            $this->fillSoftDelete($record, $field, Arr::get($attributesArr, $field));
         }
 
         $record->fill(
-            $this->deserializeAttributes($attributes->forget($field), $record)
+            $this->deserializeAttributes(Arr::except($attributesArr, $field), $record)
         );
     }
 
