Merge pull request #65 from cash-track/feature/profile-statistics

Feature / Profile Statistics
cash-track · Oct 16, 2021 · 827bd45 · 827bd45
2 parents 9426274 + dfdba17
commit 827bd45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/Controller/Profile/ProfileStatisticsController.php b/app/src/Controller/Profile/ProfileStatisticsController.php
@@ -77,7 +77,7 @@ public function walletsLatest(
         ChargeRepository $chargeRepository,
         WalletsView $view
     ): ResponseInterface {
-        $wallets = $walletRepository->findAllUnArchivedByUserPKWithLimit($this->user->id);
+        $wallets = $walletRepository->findByUserPKLatestWithLimit($this->user->id);
 
         foreach ($wallets as $wallet) {
             $wallet->latestCharges = new ArrayCollection($chargeRepository->findByWalletIDLatest($wallet->id));

diff --git a/app/src/Repository/WalletRepository.php b/app/src/Repository/WalletRepository.php
@@ -40,10 +40,13 @@ public function findAllByUserPKByArchived(int $userID, bool $isArchived = false)
      * @param int $limit
      * @return \App\Database\Wallet[]
      */
-    public function findAllUnArchivedByUserPKWithLimit(int $userID, int $limit = 4): array
+    public function findByUserPKLatestWithLimit(int $userID, int $limit = 4): array
     {
         /** @var \App\Database\Wallet[] $wallets */
-        $wallets = $this->allByUserPK($userID)->where('is_archived', false)->limit($limit)->fetchAll();
+        $wallets = $this->allByUserPK($userID)
+                        ->limit($limit)
+                        ->orderBy('updated_at', 'DESC')
+                        ->fetchAll();
 
         return $wallets;
     }