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

Clean up tests, test only the important things.

Browse Source
This commit is contained in:
James Cole
2019-04-12 04:53:18 +02:00
parent 6f063a134f
commit 5ac39dbdef
65 changed files with 464 additions and 4016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/AccountStoreRequest.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Rules\IsBoolean;
/**
* Class AccountStoreRequest
* @codeCoverageIgnore
*/
class AccountStoreRequest extends Request
{
@@ -48,7 +49,6 @@ class AccountStoreRequest extends Request
* Get all data from the request.
*
* @return array
* @throws Exception
*/
public function getAll(): array
{

2
app/Api/V1/Requests/AccountUpdateRequest.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Rules\IsBoolean;
/**
* Class AccountUpdateRequest
* @codeCoverageIgnore
*/
class AccountUpdateRequest extends Request
{
@@ -48,7 +49,6 @@ class AccountUpdateRequest extends Request
* Get all data from the request.
*
* @return array
* @throws Exception
*/
public function getAll(): array
{

2
app/Api/V1/Requests/AttachmentRequest.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Rules\IsValidAttachmentModel;
/**
* Class AttachmentRequest
* @codeCoverageIgnore
*/
class AttachmentRequest extends Request
{
@@ -73,7 +74,6 @@ class AttachmentRequest extends Request
str_replace('FireflyIII\\Models\\', '', Bill::class),
str_replace('FireflyIII\\Models\\', '', ImportJob::class),
str_replace('FireflyIII\\Models\\', '', TransactionJournal::class),
str_replace('FireflyIII\\Models\\', '', Transaction::class),
]
);
$model = $this->string('model');

4
app/Api/V1/Requests/AvailableBudgetRequest.php
View File

@@ -23,8 +23,12 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use Exception;
/**
* Class AvailableBudgetRequest
*
* @codeCoverageIgnore
*/
class AvailableBudgetRequest extends Request
{

4
app/Api/V1/Requests/BillRequest.php
View File

@@ -29,6 +29,8 @@ use Illuminate\Validation\Validator;
/**
* Class BillRequest
*
* @codeCoverageIgnore
*/
class BillRequest extends Request
{
@@ -108,7 +110,7 @@ class BillRequest extends Request
/**
* Configure the validator instance.
*
* @param Validator $validator
* @param Validator $validator
*
* @return void
*/

3
app/Api/V1/Requests/BudgetLimitRequest.php
View File

@@ -23,9 +23,10 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
/**
* Class BudgetLimitRequest
*
* @codeCoverageIgnore
*/
class BudgetLimitRequest extends Request
{

1
app/Api/V1/Requests/BudgetRequest.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
/**
* Class BudgetRequest
* @codeCoverageIgnore
*/
class BudgetRequest extends Request
{

1
app/Api/V1/Requests/CategoryRequest.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Models\Category;
/**
* Class CategoryRequest
* @codeCoverageIgnore
*/
class CategoryRequest extends Request
{

1
app/Api/V1/Requests/ConfigurationRequest.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
/**
* Class ConfigurationRequest
* @codeCoverageIgnore
*/
class ConfigurationRequest extends Request
{

1
app/Api/V1/Requests/CurrencyRequest.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
/**
* Class CurrencyRequest
* @codeCoverageIgnore
*/
class CurrencyRequest extends Request
{

1
app/Api/V1/Requests/LinkTypeRequest.php
View File

@@ -29,6 +29,7 @@ use Illuminate\Validation\Rule;
/**
*
* Class LinkTypeRequest
* @codeCoverageIgnore
*/
class LinkTypeRequest extends Request
{

1
app/Api/V1/Requests/PiggyBankRequest.php
View File

@@ -29,6 +29,7 @@ use FireflyIII\Rules\IsAssetAccountId;
/**
*
* Class PiggyBankRequest
* @codeCoverageIgnore
*/
class PiggyBankRequest extends Request
{

1
app/Api/V1/Requests/PreferenceRequest.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests;
/**
*
* Class PreferenceRequest
* @codeCoverageIgnore
*/
class PreferenceRequest extends Request
{

214
app/Api/V1/Requests/RecurrenceStoreRequest.php Normal file
View File

@@ -0,0 +1,214 @@
<?php
/**
* RecurrenceStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
use Carbon\Carbon;
use FireflyIII\Rules\BelongsUser;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Validation\RecurrenceValidation;
use FireflyIII\Validation\TransactionValidation;
use Illuminate\Validation\Validator;
/**
* Class RecurrenceStoreRequest
*/
class RecurrenceStoreRequest extends Request
{
use RecurrenceValidation, TransactionValidation;
/**
* Authorize logged in users.
*
* @return bool
*/
public function authorize(): bool
{
// Only allow authenticated users
return auth()->check();
}
/**
* Get all data from the request.
*
* @return array
*/
public function getAll(): array
{
$active = true;
$applyRules = true;
if (null !== $this->get('active')) {
$active = $this->boolean('active');
}
if (null !== $this->get('apply_rules')) {
$applyRules = $this->boolean('apply_rules');
}
$return = [
'recurrence' => [
'type' => $this->string('type'),
'title' => $this->string('title'),
'description' => $this->string('description'),
'first_date' => $this->date('first_date'),
'repeat_until' => $this->date('repeat_until'),
'repetitions' => $this->integer('nr_of_repetitions'),
'apply_rules' => $applyRules,
'active' => $active,
],
'meta' => [
'piggy_bank_id' => $this->integer('piggy_bank_id'),
'piggy_bank_name' => $this->string('piggy_bank_name'),
'tags' => explode(',', $this->string('tags')),
],
'transactions' => $this->getTransactionData(),
'repetitions' => $this->getRepetitionData(),
];
return $return;
}
/**
* The rules that the incoming request must be matched against.
*
* @return array
*/
public function rules(): array
{
$today = Carbon::now()->addDay();
return [
'type' => 'required|in:withdrawal,transfer,deposit',
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
'description' => 'between:1,65000',
'first_date' => sprintf('required|date|after:%s', $today->format('Y-m-d')),
'apply_rules' => [new IsBoolean],
'active' => [new IsBoolean],
'repeat_until' => sprintf('date|after:%s', $today->format('Y-m-d')),
'nr_of_repetitions' => 'numeric|between:1,31',
'tags' => 'between:1,64000',
'piggy_bank_id' => 'numeric',
'repetitions.*.type' => 'required|in:daily,weekly,ndom,monthly,yearly',
'repetitions.*.moment' => 'between:0,10',
'repetitions.*.skip' => 'required|numeric|between:0,31',
'repetitions.*.weekend' => 'required|numeric|min:1|max:4',
'transactions.*.description' => 'required|between:1,255',
'transactions.*.amount' => 'required|numeric|more:0',
'transactions.*.foreign_amount' => 'numeric|more:0',
'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id',
'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser],
'transactions.*.category_name' => 'between:1,255|nullable',
'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.source_name' => 'between:1,255|nullable',
'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser],
'transactions.*.destination_name' => 'between:1,255|nullable',
];
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$this->validateOneTransaction($validator);
$this->validateOneRepetition($validator);
$this->validateRecurrenceRepetition($validator);
$this->validateRepetitionMoment($validator);
$this->validateForeignCurrencyInformation($validator);
$this->validateAccountInformation($validator);
}
);
}
/**
* Returns the repetition data as it is found in the submitted data.
*
* @return array
*/
private function getRepetitionData(): array
{
$return = [];
// repetition data:
/** @var array $repetitions */
$repetitions = $this->get('repetitions');
/** @var array $repetition */
foreach ($repetitions as $repetition) {
$return[] = [
'type' => $repetition['type'],
'moment' => $repetition['moment'],
'skip' => (int)$repetition['skip'],
'weekend' => (int)$repetition['weekend'],
];
}
return $return;
}
/**
* Returns the transaction data as it is found in the submitted data. It's a complex method according to code
* standards but it just has a lot of ??-statements because of the fields that may or may not exist.
*
* @return array
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function getTransactionData(): array
{
$return = [];
// transaction data:
/** @var array $transactions */
$transactions = $this->get('transactions');
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return[] = [
'amount' => $transaction['amount'],
'currency_id' => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
'currency_code' => $transaction['currency_code'] ?? null,
'foreign_amount' => $transaction['foreign_amount'] ?? null,
'foreign_currency_id' => isset($transaction['foreign_currency_id']) ? (int)$transaction['foreign_currency_id'] : null,
'foreign_currency_code' => $transaction['foreign_currency_code'] ?? null,
'budget_id' => isset($transaction['budget_id']) ? (int)$transaction['budget_id'] : null,
'budget_name' => $transaction['budget_name'] ?? null,
'category_id' => isset($transaction['category_id']) ? (int)$transaction['category_id'] : null,
'category_name' => $transaction['category_name'] ?? null,
'source_id' => isset($transaction['source_id']) ? (int)$transaction['source_id'] : null,
'source_name' => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
'destination_id' => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
'destination_name' => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
'description' => $transaction['description'],
];
}
return $return;
}
}

6
app/Api/V1/Requests/RecurrenceRequest.php → app/Api/V1/Requests/RecurrenceUpdateRequest.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* RecurrenceRequest.php
* RecurrenceUpdateRequest.php
* Copyright (c) 2018 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
@@ -31,9 +31,9 @@ use FireflyIII\Validation\TransactionValidation;
use Illuminate\Validation\Validator;
/**
* Class RecurrenceRequest
* Class RecurrenceUpdateRequest
*/
class RecurrenceRequest extends Request
class RecurrenceUpdateRequest extends Request
{
use RecurrenceValidation, TransactionValidation;

1
app/Api/V1/Requests/Request.php
View File

@@ -32,6 +32,7 @@ use FireflyIII\Http\Requests\Request as FireflyIIIRequest;
* Technically speaking this class does not have to be extended like this but who knows what the future brings.
*
* @SuppressWarnings(PHPMD.NumberOfChildren)
* @codeCoverageIgnore
*/
class Request extends FireflyIIIRequest
{

2
app/Api/V1/Requests/RuleGroupRequest.php
View File

@@ -28,7 +28,7 @@ use FireflyIII\Rules\IsBoolean;
/**
*
* @codeCoverageIgnore
* Class RuleGroupRequest
*/
class RuleGroupRequest extends Request

4
app/Api/V1/Requests/TagRequest.php
View File

@@ -28,6 +28,10 @@ use FireflyIII\Models\Tag;
/**
* Class TagRequest
*
* @codeCoverageIgnore
*
* TODO split in store / update
*/
class TagRequest extends Request
{

1
app/Api/V1/Requests/UserRequest.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\User;
/**
* Class UserRequest
* @codeCoverageIgnore
*/
class UserRequest extends Request
{