Refactor resources

app/JsonApi/V3/Accounts/AccountResource.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace FireflyIII\JsonApi\V3\Accounts;
+
+use FireflyIII\Models\Account;
+use Illuminate\Http\Request;
+use LaravelJsonApi\Core\Resources\JsonApiResource;
+
+/**
+ * @property Account $resource
+ */
+class AccountResource extends JsonApiResource
+{
+
+    /**
+     * Get the resource's attributes.
+     *
+     * @param Request|null $request
+     *
+     * @return iterable
+     */
+    public function attributes($request): iterable
+    {
+        return [
+            'created_at' => $this->resource->created_at,
+            'updated_at' => $this->resource->updated_at,
+            'name'       => $this->resource->name,
+            'account_type' => $this->resource->accountType->type,
+            'virtual_balance' => $this->resource->virtual_balance,
+            'iban' => $this->resource->iban,
+            'active' => $this->resource->active,
+            'order' => $this->resource->order,
+        ];
+    }
+
+    /**
+     * Get the resource's relationships.
+     *
+     * @param Request|null $request
+     *
+     * @return iterable
+     */
+    public function relationships($request): iterable
+    {
+        return [
+            'user' => $this->relation('user')
+        ];
+    }
+
+}

app/JsonApi/V3/Accounts/AccountSchema.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace FireflyIII\JsonApi\V3\Accounts;
+
+use FireflyIII\Models\Account;
+use LaravelJsonApi\Eloquent\Contracts\Paginator;
+use LaravelJsonApi\Eloquent\Fields\Boolean;
+use LaravelJsonApi\Eloquent\Fields\DateTime;
+use LaravelJsonApi\Eloquent\Fields\ID;
+use LaravelJsonApi\Eloquent\Fields\Number;
+use LaravelJsonApi\Eloquent\Fields\Relations\HasMany;
+use LaravelJsonApi\Eloquent\Fields\Relations\HasOne;
+use LaravelJsonApi\Eloquent\Fields\Str;
+use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
+use LaravelJsonApi\Eloquent\Pagination\PagePagination;
+use LaravelJsonApi\Eloquent\Schema;
+
+class AccountSchema extends Schema
+{
+
+    /**
+     * The model the schema corresponds to.
+     *
+     * @var string
+     */
+    public static string $model = Account::class;
+
+    /**
+     * Get the resource fields.
+     *
+     * @return array
+     */
+    public function fields(): array
+    {
+        return [
+            ID::make(),
+            DateTime::make('created_at')->sortable()->readOnly(),
+            DateTime::make('updated_at')->sortable()->readOnly(),
+            Str::make('name')->sortable(),
+            Str::make('account_type'),
+            Str::make('virtual_balance'),
+            Str::make('iban'),
+            Boolean::make('active'),
+            Number::make('order'),
+            HasOne::make('user'),
+        ];
+    }
+
+    /**
+     * Get the resource filters.
+     *
+     * @return array
+     */
+    public function filters(): array
+    {
+        return [
+            WhereIdIn::make($this),
+        ];
+    }
+
+    /**
+     * Get the resource paginator.
+     *
+     * @return Paginator|null
+     */
+    public function pagination(): ?Paginator
+    {
+        return PagePagination::make();
+    }
+
+}

app/JsonApi/V3/Users/UserResource.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace FireflyIII\JsonApi\V3\Users;
+
+use FireflyIII\Models\User;
+use Illuminate\Http\Request;
+use LaravelJsonApi\Core\Resources\JsonApiResource;
+
+/**
+ * @property User $resource
+ */
+class UserResource extends JsonApiResource
+{
+
+    /**
+     * Get the resource's attributes.
+     *
+     * @param Request|null $request
+     * @return iterable
+     */
+    public function attributes($request): iterable
+    {
+        return [
+            'created_at' => $this->resource->created_at,
+            'updated_at' => $this->resource->updated_at,
+        ];
+    }
+
+    /**
+     * Get the resource's relationships.
+     *
+     * @param Request|null $request
+     * @return iterable
+     */
+    public function relationships($request): iterable
+    {
+        return [
+            // @TODO
+        ];
+    }
+
+}

app/JsonApi/V3/Users/UserSchema.php

@@ -32,7 +32,7 @@ class UserSchema extends Schema
             ID::make(),
             DateTime::make('created_at')->sortable()->readOnly(),
             DateTime::make('created_at')->sortable()->readOnly(),
-            HasMany::make('accounts'),
+            //HasMany::make('accounts'),
         ];
     }
 

app/Policies/AccountPolicy.php

@@ -39,6 +39,7 @@ class AccountPolicy
      */
     public function view(User $user, Account $account): bool
     {
+        return true;
         return auth()->check() && $user->id === $account->user_id;
     }
 
@@ -49,6 +50,7 @@ class AccountPolicy
      */
     public function viewAny(): bool
     {
+        return true;
         return auth()->check();
     }
 }

app/Policies/UserPolicy.php

@@ -23,7 +23,33 @@ declare(strict_types=1);
 
 namespace FireflyIII\Policies;
 
+use FireflyIII\Models\Account;
+use FireflyIII\User;
+
 class UserPolicy
 {
+    /**
+     * TODO needs better authentication.
+     *
+     * @param User    $user
+     * @param Account $account
+     *
+     * @return bool
+     */
+    public function view(User $user, Account $account): bool
+    {
+        return true;
+        return auth()->check() && $user->id === $account->user_id;
+    }
 
+    /**
+     * Everybody can do this, but selection should limit to user.
+     *
+     * @return true
+     */
+    public function viewAny(): bool
+    {
+        return true;
+        return auth()->check();
+    }
 }