Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions scraper.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use BOA\Programs\ProgramScraper;
use BOA\Programs\ProgramStorage;
use BOA\Programs\ScraperAdapter;
use BVP\Scraper\Scraper;
use Carbon\CarbonImmutable as Carbon;

Expand All @@ -17,9 +18,9 @@

// v2 の場合のみ ProgramScraper を利用して出走表データを取得
if ($version === 'v2') {
$scraper = new ProgramScraper(
Scraper::getInstance()
);
$scraperInstance = Scraper::getInstance();
$scraperAdapter = new ScraperAdapter($scraperInstance);
$scraper = new ProgramScraper($scraperAdapter);

// 指定日付の出走表データをスクレイピング
$programs = $scraper->scrape($date);
Expand Down
5 changes: 2 additions & 3 deletions src/ProgramScraper.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace BOA\Programs;

use BVP\Scraper\Scraper;
use Carbon\CarbonImmutable as Carbon;
use Carbon\CarbonInterface;

Expand All @@ -14,9 +13,9 @@
final class ProgramScraper
{
/**
* @param \BVP\Scraper\Scraper $scraper
* @param \BOA\Programs\ScraperInterface $scraper
*/
public function __construct(private readonly Scraper $scraper)
public function __construct(private readonly ScraperInterface $scraper)
{
//
}
Expand Down
72 changes: 72 additions & 0 deletions src/ScraperAdapter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php

declare(strict_types=1);

namespace BOA\Programs;

use BVP\Scraper\Scraper;
use Carbon\CarbonInterface;

/**
* @author shimomo
*/
final class ScraperAdapter implements ScraperInterface
{
/**
* @param \BVP\Scraper\Scraper $scraper
*/
public function __construct(private readonly Scraper $scraper)
{
//
}

/**
* @psalm-type ScrapedBoat = array{
* racer_boat_number: int,
* racer_name: string,
* racer_number: int,
* racer_class_number: int,
* racer_branch_number: int,
* racer_birthplace_number: int,
* racer_age: int,
* racer_weight: float,
* racer_flying_count: int,
* racer_late_count: int,
* racer_average_start_timing: float,
* racer_national_top_1_percent: float,
* racer_national_top_2_percent: float,
* racer_national_top_3_percent: float,
* racer_local_top_1_percent: float,
* racer_local_top_2_percent: float,
* racer_local_top_3_percent: float,
* racer_assigned_motor_number: int,
* racer_assigned_motor_top_2_percent: float,
* racer_assigned_motor_top_3_percent: float,
* racer_assigned_boat_number: int,
* racer_assigned_boat_top_2_percent: float,
* racer_assigned_boat_top_3_percent: float
* }
* @psalm-type ScrapedRace = array{
* race_date: string,
* race_stadium_number: int,
* race_number: int,
* race_closed_at: string,
* race_grade_number: int,
* race_title: string,
* race_subtitle: string,
* race_distance: int,
* boats: array<int, ScrapedBoat>
* }
* @psalm-type ScrapedRaces = array<int, ScrapedRace>
* @psalm-type ScrapedStadiumRaces = array<int, ScrapedRaces>
*
* @param \Carbon\CarbonInterface $date
* @return ScrapedStadiumRaces
*/
#[\Override]
public function scrapePrograms(CarbonInterface $date): array
{
/** @psalm-var ScrapedStadiumRaces */
return $this->scraper->scrapePrograms($date);
}
}
58 changes: 58 additions & 0 deletions src/ScraperInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

declare(strict_types=1);

namespace BOA\Programs;

use Carbon\CarbonInterface;

/**
* @author shimomo
*/
interface ScraperInterface
{
/**
* @psalm-type ScrapedBoat = array{
* racer_boat_number: int,
* racer_name: string,
* racer_number: int,
* racer_class_number: int,
* racer_branch_number: int,
* racer_birthplace_number: int,
* racer_age: int,
* racer_weight: float,
* racer_flying_count: int,
* racer_late_count: int,
* racer_average_start_timing: float,
* racer_national_top_1_percent: float,
* racer_national_top_2_percent: float,
* racer_national_top_3_percent: float,
* racer_local_top_1_percent: float,
* racer_local_top_2_percent: float,
* racer_local_top_3_percent: float,
* racer_assigned_motor_number: int,
* racer_assigned_motor_top_2_percent: float,
* racer_assigned_motor_top_3_percent: float,
* racer_assigned_boat_number: int,
* racer_assigned_boat_top_2_percent: float,
* racer_assigned_boat_top_3_percent: float
* }
* @psalm-type ScrapedRace = array{
* race_date: string,
* race_stadium_number: int,
* race_number: int,
* race_closed_at: string,
* race_grade_number: int,
* race_title: string,
* race_subtitle: string,
* race_distance: int,
* boats: array<int, ScrapedBoat>
* }
* @psalm-type ScrapedRaces = array<int, ScrapedRace>
* @psalm-type ScrapedStadiumRaces = array<int, ScrapedRaces>
*
* @param \Carbon\CarbonInterface $date
* @return ScrapedStadiumRaces
*/
public function scrapePrograms(CarbonInterface $date): array;
}
120 changes: 120 additions & 0 deletions tests/ProgramScraperTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?php

declare(strict_types=1);

namespace BOA\Previews\Tests;

use BOA\Programs\ProgramScraper;
use BOA\Programs\ScraperInterface;
use Carbon\CarbonImmutable as Carbon;
use PHPUnit\Framework\TestCase;

/**
* @author shimomo
*/
final class ProgramScraperTest extends Testcase
{
/**
* @param \Carbon\CarbonInterface|string $date
* @return void
*/
public function testScrape(): void
{
$mockScraper = $this->createMock(ScraperInterface::class);
$mockScraper->method('scrapePrograms')
->with(Carbon::create(2025, 7, 15))
->willReturn([
$this->testScrapeData(1),
]);
$scraper = new ProgramScraper($mockScraper);
$programs = $scraper->scrape(Carbon::create(2025, 7, 15));
$this->assertSame($this->testScrapeData(0), $programs);
}

/**
* @psalm-type NormalizedBoat array{
* racer_boat_number: int,
* racer_name: string,
* racer_number: int,
* racer_class_number: int,
* racer_branch_number: int,
* racer_birthplace_number: int,
* racer_age: int,
* racer_weight: int|float,
* racer_flying_count: int,
* racer_late_count: int,
* racer_average_start_timing: float,
* racer_national_top_1_percent: float,
* racer_national_top_2_percent: float,
* racer_national_top_3_percent: float,
* racer_local_top_1_percent: float,
* racer_local_top_2_percent: float,
* racer_local_top_3_percent: float,
* racer_assigned_motor_number: int,
* racer_assigned_motor_top_2_percent: float,
* racer_assigned_motor_top_3_percent: float,
* racer_assigned_boat_number: int,
* racer_assigned_boat_top_2_percent: float,
* racer_assigned_boat_top_3_percent: float
* }
*
* @psalm-type NormalizedRace array{
* race_date: string,
* race_stadium_number: int,
* race_number: int,
* race_closed_at: string,
* race_grade_number: int,
* race_title: string,
* race_subtitle: string,
* race_distance: int,
* boats: array<int, NormalizedBoat>
* }
*
* @psalm-type NormalizedRaces array<int, NormalizedRace>
*
* @param int $keyIndex
* @return NormalizedRaces
*/
private function testScrapeData(int $keyIndex): array
{
return [
$keyIndex => [
'race_date' => '2025-07-15',
'race_stadium_number' => 1,
'race_number' => 1,
'race_closed_at' => '2025-07-15 15:17:00',
'race_grade_number' => 5,
'race_title' => 'にっぽん未来プロジェクト競走in桐生',
'race_subtitle' => '予選',
'race_distance' => 1800,
'boats' => [
$keyIndex => [
'racer_boat_number' => 1,
'racer_name' => '松本 浩貴',
'racer_number' => 3860,
'racer_class_number' => 3,
'racer_branch_number' => 11,
'racer_birthplace_number' => 11,
'racer_age' => 52,
'racer_weight' => 52,
'racer_flying_count' => 0,
'racer_late_count' => 0,
'racer_average_start_timing' => 0.19,
'racer_national_top_1_percent' => 4.09,
'racer_national_top_2_percent' => 18.48,
'racer_national_top_3_percent' => 39.13,
'racer_local_top_1_percent' => 4.85,
'racer_local_top_2_percent' => 33.33,
'racer_local_top_3_percent' => 40.74,
'racer_assigned_motor_number' => 24,
'racer_assigned_motor_top_2_percent' => 28,
'racer_assigned_motor_top_3_percent' => 42.67,
'racer_assigned_boat_number' => 23,
'racer_assigned_boat_top_2_percent' => 30.47,
'racer_assigned_boat_top_3_percent' => 51.56,
],
],
],
];
}
}
105 changes: 105 additions & 0 deletions tests/ProgramStorageTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?php

declare(strict_types=1);

namespace BOA\Programs\Tests;

use BOA\Programs\ProgramStorage;
use PHPUnit\Framework\TestCase;

/**
* @author shimomo
*/
final class ProgramStorageTest extends TestCase
{
/**
* @var non-empty-string
*/
private string $tempDir;

/**
* @return void
*/
protected function setUp(): void
{
parent::setUp();
$this->tempDir = sys_get_temp_dir() . '/program_storage_test_' . uniqid();
mkdir($this->tempDir, 0777, true);
}

/**
* @return void
*/
protected function tearDown(): void
{
if (is_dir($this->tempDir)) {
$files = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($this->tempDir, \FilesystemIterator::SKIP_DOTS),
\RecursiveIteratorIterator::CHILD_FIRST
);

foreach ($files as $file) {
$file->isDir() ? rmdir($file->getRealPath()) : unlink($file->getRealPath());
}

rmdir($this->tempDir);
}
}

/**
* @return void
*/
public function testSave(): void
{
$storage = new ProgramStorage();
$path = $this->tempDir . '/programs.json';

$programs = [
[
'race_date' => '2025-07-15',
'race_stadium_number' => 1,
'race_number' => 1,
'race_closed_at' => '2025-07-15 15:17:00',
'race_grade_number' => 5,
'race_title' => 'にっぽん未来プロジェクト競走in桐生',
'race_subtitle' => '予選',
'race_distance' => 1800,
'boats' => [
[
'racer_boat_number' => 1,
'racer_name' => '松本 浩貴',
'racer_number' => 3860,
'racer_class_number' => 3,
'racer_branch_number' => 11,
'racer_birthplace_number' => 11,
'racer_age' => 52,
'racer_weight' => 52,
'racer_flying_count' => 0,
'racer_late_count' => 0,
'racer_average_start_timing' => 0.19,
'racer_national_top_1_percent' => 4.09,
'racer_national_top_2_percent' => 18.48,
'racer_national_top_3_percent' => 39.13,
'racer_local_top_1_percent' => 4.85,
'racer_local_top_2_percent' => 33.33,
'racer_local_top_3_percent' => 40.74,
'racer_assigned_motor_number' => 24,
'racer_assigned_motor_top_2_percent' => 28,
'racer_assigned_motor_top_3_percent' => 42.67,
'racer_assigned_boat_number' => 23,
'racer_assigned_boat_top_2_percent' => 30.47,
'racer_assigned_boat_top_3_percent' => 51.56,
],
],
],
];

$storage->save($programs, $path);

$this->assertFileExists($path);

$content = json_decode(file_get_contents($path), true);
$this->assertArrayHasKey('programs', $content);
$this->assertSame($programs, $content['programs']);
}
}