Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 689aa4d50b | |||
| 26370c03c4 |
+18
-14
@@ -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 $currency = null, mixed $start = null, mixed $end = null): array
|
||||
{
|
||||
if (empty($start)) {
|
||||
return [];
|
||||
@@ -132,19 +132,18 @@ class CurrencyRate extends Model
|
||||
return $dateRange;
|
||||
}
|
||||
|
||||
[$currency, $adjustment] = self::getCurrencyAliasAdjustments($currency);
|
||||
|
||||
// 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 +176,18 @@ class CurrencyRate extends Model
|
||||
// persist
|
||||
self::chunkInsert($updates);
|
||||
|
||||
return collect($updates)
|
||||
->whereBetween('date', [$start, $end ?? now()])
|
||||
->where('currency', $currency)
|
||||
->mapWithKeys(fn ($rate) => [
|
||||
$rate['date'] => $rate['rate'] * $adjustment,
|
||||
])
|
||||
->toArray();
|
||||
if (is_string($currency)) {
|
||||
|
||||
return collect($updates)
|
||||
->whereBetween('date', [$start, $end ?? now()])
|
||||
->where('currency', $currency)
|
||||
->mapWithKeys(fn ($rate) => [
|
||||
$rate['date'] => $rate['rate'] * ($adjustment ?? 1),
|
||||
])
|
||||
->toArray();
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
private static function getNearestPastDate(CarbonInterface $date, array $datesOnly, array $rates): ?CarbonInterface
|
||||
@@ -265,7 +269,7 @@ class CurrencyRate extends Model
|
||||
}
|
||||
}
|
||||
|
||||
protected static function getCurrencyAliasAdjustments($currency)
|
||||
protected static function getCurrencyAliasAdjustments(string $currency)
|
||||
{
|
||||
$adjustment = 1;
|
||||
|
||||
|
||||
@@ -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,9 +97,14 @@ return new class extends Migration
|
||||
'--force' => true,
|
||||
]);
|
||||
|
||||
CurrencyRate::timeSeriesRates(
|
||||
'', // use fake currency to force
|
||||
Transaction::min('date')
|
||||
Holding::all()->groupBy('market_data.currency')->keys()->each(
|
||||
fn ($currency) => dispatch(
|
||||
function () use ($currency) {
|
||||
CurrencyRate::timeSeriesRates(
|
||||
$currency,
|
||||
Transaction::min('date')
|
||||
);
|
||||
})
|
||||
);
|
||||
|
||||
CurrencyRate::refreshCurrencyData();
|
||||
|
||||
@@ -54,8 +54,7 @@ class MarketDataSeeder extends Seeder
|
||||
$rowCount++;
|
||||
|
||||
if ($rowCount % $chunkSize == 0) {
|
||||
DB::table('market_data')->upsert($this->rows, ['symbol'], ['name', 'currency', 'meta_data']);
|
||||
$this->rows = [];
|
||||
$this->bulkInsert($this->rows);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -77,11 +76,14 @@ class MarketDataSeeder extends Seeder
|
||||
}
|
||||
}
|
||||
|
||||
public function bulkInsert(array $rows)
|
||||
public function bulkInsert($rows)
|
||||
{
|
||||
try {
|
||||
|
||||
DB::table('market_data')->insertOrIgnore($rows);
|
||||
dispatch(
|
||||
fn () => DB::table('market_data')->upsert($rows, ['symbol'], ['name', 'currency', 'meta_data'])
|
||||
);
|
||||
|
||||
$this->rows = [];
|
||||
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,7 @@ class MarketDataTest extends TestCase
|
||||
'--force' => true,
|
||||
]);
|
||||
|
||||
$this->assertEquals(14464, MarketData::count('symbol'));
|
||||
$this->assertEquals(14262, MarketData::count('symbol'));
|
||||
}
|
||||
|
||||
public function test_can_get_quote_from_provider()
|
||||
|
||||
@@ -225,8 +225,40 @@ 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_time_series_rate_calls_are_chunked()
|
||||
|
||||
Reference in New Issue
Block a user