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

Fix https://github.com/orgs/firefly-iii/discussions/9324

Browse Source
This commit is contained in:
James Cole
2024-10-10 06:30:05 +02:00
parent 562763c938
commit b41fc43e64
23 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,7 +576,7 @@ class AccountRepository implements AccountRepositoryInterface
$parts = explode(' ', $query);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$dbQuery->where('name', 'LIKE', $search);
$dbQuery->whereLike('name', $search);
}
}
if (0 !== count($types)) {
@@ -604,11 +604,11 @@ class AccountRepository implements AccountRepositoryInterface
$search = sprintf('%%%s%%', $part);
$dbQuery->where(
static function (EloquentBuilder $q1) use ($search): void { // @phpstan-ignore-line
$q1->where('accounts.iban', 'LIKE', $search);
$q1->whereLike('accounts.iban', $search);
$q1->orWhere(
static function (EloquentBuilder $q2) use ($search): void {
$q2->where('account_meta.name', '=', 'account_number');
$q2->where('account_meta.data', 'LIKE', $search);
$q2->whereLike('account_meta.data', $search);
}
);
}

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

@@ -57,7 +57,7 @@ class BillRepository implements BillRepositoryInterface
{
$search = $this->user->bills();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s', $query));
$search->whereLike('name', sprintf('%%%s', $query));
}
$search->orderBy('name', 'ASC')
->where('active', true)
@@ -70,7 +70,7 @@ class BillRepository implements BillRepositoryInterface
{
$search = $this->user->bills();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%s%%', $query));
$search->whereLike('name', sprintf('%s%%', $query));
}
$search->orderBy('name', 'ASC')
->where('active', true)
@@ -485,7 +485,7 @@ class BillRepository implements BillRepositoryInterface
{
$query = sprintf('%%%s%%', $query);
return $this->user->bills()->where('name', 'LIKE', $query)->take($limit)->get();
return $this->user->bills()->whereLike('name', $query)->take($limit)->get();
}
public function setObjectGroup(Bill $bill, string $objectGroupTitle): Bill

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

@@ -57,7 +57,7 @@ class BudgetRepository implements BudgetRepositoryInterface
{
$search = $this->user->budgets();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s', $query));
$search->whereLike('name', sprintf('%%%s', $query));
}
$search->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->where('active', true)
@@ -70,7 +70,7 @@ class BudgetRepository implements BudgetRepositoryInterface
{
$search = $this->user->budgets();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%s%%', $query));
$search->whereLike('name', sprintf('%s%%', $query));
}
$search->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->where('active', true)
@@ -512,7 +512,7 @@ class BudgetRepository implements BudgetRepositoryInterface
}
$query = sprintf('%%%s%%', $name);
return $this->user->budgets()->where('name', 'LIKE', $query)->first();
return $this->user->budgets()->whereLike('name', $query)->first();
}
/**
@@ -577,7 +577,7 @@ class BudgetRepository implements BudgetRepositoryInterface
{
$search = $this->user->budgets();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('name', sprintf('%%%s%%', $query));
}
$search->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->where('active', true)

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

@@ -49,7 +49,7 @@ class CategoryRepository implements CategoryRepositoryInterface
{
$search = $this->user->categories();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s', $query));
$search->whereLike('name', sprintf('%%%s', $query));
}
return $search->take($limit)->get();
@@ -59,7 +59,7 @@ class CategoryRepository implements CategoryRepositoryInterface
{
$search = $this->user->categories();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%s%%', $query));
$search->whereLike('name', sprintf('%s%%', $query));
}
return $search->take($limit)->get();
@@ -344,7 +344,7 @@ class CategoryRepository implements CategoryRepositoryInterface
{
$search = $this->user->categories();
if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('name', sprintf('%%%s%%', $query));
}
return $search->take($limit)->get();

2
app/Repositories/Journal/JournalRepository.php
View File

@@ -197,7 +197,7 @@ class JournalRepository implements JournalRepositoryInterface
->orderBy('date', 'DESC')
;
if ('' !== $search) {
$query->where('description', 'LIKE', sprintf('%%%s%%', $search));
$query->whereLike('description', sprintf('%%%s%%', $search));
}
return $query->take($limit)->get();

2
app/Repositories/ObjectGroup/ObjectGroupRepository.php
View File

@@ -120,7 +120,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
$parts = explode(' ', $query);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$dbQuery->where('title', 'LIKE', $search);
$dbQuery->whereLike('title', $search);
}
}

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

@@ -343,7 +343,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
{
$search = $this->user->piggyBanks();
if ('' !== $query) {
$search->where('piggy_banks.name', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('piggy_banks.name', sprintf('%%%s%%', $query));
}
$search->orderBy('piggy_banks.order', 'ASC')
->orderBy('piggy_banks.name', 'ASC')

2
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -496,7 +496,7 @@ class RecurringRepository implements RecurringRepositoryInterface
{
$search = $this->user->recurrences();
if ('' !== $query) {
$search->where('recurrences.title', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('recurrences.title', sprintf('%%%s%%', $query));
}
$search
->orderBy('recurrences.title', 'ASC')

2
app/Repositories/Rule/RuleRepository.php
View File

@@ -213,7 +213,7 @@ class RuleRepository implements RuleRepositoryInterface
{
$search = $this->user->rules();
if ('' !== $query) {
$search->where('rules.title', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('rules.title', sprintf('%%%s%%', $query));
}
$search->orderBy('rules.order', 'ASC')
->orderBy('rules.title', 'ASC')

2
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@@ -371,7 +371,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
{
$search = $this->user->ruleGroups();
if ('' !== $query) {
$search->where('rule_groups.title', 'LIKE', sprintf('%%%s%%', $query));
$search->whereLike('rule_groups.title', sprintf('%%%s%%', $query));
}
$search->orderBy('rule_groups.order', 'ASC')
->orderBy('rule_groups.title', 'ASC')

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

@@ -205,7 +205,7 @@ class TagRepository implements TagRepositoryInterface
{
$search = sprintf('%%%s%%', $query);
return $this->user->tags()->where('tag', 'LIKE', $search)->get(['tags.*']);
return $this->user->tags()->whereLike('tag', $search)->get(['tags.*']);
}
/**
@@ -217,7 +217,7 @@ class TagRepository implements TagRepositoryInterface
$tags = $this->user->tags()->orderBy('tag', 'ASC');
if ('' !== $query) {
$search = sprintf('%%%s%%', $query);
$tags->where('tag', 'LIKE', $search);
$tags->whereLike('tag', $search);
}
return $tags->take($limit)->get('tags.*');
@@ -309,14 +309,14 @@ class TagRepository implements TagRepositoryInterface
{
$search = sprintf('%%%s', $query);
return $this->user->tags()->where('tag', 'LIKE', $search)->get(['tags.*']);
return $this->user->tags()->whereLike('tag', $search)->get(['tags.*']);
}
public function tagStartsWith(string $query): Collection
{
$search = sprintf('%s%%', $query);
return $this->user->tags()->where('tag', 'LIKE', $search)->get(['tags.*']);
return $this->user->tags()->whereLike('tag', $search)->get(['tags.*']);
}
public function transferredInPeriod(Tag $tag, Carbon $start, Carbon $end): array

2
app/Repositories/TransactionType/TransactionTypeRepository.php
View File

@@ -62,6 +62,6 @@ class TransactionTypeRepository implements TransactionTypeRepositoryInterface
return TransactionType::get();
}
return TransactionType::where('type', 'LIKE', sprintf('%%%s%%', $query))->take($limit)->get();
return TransactionType::whereLike('type', sprintf('%%%s%%', $query))->take($limit)->get();
}
}

4
app/Repositories/UserGroups/Account/AccountRepository.php
View File

@@ -270,7 +270,7 @@ class AccountRepository implements AccountRepositoryInterface
$query->where('accounts.active', $value);
}
if ('name' === $column) {
$query->where('accounts.name', 'LIKE', sprintf('%%%s%%', $value));
$query->whereLike('accounts.name', sprintf('%%%s%%', $value));
}
}
@@ -315,7 +315,7 @@ class AccountRepository implements AccountRepositoryInterface
$parts = explode(' ', $line);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$q->orWhere('name', 'LIKE', $search);
$q->orWhereLike('name', $search);
}
}
});

2
app/Repositories/UserGroups/Category/CategoryRepository.php
View File

@@ -41,7 +41,7 @@ class CategoryRepository implements CategoryRepositoryInterface
$parts = explode(' ', $line);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$q->orWhere('name', 'LIKE', $search);
$q->orWhereLike('name', $search);
}
}
});

2
app/Repositories/UserGroups/Currency/CurrencyRepository.php
View File

@@ -320,7 +320,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
{
$query = TransactionCurrency::where('enabled', true);
if ('' !== $search) {
$query->where('name', 'LIKE', sprintf('%%%s%%', $search));
$query->whereLike('name', sprintf('%%%s%%', $search));
}
return $query->take($limit)->get();

2
app/Repositories/UserGroups/Journal/JournalRepository.php
View File

@@ -46,7 +46,7 @@ class JournalRepository implements JournalRepositoryInterface
$parts = explode(' ', $line);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$q->orWhere('description', 'LIKE', $search);
$q->orWhereLike('description', $search);
}
}
});

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

@@ -44,7 +44,7 @@ class TagRepository implements TagRepositoryInterface
$parts = explode(' ', $line);
foreach ($parts as $part) {
$search = sprintf('%%%s%%', $part);
$q->orWhere('tag', 'LIKE', $search);
$q->orWhereLike('tag', $search);
}
}
});