Merge pull request #848 from revoice1/Add-previous-abilities

Author: Naramsim

data/v2/build.py

@@ -1913,6 +1913,19 @@ def csv_record_to_objects(info):
 
     build_generic((PokemonAbility,), "pokemon_abilities.csv", csv_record_to_objects)
 
+    def csv_record_to_objects(info):
+        yield PokemonAbilityPast(
+            pokemon_id=int(info[0]),
+            generation_id=int(info[1]),
+            ability_id=int(info[2]),
+            is_hidden=bool(int(info[3])),
+            slot=int(info[4]),
+        )
+
+    build_generic(
+        (PokemonAbilityPast,), "pokemon_abilities_past.csv", csv_record_to_objects
+    )
+
     def csv_record_to_objects(info):
         yield PokemonDexNumber(
             pokemon_species_id=int(info[0]),

data/v2/csv/pokemon_abilities_past.csv

@@ -0,0 +1,12 @@
+pokemon_id,generation_id,ability_id,is_hidden,slot
+94,6,26,0,1
+145,5,31,1,3
+243,6,10,1,3
+244,6,18,1,3
+245,6,11,1,3
+543,5,95,1,3
+544,5,95,1,3
+545,5,95,1,3
+607,5,23,1,3
+608,5,23,1,3
+609,5,23,1,3

graphql/metadata/databases/databases.yaml

@@ -6,10 +6,10 @@
         from_env: HASURA_GRAPHQL_DATABASE_URL
       isolation_level: read-committed
       pool_settings:
+        connection_lifetime: 60
         idle_timeout: 20
         max_connections: 10
-        retries: 1
         pool_timeout: 60
-        connection_lifetime: 60
+        retries: 1
       use_prepared_statements: false
   tables: "!include default/tables/tables.yaml"

graphql/metadata/databases/default/tables/public_pokemon_v2_ability.yaml

@@ -41,6 +41,13 @@ array_relationships:
       table:
         name: pokemon_v2_pokemonability
         schema: public
+- name: pokemon_v2_pokemonabilitypasts
+  using:
+    foreign_key_constraint_on:
+      column: ability_id
+      table:
+        name: pokemon_v2_pokemonabilitypast
+        schema: public
 select_permissions:
 - permission:
     allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_generation.yaml

@@ -41,6 +41,13 @@ array_relationships:
       table:
         name: pokemon_v2_move
         schema: public
+- name: pokemon_v2_pokemonabilitypasts
+  using:
+    foreign_key_constraint_on:
+      column: generation_id
+      table:
+        name: pokemon_v2_pokemonabilitypast
+        schema: public
 - name: pokemon_v2_pokemonformgenerations
   using:
     foreign_key_constraint_on:

graphql/metadata/databases/default/tables/public_pokemon_v2_pokemon.yaml

@@ -20,6 +20,13 @@ array_relationships:
       table:
         name: pokemon_v2_pokemonability
         schema: public
+- name: pokemon_v2_pokemonabilitypasts
+  using:
+    foreign_key_constraint_on:
+      column: pokemon_id
+      table:
+        name: pokemon_v2_pokemonabilitypast
+        schema: public
 - name: pokemon_v2_pokemonforms
   using:
     foreign_key_constraint_on:

graphql/metadata/databases/default/tables/public_pokemon_v2_pokemonabilitypast.yaml

@@ -0,0 +1,13 @@
+table:
+  name: pokemon_v2_pokemonabilitypast
+  schema: public
+object_relationships:
+- name: pokemon_v2_ability
+  using:
+    foreign_key_constraint_on: ability_id
+- name: pokemon_v2_generation
+  using:
+    foreign_key_constraint_on: generation_id
+- name: pokemon_v2_pokemon
+  using:
+    foreign_key_constraint_on: pokemon_id

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

@@ -107,6 +107,7 @@
 - "!include public_pokemon_v2_pokedexversiongroup.yaml"
 - "!include public_pokemon_v2_pokemon.yaml"
 - "!include public_pokemon_v2_pokemonability.yaml"
+- "!include public_pokemon_v2_pokemonabilitypast.yaml"
 - "!include public_pokemon_v2_pokemoncolor.yaml"
 - "!include public_pokemon_v2_pokemoncolorname.yaml"
 - "!include public_pokemon_v2_pokemondexnumber.yaml"

pokemon_v2/migrations/0013_pokemonabilitypast.py

@@ -0,0 +1,63 @@
+# Generated by Django 2.1.15 on 2023-02-27 15:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pokemon_v2", "0012_auto_20220626_1402"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PokemonAbilityPast",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("is_hidden", models.BooleanField(default=False)),
+                ("slot", models.IntegerField()),
+                (
+                    "ability",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="pokemonabilitypast",
+                        to="pokemon_v2.Ability",
+                    ),
+                ),
+                (
+                    "generation",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="pokemonabilitypast",
+                        to="pokemon_v2.Generation",
+                    ),
+                ),
+                (
+                    "pokemon",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="pokemonabilitypast",
+                        to="pokemon_v2.Pokemon",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]

pokemon_v2/models.py

@@ -1689,6 +1689,14 @@ class PokemonAbility(HasPokemon, HasAbility):
     slot = models.IntegerField()
 
 
+# model for a Pokemon's abilities that were used until a given generation
+class PokemonAbilityPast(HasPokemon, HasAbility, HasGeneration):
+
+    is_hidden = models.BooleanField(default=False)
+
+    slot = models.IntegerField()
+
+
 class PokemonColor(HasName):
     pass