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

Expand API and refactor for user groups.

Browse Source
This commit is contained in:
James Cole
2023-09-21 15:50:49 +02:00
parent 7dbdf0c4ff
commit 0b220f3288
45 changed files with 950 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Administration/Account/AccountRepository.php → app/Repositories/UserGroups/Account/AccountRepository.php
View File

@@ -23,13 +23,13 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Account;
namespace FireflyIII\Repositories\UserGroups\Account;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection;
@@ -38,7 +38,7 @@ use Illuminate\Support\Collection;
*/
class AccountRepository implements AccountRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* @param Account $account

2
app/Repositories/Administration/Account/AccountRepositoryInterface.php → app/Repositories/UserGroups/Account/AccountRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Account;
namespace FireflyIII\Repositories\UserGroups\Account;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionCurrency;

6
app/Repositories/Administration/Bill/BillRepository.php → app/Repositories/UserGroups/Bill/BillRepository.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Bill;
namespace FireflyIII\Repositories\UserGroups\Bill;
use Carbon\Carbon;
use FireflyIII\Models\Bill;
@@ -31,7 +31,7 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
@@ -39,7 +39,7 @@ use Illuminate\Support\Collection;
*/
class BillRepository implements BillRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* Correct order of piggies in case of issues.

2
app/Repositories/Administration/Bill/BillRepositoryInterface.php → app/Repositories/UserGroups/Bill/BillRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Bill;
namespace FireflyIII\Repositories\UserGroups\Bill;
use Carbon\Carbon;
use FireflyIII\Models\Bill;

6
app/Repositories/Administration/Budget/AvailableBudgetRepository.php → app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php
View File

@@ -23,19 +23,19 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use Carbon\Carbon;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
/**
* Class AvailableBudgetRepository
*/
class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* @param Carbon $start

2
app/Repositories/Administration/Budget/AvailableBudgetRepositoryInterface.php → app/Repositories/UserGroups/Budget/AvailableBudgetRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use Carbon\Carbon;

6
app/Repositories/Administration/Budget/BudgetRepository.php → app/Repositories/UserGroups/Budget/BudgetRepository.php
View File

@@ -23,9 +23,9 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
@@ -33,7 +33,7 @@ use Illuminate\Support\Collection;
*/
class BudgetRepository implements BudgetRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* @inheritDoc

2
app/Repositories/Administration/Budget/BudgetRepositoryInterface.php → app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use Illuminate\Support\Collection;

7
app/Repositories/Administration/Budget/OperationsRepository.php → app/Repositories/UserGroups/Budget/OperationsRepository.php
View File

@@ -23,13 +23,13 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
@@ -37,7 +37,7 @@ use Illuminate\Support\Collection;
*/
class OperationsRepository implements OperationsRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* @inheritDoc
@@ -132,6 +132,7 @@ class OperationsRepository implements OperationsRepositoryInterface
{
/** @var BudgetRepositoryInterface $repos */
$repos = app(BudgetRepositoryInterface::class);
die('uses old administration ID check, needs to be updated.F');
$repos->setAdministrationId($this->getAdministrationId());
return $repos->getActiveBudgets();

2
app/Repositories/Administration/Budget/OperationsRepositoryInterface.php → app/Repositories/UserGroups/Budget/OperationsRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\Budget;
namespace FireflyIII\Repositories\UserGroups\Budget;
use Carbon\Carbon;
use Illuminate\Support\Collection;

6
app/Repositories/Administration/PiggyBank/PiggyBankRepository.php → app/Repositories/UserGroups/PiggyBank/PiggyBankRepository.php
View File

@@ -23,9 +23,9 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\PiggyBank;
namespace FireflyIII\Repositories\UserGroups\PiggyBank;
use FireflyIII\Support\Repositories\Administration\AdministrationTrait;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
/**
@@ -33,7 +33,7 @@ use Illuminate\Support\Collection;
*/
class PiggyBankRepository implements PiggyBankRepositoryInterface
{
use AdministrationTrait;
use UserGroupTrait;
/**
* @inheritDoc

2
app/Repositories/Administration/PiggyBank/PiggyBankRepositoryInterface.php → app/Repositories/UserGroups/PiggyBank/PiggyBankRepositoryInterface.php
View File

@@ -23,7 +23,7 @@
declare(strict_types=1);
namespace FireflyIII\Repositories\Administration\PiggyBank;
namespace FireflyIII\Repositories\UserGroups\PiggyBank;
use Illuminate\Support\Collection;