IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-24 08:00:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup.

Browse Source
This commit is contained in:
James Cole 2016-10-07 05:44:21 +02:00
parent 3c5f9487a8
commit 49af6522a8
14 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Exceptions/Handler.php
View File

@ -108,7 +108,8 @@ class Handler extends ExceptionHandler
/** /**
* Convert an authentication exception into an unauthenticated response. * Convert an authentication exception into an unauthenticated response.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
protected function unauthenticated($request) protected function unauthenticated($request)

18
app/Helpers/Report/ReportHelper.php
View File

@ -257,17 +257,17 @@ class ReportHelper implements ReportHelperInterface
->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where( ->where(
// source.account_id in accountIds XOR destination.account_id in accountIds // source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($ids) { function (Builder $query) use ($ids) {
$sourceXorDestinationQuery->where( $query->where(
function (Builder $inSourceButNotDestinationQuery) use ($ids) { function (Builder $q1) use ($ids) {
$inSourceButNotDestinationQuery->whereIn('source.account_id', $ids) $q1->whereIn('source.account_id', $ids)
->whereNotIn('destination.account_id', $ids); ->whereNotIn('destination.account_id', $ids);
} }
)->orWhere( )->orWhere(
function (Builder $inDestinationButNotSourceQuery) use ($ids) { function (Builder $q2) use ($ids) {
$inDestinationButNotSourceQuery->whereIn('destination.account_id', $ids) $q2->whereIn('destination.account_id', $ids)
->whereNotIn('source.account_id', $ids); ->whereNotIn('source.account_id', $ids);
} }
); );
} }

2
app/Import/Converter/Amount.php
View File

@ -41,7 +41,7 @@ class Amount extends BasicConverter implements ConverterInterface
} }
if ($len > 2 && $value{$decimalPosition} == ',') { if ($len > 2 && $value{$decimalPosition} == ',') {
$decimal = ','; $decimal = ',';
} }
// if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos) // if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos)
if ($decimal === '.') { if ($decimal === '.') {

2
app/Models/Preference.php
View File

@ -44,7 +44,7 @@ class Preference extends Model
{ {
protected $dates = ['created_at', 'updated_at']; protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['user_id', 'data', 'name','data']; protected $fillable = ['user_id', 'data', 'name', 'data'];
/** /**
* @param $value * @param $value

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

@ -22,8 +22,8 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Steam; use Steam;
@ -415,23 +415,23 @@ class AccountRepository implements AccountRepositoryInterface
} }
); );
$query->where( $query->where(
// source.account_id in accountIds XOR destination.account_id in accountIds // source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($accountIds) { function (Builder $query) use ($accountIds) {
$sourceXorDestinationQuery->where( $query->where(
function (Builder $inSourceButNotDestinationQuery) use ($accountIds) { function (Builder $q1) use ($accountIds) {
$inSourceButNotDestinationQuery->whereIn('source.account_id', $accountIds) $q1->whereIn('source.account_id', $accountIds)
->whereNotIn('destination.account_id', $accountIds); ->whereNotIn('destination.account_id', $accountIds);
} }
)->orWhere( )->orWhere(
function (Builder $inDestinationButNotSourceQuery) use ($accountIds) { function (Builder $q2) use ($accountIds) {
$inDestinationButNotSourceQuery->whereIn('destination.account_id', $accountIds) $q2->whereIn('destination.account_id', $accountIds)
->whereNotIn('source.account_id', $accountIds); ->whereNotIn('source.account_id', $accountIds);
} }
); );
} }
); );
} }
// that should do it: // that should do it:
$fields = TransactionJournal::queryFields(); $fields = TransactionJournal::queryFields();
$complete = $query->get($fields); $complete = $query->get($fields);

22
app/Repositories/Budget/BudgetRepository.php
View File

@ -22,8 +22,8 @@ use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -370,17 +370,17 @@ class BudgetRepository implements BudgetRepositoryInterface
if ($accounts->count() > 0) { if ($accounts->count() > 0) {
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$query->where( $query->where(
// source.account_id in accountIds XOR destination.account_id in accountIds // source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($accountIds) { function (Builder $query) use ($accountIds) {
$sourceXorDestinationQuery->where( $query->where(
function (Builder $inSourceButNotDestinationQuery) use ($accountIds) { function (Builder $q1) use ($accountIds) {
$inSourceButNotDestinationQuery->whereIn('source.account_id', $accountIds) $q1->whereIn('source.account_id', $accountIds)
->whereNotIn('destination.account_id', $accountIds); ->whereNotIn('destination.account_id', $accountIds);
} }
)->orWhere( )->orWhere(
function (Builder $inDestinationButNotSourceQuery) use ($accountIds) { function (Builder $q2) use ($accountIds) {
$inDestinationButNotSourceQuery->whereIn('destination.account_id', $accountIds) $q2->whereIn('destination.account_id', $accountIds)
->whereNotIn('source.account_id', $accountIds); ->whereNotIn('source.account_id', $accountIds);
} }
); );
} }
@ -460,7 +460,7 @@ class BudgetRepository implements BudgetRepositoryInterface
if ($accounts->count() > 0) { if ($accounts->count() > 0) {
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$query->where( $query->where(
// source.account_id in accountIds XOR destination.account_id in accountIds // source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($accountIds) { function (Builder $sourceXorDestinationQuery) use ($accountIds) {
$sourceXorDestinationQuery->where( $sourceXorDestinationQuery->where(
function (Builder $inSourceButNotDestinationQuery) use ($accountIds) { function (Builder $inSourceButNotDestinationQuery) use ($accountIds) {

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

@ -489,17 +489,17 @@ class CategoryRepository implements CategoryRepositoryInterface
if ($accounts->count() > 0) { if ($accounts->count() > 0) {
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$query->where( $query->where(
// source.account_id in accountIds XOR destination.account_id in accountIds // source.account_id in accountIds XOR destination.account_id in accountIds
function (Builder $sourceXorDestinationQuery) use ($accountIds) { function (Builder $query) use ($accountIds) {
$sourceXorDestinationQuery->where( $query->where(
function (Builder $inSourceButNotDestinationQuery) use ($accountIds) { function (Builder $q1) use ($accountIds) {
$inSourceButNotDestinationQuery->whereIn('source.account_id', $accountIds) $q1->whereIn('source.account_id', $accountIds)
->whereNotIn('destination.account_id', $accountIds); ->whereNotIn('destination.account_id', $accountIds);
} }
)->orWhere( )->orWhere(
function (Builder $inDestinationButNotSourceQuery) use ($accountIds) { function (Builder $q2) use ($accountIds) {
$inDestinationButNotSourceQuery->whereIn('destination.account_id', $accountIds) $q2->whereIn('destination.account_id', $accountIds)
->whereNotIn('source.account_id', $accountIds); ->whereNotIn('source.account_id', $accountIds);
} }
); );
} }

2
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@ -71,7 +71,7 @@ interface CategoryRepositoryInterface
public function findByName(string $name) : Category; public function findByName(string $name) : Category;
/** /**
* @param Category $category * @param Category $category
* *
* @return Carbon * @return Carbon
*/ */

2
app/Repositories/Tag/TagRepository.php
View File

@ -145,7 +145,7 @@ class TagRepository implements TagRepositoryInterface
->transactionJournals() ->transactionJournals()
->sortCorrectly() ->sortCorrectly()
->expanded() ->expanded()
->groupBy(['tag_transaction_journal.tag_id','tag_transaction_journal.transaction_journal_id']) ->groupBy(['tag_transaction_journal.tag_id', 'tag_transaction_journal.transaction_journal_id'])
->get(TransactionJournal::queryFields()); ->get(TransactionJournal::queryFields());
return $journals; return $journals;

14
app/Repositories/Tag/TagRepositoryInterface.php
View File

@ -35,13 +35,6 @@ interface TagRepositoryInterface
*/ */
public function connect(TransactionJournal $journal, Tag $tag): bool; public function connect(TransactionJournal $journal, Tag $tag): bool;
/**
* @param Tag $tag
*
* @return Collection
*/
public function getJournals(Tag $tag) : Collection;
/** /**
* This method destroys a tag. * This method destroys a tag.
* *
@ -72,6 +65,13 @@ interface TagRepositoryInterface
*/ */
public function get(): Collection; public function get(): Collection;
/**
* @param Tag $tag
*
* @return Collection
*/
public function getJournals(Tag $tag) : Collection;
/** /**
* This method stores a tag. * This method stores a tag.
* *

3
app/Rules/Triggers/FromAccountContains.php
View File

@ -83,7 +83,8 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
Log::debug( Log::debug(
sprintf( sprintf(
'RuleTrigger FromAccountContains for journal #%d: "%s" does not contain "%s", return false.', 'RuleTrigger FromAccountContains for journal #%d: "%s" does not contain "%s", return false.',
$journal->id, $fromAccountName, $search) $journal->id, $fromAccountName, $search
)
); );
return false; return false;

3
app/Rules/Triggers/ToAccountContains.php
View File

@ -83,7 +83,8 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
Log::debug( Log::debug(
sprintf( sprintf(
'RuleTrigger ToAccountContains for journal #%d: "%s" does not contain "%s", return false.', 'RuleTrigger ToAccountContains for journal #%d: "%s" does not contain "%s", return false.',
$journal->id, $toAccountName, $search) $journal->id, $toAccountName, $search
)
); );
return false; return false;

1
app/Rules/Triggers/ToAccountEnds.php
View File

@ -86,6 +86,7 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
if ($part === $search) { if ($part === $search) {
Log::debug(sprintf('RuleTrigger ToAccountEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $toAccountName, $search)); Log::debug(sprintf('RuleTrigger ToAccountEnds for journal #%d: "%s" ends with "%s", return true.', $journal->id, $toAccountName, $search));
return true; return true;
} }

1
app/Rules/Triggers/ToAccountStarts.php
View File

@ -75,6 +75,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
if ($part === $search) { if ($part === $search) {
Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" starts with "%s", return true.', $journal->id, $toAccountName, $search)); Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" starts with "%s", return true.', $journal->id, $toAccountName, $search));
return true; return true;
} }
Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $toAccountName, $search)); Log::debug(sprintf('RuleTrigger ToAccountStarts for journal #%d: "%s" does not start with "%s", return false.', $journal->id, $toAccountName, $search));