From 1d070489133212d269904ddeca5a8268dc2224a6 Mon Sep 17 00:00:00 2001
From: TBS093A <zukkamil@gmail.com>
Date: Mon, 6 Jul 2020 18:07:23 +0200
Subject: [PATCH] upgrade ratings list

---
 portfolio/migrations/0001_initial.py          |  60 ++++++++++++++-
 ...ng_guestcomment_trackrating_usercomment.py |  69 ------------------
 .../__pycache__/0001_initial.cpython-36.pyc   | Bin 2129 -> 2980 bytes
 .../rating/__pycache__/models.cpython-36.pyc  | Bin 2368 -> 2294 bytes
 .../__pycache__/serializers.cpython-36.pyc    | Bin 3690 -> 3682 bytes
 .../rating/__pycache__/views.cpython-36.pyc   | Bin 3173 -> 3734 bytes
 portfolio/rating/models.py                    |  15 ++--
 portfolio/rating/serializers.py               |  52 ++++++-------
 portfolio/rating/views.py                     |  43 +++++++----
 9 files changed, 120 insertions(+), 119 deletions(-)
 mode change 100755 => 100644 portfolio/migrations/0001_initial.py
 delete mode 100644 portfolio/migrations/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.py
 mode change 100755 => 100644 portfolio/migrations/__pycache__/0001_initial.cpython-36.pyc

diff --git a/portfolio/migrations/0001_initial.py b/portfolio/migrations/0001_initial.py
old mode 100755
new mode 100644
index 761eeb3..da4e5cf
--- a/portfolio/migrations/0001_initial.py
+++ b/portfolio/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-06-20 22:48
+# Generated by Django 3.0.8 on 2020-07-06 15:59
 
 from django.conf import settings
 import django.contrib.auth.models
@@ -76,6 +76,17 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        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='TrackRow',
             fields=[
@@ -93,4 +104,51 @@ class Migration(migrations.Migration):
                 '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='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')),
+                ('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='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')),
+                ('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='portfolio.Album')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='portfolio.Account')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
     ]
diff --git a/portfolio/migrations/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.py b/portfolio/migrations/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.py
deleted file mode 100644
index cb004ef..0000000
--- a/portfolio/migrations/0002_albumrating_commentrating_guestcomment_trackrating_usercomment.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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,
-            },
-        ),
-    ]
diff --git a/portfolio/migrations/__pycache__/0001_initial.cpython-36.pyc b/portfolio/migrations/__pycache__/0001_initial.cpython-36.pyc
old mode 100755
new mode 100644
index 037ff1b91f505e97731a2688e750445afeabe305..95fef6094502edef105de24ea5888b91d3201684
GIT binary patch
delta 1072
zcmaJ<O>YuG7~Yu$7M73p0Ln*I)PoXR3gSnwwHEtHO{5X@Ks8Ev2iSFC$?np`#sm}3
z9L&alpa&BVHNE*Syza%b{sd3Xu(X8@n#oMw=Y5~|d7qigkJ(S>#au8b?(Og|j}jlm
zkBKnHajSIeii_h2S4F^8F`z0B>)*Z$*nf=(@(lQ3Zh*{pIML_f3V0+0R|h<C%O04A
zC}o5J(dB^{#0Rbhh6S37zUOF^rcrDdEuKahR)s9w93aYI6C$VR!UVcFfpSE6C7&Zc
zS(F9YF9+ZjTpr*CZu%UiZcjCJhl<5v12&r&mSCB60+pOpG~eP&eV0S;{#3oOr=dzK
z4y6YpZ_Wo>ovLMf+k$Q8Ejlt+a7aF6=I%Ppt^G%^2s<a2HCs3r8S8C|)dXbAT<X#B
zI`75-|5Kf4YiheqI)=IJF7+*cMXS|cKdBi~r)jwlYD$m%LiDRx-rZ8USSdc+&}{g4
zW2?a6;f>0hE=j75q&93yUe6{Mk|*T(WQL*>ZYqT>q25xZI?*-u39Z0ZkLbq8f#vQu
z89bcns+!SI6-iAG>sD~Y82J+Fw&laf8FB0;mcO9v_u4i&g*6YIqzUw(@jVtV*)h9_
zwmhCs{j1>2&mDhuhfpE5tLl;=9guRnrYOaZL7GI{l!yYBsCEf^5w)X#;j}$AiXDHX
z#g^J8i^jg5$>(b3Pfr7VH8+J9r4WkqBJV;Nhmkm3A!M(!d>BQ?SmPa&6^hIwA&+*<
i-$FipI^4GLoZ7Iw%WV~U3R&SP(!KNuATOFlUj8rRWClb4

delta 312
zcmZ1?eo=tSn3tE!XVSa42mBMcrb-JlFfcd(aq%=J28L9ID8>|qD5ey~DCQKCjl0;H
z>UC1tvm}}s(wI_ofh<WdOApS{2g#-wq!{)x0#&F3d7^NhEDBE!g=YlhiKTL8ab>Y*
zacA+Q7^f)qGNm!4bEYVzuw^o)DEBg_vqnj!7_bC0Xqs-8Vr6BTti$fdr^!^r26Su@
zJCM+n-n@{5k5Pv!zaX_Ju_QA;uXrUxksnAJMEuIv&&bbB)z44O)pyCyF3nBNE2*6P
pfisOUYjQYOEH4)$2=YPTWM*zlM!U(j+?E1x10Y8EPj2Iu0|2TcO27aB

diff --git a/portfolio/rating/__pycache__/models.cpython-36.pyc b/portfolio/rating/__pycache__/models.cpython-36.pyc
index 2588354ab45563e0fd0ef1280f492d0a82514aec..eccc71d28cf74f1a89fd322ba0de02df3a6270ad 100644
GIT binary patch
literal 2294
zcmcIlOK;mo5av^&BubVg+jaUt)pyv3<ieL0D1xYtW4NsqBUW<Yg`l`=h0c;xm!we{
zy(QQFgZ_cu`g``;Q~p9vomomURX9Zeqa=1Xv%B2+=G&Rw{bsX%?+4veDvI)#QhE%~
z??X%f1VI#{G9^-7RYhH6TBN(W)OBV=rfW*wU=_Cl<0h*{mTSqr3adqRw;nazhP129
zj+$;WYPl_GTWlk0yKT_7$o5ooH;)uzljci>G->;V?smX#kqxjnXb0>r*ln^2_NKJA
z!0wPP*j;IF6XQ&Ac3uH$#Zg5iN(f~sXw7^|vyA?ddCb3>Lr3i}&ZCDRWn=_abr=Lm
z9%qgw8c$Nn50WUNaVG4eoTk~rf<bf0CV3>xG53S#@L%guOvlNIAJ0$F(<>GH3hVUI
z+41=J>7lSjhet!y0tB>tR^)yIJyda3qPQB>FAQoDm1w_dZUw9=wLsR04t5>FG>8dd
znlCiBK`IbrRkVhaGy@>nV?PVy>D3qG`Hc3G^B$LW@9x*VuX;-?U-tIETH<jamTK@U
z2?Lr6`;ziWl2R}BBZ|}{u?NA>jIP1P*zQA1+a=gUb#<Zv9Q~@h4yS)YGk-jC3}Jb4
zWzQ3J&x0Mw83o<;yq|NQp--?Ze-X<c3g3bCrTE($JWC=v$R_FDxBLF!lqVN7$kM?q
z;n{h@!sJ@}9yVm)&t@zPAo?V}9w})BF@qv2`m?z(5ac!nrGc<iz6+m`WAhGT=%Uy{
zfurKiX_AIncuCJ9pRwaOqf^Rd3JLo$Z1d>Idpi8-$)PYWeU?*Ef0%F@PU9cxoSV2n
z^<a2*Fnn+*j2v=I`nnFb(B49CEfAZ~QYcFR)l%D<>|5K8RTg~=lh(5c@}@#m$eSwB
zi2hP>Em;<(Xf86jNEk=u=q137#RtEL^8i|koA9f0flY;`LDPx)JC>J*o2rFGR51)M
zB>WwiEb2i~G|=G~ya!$U0~9#OKLi1(Wu%mymtw|nMI}ofghBQ$=&1!l(F_&etF1M-
z{bJh4sok_Y9DnCX7=I50WOspvBRwULGPxwn@58_yXelyjA;;KrYmOW8h`2q&|6&j-
z1dpB@$^8s)!)AU2pHieUNR0k2v~^-TC5&%EEAC1`t0_^up43la<|pWHMJo2(o>Y0@
z{tu+$`T6`tQa=aW|3T_L2Dz54of5`3A+-i8EJ&3oUQen6GxyNnid5`zG~U1^>_W%t
z<xSLgM2%ed@igg^NpW)RF6=xDS=tA0amwT=$#wX_ZE?8dJPH@$IbMhy-3SA1cXxHv
z_Wk0D>=&n}JkiR-i+WoQ%Sx=`>N}++Fol;hWKtmsV&i&-M9AyV%il(UN1?1sj(Nl}
n?ox`cidk6S6&K4rq#?y$Z53Zjv(+}#wykSwMQ>YeyWRK)5*zNh

literal 2368
zcmcIlOK;mo5av^&C`zVf$8jI%yFpc;Qh~HU3lxP_$1#G!N>IBw?4bm$T{~3xaF<k3
z8@)Nl<{$LfOaDTD3a>r+FZ7arvy}BPoFITv5;L5c9q!J2J3D)~)pGy*{l!mrYMS<s
zw(wYxw?O&dU|i#RtR*_rb&`$PNK9rb*^I5kX10>8xW;N2x8r)^Fh|*HaU*e=n>1Nd
z>Gjx4TCA0{SzGB&yps6L*R@@ZH@N#u<F2TUSI<q>fu+ekSUllFUxVJ_ZRl;W27Mj+
z3iqM=O1}ktm3N?bl)k~OeXYB8f%vtqUe=O~i#UhWnjDLw5Wf~d9G;!R(AY^Q$^A&g
zd<d;R7>%+?T6B%F`C~5Rc9tX}ElO{9BJyIYVbC7Lhm)kV4`eucivQXVQ*n^(h3V-Y
ztu&%_FCQDi7AXG&OlVB!8Z)@gOl~tvn8N19xh^bx&2v36fFi|SE1N%rMU);t4&#Zq
z(D85SJbJkQ;NZdIozfZZ><&m8UcA85t(Q&^q+ue0pmc)(=}uyjy&(8`62{etY+(}F
zCT4;$IL6^2a0!CHG`U80V*dvHCs`u;#bN&W*LTDIBbklGsL1;#nJkX7ILhYIcSye<
zo}9$d2*GCQd}KkADvy4(2fdS1*~BUyD0jdd-O?@7(Uo-xxLFx~0k=!w0GP$~=Q^`d
zDs|z2H@NZKU@l6)<Q7W6IyYF8+X}??;4m++Nks)FZSm+y7L5cILnBKA?3O6R(z=B8
z7AW@@)>Rv3U{3RFZF$b#o+!eDVb_x6FIS0mz)B~au06-LlGbU|qTk+xlpA2k{|$VG
zUGK^)l2B0Cl=d%F3X<GQ_kJctbew)KP9+ssS>GP)Zx8P6l-2}wt0uc{S$PZ28=xGA
z9;>>#Zz$Um0yE@4g3}!NF^W`};~MZcSe+Z(e5Nr+m8)I0rl;c)Xn7m|jtEP7=u2^K
zgK}E`H*HL$gA9<#^*^ZW4d7TB5ijeMMi6mH5S8wzI*2d;=XYU}?-8Rx`92tS)5=AB
zw2-qxxmINNqESIEs@gOI)rR+MeJR{t<u>d#uEI}f%eROTVDfD+lu#9o{E$qugEQY;
z`3?q%azfG}j7hsO#!c0BZjSI31W~Ef&aMUb4&v_W@&kMpG9_$P_Mbsm2DY;h<Lkgm
zJ)nZsR#Chh)Q{o$DXljHl`J<0RW<Sd0aWTcPp<{Fi@09_>Q|H`;WDe%&O(f@18M{R
zPC->syc|@zl)ePbK_yG~cG=+LFg?zC{IKdcn^S#KL~-83tZ5#ro?l%iZHWsq5V%Z_
z=rUDptF%aGo3o3f7gpD6ueu9V=UN<|o~z4Yb>iv>hixoOL8W@>p^Ar+Em!6qDnjX!
z)uP*7bx+mg)G3ryHIlMiC}?$vRmX6?scz42sb%GxV4hB|V|coclk6EC*LQr+Z~g~E
CHSg8{

diff --git a/portfolio/rating/__pycache__/serializers.cpython-36.pyc b/portfolio/rating/__pycache__/serializers.cpython-36.pyc
index baf42e56c2a9484c307d88a20b7c3a94390b55e0..e6c60280a980e0b43f63b1fc19ebf6e5fc9786ec 100644
GIT binary patch
literal 3682
zcmcgvU31$+6y23<S+SKA0wEAWp_DJdOx&5m07J-xwzR`A%`i=#G{a~V?Ix8gTggfW
zl5wA$*FNww_)B`_sXu`}anCBY<iwtawn3R)U+=E&J@@NmeRF=kdHZM6|Ho$RZ&rC~
zByZA4J(>g)JZ4?)aSqvtjjrjLB%7iZ*LK)FChEdEVZxHUQy-e1MJo+q(~5n%(x8<&
z(WI5;>545{+st*Il78m$yp>871#xsNRZ3sye(d$TcOw~#r@T18KM!$q^q3@U(nufB
zB$>wr^9*TrYJv;n3HR!dhs?8N129k6kb5@C8YszgBx{HyH%o9s!)q15@}(UWgpVEs
zS=8I#9)sHfI3)w&C%yP61UNhf4M4h0BVDB_V;$Zx1{Ap`{4qfi<_R0{I|PHgu5FPP
zJA-~d66cg`L&=*o?Xv;<)p^VZyu*g<Pvfw*&Hh5PtSq?`g_&#Q#@daX|DopSw4R=c
z_QRwr+u3e<<J+4-`xljTWSFJxgG6O}NgO4mbc^h_gM))O3dzf)SMF3Kr328eq-X8m
z=vi|;j?yelx(6HcKnwpZcKp@Un62&0%olPm=*QXGdYptooNkaX(%_nTtMX#rNOm>m
z+}excOe)t<RG%!j5BpLbr7|nsRj{77Dh8T>gYsp@0zbZ1(OV|53Md40JQFEI^amX2
zTi2<~C=)}2QfF*wEClHa9m%bbY9W)9h=t#%dIibCr#aB4&frwgiq}r@+5C8QI=({d
z1T?s$s|!j-)ivN$Uq;6qG7W7Ms79aCMU~~&G)navy^@<0q}&oRmcU!!dy6*Cf_$6S
zU_<AW8M7c3ib6U#e$W7$G}0BC%AWLePYQG2^y-2t*sUM0On3Xf%!1sAgaWR-P7&?P
zE!WCz-|q!o>HB%p_q&Pc$B-T0KkNr_u~Vd@PMb1D-4Ju670+~k=vt}42z=B@uz8KE
z59r&L>!^3>Q=xg)dzerVx${#mllxL>E>iDcU4wJdj2a{C%Iskx)Eihw&=fRlh0}~H
zi*_+mhbEgl+%}v#{nhl&^k7~Z!7blTx?S1Jrcj(}5WaJ~q|5JO<klo=fbRcHZ#rx)
zS7>9Z(iVLv1gjEGq){!<^bw5_^L#zSnQE)g;GX%3S9P<f*GV;*hXu8WX-u%1adg73
z!TgwMu1{!rRa^rAgyUmCKz)(C1X%++g9-be&^X0J>~eJ$rWfZIZ5SOu+@eu|ThuZp
zl>R7YvxwyjIx`}cndn}MT2^QIjJ_`$Sb?L6Th2DU_US6zc^^|5;xU8h?ry^m<o<aC
zqEICjvmfH?Md{)?9R?Mhrwi=-&vdc$L%iGXUItm%0W@DKReXmig3xhEnd-;|h@w?_
zae^j3CB-vo;v1MosT3EIijG%B5-?AV_ZfXmkc5U+R<Pzxki_>iN|IQej_AcHLYqCM
z2#x6+MT}2W`b(n&h1>!<qzZSB>DXS1AXcX9ycj)bf1Xbd_u#{&(*wx<OISK{o2V=7
zY`Js!f|6<G?<u-G{hp{t#g(R5l=K5jUz3zchjUBcoYMTtecYhR%G4JV1-j8nD+wDD
aVs5V&cd`xq8cOk>+u@F38;i?}%l`t)ap*h%

literal 3690
zcmcgvUvt|;5WkabS+QlO6aqsDr7eG5Anwp%7-m8yrG*X;%`haxgJwXZ=q{;T*>X-Y
z5Rd!hJ~7h=J_a9wuX3+E^(*uRetSw{*>y;vrSj}~eLC&_c5i=s^7Ur3{_?MX{rHE=
z*q^L)RiJM|G9QCrf+wuUea=a@602wXHgsE5lFAOd%|ul=514Qy?^Y+a?_j1TT+Fyf
zGd0XCi8^NLM>DQyY_qoa2=-Z<>qaJ3947HdstiAuzUmKqU&k^Lk9e_wUyW$#@l}Pg
z3CRQo$$T!DZ%Mmb5nNagxnCuH!hA>8q)R~Ix@tz}q3tgf@cg=L6tE`T_n<d~_kclf
z0&Y{Z@JwrB`7N;wsOR*`jtZlD--UVH-`_rgyF+l53`LOklf#JM(na4E<R&EZFpOE3
zgzs4}#<$v*uJps6)YYHDWGG>T|MELi4Xk`DI(O5a?Bu)Iwa>4Ioo`jzl~JB`2C2&T
z(j-o&+Lu7o2?v8Dj({uePw$j8WgvG-DP9{KYIi*ed%GgsAfFk8jV>;XaP4^EOmGyS
z365%I%uG-Qew(X0ri@+;6uxR=AjNoU+qxFrP2)&rdMQtXLf18@N)FVCBg&u+F^*QD
z<j7#x8lxf~^846oVLxDFehZrh0F^DI(amX>f>=CZWShLdf?*$cfAH?}G4HYo`^`G2
zY!`6xxRa;1;wZ=VSZmi71@gGQp2S%mrM<z%d9p|t9X9%OaqjkI9tgP?4wD>tOrtQ#
zHlQ3^Kq4BY2X!soHG8d{y*SCGYFp|h*w^mCP^!aB=5uM)jgo_N1c$bR@fIIlF4>)y
z>so1jM9}G)Ni$_=%qhj|Cfzx*HKC%lwhR_PTEP<SM5y{)B2z7ta4evU0ApxY&EZrR
z@CaEh@L4V&tuDq_Se=1JA(;vw1IHCG=BNRyYfq^3EbysFRBebd$L_Z)2Bmrxk7ye~
zYe&dL65awIRnt7ki<o;IV)m3-r$H<XMOb)pQIT#!GKzEBk9^aQguQS3=so~i9bH%)
z_8pmr+KPoTxRzjLtL<nv2&hQ}fvyKZFBQXtbT0@FhGA0NDK?{un=+xQLC?%eaS^!{
z@lIFB#hcK~7P!2^)w{;cvbuzCb(w}MG*CHc@0)%u_oXsjSiME_1{y`G8$}oVo?4e8
zu!_>Ay(~woiFz`>n+mh#ic)I)EW)H5+$Axzbh*b}ZsFr_ui{p`s#h^9W-@)!`FHT#
zG}HgK^A~;JZ=lngt}i@vdQUX5M=kx@&9v8({d_^MS2egjX)R}Wd4;2unH2p)UwofZ
z0AZs`r+9vTJ@|uTUu|2ppsQsXsCCS6j<)$G#GGBkx!f9a(*|&M*}6G{v)F3t3UsVx
zGTBpa;74i8%@IJ{_=s#$fiXV1IAf&LqmFt2VW5k?=@Em6&K7FiW6Sh>ph43f4ygSg
zq7QLbyKx_d*pK8w6ojAyITJ-;G{Vx8i;!$W&Zhb5X|WLtOLRJ7`aA`%!ijpDhIeQ%
zES?S~n?&AEAoFx?&fB8YsrP7@WwD~NE7(grqbM<_Q?-q|S0EW3dUI5@U0c!pnOwaH
zqOROXc89$eMbmW(AA%R9g?^tONxwMu^h_jelu(u_YFM(68&n53$T!st7`j@r@Zb4q
zD(i@x>SGvQ=$p##7UT@y&&0|Li{p7ZPEyl&3Qpdp80eLybj1EooLqyK&&b^=oTU3(
z?Iqn(GRuQKg;$B6Q+2O6;EPF#KU(IcK~Znhj(LyB^zt2gpO|jBIfo6$6&YRBkno41
WcthEsQ!%4H?Qzd?t@EqrSN;Yz%Gf3V

diff --git a/portfolio/rating/__pycache__/views.cpython-36.pyc b/portfolio/rating/__pycache__/views.cpython-36.pyc
index 3b0d6bc0c01c5bbe5f3b64c18fe4366d3095ef36..3f5367e99babd1b10ab5c0455b3e012cefcffbfb 100644
GIT binary patch
literal 3734
zcmd^CTW{P%6!v|cy=8N2nzlf>vs|)8tq@2E6&h3`(SX{j4;I35Jd=$#_Bx&M5>joS
z(%1e1-gx8h@HnqL^)K+mcgE@NCUGSyS|P-)=J<GyXFTVd^PM@q+G^E*{l*S&v<>4A
zW9C<bejQEz4#5m&rbcE4rb)V$TA3Z#nG-nr-cH@j3p}kmX)W^uU+Zo<m(_#1);)}G
z1P$ml=BLf96|}N;(9Y(AdEGaccCv+FAzKU<v!!6kG;SKK&Ki#l*5J-y8Epma9JdFn
zM_zCq)+TGg+N!Xw!P;i?u+CRlFR;!Xqr30~ei>a;d4dla7hOyFKPCJ?@<J*vOMXs<
zlB`i&B>51Uf1Atwd?-2eC3z6_`&@+4sK`SZ@A51{_d=f+VZJ@!F)kv!cIDa=lU`!0
z#$6G`d$*$^8TM7<%XE8`9pAKW<XOgtMR|)yS7si)!$lIM$pbFb%FLjd?$r~+r-qok
zd-}7WTt}0iKyV{4nGsk((iyl%M&R*U;4?FrV-~X?89|*n%*D0AJXXWC$$a27rxs@x
zb`MD1;f1P=Bv43LOs}AyherB$X!0_|*cccClbJ{6LkGGwu*VK`w{XVpk%@_|E#()4
z4yNh4%G*1LL|-Z!SgH<YKL#L-(@09yAcz^?iAHH5=w)3`Ig+P4swVjT5toH>XuMd0
zP1W?on;WV=o#;11T!QV-AA7rb#(TxKyz<%AsQ10dY2RdTKNrPLo+kNJ`wFY;Mf>|{
z5@QGR;nXst3B9>J9YgE;hssG4S*+qsl9p+hP5d9Mp2cvTo}1uDv~$ojez&2V#&2v6
zY-T+Mf@4=~j2&j|&EZPOI%GqS{n&cw74Fy@ct-|dT)4~`JHHqSb^(aHTVfG2BVZjC
z6$o5?tE|n9ZcXDRmSGkvBwmA1UMzT2aE-U}ihLu93p`5BiSs1ZND$)U0)%RT5b@qU
zL@ws%;vyLc^HRJ*+UpS1C7TcgP8)5JAX=+{sC@qfBm#5-(ucS?1rh>|0MTJ)LqnX8
zDcsPb1Fm%6oBFCcX`b(m_QR1#LmhzHR}F#k7*Bb@yWX=M_J{_X8>gI9HHLT;`Qckw
z;v@>%=7S3rE*?L+)om$142Mz1!%)@3Fw5B}CA}Gj_eW7$T0|XFs#=+AK$a*?m5=Zj
zhsa-|1!K8=^k(rY2?AWaOJcecTGQLnfq_Qp?eM+2>6nh?yS^{T@-mXiOgcMGCSrkJ
z_0JMXM4445lIiA_NSwpu#|fiqA5~2c#U55gD<OClZL*0(<+C3AD^%`bU7#=#6&Jb_
zmr1Xrav281AMr-{P!)-<ko`>(RbWsgeTr5=-3mxvG<CJRGt?D2#I;8{VZDu&J%g&+
zt#`<+DFt-&6D_WzO}3XfTH(u-qvAc9rc2^|5)Bd`kf3xVJ|cmN>N#1sjuABHSr(Gz
zC9rV$MD_5(c&MYW>pmw1h2Ed4h$H&x1Ch4*_#|DcTKfNofOi4JSpr_H1m(X%!5_${
zr&|mPUaIuw*(9V=;xq~8sZS?{zk3vZj1gbcN@%(hM<H3Zx))W44WeN`UzfWm72{DM
z1sz(dEpXb0I|4`dK`!=$jZWb}1ZyWP>x{=a%Eeqr;nK*}Q+C|yFAaTO1#KpF!ox`R
z*GEN?N<k%}@M)Zf;(()vih(i((VA6bTI|ZQ7SO4Ppiu2^QElF$VYlcLM|E!K(r%__
zVWTWsX1dxp`4EM8{4_yOO&};G34&xMn@$P}<$sQ~p>X+vK7b@8#irFkd56E%w3f|f
OOV=2vGyL;swZ8xWITM}$

delta 1311
zcmb_b&r9P#6rM@b7*nHy>u#ggU#M$#UAw3tTks$VqF@Cp9`>+Oli3<tTbYh5`?CiR
zUWEbw4#nI0F9_ZX9{m@*>U)8NrdFX~!h8(xd-J}T_syK8?vlp5X&U<{58rM(FN~Z*
zr)An0vnUbqKk;LlBes&Q>w@Q<;;!e~nmkozw0iuIdu4g0WN1p>E9Hbv;G<pe>+&FW
zNk`?FI=GyKAh!?(5c&`X0lu2fK68pY`I6`61>-|Vq(T_R**HK-{#DPvJX=LOsxrQ|
z(zLSP;j*gWm7kOHd;DK!Bq+wGLV+f!ULZ^u)h+;CGpI^cMc3r8_PeG+NP)45Jf2bz
zmj-Q#u~NmRT!XN!@>ct7QhEcK3s?zD68h`ya%u1AU@I@Ya$(0~KXOdW7MO5+8Zy)x
zz;p6^7RYww>*`^pDi&c?p#QFgKIViQc=7ygZ-7sNcBVn!YN7A45)&+IoBTZ?HNvMM
zpW6rtgbxTG5oQp&5&97(5U{~Kjet@OH^Vo=zgVAuz#>t%V|t7u<G=_%g~<P%h259#
zK>IzwEv~`{JV?r$M1L{jI<T*1y5EiU20aV)yok%MdqC{`Mkpw+6Ukb{(?(12#Wh>n
ugR!<O{R}IXP%-j=(Nbix_T`+Z(*d;C4?MXRa=Sa-XZi0Q-oD-w%pL*P-or8g

diff --git a/portfolio/rating/models.py b/portfolio/rating/models.py
index 5383d69..22ba31a 100755
--- a/portfolio/rating/models.py
+++ b/portfolio/rating/models.py
@@ -9,18 +9,13 @@ from portfolio.album.models import Album, Track
 
 from portfolio.utils import OneToManyModel
 
-class RatingValue(enum.Enum):
-    POSITIVE = 1
-    NEGATIVE = -1
-
-    __labels__ = {
-        POSITIVE: ugettext_lazy('POSITIVE'),
-        NEGATIVE: ugettext_lazy('NEGATIVE'),
-    }
-
+RATING_VALUE = [
+    (1, 'POSITIVE'),
+    (0, 'NEGATIVE')
+]
 
 class AbstractRating(OneToManyModel):
-    value = EnumField(choices=RatingValue)
+    value = models.PositiveSmallIntegerField(choices=RATING_VALUE, verbose_name='Type of rating (1 - POSITIVE, 0 - NEGATIVE)')
     user = models.ForeignKey(Account, on_delete=models.CASCADE)
     
     class Meta:
diff --git a/portfolio/rating/serializers.py b/portfolio/rating/serializers.py
index 53f2395..e832fb3 100644
--- a/portfolio/rating/serializers.py
+++ b/portfolio/rating/serializers.py
@@ -6,13 +6,8 @@ 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()
 
+    @staticmethod
     def get_default(track_id):
         queryset = TrackRating.objects.filter(track_id=track_id)
         return [ x.toDict() for x in queryset ]
@@ -34,18 +29,20 @@ class TrackRatingSerializer(serializers.ModelSerializer):
 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)
+    @staticmethod
+    def get_default(comment_id):
+        queryset = CommentRating.objects.filter(comment_id=comment_id)
+        return [ x.toDict() for x in queryset ]
 
-    def update(self, instance, validated_data):
-        return instance.update(validated_data)
+    @staticmethod
+    def create(validated_data, comment_id):
+        validated_data["comment_id"] = comment_id    
+        return CommentRating.create(CommentRating, validated_data)
+
+    @staticmethod
+    def delete(comment_id, user_id):
+        return CommentRating.objects.get(comment_id=comment_id, user_id=user_id).delete()
 
     class Meta:
         model = CommentRating
@@ -55,18 +52,21 @@ class CommentRatingSerializer(serializers.ModelSerializer):
 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)
+    @staticmethod
+    def get_default(album_id):
+        queryset = AlbumRating.objects.filter(album_id=album_id)
+        return [ x.toDict() for x in queryset ]
+
+    @staticmethod
+    def create(validated_data, album_id):
+        validated_data["album_id"] = album_id    
+        return AlbumRating.create(AlbumRating, validated_data)
+
+    @staticmethod
+    def delete(album_id, user_id):
+        return AlbumRating.objects.get(album_id=album_id, user_id=user_id).delete()
 
-    def update(self, instance, validated_data):
-        return instance.update(validated_data)
 
     class Meta:
         model = AlbumRating
diff --git a/portfolio/rating/views.py b/portfolio/rating/views.py
index ae84b89..587d391 100755
--- a/portfolio/rating/views.py
+++ b/portfolio/rating/views.py
@@ -23,7 +23,6 @@ class TrackRatingViewSet(
     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):
@@ -49,14 +48,23 @@ class AlbumRatingViewSet(
     serializer_class = AlbumRatingSerializer
     lookup_url_kwarg = 'user_id'
 
-    def get(self, request, *args, **kwargs):
-        return Response("elo")
+    def list(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        serializer = self.serializer_class.get_default(albumID)
+        return Response(serializer)
 
-    def post(self, request, *args, **kwargs):
-        return Response("elo")
+    def create(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        checkValidate = self.serializer_class(data = request.data)
+        if checkValidate and albumID is not None:
+            serializer = self.serializer_class.create(request.data, album_id=albumID)
+            return Response(serializer.toDict())
+        return Response({ "ID": f"{albumID}" })
 
-    def delete(self, request, *args, **kwargs):
-        return Response("elo")
+    def destroy(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        userID = self.kwargs.get(self.lookup_url_kwarg)
+        return Response(self.serializer_class.delete(albumID, userID))
 
 class CommentRatingViewSet(
     mixins.ListModelMixin,
@@ -68,12 +76,21 @@ class CommentRatingViewSet(
     serializer_class = CommentRatingSerializer
     lookup_url_kwarg = 'user_id'
 
-    def get(self, request, *args, **kwargs):
-        return Response("elo")
+    def list(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        serializer = self.serializer_class.get_default(albumID)
+        return Response(serializer)
 
-    def post(self, request, *args, **kwargs):
-        return Response("elo")
+    def create(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        checkValidate = self.serializer_class(data = request.data)
+        if checkValidate and albumID is not None:
+            serializer = self.serializer_class.create(request.data, album_id=albumID)
+            return Response(serializer.toDict())
+        return Response({ "ID": f"{albumID}" })
 
-    def delete(self, request, *args, **kwargs):
-        return Response("elo")
+    def destroy(self, request, *args, **kwargs):
+        albumID = self.kwargs.get('album_id')
+        userID = self.kwargs.get(self.lookup_url_kwarg)
+        return Response(self.serializer_class.delete(albumID, userID))