kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-04 19:37:10 +00:00
Code Issues Projects Releases Wiki Activity

Autoformat lol

Browse Source
This commit is contained in:
James Cole
2026-01-23 15:09:50 +01:00
parent ae1347c550
commit 8f15a32bd6
1071 changed files with 21111 additions and 21687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,13 +24,13 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\ObjectGroup;
use Illuminate\Support\Facades\Log;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
/**
* Class ObjectGroupRepository
@@ -53,11 +53,12 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
public function get(): Collection
{
return $this->user->objectGroups()
return $this->user
->objectGroups()
->with(['piggyBanks', 'bills'])
->orderBy('order', 'ASC')
->orderBy('title', 'ASC')->get()
;
->orderBy('title', 'ASC')
->get();
}
public function deleteEmpty(): void
@@ -104,9 +105,13 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
/** @var ObjectGroup $objectGroup */
foreach ($list as $objectGroup) {
if ($index !== $objectGroup->order) {
Log::debug(
sprintf('objectGroup #%d ("%s"): order should %d be but is %d.', $objectGroup->id, $objectGroup->title, $index, $objectGroup->order)
);
Log::debug(sprintf(
'objectGroup #%d ("%s"): order should %d be but is %d.',
$objectGroup->id,
$objectGroup->title,
$index,
$objectGroup->order
));
$objectGroup->order = $index;
$objectGroup->save();
}
@@ -116,7 +121,10 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
public function search(string $query, int $limit): Collection
{
$dbQuery = $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC');
$dbQuery = $this->user
->objectGroups()
->orderBy('order', 'ASC')
->orderBy('title', 'ASC');
if ('' !== $query) {
// split query on spaces just in case:
$parts = explode(' ', $query);
@@ -149,19 +157,23 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface, UserGroup
$oldOrder = $objectGroup->order;
if ($newOrder > $oldOrder) {
$this->user->objectGroups()->where('object_groups.order', '<=', $newOrder)->where('object_groups.order', '>', $oldOrder)
$this->user
->objectGroups()
->where('object_groups.order', '<=', $newOrder)
->where('object_groups.order', '>', $oldOrder)
->where('object_groups.id', '!=', $objectGroup->id)
->decrement('object_groups.order')
;
->decrement('object_groups.order');
$objectGroup->order = $newOrder;
$objectGroup->save();
}
if ($newOrder < $oldOrder) {
$this->user->objectGroups()->where('object_groups.order', '>=', $newOrder)->where('object_groups.order', '<', $oldOrder)
$this->user
->objectGroups()
->where('object_groups.order', '>=', $newOrder)
->where('object_groups.order', '<', $oldOrder)
->where('object_groups.id', '!=', $objectGroup->id)
->increment('object_groups.order')
;
->increment('object_groups.order');
$objectGroup->order = $newOrder;
$objectGroup->save();