Update copyrights.

app/Repositories/ObjectGroup/CreatesObjectGroups.php

@@ -1,4 +1,25 @@
 <?php
+
+/**
+ * CreatesObjectGroups.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 declare(strict_types=1);
 
 namespace FireflyIII\Repositories\ObjectGroup;

app/Repositories/ObjectGroup/ObjectGroupRepository.php

@@ -1,4 +1,25 @@
 <?php
+
+/**
+ * ObjectGroupRepository.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 declare(strict_types=1);
 
 namespace FireflyIII\Repositories\ObjectGroup;
@@ -33,7 +54,9 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
      */
     public function get(): Collection
     {
-        return $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get();
+        return $this->user->objectGroups()
+                          ->with(['piggyBanks', 'bills'])
+                          ->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get();
     }
 
     /**

app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php

@@ -1,4 +1,25 @@
 <?php
+
+/**
+ * ObjectGroupRepositoryInterface.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 declare(strict_types=1);
 
 namespace FireflyIII\Repositories\ObjectGroup;

app/Repositories/ObjectGroup/OrganisesObjectGroups.php

@@ -1,4 +1,25 @@
 <?php
+
+/**
+ * OrganisesObjectGroups.php
+ * Copyright (c) 2020 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 declare(strict_types=1);
 
 namespace FireflyIII\Repositories\ObjectGroup;

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * ModifiesPiggyBanks.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Repositories\PiggyBank;
 
 
@@ -360,6 +362,7 @@ trait ModifiesPiggyBanks
             $repetition->save();
         }
 
+        // update using name:
         $objectGroupTitle = $data['object_group'] ?? '';
         if ('' !== $objectGroupTitle) {
             $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
@@ -368,6 +371,15 @@ trait ModifiesPiggyBanks
                 $piggyBank->save();
             }
         }
+        // try also with ID:
+        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        if (0 !== $objectGroupId) {
+            $objectGroup = $this->findObjectGroupById($objectGroupId);
+            if (null !== $objectGroup) {
+                $piggyBank->objectGroups()->sync([$objectGroup->id]);
+                $piggyBank->save();
+            }
+        }
 
         return $piggyBank;
     }

app/Repositories/Telemetry/TelemetryRepository.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TelemetryRepository.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Repositories\Telemetry;
 
 use FireflyIII\Models\Telemetry;

app/Repositories/Telemetry/TelemetryRepositoryInterface.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+
 /**
  * TelemetryRepositoryInterface.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -20,6 +20,8 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Repositories\Telemetry;