Merge branch 'refactor'

Author: Juan Benitez

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.linting.pylintEnabled": true,
+    "python.pythonPath": "env\\Scripts\\python.exe"
+}

movies/permissions.py

@@ -1,4 +1,5 @@
 from rest_framework import permissions
+from rest_framework.exceptions import PermissionDenied
 
 
 class IsOwnerOrReadOnly(permissions.BasePermission):
@@ -13,4 +14,17 @@ def has_object_permission(self, request, view, obj):
             return True
 
         # Write permissions are only allowed to the creator of the movie
-        return obj.creator == request.user
+        return obj.creator == request.user
+
+
+class IsAuthenticated(permissions.BasePermission):
+    """
+    Allows access only to authenticated users.
+    """
+    def has_permission(self, request, view):
+        message = 'You must be authenticated'
+        is_it = bool(request.user and request.user.is_authenticated)
+        if is_it:
+            return is_it
+        else:
+            raise PermissionDenied(detail=message)

movies/serializers.py

@@ -3,16 +3,15 @@
 from django.contrib.auth.models import User
 
 
-
-class MovieSerializer(serializers.ModelSerializer): # create classs to serializer model
+class MovieSerializer(serializers.ModelSerializer):  # create class to serializer model
     creator = serializers.ReadOnlyField(source='creator.username')
 
     class Meta:
         model = Movie
         fields = ('title', 'genre', 'year', 'creator')
 
 
-class UserSerializer(serializers.ModelSerializer): #create class to serealizer usermodel
+class UserSerializer(serializers.ModelSerializer):  # create class to serializer usermodel
     movies = serializers.PrimaryKeyRelatedField(many=True, queryset=Movie.objects.all())
 
     class Meta:

movies/urls.py

@@ -1,15 +1,14 @@
-from django.conf.urls import url
+from django.urls import include, path, re_path
 from . import views
 
 
 urlpatterns = [
-    url(r'^api/v1/movies/(?P<pk>[0-9]+)$', # urls with details i.e /movies/(1-9)
-        views.get_delete_update_movie,
+    re_path(r'^api/v1/movies/(?P<pk>[0-9]+)$', # Url to get update or delete a movie
+        views.get_delete_update_movie.as_view(),
         name='get_delete_update_movie'
     ),
-    url(
-        r'^api/v1/movies/$', # urls list all and create new one
-        views.get_post_movies,
+    path('api/v1/movies/', # urls list all and create new one
+        views.get_post_movies.as_view(),
         name='get_post_movies'
     )
 ]

movies/views.py

@@ -1,67 +1,83 @@
-from rest_framework.decorators import api_view, permission_classes
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
 from rest_framework import status
-from rest_framework.parsers import JSONParser
+from rest_framework.response import Response
+from rest_framework.generics import RetrieveUpdateDestroyAPIView, ListCreateAPIView
 from .models import Movie
+from .permissions import IsOwnerOrReadOnly, IsAuthenticated
 from .serializers import MovieSerializer
-from .permissions import IsOwnerOrReadOnly
 
+class get_delete_update_movie(RetrieveUpdateDestroyAPIView):
+    permission_classes = (IsAuthenticated, IsOwnerOrReadOnly,)
+
+    def get_queryset(self, pk):
+        try:
+            movie = Movie.objects.get(pk=pk)
+        except Movie.DoesNotExist:
+            content = {
+                'status': 'Not Found'
+            }
+            return Response(content, status=status.HTTP_404_NOT_FOUND)
+        return movie
 
-@api_view(['GET', 'DELETE', 'PUT']) # Methods Allowed
-@permission_classes((IsAuthenticated, IsOwnerOrReadOnly,)) # Pemissions, Only Authenticated user
-def get_delete_update_movie(request, pk):  #pk es PrimaryKey(Id)
-    try:
-        movie = Movie.objects.get(pk=pk)
-    except Movie.DoesNotExist:
-        content = {
-            'status': 'Not Found'
-        }
-        return Response(content, status=status.HTTP_404_NOT_FOUND)
+    # Get a movie
+    def get(self, request, pk):
 
-    # details a sinlge movie
-    if request.method == 'GET':
+        movie = self.get_queryset(pk)
         serializer = MovieSerializer(movie)
-        return Response(serializer.data)
-    # delete a movie
-    elif request.method == 'DELETE':
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    # Update a movie
+    def put(self, request, pk):
+        
+        movie = self.get_queryset(pk)
+
         if(request.user == movie.creator): # If creator is who makes request
-            movie.delete()
-            content = {
-                'status': 'NO CONTENT'
-            }
-            return Response(content, status=status.HTTP_204_NO_CONTENT)
+            serializer = MovieSerializer(movie, data=request.data)
+            if serializer.is_valid():
+                serializer.save()
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         else:
             content = {
                 'status': 'UNAUTHORIZED'
             }
             return Response(content, status=status.HTTP_401_UNAUTHORIZED)
-    # update a movie
-    elif request.method == 'PUT':
+
+    # Delete a movie
+    def delete(self, request, pk):
+
+        movie = self.get_queryset(pk)
+
         if(request.user == movie.creator): # If creator is who makes request
-            serializer = MovieSerializer(movie, data=request.data)
-            if serializer.is_valid():
-                serializer.save()
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+            movie.delete()
+            content = {
+                'status': 'NO CONTENT'
+            }
+            return Response(content, status=status.HTTP_204_NO_CONTENT)
         else:
             content = {
                 'status': 'UNAUTHORIZED'
             }
             return Response(content, status=status.HTTP_401_UNAUTHORIZED)
+   
+
+class get_post_movies(ListCreateAPIView):
+    serializer_class = MovieSerializer
+    #permission_classes = (IsAuthenticated,)
+    # Get all movies
+    
+    def get_queryset(self):
+       movies = Movie.objects.all()
+       return movies
+    
+    def get(self, request):
 
+        movies = self.get_queryset()
+        serializer = MovieSerializer(movies, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
-@api_view(['GET', 'POST'])
-@permission_classes((IsAuthenticated, ))
-def get_post_movies(request):
-    # get all movies
-    if request.method == 'GET':
-        puppies = Movie.objects.all()
-        serializer = MovieSerializer(puppies, many=True)
-        return Response(serializer.data)
+    # Create a new movie
+    def post(self, request):
 
-    # create a new movie
-    elif request.method == 'POST':
         serializer = MovieSerializer(data=request.data)
         if serializer.is_valid():
             serializer.save(creator=request.user)