Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incremental Update #26

Merged
merged 14 commits into from
May 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions back-end/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
env_oms_be/
env_oms_be2/
# Created by https://www.gitignore.io

### OSX ###
Expand Down
5 changes: 5 additions & 0 deletions back-end/movie/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 5 additions & 8 deletions back-end/movie/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
82 changes: 22 additions & 60 deletions front-end/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading