kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix rule group API

Browse Source
This commit is contained in:
James Cole
2021-03-06 18:00:49 +01:00
parent cfa9e8b318
commit 4ba713e553
12 changed files with 818 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Api/V1/Requests/todo/RuleGroupStoreRequest.php → app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php
View File

@@ -21,7 +21,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\Models\RuleGroup;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Rules\IsBoolean;
@@ -32,9 +32,9 @@ use Illuminate\Foundation\Http\FormRequest;
/**
* @codeCoverageIgnore
* Class RuleGroupStoreRequest
* Class StoreRequest
*/
class RuleGroupStoreRequest extends FormRequest
class StoreRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;

12
app/Api/V1/Requests/todo/RuleGroupTestRequest.php → app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
View File

@@ -22,7 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\Models\RuleGroup;
use Carbon\Carbon;
@@ -32,9 +32,9 @@ use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Collection;
/**
* Class RuleGroupTestRequest
* Class TestRequest
*/
class RuleGroupTestRequest extends FormRequest
class TestRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
@@ -63,11 +63,11 @@ class RuleGroupTestRequest extends FormRequest
}
/**
* @return Collection
* @return array
*/
private function getAccounts(): string
private function getAccounts(): array
{
return (string) $this->query('accounts');
return $this->get('accounts');
}
/**

12
app/Api/V1/Requests/todo/RuleGroupTriggerRequest.php → app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
View File

@@ -22,7 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\Models\RuleGroup;
use Carbon\Carbon;
@@ -31,9 +31,9 @@ use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
/**
* Class RuleGroupTriggerRequest
* Class TriggerRequest
*/
class RuleGroupTriggerRequest extends FormRequest
class TriggerRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;
@@ -62,11 +62,11 @@ class RuleGroupTriggerRequest extends FormRequest
}
/**
* @return string
* @return array
*/
private function getAccounts(): string
private function getAccounts(): array
{
return (string) $this->query('accounts');
return $this->get('accounts');
}
/**

6
app/Api/V1/Requests/todo/RuleGroupUpdateRequest.php → app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php
View File

@@ -21,7 +21,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\Models\RuleGroup;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
@@ -31,9 +31,9 @@ use Illuminate\Foundation\Http\FormRequest;
/**
* @codeCoverageIgnore
* Class RuleGroupUpdateRequest
* Class UpdateRequest
*/
class RuleGroupUpdateRequest extends FormRequest
class UpdateRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;