Merge branch 'master' into pokemon-ability-sv

Makefile

@@ -68,7 +68,7 @@ docker-down:  # (Docker) Stop and removes containers and networks
 	docker-compose down
 
 docker-prod:
-	docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
 
 docker-setup: docker-up docker-migrate docker-build-db  # (Docker) Start services, prepare the latest DB schema, populate the DB
 

README.md

@@ -20,7 +20,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 > Beta GraphQL support is rolling out! Check out the [GraphQL paragraph](#graphql--) for more info.
 
-## Setup   [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/)
+## Setup   [![pyVersion310](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/download/releases/3.10/)
 
 - Download this source code into a working directory, be sure to use the flag `--recurse-submodules` to clone also our submodules.
 

Resources/compose/docker-compose-prod-graphql.yml

@@ -1,19 +1,25 @@
 version: '2.4'
 services:
+  cache:
+    image: redis:7.0.7-alpine
   db:
+    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
 
   app:
+    image: pokeapi/pokeapi:master
     env_file: .env
     restart: "no"
 
   web:
+    image: nginx:1.23.3-alpine
     volumes:
       - graphiql:/public-console:ro
 
   graphql-engine:
+    image: hasura/graphql-engine:v2.16.1
     cpus: 0.7
     memswap_limit: 3g
     mem_limit: 700m
@@ -34,5 +40,3 @@ services:
 
 volumes:
   graphiql:
-
-# docker-compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d

Resources/docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.10-alpine
 
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_SETTINGS_MODULE 'config.docker-compose'

Resources/docker/app/README.md

@@ -14,11 +14,10 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`latest`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
 - [`master`](https://github.com/PokeAPI/pokeapi/blob/master/Resources/docker/app/Dockerfile)
 - [`staging`](https://github.com/PokeAPI/pokeapi/blob/staging/Resources/docker/app/Dockerfile)
 
-> `pokeapi` uses `python:3.7-alpine` as base image.
+> `pokeapi` uses `python:3.10-alpine` as base image.
 
 ## What is PokeAPI?
 

Resources/k8s/kustomize/base/deployments/graphql-deployment.yaml

@@ -25,7 +25,7 @@ spec:
               done;
       containers:
         - name: graphql-engine
-          image: hasura/graphql-engine:v2.0.0-alpha.5
+          image: hasura/graphql-engine:v2.16.1
           ports:
             - containerPort: 8080
           env:

Resources/k8s/kustomize/base/deployments/haproxy-ingress-controller.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: ingress-controller
       containers:
         - name: haproxy-ingress-controller
-          image: quay.io/jcmoraisjr/haproxy-ingress:v0.12.3
+          image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.0
           resources:
             limits:
               memory: "256Mi"

Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       initContainers:
         - name: postgres-connection-checker
-          image: postgres:13.3-alpine
+          image: postgres:15.1-alpine
           command: ['sh', '-c']
           args:
             - until pg_isready -h postgresql -p 5432; do
@@ -26,6 +26,7 @@ spec:
       containers:
         - name: pokeapi
           image: pokeapi/pokeapi:master
+          imagePullPolicy: Always
           ports:
             - containerPort: 8080
           securityContext:  # CI: Github Actions kills this container if not run with root. Otherwise, it's safe to use the default pokeapi/pokeapi user and remove these lines.

Resources/k8s/kustomize/base/deployments/postgres-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: postgresql
-          image: postgres:13.3-alpine
+          image: postgres:15.1-alpine
           ports:
             - containerPort: 5432
           env:

Resources/k8s/kustomize/base/deployments/redis-deployment.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: redis
-          image: redis:6.2.3-alpine
+          image: redis:7.0.7-alpine
           ports:
             - containerPort: 6379
           resources: {}

data/v2/csv/ability_names.csv

@@ -2669,161 +2669,223 @@ ability_id,local_language_id,name
 267,9,As One
 267,11,じんばいったい
 267,12,人马一体
+268,1,とれないにおい
 268,5,Odeur Tenace
 268,6,Duftschwade
 268,7,Olor Persistente
 268,8,Odore Tenace
 268,9,Lingering Aroma
+268,11,とれないにおい
+269,1,こぼれダネ
 269,5,Semencier
 269,6,Streusaat
 269,7,Disemillar
 269,8,Spargisemi
 269,9,Seed Sower
+269,11,こぼれダネ
+270,1,ねつこうかん
 270,5,Thermodynamique
 270,6,Thermowandel
 270,7,Termoscambio
 270,8,Termoscambio
 270,9,Thermal Exchange
+270,11,ねつこうかん
+271,1,いかりのこうら
 271,5,Courroupace
 271,6,Wutpanzer
 271,7,Coraza Ira
 271,8,Iraguscio
 271,9,Anger Shell
+271,11,いかりのこうら
+272,1,きよめのしお
 272,5,Sel Purificateur
 272,6,Läutersalz
 272,7,Sal Purificadora
 272,8,Sale Purificante
 272,9,Purifying Salt
+272,11,きよめのしお
+273,1,こんがりボディ
 273,5,Bien Cuit
 273,6,Knusperkruste
 273,7,Cuerpo Horneado
 273,8,Bentostato
 273,9,Well-Baked Body
+273,11,こんがりボディ
+274,1,かぜのり
 274,5,Aéroporté
 274,6,Windreiter
 274,7,Surcavientos
 274,8,Vento Propizio
 274,9,Wind Rider
+274,11,かぜのり
+275,1,ばんけん
 275,5,Chien de Garde
 275,6,Wachhund
 275,7,Perro Guardián
 275,8,Cane da Guardia
 275,9,Guard Dog
+275,11,ばんけん
+276,1,いわはこび
 276,5,Porte-Roche
 276,6,Steinträger
 276,7,Transportarrocas
 276,8,Portamassi
 276,9,Rocky Payload
+276,11,いわはこび
+277,1,ふうりょくでんき
 277,5,Turbine Éolienne
 277,6,Windkraft
 277,7,Energía Eólica
 277,8,Energia Eolica
 277,9,Wind Power
+277,11,ふうりょくでんき
+278,1,マイティチェンジ
 278,5,Supermutation
 278,6,Superwechsel
 278,7,Cambio Heroico
 278,8,Supercambio
 278,9,Zero to Hero
+278,11,マイティチェンジ
+279,1,しれいとう
 279,5,Commandant
 279,6,Kommandant
 279,7,Comandar
 279,8,Torre di Comando
 279,9,Commander
+279,11,しれいとう
+280,1,でんきにかえる
 280,5,Grecharge
 280,6,Dynamo
 280,7,Dinamo
 280,8,Convertivolt
 280,9,Electromorphosis
+280,11,でんきにかえる
+281,1,こだいかっせい
 281,5,Paléosynthèse
 281,6,Paläosynthese
 281,7,Paleosíntesis
 281,8,Paleoattivazione
 281,9,Protosynthesis
+281,11,こだいかっせい
+282,1,クォークチャージ
 282,5,Charge Quantique
 282,6,Quantenantrieb
 282,7,Carga Cuark
 282,8,Carica Quark
 282,9,Quark Drive
+282,11,クォークチャージ
+283,1,おうごんのからだ
 283,5,Corps en Or
 283,6,Goldkörper
 283,7,Cuerpo Áureo
 283,8,Corpo Aureo
 283,9,Good as Gold
+283,11,おうごんのからだ
+284,1,わざわいのうつわ
 284,5,Urne du Fléau
 284,6,Unheilsgefäß
 284,7,Caldero Debacle
 284,8,Vaso Nefasto
 284,9,Vessel of Ruin
+284,11,わざわいのうつわ
+285,1,わざわいのつるぎ
 285,5,Épée du Fléau
 285,6,Unheilsschwert
 285,7,Espada Debacle
 285,8,Spada Nefasta
 285,9,Sword of Ruin
+285,11,わざわいのつるぎ
+286,1,わざわいのおふだ
 286,5,Bois du Fléau
 286,6,Unheilstafeln
 286,7,Tablilla Debacle
 286,8,Amuleto Nefasto
 286,9,Tablets of Ruin
+286,11,わざわいのおふだ
+287,1,わざわいのたま
 287,5,Perles du Fléau
 287,6,Unheilsjuwelen
 287,7,Abalorio Debacle
 287,8,Monile Nefasto
 287,9,Beads of Ruin
+287,11,わざわいのたま
+288,1,ひひいろのこどう
 288,5,Pouls Orichalque
 288,6,Orichalkum-Puls
 288,7,Latido Oricalco
 288,8,Ritmo d’Oricalco
 288,9,Orichalcum Pulse
+288,11,ひひいろのこどう
+289,1,ハドロンエンジン
 289,5,Moteur à Hadrons
 289,6,Hadronen-Motor
 289,7,Motor Hadrónico
 289,8,Motore Adronico
 289,9,Hadron Engine
+289,11,ハドロンエンジン
+290,1,びんじょう
 290,5,Opportuniste
 290,6,Profiteur
 290,7,Oportunista
 290,8,Scrocco
 290,9,Opportunist
+290,11,びんじょう
+291,1,はんすう
 291,5,Ruminant
 291,6,Wiederkäuer
 291,7,Rumia
 291,8,Ruminante
 291,9,Cud Chew
+291,11,はんすう
+292,1,きれあじ
 292,5,Incisif
 292,6,Scharfkantig
 292,7,Cortante
 292,8,Affilama
 292,9,Sharpness
+292,11,きれあじ
+293,1,そうだいしょう
 293,5,Général Suprême
 293,6,Feldherr
 293,7,General Supremo
 293,8,Generale Supremo
 293,9,Supreme Overlord
+293,11,そうだいしょう
+294,1,きょうえん
 294,5,Collab
 294,6,Synchronauftritt
 294,7,Unísono
 294,8,Coprotagonismo
 294,9,Costar
+294,11,きょうえん
+295,1,どくげしょう
 295,5,Dépôt Toxique
 295,6,Giftbelag
 295,7,Capa Tóxica
 295,8,Mantossina
 295,9,Toxic Debris
+295,11,どくげしょう
+296,1,テイルアーマー
 296,5,Armure Caudale
 296,6,Schweifrüstung
 296,7,Cola Armadura
 296,8,Codarmatura
 296,9,Armor Tail
+296,11,テイルアーマー
+297,1,どしょく
 297,5,Absorbe-Terre
 297,6,Bodenschmaus
 297,7,Geofagia
 297,8,Mangiaterra
 297,9,Earth Eater
+297,11,どしょく
+298,1,きんしのちから
 298,5,Force Fongique
 298,6,Myzelienkraft
 298,7,Poder Fúngico
 298,8,Micoforza
 298,9,Mycelium Might
+298,11,きんしのちから
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/location_area_prose.csv

@@ -103,10 +103,10 @@ location_area_id,local_language_id,name
 141,9,Road 201
 142,9,Road 202
 143,9,Road 203
-144,9,Road 204 (south, towards Jubilife City)
-145,9,Road 204 (north, towards Floaroma Town)
-146,9,Road 205 (south, towards Floaroma Town)
-147,9,Road 205 (east, towards Eterna City)
+144,9,"Road 204 (south, towards Jubilife City)"
+145,9,"Road 204 (north, towards Floaroma Town)"
+146,9,"Road 205 (south, towards Floaroma Town)"
+147,9,"Road 205 (east, towards Eterna City)"
 148,9,Road 206
 149,9,Road 207
 150,9,Road 208
@@ -116,12 +116,12 @@ location_area_id,local_language_id,name
 154,9,Lost Tower (3F)
 155,9,Lost Tower (4F)
 156,9,Lost Tower (5F)
-157,9,Road 210 (south, towards Solaceon Town)
-158,9,Road 210 (west, towards Celestic Town)
-159,9,Road 211 (west, towards Eterna City)
-160,9,Road 211 (east, towards Celestic Town)
-161,9,Road 212 (north, towards Hearthome City)
-162,9,Road 212 (east, towards Pastoria City)
+157,9,"Road 210 (south, towards Solaceon Town)"
+158,9,"Road 210 (west, towards Celestic Town)"
+159,9,"Road 211 (west, towards Eterna City)"
+160,9,"Road 211 (east, towards Celestic Town)"
+161,9,"Road 212 (north, towards Hearthome City)"
+162,9,"Road 212 (east, towards Pastoria City)"
 163,9,Road 213
 164,9,Road 214
 165,9,Road 215
@@ -251,7 +251,7 @@ location_area_id,local_language_id,name
 293,9,Rock Tunnel (B1F)
 294,9,Victory Road 1 (1F)
 295,9,Road 1
-296,9,Road 2 (south, towards Viridian City)
+296,9,"Road 2 (south, towards Viridian City)"
 297,9,Road 3
 298,9,Road 4
 299,9,Road 5
@@ -275,7 +275,7 @@ location_area_id,local_language_id,name
 317,9,Digletts Cave
 318,9,Victory Road 1 (2F)
 319,9,Victory Road 1 (3F)
-320,9,Road 2 (north, towards Pewter City)
+320,9,"Road 2 (north, towards Pewter City)"
 321,9,Viridian Forest
 323,9,Cerulean Cave (1F)
 324,9,Cerulean Cave (2F)
@@ -300,9 +300,9 @@ location_area_id,local_language_id,name
 343,9,Pokemon Mansion (3F)
 344,9,Pokemon Mansion (B1F)
 345,9,Safari Zone (middle)
-346,9,Safari Zone (Area 1, east)
-347,9,Safari Zone (Area 2, north)
-348,9,Safari Zone (Area 3, west)
+346,9,"Safari Zone (Area 1, east)"
+347,9,"Safari Zone (Area 2, north)"
+348,9,"Safari Zone (Area 3, west)"
 349,9,S.S. Anne dock
 350,9,Petalburg City
 351,9,Slateport City
@@ -318,7 +318,7 @@ location_area_id,local_language_id,name
 361,9,Granite Cave (1F)
 362,9,Granite Cave (B1F)
 363,9,Granite Cave (B2F)
-364,9,Granite Cave (1F/small Room)
+364,9,Granite Cave (1F/small room)
 365,9,Petalburg Woods
 366,9,Jagged Pass
 367,9,Fiery Path
@@ -415,7 +415,7 @@ location_area_id,local_language_id,name
 488,9,Mount Ember
 489,9,Mount Ember (cave)
 490,9,Mount Ember (inside)
-491,9,Mount Ember (1F, cave behind team rocket)
+491,9,"Mount Ember (1F, cave behind team rocket)"
 492,9,Mount Ember (B1F)
 493,9,Mount Ember (B2F)
 494,9,Mount Ember (B3F)

data/v2/csv/pokemon_form_names.csv

@@ -396,10 +396,14 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 849,9,Amped Form,Amped Toxtricity
 849,11,ハイなすがた,
 849,12,高调的样子,
-854,9,,Phony Sinistea
+854,1,がんさくフォルム,
+854,9,Phony Form,Phony Sinistea
 854,6,Fälschungsform,Fatalitee (Fälschung)
-855,9,,Phony Polteageist
+854,11,がんさくフォルム,
+855,1,がんさくフォルム,
+855,9,Phony Form,Phony Polteageist
 855,6,Fälschungsform,Mortipot (Fälschung)
+855,11,がんさくフォルム,
 869,1,ミルキィバニラ,
 869,3,밀키바닐라,
 869,4,奶香香草,
@@ -476,6 +480,33 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 905,1,けしんフォルム,
 905,9,Incarnate Forme, Incarnate Enamorus
 905,11,けしんフォルム,
+916,1,オスのすがた,
+916,9,Male,
+916,11,オスのすがた,
+917,1,ふたふしフォルム,
+917,9,Two-Segment Form,
+917,11,ふたふしフォルム,
+934,1,ナイーブフォルム,
+934,9,Zero Form,
+934,11,ナイーブフォルム,
+946,1,４ひきかぞく,
+946,9,Family of Four,
+946,11,４ひきかぞく,
+952,1,そったすがた,
+952,9,Curly Form,
+952,11,そったすがた,
+960,1,グリーンフェザー,
+960,9,Green Plumage,
+960,11,グリーンフェザー,
+976,1,はこフォルム,
+976,9,Chest Form,
+976,11,はこフォルム,
+998,1,かんぜんけいたい,
+998,9,Apex Build,
+998,11,かんぜんけいたい,
+999,1,コンプリートモード,
+999,9,Ultimate Mode,
+999,11,コンプリートモード,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -2729,9 +2760,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10309,5,,Rubombelle Dominant
 10309,6,Totemform,Totem Bandelby
 10309,9,,Totem Ribombee
+10310,1,,イワンコ（マイペース）
 10310,5,,Rocabot Tempo Perso
 10310,6,Tempomacherform,Wuffels (Tempomacher)
 10310,9,,Own Tempo Rockruff
+10310,11,,イワンコ（マイペース）
 10311,1,たそがれのすがた,
 10311,3,황혼의 모습,
 10311,4,黃昏的樣子,
@@ -3034,10 +3067,14 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10343,9,Low Key Form,Low Key Toxtricity
 10343,11,ローなすがた,
 10343,12,低调的样子,
+10344,1,しんさくフォルム,
 10344,6,Originalform,Fatalitee (Original)
-10344,9,,Antique Sinistea
+10344,9,Antique Form,Antique Sinistea
+10344,11,しんさくフォルム,
+10345,1,しんさくフォルム,
 10345,6,Originalform,Mortipot (Original)
-10345,9,,Antique Polteageist
+10345,9,Antique Form,Antique Polteageist
+10345,11,しんさくフォルム,
 10346,1,ミルキィルビー,
 10346,3,밀키루비,
 10346,4,奶香紅鑽,
@@ -3425,3 +3462,69 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10418,6,Tiergeistform,Enamorus (Tiergeist)
 10418,9,Therian Forme,Therian Enamorus
 10418,11,れいじゅうフォルム,
+10419,1,パルデアのすがた,
+10419,9,Paldean Form,
+10419,11,パルデアのすがた,
+10420,1,パルデアのすがた,
+10420,9,Paldean Form,
+10420,11,パルデアのすがた,
+10421,1,パルデアのすがた,
+10421,9,Paldean Form,
+10421,11,パルデアのすがた,
+10422,1,パルデアのすがた,
+10422,9,Paldean Form,
+10422,11,パルデアのすがた,
+10423,1,メスのすがた,
+10423,9,Female,
+10423,11,メスのすがた,
+10424,1,みつふしフォルム,
+10424,9,Three-Segment Form,
+10424,11,みつふしフォルム,
+10425,1,マイティフォルム,
+10425,9,Hero Form,
+10425,11,マイティフォルム,
+10426,1,３びきかぞく,
+10426,9,Family of Three,
+10426,11,３びきかぞく,
+10427,1,たれたすがた,
+10427,9,Droopy Form,
+10427,11,たれたすがた,
+10428,1,のびたすがた,
+10428,9,Stretchy Form,
+10428,11,のびたすがた,
+10429,1,ブルーフェザー,
+10429,9,Blue Plumage,
+10429,11,ブルーフェザー,
+10430,1,イエローフェザー,
+10430,9,Yellow Plumage,
+10430,11,イエローフェザー,
+10431,1,ホワイトフェザー,
+10431,9,White Plumage,
+10431,11,ホワイトフェザー,
+10432,1,とほフォルム,
+10432,9,Roaming Form,
+10432,11,とほフォルム,
+10433,1,せいげんけいたい,
+10433,9,Limited Build,
+10433,11,せいげんけいたい,
+10434,1,しっそうけいたい,
+10434,9,Sprinting Build,
+10434,11,しっそうけいたい,
+10435,1,ゆうえいけいたい,
+10435,9,Swimming Build,
+10435,11,ゆうえいけいたい,
+10436,1,かっくうけいたい,
+10436,9,Gliding Build,
+10436,11,かっくうけいたい,
+10437,1,リミテッドモード,
+10437,9,Low-Power Mode,
+10437,11,リミテッドモード,
+10438,1,ドライブモード,
+10438,9,Drive Mode,
+10438,11,ドライブモード,
+10439,1,フロートモード,
+10439,9,Aquatic Mode,
+10439,11,フロートモード,
+10440,1,グライドモード,
+10440,9,Glide Mode,
+10440,11,グライドモード,

data/v2/csv/pokemon_forms.csv

@@ -1404,27 +1404,27 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10395,urshifu-single-strike-gmax,gmax,10226,20,1,1,0,1,1281
 10396,urshifu-rapid-strike-gmax,gmax,10227,20,1,1,0,1,1282
 10397,toxtricity-low-key-gmax,gmax,10228,20,1,1,0,1,1283
-10398,growlithe-hisui,hisui,10229,24,1,1,0,1,1284
-10399,arcanine-hisui,hisui,10230,24,1,1,0,1,1285
-10400,voltorb-hisui,hisui,10231,24,1,1,0,1,1286
-10401,electrode-hisui,hisui,10232,24,1,1,0,1,1287
-10402,typhlosion-hisui,hisui,10233,24,1,1,0,1,1288
-10403,qwilfish-hisui,hisui,10234,24,1,1,0,1,1289
-10404,sneasel-hisui,hisui,10235,24,1,1,0,1,1290
-10405,samurott-hisui,hisui,10236,24,1,1,0,1,1291
-10406,lilligant-hisui,hisui,10237,24,1,1,0,1,1292
-10407,zorua-hisui,hisui,10238,24,1,1,0,1,1293
-10408,zoroark-hisui,hisui,10239,24,1,1,0,1,1294
-10409,braviary-hisui,hisui,10240,24,1,1,0,1,1295
-10410,sliggoo-hisui,hisui,10241,24,1,1,0,1,1296
-10411,goodra-hisui,hisui,10242,24,1,1,0,1,1297
-10412,avalugg-hisui,hisui,10243,24,1,1,0,1,1298
-10413,decidueye-hisui,hisui,10244,24,1,1,0,1,1299
-10414,dialga-origin,origin,10245,24,1,1,0,1,1300
-10415,palkia-origin,origin,10246,24,1,1,0,1,1301
-10416,basculin-white-striped,white-striped,10247,24,1,1,0,1,1302
-10417,basculegion-female,female,10248,24,1,1,0,1,1303
-10418,enamorus-therian,therian,10249,24,1,1,0,1,1304
+10398,growlithe-hisui,hisui,10229,24,1,0,0,1,1284
+10399,arcanine-hisui,hisui,10230,24,1,0,0,1,1285
+10400,voltorb-hisui,hisui,10231,24,1,0,0,1,1286
+10401,electrode-hisui,hisui,10232,24,1,0,0,1,1287
+10402,typhlosion-hisui,hisui,10233,24,1,0,0,1,1288
+10403,qwilfish-hisui,hisui,10234,24,1,0,0,1,1289
+10404,sneasel-hisui,hisui,10235,24,1,0,0,1,1290
+10405,samurott-hisui,hisui,10236,24,1,0,0,1,1291
+10406,lilligant-hisui,hisui,10237,24,1,0,0,1,1292
+10407,zorua-hisui,hisui,10238,24,1,0,0,1,1293
+10408,zoroark-hisui,hisui,10239,24,1,0,0,1,1294
+10409,braviary-hisui,hisui,10240,24,1,0,0,1,1295
+10410,sliggoo-hisui,hisui,10241,24,1,0,0,1,1296
+10411,goodra-hisui,hisui,10242,24,1,0,0,1,1297
+10412,avalugg-hisui,hisui,10243,24,1,0,0,1,1298
+10413,decidueye-hisui,hisui,10244,24,1,0,0,1,1299
+10414,dialga-origin,origin,10245,24,1,0,0,1,1300
+10415,palkia-origin,origin,10246,24,1,0,0,1,1301
+10416,basculin-white-striped,white-striped,10247,24,1,0,0,1,1302
+10417,basculegion-female,female,10248,24,1,0,0,1,1303
+10418,enamorus-therian,therian,10249,24,1,0,0,1,1304
 10419,tauros-paldea-combat-breed,paldea-combat-breed,10250,25,0,0,0,2,1305
 10420,tauros-paldea-blaze-breed,paldea-blaze-breed,10251,25,0,0,0,3,1306
 10421,tauros-paldea-aqua-breed,paldea-aqua-breed,10252,25,0,0,0,4,1307

data/v2/csv/pokemon_species.csv

@@ -904,106 +904,106 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 903,sneasler,8,215,109,4,6,,4,135,,0,,0,4,0,0,0,903,
 904,overqwil,8,211,106,1,3,,4,135,,0,,0,2,0,0,0,904,
 905,enamorus,8,,477,6,4,,8,3,,0,,0,1,1,1,0,905,
-906,sprigatito,9,,,5,,,,45,50,0,20,0,,0,0,0,906,
-907,floragato,9,906,,5,,,,45,50,0,20,0,,0,0,0,907,
-908,meowscarada,9,907,,5,,,,45,50,0,20,0,,0,0,0,908,
-909,fuecoco,9,,,8,,,,45,50,0,20,0,,0,0,0,909,
-910,crocalor,9,909,,8,,,,45,50,0,20,0,,0,0,0,910,
-911,skeledirge,9,910,,8,,,,45,50,0,20,0,,0,0,0,911,
-912,quaxly,9,,,9,,,,45,50,0,20,0,,0,0,0,912,
-913,quaxwell,9,912,,2,,,,45,50,0,20,0,,0,0,0,913,
-914,quaquaval,9,913,,2,,,,45,50,0,20,0,,0,0,0,914,
-915,lechonk,9,,,4,,,,255,50,0,15,0,,0,0,0,915,
-916,oinkologne,9,915,,4,,,,100,50,0,15,0,,0,0,0,916,
-917,dudunsparce,9,206,,10,,,,45,50,0,20,0,,0,0,0,917,
-918,tarountula,9,,,9,,,,255,50,0,15,0,,0,0,0,918,
-919,spidops,9,918,,5,,,,120,50,0,15,0,,0,0,0,919,
-920,nymble,9,,,4,,,,190,20,0,20,0,,0,0,0,920,
-921,lokix,9,920,,4,,,,30,0,0,20,0,,0,0,0,921,
-922,rellor,9,,,3,,,,190,50,0,20,0,,0,0,0,922,
-923,rabsca,9,922,,5,,,,45,50,0,20,0,,0,0,0,923,
-924,greavard,9,,,9,,,,120,50,0,20,0,,0,0,0,924,
-925,houndstone,9,924,,9,,,,60,50,0,20,0,,0,0,0,925,
-926,flittle,9,,,10,,,,120,50,0,20,0,,0,0,0,926,
-927,espathra,9,926,,10,,,,60,50,0,20,0,,0,0,0,927,
-928,farigiraf,9,203,,3,,,,45,50,0,20,0,,0,0,0,928,
-929,wiglett,9,,,9,,,,255,50,0,20,0,,0,0,0,929,
-930,wugtrio,9,929,,8,,,,50,50,0,20,0,,0,0,0,930,
-931,dondozo,9,,,2,,,,25,50,0,40,0,,0,0,0,931,
-932,veluza,9,,,4,,,,100,50,0,20,0,,0,0,0,932,
-933,finizen,9,,,2,,,,200,50,0,40,0,,0,0,0,933,
-934,palafin,9,933,,2,,,,45,50,0,40,0,,0,0,0,934,
-935,smoliv,9,,,5,,,,255,50,0,20,0,,0,0,0,935,
-936,dolliv,9,935,,5,,,,120,50,0,20,0,,0,0,0,936,
-937,arboliva,9,936,,5,,,,45,50,0,20,0,,0,0,0,937,
-938,capsakid,9,,,5,,,,190,50,0,20,0,,0,0,0,938,
-939,scovillain,9,938,,5,,,,75,50,0,20,0,,0,0,0,939,
-940,tadbulb,9,,,10,,,,190,50,0,20,0,,0,0,0,940,
-941,bellibolt,9,940,,5,,,,50,50,0,20,0,,0,0,0,941,
-942,varoom,9,,,4,,,,190,50,0,20,0,,0,0,0,942,
-943,revavroom,9,942,,4,,,,75,50,0,20,0,,0,0,0,943,
-944,orthworm,9,,,6,,,,25,50,0,35,0,,0,0,0,944,
-945,tandemaus,9,,,9,,,,150,50,0,10,0,,0,0,0,945,
-946,maushold,9,945,,9,,,,75,50,0,10,0,,0,0,0,946,
-947,cetoddle,9,,,9,,,,150,50,0,25,0,,0,0,0,947,
-948,cetitan,9,947,,9,,,,50,50,0,25,0,,0,0,0,948,
-949,frigibax,9,,,4,,,,45,50,0,40,0,,0,0,0,949,
-950,arctibax,9,949,,4,,,,25,50,0,40,0,,0,0,0,950,
-951,baxcalibur,9,950,,4,,,,10,50,0,40,0,,0,0,0,951,
-952,tatsugiri,9,,,6,,,,100,50,0,35,0,,0,0,0,952,
-953,cyclizar,9,,,5,,,,190,50,0,30,0,,0,0,0,953,
-954,pawmi,9,,,10,,,,190,50,0,15,0,,0,0,0,954,
-955,pawmo,9,954,,10,,,,80,50,0,15,0,,0,0,0,955,
-956,pawmot,9,955,,10,,,,45,50,0,15,0,,0,0,0,956,
-957,wattrel,9,,,1,,,,180,50,0,20,0,,0,0,0,957,
-958,kilowattrel,9,957,,10,,,,90,50,0,20,0,,0,0,0,958,
-959,bombirdier,9,,,9,,,,25,50,0,35,0,,0,0,0,959,
-960,squawkabilly,9,,,5,,,,190,50,0,15,0,,0,0,0,960,
-961,flamigo,9,,,6,,,,100,50,0,20,0,,0,0,0,961,
-962,klawf,9,,,8,,,,120,50,0,35,0,,0,0,0,962,
-963,nacli,9,,,3,,,,255,50,0,20,0,,0,0,0,963,
-964,naclstack,9,963,,3,,,,120,50,0,20,0,,0,0,0,964,
-965,garganacl,9,964,,3,,,,45,50,0,20,0,,0,0,0,965,
-966,glimmet,9,,,2,,,,70,50,0,30,0,,0,0,0,966,
-967,glimmora,9,966,,2,,,,25,50,0,30,0,,0,0,0,967,
-968,shroodle,9,,,4,,,,190,50,0,20,0,,0,0,0,968,
-969,grafaiai,9,968,,4,,,,90,50,0,20,0,,0,0,0,969,
-970,fidough,9,,,10,,,,190,50,0,20,0,,0,0,0,970,
-971,dachsbun,9,970,,3,,,,90,50,0,20,0,,0,0,0,971,
-972,maschiff,9,,,3,,,,150,50,0,20,0,,0,0,0,972,
-973,mabosstiff,9,972,,4,,,,75,50,0,20,0,,0,0,0,973,
-974,bramblin,9,,,3,,,,190,50,0,20,0,,0,0,0,974,
-975,brambleghast,9,974,,3,,,,45,50,0,20,0,,0,0,0,975,
-976,gimmighoul,9,,,3,,,,45,50,0,50,0,,0,0,0,976,
-977,gholdengo,9,976,,10,,,,45,50,0,50,0,,0,0,0,977,
-978,great-tusk,9,,,7,,,,30,0,0,50,0,,0,0,0,978,
-979,brute-bonnet,9,,,4,,,,50,0,0,50,0,,0,0,0,979,
-981,sandy-shocks,9,,,4,,,,30,0,0,50,0,,0,0,0,981,
-982,scream-tail,9,,,6,,,,50,0,0,50,0,,0,0,0,982,
-983,flutter-mane,9,,,4,,,,30,0,0,50,0,,0,0,0,983,
-984,slither-wing,9,,,8,,,,30,0,0,50,0,,0,0,0,984,
-985,roaring-moon,9,,,5,,,,10,0,0,50,0,,0,0,0,985,
-986,iron-treads,9,,,4,,,,30,0,0,50,0,,0,0,0,986,
-988,iron-moth,9,,,10,,,,30,0,0,50,0,,0,0,0,988,
-989,iron-hands,9,,,4,,,,50,0,0,50,0,,0,0,0,989,
-990,iron-jugulis,9,,,2,,,,30,0,0,50,0,,0,0,0,990,
-991,iron-thorns,9,,,5,,,,30,0,0,50,0,,0,0,0,991,
-992,iron-bundle,9,,,8,,,,50,0,0,50,0,,0,0,0,992,
-993,iron-valiant,9,,,9,,,,10,0,0,50,0,,0,0,0,993,
-994,ting-lu,9,,,3,,,,6,0,0,50,0,,0,0,0,994,
-995,chien-pao,9,,,9,,,,6,0,0,50,0,,0,0,0,995,
-996,wo-chien,9,,,3,,,,6,0,0,50,0,,0,0,0,996,
-997,chi-yu,9,,,8,,,,6,0,0,50,0,,0,0,0,997,
-998,koraidon,9,,,8,,,,3,0,0,50,0,,0,0,0,998,
-999,miraidon,9,,,2,,,,3,0,0,50,0,,0,0,0,999,
-1000,tinkatink,9,,,6,,,,190,50,0,20,0,,0,0,0,1000,
-1001,tinkatuff,9,1000,,6,,,,90,50,0,20,0,,0,0,0,1001,
-1002,tinkaton,9,1001,,6,,,,45,50,0,20,0,,0,0,0,1002,
-1003,charcadet,9,,,8,,,,90,50,0,35,0,,0,0,0,1003,
-1004,armarouge,9,1003,,8,,,,25,20,0,35,0,,0,0,0,1004,
-1005,ceruledge,9,1003,,2,,,,25,20,0,35,0,,0,0,0,1005,
-1006,toedscool,9,,,10,,,,190,50,0,20,0,,0,0,0,1006,
-1007,toedscruel,9,1006,,1,,,,90,50,0,20,0,,0,0,0,1007,
-1008,kingambit,9,625,,1,,,,25,50,0,20,0,,0,0,0,1008,
-1009,clodsire,9,194,,3,,,,90,50,0,20,0,,0,0,0,1009,
-1010,annihilape,9,57,,4,,,,45,50,0,20,0,,0,0,0,1010,
+906,sprigatito,9,,,5,,,1,45,50,0,20,0,,0,0,0,906,
+907,floragato,9,906,,5,,,1,45,50,0,20,0,,0,0,0,907,
+908,meowscarada,9,907,,5,,,1,45,50,0,20,0,,0,0,0,908,
+909,fuecoco,9,,,8,,,1,45,50,0,20,0,,0,0,0,909,
+910,crocalor,9,909,,8,,,1,45,50,0,20,0,,0,0,0,910,
+911,skeledirge,9,910,,8,,,1,45,50,0,20,0,,0,0,0,911,
+912,quaxly,9,,,9,,,1,45,50,0,20,0,,0,0,0,912,
+913,quaxwell,9,912,,2,,,1,45,50,0,20,0,,0,0,0,913,
+914,quaquaval,9,913,,2,,,1,45,50,0,20,0,,0,0,0,914,
+915,lechonk,9,,,4,,,4,255,50,0,15,0,,0,0,0,915,
+916,oinkologne,9,915,,4,,,0,100,50,0,15,0,,0,0,0,916,
+917,dudunsparce,9,206,,10,,,4,45,50,0,20,0,,0,0,0,917,
+918,tarountula,9,,,9,,,4,255,50,0,15,0,,0,0,0,918,
+919,spidops,9,918,,5,,,4,120,50,0,15,0,,0,0,0,919,
+920,nymble,9,,,4,,,4,190,20,0,20,0,,0,0,0,920,
+921,lokix,9,920,,4,,,4,30,0,0,20,0,,0,0,0,921,
+922,rellor,9,,,3,,,4,190,50,0,20,0,,0,0,0,922,
+923,rabsca,9,922,,5,,,4,45,50,0,20,0,,0,0,0,923,
+924,greavard,9,,,9,,,4,120,50,0,20,0,,0,0,0,924,
+925,houndstone,9,924,,9,,,4,60,50,0,20,0,,0,0,0,925,
+926,flittle,9,,,10,,,4,120,50,0,20,0,,0,0,0,926,
+927,espathra,9,926,,10,,,4,60,50,0,20,0,,0,0,0,927,
+928,farigiraf,9,203,,3,,,4,45,50,0,20,0,,0,0,0,928,
+929,wiglett,9,,,9,,,4,255,50,0,20,0,,0,0,0,929,
+930,wugtrio,9,929,,8,,,4,50,50,0,20,0,,0,0,0,930,
+931,dondozo,9,,,2,,,4,25,50,0,40,0,,0,0,0,931,
+932,veluza,9,,,4,,,4,100,50,0,20,0,,0,0,0,932,
+933,finizen,9,,,2,,,4,200,50,0,40,0,,0,0,0,933,
+934,palafin,9,933,,2,,,4,45,50,0,40,0,,0,0,0,934,
+935,smoliv,9,,,5,,,4,255,50,0,20,0,,0,0,0,935,
+936,dolliv,9,935,,5,,,4,120,50,0,20,0,,0,0,0,936,
+937,arboliva,9,936,,5,,,4,45,50,0,20,0,,0,0,0,937,
+938,capsakid,9,,,5,,,4,190,50,0,20,0,,0,0,0,938,
+939,scovillain,9,938,,5,,,4,75,50,0,20,0,,0,0,0,939,
+940,tadbulb,9,,,10,,,4,190,50,0,20,0,,0,0,0,940,
+941,bellibolt,9,940,,5,,,4,50,50,0,20,0,,0,0,0,941,
+942,varoom,9,,,4,,,4,190,50,0,20,0,,0,0,0,942,
+943,revavroom,9,942,,4,,,4,75,50,0,20,0,,0,0,0,943,
+944,orthworm,9,,,6,,,4,25,50,0,35,0,,0,0,0,944,
+945,tandemaus,9,,,9,,,-1,150,50,0,10,0,,0,0,0,945,
+946,maushold,9,945,,9,,,-1,75,50,0,10,0,,0,0,0,946,
+947,cetoddle,9,,,9,,,4,150,50,0,25,0,,0,0,0,947,
+948,cetitan,9,947,,9,,,4,50,50,0,25,0,,0,0,0,948,
+949,frigibax,9,,,4,,,4,45,50,0,40,0,,0,0,0,949,
+950,arctibax,9,949,,4,,,4,25,50,0,40,0,,0,0,0,950,
+951,baxcalibur,9,950,,4,,,4,10,50,0,40,0,,0,0,0,951,
+952,tatsugiri,9,,,6,,,4,100,50,0,35,0,,0,0,0,952,
+953,cyclizar,9,,,5,,,4,190,50,0,30,0,,0,0,0,953,
+954,pawmi,9,,,10,,,4,190,50,0,15,0,,0,0,0,954,
+955,pawmo,9,954,,10,,,4,80,50,0,15,0,,0,0,0,955,
+956,pawmot,9,955,,10,,,4,45,50,0,15,0,,0,0,0,956,
+957,wattrel,9,,,1,,,4,180,50,0,20,0,,0,0,0,957,
+958,kilowattrel,9,957,,10,,,4,90,50,0,20,0,,0,0,0,958,
+959,bombirdier,9,,,9,,,4,25,50,0,35,0,,0,0,0,959,
+960,squawkabilly,9,,,5,,,4,190,50,0,15,0,,0,0,0,960,
+961,flamigo,9,,,6,,,4,100,50,0,20,0,,0,0,0,961,
+962,klawf,9,,,8,,,4,120,50,0,35,0,,0,0,0,962,
+963,nacli,9,,,3,,,4,255,50,0,20,0,,0,0,0,963,
+964,naclstack,9,963,,3,,,4,120,50,0,20,0,,0,0,0,964,
+965,garganacl,9,964,,3,,,4,45,50,0,20,0,,0,0,0,965,
+966,glimmet,9,,,2,,,4,70,50,0,30,0,,0,0,0,966,
+967,glimmora,9,966,,2,,,4,25,50,0,30,0,,0,0,0,967,
+968,shroodle,9,,,4,,,4,190,50,0,20,0,,0,0,0,968,
+969,grafaiai,9,968,,4,,,4,90,50,0,20,0,,0,0,0,969,
+970,fidough,9,,,10,,,4,190,50,0,20,0,,0,0,0,970,
+971,dachsbun,9,970,,3,,,4,90,50,0,20,0,,0,0,0,971,
+972,maschiff,9,,,3,,,4,150,50,0,20,0,,0,0,0,972,
+973,mabosstiff,9,972,,4,,,4,75,50,0,20,0,,0,0,0,973,
+974,bramblin,9,,,3,,,4,190,50,0,20,0,,0,0,0,974,
+975,brambleghast,9,974,,3,,,4,45,50,0,20,0,,0,0,0,975,
+976,gimmighoul,9,,,3,,,-1,45,50,0,50,0,,0,0,0,976,
+977,gholdengo,9,976,,10,,,-1,45,50,0,50,0,,0,0,0,977,
+978,great-tusk,9,,,7,,,-1,30,0,0,50,0,,0,0,0,978,
+979,brute-bonnet,9,,,4,,,-1,50,0,0,50,0,,0,0,0,979,
+981,sandy-shocks,9,,,4,,,-1,30,0,0,50,0,,0,0,0,981,
+982,scream-tail,9,,,6,,,-1,50,0,0,50,0,,0,0,0,982,
+983,flutter-mane,9,,,4,,,-1,30,0,0,50,0,,0,0,0,983,
+984,slither-wing,9,,,8,,,-1,30,0,0,50,0,,0,0,0,984,
+985,roaring-moon,9,,,5,,,-1,10,0,0,50,0,,0,0,0,985,
+986,iron-treads,9,,,4,,,-1,30,0,0,50,0,,0,0,0,986,
+988,iron-moth,9,,,10,,,-1,30,0,0,50,0,,0,0,0,988,
+989,iron-hands,9,,,4,,,-1,50,0,0,50,0,,0,0,0,989,
+990,iron-jugulis,9,,,2,,,-1,30,0,0,50,0,,0,0,0,990,
+991,iron-thorns,9,,,5,,,-1,30,0,0,50,0,,0,0,0,991,
+992,iron-bundle,9,,,8,,,-1,50,0,0,50,0,,0,0,0,992,
+993,iron-valiant,9,,,9,,,-1,10,0,0,50,0,,0,0,0,993,
+994,ting-lu,9,,,3,,,-1,6,0,0,50,0,,0,0,0,994,
+995,chien-pao,9,,,9,,,-1,6,0,0,50,0,,0,0,0,995,
+996,wo-chien,9,,,3,,,-1,6,0,0,50,0,,0,0,0,996,
+997,chi-yu,9,,,8,,,-1,6,0,0,50,0,,0,0,0,997,
+998,koraidon,9,,,8,,,-1,3,0,0,50,0,,0,0,0,998,
+999,miraidon,9,,,2,,,-1,3,0,0,50,0,,0,0,0,999,
+1000,tinkatink,9,,,6,,,8,190,50,0,20,0,,0,0,0,1000,
+1001,tinkatuff,9,1000,,6,,,8,90,50,0,20,0,,0,0,0,1001,
+1002,tinkaton,9,1001,,6,,,8,45,50,0,20,0,,0,0,0,1002,
+1003,charcadet,9,,,8,,,4,90,50,0,35,0,,0,0,0,1003,
+1004,armarouge,9,1003,,8,,,4,25,20,0,35,0,,0,0,0,1004,
+1005,ceruledge,9,1003,,2,,,4,25,20,0,35,0,,0,0,0,1005,
+1006,toedscool,9,,,10,,,4,190,50,0,20,0,,0,0,0,1006,
+1007,toedscruel,9,1006,,1,,,4,90,50,0,20,0,,0,0,0,1007,
+1008,kingambit,9,625,,1,,,4,25,50,0,20,0,,0,0,0,1008,
+1009,clodsire,9,194,,3,,,4,90,50,0,20,0,,0,0,0,1009,
+1010,annihilape,9,57,,4,,,4,45,50,0,20,0,,0,0,0,1010,

data/v2/csv/pokemon_stats.csv

@@ -5462,7 +5462,7 @@ pokemon_id,stat_id,base_stat,effort
 911,1,104,0
 911,2,75,0
 911,3,100,0
-911,4,100,3
+911,4,110,3
 911,5,75,0
 911,6,66,0
 912,1,55,0
@@ -5514,7 +5514,7 @@ pokemon_id,stat_id,base_stat,effort
 919,5,86,0
 919,6,35,0
 920,1,33,0
-920,2,43,1
+920,2,46,1
 920,3,40,0
 920,4,21,0
 920,5,25,0
@@ -5620,7 +5620,7 @@ pokemon_id,stat_id,base_stat,effort
 937,3,90,0
 937,4,125,3
 937,5,109,0
-937,6,36,0
+937,6,39,0
 938,1,50,0
 938,2,62,1
 938,3,40,0
@@ -5750,7 +5750,7 @@ pokemon_id,stat_id,base_stat,effort
 959,1,70,0
 959,2,103,2
 959,3,85,0
-959,4,80,0
+959,4,60,0
 959,5,85,0
 959,6,82,0
 960,1,82,0
@@ -5915,7 +5915,7 @@ pokemon_id,stat_id,base_stat,effort
 988,4,140,3
 988,5,110,0
 988,6,110,0
-989,1,124,0
+989,1,154,0
 989,2,140,3
 989,3,108,0
 989,4,50,0

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2.4'
 services:
   cache:
-    image: redis:alpine
+    image: redis:7.0.7-alpine
     volumes:
       - redis_data:/data
     restart: always
 
   db:
-    image: postgres
+    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
       POSTGRES_USER: ${POSTGRES_USER:-ash}
@@ -33,7 +33,7 @@ services:
     restart: always
 
   web:
-    image: nginx:alpine
+    image: nginx:1.23.3-alpine
     ports:
       - "80:80"
       - "443:443"
@@ -44,7 +44,7 @@ services:
       - ./Resources/nginx/ssl:/ssl:ro
       - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.8
+    image: hasura/graphql-engine:v2.16.1
     ports:
       - "8080:8080"
     depends_on:

graphql/examples/searchForPokemonInGerman.gql

@@ -0,0 +1,20 @@
+# This query searches for pokemon having a german name like "Ento.*"
+# Should return Psyduck and Golduck
+
+query searchForPokemonInGerman {
+  pokemon_v2_pokemonspecies(
+    where: {
+      pokemon_v2_pokemonspeciesnames: {
+        pokemon_v2_language: { name: { _eq: "de" } }
+        name: { _regex: "Ento.*" }
+      }
+    }
+  ) {
+    pokemon_v2_pokemonspeciesnames(
+      where: { pokemon_v2_language: { name: { _eq: "de" } } }
+    ) {
+      name
+    }
+    id
+  }
+}