Merge pull request #11052 from ctrl-f5/fix/incorrect-validator-function

correct validator function to check for errors + `Account\ShowControllerTest`

app/Api/V1/Requests/DateRangeRequest.php

@@ -39,7 +39,11 @@ class DateRangeRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
-                if (!$validator->valid()) {
+                if ($validator->failed()) {
+                    // set null values
+                    $this->attributes->set('start', null);
+                    $this->attributes->set('end', null);
+
                     return;
                 }
                 $start = $this->getCarbonDate('start')?->startOfDay();

app/Api/V1/Requests/DateRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use Carbon\Carbon;
 use Illuminate\Validation\Validator;
 
 class DateRequest extends ApiRequest
@@ -38,8 +39,7 @@ class DateRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
-                $this->attributes->set('date', null);
-                if (!$validator->valid()) {
+                if ($validator->failed()) {
                     return;
                 }
                 $date  = $this->getCarbonDate('date')?->endOfDay();
@@ -47,7 +47,7 @@ class DateRequest extends ApiRequest
                 // if we also have a range, date must be in that range
                 $start = $this->attributes->get('start');
                 $end   = $this->attributes->get('end');
-                if ($date && $start && $end && !$date->between($start, $end)) {
+                if ($date instanceof Carbon && $start instanceof Carbon && $end instanceof Carbon && !$date->between($start, $end)) {
                     $validator->errors()->add('date', (string)trans('validation.between_date'));
                 }
 

app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php

@@ -42,7 +42,7 @@ class AccountTypeApiRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
-                if (!$validator->valid()) {
+                if ($validator->failed()) {
                     return;
                 }
 

app/Api/V1/Requests/PaginationRequest.php

@@ -57,7 +57,7 @@ class PaginationRequest extends ApiRequest
     {
         $validator->after(
             function (Validator $validator): void {
-                if (!$validator->valid()) {
+                if ($validator->failed()) {
                     return;
                 }
 

config/firefly.php

@@ -79,7 +79,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2025-10-11',
-    'build_time'                   => 1760159380,
+    'build_time'                   => 1760188898,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.
 

database/factories/AccountFactory.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Models\AccountType;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class AccountFactory extends Factory
+{
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->name(),
+            'active' => true,
+        ];
+    }
+
+    public function withType(AccountTypeEnum $type): static
+    {
+        return $this->for(AccountType::where('type', $type->value)->first());
+    }
+}

tests/integration/Api/Models/Account/ShowControllerTest.php

@@ -0,0 +1,90 @@
+<?php
+
+
+/*
+ * AccountControllerTest.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\integration\Api\Models\Account;
+
+use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Models\Account;
+use FireflyIII\User;
+use Override;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\integration\TestCase;
+
+/**
+ * @internal
+ *
+ * @covers \FireflyIII\Api\V1\Controllers\Models\Account\ShowController
+ */
+final class ShowControllerTest extends TestCase
+{
+    use RefreshDatabase;
+    private User $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->user = $this->createAuthenticatedUser();
+        $this->actingAs($this->user);
+
+        Account::factory()->for($this->user)->withType(AccountTypeEnum::ASSET)->create();
+        Account::factory()->for($this->user)->withType(AccountTypeEnum::REVENUE)->create();
+        Account::factory()->for($this->user)->withType(AccountTypeEnum::EXPENSE)->create();
+        Account::factory()->for($this->user)->withType(AccountTypeEnum::DEBT)->create();
+        Account::factory()->for($this->user)->withType(AccountTypeEnum::ASSET)->create();
+    }
+
+    public function testIndex(): void
+    {
+        $this->actingAs($this->user);
+        $response = $this->getJson(route('api.v1.accounts.index'));
+        $response->assertStatus(200);
+        $response->assertJson([
+            'meta' => ['pagination' => ['total' => 5]],
+        ]);
+    }
+
+    public function testIndexFailsOnUnknownAccountType(): void
+    {
+        $this->actingAs($this->user);
+        $response = $this->getJson(route('api.v1.accounts.index').'?type=foobar');
+        $response->assertStatus(422);
+        $response->assertJson(['errors' => ['type' => ['The selected type is invalid.']]]);
+    }
+
+    public function testIndexCanFilterOnAccountType(): void
+    {
+        $this->actingAs($this->user);
+        $response = $this->getJson(route('api.v1.accounts.index').'?type=asset');
+        $response->assertStatus(200);
+        $response->assertJson([
+            'data' => [
+                ['attributes' => ['type' => 'asset']],
+                ['attributes' => ['type' => 'asset']],
+            ],
+            'meta' => ['pagination' => ['total' => 2]],
+        ]);
+    }
+}