Added profit by years

assets/pages/HomePage.vue

@@ -5,6 +5,9 @@ import axios from "axios";
 import useAsync from "@/utils/use-async";
 import {reactive} from "vue";
 import PreloaderComponent from "@/components/Common/PreloaderComponent.vue";
+import {useNumbers} from "@/composable/useNumbers";
+
+const {formatPrice, formatPercent} = useNumbers()
 
 interface SummaryCard {
   name: string
@@ -86,6 +89,31 @@ run()
           />
         </div>
       </template>
+
+      <template v-if="pageData.data.statisticByYears">
+        <div class="text-2xl font-extrabold mt-6 mb-3">
+          Profit By Years
+        </div>
+        <table class="simple-table">
+          <thead>
+            <tr>
+              <th>Year</th>
+              <th>Start Year Profit (1 Jan)</th>
+              <th>Percent</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
+              v-for="(item, index) in pageData.data.statisticByYears"
+              :key="index"
+            >
+              <td>{{ item.year }}</td>
+              <td>{{ formatPrice(item.profit) }}</td>
+              <td>{{ formatPercent(item.profitPercent) }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </template>
     </template>
   </page-component>
 </template>

src/Controller/AnalyticsController.php

@@ -7,6 +7,7 @@
 use App\Entity\User;
 use App\Request\DTO\Deals\DealsFilterRequestDTO;
 use App\Services\Deals\ClosedDealsService;
+use App\Services\StatisticService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Attribute\MapQueryString;
@@ -36,4 +37,12 @@ public function monthlyClosedDeals(
         $deals = $dealsService->getMonthlyDealsStat($user, $filter);
         return $this->json($deals);
     }
+
+    #[Route('/analytics/annual-stat', name: 'app_analytics_annual_statistic', methods: 'GET')]
+    public function annualStatistic(
+        StatisticService $statisticService
+    ): JsonResponse {
+        $deals = $statisticService->getStatisticByYears();
+        return $this->json($deals);
+    }
 }

src/Controller/HomepageController.php

@@ -12,6 +12,7 @@
 use App\Services\Deals\DealData;
 use App\Services\DepositsService;
 use App\Services\MarketData\Currencies\CurrencyService;
+use App\Services\StatisticService;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -27,6 +28,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly AccountService $accountService,
         private readonly DepositsService $depositsService,
+        private readonly StatisticService $statisticService
     ) {
     }
 
@@ -61,9 +63,9 @@ public function index(#[CurrentUser] ?User $user): Response
 
         return $this->json(
             [
-                'usd'             => $this->currencyService->getUSDRUBRate(),
-                'depositAccounts' => $depositAccounts,
-                'summary'         => [
+                'usd'              => $this->currencyService->getUSDRUBRate(),
+                'depositAccounts'  => $depositAccounts,
+                'summary'          => [
                     [
                         'name'     => 'The Invested Amount',
                         'total'    => $invested,
@@ -105,6 +107,7 @@ public function index(#[CurrentUser] ?User $user): Response
                         'currency' => '₽',
                     ],
                 ],
+                'statisticByYears' => $this->statisticService->getStatisticByYears(),
             ]
         );
     }

src/Repository/StatisticRepository.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Repository;
 
 use App\Entity\Statistic;
@@ -21,28 +23,27 @@ public function __construct(ManagerRegistry $registry)
         parent::__construct($registry, Statistic::class);
     }
 
-//    /**
-//     * @return Statistic[] Returns an array of Statistic objects
-//     */
-//    public function findByExampleField($value): array
-//    {
-//        return $this->createQueryBuilder('s')
-//            ->andWhere('s.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->orderBy('s.id', 'ASC')
-//            ->setMaxResults(10)
-//            ->getQuery()
-//            ->getResult()
-//        ;
-//    }
-
-//    public function findOneBySomeField($value): ?Statistic
-//    {
-//        return $this->createQueryBuilder('s')
-//            ->andWhere('s.exampleField = :val')
-//            ->setParameter('val', $value)
-//            ->getQuery()
-//            ->getOneOrNullResult()
-//        ;
-//    }
+    public function getLatestStatistic(): array
+    {
+        $connection = $this->getEntityManager()->getConnection();
+        $resultSet = $connection->executeQuery(
+            "SELECT * FROM statistic stat
+            inner join (select account_id, MAX(date) as max_date from statistic group by account_id) s_date
+            on stat.account_id = s_date.account_id and stat.date = s_date.max_date"
+        );
+
+        return $resultSet->fetchAllAssociative();
+    }
+
+    public function getStatisticByYears(): array
+    {
+        $connection = $this->getEntityManager()->getConnection();
+        $resultSet = $connection->executeQuery(
+            "SELECT * FROM statistic stat
+            inner join (select account_id, MIN(date) as max_date from statistic group by account_id, YEAR(statistic.date)) s_date
+            on stat.account_id = s_date.account_id and stat.date = s_date.max_date ORDER BY stat.date"
+        );
+
+        return $resultSet->fetchAllAssociative();
+    }
 }

src/Services/StatisticService.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services;
+
+use App\Entity\Statistic;
+use Carbon\Carbon;
+use Doctrine\ORM\EntityManagerInterface;
+
+class StatisticService
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager
+    ) {
+    }
+
+    public function getStatisticByYears()
+    {
+        $statisticRepository = $this->entityManager->getRepository(Statistic::class);
+        $yearsData = $statisticRepository->getStatisticByYears();
+        $latestData = $statisticRepository->getLatestStatistic();
+
+        $statByYears = [];
+        foreach ($yearsData as $data) {
+            $date = Carbon::createFromFormat('Y-m-d H:i:s', $data['date']);
+            if (isset($statByYears[$date->year])) {
+                $existenceDate = $statByYears[$date->year];
+            } else {
+                $existenceDate = [
+                    'year'          => $date->year,
+                    'date'          => $date,
+                    'balance'       => 0,
+                    'usd_balance'   => 0,
+                    'investments'   => 0,
+                    'current_value' => 0,
+                    'profit'        => 0,
+                ];
+            }
+
+            $statByYears[$date->year] = [
+                'year'          => $date->year,
+                'date'          => $date,
+                'balance'       => $existenceDate['balance'] + $data['balance'],
+                'usd_balance'   => $existenceDate['usd_balance'] + $data['usd_balance'],
+                'investments'   => $existenceDate['investments'] + $data['investments'],
+                'current_value' => $existenceDate['current_value'] + $data['current_value'],
+                'profit'        => $existenceDate['profit'] + $data['profit'],
+                'profitPercent' => 0,
+            ];
+        }
+
+        foreach ($latestData as $data) {
+            if (isset($statByYears['current'])) {
+                $existenceDate = $statByYears['current'];
+            } else {
+                $existenceDate = [
+                    'year'          => 'current',
+                    'date'          => $data['date'],
+                    'balance'       => 0,
+                    'usd_balance'   => 0,
+                    'investments'   => 0,
+                    'current_value' => 0,
+                    'profit'        => 0,
+                ];
+            }
+
+            $statByYears['current'] = [
+                'year'          => 'current',
+                'date'          => $data['date'],
+                'balance'       => $existenceDate['balance'] + $data['balance'],
+                'usd_balance'   => $existenceDate['usd_balance'] + $data['usd_balance'],
+                'investments'   => $existenceDate['investments'] + $data['investments'],
+                'current_value' => $existenceDate['current_value'] + $data['current_value'],
+                'profit'        => $existenceDate['profit'] + $data['profit'],
+                'profitPercent' => 0,
+            ];
+        }
+
+
+        $prevKey = null;
+        // Calculate profit
+        foreach ($statByYears as $key => $statByYear) {
+            if ($prevKey) {
+                $statByYears[$prevKey]['profitPercent'] = round(($statByYear['profit'] * 100 / $statByYears[$prevKey]['profit']) - 100, 2);
+            }
+            $prevKey = $key;
+        }
+
+        unset($statByYears['current']);
+
+        return $statByYears;
+    }
+}