From 8d464962a8615a58ddc25dd9ee32aea6aa4851fb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 23 Feb 2025 12:27:07 +0100 Subject: [PATCH] Remove methods, point to interface. --- .../Account/AccountRepositoryInterface.php | 7 --- .../Account/AccountTaskerInterface.php | 4 -- .../Account/OperationsRepositoryInterface.php | 4 -- .../AttachmentRepositoryInterface.php | 4 -- .../Bill/BillRepositoryInterface.php | 7 --- .../AvailableBudgetRepositoryInterface.php | 4 -- .../Budget/BudgetLimitRepositoryInterface.php | 4 -- .../Budget/BudgetRepositoryInterface.php | 7 --- .../Budget/NoBudgetRepositoryInterface.php | 4 -- .../Budget/OperationsRepositoryInterface.php | 4 -- .../Category/CategoryRepositoryInterface.php | 7 --- .../NoCategoryRepositoryInterface.php | 4 -- .../OperationsRepositoryInterface.php | 4 -- .../Currency/CurrencyRepositoryInterface.php | 7 --- .../Journal/JournalAPIRepositoryInterface.php | 4 -- .../Journal/JournalCLIRepositoryInterface.php | 4 -- .../Journal/JournalRepositoryInterface.php | 4 -- .../LinkType/LinkTypeRepositoryInterface.php | 4 -- .../ObjectGroupRepositoryInterface.php | 4 -- .../PiggyBankRepositoryInterface.php | 11 +---- .../RecurringRepositoryInterface.php | 4 -- .../Rule/RuleRepositoryInterface.php | 4 -- .../RuleGroupRepositoryInterface.php | 4 -- .../Tag/OperationsRepositoryInterface.php | 4 -- .../Tag/TagRepositoryInterface.php | 4 -- .../TransactionGroupRepositoryInterface.php | 7 --- .../UserGroupRepositoryInterface.php | 4 -- .../Webhook/WebhookRepositoryInterface.php | 4 -- .../UserGroup/UserGroupInterface.php | 45 +++++++++++++++++++ .../Repositories/UserGroup/UserGroupTrait.php | 7 ++- 30 files changed, 53 insertions(+), 136 deletions(-) create mode 100644 app/Support/Repositories/UserGroup/UserGroupInterface.php diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 3878423227..9079921991 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -30,9 +30,6 @@ use FireflyIII\Models\Location; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -148,10 +145,6 @@ interface AccountRepositoryInterface public function searchAccountNr(string $query, array $types, int $limit): Collection; - public function setUser(null|Authenticatable|User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; - public function store(array $data): Account; public function update(Account $account, array $data): Account; diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 74438f7882..cb05d48a32 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Account; use Carbon\Carbon; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -38,6 +36,4 @@ interface AccountTaskerInterface public function getExpenseReport(Carbon $start, Carbon $end, Collection $accounts): array; public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array; - - public function setUser(null|Authenticatable|User $user): void; } diff --git a/app/Repositories/Account/OperationsRepositoryInterface.php b/app/Repositories/Account/OperationsRepositoryInterface.php index aea8031c7c..3a0dc10db5 100644 --- a/app/Repositories/Account/OperationsRepositoryInterface.php +++ b/app/Repositories/Account/OperationsRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -49,8 +47,6 @@ interface OperationsRepositoryInterface */ public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; - public function setUser(null|Authenticatable|User $user): void; - /** * Sum of withdrawal journals in period for a set of accounts, grouped per currency. Amounts are always negative. * diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index e48a8df323..831a72c456 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -25,8 +25,6 @@ namespace FireflyIII\Repositories\Attachment; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -47,8 +45,6 @@ interface AttachmentRepositoryInterface */ public function getNoteText(Attachment $attachment): ?string; - public function setUser(null|Authenticatable|User $user): void; - /** * @throws FireflyException */ diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 25553941d0..08cc1e4e4c 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -26,9 +26,6 @@ namespace FireflyIII\Repositories\Bill; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Bill; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -41,8 +38,6 @@ interface BillRepositoryInterface public function billStartsWith(string $query, int $limit): Collection; - public function setUserGroup(UserGroup $userGroup): void; - /** * Add correct order to bills. */ @@ -141,8 +136,6 @@ interface BillRepositoryInterface */ public function setOrder(Bill $bill, int $order): void; - public function setUser(null|Authenticatable|User $user): void; - /** * @throws FireflyException */ diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 410f5990ed..a76b1b8d73 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -27,8 +27,6 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -86,8 +84,6 @@ interface AvailableBudgetRepositoryInterface */ public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): ?AvailableBudget; public function update(AvailableBudget $availableBudget, array $data): AvailableBudget; diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php index bb101e2068..0c752c213f 100644 --- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php @@ -28,8 +28,6 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -68,8 +66,6 @@ interface BudgetLimitRepositoryInterface public function setNoteText(BudgetLimit $budgetLimit, string $text): void; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): BudgetLimit; public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit; diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 89e0c44ed3..dcdf30581d 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -27,9 +27,6 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AutoBudget; use FireflyIII\Models\Budget; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -41,8 +38,6 @@ interface BudgetRepositoryInterface public function budgetStartsWith(string $query, int $limit): Collection; - public function setUserGroup(UserGroup $userGroup): void; - /** * Returns the amount that is budgeted in a period. */ @@ -102,8 +97,6 @@ interface BudgetRepositoryInterface public function setBudgetOrder(Budget $budget, int $order): void; - public function setUser(null|Authenticatable|User $user): void; - /** * Used in the v2 API to calculate the amount of money spent in all active budgets. */ diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index 01b4d6d1f1..00ad60b41d 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -40,7 +38,5 @@ interface NoBudgetRepositoryInterface */ public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; - public function setUser(null|Authenticatable|User $user): void; - public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array; } diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index f35973432e..d4685070af 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -27,8 +27,6 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -54,8 +52,6 @@ interface OperationsRepositoryInterface */ public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; - public function setUser(null|Authenticatable|User $user): void; - /** * @SuppressWarnings("PHPMD.ExcessiveParameterList") */ diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 5f59f1ce5e..e181475879 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -26,9 +26,6 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Category; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -87,10 +84,6 @@ interface CategoryRepositoryInterface public function searchCategory(string $query, int $limit): Collection; - public function setUser(null|Authenticatable|User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; - /** * @throws FireflyException */ diff --git a/app/Repositories/Category/NoCategoryRepositoryInterface.php b/app/Repositories/Category/NoCategoryRepositoryInterface.php index 6dd36fbc64..41b5f2a3e5 100644 --- a/app/Repositories/Category/NoCategoryRepositoryInterface.php +++ b/app/Repositories/Category/NoCategoryRepositoryInterface.php @@ -25,8 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Category; use Carbon\Carbon; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -48,8 +46,6 @@ interface NoCategoryRepositoryInterface */ public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; - public function setUser(null|Authenticatable|User $user): void; - /** * Sum of withdrawal journals in period without a category, grouped per currency. Amounts are always negative. */ diff --git a/app/Repositories/Category/OperationsRepositoryInterface.php b/app/Repositories/Category/OperationsRepositoryInterface.php index 522dd80a55..12531923df 100644 --- a/app/Repositories/Category/OperationsRepositoryInterface.php +++ b/app/Repositories/Category/OperationsRepositoryInterface.php @@ -25,8 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Category; use Carbon\Carbon; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -64,8 +62,6 @@ interface OperationsRepositoryInterface */ public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array; - public function setUser(null|Authenticatable|User $user): void; - /** * Sum of withdrawal journals in period for a set of categories, grouped per currency. Amounts are always negative. */ diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 30b889d299..bd6e9f49f4 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -26,9 +26,6 @@ namespace FireflyIII\Repositories\Currency; use Carbon\Carbon; use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -66,8 +63,4 @@ interface CurrencyRepositoryInterface * Used in download exchange rate cron job. Needs the user object! */ public function setExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date, float $rate): CurrencyExchangeRate; - - public function setUser(null|Authenticatable|User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; } diff --git a/app/Repositories/Journal/JournalAPIRepositoryInterface.php b/app/Repositories/Journal/JournalAPIRepositoryInterface.php index e5e9b9ec6a..03c84a6eba 100644 --- a/app/Repositories/Journal/JournalAPIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalAPIRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\Journal; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -54,6 +52,4 @@ interface JournalAPIRepositoryInterface * Get all piggy bank events for a journal. */ public function getPiggyBankEvents(TransactionJournal $journal): Collection; - - public function setUser(null|Authenticatable|User $user): void; } diff --git a/app/Repositories/Journal/JournalCLIRepositoryInterface.php b/app/Repositories/Journal/JournalCLIRepositoryInterface.php index 588e9e1d55..80d582c547 100644 --- a/app/Repositories/Journal/JournalCLIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalCLIRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; use FireflyIII\Models\TransactionJournal; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -80,6 +78,4 @@ interface JournalCLIRepositoryInterface * Return all tags as strings in an array. */ public function getTags(TransactionJournal $journal): array; - - public function setUser(null|Authenticatable|User $user): void; } diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 055af9b5f5..f9187b4dbb 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -29,8 +29,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -98,8 +96,6 @@ interface JournalRepositoryInterface */ public function searchJournalDescriptions(string $search, int $limit): Collection; - public function setUser(null|Authenticatable|User $user): void; - /** * TODO Maybe to account repository? Do this wen reconcile is API only. */ diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index 7ebae5caa7..7586243925 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\LinkType; use FireflyIII\Models\LinkType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -72,8 +70,6 @@ interface LinkTypeRepositoryInterface */ public function getLinks(TransactionJournal $journal): Collection; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): LinkType; /** diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index 0232de5ef6..7c83b41bce 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -25,8 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\ObjectGroup; use FireflyIII\Models\ObjectGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -61,7 +59,5 @@ interface ObjectGroupRepositoryInterface public function setOrder(ObjectGroup $objectGroup, int $newOrder): ObjectGroup; - public function setUser(null|Authenticatable|User $user): void; - public function update(ObjectGroup $objectGroup, array $data): ObjectGroup; } diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index ac8509d6e1..215e1514d7 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -29,9 +29,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -41,8 +38,6 @@ interface PiggyBankRepositoryInterface { public function addAmount(PiggyBank $piggyBank, Account $account, string $amount, ?TransactionJournal $journal = null): bool; - public function getCurrentNativeAmount(PiggyBank $piggyBank, ?Account $account = null): string; - public function addAmountToPiggyBank(PiggyBank $piggyBank, string $amount, TransactionJournal $journal): void; public function canAddAmount(PiggyBank $piggyBank, Account $account, string $amount): bool; @@ -72,6 +67,8 @@ interface PiggyBankRepositoryInterface */ public function getCurrentAmount(PiggyBank $piggyBank, ?Account $account = null): string; + public function getCurrentNativeAmount(PiggyBank $piggyBank, ?Account $account = null): string; + /** * Get all events. */ @@ -136,10 +133,6 @@ interface PiggyBankRepositoryInterface */ public function setOrder(PiggyBank $piggyBank, int $newOrder): bool; - public function setUser(null|Authenticatable|User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; - /** * Store new piggy bank. * diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index 3842a5b2be..caa8debe4d 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -29,8 +29,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Models\RecurrenceTransaction; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -137,8 +135,6 @@ interface RecurringRepositoryInterface public function searchRecurrence(string $query, int $limit): Collection; - public function setUser(null|Authenticatable|User $user): void; - /** * Store a new recurring transaction. * diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 96cb48c06d..24e060f64b 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -27,8 +27,6 @@ use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -84,8 +82,6 @@ interface RuleRepositoryInterface public function setOrder(Rule $rule, int $newOrder): void; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): Rule; public function storeAction(Rule $rule, array $values): RuleAction; diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index d334fbb473..d924a588ca 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\RuleGroup; use FireflyIII\Models\RuleGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -88,8 +86,6 @@ interface RuleGroupRepositoryInterface public function setOrder(RuleGroup $ruleGroup, int $newOrder): void; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): RuleGroup; public function update(RuleGroup $ruleGroup, array $data): RuleGroup; diff --git a/app/Repositories/Tag/OperationsRepositoryInterface.php b/app/Repositories/Tag/OperationsRepositoryInterface.php index 3bab517c0c..61f6f46429 100644 --- a/app/Repositories/Tag/OperationsRepositoryInterface.php +++ b/app/Repositories/Tag/OperationsRepositoryInterface.php @@ -25,8 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -48,8 +46,6 @@ interface OperationsRepositoryInterface */ public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array; - public function setUser(null|Authenticatable|User $user): void; - /** * Sum of withdrawal journals in period for a set of tags, grouped per currency. Amounts are always negative. */ diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index d81efa1cf4..6937f42bcb 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -26,8 +26,6 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use FireflyIII\Models\Location; use FireflyIII\Models\Tag; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -93,8 +91,6 @@ interface TagRepositoryInterface */ public function searchTags(string $query, int $limit): Collection; - public function setUser(null|Authenticatable|User $user): void; - /** * This method stores a tag. */ diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php index 10da55ec14..a2f50a9b0d 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php @@ -28,10 +28,7 @@ use FireflyIII\Exceptions\DuplicateTransactionException; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Location; use FireflyIII\Models\TransactionGroup; -use FireflyIII\Models\UserGroup; use FireflyIII\Support\NullArrayObject; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -98,10 +95,6 @@ interface TransactionGroupRepositoryInterface */ public function getTags(int $journalId): array; - public function setUser(null|Authenticatable|User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; - /** * Create a new transaction group. * diff --git a/app/Repositories/UserGroup/UserGroupRepositoryInterface.php b/app/Repositories/UserGroup/UserGroupRepositoryInterface.php index 0bbeddf828..7db436290f 100644 --- a/app/Repositories/UserGroup/UserGroupRepositoryInterface.php +++ b/app/Repositories/UserGroup/UserGroupRepositoryInterface.php @@ -25,8 +25,6 @@ declare(strict_types=1); namespace FireflyIII\Repositories\UserGroup; use FireflyIII\Models\UserGroup; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -44,8 +42,6 @@ interface UserGroupRepositoryInterface public function getMembershipsFromGroupId(int $groupId): Collection; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): UserGroup; public function update(UserGroup $userGroup, array $data): UserGroup; diff --git a/app/Repositories/Webhook/WebhookRepositoryInterface.php b/app/Repositories/Webhook/WebhookRepositoryInterface.php index 6425192893..928889f3c9 100644 --- a/app/Repositories/Webhook/WebhookRepositoryInterface.php +++ b/app/Repositories/Webhook/WebhookRepositoryInterface.php @@ -27,8 +27,6 @@ namespace FireflyIII\Repositories\Webhook; use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; -use FireflyIII\User; -use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -53,8 +51,6 @@ interface WebhookRepositoryInterface public function getReadyMessages(Webhook $webhook): Collection; - public function setUser(null|Authenticatable|User $user): void; - public function store(array $data): Webhook; public function update(Webhook $webhook, array $data): Webhook; diff --git a/app/Support/Repositories/UserGroup/UserGroupInterface.php b/app/Support/Repositories/UserGroup/UserGroupInterface.php new file mode 100644 index 0000000000..0c86120c1d --- /dev/null +++ b/app/Support/Repositories/UserGroup/UserGroupInterface.php @@ -0,0 +1,45 @@ +userGroup; } + public function getUser(): ?User + { + return $this->user; + } + public function checkUserGroupAccess(UserRoleEnum $role): bool { $result = $this->user->hasRoleInGroupOrOwner($this->userGroup, $role);