fix: date calculations cause failed tests

Fix #81

app/Models/CurrencyRate.php

@@ -111,7 +111,7 @@ class CurrencyRate extends Model
      *
      * @return array<string, float>
      */
-    public static function timeSeriesRates(string|array $currency, 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,19 +132,28 @@ class CurrencyRate extends Model
             return $dateRange;
         }
 
-        [$currency, $adjustment] = self::getCurrencyAliasAdjustments($currency);
+        if (is_array($currency)) {
 
+            foreach ($currency as $curr) {
+
+                dispatch(fn () => self::timeSeriesRates($curr, $start, $end));
+            }
+
+            return [];
+        }
+
+        // handle currency alias
         if (! empty($currency)) {
 
-            $currencies = Arr::wrap($currency);
+            [$currency, $adjustment] = self::getCurrencyAliasAdjustments($currency);
 
         } else {
 
-            $currencies = Currency::all()->pluck('currency')->toArray();
+            $currency = Currency::all()->pluck('currency')->toArray();
         }
 
         // get rates
-        $rates = Frankfurter::setSymbols($currencies)->timeSeries($period->first(), $period->last());
+        $rates = Frankfurter::setSymbols($currency)->timeSeries($period->first(), $period->last());
 
         $rates = collect(Arr::get($rates, 'rates', []))->sortKeys()->toArray();
 
@@ -177,13 +186,18 @@ class CurrencyRate extends Model
         // persist
         self::chunkInsert($updates);
 
-        return collect($updates)
+        if (is_string($currency)) {
-            ->whereBetween('date', [$start, $end ?? now()])
+
-            ->where('currency', $currency)
+            return collect($updates)
-            ->mapWithKeys(fn ($rate) => [
+                ->whereBetween('date', [$start, $end ?? now()])
-                $rate['date'] => $rate['rate'] * $adjustment,
+                ->where('currency', $currency)
-            ])
+                ->mapWithKeys(fn ($rate) => [
-            ->toArray();
+                    $rate['date'] => $rate['rate'] * ($adjustment ?? 1),
+                ])
+                ->toArray();
+        }
+
+        return [];
     }
 
     private static function getNearestPastDate(CarbonInterface $date, array $datesOnly, array $rates): ?CarbonInterface
@@ -265,7 +279,7 @@ class CurrencyRate extends Model
         }
     }
 
-    protected static function getCurrencyAliasAdjustments($currency)
+    protected static function getCurrencyAliasAdjustments(string $currency)
     {
         $adjustment = 1;
 

database/migrations/2025_12_28_000001_add_multi_currency_support.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use App\Models\CurrencyRate;
+use App\Models\Holding;
 use App\Models\Transaction;
 use Database\Seeders\CurrencySeeder;
 use Database\Seeders\MarketDataSeeder;
@@ -96,17 +97,17 @@ return new class extends Migration
                 '--force' => true,
             ]);
 
-            CurrencyRate::timeSeriesRates(
-                '', // use fake currency to force
-                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,16 +52,17 @@ class MarketDataSeeder extends Seeder
                     $rowCount++;
 
                     if ($rowCount % $chunkSize == 0) {
-                        DB::table('market_data')->upsert($this->rows, ['symbol'], ['name', 'currency', 'meta_data']);
+                        $this->bulkInsert($rows);
-                        $this->rows = [];
+                        $rows = [];
                     }
                 }
             }
 
             // final clean up
-            if (! empty($this->rows)) {
+            if (! empty($rows)) {
 
-                $this->bulkInsert($this->rows);
+                $this->bulkInsert($rows);
+                $rows = [];
             }
 
             // Close the CSV file
@@ -77,16 +76,17 @@ class MarketDataSeeder extends Seeder
         }
     }
 
-    public function bulkInsert(array $rows)
+    private function bulkInsert($rows): void
     {
         try {
 
-            DB::table('market_data')->insertOrIgnore($rows);
+            DB::table('market_data')->upsert($rows, ['symbol'], ['name', 'currency', 'meta_data']);
-            $this->rows = [];
 
         } catch (\Throwable $e) {
 
             throw new \Exception('Error: '.$e->getMessage());
         }
+
+        gc_collect_cycles();
     }
 }

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 \

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(14464, MarketData::count('symbol'));
+        $this->assertEquals(13187, MarketData::count('symbol'));
     }
 
     public function test_can_get_quote_from_provider()

tests/MultiCurrencyTest.php

@@ -225,8 +225,71 @@ class MultiCurrencyTest extends TestCase
             ->andReturn(['rates' => $results]);
 
         $result = CurrencyRate::timeSeriesRates('ZZZ', $start, $end);
-
         $this->assertEquals(count($period) - 1, count($result));
+
+        $result = CurrencyRate::all();
+        $this->assertEquals(count($period), count($result));
+    }
+
+    public function test_can_get_time_series_rates_with_null_currency()
+    {
+
+        $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,
+            ];
+        });
+
+        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), 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()