Refactor Pokemon evolution fields in models and serializers

- Renamed `region_restriction` to `region` and `base_form_required` to `base_form` in the PokemonEvolution model for clarity.
- Updated corresponding fields in the serializers and CSV to reflect the new naming conventions.
- Adjusted foreign key constraints in the metadata YAML files to match the updated field names.

Author: joereg4

data/v2/build.py

@@ -2073,8 +2073,8 @@ def csv_record_to_objects(info):
             trade_species_id=int(info[17]) if info[17] != "" else None,
             needs_overworld_rain=bool(int(info[18])),
             turn_upside_down=bool(int(info[19])),
-            region_restriction_id=int(info[20]) if info[20] != "" else None,
-            base_form_required_id=int(info[21]) if info[21] != "" else None,
+            region_id=int(info[20]) if info[20] != "" else None,
+            base_form_id=int(info[21]) if info[21] != "" else None,
         )
 
     build_generic((PokemonEvolution,), "pokemon_evolution.csv", csv_record_to_objects)

data/v2/csv/pokemon_evolution.csv

@@ -1,4 +1,4 @@
-id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_id,location_id,held_item_id,time_of_day,known_move_id,known_move_type_id,minimum_happiness,minimum_beauty,minimum_affection,relative_physical_stats,party_species_id,party_type_id,trade_species_id,needs_overworld_rain,turn_upside_down,region_restriction,base_form_required
+id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_id,location_id,held_item_id,time_of_day,known_move_id,known_move_type_id,minimum_happiness,minimum_beauty,minimum_affection,relative_physical_stats,party_species_id,party_type_id,trade_species_id,needs_overworld_rain,turn_upside_down,region_id,base_form_id
 1,2,1,,16,,,,,,,,,,,,,,0,0,,
 2,3,1,,32,,,,,,,,,,,,,,0,0,,
 3,5,1,,16,,,,,,,,,,,,,,0,0,,

graphql/v1beta/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml

@@ -37,10 +37,10 @@ object_relationships:
       foreign_key_constraint_on: known_move_type_id
   - name: pokemon_v2_region
     using:
-      foreign_key_constraint_on: region_restriction_id
-  - name: pokemon_v2_pokemonspecy_by_base_form_required
+      foreign_key_constraint_on: region_id
+  - name: pokemon_v2_pokemonspecy_by_base_form_id
     using:
-      foreign_key_constraint_on: base_form_required_id
+      foreign_key_constraint_on: base_form_id
 select_permissions:
   - role: anon
     permission:

graphql/v1beta2/metadata/databases/default/tables/public_pokemon_v2_pokemonevolution.yaml

@@ -42,10 +42,10 @@ object_relationships:
       foreign_key_constraint_on: known_move_type_id
   - name: region
     using:
-      foreign_key_constraint_on: region_restriction_id
-  - name: baseformrequired
+      foreign_key_constraint_on: region_id
+  - name: baseformid
     using:
-      foreign_key_constraint_on: base_form_required_id
+      foreign_key_constraint_on: base_form_id
 select_permissions:
   - role: anon
     permission:

pokemon_v2/migrations/0020_add_regional_evolution_fields.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name="pokemonevolution",
-            name="region_restriction",
+            name="region",
             field=models.ForeignKey(
                 blank=True,
                 null=True,
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="pokemonevolution",
-            name="base_form_required",
+            name="base_form",
             field=models.ForeignKey(
                 blank=True,
                 null=True,

pokemon_v2/models.py

@@ -1695,15 +1695,15 @@ class PokemonEvolution(HasEvolutionTrigger, HasGender):
     turn_upside_down = models.BooleanField(default=False)
 
     # Regional evolution fields
-    region_restriction = models.ForeignKey(
+    region = models.ForeignKey(
         "Region",
         blank=True,
         null=True,
         on_delete=models.CASCADE,
         help_text="Region where this evolution can occur (null = any region)",
     )
 
-    base_form_required = models.ForeignKey(
+    base_form = models.ForeignKey(
         "PokemonSpecies",
         blank=True,
         null=True,

pokemon_v2/serializers.py

@@ -5518,8 +5518,8 @@ class PokemonEvolutionSerializer(serializers.ModelSerializer):
     trade_species = PokemonSpeciesSummarySerializer()
     location = LocationSummarySerializer()
     trigger = EvolutionTriggerSummarySerializer(source="evolution_trigger")
-    region_restriction = RegionSummarySerializer()
-    base_form_required = PokemonSpeciesSummarySerializer()
+    region_id = RegionSummarySerializer(source="region")
+    base_form_id = PokemonSpeciesSummarySerializer(source="base_form")
 
     class Meta:
         model = PokemonEvolution
@@ -5542,8 +5542,8 @@ class Meta:
             "time_of_day",
             "trade_species",
             "turn_upside_down",
-            "region_restriction",
-            "base_form_required",
+            "region_id",
+            "base_form_id",
         )
 
 
@@ -5596,8 +5596,8 @@ class Meta:
                                         "trade_species",
                                         "trigger",
                                         "turn_upside_down",
-                                        "region_restriction",
-                                        "base_form_required",
+                                        "region_id",
+                                        "base_form_id",
                                     ],
                                     "properties": {
                                         "gender": {
@@ -5726,7 +5726,7 @@ class Meta:
                                             },
                                         },
                                         "turn_upside_down": {"type": "boolean"},
-                                        "region_restriction": {
+                                        "region_id": {
                                             "type": "object",
                                             "nullable": True,
                                             "required": ["name", "url"],
@@ -5738,7 +5738,7 @@ class Meta:
                                                 },
                                             },
                                         },
-                                        "base_form_required": {
+                                        "base_form_id": {
                                             "type": "object",
                                             "nullable": True,
                                             "required": ["name", "url"],