Add pokemon evolution support across the full stack
- Evolution model with trigger, level, item, and condition fields
- Encounter.current_pokemon_id tracks evolved species separately
- Alembic migration for evolutions table and current_pokemon_id column
- Seed pipeline loads evolution data with manual overrides
- GET /pokemon/{id}/evolutions and PATCH /encounters/{id} endpoints
- Evolve button in StatusChangeModal with evolution method details
- PokemonCard shows evolved species with "Originally" label
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,12 +1,19 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException, Response
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import joinedload
|
||||
|
||||
from app.core.database import get_session
|
||||
from app.models.encounter import Encounter
|
||||
from app.models.nuzlocke_run import NuzlockeRun
|
||||
from app.models.pokemon import Pokemon
|
||||
from app.models.route import Route
|
||||
from app.schemas.encounter import EncounterCreate, EncounterResponse, EncounterUpdate
|
||||
from app.schemas.encounter import (
|
||||
EncounterCreate,
|
||||
EncounterDetailResponse,
|
||||
EncounterResponse,
|
||||
EncounterUpdate,
|
||||
)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -50,7 +57,7 @@ async def create_encounter(
|
||||
return encounter
|
||||
|
||||
|
||||
@router.patch("/encounters/{encounter_id}", response_model=EncounterResponse)
|
||||
@router.patch("/encounters/{encounter_id}", response_model=EncounterDetailResponse)
|
||||
async def update_encounter(
|
||||
encounter_id: int,
|
||||
data: EncounterUpdate,
|
||||
@@ -65,8 +72,18 @@ async def update_encounter(
|
||||
setattr(encounter, field, value)
|
||||
|
||||
await session.commit()
|
||||
await session.refresh(encounter)
|
||||
return encounter
|
||||
|
||||
# Reload with relationships for detail response
|
||||
result = await session.execute(
|
||||
select(Encounter)
|
||||
.where(Encounter.id == encounter_id)
|
||||
.options(
|
||||
joinedload(Encounter.pokemon),
|
||||
joinedload(Encounter.current_pokemon),
|
||||
joinedload(Encounter.route),
|
||||
)
|
||||
)
|
||||
return result.scalar_one()
|
||||
|
||||
|
||||
@router.delete("/encounters/{encounter_id}", status_code=204)
|
||||
|
||||
Reference in New Issue
Block a user