@@ -1053,7 +1053,7 @@ def get_method_rates(self, obj: LocationAreaEncounterRate) -> ReturnList[ReturnD
10531053 rates = (
10541054 LocationAreaEncounterRate .objects .filter (location_area = obj , encounter_method__isnull = False )
10551055 .select_related ("encounter_method" , "version" )
1056- .order_by ("encounter_method_id" )
1056+ .order_by ("encounter_method_id" , "version_id" , "pk" )
10571057 )
10581058 grouped_rates : list [dict [str , Any ]] = [
10591059 {
@@ -1081,7 +1081,7 @@ def get_encounters(self, obj: LocationArea) -> ReturnList[ReturnDict[str, Any]]:
10811081 "encounterconditionvaluemap_set" ,
10821082 "encounterpokemondetail_set" ,
10831083 )
1084- .order_by ("pokemon_id" , "version_id" )
1084+ .order_by ("pokemon_id" , "version_id" , "encounter_slot_id" , "pk" )
10851085 )
10861086
10871087 grouped_data : list [dict [str , Any ]] = []
@@ -1597,7 +1597,7 @@ def get_held_by_pokemon(self, obj: Item) -> ReturnList[ReturnDict[str, Any]]:
15971597 pokemon_items = (
15981598 PokemonItem .objects .filter (item = obj )
15991599 .select_related ("pokemon" , "version" )
1600- .order_by ("pokemon_id" , "version_id" )
1600+ .order_by ("pokemon_id" , "version_id" , "pk" )
16011601 )
16021602 grouped_data : list [dict [str , Any ]] = [
16031603 {
@@ -1739,7 +1739,9 @@ class Meta:
17391739 @extend_schema_field (BerryFlavorBerryMapSerializer (many = True ))
17401740 def get_berries_with_flavor (self , obj : BerryFlavor ) -> ReturnList [ReturnDict [str , Any ]]:
17411741 flavor_map_objects = (
1742- BerryFlavorMap .objects .filter (berry_flavor = obj , potency__gt = 0 ).select_related ("berry" ).order_by ("potency" )
1742+ BerryFlavorMap .objects .filter (berry_flavor = obj , potency__gt = 0 )
1743+ .select_related ("berry" )
1744+ .order_by ("potency" , "berry_id" , "pk" )
17431745 )
17441746 return cast (
17451747 "ReturnList[ReturnDict[str, Any]]" ,
@@ -2629,7 +2631,7 @@ def get_pokemon_form_sprites(self, obj: PokemonForm) -> dict[str, Any]:
26292631
26302632 @extend_schema_field (PokemonFormTypeSerializer (many = True ))
26312633 def get_pokemon_form_types (self , obj : PokemonForm ) -> ReturnList [ReturnDict [str , Any ]]:
2632- form_types = PokemonFormType .objects .filter (pokemon_form = obj ).select_related ("type" ).order_by ("slot" )
2634+ form_types = PokemonFormType .objects .filter (pokemon_form = obj ).select_related ("type" ).order_by ("slot" , "pk" )
26332635
26342636 if form_types :
26352637 return cast (
@@ -2638,7 +2640,7 @@ def get_pokemon_form_types(self, obj: PokemonForm) -> ReturnList[ReturnDict[str,
26382640 )
26392641
26402642 # Fall back to parent Pokemon's types if no form-specific types exist
2641- pokemon_types = PokemonType .objects .filter (pokemon = obj .pokemon ).select_related ("type" ).order_by ("slot" )
2643+ pokemon_types = PokemonType .objects .filter (pokemon = obj .pokemon ).select_related ("type" ).order_by ("slot" , "pk" )
26422644 return cast (
26432645 "ReturnList[ReturnDict[str, Any]]" ,
26442646 PokemonTypeSerializer (pokemon_types , many = True , context = self .context ).data ,
@@ -2946,7 +2948,7 @@ def get_pokemon_moves(self, obj: Pokemon) -> list[dict[str, Any]]:
29462948 pokemon_moves = (
29472949 PokemonMove .objects .filter (pokemon = obj , move__isnull = False )
29482950 .select_related ("move" , "version_group" , "move_learn_method" )
2949- .order_by ("move__id" , "version_group_id" )
2951+ .order_by ("move__id" , "version_group_id" , "move_learn_method_id" , "level" , "pk" )
29502952 )
29512953
29522954 vg_cache : dict [int , Any ] = {}
@@ -2990,7 +2992,7 @@ def get_pokemon_held_items(self, obj: Pokemon) -> list[dict[str, Any]]:
29902992 pokemon_items = (
29912993 PokemonItem .objects .filter (pokemon = obj , item__isnull = False )
29922994 .select_related ("item" , "version" )
2993- .order_by ("item__id" , "version_id" )
2995+ .order_by ("item__id" , "version_id" , "pk" )
29942996 )
29952997
29962998 version_cache : dict [int , Any ] = {}
@@ -3033,7 +3035,7 @@ def get_past_pokemon_abilities(self, obj: Pokemon) -> list[dict[str, Any]]:
30333035 past_abilities = (
30343036 PokemonAbilityPast .objects .filter (pokemon = obj , generation__isnull = False )
30353037 .select_related ("generation" , "ability" )
3036- .order_by ("generation_id" )
3038+ .order_by ("generation_id" , "slot" , "pk" )
30373039 )
30383040
30393041 final_data : list [dict [str , Any ]] = []
@@ -3061,7 +3063,7 @@ def get_past_pokemon_stats(self, obj: Pokemon) -> list[dict[str, Any]]:
30613063 past_stats = (
30623064 PokemonStatPast .objects .filter (pokemon = obj , generation__isnull = False )
30633065 .select_related ("generation" , "stat" )
3064- .order_by ("generation_id" )
3066+ .order_by ("generation_id" , "stat_id" , "pk" )
30653067 )
30663068
30673069 final_data : list [dict [str , Any ]] = []
@@ -3086,7 +3088,7 @@ def get_past_pokemon_stats(self, obj: Pokemon) -> list[dict[str, Any]]:
30863088
30873089 @extend_schema_field (PokemonTypeSerializer (many = True ))
30883090 def get_pokemon_types (self , obj : Pokemon ) -> ReturnList [ReturnDict [str , Any ]]:
3089- types = PokemonType .objects .filter (pokemon = obj ).select_related ("type" ).order_by ("slot" )
3091+ types = PokemonType .objects .filter (pokemon = obj ).select_related ("type" ).order_by ("slot" , "pk" )
30903092 return cast (
30913093 "ReturnList[ReturnDict[str, Any]]" ,
30923094 PokemonTypeSerializer (types , many = True , context = self .context ).data ,
@@ -3097,7 +3099,7 @@ def get_past_pokemon_types(self, obj: Pokemon) -> list[dict[str, Any]]:
30973099 past_types = (
30983100 PokemonTypePast .objects .filter (pokemon = obj , generation__isnull = False )
30993101 .select_related ("generation" , "type" )
3100- .order_by ("generation_id" , "slot" )
3102+ .order_by ("generation_id" , "slot" , "pk" )
31013103 )
31023104
31033105 final_data : list [dict [str , Any ]] = []
@@ -3361,7 +3363,7 @@ class Meta:
33613363
33623364 @extend_schema_field (EvolutionChainLinkSerializer )
33633365 def build_chain (self , obj : EvolutionChain ) -> dict [str , Any ]:
3364- pokemon_objects = PokemonSpecies .objects .filter (evolution_chain = obj ).order_by ("order" )
3366+ pokemon_objects = PokemonSpecies .objects .filter (evolution_chain = obj ).order_by ("order" , "pk" )
33653367 summary_data = cast (
33663368 "ReturnList[ReturnDict[str, Any]]" ,
33673369 PokemonSpeciesSummarySerializer (pokemon_objects , many = True , context = self .context ).data ,
@@ -3535,7 +3537,9 @@ class Meta:
35353537 @extend_schema_field (PokemonDexNumberSerializer (many = True ))
35363538 def get_pokedex_entries (self , obj : Pokedex ) -> ReturnList [ReturnDict [str , Any ]]:
35373539 entries = (
3538- PokemonDexNumber .objects .filter (pokedex = obj ).select_related ("pokemon_species" ).order_by ("pokedex_number" )
3540+ PokemonDexNumber .objects .filter (pokedex = obj )
3541+ .select_related ("pokemon_species" )
3542+ .order_by ("pokedex_number" , "pokemon_species_id" , "pk" )
35393543 )
35403544 return cast (
35413545 "ReturnList[ReturnDict[str, Any]]" ,
0 commit comments