kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Add debug information.

Browse Source
This commit is contained in:
James Cole
2020-02-22 11:05:16 +01:00
parent 1d8f34275a
commit 6c163ebef3
10 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Validation/AccountValidator.php
View File

@@ -559,7 +559,7 @@ class AccountValidator
// if both values are NULL we return false,
// because the source of a withdrawal can't be created.
$this->sourceError = (string)trans('validation.transfer_source_need_data');
Log::warning('Not a valid source, need more data.');
return false;
}
@@ -567,10 +567,11 @@ class AccountValidator
$search = $this->findExistingAccount($validTypes, (int)$accountId, (string)$accountName);
if (null === $search) {
$this->sourceError = (string)trans('validation.transfer_source_bad_data', ['id' => $accountId, 'name' => $accountName]);
Log::warning('Not a valid source, cant find it.', $validTypes);
return false;
}
$this->source = $search;
Log::debug('Valid source!');
return true;
}
@@ -634,6 +635,7 @@ class AccountValidator
// if both values are NULL we return false,
// because the source of a withdrawal can't be created.
$this->sourceError = (string)trans('validation.withdrawal_source_need_data');
Log::warning('Not a valid source. Need more data.');
return false;
}
@@ -642,10 +644,11 @@ class AccountValidator
$search = $this->findExistingAccount($validTypes, (int)$accountId, (string)$accountName);
if (null === $search) {
$this->sourceError = (string)trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]);
Log::warning('Not a valid source. Cant find it.', $validTypes);
return false;
}
$this->source = $search;
Log::debug('Valid source account!');
return true;
}

18
app/Validation/TransactionValidation.php
View File

@@ -42,6 +42,7 @@ trait TransactionValidation
*/
public function validateAccountInformation(Validator $validator): void
{
Log::debug('Now in validateAccountInformation()');
$transactions = $this->getTransactionsArray($validator);
$data = $validator->getData();
@@ -88,6 +89,7 @@ trait TransactionValidation
*/
public function validateAccountInformationUpdate(Validator $validator): void
{
Log::debug('Now in validateAccountInformationUpdate()');
$transactions = $this->getTransactionsArray($validator);
/** @var AccountValidator $accountValidator */
@@ -141,9 +143,10 @@ trait TransactionValidation
*/
public function validateDescriptions(Validator $validator): void
{
Log::debug('Now in validateDescriptions()');
$transactions = $this->getTransactionsArray($validator);
$validDescriptions = 0;
foreach ($transactions as $index => $transaction) {
foreach ($transactions as $transaction) {
if ('' !== (string)($transaction['description'] ?? null)) {
$validDescriptions++;
}
@@ -164,6 +167,7 @@ trait TransactionValidation
*/
public function validateForeignCurrencyInformation(Validator $validator): void
{
Log::debug('Now in validateForeignCurrencyInformation()');
$transactions = $this->getTransactionsArray($validator);
foreach ($transactions as $index => $transaction) {
@@ -191,6 +195,7 @@ trait TransactionValidation
*/
public function validateGroupDescription(Validator $validator): void
{
Log::debug('Now in validateGroupDescription()');
$data = $validator->getData();
$transactions = $this->getTransactionsArray($validator);
@@ -207,6 +212,7 @@ trait TransactionValidation
*/
public function validateOneRecurrenceTransaction(Validator $validator): void
{
Log::debug('Now in validateOneRecurrenceTransaction()');
$transactions = $this->getTransactionsArray($validator);
// need at least one transaction
@@ -222,6 +228,7 @@ trait TransactionValidation
*/
public function validateOneRecurrenceTransactionUpdate(Validator $validator): void
{
Log::debug('Now in validateOneRecurrenceTransactionUpdate()');
$transactions = $this->getTransactionsArray($validator);
// need at least one transaction
if (0 === count($transactions)) {
@@ -236,11 +243,15 @@ trait TransactionValidation
*/
public function validateOneTransaction(Validator $validator): void
{
Log::debug('Now in validateOneTransaction()');
$transactions = $this->getTransactionsArray($validator);
// need at least one transaction
if (0 === count($transactions)) {
$validator->errors()->add('transactions.0.description', (string)trans('validation.at_least_one_transaction'));
Log::debug('Added error: at_least_one_transaction.');
return;
}
Log::debug('Added NO errors.');
}
/**
@@ -250,6 +261,7 @@ trait TransactionValidation
*/
public function validateTransactionTypes(Validator $validator): void
{
Log::debug('Now in validateTransactionTypes()');
$transactions = $this->getTransactionsArray($validator);
$types = [];
@@ -276,6 +288,7 @@ trait TransactionValidation
*/
public function validateTransactionTypesForUpdate(Validator $validator): void
{
Log::debug('Now in validateTransactionTypesForUpdate()');
$transactions = $this->getTransactionsArray($validator);
$types = [];
foreach ($transactions as $index => $transaction) {
@@ -383,6 +396,7 @@ trait TransactionValidation
*/
private function validateEqualAccounts(Validator $validator): void
{
Log::debug('Now in validateEqualAccounts()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
@@ -433,6 +447,7 @@ trait TransactionValidation
*/
private function validateEqualAccountsForUpdate(Validator $validator, TransactionGroup $transactionGroup): void
{
Log::debug('Now in validateEqualAccountsForUpdate()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
@@ -525,6 +540,7 @@ trait TransactionValidation
*/
private function validateJournalIds(Validator $validator, TransactionGroup $transactionGroup): void
{
Log::debug('Now in validateJournalIds()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];