Skip to content

Commit 9c9e9ca

Browse files
fix(api): remove PostgreSQL-specific DISTINCT ON usage
1 parent a2821c7 commit 9c9e9ca

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

pokemon_v2/api.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -987,11 +987,7 @@ def get(self, request, pokemon_id):
987987

988988
encounter_objects = Encounter.objects.filter(pokemon=pokemon)
989989

990-
area_ids = (
991-
encounter_objects.order_by("location_area")
992-
.distinct("location_area")
993-
.values_list("location_area", flat=True)
994-
)
990+
area_ids = encounter_objects.values_list("location_area", flat=True).distinct()
995991

996992
location_area_objects = LocationArea.objects.filter(pk__in=area_ids)
997993
version_objects = Version.objects
@@ -1003,12 +999,9 @@ def get(self, request, pokemon_id):
1003999

10041000
area_encounters = encounter_objects.filter(location_area_id=area_id)
10051001

1006-
version_ids = (
1007-
area_encounters.order_by("version_id")
1008-
.distinct("version_id")
1009-
.values_list("version_id", flat=True)
1010-
)
1011-
1002+
version_ids = area_encounters.values_list(
1003+
"version_id", flat=True
1004+
).distinct()
10121005
version_details_list = []
10131006

10141007
for version_id in version_ids:

0 commit comments

Comments
 (0)