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

Add strict types, add debug info

Browse Source
This commit is contained in:
James Cole
2022-07-16 09:25:10 +02:00
parent 5c3b4d1663
commit 9493046212
38 changed files with 222 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

6
app/Api/V2/Controllers/Controller.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* Controller.php
* Copyright (c) 2022 james@firefly-iii.org
@@ -82,6 +83,11 @@ class Controller extends BaseController
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$objects = $paginator->getCollection();
// the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta data and stuff like that, and save it for later.
$transformer->collectMetaData($objects);
$resource = new FractalCollection($objects, $transformer, $key);
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

1
app/Api/V2/Controllers/Data/Bulk/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Data/Export/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Data/MassDestroy/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Model/Account/ShowController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* ShowController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Model/Bill/SumController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* SumController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Model/Budget/SumController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* SumController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/NetWorthController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* NetWorthController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Search/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/System/ConfigurationController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* ConfigurationController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/System/DebugController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* DebugController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/System/PreferencesController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* PreferencesController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Transaction/List/AccountController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/Transaction/Sum/BillController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* BillController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Controllers/VersionUpdateController.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* VersionUpdateController.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Request/Transaction/ListRequest.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* ListRequest.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Api/V2/Response/Sum/AutoSum.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AutoSum.php
* Copyright (c) 2022 james@firefly-iii.org

16
app/Console/Commands/Tools/Cron.php
View File

@@ -142,10 +142,10 @@ class Cron extends Command
$this->error(sprintf('Error in "create recurring transactions" cron: %s', $recurring->message));
}
if ($recurring->jobFired) {
$this->error(sprintf('"Create recurring transactions" cron fired: %s', $recurring->message));
$this->line(sprintf('"Create recurring transactions" cron fired: %s', $recurring->message));
}
if ($recurring->jobSucceeded) {
$this->error(sprintf('"Create recurring transactions" cron ran with success: %s', $recurring->message));
$this->info(sprintf('"Create recurring transactions" cron ran with success: %s', $recurring->message));
}
}
@@ -169,10 +169,10 @@ class Cron extends Command
$this->error(sprintf('Error in "create auto budgets" cron: %s', $autoBudget->message));
}
if ($autoBudget->jobFired) {
$this->error(sprintf('"Create auto budgets" cron fired: %s', $autoBudget->message));
$this->line(sprintf('"Create auto budgets" cron fired: %s', $autoBudget->message));
}
if ($autoBudget->jobSucceeded) {
$this->error(sprintf('"Create auto budgets" cron ran with success: %s', $autoBudget->message));
$this->info(sprintf('"Create auto budgets" cron ran with success: %s', $autoBudget->message));
}
}
@@ -197,10 +197,10 @@ class Cron extends Command
$this->error(sprintf('Error in "bill warnings" cron: %s', $autoBudget->message));
}
if ($autoBudget->jobFired) {
$this->error(sprintf('"Send bill warnings" cron fired: %s', $autoBudget->message));
$this->line(sprintf('"Send bill warnings" cron fired: %s', $autoBudget->message));
}
if ($autoBudget->jobSucceeded) {
$this->error(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
$this->info(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
}
}
@@ -225,10 +225,10 @@ class Cron extends Command
$this->error(sprintf('Error in "exchange rates" cron: %s', $exchangeRates->message));
}
if ($exchangeRates->jobFired) {
$this->error(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
$this->line(sprintf('"Exchange rates" cron fired: %s', $exchangeRates->message));
}
if ($exchangeRates->jobSucceeded) {
$this->error(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
$this->info(sprintf('"Exchange rates" cron ran with success: %s', $exchangeRates->message));
}
}

1
app/Enums/AccountTypeEnum.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountTypeEnum.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/AutoBudgetType.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AutoBudgetType.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/RecurrenceRepetitionWeekend.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* RecurrenceRepetitionWeekend.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/TransactionTypeEnum.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* TransactionTypeEnum.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/UserRoleEnum.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* UserRoleEnum.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/WebhookDelivery.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* WebhookDelivery.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/WebhookResponse.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* WebhookResponse.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Enums/WebhookTrigger.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* WebhookTrigger.php
* Copyright (c) 2022 james@firefly-iii.org

1
app/Exceptions/BadHttpHeaderException.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
namespace FireflyIII\Exceptions;

1
app/Http/Middleware/AcceptHeaders.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
namespace FireflyIII\Http\Middleware;

4
app/Jobs/DownloadExchangeRates.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* DownloadExchangeRates.php
* Copyright (c) 2022 james@firefly-iii.org
@@ -77,6 +78,7 @@ class DownloadExchangeRates implements ShouldQueue
*/
public function handle(): void
{
Log::debug('Now in handle()');
$currencies = $this->repository->get();
/** @var TransactionCurrency $currency */
@@ -108,7 +110,7 @@ class DownloadExchangeRates implements ShouldQueue
$res = $client->get($url);
$statusCode = $res->getStatusCode();
if (200 !== $statusCode) {
Log::warning(sprintf('Trying to grab "%s" resulted in %d.', $url, $statusCode));
Log::warning(sprintf('Trying to grab "%s" resulted in status code %d.', $url, $statusCode));
return;
}
$body = (string) $res->getBody();

4
app/Support/Cronjobs/ExchangeRatesCronjob.php
View File

@@ -68,14 +68,14 @@ class ExchangeRatesCronjob extends AbstractCronjob
Log::info(sprintf('It has been %s since the exchange rates cron-job has fired. It will fire now!', $diffForHumans));
}
$this->fireAutoBudget();
$this->fireExchangeRateJob();
app('preferences')->mark();
}
/**
*
*/
private function fireAutoBudget(): void
private function fireExchangeRateJob(): void
{
Log::info(sprintf('Will now fire exchange rates cron job task for date "%s".', $this->date->format('Y-m-d')));
/** @var DownloadExchangeRates $job */

1
app/Support/Http/Api/ConvertsExchangeRates.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* ConvertsExchangeRates.php
* Copyright (c) 2022 james@firefly-iii.org

7
app/Transformers/V2/AbstractTransformer.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AbstractTransformer.php
* Copyright (c) 2022 james@firefly-iii.org
@@ -21,6 +22,7 @@
namespace FireflyIII\Transformers\V2;
use Illuminate\Support\Collection;
use League\Fractal\TransformerAbstract;
/**
@@ -29,4 +31,9 @@ use League\Fractal\TransformerAbstract;
abstract class AbstractTransformer extends TransformerAbstract
{
/**
* @param Collection $objects
* @return void
*/
abstract public function collectMetaData(Collection $objects): void;
}

1
app/Transformers/V2/AccountTransformer.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* AccountTransformer.php
* Copyright (c) 2022 james@firefly-iii.org

139
app/Transformers/V2/TransactionGroupTransformer.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* TransactionGroupTransformer.php
* Copyright (c) 2022 james@firefly-iii.org
@@ -21,14 +22,27 @@
namespace FireflyIII\Transformers\V2;
use Carbon\Carbon;
use FireflyIII\Factory\TransactionFactory;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use FireflyIII\Support\NullArrayObject;
use Illuminate\Support\Collection;
/**
* Class TransactionGroupTransformer
*/
class TransactionGroupTransformer extends AbstractTransformer
{
use ConvertsExchangeRates;
private array $currencies = [];
private TransactionCurrency $default;
private array $meta;
/**
* @param array $group
*
@@ -70,11 +84,25 @@ class TransactionGroupTransformer extends AbstractTransformer
private function transformTransaction(array $transaction): array
{
$transaction = new NullArrayObject($transaction);
$journalId = (int) $transaction['transaction_journal_id'];
$meta = new NullArrayObject($this->meta[$journalId] ?? []);
$type = $this->stringFromArray($transaction, 'transaction_type_type', TransactionType::WITHDRAWAL);
$amount = app('steam')->positive((string) ($row['amount'] ?? '0'));
$amount = app('steam')->positive((string) ($transaction['amount'] ?? '0'));
$foreignAmount = null;
$foreignNativeAmount = null;
if (null !== $transaction['foreign_amount']) {
$foreignAmount = app('steam')->positive($transaction['foreign_amount']);
$foreignNativeAmount = $foreignAmount;
if ($transaction['foreign_currency_id'] !== $this->default->id) {
$rate = $this->getRate($this->currencies[$transaction['foreign_currency_id']], $this->default, $transaction['date']);
$foreignNativeAmount = bcmul($foreignAmount, $rate);
}
}
$nativeAmount = $amount;
if ($transaction['currency_id'] !== $this->default->id) {
$rate = $this->getRate($this->currencies[$transaction['currency_id']], $this->default, $transaction['date']);
$nativeAmount = bcmul($amount, $rate);
}
return [
@@ -88,12 +116,28 @@ class TransactionGroupTransformer extends AbstractTransformer
'currency_name' => $transaction['currency_name'],
'currency_symbol' => $transaction['currency_symbol'],
'currency_decimal_places' => (int) $transaction['currency_decimal_places'],
// converted to native currency
'native_currency_converted' => $transaction['currency_id'] !== $this->default->id,
'native_currency_id' => (string) $this->default->id,
'native_currency_code' => $this->default->code,
'native_currency_name' => $this->default->name,
'native_currency_symbol' => $this->default->symbol,
'native_currency_decimal_places' => (int) $this->default->decimal_places,
'foreign_currency_id' => $this->stringFromArray($transaction, 'foreign_currency_id', null),
'foreign_currency_code' => $transaction['foreign_currency_code'],
'foreign_currency_name' => $transaction['foreign_currency_name'],
'foreign_currency_symbol' => $transaction['foreign_currency_symbol'],
'foreign_currency_decimal_places' => $transaction['foreign_currency_decimal_places'],
// foreign converted to native currency:
'foreign_currency_converted' => null !== $transaction['foreign_currency_id'] && $transaction['foreign_currency_id'] !== $this->default->id,
'amount' => $amount,
'native_amount' => $nativeAmount,
'foreign_amount' => $foreignAmount,
'foreign_native_amount' => $foreignNativeAmount,
'description' => $transaction['description'],
'source_id' => (string) $transaction['source_account_id'],
'source_name' => $transaction['source_account_name'],
@@ -114,31 +158,30 @@ class TransactionGroupTransformer extends AbstractTransformer
//'notes' => $this->groupRepos->getNoteText((int) $row['transaction_journal_id']),
//'tags' => $this->groupRepos->getTags((int) $row['transaction_journal_id']),
// 'internal_reference' => $metaFieldData['internal_reference'],
// 'external_id' => $metaFieldData['external_id'],
// 'original_source' => $metaFieldData['original_source'],
// 'recurrence_id' => $this->stringFromArray($metaFieldData->getArrayCopy(), 'recurrence_id', null),
// 'recurrence_total' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_total'),
// 'recurrence_count' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_count'),
// 'bunq_payment_id' => $metaFieldData['bunq_payment_id'],
// 'external_url' => $metaFieldData['external_url'],
// 'import_hash_v2' => $metaFieldData['import_hash_v2'],
'internal_reference' => $meta['internal_reference'],
'external_id' => $meta['external_id'],
'original_source' => $meta['original_source'],
'recurrence_id' => $meta['recurrence_id'],
'recurrence_total' => $meta['recurrence_total'],
'recurrence_count' => $meta['recurrence_count'],
'bunq_payment_id' => $meta['bunq_payment_id'],
'external_url' => $meta['external_url'],
'import_hash_v2' => $meta['import_hash_v2'],
'sepa_cc' => $meta['sepa_cc'],
'sepa_ct_op' => $meta['sepa_ct_op'],
'sepa_ct_id' => $meta['sepa_ct_id'],
'sepa_db' => $meta['sepa_db'],
'sepa_country' => $meta['sepa_country'],
'sepa_ep' => $meta['sepa_ep'],
'sepa_ci' => $meta['sepa_ci'],
'sepa_batch_id' => $meta['sepa_batch_id'],
// 'sepa_cc' => $metaFieldData['sepa_cc'],
// 'sepa_ct_op' => $metaFieldData['sepa_ct_op'],
// 'sepa_ct_id' => $metaFieldData['sepa_ct_id'],
// 'sepa_db' => $metaFieldData['sepa_db'],
// 'sepa_country' => $metaFieldData['sepa_country'],
// 'sepa_ep' => $metaFieldData['sepa_ep'],
// 'sepa_ci' => $metaFieldData['sepa_ci'],
// 'sepa_batch_id' => $metaFieldData['sepa_batch_id'],
// 'interest_date' => $this->dateFromArray($metaDateData, 'interest_date'),
// 'book_date' => $this->dateFromArray($metaDateData, 'book_date'),
// 'process_date' => $this->dateFromArray($metaDateData, 'process_date'),
// 'due_date' => $this->dateFromArray($metaDateData, 'due_date'),
// 'payment_date' => $this->dateFromArray($metaDateData, 'payment_date'),
// 'invoice_date' => $this->dateFromArray($metaDateData, 'invoice_date'),
'interest_date' => $this->date($meta['interest_date']),
'book_date' => $this->date($meta['book_date']),
'process_date' => $this->date($meta['process_date']),
'due_date' => $this->date($meta['due_date']),
'payment_date' => $this->date($meta['payment_date']),
'invoice_date' => $this->date($meta['invoice_date']),
// location data
// 'longitude' => $longitude,
@@ -174,4 +217,50 @@ class TransactionGroupTransformer extends AbstractTransformer
return null;
}
/**
* @inheritDoc
*/
public function collectMetaData(Collection $objects): void
{
// start with currencies:
$currencies = [];
$journals = [];
/** @var array $object */
foreach ($objects as $object) {
foreach ($object['sums'] as $sum) {
$id = $sum['currency_id'];
if (!array_key_exists($id, $currencies)) {
$currencyObject = TransactionCurrency::find($sum['currency_id']);
$currencies[$id] = $currencyObject;
}
}
/** @var array $transaction */
foreach ($object['transactions'] as $transaction) {
$id = $transaction['transaction_journal_id'];
$journals[$id] = [];
}
}
$this->currencies = $currencies;
$this->default = app('amount')->getDefaultCurrency();
// grab meta for all journals:
$meta = TransactionJournalMeta::whereIn('transaction_journal_id', array_keys($journals))->get();
/** @var TransactionJournalMeta $entry */
foreach ($meta as $entry) {
$id = (int) $entry->transaction_journal_id;
$this->meta[$id][$entry->name] = $entry->data;
}
}
/**
* @param string|null $string
* @return Carbon|null
*/
private function date(?string $string): ?Carbon
{
if(null === $string) {
return null;
}
return Carbon::createFromFormat('Y-m-d', $string);
}
}

1
config/cer.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* default_cer.php
* Copyright (c) 2022 james@firefly-iii.org

1
database/seeders/ExchangeRateSeeder.php
View File

@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/*
* ExchangeRateSeeder.php
* Copyright (c) 2022 james@firefly-iii.org