fix: division by zero error

Fix #81

app/Models/CurrencyRate.php

@@ -111,7 +111,7 @@ class CurrencyRate extends Model
      *
      * @return array<string, float>
      */
-    public static function timeSeriesRates(?string $currency = null, mixed $start = null, mixed $end = null): array
+    public static function timeSeriesRates(string|array|null $currency = null, mixed $start = null, mixed $end = null): array
     {
         if (empty($start)) {
             return [];
@@ -132,6 +132,18 @@ class CurrencyRate extends Model
             return $dateRange;
         }
 
+        if (is_array($currency)) {
+
+            $i = 1;
+            foreach ($currency as $curr) {
+
+                dispatch(fn () => self::timeSeriesRates($curr, $start, $end))->delay(now()->addSeconds(30 * $i));
+                $i++;
+            }
+
+            return [];
+        }
+
         // handle currency alias
         if (! empty($currency)) {
 

app/Models/DailyChange.php

@@ -99,8 +99,11 @@ class DailyChange extends Model
                 'tx1.quantity',
             ])
             ->selectRaw("(CASE
-                WHEN tx1.transaction_type = 'BUY'
-                    THEN COALESCE(cr.rate, 1)
+                WHEN 
+                    tx1.transaction_type = 'BUY' 
+                    OR SUM(tx1.cost_basis_base) = 0
+                THEN 
+                    COALESCE(cr.rate, 1)
                 ELSE (
                     SELECT
                         SUM(COALESCE(cr2.rate, 1) * buy.cost_basis_base)

app/Models/Holding.php

@@ -302,8 +302,11 @@ class Holding extends Model
                             ])
                             ->selectRaw(
                                 "(CASE
-                                        WHEN transactions.transaction_type = 'BUY'
-                                            THEN COALESCE(cr.rate, 1)
+                                        WHEN 
+                                            transactions.transaction_type = 'BUY'
+                                            OR SUM(transactions.cost_basis_base) = 0
+                                        THEN 
+                                            COALESCE(cr.rate, 1)
                                         ELSE (
                                             SELECT
                                                 SUM(COALESCE(cr2.rate, 1) * buy.cost_basis_base)

database/migrations/2025_12_28_000001_add_multi_currency_support.php

@@ -8,6 +8,7 @@ use App\Models\Transaction;
 use Database\Seeders\CurrencySeeder;
 use Database\Seeders\MarketDataSeeder;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
@@ -24,10 +25,15 @@ return new class extends Migration
          * Add options column to users table
          */
         Schema::table('users', function (Blueprint $table) {
-            $table->json('options')->default(json_encode([
-                'locale' => config('app.locale', 'en'),
-                'display_currency' => config('investbrain.base_currency', 'USD'),
-            ]))->after('profile_photo_path');
+
+            $locale = config('app.locale', 'en');
+            $currency = config('investbrain.base_currency', 'USD');
+
+            $default = config('database.default') === 'mysql'
+                ? new Expression("(JSON_OBJECT('locale', '{$locale}', 'display_currency', '{$currency}'))")
+                : json_encode(['locale' => $locale, 'display_currency' => $currency]);
+
+            $table->json('options')->default($default)->after('profile_photo_path');
         });
 
         /**
@@ -97,22 +103,17 @@ return new class extends Migration
                 '--force' => true,
             ]);
 
-            Holding::all()->groupBy('market_data.currency')->keys()->each(
-                fn ($currency) => dispatch(
-                    function () use ($currency) {
-                        CurrencyRate::timeSeriesRates(
-                            $currency,
-                            Transaction::min('date')
-                        );
-                    })
-            );
-
-            CurrencyRate::refreshCurrencyData();
-
             Artisan::call('db:seed', [
                 '--class' => MarketDataSeeder::class,
                 '--force' => true,
             ]);
+
+            CurrencyRate::timeSeriesRates(
+                Holding::all()->groupBy('market_data.currency')->keys()->toArray(),
+                Transaction::min('date')
+            );
+
+            CurrencyRate::refreshCurrencyData();
         }
 
         /**

database/seeders/MarketDataSeeder.php

@@ -12,8 +12,6 @@ class MarketDataSeeder extends Seeder
 {
     use WithoutModelEvents;
 
-    public array $rows = [];
-
     /**
      * Run the database seeds.
      */
@@ -44,7 +42,7 @@ class MarketDataSeeder extends Seeder
                     $meta_data = json_decode(base64_decode($data['meta_data']), true);
                     $meta_data['source'] = 'market_data_seeder';
 
-                    $this->rows[] = [
+                    $rows[] = [
                         'symbol' => $data['symbol'],
                         'name' => $data['name'],
                         'currency' => $data['currency'],
@@ -54,15 +52,17 @@ class MarketDataSeeder extends Seeder
                     $rowCount++;
 
                     if ($rowCount % $chunkSize == 0) {
-                        $this->bulkInsert($this->rows);
+                        $this->bulkInsert($rows);
+                        $rows = [];
                     }
                 }
             }
 
             // final clean up
-            if (! empty($this->rows)) {
+            if (! empty($rows)) {
 
-                $this->bulkInsert($this->rows);
+                $this->bulkInsert($rows);
+                $rows = [];
             }
 
             // Close the CSV file
@@ -76,19 +76,17 @@ class MarketDataSeeder extends Seeder
         }
     }
 
-    public function bulkInsert($rows)
+    private function bulkInsert($rows): void
     {
         try {
 
-            dispatch(
-                fn () => DB::table('market_data')->upsert($rows, ['symbol'], ['name', 'currency', 'meta_data'])
-            );
-
-            $this->rows = [];
+            DB::table('market_data')->upsert($rows, ['symbol'], ['name', 'currency', 'meta_data']);
 
         } catch (\Throwable $e) {
 
             throw new \Exception('Error: '.$e->getMessage());
         }
+
+        gc_collect_cycles();
     }
 }

docker-compose.yml

@@ -11,9 +11,9 @@ services:
       - 8000:80
     environment: # You can either use these properties OR an .env file. Do not use both!
       APP_URL: "http://localhost:8000"
-      DB_CONNECTION: mysql
-      DB_HOST: investbrain-mysql
-      DB_PORT: 3306
+      DB_CONNECTION: pgsql
+      DB_HOST: investbrain-pgsql
+      DB_PORT: 5432
       DB_DATABASE: investbrain
       DB_USERNAME: investbrain
       DB_PASSWORD: investbrain
@@ -25,7 +25,7 @@ services:
       - investbrain-storage:/var/app/storage # You can use a volume... 
       # - /path/to/storage:/var/app/storage:delegated # ...or you can use a path on host
     depends_on:
-      - mysql
+      - pgsql
       - redis
     networks:
       - investbrain-network
@@ -40,22 +40,22 @@ services:
       - investbrain-redis:/data
     networks:
       - investbrain-network
-  mysql:
-    image: mysql:8.0
-    container_name: investbrain-mysql
+  pgsql:
+    image: postgres:15-alpine
+    container_name: investbrain-pgsql
     restart: unless-stopped
+    ports:
+      - "5432:5432"
     environment:
-      MYSQL_DATABASE: ${DB_DATABASE:-investbrain}
-      MYSQL_USER: ${DB_USERNAME:-investbrain}
-      MYSQL_PASSWORD: ${DB_PASSWORD:-investbrain}
-      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-investbrain}
-    command: 
-      - --cte-max-recursion-depth=25000
+      POSTGRES_DB: ${DB_DATABASE:-investbrain}
+      POSTGRES_USER: ${DB_USERNAME:-investbrain}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-investbrain}
+    command: postgres -c log_min_messages=error
     volumes:
-      - investbrain-mysql:/var/lib/mysql
+      - investbrain-pgsql:/var/lib/postgresql/data
     networks:
       - investbrain-network
 volumes:
   investbrain-storage:
   investbrain-redis:
-  investbrain-mysql:
+  investbrain-pgsql:

docker/Dockerfile

@@ -62,7 +62,7 @@ RUN apk add --no-cache \
         bash \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) \
-        gd pgsql zip pdo_mysql mysqli intl 
+        gd pgsql zip pdo_mysql pdo_pgsql mysqli intl 
 
 # Remove default nginx config
 RUN rm -rf /var/www/html \

docker/entrypoint.sh

@@ -3,7 +3,7 @@
 cd /var/app
 
 # Starting Investbrain
-echo "CiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICAqICBJSUkgICBOICAgTiAgViAgIFYgIEVFRUVFICBTU1NTICBUVFRUVCAgQkJCQkIgICBSUlJSICAgIEFBQUFBICBJSUkgICBOICAgTiAgKgogICogICBJICAgIE5OICBOICBWICAgViAgRSAgICAgIFMgICAgICAgVCAgICBCICAgIEIgIFIgICBSICAgQSAgIEEgICBJICAgIE5OICBOICAqCiAgKiAgIEkgICAgTiBOIE4gIFYgICBWICBFRUVFICAgU1NTUyAgICBUICAgIEJCQkJCICAgUlJSUiAgICBBQUFBQSAgIEkgICAgTiBOIE4gICoKICAqICAgSSAgICBOICBOTiAgViAgIFYgIEUgICAgICAgICAgUyAgIFQgICAgQiAgICBCICBSICBSICAgIEEgICBBICAgSSAgICBOICBOTiAgKgogICogIElJSSAgIE4gICBOICAgVlZWICAgRUVFRUUgIFNTU1MgICAgVCAgICBCQkJCQiAgIFIgICBSICAgQSAgIEEgIElJSSAgIE4gICBOICAqCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICA=" | base64 -d
+echo "CuKWhOKWliAgICAgICAg4paXIOKWjCAgICAg4paYICAK4paQIOKWm+KWjOKWjOKWjOKWiOKWjOKWm+KWmOKWnOKWmOKWm+KWjOKWm+KWmOKWgOKWjOKWjOKWm+KWjArilp/ilpbilozilozilprilpjilpnilpbiloTilozilpDilpbilpnilozilowg4paI4paM4paM4paM4paMCg==" | base64 -d
 
 echo -e "\n====================== Validating environment...  ====================== "
 
@@ -54,7 +54,6 @@ RETRIES=12
 DELAY=5
 run_migrations() {
     sleep $DELAY
-    # php artisan migrate --force
     output=$(php artisan migrate --force 2>/dev/null)
     if [[ $? -eq 0 ]]; then
         echo "$output"
@@ -72,7 +71,18 @@ until run_migrations; do
   echo -e "\n > Waiting for database to be ready... retrying in $DELAY seconds. \n"
 done
 
+echo -e "\n====================== Cleaning up...  ====================== \n"
+
+# Clear caches
+echo $(php artisan cache:clear)
+echo $(php artisan view:clear)
+echo $(php artisan route:clear)
+echo $(php artisan event:clear)
+
+# Re-create caches
+echo $(php artisan route:cache)
+echo $(php artisan event:cache)
+
 echo -e "\n====================== Spinning up Supervisor daemon...  ====================== \n"
 
 exec supervisord -c /etc/supervisor/conf.d/supervisord.conf
-

tests/DailyChangeTest.php

@@ -221,7 +221,7 @@ class DailyChangeTest extends TestCase
         $second_transaction = Transaction::create([
             'symbol' => 'AAPL',
             'portfolio_id' => $portfolio->id,
-            'date' => now()->subYears(3),
+            'date' => now()->subDays(1080), // 3 years
             'quantity' => 1,
             'cost_basis' => 39.89,
             'transaction_type' => 'BUY',

tests/MarketDataTest.php

@@ -21,7 +21,7 @@ class MarketDataTest extends TestCase
             '--force' => true,
         ]);
 
-        $this->assertEquals(14262, MarketData::count('symbol'));
+        $this->assertEquals(13187, MarketData::count('symbol'));
     }
 
     public function test_can_get_quote_from_provider()

tests/MultiCurrencyTest.php

@@ -261,6 +261,37 @@ class MultiCurrencyTest extends TestCase
         $this->assertEquals(count($period), count($result));
     }
 
+    public function test_can_get_time_series_rates_with_currencies()
+    {
+
+        $start = now()->subWeeks(2);
+        $end = now();
+
+        $period = CarbonPeriod::create($start, $end);
+
+        // mock response from Frankfurter
+        $results = [];
+        collect($period->copy()->filter('isWeekday'))->each(function ($date) use (&$results) {
+            $date = $date->toDateString();
+
+            $results[$date] = [
+                'FOO' => random_int(10, 150) / 1000,
+                'BAR' => random_int(10, 150) / 1000,
+            ];
+        });
+
+        Frankfurter::expects('setSymbols')
+            ->andReturnSelf();
+        Frankfurter::expects('timeSeries')
+            ->andReturn(['rates' => $results]);
+
+        $result = CurrencyRate::timeSeriesRates(null, $start, $end);
+        $this->assertEquals(0, count($result));
+
+        $result = CurrencyRate::all();
+        $this->assertEquals(count($period) * 2, count($result));
+    }
+
     public function test_time_series_rate_calls_are_chunked()
     {