- Made `/api/auth/me` public and return explicit allowlist (name, email, two_factor_confirmed_at, tier, subscription fields) instead of spreading `$user->toArray()` which leaked is_admin, stripe_id, pm_type, pm_last_four, postcode. Returns `null` when unauthenticated rather than 401. - Moved `/auth/logout` to remain behind auth:sanctum gate. - Added 3×200ms retry with exponential backoff to EiaBrentPriceSource and FredBrentPriceSource on ConnectionException or 5xx responses. Timeout raised from 10s to 30s. - Both sources now throw typed BrentPriceFetchException on exhausted retries instead of silently returning null + logging. Updated tests to assert exception message includes HTTP status or "connection failed".
147 lines
4.5 KiB
PHP
147 lines
4.5 KiB
PHP
<?php
|
|
|
|
use App\Models\BrentPrice;
|
|
use App\Services\ApiLogger;
|
|
use App\Services\BrentPriceFetcher;
|
|
use App\Services\BrentPriceSources\BrentPriceFetchException;
|
|
use App\Services\BrentPriceSources\EiaBrentPriceSource;
|
|
use App\Services\BrentPriceSources\FredBrentPriceSource;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Http;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
beforeEach(function (): void {
|
|
Http::preventStrayRequests();
|
|
$apiLogger = new ApiLogger;
|
|
$this->fetcher = new BrentPriceFetcher(
|
|
new EiaBrentPriceSource($apiLogger),
|
|
new FredBrentPriceSource($apiLogger),
|
|
);
|
|
});
|
|
|
|
it('fetches and stores brent prices from EIA', function (): void {
|
|
Http::fake([
|
|
'*eia.gov/*' => Http::response([
|
|
'response' => [
|
|
'data' => [
|
|
['period' => '2026-04-02', 'value' => '73.80'],
|
|
['period' => '2026-04-01', 'value' => '75.10'],
|
|
],
|
|
],
|
|
]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromEia();
|
|
|
|
expect(BrentPrice::count())->toBe(2)
|
|
->and(BrentPrice::find('2026-04-02')->price_usd)->toBe('73.80');
|
|
});
|
|
|
|
it('throws with HTTP status when EIA returns a 500', function (): void {
|
|
Http::fake(['*eia.gov/*' => Http::response([], 500)]);
|
|
|
|
expect(fn () => $this->fetcher->fetchFromEia())
|
|
->toThrow(BrentPriceFetchException::class, 'EIA returned HTTP 500');
|
|
});
|
|
|
|
it('retries EIA on transient 500 and succeeds', function (): void {
|
|
Http::fake([
|
|
'*eia.gov/*' => Http::sequence()
|
|
->push([], 500)
|
|
->push(['response' => ['data' => [['period' => '2026-04-01', 'value' => '75.10']]]]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromEia();
|
|
|
|
expect(BrentPrice::count())->toBe(1);
|
|
});
|
|
|
|
it('throws when EIA returns empty data', function (): void {
|
|
Http::fake(['*eia.gov/*' => Http::response(['response' => ['data' => []]])]);
|
|
|
|
$this->fetcher->fetchFromEia();
|
|
})->throws(BrentPriceFetchException::class);
|
|
|
|
it('filters out EIA missing value markers', function (): void {
|
|
Http::fake([
|
|
'*eia.gov/*' => Http::response([
|
|
'response' => [
|
|
'data' => [
|
|
['period' => '2026-04-01', 'value' => '75.10'],
|
|
['period' => '2026-04-02', 'value' => '.'],
|
|
['period' => '2026-04-03', 'value' => '74.20'],
|
|
],
|
|
],
|
|
]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromEia();
|
|
|
|
expect(BrentPrice::count())->toBe(2)
|
|
->and(BrentPrice::find('2026-04-02'))->toBeNull();
|
|
});
|
|
|
|
it('fetches and stores brent prices from FRED', function (): void {
|
|
Http::fake([
|
|
'*/fred/series/observations*' => Http::response([
|
|
'observations' => [
|
|
['date' => '2026-04-01', 'value' => '75.10'],
|
|
['date' => '2026-04-02', 'value' => '73.80'],
|
|
],
|
|
]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromFred();
|
|
|
|
expect(BrentPrice::count())->toBe(2);
|
|
});
|
|
|
|
it('throws with HTTP status when FRED returns a 500', function (): void {
|
|
Http::fake(['*/fred/series/observations*' => Http::response([], 500)]);
|
|
|
|
expect(fn () => $this->fetcher->fetchFromFred())
|
|
->toThrow(BrentPriceFetchException::class, 'FRED returned HTTP 500');
|
|
});
|
|
|
|
it('retries FRED on transient 500 and succeeds', function (): void {
|
|
Http::fake([
|
|
'*/fred/series/observations*' => Http::sequence()
|
|
->push([], 500)
|
|
->push(['observations' => [['date' => '2026-04-01', 'value' => '75.10']]]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromFred();
|
|
|
|
expect(BrentPrice::count())->toBe(1);
|
|
});
|
|
|
|
it('filters out FRED missing value markers', function (): void {
|
|
Http::fake([
|
|
'*/fred/series/observations*' => Http::response([
|
|
'observations' => [
|
|
['date' => '2026-04-01', 'value' => '75.10'],
|
|
['date' => '2026-04-02', 'value' => '.'],
|
|
],
|
|
]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromFred();
|
|
|
|
expect(BrentPrice::count())->toBe(1);
|
|
});
|
|
|
|
it('upserts existing rows on refetch', function (): void {
|
|
Http::fake([
|
|
'*eia.gov/*' => Http::sequence()
|
|
->push(['response' => ['data' => [['period' => '2026-04-01', 'value' => '74.00']]]])
|
|
->push(['response' => ['data' => [['period' => '2026-04-01', 'value' => '75.50']]]]),
|
|
]);
|
|
|
|
$this->fetcher->fetchFromEia();
|
|
$this->fetcher->fetchFromEia();
|
|
|
|
expect(BrentPrice::count())->toBe(1)
|
|
->and(BrentPrice::find('2026-04-01')->price_usd)->toBe('75.50');
|
|
});
|