First code for new balance chart

app/Repositories/Administration/Account/AccountRepository.php

@@ -39,82 +39,6 @@ class AccountRepository implements AccountRepositoryInterface
 {
     use AdministrationTrait;
 
-
-    /**
-     * @inheritDoc
-     */
-    public function searchAccount(string $query, array $types, int $limit): Collection
-    {
-        // search by group, not by user
-        $dbQuery = $this->userGroup->accounts()
-            ->where('active', true)
-            ->orderBy('accounts.order', 'ASC')
-            ->orderBy('accounts.account_type_id', 'ASC')
-            ->orderBy('accounts.name', 'ASC')
-            ->with(['accountType']);
-        if ('' !== $query) {
-            // split query on spaces just in case:
-            $parts = explode(' ', $query);
-            foreach ($parts as $part) {
-                $search = sprintf('%%%s%%', $part);
-                $dbQuery->where('name', 'LIKE', $search);
-            }
-        }
-        if (0 !== count($types)) {
-            $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
-            $dbQuery->whereIn('account_types.type', $types);
-        }
-
-        return $dbQuery->take($limit)->get(['accounts.*']);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getAccountsByType(array $types, ?array $sort = []): Collection
-    {
-        $res = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
-        $query = $this->userGroup->accounts();
-        if (0 !== count($types)) {
-            $query->accountTypeIn($types);
-        }
-
-        // add sort parameters. At this point they're filtered to allowed fields to sort by:
-        if (0 !== count($sort)) {
-            foreach ($sort as $param) {
-                $query->orderBy($param[0], $param[1]);
-            }
-        }
-
-        if (0 === count($sort)) {
-            if (0 !== count($res)) {
-                $query->orderBy('accounts.order', 'ASC');
-            }
-            $query->orderBy('accounts.active', 'DESC');
-            $query->orderBy('accounts.name', 'ASC');
-        }
-        return $query->get(['accounts.*']);
-    }
-
-    /**
-     * @param array $accountIds
-     *
-     * @return Collection
-     */
-    public function getAccountsById(array $accountIds): Collection
-    {
-        $query = $this->userGroup->accounts();
-
-        if (0 !== count($accountIds)) {
-            $query->whereIn('accounts.id', $accountIds);
-        }
-        $query->orderBy('accounts.order', 'ASC');
-        $query->orderBy('accounts.active', 'DESC');
-        $query->orderBy('accounts.name', 'ASC');
-
-        return $query->get(['accounts.*']);
-    }
-
     /**
      * @param Account $account
      *
@@ -141,7 +65,7 @@ class AccountRepository implements AccountRepositoryInterface
      * Return meta value for account. Null if not found.
      *
      * @param Account $account
-     * @param string $field
+     * @param string  $field
      *
      * @return null|string
      */
@@ -161,4 +85,93 @@ class AccountRepository implements AccountRepositoryInterface
 
         return null;
     }
+
+    /**
+     * @param int $accountId
+     *
+     * @return Account|null
+     */
+    public function find(int $accountId): ?Account
+    {
+        $account = $this->user->accounts()->find($accountId);
+        if (null === $account) {
+            $account = $this->userGroup->accounts()->find($accountId);
+        }
+        return $account;
+    }
+
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection
+    {
+        $query = $this->userGroup->accounts();
+
+        if (0 !== count($accountIds)) {
+            $query->whereIn('accounts.id', $accountIds);
+        }
+        $query->orderBy('accounts.order', 'ASC');
+        $query->orderBy('accounts.active', 'DESC');
+        $query->orderBy('accounts.name', 'ASC');
+
+        return $query->get(['accounts.*']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAccountsByType(array $types, ?array $sort = []): Collection
+    {
+        $res   = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
+        $query = $this->userGroup->accounts();
+        if (0 !== count($types)) {
+            $query->accountTypeIn($types);
+        }
+
+        // add sort parameters. At this point they're filtered to allowed fields to sort by:
+        if (0 !== count($sort)) {
+            foreach ($sort as $param) {
+                $query->orderBy($param[0], $param[1]);
+            }
+        }
+
+        if (0 === count($sort)) {
+            if (0 !== count($res)) {
+                $query->orderBy('accounts.order', 'ASC');
+            }
+            $query->orderBy('accounts.active', 'DESC');
+            $query->orderBy('accounts.name', 'ASC');
+        }
+        return $query->get(['accounts.*']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function searchAccount(string $query, array $types, int $limit): Collection
+    {
+        // search by group, not by user
+        $dbQuery = $this->userGroup->accounts()
+                                   ->where('active', true)
+                                   ->orderBy('accounts.order', 'ASC')
+                                   ->orderBy('accounts.account_type_id', 'ASC')
+                                   ->orderBy('accounts.name', 'ASC')
+                                   ->with(['accountType']);
+        if ('' !== $query) {
+            // split query on spaces just in case:
+            $parts = explode(' ', $query);
+            foreach ($parts as $part) {
+                $search = sprintf('%%%s%%', $part);
+                $dbQuery->where('name', 'LIKE', $search);
+            }
+        }
+        if (0 !== count($types)) {
+            $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
+            $dbQuery->whereIn('account_types.type', $types);
+        }
+
+        return $dbQuery->take($limit)->get(['accounts.*']);
+    }
 }

app/Repositories/Administration/Account/AccountRepositoryInterface.php

@@ -35,28 +35,11 @@ use Illuminate\Support\Collection;
 interface AccountRepositoryInterface
 {
     /**
-     * @param string $query
-     * @param array $types
-     * @param int $limit
+     * @param int $accountId
      *
-     * @return Collection
+     * @return Account|null
      */
-    public function searchAccount(string $query, array $types, int $limit): Collection;
-
-    /**
-     * @param array $types
-     * @param array|null $sort
-     *
-     * @return Collection
-     */
-    public function getAccountsByType(array $types, ?array $sort = []): Collection;
-
-    /**
-     * @param array $accountIds
-     *
-     * @return Collection
-     */
-    public function getAccountsById(array $accountIds): Collection;
+    public function find(int $accountId): ?Account;
 
     /**
      * @param Account $account
@@ -65,13 +48,38 @@ interface AccountRepositoryInterface
      */
     public function getAccountCurrency(Account $account): ?TransactionCurrency;
 
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection;
+
+    /**
+     * @param array      $types
+     * @param array|null $sort
+     *
+     * @return Collection
+     */
+    public function getAccountsByType(array $types, ?array $sort = []): Collection;
+
     /**
      * Return meta value for account. Null if not found.
      *
      * @param Account $account
-     * @param string $field
+     * @param string  $field
      *
      * @return null|string
      */
     public function getMetaValue(Account $account, string $field): ?string;
+
+    /**
+     * @param string $query
+     * @param array  $types
+     * @param int    $limit
+     *
+     * @return Collection
+     */
+    public function searchAccount(string $query, array $types, int $limit): Collection;
+
 }