mirror of
https://github.com/PokeAPI/pokeapi
synced 2024-11-22 03:13:06 +00:00
tests now handling all convenience attributes in all apis
This commit is contained in:
Adickes
parent
300f1a9b79
commit
3d8e9a7649
7 changed files with 713 additions and 305 deletions
|
|
@ -48,7 +48,6 @@ from pokemon_v2.views import *
|
|||
router = routers.DefaultRouter()
|
||||
|
||||
router.register(r"ability", AbilityResource)
|
||||
router.register(r"ability-change", AbilityChangeResource)
|
||||
router.register(r"berry", BerryResource)
|
||||
router.register(r"berry-firmness", BerryFirmnessResource)
|
||||
router.register(r"berry-flavor", BerryFlavorResource)
|
||||
|
|
@ -72,7 +71,6 @@ router.register(r"item-pocket", ItemPocketResource)
|
|||
router.register(r"language", LanguageResource)
|
||||
router.register(r"location", LocationResource)
|
||||
router.register(r"location-area", LocationAreaResource)
|
||||
# router.register(r"machine", MachineResource)
|
||||
router.register(r"move", MoveResource)
|
||||
router.register(r"move-ailment", MoveMetaAilmentResource)
|
||||
router.register(r"move-battle-style", MoveBattleStyleResource)
|
||||
|
|
|
|||
|
|
@ -1332,7 +1332,7 @@ for index, info in enumerate(data):
|
|||
name = item.name[:item.name.index('-')],
|
||||
berry_firmness = BerryFirmness.objects.get(pk = int(info[2])),
|
||||
natural_gift_power = int(info[3]),
|
||||
nature = None,
|
||||
natural_gift_type = Type.objects.get(pk = int(info[4])),
|
||||
size = int(info[5]),
|
||||
max_harvest = int(info[6]),
|
||||
growth_time = int(info[7]),
|
||||
|
|
@ -1425,17 +1425,6 @@ for index, info in enumerate(data):
|
|||
nature.save()
|
||||
|
||||
|
||||
#Berry/Nature associations
|
||||
data = loadData('berries.csv')
|
||||
|
||||
for index, info in enumerate(data):
|
||||
if index > 0:
|
||||
|
||||
berry = Berry.objects.get(pk = int(info[0]))
|
||||
berry.nature = Nature.objects.get(pk = int(info[4]))
|
||||
berry.save()
|
||||
|
||||
|
||||
clearTable(NatureName)
|
||||
data = loadData('nature_names.csv')
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ from django.db import models, migrations
|
|||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
#replaces = [(b'pokemon_v2', '0001_squashed_0011_auto_20151108_0352'), (b'pokemon_v2', '0002_auto_20151110_1756'), (b'pokemon_v2', '0003_berryflavormap'), (b'pokemon_v2', '0004_auto_20151111_0531'), (b'pokemon_v2', '0005_auto_20151111_0541'), (b'pokemon_v2', '0006_auto_20151111_2216'), (b'pokemon_v2', '0007_auto_20151113_1414'), (b'pokemon_v2', '0008_auto_20151114_0241'), (b'pokemon_v2', '0009_auto_20151114_0433'), (b'pokemon_v2', '0010_auto_20151116_0219'), (b'pokemon_v2', '0011_auto_20151116_0230'), (b'pokemon_v2', '0012_auto_20151116_0317')]
|
||||
# replaces = [(b'pokemon_v2', '0001_squashed_0012_auto_20151116_0317'), (b'pokemon_v2', '0002_auto_20151119_0338'), (b'pokemon_v2', '0003_auto_20151119_1409')]
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
|
@ -3080,7 +3080,7 @@ class Migration(migrations.Migration):
|
|||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||
('item_fling_effect', models.ForeignKey(related_name='itemflingeffecteffecttext', blank=True, to='pokemon_v2.ItemFlingEffect', null=True)),
|
||||
('language', models.ForeignKey(related_name='itemflingeffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
|
||||
('effect', models.CharField(default='string', max_length=4000)),
|
||||
('effect', models.CharField(max_length=4000)),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
|
|
@ -3147,4 +3147,20 @@ class Migration(migrations.Migration):
|
|||
field=models.OneToOneField(related_name='generation', null=True, blank=True, to='pokemon_v2.Region'),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='berry',
|
||||
name='nature',
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='berry',
|
||||
name='natural_gift_type',
|
||||
field=models.ForeignKey(related_name='berry', blank=True, to='pokemon_v2.Type', null=True),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='itemflingeffect',
|
||||
name='name',
|
||||
field=models.CharField(max_length=100),
|
||||
preserve_default=True,
|
||||
),
|
||||
]
|
||||
|
|
@ -707,12 +707,14 @@ class BerryFirmnessName(IsName):
|
|||
berry_firmness = models.ForeignKey(BerryFirmness, blank=True, null=True, related_name="%(class)s")
|
||||
|
||||
|
||||
class Berry(HasName, HasItem, HasNature):
|
||||
class Berry(HasName, HasItem):
|
||||
|
||||
berry_firmness = models.ForeignKey(BerryFirmness, blank=True, null=True, related_name="%(class)s")
|
||||
|
||||
natural_gift_power = models.IntegerField()
|
||||
|
||||
natural_gift_type = models.ForeignKey(Type, blank=True, null=True, related_name="%(class)s")
|
||||
|
||||
size = models.IntegerField()
|
||||
|
||||
max_harvest = models.IntegerField()
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class BerrySummarySerializer(serializers.HyperlinkedModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = Berry
|
||||
fields = ('url', 'name')
|
||||
fields = ('name', 'url')
|
||||
|
||||
class CharacteristicSummarySerializer(serializers.HyperlinkedModelSerializer):
|
||||
|
||||
|
|
@ -319,7 +319,7 @@ class BerryFlavorMapSerializer(serializers.ModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = BerryFlavorMap
|
||||
fields = ('berry', 'flavor', 'potency')
|
||||
fields = ('potency', 'berry', 'flavor')
|
||||
|
||||
class ItemAttributeMapSerializer(serializers.ModelSerializer):
|
||||
|
||||
|
|
@ -357,6 +357,15 @@ class PokemonAbilitySerializer(serializers.ModelSerializer):
|
|||
model = PokemonAbility
|
||||
fields = ('is_hidden', 'slot', 'ability', 'pokemon')
|
||||
|
||||
class PokemonDexEntrySerializer(serializers.ModelSerializer):
|
||||
|
||||
entry_number = serializers.IntegerField(source="pokedex_number")
|
||||
pokedex = PokedexSummarySerializer()
|
||||
|
||||
class Meta:
|
||||
model = PokemonDexNumber
|
||||
fields = ('entry_number', 'pokedex')
|
||||
|
||||
class PokemonTypeSerializer(serializers.ModelSerializer):
|
||||
|
||||
pokemon = PokemonSummarySerializer()
|
||||
|
|
@ -559,7 +568,6 @@ class RegionDetailSerializer(serializers.ModelSerializer):
|
|||
def get_region_version_groups(self, obj):
|
||||
|
||||
vg_regions = VersionGroupRegion.objects.filter(region=obj)
|
||||
print vg_regions
|
||||
data = VersionGroupRegionSerializer(vg_regions, many=True, context=self.context).data
|
||||
groups = []
|
||||
|
||||
|
|
@ -584,7 +592,7 @@ class GenerationNameSerializer(serializers.ModelSerializer):
|
|||
|
||||
class GenerationDetailSerializer(serializers.ModelSerializer):
|
||||
|
||||
main_region = RegionSummarySerializer()
|
||||
main_region = RegionSummarySerializer(source='region')
|
||||
names = GenerationNameSerializer(many=True, read_only=True, source="generationname")
|
||||
abilities = AbilitySummarySerializer(many=True, read_only=True, source="ability")
|
||||
moves = MoveSummarySerializer(many=True, read_only=True, source="move")
|
||||
|
|
@ -613,6 +621,8 @@ class GenderDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
def get_species(self, obj):
|
||||
|
||||
species_objects = []
|
||||
|
||||
if obj.name == 'female':
|
||||
species_objects = PokemonSpecies.objects.filter(gender_rate__gt=0)
|
||||
elif obj.name == 'male':
|
||||
|
|
@ -636,10 +646,8 @@ class GenderDetailSerializer(serializers.ModelSerializer):
|
|||
species_list = []
|
||||
|
||||
for evo in evo_objects:
|
||||
print evo.evolved_species
|
||||
species = PokemonSpeciesSummarySerializer(evo.evolved_species, context=self.context).data
|
||||
species_list.append(species)
|
||||
print species_list
|
||||
|
||||
return species_list
|
||||
|
||||
|
|
@ -669,10 +677,11 @@ class GrowthRateDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
descriptions = GrowthRateDescriptionSerializer(many=True, read_only=True, source="growthratedescription")
|
||||
levels = ExperienceSerializer(many=True, read_only=True, source="experience")
|
||||
pokemon_species = PokemonSpeciesSummarySerializer(many=True, read_only=True, source="pokemonspecies")
|
||||
|
||||
class Meta:
|
||||
model = GrowthRate
|
||||
fields = ('id', 'name', 'formula', 'descriptions', 'levels')
|
||||
fields = ('id', 'name', 'formula', 'descriptions', 'levels', 'pokemon_species')
|
||||
|
||||
|
||||
##########################
|
||||
|
|
@ -828,8 +837,6 @@ class LocationAreaDetailSerializer(serializers.ModelSerializer):
|
|||
method_ids = encounter_rates.values('encounter_method_id').distinct()
|
||||
encounter_rate_list = []
|
||||
|
||||
print method_ids
|
||||
|
||||
for id in method_ids:
|
||||
|
||||
encounter_rate_details = OrderedDict()
|
||||
|
|
@ -1101,7 +1108,7 @@ class ItemPocketDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = ItemPocket
|
||||
fields = ('id', 'name', 'categories', 'items', 'names')
|
||||
fields = ('id', 'name', 'categories', 'categories', 'names')
|
||||
|
||||
|
||||
|
||||
|
|
@ -1251,7 +1258,7 @@ class ItemDetailSerializer(serializers.ModelSerializer):
|
|||
attributes = serializers.SerializerMethodField("get_item_attributes")
|
||||
fling_effect = ItemFlingEffectSummarySerializer(source="item_fling_effect")
|
||||
held_by_pokemon = serializers.SerializerMethodField(source='get_held_by_pokemon')
|
||||
baby_trigger_for_evolution_chain = serializers.SerializerMethodField(source='get_baby_trigger_for_evolution_chain')
|
||||
baby_trigger_for = serializers.SerializerMethodField(source='get_baby_trigger_for')
|
||||
|
||||
class Meta:
|
||||
model = Item
|
||||
|
|
@ -1268,7 +1275,7 @@ class ItemDetailSerializer(serializers.ModelSerializer):
|
|||
'game_indices',
|
||||
'names',
|
||||
'held_by_pokemon',
|
||||
'baby_trigger_for_evolution_chain'
|
||||
'baby_trigger_for'
|
||||
)
|
||||
|
||||
def get_item_attributes(self, obj):
|
||||
|
|
@ -1317,7 +1324,7 @@ class ItemDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
return pokemon_list
|
||||
|
||||
def get_baby_trigger_for_evolution_chain(self, obj):
|
||||
def get_baby_trigger_for(self, obj):
|
||||
|
||||
try:
|
||||
chain_object = EvolutionChain.objects.get(baby_trigger_item=obj)
|
||||
|
|
@ -1353,8 +1360,6 @@ class NatureNameSerializer(serializers.ModelSerializer):
|
|||
|
||||
class NatureDetailSerializer(serializers.ModelSerializer):
|
||||
|
||||
# NEED FLAVORS
|
||||
|
||||
names = NatureNameSerializer(many=True, read_only=True, source="naturename")
|
||||
decreased_stat = StatSummarySerializer()
|
||||
increased_stat = StatSummarySerializer()
|
||||
|
|
@ -1399,7 +1404,7 @@ class BerryFirmnessDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
class Meta:
|
||||
model = BerryFirmness
|
||||
fields = ('id', 'name', 'names', 'berries')
|
||||
fields = ('id', 'name', 'berries', 'names')
|
||||
|
||||
|
||||
class BerryFlavorNameSerializer(serializers.ModelSerializer):
|
||||
|
|
@ -1415,17 +1420,27 @@ class BerryFlavorDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
names = BerryFlavorNameSerializer(many=True, read_only=True, source="berryflavorname")
|
||||
contest_type = ContestTypeSummarySerializer()
|
||||
berries = serializers.SerializerMethodField('get_berries_with_flavor')
|
||||
|
||||
class Meta:
|
||||
model = BerryFlavor
|
||||
fields = ('id', 'name', 'contest_type', 'names')
|
||||
fields = ('id', 'name', 'berries', 'contest_type', 'names')
|
||||
|
||||
def get_berries_with_flavor(self, obj):
|
||||
|
||||
flavor_map_objects = BerryFlavorMap.objects.filter(berry_flavor=obj, potency__gt=0).order_by('potency')
|
||||
flavor_maps = BerryFlavorMapSerializer(flavor_map_objects, many=True, context=self.context).data
|
||||
|
||||
for map in flavor_maps:
|
||||
del map['flavor']
|
||||
|
||||
return flavor_maps
|
||||
|
||||
|
||||
class BerryDetailSerializer(serializers.ModelSerializer):
|
||||
|
||||
item = ItemSummarySerializer()
|
||||
nature = NatureSummarySerializer()
|
||||
nature_power = serializers.IntegerField(source='natural_gift_power')
|
||||
natural_gift_type = TypeSummarySerializer()
|
||||
firmness = BerryFirmnessSummarySerializer(source="berry_firmness")
|
||||
flavors = serializers.SerializerMethodField('get_berry_flavors')
|
||||
|
||||
|
|
@ -1436,14 +1451,14 @@ class BerryDetailSerializer(serializers.ModelSerializer):
|
|||
'name',
|
||||
'growth_time',
|
||||
'max_harvest',
|
||||
'nature_power',
|
||||
'natural_gift_power',
|
||||
'size',
|
||||
'smoothness',
|
||||
'soil_dryness',
|
||||
'firmness',
|
||||
'flavors',
|
||||
'item',
|
||||
'nature',
|
||||
'natural_gift_type',
|
||||
)
|
||||
|
||||
def get_berry_flavors(self, obj):
|
||||
|
|
@ -1872,7 +1887,7 @@ class MoveDetailSerializer(serializers.ModelSerializer):
|
|||
stat_changes = serializers.SerializerMethodField('get_move_stat_change')
|
||||
super_contest_effect = SuperContestEffectSummarySerializer()
|
||||
past_values = MoveChangeSerializer(many=True, read_only=True, source="movechange")
|
||||
effect_change = serializers.SerializerMethodField('get_effect_change_text')
|
||||
effect_changes = serializers.SerializerMethodField('get_effect_change_text')
|
||||
|
||||
class Meta:
|
||||
model = Move
|
||||
|
|
@ -1880,6 +1895,7 @@ class MoveDetailSerializer(serializers.ModelSerializer):
|
|||
'id',
|
||||
'name',
|
||||
'accuracy',
|
||||
'effect_chance',
|
||||
'pp',
|
||||
'priority',
|
||||
'power',
|
||||
|
|
@ -1888,8 +1904,7 @@ class MoveDetailSerializer(serializers.ModelSerializer):
|
|||
'contest_effect',
|
||||
'damage_class',
|
||||
'effect_entries',
|
||||
'effect_chance',
|
||||
'effect_change',
|
||||
'effect_changes',
|
||||
'generation',
|
||||
'meta',
|
||||
'names',
|
||||
|
|
@ -1955,7 +1970,6 @@ class MoveDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
def get_effect_change_text(self, obj):
|
||||
|
||||
print obj.move_effect.id
|
||||
effect_changes = MoveEffectChange.objects.filter(move_effect=obj.move_effect)
|
||||
data = MoveEffectChangeSerializer(effect_changes, many=True, context=self.context).data
|
||||
|
||||
|
|
@ -2227,35 +2241,31 @@ class PokemonDetailSerializer(serializers.ModelSerializer):
|
|||
types = serializers.SerializerMethodField('get_pokemon_types')
|
||||
forms = PokemonFormSummarySerializer(many=True, read_only=True, source="pokemonform")
|
||||
held_items = serializers.SerializerMethodField('get_pokemon_held_items')
|
||||
# location_area_encounters = serializers.SerializerMethodField('get_encounters')
|
||||
location_areas = serializers.SerializerMethodField('get_areas')
|
||||
location_area_encounters = serializers.SerializerMethodField('get_encounters')
|
||||
|
||||
class Meta:
|
||||
model = Pokemon
|
||||
fields = (
|
||||
'id',
|
||||
'name',
|
||||
'order',
|
||||
'is_default',
|
||||
'height',
|
||||
'weight',
|
||||
'name',
|
||||
'base_experience',
|
||||
'species',
|
||||
'height',
|
||||
'is_default',
|
||||
'order',
|
||||
'weight',
|
||||
'abilities',
|
||||
'forms',
|
||||
'game_indices',
|
||||
'held_items',
|
||||
'location_area_encounters',
|
||||
'moves',
|
||||
'species',
|
||||
'stats',
|
||||
'types',
|
||||
'forms',
|
||||
'held_items',
|
||||
'moves',
|
||||
'game_indices',
|
||||
'location_areas'
|
||||
)
|
||||
|
||||
def get_pokemon_moves(self, obj):
|
||||
# Doin moves a little differently because pokemon
|
||||
# move resources are a beast
|
||||
|
||||
# Get all possible Version Groups and Move Methods for later use
|
||||
version_objects = VersionGroup.objects.all()
|
||||
version_data = VersionGroupSummarySerializer(version_objects, many=True, context=self.context).data
|
||||
method_objects = MoveLearnMethod.objects.all()
|
||||
|
|
@ -2341,16 +2351,6 @@ class PokemonDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
return abilities
|
||||
|
||||
def get_areas(self, obj):
|
||||
|
||||
encounter_objects = Encounter.objects.filter(pokemon_id=obj.id)
|
||||
areas = []
|
||||
|
||||
for encounter in encounter_objects:
|
||||
areas.append(LocationAreaSummarySerializer(encounter.location_area, context=self.context).data)
|
||||
|
||||
return areas
|
||||
|
||||
def get_pokemon_types(self, obj):
|
||||
|
||||
poke_type_objects = PokemonType.objects.filter(pokemon=obj)
|
||||
|
|
@ -2362,57 +2362,57 @@ class PokemonDetailSerializer(serializers.ModelSerializer):
|
|||
return poke_types
|
||||
|
||||
|
||||
# def get_encounters(self, obj):
|
||||
def get_encounters(self, obj):
|
||||
|
||||
# # get versions for later use
|
||||
# version_objects = Version.objects.all()
|
||||
# version_data = VersionSummarySerializer(version_objects, many=True, context=self.context).data
|
||||
# get versions for later use
|
||||
version_objects = Version.objects.all()
|
||||
version_data = VersionSummarySerializer(version_objects, many=True, context=self.context).data
|
||||
|
||||
# # all encounters associated with location area
|
||||
# all_encounters = Encounter.objects.filter(pokemon=obj).order_by('location_area')
|
||||
# encounters_list = []
|
||||
# all encounters associated with location area
|
||||
all_encounters = Encounter.objects.filter(pokemon=obj).order_by('location_area')
|
||||
encounters_list = []
|
||||
|
||||
# # break encounters into pokemon groupings
|
||||
# for area in all_encounters.values('location_area').distinct():
|
||||
# break encounters into pokemon groupings
|
||||
for area in all_encounters.values('location_area').distinct():
|
||||
|
||||
# location_area_object = LocationArea.objects.get(pk=area['location_area'])
|
||||
location_area_object = LocationArea.objects.get(pk=area['location_area'])
|
||||
|
||||
# location_area_detail = OrderedDict()
|
||||
# location_area_detail['location_area'] = LocationAreaSummarySerializer(location_area_object, context=self.context).data
|
||||
# location_area_detail['version_details'] = []
|
||||
location_area_detail = OrderedDict()
|
||||
location_area_detail['location_area'] = LocationAreaSummarySerializer(location_area_object, context=self.context).data
|
||||
location_area_detail['version_details'] = []
|
||||
|
||||
# area_encounters = all_encounters.filter(location_area=area['location_area']).order_by('version')
|
||||
area_encounters = all_encounters.filter(location_area=area['location_area']).order_by('version')
|
||||
|
||||
# # each pokemon has multiple versions it could be encountered in
|
||||
# for ver in area_encounters.values('version').distinct():
|
||||
# each pokemon has multiple versions it could be encountered in
|
||||
for ver in area_encounters.values('version').distinct():
|
||||
|
||||
# version_detail = OrderedDict()
|
||||
# version_detail['version'] = version_data[ver['version'] - 1]
|
||||
# version_detail['max_chance'] = 0
|
||||
# version_detail['encounter_details'] = []
|
||||
version_detail = OrderedDict()
|
||||
version_detail['max_chance'] = 0
|
||||
version_detail['encounter_details'] = []
|
||||
version_detail['version'] = version_data[ver['version'] - 1]
|
||||
|
||||
# area_data = EncounterDetailSerializer(area_encounters.filter(version=ver['version']), many=True, context=self.context).data
|
||||
area_data = EncounterDetailSerializer(area_encounters.filter(version=ver['version']), many=True, context=self.context).data
|
||||
|
||||
# # each version has multiple ways a pokemon can be encountered
|
||||
# for encounter in area_data:
|
||||
# each version has multiple ways a pokemon can be encountered
|
||||
for encounter in area_data:
|
||||
|
||||
# slot = EncounterSlot.objects.get(pk=encounter['encounter_slot'])
|
||||
# slot_data = EncounterSlotSerializer(slot, context=self.context).data
|
||||
# del encounter['pokemon']
|
||||
# del encounter['encounter_slot']
|
||||
# del encounter['location_area']
|
||||
# del encounter['version']
|
||||
# encounter['chance'] = slot_data['chance']
|
||||
# version_detail['max_chance'] += slot_data['chance']
|
||||
# encounter['method'] = slot_data['encounter_method']
|
||||
slot = EncounterSlot.objects.get(pk=encounter['encounter_slot'])
|
||||
slot_data = EncounterSlotSerializer(slot, context=self.context).data
|
||||
del encounter['pokemon']
|
||||
del encounter['encounter_slot']
|
||||
del encounter['location_area']
|
||||
del encounter['version']
|
||||
encounter['chance'] = slot_data['chance']
|
||||
version_detail['max_chance'] += slot_data['chance']
|
||||
encounter['method'] = slot_data['encounter_method']
|
||||
|
||||
# version_detail['encounter_details'].append(encounter)
|
||||
version_detail['encounter_details'].append(encounter)
|
||||
|
||||
# location_area_detail['version_details'].append(version_detail)
|
||||
location_area_detail['version_details'].append(version_detail)
|
||||
|
||||
# encounters_list.append(location_area_detail)
|
||||
encounters_list.append(location_area_detail)
|
||||
|
||||
# return encounters_list
|
||||
return encounters_list
|
||||
|
||||
|
||||
|
||||
|
|
@ -2432,20 +2432,22 @@ class EvolutionTriggerNameSerializer(serializers.HyperlinkedModelSerializer):
|
|||
class EvolutionTriggerDetailSerializer(serializers.HyperlinkedModelSerializer):
|
||||
|
||||
names = EvolutionTriggerNameSerializer(many=True, read_only=True, source="evolutiontriggername")
|
||||
pokemon_species = serializers.SerializerMethodField('get_species')
|
||||
|
||||
class Meta:
|
||||
model = EvolutionTrigger
|
||||
fields = ('id', 'name', 'names')
|
||||
fields = ('id', 'name', 'names', 'pokemon_species')
|
||||
|
||||
def get_species(self, obj):
|
||||
|
||||
class PokemonDexEntrySerializer(serializers.ModelSerializer):
|
||||
evo_objects = PokemonEvolution.objects.filter(evolution_trigger=obj);
|
||||
species_list = []
|
||||
|
||||
entry_number = serializers.IntegerField(source="pokedex_number")
|
||||
pokedex = PokedexSummarySerializer()
|
||||
|
||||
class Meta:
|
||||
model = PokemonDexNumber
|
||||
fields = ('entry_number', 'pokedex')
|
||||
for evo in evo_objects:
|
||||
species = PokemonSpeciesSummarySerializer(evo.evolved_species, context=self.context).data
|
||||
species_list.append(species)
|
||||
|
||||
return species_list
|
||||
|
||||
|
||||
class PokemonSpeciesDescriptionSerializer(serializers.ModelSerializer):
|
||||
|
|
@ -2492,7 +2494,7 @@ class PokemonSpeciesDetailSerializer(serializers.ModelSerializer):
|
|||
varieties = PokemonSummarySerializer(many=True, read_only=True, source="pokemon")
|
||||
varieties = serializers.SerializerMethodField('get_pokemon_varieties')
|
||||
evolution_chain = EvolutionChainSummarySerializer()
|
||||
pal_park_encounter = serializers.SerializerMethodField('get_encounters')
|
||||
pal_park_encounters = serializers.SerializerMethodField('get_encounters')
|
||||
|
||||
class Meta:
|
||||
model = PokemonSpecies
|
||||
|
|
@ -2517,7 +2519,7 @@ class PokemonSpeciesDetailSerializer(serializers.ModelSerializer):
|
|||
'habitat',
|
||||
'generation',
|
||||
'names',
|
||||
'pal_park_encounter',
|
||||
'pal_park_encounters',
|
||||
'form_descriptions',
|
||||
'genera',
|
||||
'varieties'
|
||||
|
|
@ -2577,7 +2579,7 @@ class PokemonSpeciesDetailSerializer(serializers.ModelSerializer):
|
|||
|
||||
def get_encounters(self, obj):
|
||||
|
||||
pal_park_objects = PalPark.objects.filter(pal_park_area=obj)
|
||||
pal_park_objects = PalPark.objects.filter(pokemon_species=obj)
|
||||
parks = PalParkSerializer(pal_park_objects, many=True, context=self.context).data
|
||||
encounters = []
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -66,13 +66,6 @@ class AbilityResource(PokeapiCommonViewset):
|
|||
list_serializer_class = AbilitySummarySerializer
|
||||
|
||||
|
||||
class AbilityChangeResource(PokeapiCommonViewset):
|
||||
|
||||
queryset = AbilityChange.objects.all()
|
||||
serializer_class = AbilityChangeSerializer
|
||||
list_serializer_class = AbilityChangeSerializer
|
||||
|
||||
|
||||
class BerryResource(PokeapiCommonViewset):
|
||||
|
||||
queryset = Berry.objects.all()
|
||||
|
|
|
|||
Loading…
Reference in a new issue