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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public function __construct(
private readonly ?string $shortDescriptionJp = null,
private readonly array $statePartyCodes = [],
private readonly array $statePartiesMeta = [],
private readonly ?string $mainImageUrl = null,
){}


Expand Down Expand Up @@ -125,6 +126,11 @@ public function getUnescoSiteUrl(): ?string
return $this->unescoSiteUrl;
}

public function getMainImageUrl(): ?string
{
return $this->mainImageUrl;
}

public function getStatePartyCodes(): array
{
return $this->statePartyCodes ?: $this->getStatePartyCodesOrFallback();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public function toSummaryArray(): array
'unesco_site_url' => $heritage->getUnescoSiteUrl(),
'state_party_codes' => $heritage->getStatePartyCodes(),
'state_parties_meta' => $heritage->getStatePartiesMeta(),
'thumbnail' => $heritage->getThumbnailUrl(),
'thumbnail_url' => $heritage->getMainImageUrl()
?? ($heritage->getImages()[0]['url'] ?? null),
];
}, $this->heritages);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static function build(array $data): WorldHeritageDto
shortDescriptionJp: $data['short_description_jp'] ?? null,
statePartyCodes: $statePartyCodes,
statePartiesMeta: $statePartiesMeta,
mainImageUrl: $data['main_image_url'] ?? null,
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public static function build(array $data): WorldHeritageDto
shortDescriptionJp: $data['short_description_jp'] ?? null,
statePartyCodes: $statePartyCodes,
statePartiesMeta: $statePartiesMeta,
mainImageUrl: $data['main_image_url'] ?? null,
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ public function test_summary_array_matches_expected_with_thumbnail(): void
$this->assertArrayNotHasKey('images', $item);
$this->assertArrayNotHasKey('imageUrl', $item);
$this->assertArrayNotHasKey('state_parties', $item);
$this->assertArrayHasKey('thumbnail', $item);
$this->assertTrue(is_string($item['thumbnail']) || is_null($item['thumbnail']));
$this->assertArrayHasKey('thumbnail_url', $item);
$this->assertTrue(is_string($item['thumbnail_url']) || is_null($item['thumbnail_url']));

return collect($item)->keyBy(static fn($v, $k) => Str::snake($k))->toArray();
})->toArray();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private function mockDto(): WorldHeritageDto
$mock->shouldReceive('getStatePartiesMeta')
->andReturn($this->arrayData()['state_parties_meta']);

$mock->shouldReceive('getThumbnailUrl')
$mock->shouldReceive('getMainImageUrl')
->andReturn($this->arrayData()['thumbnail_url']);

$mock->shouldReceive('getCountryNameJp')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use App\Packages\Features\QueryUseCases\Factory\ViewModel\WorldHeritageViewModelCollectionFactory;
use App\Packages\Features\QueryUseCases\ViewModel\WorldHeritageViewModelCollection;
use Tests\TestCase;
use App\Packages\Features\QueryUseCases\Dto\ImageDto;

class WorldHeritageViewModelCollectionFactoryTest extends TestCase
{
Expand Down Expand Up @@ -103,15 +102,6 @@ private function arrayData(): array
private function mockDtoCollection(): WorldHeritageDtoCollection
{
$dtos = array_map(static function (array $data) {
$thumbnail = isset($data['thumbnail_url']) && $data['thumbnail_url']
? new ImageDto(
id: $data['id'] ?? 0,
url: $data['thumbnail_url'],
sortOrder: 0,
isPrimary: true,
)
: null;

return new WorldHeritageDto(
id: $data['id'],
officialName: $data['official_name'],
Expand All @@ -131,11 +121,12 @@ private function mockDtoCollection(): WorldHeritageDtoCollection
bufferZoneHectares: $data['buffer_zone_hectares'] ?? null,
shortDescription: $data['short_description'] ?? null,
images: null,
imageUrl: $thumbnail,
imageUrl: null,
unescoSiteUrl: $data['unesco_site_url'] ?? null,
shortDescriptionJp: $data['short_description_jp'] ?? null,
statePartyCodes: $data['state_party_codes'] ?? ($data['state_parties'] ?? []),
statePartiesMeta: $data['state_parties_meta'] ?? []
statePartiesMeta: $data['state_parties_meta'] ?? [],
mainImageUrl: $data['thumbnail_url'] ?? null,
);
}, $this->arrayData());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ public function __construct(

public function getThumbnailUrl(): ?string
{
return $this->dto->getThumbnailUrl();
return $this->dto->getMainImageUrl()
?? ($this->dto->getImages()[0]['url'] ?? null);
}

public function getId(): int
Expand Down
Loading