Merge pull request #26 from danielebra/release_one

Incremental Update

back-end/.gitignore

@@ -1,4 +1,5 @@
 env_oms_be/
+env_oms_be2/
 # Created by https://www.gitignore.io
 
 ### OSX ###

back-end/movie/serializers.py

@@ -76,6 +76,11 @@ class Meta:
 
 
 class OrderSerializer(serializers.ModelSerializer):
+    movie_title = serializers.SerializerMethodField()
+
     class Meta:
         model = Order
         fields = '__all__'
+
+    def get_movie_title(self, obj):
+        return obj.movie.title

back-end/movie/views.py

@@ -107,14 +107,11 @@ def logs(self, request, pk=None):
         query = LogModel.objects.filter(user=pk).values()
         print(query)
         return Response(query, status=status.HTTP_200_OK)
-        print("in get")
-        # Map the pk to user
-        data = request.data.copy()
-        data['user'] = pk
-        serializer = LogSerializer(data=data)
-        if serializer.is_valid():
-            return Response({"status": "success"}, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    @action(methods=['get'], detail=True)
+    def orders(self, request, pk=None):
+        query = Order.objects.filter(user=pk).values()
+        return Response(query, status=status.HTTP_200_OK)
 
 
 class MoviePopulator(viewsets.ModelViewSet):