From a732dadcb0cf7bd73d2bcb4294ecc7d14fcd808d Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Thu, 10 Jan 2019 00:59:07 +0200
Subject: [PATCH] Add API support for restaurant addition and filtering

---
 .../__pycache__/__init__.cpython-35.pyc       | Bin 131 -> 0 bytes
 .../__pycache__/settings.cpython-35.pyc       | Bin 2544 -> 0 bytes
 .../__pycache__/urls.cpython-35.pyc           | Bin 1097 -> 0 bytes
 .../__pycache__/wsgi.cpython-35.pyc           | Bin 560 -> 0 bytes
 .../__pycache__/__init__.cpython-35.pyc       | Bin 139 -> 0 bytes
 .../hyrieus/__pycache__/admin.cpython-35.pyc  | Bin 964 -> 0 bytes
 .../hyrieus/__pycache__/models.cpython-35.pyc | Bin 9703 -> 0 bytes
 .../__pycache__/serializers.cpython-35.pyc    | Bin 6647 -> 0 bytes
 .../hyrieus/__pycache__/urls.cpython-35.pyc   | Bin 1517 -> 0 bytes
 .../hyrieus/__pycache__/views.cpython-35.pyc  | Bin 5831 -> 0 bytes
 .../hyrieus/flavoursAPI/hyrieus/admin.py      |   7 +-
 .../hyrieus/migrations/0001_initial.py        | 116 ++++---
 .../__pycache__/0001_initial.cpython-35.pyc   | Bin 6262 -> 0 bytes
 .../__pycache__/__init__.cpython-35.pyc       | Bin 150 -> 0 bytes
 .../hyrieus/flavoursAPI/hyrieus/models.py     |  66 ++--
 .../flavoursAPI/hyrieus/serializers.py        |  48 ++-
 .../hyrieus/flavoursAPI/hyrieus/urls.py       |  30 +-
 .../hyrieus/flavoursAPI/hyrieus/views.py      | 294 +++++++++++++++---
 .../hyrieus/flavoursAPI/settings.py           |  34 +-
 19 files changed, 425 insertions(+), 170 deletions(-)
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/__pycache__/settings.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/__pycache__/urls.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/__pycache__/wsgi.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/__init__.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/admin.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/models.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/serializers.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/urls.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/views.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/0001_initial.cpython-35.pyc
 delete mode 100644 UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/__init__.cpython-35.pyc

diff --git a/UI/Database API/hyrieus/flavoursAPI/__pycache__/__init__.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 697db6dbbc48507023cfde992f655a484418d473..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmWgR<>gu%q#wfo1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnF9ZFI{M=Oiw4B7U
z{L-T0lqCI(%A(BF(qg!fV}PfAe0*kJW=VX!UP0w84x8Nkl+v73JCI4mK+FIDOp+dX

diff --git a/UI/Database API/hyrieus/flavoursAPI/__pycache__/settings.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/__pycache__/settings.cpython-35.pyc
deleted file mode 100644
index a0e230daaca7b7085f17322114919dfea50c3f15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2544
zcmb7GZByGu5MIAv8wW_5kc1{_qqcd21lb0X&`u|fVk_W@u|1XujixgiS$DPtdU13o
z2>RMz(vSTE{W1F5PyGx1)Rk<5Ycf-6ne%FI_u1$6cJH{gxLEw-x6&`mivWMZ)Cb?;
zHU2R*1wa5a98*BjV5dM!0ZqYS8V)lTge=fG_%${DYB?Yo(DFdCpcR13K_A`cfuJ6h
zs6n|1<O+}lAdAp1fQGM2K&}G02ILDM*MZysvJCw^XlQm5G_<@0<Tj8M=p(ByV{mc@
z$Xy`!fP4kyYasWbp9L!gRyK*a2t)u4VZQ<LEs*bkJOJ_#$Ri++fjj}S3S=#&N1g(C
z239Wi)sO?4t;cdKh!deS5z4WEfi$FA0S(!1fQE!ogPd_(PR5%+HbFzqTL~Fto(5(0
zxlzW{7Hfxw+xG-UIk((C6MCL6^lanU3w$QE>%!3Y4ynn-VsVGM)HgUKLibd7OcK9!
zgE*EeFmCvKZ24FS7$ON{;0>`NZlU*E#C1HM3YLo@9D`e)E8v$8EDUPd^cixX#R2C-
z_Cu*eJd=r|7!wAj=ai^hLckLDhL*`n6Vjy-JReY@7udF7TZ{`{?|e~)OE3_%eBs!z
z1IqqSET8tK0{s=&XfxaxhA)OMPRz=~hh_5-F}Ll2_g0Udv#znW#Xh;mo1S;-npW8{
zkJs(>p?<inhD+O<;zkAem%kS)FDv2lXnmsTx!kw9Vv@`7#;i8rgYfQ*GIpUZ=chx;
z!rL>Gj53DVy*T0EgwaQjJF^}f_rr{LfrU4wc3&Kv`W6kCw&YXB^`37y^u+Uz!u2tL
zV-aH06T_z>qh{b+{8UuN!rs|jxHTJZ%ut;2S4O%iuhok|um&8@6|2e5f0#1ACsuKI
zZ_$$})0Z<`49xE|4+-BfwU(Kb=#=B^A|~0KcHSFhc*^U=XBJ^w=Fy>H9$}k^KfjHW
z+8W0Fz^44JO>aZs+bqhzk*e?HW-Tm@Avtx1Ha4W#MJ(!)NyCV>q&L;^G}E%RdPj*0
zQoF4uQohwz>#e4uT~F%h6W6iFOr-AlEPOJHe$hrGv>WupwM$s~^dt5g51)>0&uTr+
z`e%^i-3T{ljL$Ot8HdSScyBskC#-LY#&C$4PPQ@16WTKZn@2ghxl?b-;mSA$>7J+0
zIb|R1DBG0wWNl>vr=M7S;00XodOo2(i?aKQ+|d>$^ZShYQK2m<%0a7B(~1*)Wi!g|
zwiGqWwp$%Ff^c_cRY~Cu4aTseh>i!7MG~%Jj41K=NC-GpEXT5qxUt@kEIdDaby=i6
z%e9=qX;8P%2j~7jUDkipXYDb^bAZ>E1!x8i^)2%v!W?zi@m$I5tJSbj!utaot`ruN
z9T4Smxw5(v<#ipe0bP&M9%g-L@Bwb4<-6D~QQqjXL{rf9_}tQUt?))t<ha12q9Rv2
zvZ}w6KSXmi`OW@Lv?w(itpmBH$6KOAOZBFrq6!t*6-rdxtJi7``9SK((L$%yQuX~#
zquOe|jpkK(uicPTS&6P4C_DAozEQ7AaRWv3HA$7?uu8Nd?W?=`qzv@;QlpNOE$q9+
zhSc2Imv&^m+N#M2Sl^R%t<{vH0#=e<uWUC*QlnCCM!8t0YPbd!V^m`v(JiIkkegK`
zt9($9k6zuCtM8QG!GD0aQ8N5pE)6_~mL}Clx~1{ieWt?O{OlqVho@2DN5><9O<!G!
z|Ig~;kV`LQ*7CVbE<K;iq^6(w?7!YJxoj>KKj+%(xm-Sz=#rWA)#7|6ey$dB>G6}x
GrT+oP`!jL?

diff --git a/UI/Database API/hyrieus/flavoursAPI/__pycache__/urls.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/__pycache__/urls.cpython-35.pyc
deleted file mode 100644
index d7b6b068bb2ded98e9a4b6bf2eeda2a4915cbf92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcma)5U2oGc6un8)uWW^hhlxkOb&*P}@mK+3nwXe`5aQz{LUd{EwyEMcvYo;Dx}U(W
z;4kHsC;kFYT)QcYkdT%rj(v4~?m5TT$D>gge5apH2jC~Po-WQ`;-|MbFn|O{510?R
z2f~NM2hXlMkas`?kOaGR0C^Wg50c()-G#glVgShi#1N7pcsu~s1Mb5ngv|lm`oIUk
z`oM?425{@y$O;P_0vp1IC`^qHu*}nISt)(??vi|Z|Aw5)VwtTfm6}WzVfb;)$yKHD
zGBt*)LSK<Q(}pNn8LsUHO^hVh8ULzdav>EFQgM<MOR0o|AZ5-|&57oG8WMcg#*}(W
zDU%BwvrSs8WU1taFHF3Ug7ShsjZdkOWwy}NCQ~f0Y53|}DiBLg!;7j|Sa!Rz4)io8
zXN-}wAektoGE+j9N(v%wW@%YA!B+m$Cf`X$0WF2N6~(Sk#^Xt&Yb^zzkRlcQ`Pk0K
zQFxxGT0fbiFxEo-9}8*LTv;NqGip!gHDWpT_he)9<5bTq$Vv1MqswBES1c=5Xo9O}
zr7iF<_x@ZuV+c~g<FUE?BqGbk%IVIo-EqX$@IA>Ucj8RBH`{qGR}>B0R~p-Z!yQLa
z_zN2!BCqbIOk@R40_!;b2bvp$8g%5>9b{4W8-Q)krP6KpOIl`h`?%G%@%lz(ywVQ-
zZ8WO;vl%wmY?eG|^q>t!Wpjn?4)sAxq{6#-7qM=s03*rK-NvPZRrb=Vp3M$)W_TS~
zkLrU~-~0eIvPpLMJ)yQy=$<8;(}v{V5Z*V}*l~GN51t9hs+_-gh<o)R4n6P4y~mwL
F-X8*NNM-;4

diff --git a/UI/Database API/hyrieus/flavoursAPI/__pycache__/wsgi.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/__pycache__/wsgi.cpython-35.pyc
deleted file mode 100644
index 13c92bf83dcaebb6b9e5e49a9df43423e9c20f4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmYjO!D<^Z5S`T~cGxx$XvkStL$abhmQtFM)VMTGi4zK@uvS*HYZ<MytYoLoH6PIL
z=pjF}J@(XJ=&56y1PkdgjP&Nc86EBKCy!U+`_BmA4{WWN;tzEEM*;;fCX7HaFcFL?
zpdEu@P{lBgA;Jh|J22Y?wF7Dw9vG!!cpzS9MH=-w_rH^GqyB*B&KA1lg==_W<igDx
zfBJR6>&DG64{4GN0>>Y<^XPe)BHxgtG4j?Rm!3;rIW;$UVsL?mFJz<FS5{W2_+%pM
z+UQ&c?d)Vi^*)hO<r?JLl4!NQ;LcKU?RlXM9&?YFOhc&sTOpLoeX3^CmhQ<@?ka&+
zyh&e+sk;kKD6EZJR%nB`^Q9KaUm6k&dr^B>V#rpxY|BP_boTjl*uTt1=hxSRVSkie
zT%O&0Iln*Lnn3C?1Z_*->$cr2BO6)PGUwZajhQs39@16mhLKp?MZ3_Avu#2|g@v4(
z(7xDG{RK@z57+STn4DKAp7hkMm@XTQbN`&8PgpmT*2{M9-Dbq^_o#qhL5IC$2kaI5
E57^DBo&W#<

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/__init__.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index bd62fef0bc5d8b0c8ef786ce6751ad3a7a7c68cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmWgR<>fjbq#wfo1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFAM#Q{M=Oiw4B7U
z{L-T0lqCI(%A(BF(qg!fV}K`IEIvLnFS8^*Uaz3?7Kcr4eoARhsvXG0VjyM!0DrF`
A+W-In

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/admin.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/admin.cpython-35.pyc
deleted file mode 100644
index fbab449127267fe63b1527a9eec2d3e54e5feda2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 964
zcmaKqL5|Zf6o&t_Nt>oknzX~f0oZgiU9m$5q|u1kpsI+C#U>@Db&2E3PC>Kg3Uh&3
zasdwGEvvZ#EBrcAr&x$M`I7Iw*nZOUd736a@8%zOUEmi^u8#YD?H+R*0F}D~)PM}Y
z0t8hDRTp&!vJ2LQ48cOk2rPo^f%PE!V139KEQTC_4ImS+1ab&AgdBm5AXBguG6TyX
z$6#Z~94v<{zzWC-*aUJ4HbuY#Y|pTL0^Y@UxBsJuo=2YdJnwrRdp__y@qFm{$n(_m
z%=5A5x#xxF6VImyuR^?^MfcRMSzx2GlA^hHeZs7;;icfMeM($twGk`Pn(Jn*c_nz$
z+UQb?=8K&iUT@3ORCuLSWeeipiR5H{vfx?@V}xpKvgD>M_qufJhD%j*TM*sklb^y5
zhHE<}Ua7iP-^@dS6!=$x86}ow%gsZj>Cq46O^^Dx`McRU%c^bJtkuOQ)wEiyG@W1D
zld9si(V-I^5qg9^Atnq631LVW5mG`%7!z_rL6{Jxgfj;l8qsnaYrYny<@yKoGs+Qu
zznE{7<nzyU`Bm+;saEsNjTU@wj-fY;>tpQDzl+_CjbFNg_ceb-y)@4q@?h7=ga3~|
D6qVmP

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/models.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/models.cpython-35.pyc
deleted file mode 100644
index 81a13c67dc086d28a94206d3cc06d80b57a9dfa8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9703
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

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/serializers.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/serializers.cpython-35.pyc
deleted file mode 100644
index 68eabdba79905ec7533a44d97decffaf6cc6cb1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6647
zcmcJT-BQ~|7=}Op8~<W#Fy`0BK<c)E9<&E-Iw_qpNjQLEU^?w+($Sc%2yP^tu1qt@
zX?g>_jNXz?dz4$~QNMQ)whTs5Bp1-4-PikSzel_4-CZaabC3SoeLg=!^bdJ{l6=3%
zm;EqKB=|2zCXp2*Ek-dBCy^jCPF8}n1X)Sal4PYwOOcf(ElpO2v<z8U(z0aDkTyeB
zj<g(EdD8M^6-X<PRV1xQR*AF{S!L47WX+N`OIC%n3R!cc&5>0ltxB<{B1s}ee{wTY
zWW?yV8olEu&(l+pCXrD>#v?4SkR>srgc*-eXCX%-uY|luSY)9<qNs$TM`*B6B2iXC
z*&{5mFiWDMgo;O4W?_y*RS8v(u);!(#Jm#bJ;Evr3nc1FsC$Gp78Xe~l+f@9>ntph
zSXRQaM`*IJLSj`3s~(}n!WxNnC9Hdd4HlXtT1sengf<HsB-%=7dxT9EHc4zLVap?I
zk=Ulw&V%>pN1d3Hw+-3rn!UG%wBN^2R&kR1J!9b1ksizbMenRPun#U@NJI3D%Yl>H
zm%YoE&Yb%9tm~DMPx^h~RFIAfIZyrEu_3LVZTI?@PVU682i+^#W#8mU-!z;GQm*Xz
zQ1VA^q*F%vq;H!2*Y<S-Q81~2B?u?ofni^_v^dPG=2eH;(ZhcQj+>tZ-|X>aw>dEg
z!-+?i7H6h>7gtQ<^e&EZ#bfNWlXOaG(diK7m>sApyOmpZ29FOOG(28Yus!W0-d4wb
zb`Fg}*U9L5*EDtgsFQZGx_;TU3|)6}x^DHwm5KX;uK#}3HLn$kdBI7sXqZm=yl0rg
z{+lG8u9ANr?OyaPWB1(b{?WgZwm93pcq4npl|3x_{`g>6#w>3-$j+-bP7+P3vzLv>
z6k_R^T;rRgPEw*&E+T0lLGkFR*LSNZo9ASKFPo<=c2M~-Vj*5Y3*aVnhAF(0?GIY3
z*CY`VzoOe1Qd}&TkSrq^z6K8vkV1KQr0ZN8_BTk8kBYRcM$Z%g)@~X3;!1PN1K?^Q
z*w8(&$+dCa;KF@WTq}3y!zr+9`MLUn%y3KrKyCv=XpndfTX1lPGV)PDmM}|C0bO<6
z#}`(X+Z_PbX9zVktPQUHDI8o_$VY{>eCNA%3gntTroI??g&G9o7l05NW1DO5!okIe
zd{m6J(fVWx{2G(oe8J^7h5-HVD})^y+$Pul5)Ljn<RgO{t<$CfZjzfXxID)Y0NghS
zJ2W`Va9_j01&4fOaHGZNG{8-A^95Jn7y^L%4q=A|hcB1MaB#sP9~E2)8-yt!tB(8l
z!YXpR1HjrxsG(s!;MzaH!G(o<R9MS*c2iRz*Yq*<#aQBq0$@A<gwPm2;o8sO;9^8R
zDn_-VoB}zu^&I*5!YXsS1Hd{$sG(tXxb`6&Tv*6Qh1J0R+Ots~#XII4<45h`(E+x_
zYxi3EBAjLW00>XfiqHtLqC0_uixBy-KoeZBhYz$lF#;VYv=HzAw442)wJ*{N#}EMN
z&xkiPQY^E7f`f|``KU-25%=g&XbPQj^*%>mfO8y60D!+B{LlbD=i1NV-~vQGD!}?M
z-0^+YnD567>Xmy8eeqQ}k^uP55PWES54m<14lX|A$HGi-!5%))<|NpV9`%+<OSLig
zkAb)`ggD987iEpx9suPF#2Fgp4%a@1gNqXRqt3Qdl6>&1pG!W=eBGBXC1fY9&Ma+p
zfGJa4BGX9JNru{?tNo?gE2(wATEnWfnOa$>Z%j4kt655oG}T`asZ&10f#_)5t7Aur
zgEHAf(n7L<1TR%?BEdpmV$mwG7?W5^NPI;~O!5-blEl!G=pYiIO*-Clvfo}G)IP?G
PwP8FPdsS<s{D1!g!~R!n

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/urls.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/urls.cpython-35.pyc
deleted file mode 100644
index 6fec36cd2013e207936924da1bc80c7512c4e8b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1517
zcmai!%Wl(95Qcv@cRNnv+?sORv8aU74H6rKK&mRbK~*bQ93dftC#hSXI6B8})pehQ
zB~QS+m?bM-ffZ*G;-0D%B+l=AGjr^j-<PrPyWhX=eQec%pRhg^^Z&K^=^qXdnax20
zNC(1!!@PxL3$g-HS#t$R6|x3VgRDc;AsY}4$R<P+vIWtCbRk?w55j|NL$o1%2p_To
z(ShtjbRl~XJ;(qefb2u`AqNlx$RWfKas)Ag97BxZPz7h(xCX=oG{M;pqAI9{>n)R8
za}89txejXB+yFIgZh~4iw?MAVF37Xl1GQ~#gM6EPP{-yDsB3c<)U&w<3TzHQeVhBB
zfz1QZ(B>g%v}Om<2sFmo19r$*GB=m*A;@gTnn!qHAR6Ojcl#G#^<Af^<SH?{hD!5{
zl-}(Z-hNEkhnOx;C@Y>Y9I5m){v2oea4}aD#k45%?R^z5&NtOND|#E=Q|KL}X|$=E
zFx*=f+&x8bL`ue5$LV6TJ~$?wg}DlE8u5<Pgf{sJgE{`)mEL<zYEw35I7pKuz0|jc
z=J-E`9&!FS%t+sweprU>Ss#?qyG_?m;`t(97FFYECbn6Z8?WQi>!KF1$)dm7orc;<
zRcFRY5wPA)xK@$7EFCOdRa#e6m9a?#tY)!QRL#wRqRTp4+p}(v1NSs2I-F2!$huR%
z<W+lv5^qi}>UuT%yWPh{FFFes^K|+pUCgHDe$;Bq+?+*+t3S<DDCsg)=ZarWVrQ0w
z7iq5ao1??&>6MBp*V7Agw`x^2c~xUEuQjL!OOvI=;<9)wZ5E%U!_sBxu>>rAmI2F<
zWn@J7`!oylBs*R`Bt?DwuoO*2^H`h5rf7uv6E{(Kru}7@nb<-XRi5P=)KfkX%kSrV
zr>Ug9%?#1!y}u)rAv0DP<K@%kRndGY(<o2qm3b*cKQq#Edd|hLZS+6i%B1oKS|qAl

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/views.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/__pycache__/views.cpython-35.pyc
deleted file mode 100644
index f53971e3e3b2ad89d3efc4647fe2a2874ba1a339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5831
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
XCY6u!x?)wV^O5t>Df`d<ji>$x-;Qt^

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/admin.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/admin.py
index 340d896..33da03e 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/admin.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/admin.py	
@@ -1,5 +1,10 @@
 from django.contrib import admin
-from .models import Diet, DietProhibitsIngredient, Drink, DrinkHasIngredient, Food, FoodHasIngredient, Ingredient, Permission, Restaurant, Role, RoleHasPermission, User, UserFollowsDiet, UserProhibitsIngredient, UserRatesDrink, UserRatesFood, UserRatesRestaurant
+from .models import (Diet,
+	DietProhibitsIngredient, Drink, DrinkHasIngredient, Food, FoodHasIngredient,
+	Ingredient, Permission, Restaurant, Role, RoleHasPermission, User,
+	UserFollowsDiet, UserProhibitsIngredient, UserRatesDrink, UserRatesFood,
+	UserRatesRestaurant,
+)
 
 admin.site.register(Diet)
 admin.site.register(DietProhibitsIngredient)
diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/0001_initial.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/0001_initial.py
index a80d929..086df8e 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/0001_initial.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/0001_initial.py	
@@ -1,7 +1,11 @@
-# Generated by Django 2.1.4 on 2019-01-04 16:17
+# Generated by Django 2.1.4 on 2019-01-09 11:35
 
+from django.conf import settings
+import django.contrib.auth.models
+import django.contrib.auth.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -9,20 +13,46 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('auth', '0009_alter_user_last_name_max_length'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('user_age', models.DateField(null=True)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
+            ],
+            options={
+                'managed': True,
+                'db_table': 'user',
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
         migrations.CreateModel(
             name='Diet',
             fields=[
-                ('diet_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('diet_id', models.AutoField(primary_key=True, serialize=False)),
                 ('diet_name', models.CharField(max_length=500)),
                 ('diet_description', models.CharField(blank=True, max_length=700, null=True)),
                 ('diet_is_approved', models.BooleanField(default=False)),
             ],
             options={
-                'db_table': 'diet',
                 'managed': True,
+                'db_table': 'diet',
             },
         ),
         migrations.CreateModel(
@@ -32,21 +62,21 @@ class Migration(migrations.Migration):
                 ('diet', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Diet')),
             ],
             options={
-                'db_table': 'diet_prohibits_ingredient',
                 'managed': True,
+                'db_table': 'diet_prohibits_ingredient',
             },
         ),
         migrations.CreateModel(
             name='Drink',
             fields=[
-                ('drink_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('drink_id', models.AutoField(primary_key=True, serialize=False)),
                 ('drink_name', models.CharField(max_length=500)),
                 ('drink_description', models.CharField(blank=True, max_length=700, null=True)),
                 ('drink_is_approved', models.BooleanField(default=False)),
             ],
             options={
-                'db_table': 'drink',
                 'managed': True,
+                'db_table': 'drink',
             },
         ),
         migrations.CreateModel(
@@ -56,22 +86,22 @@ class Migration(migrations.Migration):
                 ('drink', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Drink')),
             ],
             options={
-                'db_table': 'drink_has_ingredient',
                 'managed': True,
+                'db_table': 'drink_has_ingredient',
             },
         ),
         migrations.CreateModel(
             name='Food',
             fields=[
-                ('food_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('food_id', models.AutoField(primary_key=True, serialize=False)),
                 ('food_name', models.CharField(max_length=500)),
                 ('food_description', models.CharField(blank=True, max_length=700, null=True)),
                 ('food_calories', models.IntegerField(blank=True, null=True)),
                 ('food_is_approved', models.BooleanField(default=False)),
             ],
             options={
-                'db_table': 'food',
                 'managed': True,
+                'db_table': 'food',
             },
         ),
         migrations.CreateModel(
@@ -81,8 +111,8 @@ class Migration(migrations.Migration):
                 ('food', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Food')),
             ],
             options={
-                'db_table': 'food_has_ingredient',
                 'managed': True,
+                'db_table': 'food_has_ingredient',
             },
         ),
         migrations.CreateModel(
@@ -92,25 +122,25 @@ class Migration(migrations.Migration):
                 ('ingredient_has_alcohol', models.BooleanField(blank=True, default=False, null=True)),
             ],
             options={
-                'db_table': 'ingredient',
                 'managed': True,
+                'db_table': 'ingredient',
             },
         ),
         migrations.CreateModel(
             name='Permission',
             fields=[
-                ('permission_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('permission_id', models.AutoField(primary_key=True, serialize=False)),
                 ('permission_description', models.CharField(max_length=700)),
             ],
             options={
-                'db_table': 'permission',
                 'managed': True,
+                'db_table': 'permission',
             },
         ),
         migrations.CreateModel(
             name='Restaurant',
             fields=[
-                ('restaurant_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('restaurant_id', models.AutoField(primary_key=True, serialize=False)),
                 ('restaurant_name', models.CharField(max_length=500)),
                 ('restaurant_category', models.CharField(max_length=10)),
                 ('restaurant_longitude', models.FloatField()),
@@ -118,10 +148,11 @@ class Migration(migrations.Migration):
                 ('restaurant_opening', models.TimeField(blank=True, null=True)),
                 ('restaurant_closing', models.TimeField(blank=True, null=True)),
                 ('restaurant_is_approved', models.BooleanField(default=False)),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'restaurant',
                 'managed': True,
+                'db_table': 'restaurant',
             },
         ),
         migrations.CreateModel(
@@ -132,8 +163,8 @@ class Migration(migrations.Migration):
                 ('role_description', models.CharField(max_length=700)),
             ],
             options={
-                'db_table': 'role',
                 'managed': True,
+                'db_table': 'role',
             },
         ),
         migrations.CreateModel(
@@ -144,24 +175,8 @@ class Migration(migrations.Migration):
                 ('role', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Role')),
             ],
             options={
-                'db_table': 'role_has_permission',
-                'managed': True,
-            },
-        ),
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('user_id', models.IntegerField(primary_key=True, serialize=False)),
-                ('user_email', models.CharField(max_length=500)),
-                ('user_username', models.CharField(max_length=500)),
-                ('user_hashed_password', models.CharField(max_length=64)),
-                ('user_salt', models.CharField(max_length=32)),
-                ('user_age', models.DateField()),
-                ('role', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Role')),
-            ],
-            options={
-                'db_table': 'user',
                 'managed': True,
+                'db_table': 'role_has_permission',
             },
         ),
         migrations.CreateModel(
@@ -169,11 +184,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('diet', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Diet')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'user_follows_diet',
                 'managed': True,
+                'db_table': 'user_follows_diet',
             },
         ),
         migrations.CreateModel(
@@ -181,11 +196,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('ingredient_name', models.ForeignKey(db_column='ingredient_name', on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Ingredient')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'user_prohibits_ingredient',
                 'managed': True,
+                'db_table': 'user_prohibits_ingredient',
             },
         ),
         migrations.CreateModel(
@@ -197,11 +212,11 @@ class Migration(migrations.Migration):
                 ('rating_text', models.CharField(blank=True, max_length=700, null=True)),
                 ('rating_pοrtion_size', models.CharField(blank=True, max_length=6, null=True)),
                 ('drink', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Drink')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'user_rates_drink',
                 'managed': True,
+                'db_table': 'user_rates_drink',
             },
         ),
         migrations.CreateModel(
@@ -213,11 +228,11 @@ class Migration(migrations.Migration):
                 ('rating_text', models.CharField(blank=True, max_length=700, null=True)),
                 ('rating_pοrtion_size', models.CharField(blank=True, max_length=6, null=True)),
                 ('food', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Food')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'user_rates_food',
                 'managed': True,
+                'db_table': 'user_rates_food',
             },
         ),
         migrations.CreateModel(
@@ -230,18 +245,13 @@ class Migration(migrations.Migration):
                 ('rating_accessibility', models.CharField(blank=True, max_length=8, null=True)),
                 ('diet', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Diet')),
                 ('restaurant', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Restaurant')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'db_table': 'user_rates_restaurant',
                 'managed': True,
+                'db_table': 'user_rates_restaurant',
             },
         ),
-        migrations.AddField(
-            model_name='restaurant',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.User'),
-        ),
         migrations.AddField(
             model_name='foodhasingredient',
             name='ingredient_name',
@@ -267,6 +277,16 @@ class Migration(migrations.Migration):
             name='ingredient_name',
             field=models.ForeignKey(db_column='ingredient_name', on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Ingredient'),
         ),
+        migrations.AddField(
+            model_name='user',
+            name='role',
+            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='hyrieus.Role'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='user_permissions',
+            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+        ),
         migrations.AlterUniqueTogether(
             name='userratesrestaurant',
             unique_together={('user', 'restaurant')},
diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/0001_initial.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/0001_initial.cpython-35.pyc
deleted file mode 100644
index 103da2a91098cec29d16c9c899ff20d8fe6414a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6262
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

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/__init__.cpython-35.pyc b/UI/Database API/hyrieus/flavoursAPI/hyrieus/migrations/__pycache__/__init__.cpython-35.pyc
deleted file mode 100644
index 9e2137af63bdbca873f6a5dcfb0edfd6cf0d3ca8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmWgR<>gXr*N<TUg2x~N1{i@12OutH0TL+;48fX=ek&P@K*9*(m$QCGer~FMT25kF
zerZv0N|Js?Wl?5oX)#>LF~AcpmYbPglvt9PpI59OAD@|*SrQ+wS5SG2!zMRBr8Fni
L4rF*S5HkP(^c5x9

diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/models.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/models.py
index dc2d91e..93a5df6 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/models.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/models.py	
@@ -1,7 +1,26 @@
 from django.db import models
+from django.contrib.auth.models import AbstractUser
+from django.conf import settings
+
+class Role(models.Model):
+    role_id = models.IntegerField(primary_key=True)
+    role_name = models.CharField(max_length=500)
+    role_description = models.CharField(max_length=700)
+
+    class Meta:
+        managed = True
+        db_table = 'role'
+
+class User(AbstractUser):
+    role = models.ForeignKey(Role, models.DO_NOTHING, default=0)
+    user_age = models.DateField(null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'user'
 
 class Diet(models.Model):
-    diet_id = models.IntegerField(primary_key=True)
+    diet_id = models.AutoField(primary_key=True)
     diet_name = models.CharField(max_length=500)
     diet_description = models.CharField(max_length=700, blank=True, null=True)
     diet_is_approved = models.BooleanField(default=False)
@@ -21,7 +40,7 @@ class DietProhibitsIngredient(models.Model):
         unique_together = (('diet', 'ingredient_name'),)
 
 class Drink(models.Model):
-    drink_id = models.IntegerField(primary_key=True)
+    drink_id = models.AutoField(primary_key=True)
     drink_name = models.CharField(max_length=500)
     drink_description = models.CharField(max_length=700, blank=True, null=True)
     drink_is_approved = models.BooleanField(default=False)
@@ -43,7 +62,7 @@ class DrinkHasIngredient(models.Model):
 
 
 class Food(models.Model):
-    food_id = models.IntegerField(primary_key=True)
+    food_id = models.AutoField(primary_key=True)
     food_name = models.CharField(max_length=500)
     food_description = models.CharField(max_length=700, blank=True, null=True)
     food_calories = models.IntegerField(blank=True, null=True)
@@ -74,7 +93,7 @@ class Ingredient(models.Model):
 
 
 class Permission(models.Model):
-    permission_id = models.IntegerField(primary_key=True)
+    permission_id = models.AutoField(primary_key=True)
     permission_description = models.CharField(max_length=700)
 
     class Meta:
@@ -83,7 +102,7 @@ class Permission(models.Model):
 
 
 class Restaurant(models.Model):
-    restaurant_id = models.IntegerField(primary_key=True)
+    restaurant_id = models.AutoField(primary_key=True)
     restaurant_name = models.CharField(max_length=500)
     restaurant_category = models.CharField(max_length=10)
     restaurant_longitude = models.FloatField()
@@ -91,23 +110,12 @@ class Restaurant(models.Model):
     restaurant_opening = models.TimeField(blank=True, null=True)
     restaurant_closing = models.TimeField(blank=True, null=True)
     restaurant_is_approved = models.BooleanField(default=False)
-    user = models.ForeignKey('User', models.DO_NOTHING, blank=True, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING, blank=True, null=True)
 
     class Meta:
         managed = True
         db_table = 'restaurant'
 
-
-class Role(models.Model):
-    role_id = models.IntegerField(primary_key=True)
-    role_name = models.CharField(max_length=500)
-    role_description = models.CharField(max_length=700)
-
-    class Meta:
-        managed = True
-        db_table = 'role'
-
-
 class RoleHasPermission(models.Model):
     role = models.ForeignKey(Role, models.DO_NOTHING)
     permission = models.ForeignKey(Permission, models.DO_NOTHING)
@@ -118,22 +126,8 @@ class RoleHasPermission(models.Model):
         unique_together = (('role', 'permission'),)
 
 
-class User(models.Model):
-    user_id = models.IntegerField(primary_key=True)
-    user_email = models.CharField(max_length=500)
-    user_username = models.CharField(max_length=500)
-    user_hashed_password = models.CharField(max_length=64)
-    user_salt = models.CharField(max_length=32)
-    role = models.ForeignKey(Role, models.DO_NOTHING)
-    user_age = models.DateField()
-
-    class Meta:
-        managed = True
-        db_table = 'user'
-
-
 class UserFollowsDiet(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING)
     diet = models.ForeignKey(Diet, models.DO_NOTHING)
 
     class Meta:
@@ -143,7 +137,7 @@ class UserFollowsDiet(models.Model):
 
 
 class UserProhibitsIngredient(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING)
     ingredient_name = models.ForeignKey(Ingredient, models.DO_NOTHING, db_column='ingredient_name')
 
     class Meta:
@@ -153,7 +147,7 @@ class UserProhibitsIngredient(models.Model):
 
 
 class UserRatesDrink(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING)
     drink = models.ForeignKey(Drink, models.DO_NOTHING)
     rating_grade = models.IntegerField()
     rating_date = models.DateField()
@@ -167,7 +161,7 @@ class UserRatesDrink(models.Model):
 
 
 class UserRatesFood(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING)
     food = models.ForeignKey(Food, models.DO_NOTHING)
     rating_grade = models.IntegerField()
     rating_date = models.DateField()
@@ -181,7 +175,7 @@ class UserRatesFood(models.Model):
 
 
 class UserRatesRestaurant(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, models.DO_NOTHING)
     restaurant = models.ForeignKey(Restaurant, models.DO_NOTHING)
     diet = models.ForeignKey(Diet, models.DO_NOTHING, blank=True, null=True)
     rating_grade = models.IntegerField()
diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/serializers.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/serializers.py
index 97a3e51..a81661b 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/serializers.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/serializers.py	
@@ -1,22 +1,10 @@
 from rest_framework import serializers
+from rest_framework.authtoken.models import Token
 from .models import (
-	Diet,
-	DietProhibitsIngredient,
-	Drink,
-	DrinkHasIngredient,
-	Food,
-	FoodHasIngredient,
-	Ingredient,
-	Permission,
-	Restaurant,
-	Role,
-	RoleHasPermission,
-	User,
-	UserFollowsDiet,
-	UserProhibitsIngredient,
-	UserRatesDrink,
-	UserRatesFood,
-	UserRatesRestaurant,
+	Diet, DietProhibitsIngredient, Drink, DrinkHasIngredient, Food,
+	FoodHasIngredient, Ingredient, Permission, Restaurant, Role,
+	RoleHasPermission, User, UserFollowsDiet, UserProhibitsIngredient,
+	UserRatesDrink, UserRatesFood, UserRatesRestaurant,
 )
 
 class DietSerializer(serializers.ModelSerializer):
@@ -64,6 +52,16 @@ class RestaurantSerializer(serializers.ModelSerializer):
 		model = Restaurant
 		fields = '__all__'
 
+	def create(self, validated_data):
+		user = None
+		request = self.context.get("request")
+		if request and hasattr(request, "user"):
+			user = request.user
+			user = User.objects.get(username=user)
+			validated_data['restaurant_is_approved'] = True if (user.role.role_id == 1) else False
+		restaurant = Restaurant.objects.create(**validated_data)
+		return restaurant
+
 class RoleSerializer(serializers.ModelSerializer):
 	class Meta:
 		model = Role
@@ -79,6 +77,16 @@ class UserSerializer(serializers.ModelSerializer):
 		model = User
 		fields = '__all__'
 
+class UserPublicInfoSerializer(UserSerializer):
+	class Meta:
+		model = User
+		fields = (
+			'id',
+			'role',
+			'username'
+		)
+
+
 class UserFollowsDietSerializer(serializers.ModelSerializer):
 	class Meta:
 		model = UserFollowsDiet
@@ -103,3 +111,9 @@ class UserRatesRestaurantSerializer(serializers.ModelSerializer):
 	class Meta:
 		model = UserRatesRestaurant
 		fields = '__all__'
+
+class FlavoursTokenSerializer(serializers.ModelSerializer):
+	user = UserPublicInfoSerializer(many=False, read_only=True)
+	class Meta:
+		model = Token
+		fields = ('key', 'user')
\ No newline at end of file
diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/urls.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/urls.py
index 4b87c81..79c8bef 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/urls.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/urls.py	
@@ -1,23 +1,12 @@
 from django.conf.urls import url
+from django.urls import include, path
 from rest_framework import routers
-from flavoursAPI.hyrieus.views import (DietViewSet,
-	DietProhibitsIngredientViewSet,
-	DrinkViewSet,
-	DrinkHasIngredientViewSet,
-	FoodViewSet,
-	FoodHasIngredientViewSet,
-	IngredientViewSet,
-	PermissionViewSet,
-	RestaurantViewSet,
-	RoleViewSet,
-	RoleHasPermissionViewSet,
-	UserViewSet,
-	UserFollowsDietViewSet,
-	UserProhibitsIngredientViewSet,
-	UserRatesDrinkViewSet,
-	UserRatesFoodViewSet,
-	UserRatesRestaurantViewSet,
-	Signup,
+from flavoursAPI.hyrieus.views import (DietViewSet, DietProhibitsIngredientViewSet,
+	DrinkViewSet, DrinkHasIngredientViewSet, FoodViewSet, FoodHasIngredientViewSet,
+	IngredientViewSet, PermissionViewSet, RestaurantViewSet, RoleViewSet,
+	RoleHasPermissionViewSet, UserViewSet, UserFollowsDietViewSet,
+	UserProhibitsIngredientViewSet, UserRatesDrinkViewSet, UserRatesFoodViewSet,
+	UserRatesRestaurantViewSet, UserSetBirthDay,
 )
 
 router = routers.DefaultRouter()
@@ -40,7 +29,10 @@ router.register(r'userratesfood', UserRatesFoodViewSet)
 router.register(r'userratesrestaurant', UserRatesRestaurantViewSet)
 
 urlpatterns = [
-    url(r'signup', Signup.as_view()),
+    # url(r'signup', Signup.as_view()),
+    path('setUserBirthday/<int:pk>/', UserSetBirthDay.as_view(), name='setUserBirthday'),
+    path('rest-auth/', include('rest_auth.urls')),
+    url(r'^rest-auth/registration/', include('rest_auth.registration.urls'))
 ]
 
 urlpatterns += router.urls
\ No newline at end of file
diff --git a/UI/Database API/hyrieus/flavoursAPI/hyrieus/views.py b/UI/Database API/hyrieus/flavoursAPI/hyrieus/views.py
index ecfcf54..463fe19 100644
--- a/UI/Database API/hyrieus/flavoursAPI/hyrieus/views.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/hyrieus/views.py	
@@ -1,127 +1,327 @@
 from django.shortcuts import render
+from decimal import Decimal
+from django.db.models import F, ExpressionWrapper, FloatField
+from rest_framework.views import APIView
 from rest_framework import viewsets
-from .models import (
-	Diet,
-	DietProhibitsIngredient,
-	Drink,
-	DrinkHasIngredient,
-	Food,
-	FoodHasIngredient,
-	Ingredient,
-	Permission,
-	Restaurant,
-	Role,
-	RoleHasPermission,
-	User,
-	UserFollowsDiet,
-	UserProhibitsIngredient,
-	UserRatesDrink,
-	UserRatesFood,
-	UserRatesRestaurant,
+from rest_framework.authentication import SessionAuthentication, BasicAuthentication
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.exceptions import PermissionDenied
+
+from .models import (Diet, DietProhibitsIngredient, Drink, DrinkHasIngredient,
+	Food, FoodHasIngredient, Ingredient, Permission, Restaurant, Role,
+	RoleHasPermission, User, UserFollowsDiet, UserProhibitsIngredient,
+	UserRatesDrink, UserRatesFood, UserRatesRestaurant,
 )
 from .serializers import (
-	DietSerializer,
-	DietProhibitsIngredientSerializer,
-	DrinkSerializer,
-	DrinkHasIngredientSerializer,
-	FoodSerializer,
-	FoodHasIngredientSerializer,
-	IngredientSerializer,
-	PermissionSerializer,
-	RestaurantSerializer,
-	RoleSerializer,
-	RoleHasPermissionSerializer,
-	UserSerializer,
-	UserFollowsDietSerializer,
-	UserProhibitsIngredientSerializer,
-	UserRatesDrinkSerializer,
-	UserRatesFoodSerializer,
+	DietSerializer, DietProhibitsIngredientSerializer, DrinkSerializer,
+	DrinkHasIngredientSerializer, FoodSerializer, FoodHasIngredientSerializer,
+	IngredientSerializer, PermissionSerializer, RestaurantSerializer,
+	RoleSerializer, RoleHasPermissionSerializer, UserSerializer,
+	UserFollowsDietSerializer, UserProhibitsIngredientSerializer,
+	UserRatesDrinkSerializer, UserRatesFoodSerializer,
 	UserRatesRestaurantSerializer,
 )
 
 class DietViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Diet.objects.all()
 	serializer_class = DietSerializer
 
 class DietProhibitsIngredientViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = DietProhibitsIngredient.objects.all()
 	serializer_class = DietProhibitsIngredientSerializer
 
 class DrinkViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Drink.objects.all()
 	serializer_class = DrinkSerializer
 
 class DrinkHasIngredientViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = DrinkHasIngredient.objects.all()
 	serializer_class = DrinkHasIngredientSerializer
 
 class FoodViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Food.objects.all()
 	serializer_class = FoodSerializer
 
 class FoodHasIngredientViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = FoodHasIngredient.objects.all()
 	serializer_class = FoodHasIngredientSerializer
 
 class IngredientViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Ingredient.objects.all()
 	serializer_class = IngredientSerializer
 
 class PermissionViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Permission.objects.all()
 	serializer_class = PermissionSerializer
 
 class RestaurantViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get_queryset(self):
+		user = self.request.user
+		filterType = self.request.query_params.get('filter_restaurant_type', None)
+		filterDistanceRadius = self.request.query_params.get('filter_restaurant_radius', None)
+		filterDistanceLongitude = self.request.query_params.get('filter_restaurant_longitude', None)
+		filterDistanceLatitude = self.request.query_params.get('filter_restaurant_latitude', None)
+		filterCalories = self.request.query_params.get('filter_restaurant_calories', None)
+
+		restaurants = Restaurant.objects.all()
+		if filterDistanceRadius is not None:
+			filterDistanceRadius = float(filterDistanceRadius)
+			filterDistanceLongitude = float(filterDistanceLongitude)
+			filterDistanceLatitude = float(filterDistanceLatitude)
+
+			import math
+			restaurants = restaurants.filter(
+				restaurant_latitude__range=(filterDistanceLatitude-(filterDistanceRadius/111.045),
+					filterDistanceLatitude+(filterDistanceRadius/111.045)))
+			restaurants = restaurants.filter(
+				restaurant_longitude__range=(filterDistanceLongitude-(filterDistanceRadius/(111.045*math.cos(math.radians(filterDistanceLatitude)))),
+					filterDistanceLongitude+(filterDistanceRadius/(111.045*math.cos(math.radians(filterDistanceLatitude))))))
+
+			# ======================================================================================
+			# WHY THE FUCK DOES BELOW CODE FAIL?       :-(
+			# ======================================================================================
+
+			# restaurants = restaurants.annotate(distance =
+			# 	111.045 * math.degrees(math.acos(
+			# 		math.cos(math.radians(filterDistanceLatitude))
+			# 		* math.cos(math.radians(F('restaurant_latitude')))
+			# 		* math.cos(math.radians(filterDistanceLongitude - float(F('restaurant_longitude'))))
+			# 		+ math.sin(math.radians(filterDistanceLatitude))
+			# 		* math.sin(math.radians(F('restaurant_latitude')))
+			# 	)))
+			# restaurants = restaurants.filter(distance__lt=filterDistanceRadius)
+			# restaurants = restaurants.order_by('distance')
+			restaurants = restaurants.distinct();
+
+		if filterType is not None:
+				restaurants = restaurants.filter(restaurant_category=filterType)
+
+		if not user.role.role_id == 1:
+			restaurants = restaurants.filter(restaurant_is_approved=True)
+
+		return restaurants
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Restaurant.objects.all()
 	serializer_class = RestaurantSerializer
 
 class RoleViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+
 	queryset = Role.objects.all()
 	serializer_class = RoleSerializer
 
 class RoleHasPermissionViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = RoleHasPermission.objects.all()
 	serializer_class = RoleHasPermissionSerializer
 
 class UserViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = User.objects.all()
 	serializer_class = UserSerializer
 
 class UserFollowsDietViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = UserFollowsDiet.objects.all()
 	serializer_class = UserFollowsDietSerializer
 
 class UserProhibitsIngredientViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = UserProhibitsIngredient.objects.all()
 	serializer_class = UserProhibitsIngredientSerializer
 
 class UserRatesDrinkViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = UserRatesDrink.objects.all()
 	serializer_class = UserRatesDrinkSerializer
 
 class UserRatesFoodViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = UserRatesFood.objects.all()
 	serializer_class = UserRatesFoodSerializer
 
 class UserRatesRestaurantViewSet(viewsets.ModelViewSet):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
+
+	def get(self, request, format=None):
+		content = {
+			'user': unicode(request.user),
+			'auth': unicode(request.auth),
+		}
+		return Response(content)
+	
 	queryset = UserRatesRestaurant.objects.all()
 	serializer_class = UserRatesRestaurantSerializer
 
-from rest_framework.views import APIView, Response
+class UserSetBirthDay(APIView):
+	authentication_classes = (SessionAuthentication, BasicAuthentication)
+	permission_classes = (IsAuthenticated,)
 
-class Signup(APIView):
-	def get(self, request, format=None):
-		serializer = User.objects.all()
-		return Response(serializer.data, status=status.HTTP_201_CREATED)
+	def put(self, request, pk, format=None):
+		try:
+			user = User.objects.get(pk=pk)
+		except Snippet.DoesNotExist:
+			raise Http404
 
-	def post(self, request, format=None):
-		serializer = UserSerializer(data=request.data)
+		if not request.user == user:
+			raise PermissionDenied({"message":"You don't have permission to access"})
+
+		serializer = UserSerializer(user, data=request.data, partial=True)
 		if serializer.is_valid():
 			serializer.save()
-			return Response(serializer.data, status=status.HTTP_201_CREATED)
-
+			return Response(serializer.data)
 		return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-	@classmethod
-	def get_extra_actions(cls):
-		return []
diff --git a/UI/Database API/hyrieus/flavoursAPI/settings.py b/UI/Database API/hyrieus/flavoursAPI/settings.py
index 2971066..2e08c31 100644
--- a/UI/Database API/hyrieus/flavoursAPI/settings.py	
+++ b/UI/Database API/hyrieus/flavoursAPI/settings.py	
@@ -38,9 +38,17 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'flavoursAPI.hyrieus',
+    'rest_auth',
     'rest_framework',
+    'rest_framework.authtoken',
+    'rest_auth.registration',
+    'allauth.account',
+    'allauth',
+    'django.contrib.sites',
 ]
 
+SITE_ID = 1
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -82,7 +90,6 @@ DATABASES = {
         'USER': 'flavoursUser',
         'PASSWORD': 'flavours13',
         'HOST': '83.212.109.171',
-        # 'HOST': '127.0.0.1',
         'PORT': '',
     },
 }
@@ -126,4 +133,27 @@ USE_TZ = True
 
 STATIC_URL = '/static/'
 
-SILENCED_SYSTEM_CHECKS = ['mysql.E001']
\ No newline at end of file
+SILENCED_SYSTEM_CHECKS = ['mysql.E001']
+
+AUTH_USER_MODEL = 'hyrieus.User'
+
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.BasicAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+    )
+}
+
+REST_AUTH_SERIALIZERS = {
+    'TOKEN_SERIALIZER': 'flavoursAPI.hyrieus.serializers.FlavoursTokenSerializer',
+}
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'allauth.account.auth_backends.AuthenticationBackend',
+)
+
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+ACCOUNT_EMAIL_VERIFICATION = 'none'
+ACCOUNT_AUTHENTICATION_METHOD = 'username_email'