Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public function handle(): int
'area_hectares' => $this->toNullableFloat($row['area_hectares'] ?? null),
'buffer_zone_hectares' => $this->toNullableFloat($row['buffer_zone_hectares'] ?? null),
'is_endangered' => $this->toNullableBoolInt($row['is_endangered'] ?? null),
'is_transboundary' => $this->toNullableBoolInt($row['is_transboundary'] ?? null),
'latitude' => $this->toNullableFloat($row['latitude'] ?? null),
'longitude' => $this->toNullableFloat($row['longitude'] ?? null),
'short_description' => $this->toNullableString($row['short_description'] ?? null),
Expand Down
5 changes: 5 additions & 0 deletions src/app/Console/Commands/SplitWorldHeritageJson.php
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ private function normalizeSiteRowImportReady(array $row, int $siteId): array
'criteria' => $criteria,
'year_inscribed' => (isset($row['date_inscribed']) && is_numeric($row['date_inscribed'])) ? (int) $row['date_inscribed'] : null,
'is_endangered' => $this->boolFromDanger($row['danger'] ?? null),
'is_transboundary' => $this->boolFromDanger($row['transboundary'] ?? null),
'area_hectares' => isset($row['area_hectares']) ? (is_numeric($row['area_hectares']) ? (float) $row['area_hectares'] : null) : null,
'buffer_zone_hectares' => isset($row['buffer_zone_hectares']) ? (is_numeric($row['buffer_zone_hectares']) ? (float) $row['buffer_zone_hectares'] : null) : null,
'latitude' => isset($lat) ? (is_numeric($lat) ? (float) $lat : null) : null,
Expand Down Expand Up @@ -789,6 +790,10 @@ private function mergeSiteRowPreferExisting(array $existing, array $incoming): a
$existing['is_endangered'] = $this->boolFromDanger($incoming['danger'] ?? null);
}

if (($existing['is_transboundary'] ?? false) === false) {
$existing['is_transboundary'] = $this->boolFromDanger($incoming['transboundary'] ?? null);
}

if (($existing['state_party'] ?? null) === null) {
$iso2List = $this->extractIsoCodes($incoming['iso_codes'] ?? null);
if (count($iso2List) === 1) {
Expand Down
2 changes: 2 additions & 0 deletions src/app/Models/WorldHeritage.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class WorldHeritage extends Model
'area_hectares',
'buffer_zone_hectares',
'is_endangered',
'is_transboundary',
'latitude',
'longitude',
'short_description',
Expand Down Expand Up @@ -71,6 +72,7 @@ protected function casts(): array
return [
'criteria' => 'array',
'is_endangered' => 'boolean',
'is_transboundary' => 'boolean',
'year_inscribed' => 'integer',
'area_hectares' => 'float',
'buffer_zone_hectares' => 'float',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?php

namespace App\Packages\Domains\WorldHeritage\Tests;

use App\Models\WorldHeritage;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Tests\TestCase;

class ImportWorldHeritageSiteFromSplitFileIsTransboundaryTest extends TestCase
{
protected function setUp(): void
{
parent::setUp();
$this->truncate();
}

protected function tearDown(): void
{
$this->truncate();
parent::tearDown();
}

private function truncate(): void
{
DB::connection('mysql')->statement('SET FOREIGN_KEY_CHECKS=0;');
WorldHeritage::truncate();
DB::connection('mysql')->statement('SET FOREIGN_KEY_CHECKS=1;');
}

private function writeSplitFile(array $sites): string
{
Storage::fake('local');

$path = 'unesco/normalized/test_world_heritage_sites.json';
Storage::disk('local')->put($path, json_encode(['results' => $sites]));

return $path;
}

public function test_import_persists_is_transboundary_true(): void
{
$path = $this->writeSplitFile([[
'id' => 9001,
'official_name' => 'Transboundary Test Site',
'name' => 'Transboundary Test Site',
'region' => 'EUR',
'category' => 'Cultural',
'criteria' => ['i'],
'year_inscribed' => 2000,
'is_transboundary' => true,
]]);

Artisan::call('world-heritage:import-sites-split', ['--in' => $path]);

$this->assertTrue(WorldHeritage::find(9001)->is_transboundary);
}

public function test_import_persists_is_transboundary_false_when_missing(): void
{
$path = $this->writeSplitFile([[
'id' => 9002,
'official_name' => 'Single Country Test Site',
'name' => 'Single Country Test Site',
'region' => 'EUR',
'category' => 'Cultural',
'criteria' => ['i'],
'year_inscribed' => 2000,
]]);

Artisan::call('world-heritage:import-sites-split', ['--in' => $path]);

$this->assertFalse(WorldHeritage::find(9002)->is_transboundary);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php

namespace App\Packages\Domains\WorldHeritage\Tests;

use App\Console\Commands\SplitWorldHeritageJson;
use PHPUnit\Framework\TestCase;
use ReflectionMethod;

class SplitWorldHeritageJsonIsTransboundaryTest extends TestCase
{
private function invokeNormalize(array $row, int $siteId): array
{
$command = new SplitWorldHeritageJson();
$method = new ReflectionMethod($command, 'normalizeSiteRowImportReady');
$method->setAccessible(true);

return $method->invoke($command, $row, $siteId);
}

private function invokeMerge(array $existing, array $incoming): array
{
$command = new SplitWorldHeritageJson();
$method = new ReflectionMethod($command, 'mergeSiteRowPreferExisting');
$method->setAccessible(true);

return $method->invoke($command, $existing, $incoming);
}

public function test_normalizeSiteRowImportReady_carries_transboundary_true(): void
{
$result = $this->invokeNormalize(['id_no' => 1, 'transboundary' => true], 1);

$this->assertTrue($result['is_transboundary']);
}

public function test_normalizeSiteRowImportReady_defaults_transboundary_to_false_when_missing(): void
{
$result = $this->invokeNormalize(['id_no' => 1], 1);

$this->assertFalse($result['is_transboundary']);
}

public function test_mergeSiteRowPreferExisting_fills_transboundary_from_incoming_when_existing_is_false(): void
{
$existing = $this->invokeNormalize(['id_no' => 1], 1);
$incoming = ['transboundary' => true];

$result = $this->invokeMerge($existing, $incoming);

$this->assertTrue($result['is_transboundary']);
}

public function test_mergeSiteRowPreferExisting_keeps_transboundary_true_once_set(): void
{
$existing = $this->invokeNormalize(['id_no' => 1, 'transboundary' => true], 1);
$incoming = ['transboundary' => false];

$result = $this->invokeMerge($existing, $incoming);

$this->assertTrue($result['is_transboundary']);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('world_heritage_sites', function (Blueprint $table) {
$table->boolean('is_transboundary')->default(false)->after('is_endangered');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('world_heritage_sites', function (Blueprint $table) {
$table->dropColumn('is_transboundary');
});
}
};
Loading
Loading