Fix DB design, Entity, Repository

src/app/Models/Country.php

@@ -21,6 +21,7 @@ class Country extends Model
     protected $primaryKey = 'state_party_code';
     public $incrementing = false;
     protected $keyType = 'string';
+    public $timestamps = false;
 
     public function worldHeritageSites(): BelongsToMany
     {

src/app/Packages/Domains/WorldHeritageEntity.php

@@ -23,7 +23,9 @@ public function __construct(
         public ?float $bufferZoneHectares = null,
         public ?string $shortDescription = null,
         public ?string $imageUrl = null,
-        public ?string $unescoSiteUrl = null
+        public ?string $unescoSiteUrl = null,
+        private array $statePartyCodes = [],
+        private array $statePartyMeta = []
     ) {}
 
     public function getId(): ?int
@@ -96,12 +98,12 @@ public function isEndangered(): bool
         return $this->isEndangered;
     }
 
-    public function getLatitude(): float
+    public function getLatitude(): ?float
     {
         return $this->latitude;
     }
 
-    public function getLongitude(): float
+    public function getLongitude(): ?float
     {
         return $this->longitude;
     }
@@ -120,4 +122,41 @@ public function getUnescoSiteUrl(): ?string
     {
         return $this->unescoSiteUrl;
     }
+
+    public function getStatePartyCodes(): array
+    {
+        return $this->statePartyCodes;
+    }
+
+    public function getStatePartyMeta(): array
+    {
+        return $this->statePartyMeta;
+    }
+
+    public function isTransnational(): bool
+    {
+        return count($this->statePartyCodes) > 1;
+    }
+
+    public function getPrimaryStatePartyCode(): ?string
+    {
+        foreach ($this->statePartyMeta as $code => $meta) {
+            if (!empty($meta['is_primary'])) return $code;
+        }
+        return $this->statePartyCodes[0] ?? null;
+    }
+
+    public function getStatePartyCodesOrFallback(): array
+    {
+        if ($this->statePartyCodes)
+            return $this->statePartyCodes;
+
+        if (!$this->stateParty)
+            return [];
+
+        $parts = preg_split('/[;,\s]+/', strtoupper($this->stateParty));
+        $codes = array_filter($parts, fn($country) => preg_match('/^[A-Z]{2}$/', $country));
+
+        return array_values(array_unique($codes));
+    }
 }

src/app/Packages/Domains/WorldHeritageRepository.php

@@ -26,7 +26,6 @@ public function insertHeritage(
         'longitude' => $entity->getLongitude(),
         'is_endangered' => $entity->isEndangered(),
         'name_jp' => $entity->getNameJp(),
-        'state_party' => $entity->getStateParty(),
         'criteria' => $entity->getCriteria(),
         'area_hectares' => $entity->getAreaHectares(),
         'buffer_zone_hectares' => $entity->getBufferZoneHectares(),
@@ -37,8 +36,34 @@ public function insertHeritage(
 
         $heritage = $this->model->create($insertValue);
 
-        if (!$heritage) {
-            throw new Exception('Failed to insert heritage');
+        $codes = $entity->getStatePartyCodes() ?: $entity->getStatePartyCodesOrFallback();
+        $codes = array_values(array_unique(array_map('strtoupper', $codes)));
+
+        $meta = $entity->getStatePartyMeta();
+        if (!empty($meta)) {
+            $payload = [];
+            foreach ($codes as $code) {
+                $m = $meta[$code] ?? [];
+                $payload[$code] = [
+                    'is_primary'       => (bool)($m['is_primary'] ?? false),
+                    'inscription_year' => $m['inscription_year'] ?? null,
+                ];
+            }
+            $heritage->countries()->sync($payload);
+        } else {
+            $heritage->countries()->sync($codes);
+        }
+
+        $heritage->state_party = $code ? implode(', ', $codes) : null;
+        $heritage->save();
+
+        $partyMeta = [];
+
+        foreach ($heritage->countries as $country) {
+            $partyMeta[$country->state_party_code] = [
+                'is_primary'       => (bool) data_get($country, 'pivot.is_primary', false),
+                'inscription_year' => data_get($country, 'pivot.inscription_year'),
+            ];
         }
 
         return new WorldHeritageEntity(
@@ -60,7 +85,9 @@ public function insertHeritage(
             bufferZoneHectares: $heritage->buffer_zone_hectares,
             shortDescription: $heritage->short_description,
             imageUrl: $heritage->image_url,
-            unescoSiteUrl: $heritage->unesco_site_url
+            unescoSiteUrl: $heritage->unesco_site_url,
+            statePartyCodes: $heritage->countries->pluck('state_party_code')->all(),
+            statePartyMeta: $partyMeta
         );
     }
 
@@ -76,4 +103,71 @@ public function insertHeritages(
 
         return $newCollection;
     }
-}
+
+//    public function updateOneHeritage(
+//        WorldHeritageEntity $entity
+//    ): WorldHeritageEntity
+//    {
+//        $targetEntity = $this->model->find($entity->getUnescoId());
+//
+//        if (!$targetEntity) {
+//            throw new Exception('Heritage was not found');
+//        }
+//
+//        $updateValue = [
+//            'id' => $entity->getId(),
+//            'unesco_id' => $entity->getUnescoId(),
+//            'official_name' => $entity->getOfficialName(),
+//            'name' => $entity->getName(),
+//            'country' => $entity->getCountry(),
+//            'region' => $entity->getRegion(),
+//            'category' => $entity->getCategory(),
+//            'year_inscribed' => $entity->getYearInscribed(),
+//            'latitude' => $entity->getLatitude(),
+//            'longitude' => $entity->getLongitude(),
+//            'is_endangered' => $entity->isEndangered(),
+//            'name_jp' => $entity->getNameJp(),
+//            'state_party' => $entity->getStateParty(),
+//            'criteria' => $entity->getCriteria(),
+//            'area_hectares' => $entity->getAreaHectares(),
+//            'buffer_zone_hectares' => $entity->getBufferZoneHectares(),
+//            'short_description' => $entity->getShortDescription(),
+//            'image_url' => $entity->getImageUrl(),
+//            'unesco_site_url' => $entity->getUnescoSiteUrl()
+//        ];
+//
+//        $codes = method_exists($entity, 'getStatePartyCodes')
+//            ? (array) $entity->getStatePartyCodes()
+//            : $this->parseStatePartyString((string) $entity->getStateParty());
+//
+//        $updatedHeritage = $this->model->updateOrFail(
+//          $updateValue
+//        );
+//
+//        if (!$updatedHeritage) {
+//            throw new Exception('Failed to update heritage');
+//        }
+//
+//        return new WorldHeritageEntity(
+//            id: $updateValue['id'],
+//            unescoId: $updateValue['unesco_id'],
+//            officialName: $updateValue['official_name'],
+//            name: $updateValue['name'],
+//            country: $updateValue['country'],
+//            region: $updateValue['region'],
+//            category: $updateValue['category'],
+//            yearInscribed: $updateValue['year_inscribed'],
+//            latitude: $updateValue['latitude'],
+//            longitude: $updateValue['longitude'],
+//            isEndangered: $updateValue['is_endangered'],
+//            nameJp: $updateValue['name_jp'],
+//            stateParty: $updateValue['state_party'],
+//            criteria: $updateValue['criteria'],
+//            areaHectares: $updateValue['area_hectares'],
+//            bufferZoneHectares: $updateValue['buffer_zone_hectares'],
+//            shortDescription: $updateValue['short_description'],
+//            imageUrl: $updateValue['image_url'],
+//            unescoSiteUrl: $updateValue['unesco_site_url']
+//        );
+//    }
+ }

src/app/Packages/Domains/WorldHeritageRepositoryInterface.php

@@ -11,4 +11,8 @@ public function insertHeritage(
     public function insertHeritages(
         WorldHeritageEntityCollection $collection
     ): WorldHeritageEntityCollection;
+
+//    public function updateOneHeritage(
+//        WorldHeritageEntity $entity
+//    ): WorldHeritageEntity;
 }

src/database/migrations/2025_07_28_195929_create_world_heritage_sites.php

@@ -19,7 +19,7 @@ public function up(): void
             $table->string('name_jp')->nullable();
             $table->string('country');
             $table->string('region');
-            $table->string('state_party', 5)->nullable();
+            $table->string('state_party', 255)->nullable();
             $table->enum('category', ['cultural', 'natural', 'mixed']);
             $table->json('criteria')->nullable();
             $table->year('year_inscribed');

src/database/migrations/2025_08_18_080451_countries.php

@@ -24,6 +24,6 @@ public function up(): void
      */
     public function down(): void
     {
-        //
+        Schema::dropIfExists('countries');
     }
 };

src/database/migrations/2025_08_18_080644_site_state_parties.php

@@ -9,7 +9,7 @@
     public function up(): void
     {
         Schema::create('site_state_parties', function (Blueprint $table) {
-            $table->char('state_party_code', 2);
+            $table->char('state_party_code', 255);
 
             $table->foreignId('world_heritage_site_id')
                 ->constrained('world_heritage_sites')

src/database/seeders/CountrySeeder.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\Country;
+
+class CountrySeeder extends Seeder
+{
+    public function run(): void
+    {
+        $countries = [
+            ['AF','Afghanistan'], ['AL','Albania'], ['DZ','Algeria'], ['AD','Andorra'], ['AO','Angola'],
+            ['AG','Antigua and Barbuda'], ['AR','Argentina'], ['AM','Armenia'], ['AU','Australia'], ['AT','Austria'],
+            ['AZ','Azerbaijan'], ['BS','Bahamas'], ['BH','Bahrain'], ['BD','Bangladesh'], ['BB','Barbados'],
+            ['BY','Belarus'], ['BE','Belgium'], ['BZ','Belize'], ['BJ','Benin'], ['BT','Bhutan'],
+            ['BO','Bolivia'], ['BA','Bosnia and Herzegovina'], ['BW','Botswana'], ['BR','Brazil'], ['BN','Brunei Darussalam'],
+            ['BG','Bulgaria'], ['BF','Burkina Faso'], ['BI','Burundi'], ['CV','Cabo Verde'], ['KH','Cambodia'],
+            ['CM','Cameroon'], ['CA','Canada'], ['CF','Central African Republic'], ['TD','Chad'], ['CL','Chile'],
+            ['CN','China'], ['CO','Colombia'], ['KM','Comoros'], ['CG','Congo'], ['CD','Congo, Democratic Republic of the'],
+            ['CR','Costa Rica'], ['CI',"Cote d'Ivoire"], ['HR','Croatia'], ['CU','Cuba'], ['CY','Cyprus'],
+            ['CZ','Czechia'], ['DK','Denmark'], ['DJ','Djibouti'], ['DM','Dominica'], ['DO','Dominican Republic'],
+            ['EC','Ecuador'], ['EG','Egypt'], ['SV','El Salvador'], ['GQ','Equatorial Guinea'], ['ER','Eritrea'],
+            ['EE','Estonia'], ['SZ','Eswatini'], ['ET','Ethiopia'], ['FJ','Fiji'], ['FI','Finland'],
+            ['FR','France'], ['GA','Gabon'], ['GM','Gambia'], ['GE','Georgia'], ['DE','Germany'],
+            ['GH','Ghana'], ['GR','Greece'], ['GD','Grenada'], ['GT','Guatemala'], ['GN','Guinea'],
+            ['GW','Guinea-Bissau'], ['GY','Guyana'], ['HT','Haiti'], ['HN','Honduras'], ['HU','Hungary'],
+            ['IS','Iceland'], ['IN','India'], ['ID','Indonesia'], ['IR','Iran'], ['IQ','Iraq'],
+            ['IE','Ireland'], ['IL','Israel'], ['IT','Italy'], ['JM','Jamaica'], ['JP','Japan'],
+            ['JO','Jordan'], ['KZ','Kazakhstan'], ['KE','Kenya'], ['KI','Kiribati'], ['KP',"Korea, Democratic People's Republic of"],
+            ['KR','Korea, Republic of'], ['KW','Kuwait'], ['KG','Kyrgyzstan'], ['LA',"Lao People's Democratic Republic"], ['LV','Latvia'],
+            ['LB','Lebanon'], ['LS','Lesotho'], ['LR','Liberia'], ['LY','Libya'], ['LI','Liechtenstein'],
+            ['LT','Lithuania'], ['LU','Luxembourg'], ['MG','Madagascar'], ['MW','Malawi'], ['MY','Malaysia'],
+            ['MV','Maldives'], ['ML','Mali'], ['MT','Malta'], ['MH','Marshall Islands'], ['MR','Mauritania'],
+            ['MU','Mauritius'], ['MX','Mexico'], ['FM','Micronesia, Federated States of'], ['MD','Moldova'], ['MC','Monaco'],
+            ['MN','Mongolia'], ['ME','Montenegro'], ['MA','Morocco'], ['MZ','Mozambique'], ['MM','Myanmar'],
+            ['NA','Namibia'], ['NR','Nauru'], ['NP','Nepal'], ['NL','Netherlands'], ['NZ','New Zealand'],
+            ['NI','Nicaragua'], ['NE','Niger'], ['NG','Nigeria'], ['MK','North Macedonia'], ['NO','Norway'],
+            ['OM','Oman'], ['PK','Pakistan'], ['PW','Palau'], ['PA','Panama'], ['PG','Papua New Guinea'],
+            ['PY','Paraguay'], ['PE','Peru'], ['PH','Philippines'], ['PL','Poland'], ['PT','Portugal'],
+            ['QA','Qatar'], ['RO','Romania'], ['RU','Russian Federation'], ['RW','Rwanda'], ['KN','Saint Kitts and Nevis'],
+            ['LC','Saint Lucia'], ['VC','Saint Vincent and the Grenadines'], ['WS','Samoa'], ['SM','San Marino'], ['ST','Sao Tome and Principe'],
+            ['SA','Saudi Arabia'], ['SN','Senegal'], ['RS','Serbia'], ['SC','Seychelles'], ['SL','Sierra Leone'],
+            ['SG','Singapore'], ['SK','Slovakia'], ['SI','Slovenia'], ['SB','Solomon Islands'], ['SO','Somalia'],
+            ['ZA','South Africa'], ['SS','South Sudan'], ['ES','Spain'], ['LK','Sri Lanka'], ['SD','Sudan'],
+            ['SR','Suriname'], ['SE','Sweden'], ['CH','Switzerland'], ['SY','Syrian Arab Republic'], ['TJ','Tajikistan'],
+            ['TH','Thailand'], ['TL','Timor-Leste'], ['TG','Togo'], ['TO','Tonga'], ['TT','Trinidad and Tobago'],
+            ['TN','Tunisia'], ['TR','Türkiye'], ['TM','Turkmenistan'], ['TV','Tuvalu'], ['UG','Uganda'],
+            ['UA','Ukraine'], ['AE','United Arab Emirates'], ['GB','United Kingdom of Great Britain and Northern Ireland'],
+            ['TZ','Tanzania, United Republic of'], ['US','United States of America'], ['UY','Uruguay'], ['UZ','Uzbekistan'],
+            ['VU','Vanuatu'], ['VE','Venezuela'], ['VN','Viet Nam'], ['YE','Yemen'], ['ZM','Zambia'], ['ZW','Zimbabwe'],
+            ['VA','Holy See'], ['PS','State of Palestine'],
+        ];
+
+        $regions = [
+            'Africa' => [
+                'DZ','AO','BJ','BF','BI','CV','CM','CF','TD','KM','CG','CD','CI','DJ','EG','GQ','ER','SZ','ET','GA','GM','GH','GN','GW',
+                'KE','LS','LR','LY','MG','MW','ML','MR','MU','MA','MZ','NA','NE','NG','RW','ST','SN','SC','SL','SO','ZA','SS','SD','TZ','TG','TN','UG','ZM','ZW',
+            ],
+            'Americas' => [
+                'AG','AR','BS','BB','BZ','BO','BR','CA','CL','CO','CR','CU','DM','DO','EC','SV','GD','GT','GY','HT','HN','JM','KN','LC','VC','MX','NI','PA','PE','PY','SR','TT','US','UY','VE',
+            ],
+            'Asia' => [
+                'AF','AM','AZ','BH','BD','BT','BN','KH','CN','CY','GE','IN','ID','IR','IQ','IL','JO','JP','KZ','KW','KG','LA','LB','MY','MV','MN','MM','NP','KP','KR','OM','PK','PS','PH','QA','SA','SG','LK','SY','TJ','TH','TL','TM','TR','AE','UZ','VN','YE',
+            ],
+            'Europe' => [
+                'AD','AL','AT','BY','BE','BA','BG','HR','CZ','DK','EE','FI','FR','DE','GR','HU','IS','IE','IT','LV','LI','LT','LU','MT','MD','MC','ME','NL','MK','NO','PL','PT','RO','RU','SM','RS','SK','SI','ES','SE','CH','UA','GB','VA',
+            ],
+            'Oceania' => [
+                'AU','FJ','KI','MH','FM','NR','NZ','PW','PG','WS','SB','TO','TV','VU',
+            ],
+        ];
+
+        $nameJp = [
+            'JP'=>'日本','CN'=>'中国','KR'=>'大韓民国','KP'=>'朝鮮民主主義人民共和国','TW'=> '台湾',
+            'SG'=>'シンガポール','MY'=>'マレーシア','TH'=>'タイ','VN'=>'ベトナム','PH'=>'フィリピン','ID'=>'インドネシア',
+            'LA'=>'ラオス','KH'=>'カンボジア','MM'=>'ミャンマー','LK'=>'スリランカ','IN'=>'インド','BD'=>'バングラデシュ',
+            'IR'=>'イラン','IQ'=>'イラク','IL'=>'イスラエル','JO'=>'ヨルダン','SA'=>'サウジアラビア','AE'=>'アラブ首長国連邦','QA'=>'カタール','KW'=>'クウェート',
+            'TR'=>'トルコ','KZ'=>'カザフスタン','KG'=>'キルギス','TJ'=>'タジキスタン','TM'=>'トルクメニスタン','MN'=>'モンゴル','PK'=>'パキスタン','NP'=>'ネパール','PS'=>'パレスチナ',
+            'AF'=>'アフガニスタン','AZ'=>'アゼルバイジャン','AM'=>'アルメニア','LB'=>'レバノン','OM'=>'オマーン','YE'=>'イエメン','BH'=>'バーレーン','MV'=>'モルディブ',
+            'AL'=>'アルバニア','AT'=>'オーストリア','BE'=>'ベルギー','BA'=>'ボスニア・ヘルツェゴビナ','BG'=>'ブルガリア','HR'=>'クロアチア',
+            'CZ'=>'チェコ','FR'=>'フランス','DE'=>'ドイツ','IT'=>'イタリア','MK'=>'北マケドニア','PL'=>'ポーランド','RO'=>'ルーマニア',
+            'SK'=>'スロバキア','SI'=>'スロベニア','ES'=>'スペイン','CH'=>'スイス','UA'=>'ウクライナ','GB'=>'イギリス','IE'=>'アイルランド',
+            'NL'=>'オランダ','PT'=>'ポルトガル','NO'=>'ノルウェー','SE'=>'スウェーデン','FI'=>'フィンランド','EE'=>'エストニア','LV'=>'ラトビア','LT'=>'リトアニア',
+            'IS'=>'アイスランド','DK'=>'デンマーク','LI'=>'リヒテンシュタイン','LU'=>'ルクセンブルク','MT'=>'マルタ','MC'=>'モナコ','ME'=>'モンテネグロ','SM'=>'サンマリノ','VA'=>'バチカン','RU'=>'ロシア連邦','GE'=>'ジョージア','CY'=>'キプロス',
+            'BY'=>'ベラルーシ','GR'=>'ギリシャ','RS'=>'セルビア',
+            'EG'=>'エジプト','MA'=>'モロッコ','TN'=>'チュニジア','DZ'=>'アルジェリア','ZA'=>'南アフリカ共和国','ET'=>'エチオピア','KE'=>'ケニア','NG'=>'ナイジェリア','GH'=>'ガーナ','SN'=>'セネガル','TZ'=>'タンザニア','UG'=>'ウガンダ','RW'=>'ルワンダ','ZM'=>'ザンビア','ZW'=>'ジンバブエ','CM'=>'カメルーン','CI'=>'コートジボワール','GA'=>'ガボン','GM'=>'ガンビア','GN'=>'ギニア','GW'=>'ギニアビサウ','BI'=>'ブルンジ','BF'=>'ブルキナファソ','BJ'=>'ベナン','CV'=>'カーボベルデ','KM'=>'コモロ','CG'=>'コンゴ共和国','CD'=>'コンゴ民主共和国','DJ'=>'ジブチ','ER'=>'エリトリア','GQ'=>'赤道ギニア','LY'=>'リビア','LR'=>'リベリア','LS'=>'レソト','MG'=>'マダガスカル','MW'=>'マラウイ','ML'=>'マリ','MR'=>'モーリタニア','MU'=>'モーリシャス','MZ'=>'モザンビーク','NA'=>'ナミビア','NE'=>'ニジェール','SC'=>'セーシェル','SL'=>'シエラレオネ','SO'=>'ソマリア','SS'=>'南スーダン','SD'=>'スーダン','TG'=>'トーゴ',
+            'US'=>'アメリカ合衆国','CA'=>'カナダ','MX'=>'メキシコ','AR'=>'アルゼンチン','BR'=>'ブラジル','CL'=>'チリ','CO'=>'コロンビア','PE'=>'ペルー','BO'=>'ボリビア','PY'=>'パラグアイ','UY'=>'ウルグアイ','VE'=>'ベネズエラ','EC'=>'エクアドル','CR'=>'コスタリカ','PA'=>'パナマ','CU'=>'キューバ','DO'=>'ドミニカ共和国','DM'=>'ドミニカ国','HT'=>'ハイチ','HN'=>'ホンジュラス','NI'=>'ニカラグア','SV'=>'エルサルバドル','GT'=>'グアテマラ','GY'=>'ガイアナ','SR'=>'スリナム','BS'=>'バハマ','BB'=>'バルバドス','BZ'=>'ベリーズ','GD'=>'グレナダ','JM'=>'ジャマイカ','KN'=>'セントクリストファー・ネーヴィス','LC'=>'セントルシア','VC'=>'セントビンセントおよびグレナディーン諸島','TT'=>'トリニダード・トバゴ',
+            'AU'=>'オーストラリア','NZ'=>'ニュージーランド','PG'=>'パプアニューギニア','FJ'=>'フィジー','WS'=>'サモア','SB'=>'ソロモン諸島','TO'=>'トンガ','TV'=>'ツバル','VU'=>'バヌアツ','FM'=>'ミクロネシア連邦','MH'=>'マーシャル諸島','PW'=>'パラオ','KI'=>'キリバス','NR'=>'ナウル',
+        ];
+
+        $regionByCode = [];
+        foreach ($regions as $regionName => $codes) {
+            foreach ($codes as $code) {
+                $regionByCode[$code] = $regionName;
+            }
+        }
+
+        $rows = array_map(function ($c) use ($regionByCode, $nameJp) {
+            $code = $c[0];
+            return [
+                'state_party_code' => $code,
+                'name_en'          => $c[1],
+                'name_jp'          => $nameJp[$code] ?? null,
+                'region'           => $regionByCode[$code] ?? null,
+            ];
+        }, $countries);
+
+        Country::query()->upsert(
+            $rows,
+            ['state_party_code'],
+            ['name_en','name_jp','region']
+        );
+    }
+}