Piggy bank can now have a group.

app/Repositories/ObjectGroup/CreatesObjectGroups.php

@@ -0,0 +1,61 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Repositories\ObjectGroup;
+
+use FireflyIII\Models\ObjectGroup;
+
+/**
+ * Trait CreatesObjectGroups
+ */
+trait CreatesObjectGroups
+{
+    /**
+     * @param string $title
+     *
+     * @return null|ObjectGroup
+     */
+    protected function findObjectGroup(string $title): ?ObjectGroup
+    {
+        return ObjectGroup::where('title', $title)->first();
+    }
+
+    /**
+     * @param string $title
+     *
+     * @return ObjectGroup|null
+     */
+    protected function findOrCreateObjectGroup(string $title): ?ObjectGroup
+    {
+        $group    = null;
+        $maxOrder = $this->getObjectGroupMaxOrder();
+        if (!$this->hasObjectGroup($title)) {
+            return ObjectGroup::create(
+                [
+                    'title' => $title,
+                    'order' => $maxOrder + 1,
+                ]
+            );
+        }
+
+        return $this->findObjectGroup($title);
+    }
+
+    /**
+     * @return int
+     */
+    protected function getObjectGroupMaxOrder(): int
+    {
+        return ObjectGroup::max('order');
+    }
+
+    /**
+     * @param string $title
+     *
+     * @return bool
+     */
+    protected function hasObjectGroup(string $title): bool
+    {
+        return 1 === ObjectGroup::where('title', $title)->count();
+    }
+}

app/Repositories/ObjectGroup/ObjectGroupRepository.php

@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Repositories\ObjectGroup;
+
+use FireflyIII\Models\ObjectGroup;
+use Illuminate\Support\Collection;
+
+/**
+ * Class ObjectGroupRepository
+ */
+class ObjectGroupRepository implements ObjectGroupRepositoryInterface
+{
+
+
+    /**
+     * @inheritDoc
+     */
+    public function get(): Collection
+    {
+        return ObjectGroup::orderBy('order')->get();
+    }
+
+    /**
+     * @param string $query
+     *
+     * @return Collection
+     */
+    public function search(string $query): Collection
+    {
+        $dbQuery = ObjectGroup::orderBy('order');
+        if ('' !== $query) {
+            // split query on spaces just in case:
+            $parts = explode(' ', $query);
+            foreach ($parts as $part) {
+                $search = sprintf('%%%s%%', $part);
+                $dbQuery->where('title', 'LIKE', $search);
+            }
+
+        }
+
+        return $dbQuery->get(['object_groups.*']);
+    }
+}

app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Repositories\ObjectGroup;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ObjectGroupRepositoryInterface
+ */
+interface ObjectGroupRepositoryInterface
+{
+    /**
+     * @return Collection
+     */
+    public function get(): Collection;
+
+    /**
+     * @param string $query
+     *
+     * @return Collection
+     */
+    public function search(string $query): Collection;
+
+}

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use Illuminate\Database\QueryException;
 use Log;
 
@@ -39,7 +40,7 @@ use Log;
  */
 trait ModifiesPiggyBanks
 {
-
+    use CreatesObjectGroups;
     /**
      * @param PiggyBank $piggyBank
      * @param string    $amount
@@ -274,6 +275,15 @@ trait ModifiesPiggyBanks
             $repetition->save();
         }
 
+        $objectGroupTitle = $data['object_group'] ?? '';
+        if ('' !== $objectGroupTitle) {
+            $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
+            if (null !== $objectGroup) {
+                $piggyBank->objectGroups()->sync([$objectGroup->id]);
+                $piggyBank->save();
+            }
+        }
+
         return $piggyBank;
     }
 
@@ -313,6 +323,15 @@ trait ModifiesPiggyBanks
             $repetition->save();
         }
 
+        $objectGroupTitle = $data['object_group'] ?? '';
+        if ('' !== $objectGroupTitle) {
+            $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
+            if (null !== $objectGroup) {
+                $piggyBank->objectGroups()->sync([$objectGroup->id]);
+                $piggyBank->save();
+            }
+        }
+
         return $piggyBank;
     }
 

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -265,7 +265,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function getPiggyBanks(): Collection
     {
-        return $this->user->piggyBanks()->with(['account'])->orderBy('order', 'ASC')->get();
+        return $this->user->piggyBanks()->with(['account', 'objectGroups'])->orderBy('order', 'ASC')->get();
     }