From 3f8a4b511900cea9e68e24960b2b63f2c7d8dc81 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Tue, 27 Feb 2024 15:20:15 +0100
Subject: [PATCH] [accelerator] move accel stats into backend

---
 .../acceleration-stats.component.html         |  6 +--
 .../acceleration-stats.component.ts           | 43 ++++++-------------
 .../accelerator-dashboard.component.html      |  2 +-
 .../accelerator-dashboard.component.ts        |  4 +-
 .../src/app/services/services-api.service.ts  |  5 +++
 5 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
index 5e8aa729a..fef91acc0 100644
--- a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
+++ b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
@@ -3,16 +3,16 @@
     <div class="item">
       <h5 class="card-title" i18n="accelerator.requests">Requests</h5>
       <div class="card-text">
-        <div>{{ stats.count }}</div>
+        <div>{{ stats.totalRequested }}</div>
         <div class="symbol" i18n="accelerator.total-accelerated">accelerated</div>
       </div>
     </div>
     <div class="item">
       <h5 class="card-title" i18n="accelerator.total-boost">Total Bid Boost</h5>
       <div class="card-text">
-        <div>{{ stats.totalFeesPaid / 100_000_000 | amountShortener: 4 }} <span class="symbol" i18n="shared.btc|BTC">BTC</span></div>
+        <div>{{ stats.totalBidBoost / 100_000_000 | amountShortener: 4 }} <span class="symbol" i18n="shared.btc|BTC">BTC</span></div>
         <span class="fiat">
-          <app-fiat [value]="stats.totalFeesPaid"></app-fiat>
+          <app-fiat [value]="stats.totalBidBoost"></app-fiat>
         </span>
       </div>
     </div>
diff --git a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts
index 0a6ef065c..29909ff39 100644
--- a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts
+++ b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts
@@ -1,9 +1,12 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { Observable, of } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-import { ApiService } from '../../../services/api.service';
-import { StateService } from '../../../services/state.service';
-import { Acceleration } from '../../../interfaces/node-api.interface';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ServicesApiServices } from '../../../services/services-api.service';
+
+export type AccelerationStats = {
+  totalRequested: number;
+  totalBidBoost: number;
+  successRate: number;
+}
 
 @Component({
   selector: 'app-acceleration-stats',
@@ -12,35 +15,13 @@ import { Acceleration } from '../../../interfaces/node-api.interface';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccelerationStatsComponent implements OnInit {
-  @Input() timespan: '24h' | '1w' | '1m' = '24h';
-  @Input() accelerations$: Observable<Acceleration[]>;
-  public accelerationStats$: Observable<any>;
+  accelerationStats$: Observable<AccelerationStats>;
 
   constructor(
-    private apiService: ApiService,
-    private stateService: StateService,
+    private servicesApiService: ServicesApiServices
   ) { }
 
   ngOnInit(): void {
-    this.accelerationStats$ = this.accelerations$.pipe(
-      switchMap(accelerations => {
-        let totalFeesPaid = 0;
-        let totalSucceeded = 0;
-        let totalCanceled = 0;
-        for (const acc of accelerations) {
-          if (acc.status === 'completed') {
-            totalSucceeded++;
-            totalFeesPaid += (acc.feePaid - acc.baseFee - acc.vsizeFee) || 0;
-          } else if (acc.status === 'failed') {
-            totalCanceled++;
-          }
-        }
-        return of({
-          count: totalSucceeded,
-          totalFeesPaid,
-          successRate: (totalSucceeded + totalCanceled > 0) ? ((totalSucceeded / (totalSucceeded + totalCanceled)) * 100) : 0.0,
-        });
-      })
-    );
+    this.accelerationStats$ = this.servicesApiService.getAccelerationStats$();
   }
 }
diff --git a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
index 0fd70269c..0afae6e7b 100644
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
@@ -27,7 +27,7 @@
       <div class="card-wrapper">
         <div class="card">
           <div class="card-body more-padding">
-            <app-acceleration-stats timespan="1m" [accelerations$]="minedAccelerations$"></app-acceleration-stats>
+            <app-acceleration-stats timespan="1m"></app-acceleration-stats>
           </div>
         </div>
       </div>
diff --git a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
index a2abc657a..57cb605ca 100644
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
@@ -60,7 +60,7 @@ export class AcceleratorDashboardComponent implements OnInit {
     this.accelerations$ = this.stateService.chainTip$.pipe(
       distinctUntilChanged(),
       switchMap(() => {
-        return this.serviceApiServices.getAccelerationHistory$({ timeframe: '1m' }).pipe(
+        return this.serviceApiServices.getAccelerationHistory$({ timeframe: '1m', page: 1, pageLength: 100}).pipe(
           catchError(() => {
             return of([]);
           }),
@@ -71,7 +71,7 @@ export class AcceleratorDashboardComponent implements OnInit {
 
     this.minedAccelerations$ = this.accelerations$.pipe(
       map(accelerations => {
-        return accelerations.filter(acc => ['mined', 'completed', 'failed'].includes(acc.status));
+        return accelerations.filter(acc => ['mined', 'completed'].includes(acc.status));
       })
     );
 
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index a1f023b9b..a2e62cf36 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -7,6 +7,7 @@ import { MenuGroup } from '../interfaces/services.interface';
 import { Observable, of, ReplaySubject, tap, catchError, share, filter, switchMap } from 'rxjs';
 import { IBackendInfo } from '../interfaces/websocket.interface';
 import { Acceleration, AccelerationHistoryParams } from '../interfaces/node-api.interface';
+import { AccelerationStats } from '../components/acceleration/acceleration-stats/acceleration-stats.component';
 
 export type ProductType = 'enterprise' | 'community' | 'mining_pool' | 'custom';
 export interface IUser {
@@ -151,4 +152,8 @@ export class ServicesApiServices {
   getAccelerationHistoryObserveResponse$(params: AccelerationHistoryParams): Observable<any> {
     return this.httpClient.get<any>(`${SERVICES_API_PREFIX}/accelerator/accelerations/history`, { params: { ...params }, observe: 'response'});
   }
+
+  getAccelerationStats$(): Observable<AccelerationStats> {
+    return this.httpClient.get<AccelerationStats>(`${SERVICES_API_PREFIX}/accelerator/stats`);
+  }
 }