Fix piggy bank orders

app/Factory/PiggyBankFactory.php

@@ -39,6 +39,7 @@ use Illuminate\Database\QueryException;
 class PiggyBankFactory
 {
     use CreatesObjectGroups;
+
     public User                          $user {
         set(User $value) {
             $this->user = $value;
@@ -65,7 +66,8 @@ class PiggyBankFactory
      *
      * @return PiggyBank
      */
-    public function store(array $data): PiggyBank {
+    public function store(array $data): PiggyBank
+    {
 
         $piggyBankData = $data;
 
@@ -125,8 +127,12 @@ class PiggyBankFactory
         }
         // first find by ID:
         if ($piggyBankId > 0) {
-            /** @var null|PiggyBank $piggyBank */
-            $piggyBank = $this->user->piggyBanks()->find($piggyBankId);
+            $piggyBank = PiggyBank
+                ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+                ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+                ->where('accounts.user_id', $this->user->id)
+                ->where('piggy_banks.id', $piggyBankId)
+                ->first(['piggy_banks.*']);
             if (null !== $piggyBank) {
                 return $piggyBank;
             }
@@ -146,10 +152,16 @@ class PiggyBankFactory
 
     public function findByName(string $name): ?PiggyBank
     {
-        return $this->user->piggyBanks()->where('piggy_banks.name', $name)->first();
+        return PiggyBank
+            ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+            ->where('accounts.user_id', $this->user->id)
+            ->where('piggy_banks.name', $name)
+            ->first(['piggy_banks.*']);
     }
 
-    private function getCurrency(array $data): TransactionCurrency {
+    private function getCurrency(array $data): TransactionCurrency
+    {
         // currency:
         $defaultCurrency = app('amount')->getDefaultCurrency();
         $currency        = null;
@@ -163,7 +175,8 @@ class PiggyBankFactory
         return $currency;
     }
 
-    private function setOrder(PiggyBank $piggyBank, array $data): PiggyBank {
+    private function setOrder(PiggyBank $piggyBank, array $data): PiggyBank
+    {
         $this->resetOrder();
         $order = $this->getMaxOrder() + 1;
         if (array_key_exists('order', $data)) {
@@ -184,7 +197,6 @@ class PiggyBankFactory
             ->where('accounts.user_id', $this->user->id)
             ->with(
                 [
-                    'account',
                     'objectGroups',
                 ]
             )
@@ -207,7 +219,8 @@ class PiggyBankFactory
 
     }
 
-    public function linkToAccountIds(PiggyBank $piggyBank, array $accounts): void {
+    public function linkToAccountIds(PiggyBank $piggyBank, array $accounts): void
+    {
         $toBeLinked = [];
         /** @var array $info */
         foreach ($accounts as $info) {

app/Handlers/Observer/AccountObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Account;
+use FireflyIII\Models\PiggyBank;
 
 /**
  * Class AccountObserver
@@ -38,8 +39,9 @@ class AccountObserver
     {
         app('log')->debug('Observe "deleting" of an account.');
         $account->accountMeta()->delete();
+        /** @var PiggyBank $piggy */
         foreach ($account->piggyBanks()->get() as $piggy) {
-            $piggy->delete();
+            $piggy->accounts()->detach($account);
         }
         foreach ($account->attachments()->get() as $attachment) {
             $attachment->delete();

app/Http/Controllers/DebugController.php

@@ -29,7 +29,9 @@ use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use FireflyIII\User;
@@ -291,7 +293,10 @@ class DebugController extends Controller
         }
 
         // has piggies
-        if ($user->piggyBanks()->count() > 0) {
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->setUser($user);
+
+        if ($repository->getPiggyBanks()->count() > 0) {
             $flags[] = '<span title="Has piggy banks">:pig:</span>';
         }
 

app/Http/Controllers/HomeController.php

@@ -120,6 +120,7 @@ class HomeController extends Controller
      */
     public function index(AccountRepositoryInterface $repository): mixed
     {
+
         $types = config('firefly.accountTypesByIdentifier.asset');
         $count = $repository->count($types);
         Log::channel('audit')->info('User visits homepage.');

app/Models/PiggyBank.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Models;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -55,7 +56,7 @@ class PiggyBank extends Model
             'target_amount' => 'string',
         ];
 
-    protected $fillable = ['name', 'account_id', 'order', 'target_amount', 'start_date', 'start_date_tz', 'target_date', 'target_date_tz', 'active', 'transaction_currency_id'];
+    protected $fillable = ['name', 'order', 'target_amount', 'start_date', 'start_date_tz', 'target_date', 'target_date_tz', 'active', 'transaction_currency_id'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).
@@ -83,10 +84,9 @@ class PiggyBank extends Model
     {
         return $this->belongsTo(TransactionCurrency::class);
     }
-
     public function account(): BelongsTo
     {
-        return $this->belongsTo(Account::class);
+        throw new FireflyException('This method is not available on PiggyBank.');
     }
 
     public function attachments(): MorphMany

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -204,21 +204,26 @@ trait ModifiesPiggyBanks
         $oldOrder         = $piggyBank->order;
         // app('log')->debug(sprintf('Will move piggy bank #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
         if ($newOrder > $oldOrder) {
-            $this->user->piggyBanks()->where('piggy_banks.order', '<=', $newOrder)->where('piggy_banks.order', '>', $oldOrder)
+            PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+                     ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+                     ->where('accounts.user_id', $this->user->id)
+                ->where('piggy_banks.order', '<=', $newOrder)->where('piggy_banks.order', '>', $oldOrder)
                      ->where('piggy_banks.id', '!=', $piggyBank->id)
-                ->decrement('piggy_banks.order')
-            ;
+                     ->distinct()->decrement('piggy_banks.order');
+
             $piggyBank->order = $newOrder;
             app('log')->debug(sprintf('[1] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
             $piggyBank->save();
 
             return true;
         }
-
-        $this->user->piggyBanks()->where('piggy_banks.order', '>=', $newOrder)->where('piggy_banks.order', '<', $oldOrder)
+        PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+                 ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
+                 ->where('accounts.user_id', $this->user->id)
+            ->where('piggy_banks.order', '>=', $newOrder)->where('piggy_banks.order', '<', $oldOrder)
             ->where('piggy_banks.id', '!=', $piggyBank->id)
-            ->increment('piggy_banks.order')
-        ;
+            ->distinct()->increment('piggy_banks.order');
+
         $piggyBank->order = $newOrder;
         app('log')->debug(sprintf('[2] Order of piggy #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
         $piggyBank->save();

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -289,7 +289,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
                         ->where('accounts.user_id', auth()->user()->id)
                         ->with(
                             [
-                                'account',
                                 'objectGroups',
                             ]
                         )

app/User.php

@@ -36,6 +36,7 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Role;