diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php index 19532d66b1..fc89c129b7 100644 --- a/app/Api/V1/Controllers/Chart/BudgetController.php +++ b/app/Api/V1/Controllers/Chart/BudgetController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Api\V1\Requests\Generic\DateRequest; +use FireflyIII\Api\V1\Requests\Data\DateRequest; use FireflyIII\Enums\UserRoleEnum; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Budget; diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php index 9adc16e927..94968d09cc 100644 --- a/app/Api/V1/Controllers/Chart/CategoryController.php +++ b/app/Api/V1/Controllers/Chart/CategoryController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Api\V1\Request\Generic\DateRequest; +use FireflyIII\Api\V1\Requests\Data\DateRequest; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Enums\UserRoleEnum; diff --git a/app/Api/V1/Requests/Generic/DateRequest.php b/app/Api/V1/Requests/Generic/DateRequest.php deleted file mode 100644 index 599cdef49a..0000000000 --- a/app/Api/V1/Requests/Generic/DateRequest.php +++ /dev/null @@ -1,62 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Api\V1\Requests\Generic; - -use FireflyIII\Support\Request\ChecksLogin; -use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; - -/** - * Request class for end points that require date parameters. - * - * Class DateRequest - */ -class DateRequest extends FormRequest -{ - use ChecksLogin; - use ConvertsDataTypes; - - /** - * Get all data from the request. - */ - public function getAll(): array - { - return [ - 'start' => $this->getCarbonDate('start')->startOfDay(), - 'end' => $this->getCarbonDate('end')->endOfDay(), - ]; - } - - /** - * The rules that the incoming request must be matched against. - */ - public function rules(): array - { - return [ - 'start' => 'required|date|after:1970-01-02|before:2038-01-17', - 'end' => 'required|date|after_or_equal:start|before:2038-01-17|after:1970-01-02', - ]; - } -}