Merge pull request 'updated permissions for list' (#11) from list-permission-handling into main

Reviewed-on: #11

.env.example

@@ -11,5 +11,10 @@ DATABASE_HOST=movienight-db
 DATABASE_NAME=movienight
 DATABASE_USERNAME=admin
 DATABASE_PASSWORD=super_secret_password
+
+# Django key generator: https://djecrety.ir/
 SECRET_KEY=your_django_secret_key
 DJANGO_SECRET_KEY=your_django_secret_key
+
+# You can get a free key here: https://www.omdbapi.com/apikey.aspx
+OMDB_API_KEY=your_omdb_api_key

.idea/misc.xml

@@ -5,5 +5,5 @@
     <option name="enabledOnSave" value="true" />
     <option name="sdkName" value="Python 3.13 (api)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (api)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" project-jdk-type="Python SDK" />
 </project>

.idea/movie-night-py.iml

@@ -17,7 +17,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
       <excludeFolder url="file://$MODULE_DIR$/.venv1" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.13 (api)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

Dockerfile

@@ -35,4 +35,4 @@ USER web
 
 EXPOSE 8000
 
-CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--workers", "3", "movienight.wsgi:application"]
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

movie_db/db_providers/omdb.py

@@ -1,5 +1,7 @@
 import os
 
+from django.conf import settings
+
 from movie_db.movie_db import MovieDB
 import requests
 
@@ -8,8 +10,7 @@ from movie_db.serializers import MovieSerializer, MovieResultSerializer
 
 class OMDb(MovieDB):
     def __init__(self):
-        api_key = os.getenv("OMDB_API_KEY")
+        self.api_key = settings.OMDB_API_KEY
-        self.api_key = f"{api_key}"
         self.base_url = "https://www.omdbapi.com/?apikey=" + self.api_key
         super().__init__()
 

movie_db/views.py

@@ -9,4 +9,17 @@ def omdb_search(request):
 
     search_type = request.GET.get("type")
     omdb = OMDb()
-    return JsonResponse(omdb.search(query, {"type": search_type}), safe=False)
+
+    results = omdb.search(query, {"type": search_type})
+    if "error" in results:
+        return parse_error(results)
+
+    return JsonResponse(results, safe=False)
+
+
+def parse_error(results):
+    error_json = results["error"]
+    if "Error" in error_json and error_json["Error"] == "Movie not found!":
+        return JsonResponse({}, status=404)
+    else:
+        return JsonResponse("Error while searching for movie.", status=500)

movie_manager/admin.py

@@ -6,19 +6,19 @@ from movie_manager.models import Movie, MovieList, Schedule, Showing
 # Register your models here.
 @admin.register(Movie)
 class MovieAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["title", "imdb_id", "added_by"]
 
 
 @admin.register(MovieList)
 class MovieListAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["name", "owner"]
 
 
 @admin.register(Schedule)
 class ScheduleAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["name", "owner"]
 
 
 @admin.register(Showing)
 class ShowingAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["showtime", "movie"]

movie_manager/serializers.py

@@ -5,21 +5,55 @@ from movie_manager.models import Movie, MovieList, Schedule, Showing
 
 
 class MovieSerializer(serializers.ModelSerializer):
+    has_been_scheduled = serializers.SerializerMethodField()
+
     class Meta:
         model = Movie
-        fields = "__all__"
+        fields = [
+            "id",
+            "title",
+            "imdb_id",
+            "year",
+            "director",
+            "actors",
+            "plot",
+            "genre",
+            "mpaa_rating",
+            "critic_scores",
+            "poster",
+            "added_by_id",
+            "has_been_scheduled",
+        ]
 
+    def get_has_been_scheduled(self, obj):
+        return Showing.objects.filter(movie_id=obj.id).exists()
 
-class MovieListSerializer(serializers.ModelSerializer):
+class MovieListListSerializer(serializers.ModelSerializer):
     movie_count = serializers.SerializerMethodField()
-    movies = MovieSerializer(read_only=True, many=True)
 
     class Meta:
         model = MovieList
-        fields = ["id", "name", "owner", "public", "movies", "movie_count"]
+        fields = ["id", "name", "owner", "public", "movie_count"]
 
     def get_movie_count(self, obj):
-        return len(obj.movies.all())
+        return obj.movies.count()
+
+
+class MovieListSerializer(serializers.ModelSerializer):
+    movies = MovieSerializer(read_only=True, many=True)
+    serializer_class = MovieSerializer
+    owner = serializers.PrimaryKeyRelatedField(read_only=True)
+
+    def get_queryset(self):
+        return MovieList.objects.prefetch_related(
+            "movies",
+            "movies__showing_set"
+        )
+
+    class Meta:
+        model = MovieList
+        fields = ["id", "name", "owner", "public", "movies"]
+
 
 
 class UserSerializer(serializers.Serializer):

movie_manager/views.py

@@ -1,9 +1,10 @@
 import datetime
-import json
 
+from django.db.models import QuerySet
 from django.http import JsonResponse
 from django.contrib.auth.models import User
 from django.utils.dateparse import parse_datetime
+from django.db import models
 from rest_framework import permissions, viewsets
 from knox.auth import TokenAuthentication
 from rest_framework.decorators import action, api_view
@@ -16,7 +17,7 @@ from movie_manager.serializers import (
     MovieListSerializer,
     MovieSerializer,
     ScheduleSerializer,
-    ShowingSerializer,
+    ShowingSerializer, MovieListListSerializer,
 )
 
 
@@ -55,11 +56,40 @@ class MovieViewset(viewsets.ModelViewSet):
 
 
 class MovieListViewset(viewsets.ModelViewSet):
-    queryset = MovieList.objects.all().order_by("name")
+    queryset = MovieList.objects.all()
     authentication_classes = [TokenAuthentication]
     permission_classes = [permissions.IsAuthenticated | ReadOnly]
 
-    serializer_class = MovieListSerializer
+    def get_serializer_class(self):
+        if self.action == "list":
+            return MovieListListSerializer
+        else:
+            return MovieListSerializer
+
+    def get_queryset(self):
+        base_qs = MovieList.objects.all()
+
+        if self.action == "list":
+            if self.request.user.is_authenticated:
+                return base_qs.filter(
+                    models.Q(public=True) |
+                    models.Q(owner=self.request.user)
+                ).order_by("name")
+
+            return base_qs.filter(public=True).order_by("name")
+        else:
+            return MovieList.objects.prefetch_related(
+                "movies",
+                "movies__showing_set"
+            ).order_by("name")
+
+    def perform_create(self, serializer):
+        serializer.save(owner=self.request.user)
+
+    def get_permissions(self):
+        if self.action in ['update', 'partial_update', 'destroy']:
+            self.permission_classes = [permissions.IsAuthenticated]
+        return super().get_permissions()
 
     def create(self, request, *args, **kwargs):
         movie_list = MovieList.objects.create(
@@ -142,7 +172,9 @@ class ScheduleViewset(viewsets.ModelViewSet):
     def retrieve(self, request, pk=None, *args, **kwargs):
         # Get the schedule instance
         instance = self.get_object()
-        today = datetime.datetime.now()
+        now = datetime.datetime.now()
+        # get time from start of day
+        today = datetime.datetime(now.year, now.month, now.day)
 
         upcoming_showings = Showing.objects.filter(
             showtime__gte=today, schedule=instance

movienight/settings.py

@@ -126,6 +126,8 @@ USE_I18N = True
 
 USE_TZ = True
 
+OMDB_API_KEY = os.environ.get("OMDB_API_KEY")
+
 # Django Rest Framework
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [