Use trait and interface.

This commit is contained in:
James Cole
2025-02-23 12:28:27 +01:00
parent 79ae110368
commit de8149137a
32 changed files with 165 additions and 343 deletions

View File

@@ -29,16 +29,16 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
* Class JournalAPIRepository
*/
class JournalAPIRepository implements JournalAPIRepositoryInterface
class JournalAPIRepository implements JournalAPIRepositoryInterface, UserGroupInterface
{
private User $user;
use UserGroupTrait;
/**
* Returns transaction by ID. Used to validate attachments.
@@ -96,11 +96,4 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface
return $events;
}
public function setUser(null|Authenticatable|User $user): void
{
if ($user instanceof User) {
$this->user = $user;
}
}
}

View File

@@ -28,15 +28,17 @@ use Carbon\Carbon;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
* Class JournalCLIRepository
*/
class JournalCLIRepository implements JournalCLIRepositoryInterface
class JournalCLIRepository implements JournalCLIRepositoryInterface, UserGroupInterface
{
use UserGroupTrait;
/**
* Get all transaction journals with a specific type, regardless of user.
*/
@@ -201,9 +203,4 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface
{
return $journal->tags()->get()->pluck('tag')->toArray();
}
public function setUser(null|Authenticatable|User $user): void
{
// empty
}
}

View File

@@ -36,16 +36,16 @@ use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
use FireflyIII\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Contracts\Auth\Authenticatable;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
* Class JournalRepository.
*/
class JournalRepository implements JournalRepositoryInterface
class JournalRepository implements JournalRepositoryInterface, UserGroupInterface
{
private User $user;
use UserGroupTrait;
public function destroyGroup(TransactionGroup $transactionGroup): void
{
@@ -204,13 +204,6 @@ class JournalRepository implements JournalRepositoryInterface
return $query->take($limit)->get();
}
public function setUser(null|Authenticatable|User $user): void
{
if ($user instanceof User) {
$this->user = $user;
}
}
public function unreconcileById(int $journalId): void
{
/** @var null|TransactionJournal $journal */