make media URL relative and un nest serialisers

Author: laurenpudz

server/api/settings.py

@@ -148,11 +148,7 @@
 # The directory to store images and other media
 MEDIA_ROOT = BASE_DIR/"media"
 
-# The url to serve images and other media
-if DEBUG:
-    MEDIA_URL = "http://localhost:8000/media/"
-else:
-    MEDIA_URL = f"https://{ALLOWED_HOSTS[0]}/media/"
+MEDIA_URL = "/media/"
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 

server/game_dev/serializers.py

@@ -100,17 +100,7 @@ def get_contributors(self, obj):
         return ShowcaseContributorSerializer(contributors, many=True).data
 
 
-class ContributorGameDataSerializer(serializers.ModelSerializer):
-    # Serializes data in Game model to display on a contributor's profile.
-
-    class Meta:
-        model = Game
-        fields = ('name', 'thumbnail',
-                  'description')
-
-
 class ContributorGameSerializer(serializers.ModelSerializer):
-    # Matches games in the GameContributor model to the information about them in the Game model.
     game_id = serializers.IntegerField(source='game.id', read_only=True)
     role = serializers.CharField(read_only=True)
     game_data = serializers.SerializerMethodField()
@@ -120,8 +110,13 @@ class Meta:
         fields = ['game_id', 'role', 'game_data']
 
     def get_game_data(self, obj):
-        game_data = Game.objects.get(id=obj.game_id)
-        return ContributorGameDataSerializer(game_data).data
+        game = obj.game
+        request = self.context.get('request')
+        return {
+            'name': game.name,
+            'description': game.description,
+            'thumbnail': request.build_absolute_uri(game.thumbnail.url) if game.thumbnail and request else None
+        }
 
 
 class SocialMediaSerializer(serializers.ModelSerializer):

server/game_dev/views.py

@@ -70,18 +70,12 @@ def get(self, request):
         return Response(serializer.data)
 
 
-class ContributorGamesListAPIView(APIView):
-    """
-    GET /api/games/contributor/<member>/
-    Returns the games a particular member has contributed to.
-    """
-    lookup_url_kwarg = "member"
+class ContributorGamesListAPIView(generics.ListAPIView):
+    serializer_class = ContributorGameSerializer
 
-    def get(self, request, member):
-        contributions = GameContributor.objects.filter(
-            member=self.kwargs["member"])
-        serializer = ContributorGameSerializer(contributions, many=True)
-        return Response(serializer.data)
+    def get_queryset(self):
+        member_id = self.kwargs.get("member")
+        return GameContributor.objects.filter(member=member_id)
 
 
 class MemberAPIView(generics.RetrieveAPIView):