create ratings endpoints // enumField problem #TODO
parent
709df5fb90
commit
89fc4b3099
|
|
@ -1,6 +1,7 @@
|
||||||
pip install django
|
pip install django
|
||||||
pip install djangorestframework
|
pip install djangorestframework
|
||||||
pip install django-filter
|
pip install django-filter
|
||||||
pip install django-enumfield
|
pip install django-rest-enumfield
|
||||||
|
pip install drf_yasg
|
||||||
pip install pyjwt
|
pip install pyjwt
|
||||||
pip install markdown
|
pip install markdown
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,7 +1,6 @@
|
||||||
from rest_framework import viewsets, mixins
|
from rest_framework import viewsets, mixins
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from rest_framework import permissions
|
from rest_framework import permissions
|
||||||
from rest_framework.decorators import permission_classes
|
|
||||||
from rest_framework.authtoken.views import ObtainAuthToken
|
from rest_framework.authtoken.views import ObtainAuthToken
|
||||||
|
|
||||||
from drf_yasg.utils import swagger_auto_schema
|
from drf_yasg.utils import swagger_auto_schema
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,27 +1,7 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
from portfolio.account.models import Account
|
from portfolio.account.models import Account
|
||||||
|
from portfolio.utils import OneToManyModel
|
||||||
|
|
||||||
class OneToManyModel(models.Model):
|
|
||||||
|
|
||||||
def fromDict(self, dict):
|
|
||||||
self.__dict__.update(dict)
|
|
||||||
|
|
||||||
def create(self, dict):
|
|
||||||
new_object = self()
|
|
||||||
new_object.fromDict(dict)
|
|
||||||
new_object.save()
|
|
||||||
return new_object
|
|
||||||
|
|
||||||
def update(self, dict):
|
|
||||||
self.fromDict(dict)
|
|
||||||
self.save()
|
|
||||||
return self
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
abstract = True
|
|
||||||
|
|
||||||
|
|
||||||
class Album(OneToManyModel):
|
class Album(OneToManyModel):
|
||||||
title = models.CharField(max_length=255)
|
title = models.CharField(max_length=255)
|
||||||
|
|
|
||||||
|
|
@ -2,22 +2,44 @@ from django.shortcuts import render
|
||||||
|
|
||||||
from rest_framework import viewsets
|
from rest_framework import viewsets
|
||||||
|
|
||||||
from drf_yasg.utils import swagger_auto_schema
|
|
||||||
|
|
||||||
from .models import *
|
from .models import *
|
||||||
from .serializers import *
|
from .serializers import *
|
||||||
|
|
||||||
|
|
||||||
class TrackViewSet(viewsets.ModelViewSet):
|
class TrackViewSet(viewsets.ModelViewSet):
|
||||||
|
"""
|
||||||
|
A Tack CRUD (abstract from `viewsets.ModelViewSet`):
|
||||||
|
`GET`: `list()`
|
||||||
|
`GET`: `retrieve()` /parameter {id}
|
||||||
|
`POST`: `create()`
|
||||||
|
`PUT`&`PATCH`: `update()` /parameter {id}
|
||||||
|
`DELETE`: `destroy()` /parameter {id}
|
||||||
|
"""
|
||||||
queryset = Track.objects.all()
|
queryset = Track.objects.all()
|
||||||
serializer_class = TrackSerializer
|
serializer_class = TrackSerializer
|
||||||
|
|
||||||
|
|
||||||
class TrackRowViewSet(viewsets.ModelViewSet):
|
class TrackRowViewSet(viewsets.ModelViewSet):
|
||||||
|
"""
|
||||||
|
A TrackRow CRUD (abstract from `viewsets.ModelViewSet`):
|
||||||
|
`GET`: `list()`
|
||||||
|
`GET`: `retrieve()` /parameter {id}
|
||||||
|
`POST`: `create()`
|
||||||
|
`PUT`&`PATCH`: `update()` /parameter {id}
|
||||||
|
`DELETE`: `destroy()` /parameter {id}
|
||||||
|
"""
|
||||||
queryset = TrackRow.objects.all()
|
queryset = TrackRow.objects.all()
|
||||||
serializer_class = TrackRowSerializer
|
serializer_class = TrackRowSerializer
|
||||||
|
|
||||||
|
|
||||||
class AlbumViewSet(viewsets.ModelViewSet):
|
class AlbumViewSet(viewsets.ModelViewSet):
|
||||||
|
"""
|
||||||
|
A Album CRUD (abstract from `viewsets.ModelViewSet`):
|
||||||
|
`GET`: `list()`
|
||||||
|
`GET`: `retrieve()` /parameter {id}
|
||||||
|
`POST`: `create()`
|
||||||
|
`PUT`&`PATCH`: `update()` /parameter {id}
|
||||||
|
`DELETE`: `destroy()` /parameter {id}
|
||||||
|
"""
|
||||||
queryset = Album.objects.all()
|
queryset = Album.objects.all()
|
||||||
serializer_class = AlbumSerializer
|
serializer_class = AlbumSerializer
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
from account.models import Account, Guest
|
from portfolio.account.models import Account, Guest
|
||||||
|
|
||||||
|
|
||||||
class AbstractComment(models.Model):
|
class AbstractComment(models.Model):
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,69 @@
|
||||||
|
# Generated by Django 3.0.8 on 2020-07-03 10:54
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('portfolio', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='UserComment',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('text', models.CharField(max_length=255)),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Account')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='TrackRating',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('track', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Track')),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Account')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='GuestComment',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('text', models.CharField(max_length=255)),
|
||||||
|
('guest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Guest')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='CommentRating',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.UserComment')),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Account')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='AlbumRating',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Album')),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Account')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'abstract': False,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,25 +1,26 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy
|
from django.utils.translation import ugettext_lazy
|
||||||
from django_enumfield import enum
|
from rest_enumfield import EnumField
|
||||||
|
import enum
|
||||||
|
|
||||||
from account.models import Account
|
from portfolio.account.models import Account
|
||||||
from comment.models import UserComment, GuestComment
|
from portfolio.comment.models import UserComment, GuestComment
|
||||||
from album.models import Album
|
from portfolio.album.models import Album, Track
|
||||||
from song.models import Song
|
|
||||||
|
|
||||||
|
from portfolio.utils import OneToManyModel
|
||||||
|
|
||||||
class RatingValue(enum.Enum):
|
class RatingValue(enum.Enum):
|
||||||
POSITIVE = 1
|
POSITIVE = 1
|
||||||
NEGATIVE = 0
|
NEGATIVE = -1
|
||||||
|
|
||||||
__labels__ = {
|
__labels__ = {
|
||||||
POSITIVE: ugettext_lazy('Positive'),
|
POSITIVE: ugettext_lazy('POSITIVE'),
|
||||||
NEGATIVE: ugettext_lazy('Negative'),
|
NEGATIVE: ugettext_lazy('NEGATIVE'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class AbstractRating(models.Model):
|
class AbstractRating(OneToManyModel):
|
||||||
value = enum.EnumField(RatingValue)
|
value = EnumField(choices=RatingValue)
|
||||||
user = models.ForeignKey(Account, on_delete=models.CASCADE)
|
user = models.ForeignKey(Account, on_delete=models.CASCADE)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
@ -29,10 +30,33 @@ class AbstractRating(models.Model):
|
||||||
class CommentRating(AbstractRating):
|
class CommentRating(AbstractRating):
|
||||||
comment = models.ForeignKey(UserComment, on_delete=models.CASCADE)
|
comment = models.ForeignKey(UserComment, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
def toDict(self):
|
||||||
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"user_id": self.user_id,
|
||||||
|
"value": self.value,
|
||||||
|
"comment_id": self.comment_id
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class AlbumRating(AbstractRating):
|
class AlbumRating(AbstractRating):
|
||||||
album = models.ForeignKey(Album, on_delete=models.CASCADE)
|
album = models.ForeignKey(Album, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
def toDict(self):
|
||||||
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"user_id": self.user_id,
|
||||||
|
"value": self.value,
|
||||||
|
"album_id": self.album_id
|
||||||
|
}
|
||||||
|
|
||||||
class SongRating(AbstractRating):
|
class TrackRating(AbstractRating):
|
||||||
song = models.ForeignKey(Song, on_delete=models.CASCADE)
|
track = models.ForeignKey(Track, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
def toDict(self):
|
||||||
|
return {
|
||||||
|
"id": self.id,
|
||||||
|
"user_id": self.user_id,
|
||||||
|
"value": self.value,
|
||||||
|
"track_id": self.track_id
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,75 @@
|
||||||
|
from rest_framework import serializers
|
||||||
|
from rest_enumfield import EnumField
|
||||||
|
|
||||||
|
from .models import *
|
||||||
|
|
||||||
|
class TrackRatingSerializer(serializers.ModelSerializer):
|
||||||
|
id = serializers.IntegerField(read_only = True)
|
||||||
|
user_id = serializers.IntegerField()
|
||||||
|
value = EnumField(
|
||||||
|
choices=RatingValue,
|
||||||
|
to_choice=lambda x:(x.name, x.value),
|
||||||
|
to_repr=lambda x: x
|
||||||
|
)
|
||||||
|
# track_id = serializers.IntegerField()
|
||||||
|
|
||||||
|
def get_default(track_id):
|
||||||
|
queryset = TrackRating.objects.filter(track_id=track_id)
|
||||||
|
return [ x.toDict() for x in queryset ]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def create(validated_data, track_id):
|
||||||
|
validated_data["track_id"] = track_id
|
||||||
|
return TrackRating.create(TrackRating, validated_data)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def delete(track_id, user_id):
|
||||||
|
return TrackRating.objects.get(track_id=track_id, user_id=user_id).delete()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TrackRating
|
||||||
|
fields = ['id', 'user_id', 'value']
|
||||||
|
|
||||||
|
|
||||||
|
class CommentRatingSerializer(serializers.ModelSerializer):
|
||||||
|
id = serializers.IntegerField(read_only = True)
|
||||||
|
user_id = serializers.IntegerField()
|
||||||
|
value = EnumField(
|
||||||
|
choices=RatingValue,
|
||||||
|
to_choice=lambda x:(x.name, x.value),
|
||||||
|
to_repr=lambda x: x
|
||||||
|
)
|
||||||
|
# comment_id = serializers.IntegerField()
|
||||||
|
|
||||||
|
def create(self, validated_data):
|
||||||
|
return CommentRating.create(TrackRating, validated_data)
|
||||||
|
|
||||||
|
def update(self, instance, validated_data):
|
||||||
|
return instance.update(validated_data)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = CommentRating
|
||||||
|
fields = ['id', 'user_id', 'value']
|
||||||
|
|
||||||
|
|
||||||
|
class AlbumRatingSerializer(serializers.ModelSerializer):
|
||||||
|
id = serializers.IntegerField(read_only = True)
|
||||||
|
user_id = serializers.IntegerField()
|
||||||
|
value = EnumField(
|
||||||
|
choices=RatingValue,
|
||||||
|
to_choice=lambda x:(x.name, x.value),
|
||||||
|
to_repr=lambda x: x
|
||||||
|
)
|
||||||
|
# album_id = serializers.IntegerField()
|
||||||
|
|
||||||
|
def create(self, validated_data):
|
||||||
|
return AlbumRating.create(TrackRating, validated_data)
|
||||||
|
|
||||||
|
def update(self, instance, validated_data):
|
||||||
|
return instance.update(validated_data)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = AlbumRating
|
||||||
|
fields = ['id', 'user_id', 'value']
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,3 +1,79 @@
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
|
|
||||||
# Create your views here.
|
from rest_framework import viewsets, mixins
|
||||||
|
from rest_framework.decorators import action
|
||||||
|
from rest_framework.response import Response
|
||||||
|
from drf_yasg.utils import swagger_auto_schema
|
||||||
|
|
||||||
|
from django.shortcuts import get_object_or_404
|
||||||
|
|
||||||
|
from .models import TrackRating, AlbumRating, CommentRating
|
||||||
|
from .serializers import TrackRatingSerializer, AlbumRatingSerializer, CommentRatingSerializer
|
||||||
|
|
||||||
|
class TrackRatingViewSet(
|
||||||
|
mixins.ListModelMixin,
|
||||||
|
mixins.CreateModelMixin,
|
||||||
|
mixins.DestroyModelMixin,
|
||||||
|
viewsets.GenericViewSet
|
||||||
|
):
|
||||||
|
queryset = TrackRating.objects.all()
|
||||||
|
serializer_class = TrackRatingSerializer
|
||||||
|
lookup_url_kwarg = 'user_id'
|
||||||
|
|
||||||
|
def list(self, request, *args, **kwargs):
|
||||||
|
trackID = self.kwargs.get('track_id')
|
||||||
|
serializer = self.serializer_class.get_default(trackID)
|
||||||
|
print(serializer)
|
||||||
|
return Response(serializer)
|
||||||
|
|
||||||
|
def create(self, request, *args, **kwargs):
|
||||||
|
trackID = self.kwargs.get('track_id')
|
||||||
|
checkValidate = self.serializer_class(data = request.data)
|
||||||
|
if checkValidate and trackID is not None:
|
||||||
|
serializer = self.serializer_class.create(request.data, track_id=trackID)
|
||||||
|
return Response(serializer.toDict())
|
||||||
|
return Response({ "ID": f"{trackID}" })
|
||||||
|
|
||||||
|
def destroy(self, request, *args, **kwargs):
|
||||||
|
trackID = self.kwargs.get('track_id')
|
||||||
|
userID = self.kwargs.get(self.lookup_url_kwarg)
|
||||||
|
return Response(self.serializer_class.delete(trackID, userID))
|
||||||
|
|
||||||
|
class AlbumRatingViewSet(
|
||||||
|
mixins.ListModelMixin,
|
||||||
|
mixins.CreateModelMixin,
|
||||||
|
mixins.DestroyModelMixin,
|
||||||
|
viewsets.GenericViewSet
|
||||||
|
):
|
||||||
|
queryset = AlbumRating.objects.all()
|
||||||
|
serializer_class = AlbumRatingSerializer
|
||||||
|
lookup_url_kwarg = 'user_id'
|
||||||
|
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
def delete(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
class CommentRatingViewSet(
|
||||||
|
mixins.ListModelMixin,
|
||||||
|
mixins.CreateModelMixin,
|
||||||
|
mixins.DestroyModelMixin,
|
||||||
|
viewsets.GenericViewSet
|
||||||
|
):
|
||||||
|
queryset = CommentRating.objects.all()
|
||||||
|
serializer_class = CommentRatingSerializer
|
||||||
|
lookup_url_kwarg = 'user_id'
|
||||||
|
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
def delete(self, request, *args, **kwargs):
|
||||||
|
return Response("elo")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ from rest_framework.authtoken import views as authViews
|
||||||
from portfolio import settings
|
from portfolio import settings
|
||||||
from .account.views import GuestViewSet, AccountViewSet, AccountAuth
|
from .account.views import GuestViewSet, AccountViewSet, AccountAuth
|
||||||
from .album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet
|
from .album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet
|
||||||
|
from .rating.views import TrackRatingViewSet, AlbumRatingViewSet, CommentRatingViewSet
|
||||||
|
|
||||||
schema_view = get_schema_view(
|
schema_view = get_schema_view(
|
||||||
openapi.Info(
|
openapi.Info(
|
||||||
|
|
@ -46,6 +47,10 @@ router.register(r'album', AlbumViewSet, basename='album')
|
||||||
router.register(r'track', TrackViewSet, basename='track')
|
router.register(r'track', TrackViewSet, basename='track')
|
||||||
router.register(r'track-row', TrackRowViewSet, basename='track row')
|
router.register(r'track-row', TrackRowViewSet, basename='track row')
|
||||||
|
|
||||||
|
router.register(r'track/(?P<track_id>\w+)/rating', TrackRatingViewSet, basename='track rating')
|
||||||
|
router.register(r'album/(?P<album_id>\w+)/rating', AlbumRatingViewSet, basename='album rating')
|
||||||
|
router.register(r'comment/(?P<comment_id>\w+)/rating', CommentRatingViewSet, basename='comment rating')
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
path('', include(router.urls)),
|
path('', include(router.urls)),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class OneToManyModel(models.Model):
|
||||||
|
|
||||||
|
def fromDict(self, dict):
|
||||||
|
self.__dict__.update(dict)
|
||||||
|
|
||||||
|
def create(self, dict):
|
||||||
|
new_object = self()
|
||||||
|
new_object.fromDict(dict)
|
||||||
|
new_object.save()
|
||||||
|
return new_object
|
||||||
|
|
||||||
|
def update(self, dict):
|
||||||
|
self.fromDict(dict)
|
||||||
|
self.save()
|
||||||
|
return self
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
abstract = True
|
||||||
Loading…
Reference in New Issue