kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Organise object groups

Browse Source
This commit is contained in:
James Cole
2020-06-07 16:38:15 +02:00
parent 16b0307b0a
commit 471cdefcff
8 changed files with 172 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\ObjectGroup;
use DB;
use FireflyIII\Models\ObjectGroup;
use Illuminate\Support\Collection;
@@ -18,7 +19,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
*/
public function get(): Collection
{
return ObjectGroup::orderBy('order')->get();
return ObjectGroup::orderBy('order', 'ASC')->orderBy('title', 'ASC')->get();
}
/**
@@ -28,7 +29,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
*/
public function search(string $query): Collection
{
$dbQuery = ObjectGroup::orderBy('order');
$dbQuery = ObjectGroup::orderBy('order', 'ASC')->orderBy('title', 'ASC');
if ('' !== $query) {
// split query on spaces just in case:
$parts = explode(' ', $query);
@@ -41,4 +42,35 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
return $dbQuery->get(['object_groups.*']);
}
/**
* @inheritDoc
*/
public function deleteEmpty(): void
{
$all = $this->get();
/** @var ObjectGroup $group */
foreach ($all as $group) {
$count = DB::table('object_groupables')->where('object_groupables.object_group_id', $group->id)->count();
if (0 === $count) {
$group->delete();
}
}
}
/**
* @inheritDoc
*/
public function sort(): void
{
$all = $this->get();
/**
* @var int $index
* @var ObjectGroup $group
*/
foreach ($all as $index => $group) {
$group->order = $index + 1;
$group->save();
}
}
}