Avoid using model methods and use repository instead

app/Repositories/Account/AccountRepository.php

@@ -125,6 +125,23 @@ class AccountRepository implements AccountRepositoryInterface
         return $account->notes()->first();
     }
 
+    /**
+     * Get note text or null.
+     *
+     * @param Account $account
+     *
+     * @return null|string
+     */
+    public function getNoteText(Account $account): ?string
+    {
+        $note = $account->notes()->first();
+        if (is_null($note)) {
+            return null;
+        }
+
+        return $note->text;
+    }
+
     /**
      * Returns the amount of the opening balance for this account.
      *
@@ -285,5 +302,4 @@ class AccountRepository implements AccountRepositoryInterface
 
         return $journal;
     }
-
 }

app/Repositories/Account/AccountRepositoryInterface.php

@@ -145,6 +145,15 @@ interface AccountRepositoryInterface
      */
     public function getNote(Account $account): ?Note;
 
+    /**
+     * Get note text or null.
+     *
+     * @param Account $account
+     *
+     * @return null|string
+     */
+    public function getNoteText(Account $account): ?string;
+
     /**
      * Returns the amount of the opening balance for this account.
      *

app/Repositories/Journal/JournalRepository.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Journal;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Factory\TransactionJournalFactory;
+use FireflyIII\Factory\TransactionJournalMetaFactory;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Note;
@@ -384,7 +385,7 @@ class JournalRepository implements JournalRepositoryInterface
         $cache->addProperty($field);
 
         if ($cache->has()) {
-            return $cache->get(); // @codeCoverageIgnore
+            return new Carbon($cache->get()); // @codeCoverageIgnore
         }
 
         $entry = $journal->transactionJournalMeta()->where('name', $field)->first();
@@ -392,7 +393,7 @@ class JournalRepository implements JournalRepositoryInterface
             return null;
         }
         $value = new Carbon($entry->data);
-        $cache->store($value);
+        $cache->store($entry->data);
 
         return $value;
     }
@@ -597,6 +598,52 @@ class JournalRepository implements JournalRepositoryInterface
         return false;
     }
 
+    /**
+     * Set meta field for journal that contains a date.
+     *
+     * @param TransactionJournal $journal
+     * @param string             $name
+     * @param Carbon             $date
+     *
+     * @return void
+     */
+    public function setMetaDate(TransactionJournal $journal, string $name, Carbon $date): void
+    {
+        /** @var TransactionJournalMetaFactory $factory */
+        $factory = app(TransactionJournalMetaFactory::class);
+        $factory->updateOrCreate(
+            [
+                'data'    => $date,
+                'journal' => $journal,
+                'name'    => $name,
+            ]
+        );
+
+        return;
+    }
+
+    /**
+     * Set meta field for journal that contains string.
+     *
+     * @param TransactionJournal $journal
+     * @param string             $name
+     * @param string             $value
+     */
+    public function setMetaString(TransactionJournal $journal, string $name, string $value): void
+    {
+        /** @var TransactionJournalMetaFactory $factory */
+        $factory = app(TransactionJournalMetaFactory::class);
+        $factory->updateOrCreate(
+            [
+                'data'    => $value,
+                'journal' => $journal,
+                'name'    => $name,
+            ]
+        );
+
+        return;
+    }
+
     /**
      * @param TransactionJournal $journal
      * @param int                $order

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -262,6 +262,26 @@ interface JournalRepositoryInterface
      */
     public function reconcileById(int $transactionId): bool;
 
+    /**
+     * Set meta field for journal that contains a date.
+     *
+     * @param TransactionJournal $journal
+     * @param string             $name
+     * @param Carbon             $date
+     *
+     * @return void
+     */
+    public function setMetaDate(TransactionJournal $journal, string $name, Carbon $date): void;
+
+    /**
+     * Set meta field for journal that contains string.
+     *
+     * @param TransactionJournal $journal
+     * @param string             $name
+     * @param string             $value
+     */
+    public function setMetaString(TransactionJournal $journal, string $name, string $value): void;
+
     /**
      * @param TransactionJournal $journal
      * @param int                $order