Return badges sorted by highest level

eleurent · Jun 26, 2024 · 89c8f12 · 89c8f12
1 parent b738475
commit 89c8f12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/backend/nature_go/badge/serializers.py b/backend/nature_go/badge/serializers.py
@@ -53,7 +53,7 @@ class UserBadgeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = UserBadge
-        fields = ['badge', 'progress', 'highest_unlocked_level']
+        fields = ['badge', 'progress', 'unlocked_level']
 
     def get_badge(self, obj):
         if isinstance(obj.badge.logic, SpeciesBadgeLogic):

diff --git a/backend/nature_go/badge/views.py b/backend/nature_go/badge/views.py
@@ -12,7 +12,10 @@ class BadgeListView(ListAPIView):
 
     def get_queryset(self):
         update_user_badges(self.request.user)
-        return UserBadge.objects.filter(user=self.request.user)
+        queryset = UserBadge.objects.filter(user=self.request.user)
+        levels = ["Bronze", "Silver", "Gold"]
+        index_or_minus_one = lambda x: levels.index(x.unlocked_level) if x.unlocked_level in levels else -1
+        return sorted(queryset, key=index_or_minus_one, reverse=True)
 
 
 class BadgeDetailView(RetrieveAPIView):