IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add some TODO's, refactor some code.

Browse Source
This commit is contained in:
James Cole 2019-08-03 19:17:59 +02:00
parent cf121fea50
commit 0b8427f881
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
13 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,8 +248,7 @@ class TransactionUpdateRequest extends Request
// The currency info must match the accounts involved.
// Instead will ignore currency info as much as possible.
// TODO if the transaction_journal_id is empty, some fields are mandatory.
// TODO like the amount!
// TODO if the transaction_journal_id is empty, some fields are mandatory, like the amount!
// all journals must have a description
//$this->validateDescriptions($validator);

1
app/Factory/BudgetFactory.php
View File

@ -92,6 +92,7 @@ class BudgetFactory
{
/** @var Collection $collection */
$collection = $this->user->budgets()->get();
// TODO no longer need to loop like this
/** @var Budget $budget */
foreach ($collection as $budget) {
if ($budget->name === $name) {

3
app/Factory/CategoryFactory.php
View File

@ -58,6 +58,9 @@ class CategoryFactory
$result = null;
/** @var Collection $collection */
$collection = $this->user->categories()->get();
// TODO no longer need to loop like this
/** @var Category $category */
foreach ($collection as $category) {
if ($category->name === $name) {

3
app/Factory/PiggyBankFactory.php
View File

@ -91,6 +91,9 @@ class PiggyBankFactory
public function findByName(string $name): ?PiggyBank
{
$set = $this->user->piggyBanks()->get();
// TODO no longer need to loop like this
/** @var PiggyBank $piggy */
foreach ($set as $piggy) {
if ($piggy->name === $name) {

2
app/Models/ImportJob.php
View File

@ -48,8 +48,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property int id
* @property Carbon $created_at
* @property Carbon $updated_at
* @property int $id
* @property array|null $extended_status
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|\FireflyIII\Models\ImportJob newQuery()

8
app/Repositories/Account/AccountRepository.php
View File

@ -157,6 +157,9 @@ class AccountRepository implements AccountRepositoryInterface
Log::debug(sprintf('Searching for account named "%s" (of user #%d) of the following type(s)', $name, $this->user->id), ['types' => $types]);
$accounts = $query->get(['accounts.*']);
// TODO no longer need to loop like this
/** @var Account $account */
foreach ($accounts as $account) {
if ($account->name === $name) {
@ -308,6 +311,8 @@ class AccountRepository implements AccountRepositoryInterface
*/
public function getMetaValue(Account $account, string $field): ?string
{
// TODO no longer need to loop like this
foreach ($account->accountMeta as $meta) {
if ($meta->name === $field) {
return (string)$meta->data;
@ -406,6 +411,9 @@ class AccountRepository implements AccountRepositoryInterface
/** @var AccountType $type */
$type = AccountType::where('type', AccountType::RECONCILIATION)->first();
$accounts = $this->user->accounts()->where('account_type_id', $type->id)->get();
// TODO no longer need to loop like this
/** @var Account $current */
foreach ($accounts as $current) {
if ($current->name === $name) {

2
app/Repositories/Bill/BillRepository.php
View File

@ -128,6 +128,8 @@ class BillRepository implements BillRepositoryInterface
{
$bills = $this->user->bills()->get(['bills.*']);
// TODO no longer need to loop like this
/** @var Bill $bill */
foreach ($bills as $bill) {
if ($bill->name === $name) {

3
app/Repositories/Category/CategoryRepository.php
View File

@ -272,6 +272,9 @@ class CategoryRepository implements CategoryRepositoryInterface
public function findByName(string $name): ?Category
{
$categories = $this->user->categories()->get(['categories.*']);
// TODO no longer need to loop like this
foreach ($categories as $category) {
if ($category->name === $name) {
return $category;

3
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@ -199,6 +199,9 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
public function findByName(string $name): ?PiggyBank
{
$set = $this->user->piggyBanks()->get(['piggy_banks.*']);
// TODO no longer need to loop like this
/** @var PiggyBank $piggy */
foreach ($set as $piggy) {
if ($piggy->name === $name) {

1
app/Support/Facades/Steam.php
View File

@ -40,6 +40,7 @@ use Illuminate\Support\Facades\Facade;
* @method string|null opposite(string $amount = null)
* @method int phpBytes(string $string)
* @method string positive(string $amount)
* @method array balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date)
*
* @codeCoverageIgnore
*/

3
app/TransactionRules/Actions/SetBudget.php
View File

@ -63,6 +63,9 @@ class SetBudget implements ActionInterface
$repository->setUser($journal->user);
$search = $this->action->action_value;
$budgets = $repository->getActiveBudgets();
// TODO no longer need to loop like this
$budget = $budgets->filter(
static function (Budget $current) use ($search) {
return $current->name === $search;

5
app/Validation/FireflyValidator.php
View File

@ -269,6 +269,7 @@ class FireflyValidator extends Validator
$repository = app(BudgetRepositoryInterface::class);
$budgets = $repository->getBudgets();
// count budgets, should have at least one
// TODO no longer need to loop like this
$count = $budgets->filter(
function (Budget $budget) use ($value) {
return $budget->name === $value;
@ -540,6 +541,7 @@ class FireflyValidator extends Validator
$value = $this->data['name'];
$set = $user->accounts()->where('account_type_id', $type->id)->get();
// TODO no longer need to loop like this
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name === $value) {
@ -565,6 +567,7 @@ class FireflyValidator extends Validator
/** @var Collection $set */
$set = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
// TODO no longer need to loop like this
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name === $value) {
@ -588,6 +591,7 @@ class FireflyValidator extends Validator
/** @var Collection $set */
$set = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
// TODO no longer need to loop like this
/** @var Account $entry */
foreach ($set as $entry) {
// TODO no longer need to loop like this.
@ -621,6 +625,7 @@ class FireflyValidator extends Validator
$accountTypeIds = $accountTypes->pluck('id')->toArray();
/** @var Collection $set */
$set = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)->get();
// TODO no longer need to loop like this
/** @var Account $entry */
foreach ($set as $entry) {
if ($entry->name === $value) {

4
resources/lang/en_US/firefly.php
View File

@ -83,7 +83,7 @@ return [
'help_for_this_page' => 'Help for this page',
'no_help_could_be_found' => 'No help text could be found.',
'no_help_title' => 'Apologies, an error occurred.',
'two_factor_welcome' => 'Hello, :user!',
'two_factor_welcome' => 'Hello!',
'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
'two_factor_code_here' => 'Enter code here',
'two_factor_title' => 'Two factor authentication',
@ -487,6 +487,8 @@ return [
'pref_two_factor_auth_reset_code' => 'Reset verification code',
'pref_two_factor_auth_disable_2fa' => 'Disable 2FA',
'2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.',
'2fa_backup_codes' => 'Store these backup codes for access in case you lose your device.',
'2fa_already_enabled' => '2-step verification is already enabled.',
'pref_save_settings' => 'Save settings',
'saved_preferences' => 'Preferences saved!',
'preferences_general' => 'General',