Code cleanup

app/JsonApi/V2/AccountBalances/AccountBalanceResource.php

@@ -9,14 +9,6 @@ use LaravelJsonApi\Core\Resources\JsonApiResource;
 
 class AccountBalanceResource extends JsonApiResource
 {
-    /**
-     * Get the resource id.
-     */
-    public function id(): string
-    {
-        return $this->resource->id;
-    }
-
     /**
      * Get the resource's attributes.
      *
@@ -30,6 +22,14 @@ class AccountBalanceResource extends JsonApiResource
         ];
     }
 
+    /**
+     * Get the resource id.
+     */
+    public function id(): string
+    {
+        return $this->resource->id;
+    }
+
     /**
      * Get the resource's relationships.
      *

app/JsonApi/V2/Accounts/AccountCollectionQuery.php

@@ -24,50 +24,50 @@ class AccountCollectionQuery extends ResourceQuery
         $validFilters = config('api.valid_api_filters')[Account::class];
 
         return [
-            'fields'        => [
+            'fields'      => [
                 'nullable',
                 'array',
                 JsonApiRule::fieldSets(),
             ],
-            'userGroupId'   => [
+            'userGroupId' => [
                 'nullable',
                 'integer',
                 new IsAllowedGroupAction(Account::class, request()->method()),
             ],
-            'startPeriod'   => [
+            'startPeriod' => [
                 'nullable',
                 'date',
                 new IsDateOrTime(),
                 new IsValidDateRange(),
             ],
-            'endPeriod'     => [
+            'endPeriod'   => [
                 'nullable',
                 'date',
                 new IsDateOrTime(),
                 new IsValidDateRange(),
             ],
-            'filter'        => [
+            'filter'      => [
                 'nullable',
                 'array',
                 JsonApiRule::filter($validFilters),
                 new IsValidAccountType(),
             ],
-            'include'       => [
+            'include'     => [
                 'nullable',
                 'string',
                 JsonApiRule::includePaths(),
             ],
-            'page'          => [
+            'page'        => [
                 'nullable',
                 'array',
                 JsonApiRule::page(),
             ],
-            'sort'          => [
+            'sort'        => [
                 'nullable',
                 'string',
                 JsonApiRule::sort(),
             ],
-            'withCount'     => [
+            'withCount'   => [
                 'nullable',
                 'string',
                 JsonApiRule::countable(),

app/JsonApi/V2/Accounts/AccountRequest.php

@@ -4,11 +4,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\JsonApi\V2\Accounts;
 
-use FireflyIII\Rules\Account\IsUniqueAccount;
-use FireflyIII\Rules\IsBoolean;
-use FireflyIII\Rules\IsValidPositiveAmount;
-use FireflyIII\Rules\UniqueAccountNumber;
-use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Support\Facades\Log;
 use LaravelJsonApi\Laravel\Http\Requests\ResourceRequest;
@@ -30,8 +25,8 @@ class AccountRequest extends ResourceRequest
         // var_dump($types);exit;
 
         return [
-            'name'                         => ['required', 'max:1024', 'min:1'], // , new IsUniqueAccount()
-            'account_type'                 => ['required', 'max:1024', 'min:1', sprintf('in:%s', $types)],
+            'name'         => ['required', 'max:1024', 'min:1'], // , new IsUniqueAccount()
+            'account_type' => ['required', 'max:1024', 'min:1', sprintf('in:%s', $types)],
             //            'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
             //            'bic'                  => 'bic|nullable',
             //            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],

app/JsonApi/V2/Accounts/AccountResource.php

@@ -13,14 +13,6 @@ use LaravelJsonApi\Core\Resources\JsonApiResource;
  */
 class AccountResource extends JsonApiResource
 {
-    /**
-     * Get the resource id.
-     */
-    public function id(): string
-    {
-        return (string) $this->resource->id;
-    }
-
     /**
      * Get the resource's attributes.
      *
@@ -69,6 +61,14 @@ class AccountResource extends JsonApiResource
         ];
     }
 
+    /**
+     * Get the resource id.
+     */
+    public function id(): string
+    {
+        return (string) $this->resource->id;
+    }
+
     /**
      * Get the resource's relationships.
      *

app/JsonApi/V2/Accounts/AccountResourceOld.php

@@ -27,9 +27,9 @@ class AccountResourceOld extends JsonApiResource
     {
         // fields removed here have been migrated.
         return [
-            'created_at'    => $this->resource->created_at,
-            'updated_at'    => $this->resource->updated_at,
-            'name'          => $this->resource->name,
+            'created_at' => $this->resource->created_at,
+            'updated_at' => $this->resource->updated_at,
+            'name'       => $this->resource->name,
 
             //            'virtual_balance' => $this->resource->virtual_balance,
             //            'native_balance'  => $this->resource->native_balance,

app/JsonApi/V2/Accounts/AccountSchema.php

@@ -91,6 +91,13 @@ class AccountSchema extends Schema
         return $array;
     }
 
+    public function pagination(): EnumerablePagination
+    {
+        Log::debug(__METHOD__);
+
+        return EnumerablePagination::make();
+    }
+
     public function repository(): AccountRepository
     {
         Log::debug(__METHOD__);
@@ -102,11 +109,4 @@ class AccountSchema extends Schema
             ->withUserGroup($this->userGroup)
         ;
     }
-
-    public function pagination(): EnumerablePagination
-    {
-        Log::debug(__METHOD__);
-
-        return EnumerablePagination::make();
-    }
 }

app/JsonApi/V2/Accounts/AccountSchemaOld.php

@@ -6,11 +6,8 @@ namespace FireflyIII\JsonApi\V2\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;

app/JsonApi/V2/Accounts/Capabilities/AccountQuery.php

@@ -126,17 +126,17 @@ class AccountQuery extends QueryAll implements HasPagination
         return new LengthAwarePaginator($currentPage, $totalCount, $pagination['size'], $pagination['number']);
     }
 
-    #[\Override]
-    public function paginate(array $page): Page
-    {
-        exit('here weare');
-        // TODO: Implement paginate() method.
-    }
-
     #[\Override]
     public function getOrPaginate(?array $page): iterable
     {
         exit('here weare');
         // TODO: Implement getOrPaginate() method.
     }
+
+    #[\Override]
+    public function paginate(array $page): Page
+    {
+        exit('here weare');
+        // TODO: Implement paginate() method.
+    }
 }

app/JsonApi/V2/Accounts/Capabilities/CrudAccount.php

@@ -34,6 +34,13 @@ class CrudAccount extends CrudResource
 {
     use CollectsCustomParameters;
 
+    public function create(array $validatedData): Account
+    {
+        var_dump($validatedData);
+
+        exit;
+    }
+
     /**
      * Read the supplied site.
      */
@@ -51,11 +58,4 @@ class CrudAccount extends CrudResource
 
         return $enrichment->enrichSingle($account);
     }
-
-    public function create(array $validatedData): Account
-    {
-        var_dump($validatedData);
-
-        exit;
-    }
 }