Showing btc balance

manelgavalda · Jan 13, 2024 · 2050265 · 2050265
1 parent 4d4820f
commit 2050265
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 80 deletions.
diff --git a/app/Models/Total.php b/app/Models/Total.php
@@ -11,7 +11,8 @@ class Total extends Model
     protected $casts = [
         'price' => 'float',
         'balance' => 'float',
+        'price_eur' => 'float',
         'btc_price' => 'float',
-        'price_eur' => 'float'
+        'btc_price_eur' => 'float'
     ];
 }
diff --git a/app/Services/SupabaseService.php b/app/Services/SupabaseService.php
@@ -22,11 +22,13 @@ public function getHistoricalBalances()
         return [
             'prices' => $balances->pluck('price')->toArray(),
             'ethereum' => $balances->pluck('balance')->toArray(),
-            'bitcoin' => $balances->pluck('btc_price')->toArray(),
+            'btc_prices' => $balances->pluck('btc_price')->toArray(),
             'prices_eur' => $balances->pluck('price_eur')->toArray(),
+            'btc_prices_eur' => $balances->pluck('btc_price_eur')->toArray(),
             'totals' => $balances->map(fn ($balance) => $balance->price * $balance->balance)->toArray(),
             'totals_eur' => $balances->map(fn ($balance) => $balance->price_eur * $balance->balance)->toArray(),
-            'dates' => $balances->map(fn ($balance) => Carbon::parse($balance->created_at)->format('M d Y'))->toArray()
+            'dates' => $balances->map(fn ($balance) => Carbon::parse($balance->created_at)->format('M d Y'))->toArray(),
+            'bitcoin' => $balances->map(fn ($balance) => $balance->btc_price ? (($balance->price * $balance->balance) / $balance->btc_price) : null)->toArray()
         ];
     }
 }
diff --git a/database/migrations/2024_01_11_120158_create_totals_table.php b/database/migrations/2024_01_11_120158_create_totals_table.php
@@ -17,6 +17,7 @@ public function up(): void
             $table->string('balance');
             $table->string('price_eur');
             $table->string('btc_price')->nullable();
+            $table->string('btc_price_eur')->nullable();
             $table->timestamps();
         });
     }

diff --git a/public/build/assets/app2.js b/public/build/assets/app2.js
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
@@ -16,6 +16,7 @@
         :dates="balances.dates"
         :data="balances.ethereum"
         :total="totals.eth.toFixed(3)"
+        :subtotal="`(${totals.btc.toFixed(3)} BTC)`"
       />
     </div>
     <div class="w-1/3">
@@ -226,6 +227,7 @@
     created() {
       this.totals = {
         usd: this.balances.totals.at(-1),
+        btc: this.balances.bitcoin.at(-1),
         eth: this.balances.ethereum.at(-1),
         eur: this.balances.totals_eur.at(-1),
         pricesUsd: this.balances.prices.at(-1),
@@ -282,15 +284,18 @@
           this.totals = {
             usd: 0,
             eth: 0,
+            btc: 0,
             eur: 0,
             pricesEur: data.ethereumPrice.eur,
-            pricesUsd: data.ethereumPrice.usd
+            pricesUsd: data.ethereumPrice.usd,
+            btcPricesUsd: data.bitcoinPrice.usd
           }
 
           data.balances.forEach(token => {
             this.totals.usd += token.price * token.balance
             this.totals.eur += token.price_eur * token.balance
             this.totals.eth += token.price * token.balance / this.totals.pricesUsd
+            this.totals.btc += token.price * token.balance / this.totals.btcPricesUsd
           })
 
           this.loading = false

diff --git a/resources/js/components/Dashboard/BalancesChart.vue b/resources/js/components/Dashboard/BalancesChart.vue
@@ -8,7 +8,7 @@
         <div class="flex items-start ">
           <div class="text-right mr-2 text-slate-800 dark:text-slate-100">
             <div class="text-3xl font-bold">{{ total }}</div>
-            <div class="text-xl font-semibold h-1">{{ subtotal }}</div>
+            <div class="text-lg font-semibold h-2">{{ subtotal }}</div>
           </div>
           <div class="text-sm font-semibold text-white px-1.5 rounded-full" :class="{
             'bg-red-700': getChange() < 0,

diff --git a/resources/views/components/dashboard/chart.blade.php b/resources/views/components/dashboard/chart.blade.php
diff --git a/resources/views/components/dashboard/simple-chart.blade.php b/resources/views/components/dashboard/simple-chart.blade.php
diff --git a/tests/Unit/SupabaseServiceTest.php b/tests/Unit/SupabaseServiceTest.php
@@ -25,11 +25,13 @@ function createEntries($type) {
 
     expect(end($dates))->toBe('Nov 08 2024');
     expect(end($this->balances['prices']))->toBe(2000.0);
-    expect(end($this->balances['bitcoin']))->toBe(20000.0);
+    expect(end($this->balances['bitcoin']))->toBe(200.0);
     expect(end($this->balances['ethereum']))->toBe(2000.0);
     expect(end($this->balances['totals']))->toBe(4000000.0);
     expect(end($this->balances['prices_eur']))->toBe(1900.0);
+    expect(end($this->balances['btc_prices']))->toBe(20000.0);
     expect(end($this->balances['totals_eur']))->toBe(3800000.0);
+    expect(end($this->balances['btc_prices_eur']))->toBe(19000.0);
 
     expect(Carbon::parse($dates[0])->lt(Carbon::createFromFormat('M d Y', end($dates))))->toBetrue();
 });

diff --git a/tests/responses/totals.json b/tests/responses/totals.json
@@ -4,6 +4,7 @@
       "price_eur": 1900,
       "balance": 2000,
       "btc_price": 20000,
+      "btc_price_eur": 19000,
       "created_at": "2024-11-08T00:00:00.000000+00:00"
    },
    {