diff --git a/portfolio/account/__init__.py b/account/__init__.py similarity index 100% rename from portfolio/account/__init__.py rename to account/__init__.py diff --git a/portfolio/account/__pycache__/__init__.cpython-36.pyc b/account/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/__init__.cpython-36.pyc rename to account/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/account/__pycache__/admin.cpython-36.pyc b/account/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/admin.cpython-36.pyc rename to account/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/account/__pycache__/models.cpython-36.pyc b/account/__pycache__/models.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/models.cpython-36.pyc rename to account/__pycache__/models.cpython-36.pyc diff --git a/portfolio/account/__pycache__/serializers.cpython-36.pyc b/account/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/serializers.cpython-36.pyc rename to account/__pycache__/serializers.cpython-36.pyc diff --git a/portfolio/account/__pycache__/views.cpython-36.pyc b/account/__pycache__/views.cpython-36.pyc similarity index 100% rename from portfolio/account/__pycache__/views.cpython-36.pyc rename to account/__pycache__/views.cpython-36.pyc diff --git a/portfolio/account/admin.py b/account/admin.py similarity index 100% rename from portfolio/account/admin.py rename to account/admin.py diff --git a/portfolio/account/apps.py b/account/apps.py similarity index 100% rename from portfolio/account/apps.py rename to account/apps.py diff --git a/account/migrations/0001_initial.py b/account/migrations/0001_initial.py new file mode 100644 index 0000000..7603c0c --- /dev/null +++ b/account/migrations/0001_initial.py @@ -0,0 +1,48 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.conf import settings +import django.contrib.auth.models +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0011_update_proxy_permissions'), + ] + + operations = [ + migrations.CreateModel( + name='Account', + fields=[ + ('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), + ('city', models.CharField(max_length=255, verbose_name='City')), + ('country', models.CharField(max_length=255, verbose_name='Country')), + ('ip', models.CharField(max_length=15, verbose_name='IP')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + bases=('auth.user', models.Model), + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.CreateModel( + name='Guest', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('city', models.CharField(max_length=255, verbose_name='City')), + ('country', models.CharField(max_length=255, verbose_name='Country')), + ('ip', models.CharField(max_length=15, verbose_name='IP')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/portfolio/account/migrations/__init__.py b/account/migrations/__init__.py similarity index 100% rename from portfolio/account/migrations/__init__.py rename to account/migrations/__init__.py diff --git a/account/migrations/__pycache__/0001_initial.cpython-36.pyc b/account/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..8eda0a3 Binary files /dev/null and b/account/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/account/migrations/__pycache__/__init__.cpython-36.pyc b/account/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..861c9db Binary files /dev/null and b/account/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/portfolio/account/models.py b/account/models.py similarity index 100% rename from portfolio/account/models.py rename to account/models.py diff --git a/portfolio/account/serializers.py b/account/serializers.py similarity index 100% rename from portfolio/account/serializers.py rename to account/serializers.py diff --git a/portfolio/account/tests.py b/account/tests.py similarity index 100% rename from portfolio/account/tests.py rename to account/tests.py diff --git a/portfolio/account/views.py b/account/views.py similarity index 100% rename from portfolio/account/views.py rename to account/views.py diff --git a/portfolio/album/__init__.py b/album/__init__.py similarity index 100% rename from portfolio/album/__init__.py rename to album/__init__.py diff --git a/portfolio/album/__pycache__/__init__.cpython-36.pyc b/album/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/album/__pycache__/__init__.cpython-36.pyc rename to album/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/album/__pycache__/admin.cpython-36.pyc b/album/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/album/__pycache__/admin.cpython-36.pyc rename to album/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/album/__pycache__/models.cpython-36.pyc b/album/__pycache__/models.cpython-36.pyc similarity index 77% rename from portfolio/album/__pycache__/models.cpython-36.pyc rename to album/__pycache__/models.cpython-36.pyc index 48e7e01..bc6b342 100644 Binary files a/portfolio/album/__pycache__/models.cpython-36.pyc and b/album/__pycache__/models.cpython-36.pyc differ diff --git a/portfolio/album/__pycache__/serializers.cpython-36.pyc b/album/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from portfolio/album/__pycache__/serializers.cpython-36.pyc rename to album/__pycache__/serializers.cpython-36.pyc diff --git a/portfolio/album/__pycache__/views.cpython-36.pyc b/album/__pycache__/views.cpython-36.pyc similarity index 100% rename from portfolio/album/__pycache__/views.cpython-36.pyc rename to album/__pycache__/views.cpython-36.pyc diff --git a/portfolio/album/admin.py b/album/admin.py similarity index 100% rename from portfolio/album/admin.py rename to album/admin.py diff --git a/portfolio/album/apps.py b/album/apps.py similarity index 100% rename from portfolio/album/apps.py rename to album/apps.py diff --git a/album/migrations/0001_initial.py b/album/migrations/0001_initial.py new file mode 100644 index 0000000..be45b5c --- /dev/null +++ b/album/migrations/0001_initial.py @@ -0,0 +1,64 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('account', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Album', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('description', models.CharField(max_length=255)), + ('image', models.TextField()), + ('url_code', models.CharField(max_length=255)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Track', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('description', models.CharField(max_length=1000)), + ('text', models.TextField()), + ('image', models.TextField()), + ('audio', models.TextField()), + ('url_code', models.CharField(max_length=255)), + ('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='album.Album')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='TrackRow', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('row_number', models.IntegerField()), + ('group', models.BooleanField()), + ('leader', models.BooleanField()), + ('link', models.IntegerField(default=None)), + ('text', models.TextField(default=None)), + ('description', models.TextField(default=None)), + ('image', models.TextField(default=None)), + ('track', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='album.Track')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/portfolio/album/migrations/__init__.py b/album/migrations/__init__.py similarity index 100% rename from portfolio/album/migrations/__init__.py rename to album/migrations/__init__.py diff --git a/album/migrations/__pycache__/0001_initial.cpython-36.pyc b/album/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..aa79239 Binary files /dev/null and b/album/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/album/migrations/__pycache__/__init__.cpython-36.pyc b/album/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..b0ef70a Binary files /dev/null and b/album/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/portfolio/album/models.py b/album/models.py similarity index 97% rename from portfolio/album/models.py rename to album/models.py index 365b608..76ee1b4 100755 --- a/portfolio/album/models.py +++ b/album/models.py @@ -1,6 +1,6 @@ from django.db import models -from portfolio.account.models import Account +from account.models import Account from portfolio.utils import OneToManyModel class Album(OneToManyModel): diff --git a/portfolio/album/serializers.py b/album/serializers.py similarity index 100% rename from portfolio/album/serializers.py rename to album/serializers.py diff --git a/portfolio/album/tests.py b/album/tests.py similarity index 100% rename from portfolio/album/tests.py rename to album/tests.py diff --git a/portfolio/album/views.py b/album/views.py similarity index 100% rename from portfolio/album/views.py rename to album/views.py diff --git a/portfolio/comment/__init__.py b/comment/__init__.py similarity index 100% rename from portfolio/comment/__init__.py rename to comment/__init__.py diff --git a/portfolio/comment/__pycache__/__init__.cpython-36.pyc b/comment/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/__init__.cpython-36.pyc rename to comment/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/comment/__pycache__/admin.cpython-36.pyc b/comment/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/admin.cpython-36.pyc rename to comment/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/comment/__pycache__/models.cpython-36.pyc b/comment/__pycache__/models.cpython-36.pyc similarity index 58% rename from portfolio/comment/__pycache__/models.cpython-36.pyc rename to comment/__pycache__/models.cpython-36.pyc index 9a2d5ba..b31764b 100644 Binary files a/portfolio/comment/__pycache__/models.cpython-36.pyc and b/comment/__pycache__/models.cpython-36.pyc differ diff --git a/portfolio/comment/__pycache__/serializers.cpython-36.pyc b/comment/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/serializers.cpython-36.pyc rename to comment/__pycache__/serializers.cpython-36.pyc diff --git a/portfolio/comment/__pycache__/views.cpython-36.pyc b/comment/__pycache__/views.cpython-36.pyc similarity index 100% rename from portfolio/comment/__pycache__/views.cpython-36.pyc rename to comment/__pycache__/views.cpython-36.pyc diff --git a/portfolio/comment/admin.py b/comment/admin.py similarity index 100% rename from portfolio/comment/admin.py rename to comment/admin.py diff --git a/portfolio/comment/apps.py b/comment/apps.py similarity index 100% rename from portfolio/comment/apps.py rename to comment/apps.py diff --git a/comment/migrations/0001_initial.py b/comment/migrations/0001_initial.py new file mode 100644 index 0000000..ca92243 --- /dev/null +++ b/comment/migrations/0001_initial.py @@ -0,0 +1,38 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('account', '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='account.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='account.Guest')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/portfolio/comment/migrations/__init__.py b/comment/migrations/__init__.py similarity index 100% rename from portfolio/comment/migrations/__init__.py rename to comment/migrations/__init__.py diff --git a/comment/migrations/__pycache__/0001_initial.cpython-36.pyc b/comment/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..37edbf5 Binary files /dev/null and b/comment/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/comment/migrations/__pycache__/__init__.cpython-36.pyc b/comment/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..63f2072 Binary files /dev/null and b/comment/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/portfolio/comment/models.py b/comment/models.py similarity index 87% rename from portfolio/comment/models.py rename to comment/models.py index 01d9424..d925391 100755 --- a/portfolio/comment/models.py +++ b/comment/models.py @@ -1,6 +1,6 @@ from django.db import models -from portfolio.account.models import Account, Guest +from account.models import Account, Guest class AbstractComment(models.Model): diff --git a/portfolio/comment/serializers.py b/comment/serializers.py similarity index 100% rename from portfolio/comment/serializers.py rename to comment/serializers.py diff --git a/portfolio/comment/tests.py b/comment/tests.py similarity index 100% rename from portfolio/comment/tests.py rename to comment/tests.py diff --git a/portfolio/comment/views.py b/comment/views.py similarity index 100% rename from portfolio/comment/views.py rename to comment/views.py diff --git a/portfolio/migrations/0001_initial.py b/migrations/0001_initial.py similarity index 100% rename from portfolio/migrations/0001_initial.py rename to migrations/0001_initial.py diff --git a/portfolio/migrations/0002_auto_20200724_1012.py b/migrations/0002_auto_20200724_1012.py similarity index 100% rename from portfolio/migrations/0002_auto_20200724_1012.py rename to migrations/0002_auto_20200724_1012.py diff --git a/portfolio/migrations/__init__.py b/migrations/__init__.py similarity index 100% rename from portfolio/migrations/__init__.py rename to migrations/__init__.py diff --git a/portfolio/migrations/__pycache__/0001_initial.cpython-36.pyc b/migrations/__pycache__/0001_initial.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0001_initial.cpython-36.pyc rename to migrations/__pycache__/0001_initial.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0002_album_track_trackrow.cpython-36.pyc b/migrations/__pycache__/0002_album_track_trackrow.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0002_album_track_trackrow.cpython-36.pyc rename to migrations/__pycache__/0002_album_track_trackrow.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.cpython-36.pyc b/migrations/__pycache__/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.cpython-36.pyc rename to migrations/__pycache__/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0002_auto_20200724_1012.cpython-36.pyc b/migrations/__pycache__/0002_auto_20200724_1012.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0002_auto_20200724_1012.cpython-36.pyc rename to migrations/__pycache__/0002_auto_20200724_1012.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0003_auto_20200620_1850.cpython-36.pyc b/migrations/__pycache__/0003_auto_20200620_1850.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0003_auto_20200620_1850.cpython-36.pyc rename to migrations/__pycache__/0003_auto_20200620_1850.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0004_auto_20200620_1956.cpython-36.pyc b/migrations/__pycache__/0004_auto_20200620_1956.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0004_auto_20200620_1956.cpython-36.pyc rename to migrations/__pycache__/0004_auto_20200620_1956.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/0005_auto_20200620_2006.cpython-36.pyc b/migrations/__pycache__/0005_auto_20200620_2006.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/0005_auto_20200620_2006.cpython-36.pyc rename to migrations/__pycache__/0005_auto_20200620_2006.cpython-36.pyc diff --git a/portfolio/migrations/__pycache__/__init__.cpython-36.pyc b/migrations/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/migrations/__pycache__/__init__.cpython-36.pyc rename to migrations/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/playlist/__init__.py b/playlist/__init__.py similarity index 100% rename from portfolio/playlist/__init__.py rename to playlist/__init__.py diff --git a/portfolio/playlist/__pycache__/__init__.cpython-36.pyc b/playlist/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/playlist/__pycache__/__init__.cpython-36.pyc rename to playlist/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/playlist/__pycache__/admin.cpython-36.pyc b/playlist/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/playlist/__pycache__/admin.cpython-36.pyc rename to playlist/__pycache__/admin.cpython-36.pyc diff --git a/playlist/__pycache__/models.cpython-36.pyc b/playlist/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000..4a9e102 Binary files /dev/null and b/playlist/__pycache__/models.cpython-36.pyc differ diff --git a/portfolio/playlist/admin.py b/playlist/admin.py similarity index 100% rename from portfolio/playlist/admin.py rename to playlist/admin.py diff --git a/portfolio/playlist/apps.py b/playlist/apps.py similarity index 100% rename from portfolio/playlist/apps.py rename to playlist/apps.py diff --git a/playlist/migrations/0001_initial.py b/playlist/migrations/0001_initial.py new file mode 100644 index 0000000..c6b0cad --- /dev/null +++ b/playlist/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('album', '0001_initial'), + ('account', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Playlist', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('track', models.ManyToManyField(to='album.Track')), + ('user', models.ManyToManyField(to='account.Account')), + ], + ), + ] diff --git a/portfolio/playlist/migrations/__init__.py b/playlist/migrations/__init__.py similarity index 100% rename from portfolio/playlist/migrations/__init__.py rename to playlist/migrations/__init__.py diff --git a/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc b/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..8571e9e Binary files /dev/null and b/playlist/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/playlist/migrations/__pycache__/__init__.cpython-36.pyc b/playlist/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..8bdc27b Binary files /dev/null and b/playlist/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/portfolio/playlist/models.py b/playlist/models.py similarity index 71% rename from portfolio/playlist/models.py rename to playlist/models.py index 0902c78..9d2ce2b 100755 --- a/portfolio/playlist/models.py +++ b/playlist/models.py @@ -1,11 +1,11 @@ from django.db import models -from song.models import Song +from album.models import Track from account.models import Account class Playlist(models.Model): title = models.CharField(max_length=255) user = models.ManyToManyField(Account) - song = models.ManyToManyField(Song) + track = models.ManyToManyField(Track) diff --git a/portfolio/playlist/tests.py b/playlist/tests.py similarity index 100% rename from portfolio/playlist/tests.py rename to playlist/tests.py diff --git a/portfolio/playlist/views.py b/playlist/views.py similarity index 100% rename from portfolio/playlist/views.py rename to playlist/views.py diff --git a/portfolio/__pycache__/settings.cpython-36.pyc b/portfolio/__pycache__/settings.cpython-36.pyc index 622a8bf..0ff77cf 100644 Binary files a/portfolio/__pycache__/settings.cpython-36.pyc and b/portfolio/__pycache__/settings.cpython-36.pyc differ diff --git a/portfolio/__pycache__/urls.cpython-36.pyc b/portfolio/__pycache__/urls.cpython-36.pyc index 481cba0..c92c2de 100644 Binary files a/portfolio/__pycache__/urls.cpython-36.pyc and b/portfolio/__pycache__/urls.cpython-36.pyc differ diff --git a/portfolio/playlist/__pycache__/models.cpython-36.pyc b/portfolio/playlist/__pycache__/models.cpython-36.pyc deleted file mode 100755 index a31e78f..0000000 Binary files a/portfolio/playlist/__pycache__/models.cpython-36.pyc and /dev/null differ diff --git a/portfolio/settings.py b/portfolio/settings.py index 1ec5195..2280cf5 100755 --- a/portfolio/settings.py +++ b/portfolio/settings.py @@ -42,6 +42,11 @@ INSTALLED_APPS = [ 'drf_yasg', 'rest_framework.authtoken', 'portfolio', + 'account', + 'album', + 'comment', + 'playlist', + 'rating' ] MIDDLEWARE = [ diff --git a/portfolio/urls.py b/portfolio/urls.py index a72d08c..33041d8 100755 --- a/portfolio/urls.py +++ b/portfolio/urls.py @@ -22,10 +22,10 @@ from rest_framework import routers, permissions from rest_framework.authtoken import views as authViews from portfolio import settings -from .account.views import GuestViewSet, AccountViewSet, AccountAuth -from .album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet -from .rating.views import TrackRatingViewSet, AlbumRatingViewSet, CommentRatingViewSet -from .comment.views import UserCommentViewSet, GuestCommentViewSet +from account.views import GuestViewSet, AccountViewSet, AccountAuth +from album.views import AlbumViewSet, TrackViewSet, TrackRowViewSet +from rating.views import TrackRatingViewSet, AlbumRatingViewSet, CommentRatingViewSet +from comment.views import UserCommentViewSet, GuestCommentViewSet schema_view = get_schema_view( openapi.Info( diff --git a/portfolio/rating/__init__.py b/rating/__init__.py similarity index 100% rename from portfolio/rating/__init__.py rename to rating/__init__.py diff --git a/portfolio/rating/__pycache__/__init__.cpython-36.pyc b/rating/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/__init__.cpython-36.pyc rename to rating/__pycache__/__init__.cpython-36.pyc diff --git a/portfolio/rating/__pycache__/admin.cpython-36.pyc b/rating/__pycache__/admin.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/admin.cpython-36.pyc rename to rating/__pycache__/admin.cpython-36.pyc diff --git a/portfolio/rating/__pycache__/models.cpython-36.pyc b/rating/__pycache__/models.cpython-36.pyc similarity index 80% rename from portfolio/rating/__pycache__/models.cpython-36.pyc rename to rating/__pycache__/models.cpython-36.pyc index 78f9c7d..2c2a585 100644 Binary files a/portfolio/rating/__pycache__/models.cpython-36.pyc and b/rating/__pycache__/models.cpython-36.pyc differ diff --git a/portfolio/rating/__pycache__/serializers.cpython-36.pyc b/rating/__pycache__/serializers.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/serializers.cpython-36.pyc rename to rating/__pycache__/serializers.cpython-36.pyc diff --git a/portfolio/rating/__pycache__/views.cpython-36.pyc b/rating/__pycache__/views.cpython-36.pyc similarity index 100% rename from portfolio/rating/__pycache__/views.cpython-36.pyc rename to rating/__pycache__/views.cpython-36.pyc diff --git a/portfolio/rating/admin.py b/rating/admin.py similarity index 100% rename from portfolio/rating/admin.py rename to rating/admin.py diff --git a/portfolio/rating/apps.py b/rating/apps.py similarity index 100% rename from portfolio/rating/apps.py rename to rating/apps.py diff --git a/rating/migrations/0001_initial.py b/rating/migrations/0001_initial.py new file mode 100644 index 0000000..0c1d3b5 --- /dev/null +++ b/rating/migrations/0001_initial.py @@ -0,0 +1,66 @@ +# Generated by Django 3.0.8 on 2020-07-24 10:21 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('album', '0001_initial'), + ('comment', '0001_initial'), + ('account', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='UserCommentRating', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.PositiveSmallIntegerField(choices=[(1, 'POSITIVE'), (0, 'NEGATIVE')], verbose_name='Type of rating (1 - POSITIVE, 0 - NEGATIVE)')), + ('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comment.UserComment')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='TrackRating', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.PositiveSmallIntegerField(choices=[(1, 'POSITIVE'), (0, 'NEGATIVE')], verbose_name='Type of rating (1 - POSITIVE, 0 - NEGATIVE)')), + ('track', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='album.Track')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='GuestCommentRating', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.PositiveSmallIntegerField(choices=[(1, 'POSITIVE'), (0, 'NEGATIVE')], verbose_name='Type of rating (1 - POSITIVE, 0 - NEGATIVE)')), + ('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comment.GuestComment')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='AlbumRating', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.PositiveSmallIntegerField(choices=[(1, 'POSITIVE'), (0, 'NEGATIVE')], verbose_name='Type of rating (1 - POSITIVE, 0 - NEGATIVE)')), + ('album', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='album.Album')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.Account')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/portfolio/rating/migrations/__init__.py b/rating/migrations/__init__.py similarity index 100% rename from portfolio/rating/migrations/__init__.py rename to rating/migrations/__init__.py diff --git a/rating/migrations/__pycache__/0001_initial.cpython-36.pyc b/rating/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..f698cf4 Binary files /dev/null and b/rating/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/rating/migrations/__pycache__/__init__.cpython-36.pyc b/rating/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..ece99f3 Binary files /dev/null and b/rating/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/portfolio/rating/models.py b/rating/models.py similarity index 91% rename from portfolio/rating/models.py rename to rating/models.py index 5d132c6..3440428 100755 --- a/portfolio/rating/models.py +++ b/rating/models.py @@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy from rest_enumfield import EnumField import enum -from portfolio.account.models import Account -from portfolio.comment.models import UserComment, GuestComment -from portfolio.album.models import Album, Track +from account.models import Account +from comment.models import UserComment, GuestComment +from album.models import Album, Track from portfolio.utils import OneToManyModel diff --git a/portfolio/rating/serializers.py b/rating/serializers.py similarity index 100% rename from portfolio/rating/serializers.py rename to rating/serializers.py diff --git a/portfolio/rating/tests.py b/rating/tests.py similarity index 100% rename from portfolio/rating/tests.py rename to rating/tests.py diff --git a/portfolio/rating/views.py b/rating/views.py similarity index 100% rename from portfolio/rating/views.py rename to rating/views.py