From 859d26d07364d9fbbd233f44601d14580894cac7 Mon Sep 17 00:00:00 2001
From: abutalib-kiwi <abu.talib@kiwitech.com>
Date: Fri, 8 Sep 2023 19:07:06 +0530
Subject: [PATCH 1/2] test cases for web admin auth

---
 celerybeat-schedule            | Bin 20480 -> 20480 bytes
 web_admin/tests/test_auth.py   |  99 +++++++++++++++++++++++++++++++++
 web_admin/tests/test_set_up.py |  22 ++++++--
 3 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 web_admin/tests/test_auth.py

diff --git a/celerybeat-schedule b/celerybeat-schedule
index be892edea3778b38a0afe5c729adddc781b59706..7638e5252440a76df3a3df6b009f2805ccced487 100644
GIT binary patch
delta 74
zcmZozz}T>Wal>2(b`B0XMov@S$qUQ_8QCWr*l13ccT5)mi+0sa$q;Ls5;Vn|ck(pH
VVgU{=1_s9DYM9`H&5};fc>xRT7ApV%

delta 74
zcmZozz}T>Wal>2(c2*ufMZVII$qUQ_8QCTq*l13ccT5)mi_SeaB}1%jO3)N<p2^c3
Siy?xGdtid|HcL7^=LG;tI~U6U

diff --git a/web_admin/tests/test_auth.py b/web_admin/tests/test_auth.py
new file mode 100644
index 0000000..6033af1
--- /dev/null
+++ b/web_admin/tests/test_auth.py
@@ -0,0 +1,99 @@
+"""
+web admin test auth file
+"""
+from datetime import datetime
+from django.utils import timezone
+from django.urls import reverse
+from django.contrib.auth import get_user_model
+
+from rest_framework.test import APITestCase, APIClient
+from rest_framework import status
+
+from account.models import UserEmailOtp
+from base.constants import USER_TYPE
+from guardian.tasks import generate_otp
+from web_admin.tests.test_set_up import BaseSetUp
+
+User = get_user_model()
+
+
+class AdminOTPTestCase(BaseSetUp):
+    """
+
+    """
+
+    def setUp(self):
+        """
+        inherit data here
+        :return:
+        """
+        super(AdminOTPTestCase, self).setUp()
+
+    def test_admin_otp_for_valid_email(self):
+        """
+
+        :return:
+        """
+        url = reverse('web_admin:admin-otp')
+        data = {
+            'email': 'admin@example.com'
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(UserEmailOtp.objects.count(), 1)
+
+    def test_admin_otp_for_invalid_email(self):
+        """
+
+        :return:
+        """
+        url = reverse('web_admin:admin-otp')
+        data = {
+            'email': 'notadmin@example.com'
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+
+class AdminVerifyOTPTestCase(BaseSetUp):
+    """
+
+    """
+
+    def setUp(self):
+        """
+        inherit data here
+        :return:
+        """
+        super(AdminVerifyOTPTestCase, self).setUp()
+        self.verification_code = generate_otp()
+        expiry = timezone.now() + timezone.timedelta(days=1)
+        self.user_email_otp = UserEmailOtp.objects.create(email='admin@example.com',
+                                                          otp=self.verification_code,
+                                                          expired_at=expiry,
+                                                          user_type=dict(USER_TYPE).get('3'),
+                                                          )
+
+    def test_admin_verify_otp_with_valid_otp(self):
+        url = reverse('web_admin:admin-verify-otp')
+        data = {
+            'email': 'admin@example.com',
+            "otp": self.verification_code
+        }
+
+        response = self.client.post(url, data)
+        self.user_email_otp.refresh_from_db()
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(self.user_email_otp.is_verified, True)
+
+    def test_admin_verify_otp_with_invalid_otp(self):
+        url = reverse('web_admin:admin-verify-otp')
+        data = {
+            'email': 'admin@example.com',
+            "otp": generate_otp()
+        }
+
+        response = self.client.post(url, data)
+        self.user_email_otp.refresh_from_db()
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(self.user_email_otp.is_verified, False)
diff --git a/web_admin/tests/test_set_up.py b/web_admin/tests/test_set_up.py
index aa6a664..f5cf1f6 100644
--- a/web_admin/tests/test_set_up.py
+++ b/web_admin/tests/test_set_up.py
@@ -103,7 +103,22 @@ base64_image = ("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAoHCBIS
                 "GYdEC/arYms/HtkfAS7huhuDXXJmPEkn5whN4xrZ0NkYdPRpIPdLS0kG5QPdCEskKlYcIWHCEJUO3KFuUIQD3QhCB//Z")
 
 
-class ArticleTestSetUp(APITestCase):
+class BaseSetUp(APITestCase):
+    """
+
+    """
+    def setUp(self) -> None:
+        """
+
+        :return:
+        """
+        self.client = APIClient()
+        self.user = User.objects.create_user(username='user@example.com', password='user@1234')
+        self.admin_user = User.objects.create_user(username='admin@example.com', email='admin@example.com',
+                                                   password='admin@1234', is_staff=True, is_superuser=True)
+
+
+class ArticleTestSetUp(BaseSetUp):
     """
     test cases data set up for article create, update
     """
@@ -112,10 +127,7 @@ class ArticleTestSetUp(APITestCase):
         set up data for test
         :return:
         """
-        self.client = APIClient()
-        self.user = User.objects.create_user(username='user@example.com', password='user@1234')
-        self.admin_user = User.objects.create_user(username='admin@example.com', email='admin@example.com',
-                                                   password='admin@1234', is_staff=True, is_superuser=True)
+        super(ArticleTestSetUp, self).setUp()
 
         self.article = Article.objects.create(title="Existing Article", description="Existing Description",
                                               is_published=True)

From bf1004696ae09d098908033703f85129793a1cba Mon Sep 17 00:00:00 2001
From: abutalib-kiwi <abu.talib@kiwitech.com>
Date: Mon, 11 Sep 2023 14:39:01 +0530
Subject: [PATCH 2/2] added test cases for auth

---
 .coverage                       |  Bin 86016 -> 86016 bytes
 account/tests.py                |   17 +-
 coverage-reports/coverage.xml   | 1007 +++++++++++++++++--------------
 web_admin/tests/test_article.py |   16 +-
 web_admin/tests/test_auth.py    |   93 ++-
 web_admin/tests/test_set_up.py  |  230 +++----
 6 files changed, 730 insertions(+), 633 deletions(-)

diff --git a/.coverage b/.coverage
index 54b2bef06e7247a33767c8d51e38ad691ba51e31..c5c9742d688286628453e0f8b84e1ae94c05c24b 100644
GIT binary patch
delta 5795
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
bYRJ*yD+M`#pVminAxr6~Y42c{aOnR7?cJ`n

delta 5361
zcmZ8l2XGbF)xKxn*0;OwsXPfG2{npAr~m>a0eX_C5~vrNP(!FZ^+pq*r^UEXT;!c_
zamSO)KR^67hCu9iVuBLe@g$BdFu&tM2LrbGV=#&#*jW0{T_G_O&FJlS&pqedbI(2H
z?)K~#diD#4f6N`Xo)F@jhd(~C9RAuI2k@5!I3IQTI1U{3^?AVo{&X-K+~%zxCkPQZ
z=QQ_!=BCfuA;5g)>kuUiNsdjt(P3UXoo}8k9}la3Tfs-zo)X_RrJmW|ZI1PhCP%fS
z)KTonb}VwFIA%G<>NoZ4`dR%`{X_k@epEl8zoI{*@6fySR=q}FqZjI#x?4}sr|98&
zfUfF9yQ6)lUDW=e{ayRB_O|wh_G|5V?HTPcZL`*_t<zR(dD>!ao|d3Z*1|NGX4i;%
zNBvH{sGhD-|Eiu)f2ST)_p5u=J?eIKliIAVQ&*`u>OysnI#mr<o%VzFr|hNn6#FE*
z(+<jq$_b@iS*rvos{E<^7x^tYL-vye>7I05`b_#j`n}XE?U3rExzbe0U;J6@7vDY7
z`+^YaW9U4mM3AQj!+Xez<7%YLO))ei6_7pVOOH=nq9TqayD#^rwhzYl5SgSA(gOj8
z-J<V`y8h8j6<yr-e;nyM8>1Tv(u2v)%gN6>dTg!HhK%DP@}#LhG07_-o<W|7Dt`V&
zUDNg@zBv6tV+9fWdcbaoIOigdNBR5PCKv(^GRR|>lf8o<^>IPCAQ1^kB7NlHA8$8!
zOJ>K~*~dM)VZ%W%c{D0vBi#K<iqqh597eW3mz-)N(+Clr#x$@<#^r(j7@}1Whhh+<
z_>rEq1vb^ogA(NZtupD~iD@&taZulFUV9?m+qg{t#aOxR&Y3RK^TCinwgMUvPkMfd
zB0cfUo*w+Kh?mLzJLx^7B94%Y<!OZMQ<2;^hLn+rJ|`hTNY~adK_tqg#uw$1Q4+_f
zuwo@j#Q_1wR$Mu3Ygi+B{ouiagEqV079<32S(~t&_#}2AZtXG;JUK498=x;vP9x>G
z3b`n;-!BApGcp8iensy)cu>sP#0>Y@WZrsm!I+Iq?Z!b{DEcss$jdgcxxfwP(w&Q(
z;(DBPtbZ=46QAv!=H8t%=XW3s?wFtRtLHX80RineifJEQQ4ECJF^Qb>Cwv5%7SP7X
zZMW}kOnLfB()UUD<M=T7dRQxx-L0m!D_CqnSk_|3>>4|Zr1dZ(AuS>!0-t<HGtMP7
zU;cYJhsp?#v>-eV+=)iSswQUN;wE$RuCk&=WDIL`6C&Rk8v5C5Z@_V214jmb^4IGT
zht}`=+t9s!@1P`maOmgB7y!ABp}Kw7Y)UO6S8c|?tCCW~V9lobL8qCuJ1jw7%b3<O
z_DY5-GX_%R3Wh2et(>9qi~)yIhR9WxF>qWmU)>$%RafIUXf^5?x&ZPj#<mIt>?;uk
zuH5&@&<UHof>Bp6h07UQ&J-3iRLoEjLq!Y~GE|62DL~{ZV2eok2z~N12IM?8o5%Qa
z8Omk)a#*DL<>1!jY=*MgbQVKdOwBSxu4QNh*q0&<T*}P6DQ7Z<OvakQPzFOw7+S*6
zVultow1}Zah?IqhTnm{Zc>yCXVAJyvdHv=yn9hjl45cxYhK{nQA_`2+7`X7xT-nX2
zZl);(kt+o?g~{_6aUK(z%g|hg<}fsep=5@V_kAKMNr+rYDB@HS8BE-F4V^lh&Cm8C
zt27It&n$G&Oh%iTF%TvvFqFXjGJ~NROyhKhrlUd1G(@gxNiPqD=<x_c<CA6$wG3Xk
z-=f5^nK(8h$1?U<+=(2+Pz+Nsm7%GKlxW5no#7q0V3VgX>J%0nlNog~iie4hAap#!
zO`e3$f=RcdF{U5<_1(PS?RLM~FAd$hx78hfzrTE|`&Fkqcp`Gno_IU{^BXt3Z{9ug
z&*L|@9KZi_`|&j`AWmS~CUD|-_8iZNQS2GTiDuT*@wys<qo9z>*Zc2oa~|FGbQjp3
z($u5Uvmt;j@LT&)^`$!rPTL_enN$$xA!oVMm)A|7lc6!T3hvJ~U!_fnB){X|;yv;w
za<?2WeJriu3ZP5;2Ce`vJ}UYNFA9>m^5h!mG~2#h;L}vy(NS4j-4WNixph5nG?}M9
z&o{lFMZh|<`yX{sfi1Qfs?D_XZu8=)Ky&WrA+Qz&-Sn^yva-I@)5t_y9+EbAsy8xH
zlj(b5v9`Y5nr}pZmG}0Rm{&e6fv3#W(^;^c9?1bWz2yUf*?(GxE#_;dOeizYo!%f6
zw(>@mWl8C6nQjdNf1zX@Z!BXZ`cDmHxwEpP0T)?`<`vU@fiPAm9<iPdj)4fsH$VQo
z5>_+2&~WAGhA$3s5N$@D=`#QKT(NoUOrSW~0Dik*zE(DeZ6*+REz=E7m?%uy${T3T
z2>txo$wI7$H;NyUO3np9oY{7+3Z|K_ePcNz(42BU5T>K2S|G+ee7*wW(F3>gwZ$Zo
z)Dm*s`HYjdw<=#N>mWw$S1VN;zlYSy@ALDtQpM#sX1if~*_OxM;&yQ1a7<o>Eq<#s
zMm!+S6HW>>{5gk@{u_Oo_Ihu60AI`-v3Sc_Kv%oL0h`bZMdq}xgT>|8aJM_H`%nD$
z(_sY~S1)8*uDkSY?p_6aVV>FcZ3ASO=e{k6rAJe~n+MiGpp)$8OFzk?pCR$vea$0R
zb4|z9nL?ViaW>j}H4qk{aDh2=b*!+skvB>#uEuL)g&9q}QEK86=9kxkh4~{3va|Aq
zM6{xidDm6HzS+~#UhZkah{MyH)5aUsmel#PvKjtOAY@ytJHHtNd1mDB$(emOWLQ5s
z`u?H}?PlfoUMM#&eZLzj&8C~rK><Cr6fcGsPr2yRS)dA`!}grcqfdvySXhHmRYbEw
zAWA6GUMFLE)BQ&RV<bX16T-<ydU?*gaVgilaCx^-Wd$L-O7>j|kxO+9;aJjPO1E+*
z#BuL&X>bNA$Su+_QVT|(TVi>_;^$1RiJ`+a$Iw&<G>e<3B6*`lF1<a8tBR%<0w9Hj
zUV!O5<0~0t3Qt%(qTEO*a-PZbO$QWO@w)O6R4|M7CPF6Fmx3ymOhUq3ddVNpCGKD9
z(X#{5TE;Qr-0Pg>IOV9(@9B^0cD$TURQuE-`$>DX@`JKR87m)>W2N6nLE=F%P54UK
zD5(5iKH7G|R?hv%J<hpcKZKKGy}dP@Cy%Y3Lh}@~5l@Bl=F(;ny&X3JV!8I5Umbyb
z`lf_#%|=VAP2X>GaLd+Fa!pzErU*@3-7@pUElY)q9-07SxU!|@tN(hSbJ}+r=gAyh
zB!;Wcpy@WK7dw`q!Uj~BP4mV>6j#5P(eqj8iIt0RZV9cN06A3Az$va<h=lB6LTDuT
zadiu<HLW)T3|p~rJ~EVA=3#u=3?-c&9*6s4410M<v>9R=^%dZ8&YQ|M=;b`_QKMY6
zUx6U5EoHBcyFC{L5nR>0;j?3YVM)cc&qY_XbDlY)QUUA?{r)514M?Wma4@*~Bx^f#
z7Y}2(s>Fxdtc>C6W<T^<=wuipZk~l3*l4-qEWl*0YbJFBKiB~69s^D~MTKBUKoi@<
zh8f6Q!kEp5Yr&jnIy1^6uAPSDOe?(Z{ov%v<LP-F%DK8YT&u2th4)0#O`N+NcO5+r
zMSnq`itjdV^#irae%rpo?yq>|A$hNCmtK&Z;`3s(@Sd=Q|CBGc-M77AE4TS@f8ZLq
zaqvEL!g%rt>F(`~p@&nk(qIB}g`G6tcR1Q*^S@3yxZDm}nF@KB%YAnio0!$yiZ*&E
z2~zOw&LLN|G<S4XHh0qfzOaDx2w!M1o9`~Nk2IXZW~Q$Qni!Sd@C5}LO`m&KI$>KH
z?mF2GIGaLy{J>YJ$IUNcsgiH9plkD>t5VFgpHzC-A9T9ZAI1rF$kSl)&|6s$#&y+N
zUVg|`oedMY>Kb}8(Xw+aeba@mpC1Uz%^yD-D|W6!1x@CqE4gO(XOWU2S7Aa2;5d&S
z2!NSf^IDoZ4qBm-Mc+=bwgTA;89Tin1}>qy9NAgzW+xhLGknYFpIp$(wUp9`Aglo=
zu7rw>YfuI&Ey}RU#<i5NxfZcvHPRPZOUHkwa~oID))3gpRjp*9RV5k13e=5_;Yyx~
zje%=gPRm14CH4%ishHs+)<uJbB2?32sb|$vTwnNLoJXZGfLrn@Ks^(g9(pYZ=82v8
z$Y5=m{(=l^>=;I2c<Gn^Diw*B#A@N5@R$Jni&&Ffj@KOF`Y}CUyRJ2=|5jg8v+ein
z|HJ3lOL<}sRQ{-VlmPi%yiU)yeQtZqHj(>?YvO$1EvN!Na)Pw>rU!D;)g!%oY;;)+
zWDDD}cq0T`P&z#y1Cp?{nm4j>m_tJ%!Czd6uZr6xYkV>sreWsAM?we8WgX1QJ4m9=
zDA*#*Z0C(y*2(DkC<w<G9gM;dUV_~vb+kYT={3BOi~T>7_KnBOM$JmzNWfu+??|Mw
zD^FV?Z%kp-w`=1d9q1u9$beaU!EIIyN_uB?M<-(ox7e87_gVMeK##;jF7-}=e#pTK
zikp>N7iD=a%zDs$b0{kVFx&e6F+4A8-~)@WUlv&PNp#~|?{=HD-xDIl38@dZl|#!W
zL4=s_a5{DZPUntlW<@!98O#45=_ql&?ksc4j&~d$N09!JzD@VX?;K6q81--Xv0|M4
zPxgA{7v<MVmi)E6U3N-G@m9J;vaK?7Gk#z=`^+h)T~aH4ZNQFT^(LB|3>s}pMCYok
z=CHK0)4atX(ytQ11$LHCwSs~Iu~v7pSFZ1@Lr1MJWL6SZfyAoiuo&u^D2Ns->wEOw
zWN_jQGJaqQ)97c*F?g&f!@MnXuq@b^VXUao_ve6*z@g|^v-h-HWmiac9EAq3TC$8b
z%>}!FZ>)HRNA4{dDI&RER;Vn6qt&Obn}*K=4{XDdvyeU;1G2bmD+-2S(M_|Wk;~m;
ziH+WGxtuOm>F6I)(5B6-F0pH={-9D7ZDKpZw3^RubWRK!rWoT#5jI!`F}*BWa#(_m
zx0Mp-LGfK@vDEA&Qjp_yM~Oq#|68A>y`wEuud1f-do@8=CcF3<wo?0-_AT}>u|axI
zd0%w$KkzTuPU34qg#5AGeWcfEqstdSySS&4Hx_Wr{Us9FU5nAqjUJv(dlrHp?4m~&
zK?ZZPqz@ku*|`eyz>><OKPQ1*B2VJIaMeT6@f>-Ai7ltc7DMXD!TXDk<?%)&M^DX#
zg|u}Jh!WXR!W)Sk^Sn<-b-Sms(bHAk&d!HCN`03=v1k-wc3BJ~M?-qp)inc+8GZ}#
zj$G2MbudzN+A$9UtlN4!!8YIn4dy3bxLHR~s52ARK*#9Vd}BzZf6Ro{@Q7Ldm7A$x
zmnz!06zp%~?J|XfI_k{Ef>CQ_7QP-J&%^c+3Lci7YoY$_${ff9Xf`WOvTv0RWhC(<
J&6mrT|36O<Y4HF6

diff --git a/account/tests.py b/account/tests.py
index a58f7a3..9b8af76 100644
--- a/account/tests.py
+++ b/account/tests.py
@@ -20,11 +20,10 @@ class UserLoginTestCase(TestCase):
         :return:
         """
         self.client = APIClient()
-        self.user = User.objects.create_superuser(
-            username='admin@example.com',
-            email='admin@example.com',
-            password='admin@1234'
-        )
+        self.user_email = 'user@example.com'
+        self.user = User.objects.create_superuser(username=self.user_email,  email=self.user_email)
+        self.user.set_password('user@1234')
+        self.user.save()
 
     def test_admin_login_success(self):
         """
@@ -33,8 +32,8 @@ class UserLoginTestCase(TestCase):
         """
         url = reverse('account:admin-login')
         data = {
-            'email': 'admin@example.com',
-            'password': 'admin@1234',
+            'email': self.user_email,
+            'password': 'user@1234',
         }
         response = self.client.post(url, data, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -49,8 +48,8 @@ class UserLoginTestCase(TestCase):
         """
         url = reverse('account:admin-login')
         data = {
-            'email': 'admin@example.com',
-            'password': 'admin@1235',
+            'email': self.user_email,
+            'password': 'user@1235',
         }
         response = self.client.post(url, data, format='json')
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
diff --git a/coverage-reports/coverage.xml b/coverage-reports/coverage.xml
index dbf7607..d63768a 100644
--- a/coverage-reports/coverage.xml
+++ b/coverage-reports/coverage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="7.3.1" timestamp="1694094623575" lines-valid="4686" lines-covered="2781" line-rate="0.5935" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.3.1" timestamp="1694423255106" lines-valid="4777" lines-covered="2925" line-rate="0.6123" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.3.1 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
@@ -29,7 +29,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="account" line-rate="0.4819" branch-rate="0" complexity="0">
+		<package name="account" line-rate="0.486" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="account/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -509,24 +509,27 @@
 						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
 						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="16" hits="1"/>
+						<line number="17" hits="1"/>
 						<line number="22" hits="1"/>
 						<line number="23" hits="1"/>
 						<line number="24" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="26" hits="1"/>
 						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
+						<line number="33" hits="1"/>
 						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
 						<line number="40" hits="1"/>
 						<line number="41" hits="1"/>
 						<line number="42" hits="1"/>
-						<line number="43" hits="1"/>
+						<line number="44" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="55" hits="1"/>
+						<line number="56" hits="1"/>
+						<line number="57" hits="1"/>
 					</lines>
 				</class>
 				<class name="urls.py" filename="account/urls.py" complexity="0" line-rate="1" branch-rate="0">
@@ -566,7 +569,7 @@
 						<line number="61" hits="1"/>
 					</lines>
 				</class>
-				<class name="utils.py" filename="account/utils.py" complexity="0" line-rate="0.2956" branch-rate="0">
+				<class name="utils.py" filename="account/utils.py" complexity="0" line-rate="0.3145" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="2" hits="1"/>
@@ -673,11 +676,11 @@
 						<line number="192" hits="1"/>
 						<line number="193" hits="1"/>
 						<line number="197" hits="1"/>
-						<line number="204" hits="0"/>
+						<line number="204" hits="1"/>
 						<line number="206" hits="0"/>
-						<line number="207" hits="0"/>
+						<line number="207" hits="1"/>
 						<line number="208" hits="0"/>
-						<line number="211" hits="0"/>
+						<line number="211" hits="1"/>
 						<line number="214" hits="1"/>
 						<line number="218" hits="0"/>
 						<line number="220" hits="0"/>
@@ -1421,7 +1424,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="guardian" line-rate="0.5308" branch-rate="0" complexity="0">
+		<package name="guardian" line-rate="0.5335" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="guardian/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -1867,13 +1870,13 @@
 						<line number="529" hits="0"/>
 					</lines>
 				</class>
-				<class name="tasks.py" filename="guardian/tasks.py" complexity="0" line-rate="0.5" branch-rate="0">
+				<class name="tasks.py" filename="guardian/tasks.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="4" hits="1"/>
 						<line number="7" hits="1"/>
-						<line number="11" hits="0"/>
-						<line number="12" hits="0"/>
+						<line number="11" hits="1"/>
+						<line number="12" hits="1"/>
 					</lines>
 				</class>
 				<class name="tests.py" filename="guardian/tests.py" complexity="0" line-rate="1" branch-rate="0">
@@ -2108,66 +2111,67 @@
 						<line number="214" hits="0"/>
 						<line number="215" hits="0"/>
 						<line number="216" hits="0"/>
-						<line number="218" hits="0"/>
-						<line number="221" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="225" hits="0"/>
+						<line number="217" hits="0"/>
+						<line number="220" hits="0"/>
+						<line number="222" hits="0"/>
+						<line number="224" hits="0"/>
+						<line number="226" hits="0"/>
 						<line number="227" hits="0"/>
 						<line number="228" hits="0"/>
 						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="233" hits="1"/>
+						<line number="232" hits="1"/>
+						<line number="234" hits="1"/>
 						<line number="235" hits="1"/>
 						<line number="236" hits="1"/>
 						<line number="237" hits="1"/>
-						<line number="238" hits="1"/>
-						<line number="240" hits="1"/>
-						<line number="242" hits="0"/>
-						<line number="244" hits="0"/>
-						<line number="246" hits="0"/>
-						<line number="248" hits="1"/>
+						<line number="239" hits="1"/>
+						<line number="241" hits="0"/>
+						<line number="243" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="247" hits="1"/>
+						<line number="249" hits="0"/>
 						<line number="250" hits="0"/>
 						<line number="251" hits="0"/>
-						<line number="252" hits="0"/>
-						<line number="254" hits="0"/>
+						<line number="253" hits="0"/>
+						<line number="255" hits="0"/>
 						<line number="256" hits="0"/>
 						<line number="257" hits="0"/>
 						<line number="258" hits="0"/>
-						<line number="259" hits="0"/>
-						<line number="262" hits="1"/>
+						<line number="261" hits="1"/>
+						<line number="264" hits="1"/>
 						<line number="265" hits="1"/>
 						<line number="266" hits="1"/>
-						<line number="267" hits="1"/>
-						<line number="269" hits="1"/>
+						<line number="268" hits="1"/>
+						<line number="270" hits="0"/>
 						<line number="271" hits="0"/>
 						<line number="272" hits="0"/>
-						<line number="273" hits="0"/>
-						<line number="275" hits="1"/>
-						<line number="276" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="286" hits="1"/>
+						<line number="274" hits="1"/>
+						<line number="275" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="285" hits="1"/>
+						<line number="287" hits="0"/>
 						<line number="288" hits="0"/>
 						<line number="289" hits="0"/>
 						<line number="290" hits="0"/>
 						<line number="291" hits="0"/>
 						<line number="292" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="296" hits="1"/>
+						<line number="295" hits="1"/>
+						<line number="297" hits="1"/>
 						<line number="298" hits="1"/>
 						<line number="299" hits="1"/>
-						<line number="300" hits="1"/>
-						<line number="302" hits="1"/>
+						<line number="301" hits="1"/>
+						<line number="306" hits="0"/>
 						<line number="307" hits="0"/>
-						<line number="308" hits="0"/>
+						<line number="309" hits="0"/>
 						<line number="310" hits="0"/>
 						<line number="311" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="314" hits="0"/>
-						<line number="316" hits="0"/>
-						<line number="320" hits="0"/>
+						<line number="313" hits="0"/>
+						<line number="315" hits="0"/>
+						<line number="319" hits="0"/>
+						<line number="321" hits="0"/>
 						<line number="322" hits="0"/>
-						<line number="323" hits="0"/>
-						<line number="325" hits="0"/>
+						<line number="324" hits="0"/>
+						<line number="326" hits="0"/>
 						<line number="327" hits="0"/>
 						<line number="328" hits="0"/>
 						<line number="329" hits="0"/>
@@ -2179,43 +2183,42 @@
 						<line number="335" hits="0"/>
 						<line number="336" hits="0"/>
 						<line number="337" hits="0"/>
-						<line number="338" hits="0"/>
-						<line number="341" hits="1"/>
+						<line number="340" hits="1"/>
+						<line number="342" hits="1"/>
 						<line number="343" hits="1"/>
 						<line number="344" hits="1"/>
 						<line number="345" hits="1"/>
-						<line number="346" hits="1"/>
+						<line number="354" hits="0"/>
 						<line number="355" hits="0"/>
-						<line number="356" hits="0"/>
-						<line number="358" hits="0"/>
+						<line number="357" hits="0"/>
+						<line number="360" hits="0"/>
 						<line number="361" hits="0"/>
 						<line number="362" hits="0"/>
 						<line number="363" hits="0"/>
-						<line number="364" hits="0"/>
-						<line number="366" hits="0"/>
+						<line number="365" hits="0"/>
+						<line number="370" hits="0"/>
 						<line number="371" hits="0"/>
-						<line number="372" hits="0"/>
+						<line number="374" hits="0"/>
 						<line number="375" hits="0"/>
 						<line number="376" hits="0"/>
-						<line number="377" hits="0"/>
+						<line number="379" hits="0"/>
 						<line number="380" hits="0"/>
-						<line number="381" hits="0"/>
+						<line number="382" hits="0"/>
 						<line number="383" hits="0"/>
 						<line number="384" hits="0"/>
-						<line number="385" hits="0"/>
-						<line number="387" hits="1"/>
+						<line number="386" hits="1"/>
+						<line number="389" hits="1"/>
 						<line number="390" hits="1"/>
 						<line number="391" hits="1"/>
-						<line number="392" hits="1"/>
-						<line number="394" hits="1"/>
+						<line number="393" hits="1"/>
+						<line number="396" hits="0"/>
 						<line number="397" hits="0"/>
-						<line number="398" hits="0"/>
-						<line number="400" hits="0"/>
+						<line number="399" hits="0"/>
+						<line number="401" hits="0"/>
 						<line number="402" hits="0"/>
 						<line number="403" hits="0"/>
 						<line number="404" hits="0"/>
 						<line number="405" hits="0"/>
-						<line number="406" hits="0"/>
 					</lines>
 				</class>
 			</classes>
@@ -2416,13 +2419,22 @@
 						<line number="12" hits="1"/>
 					</lines>
 				</class>
+				<class name="0022_alter_juniortask_task_description.py" filename="guardian/migrations/0022_alter_juniortask_task_description.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="3" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="12" hits="1"/>
+					</lines>
+				</class>
 				<class name="__init__.py" filename="guardian/migrations/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines/>
 				</class>
 			</classes>
 		</package>
-		<package name="junior" line-rate="0.4728" branch-rate="0" complexity="0">
+		<package name="junior" line-rate="0.4736" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="junior/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -3006,6 +3018,7 @@
 						<line number="53" hits="1"/>
 						<line number="55" hits="1"/>
 						<line number="57" hits="1"/>
+						<line number="59" hits="1"/>
 					</lines>
 				</class>
 				<class name="utils.py" filename="junior/utils.py" complexity="0" line-rate="0.4688" branch-rate="0">
@@ -3045,7 +3058,7 @@
 						<line number="82" hits="0"/>
 					</lines>
 				</class>
-				<class name="views.py" filename="junior/views.py" complexity="0" line-rate="0.3169" branch-rate="0">
+				<class name="views.py" filename="junior/views.py" complexity="0" line-rate="0.3206" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="2" hits="1"/>
@@ -3139,401 +3152,411 @@
 						<line number="163" hits="0"/>
 						<line number="164" hits="0"/>
 						<line number="167" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="170" hits="1"/>
 						<line number="171" hits="1"/>
-						<line number="173" hits="1"/>
-						<line number="182" hits="0"/>
+						<line number="172" hits="1"/>
+						<line number="174" hits="1"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="178" hits="1"/>
 						<line number="183" hits="0"/>
-						<line number="186" hits="0"/>
+						<line number="184" hits="0"/>
 						<line number="187" hits="0"/>
-						<line number="189" hits="0"/>
-						<line number="190" hits="0"/>
-						<line number="192" hits="0"/>
-						<line number="194" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="198" hits="0"/>
-						<line number="199" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="203" hits="0"/>
-						<line number="204" hits="0"/>
+						<line number="190" hits="1"/>
+						<line number="192" hits="1"/>
+						<line number="193" hits="1"/>
+						<line number="194" hits="1"/>
+						<line number="196" hits="1"/>
+						<line number="205" hits="0"/>
 						<line number="206" hits="0"/>
 						<line number="207" hits="0"/>
+						<line number="208" hits="0"/>
 						<line number="209" hits="0"/>
 						<line number="210" hits="0"/>
 						<line number="211" hits="0"/>
 						<line number="212" hits="0"/>
 						<line number="213" hits="0"/>
-						<line number="215" hits="1"/>
+						<line number="214" hits="0"/>
 						<line number="216" hits="0"/>
-						<line number="217" hits="0"/>
-						<line number="218" hits="0"/>
 						<line number="219" hits="0"/>
 						<line number="220" hits="0"/>
-						<line number="221" hits="0"/>
 						<line number="222" hits="0"/>
 						<line number="223" hits="0"/>
-						<line number="224" hits="0"/>
 						<line number="225" hits="0"/>
-						<line number="226" hits="0"/>
 						<line number="227" hits="0"/>
-						<line number="229" hits="0"/>
-						<line number="230" hits="0"/>
+						<line number="228" hits="0"/>
 						<line number="231" hits="0"/>
 						<line number="232" hits="0"/>
-						<line number="233" hits="0"/>
+						<line number="234" hits="0"/>
 						<line number="235" hits="0"/>
 						<line number="236" hits="0"/>
 						<line number="237" hits="0"/>
 						<line number="238" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="240" hits="0"/>
+						<line number="240" hits="1"/>
 						<line number="241" hits="0"/>
 						<line number="242" hits="0"/>
-						<line number="245" hits="1"/>
-						<line number="248" hits="1"/>
-						<line number="249" hits="1"/>
-						<line number="250" hits="1"/>
-						<line number="251" hits="1"/>
-						<line number="253" hits="1"/>
+						<line number="243" hits="0"/>
+						<line number="244" hits="0"/>
+						<line number="245" hits="0"/>
+						<line number="246" hits="0"/>
+						<line number="247" hits="0"/>
+						<line number="248" hits="0"/>
+						<line number="249" hits="0"/>
+						<line number="250" hits="0"/>
+						<line number="251" hits="0"/>
+						<line number="252" hits="0"/>
+						<line number="254" hits="0"/>
 						<line number="255" hits="0"/>
 						<line number="256" hits="0"/>
+						<line number="257" hits="0"/>
 						<line number="258" hits="0"/>
-						<line number="259" hits="1"/>
+						<line number="260" hits="0"/>
+						<line number="261" hits="0"/>
 						<line number="262" hits="0"/>
 						<line number="263" hits="0"/>
 						<line number="264" hits="0"/>
+						<line number="265" hits="0"/>
 						<line number="266" hits="0"/>
-						<line number="268" hits="0"/>
-						<line number="269" hits="0"/>
-						<line number="270" hits="0"/>
-						<line number="271" hits="0"/>
+						<line number="267" hits="0"/>
+						<line number="270" hits="1"/>
+						<line number="273" hits="1"/>
 						<line number="274" hits="1"/>
+						<line number="275" hits="1"/>
 						<line number="276" hits="1"/>
-						<line number="277" hits="1"/>
 						<line number="278" hits="1"/>
-						<line number="279" hits="1"/>
-						<line number="281" hits="1"/>
-						<line number="294" hits="1"/>
+						<line number="280" hits="0"/>
+						<line number="281" hits="0"/>
+						<line number="283" hits="0"/>
+						<line number="284" hits="1"/>
+						<line number="287" hits="0"/>
+						<line number="288" hits="0"/>
+						<line number="289" hits="0"/>
+						<line number="291" hits="0"/>
+						<line number="293" hits="0"/>
+						<line number="294" hits="0"/>
+						<line number="295" hits="0"/>
 						<line number="296" hits="0"/>
-						<line number="297" hits="0"/>
-						<line number="299" hits="0"/>
-						<line number="301" hits="0"/>
+						<line number="299" hits="1"/>
+						<line number="301" hits="1"/>
+						<line number="302" hits="1"/>
 						<line number="303" hits="1"/>
-						<line number="305" hits="0"/>
-						<line number="306" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="309" hits="0"/>
-						<line number="311" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="313" hits="0"/>
-						<line number="314" hits="0"/>
-						<line number="317" hits="1"/>
-						<line number="321" hits="1"/>
-						<line number="322" hits="1"/>
-						<line number="323" hits="1"/>
-						<line number="325" hits="1"/>
+						<line number="304" hits="1"/>
+						<line number="306" hits="1"/>
+						<line number="319" hits="1"/>
+						<line number="321" hits="0"/>
+						<line number="322" hits="0"/>
+						<line number="324" hits="0"/>
 						<line number="326" hits="0"/>
-						<line number="327" hits="0"/>
-						<line number="328" hits="0"/>
+						<line number="328" hits="1"/>
 						<line number="330" hits="0"/>
+						<line number="331" hits="0"/>
 						<line number="332" hits="0"/>
 						<line number="334" hits="0"/>
 						<line number="336" hits="0"/>
+						<line number="337" hits="0"/>
 						<line number="338" hits="0"/>
 						<line number="339" hits="0"/>
-						<line number="340" hits="0"/>
-						<line number="341" hits="0"/>
-						<line number="342" hits="0"/>
-						<line number="344" hits="0"/>
-						<line number="345" hits="0"/>
-						<line number="346" hits="0"/>
-						<line number="349" hits="1"/>
-						<line number="351" hits="1"/>
-						<line number="352" hits="1"/>
-						<line number="353" hits="1"/>
-						<line number="354" hits="1"/>
-						<line number="355" hits="1"/>
-						<line number="356" hits="1"/>
-						<line number="358" hits="1"/>
+						<line number="342" hits="1"/>
+						<line number="346" hits="1"/>
+						<line number="347" hits="1"/>
+						<line number="348" hits="1"/>
+						<line number="350" hits="1"/>
+						<line number="351" hits="0"/>
+						<line number="352" hits="0"/>
+						<line number="353" hits="0"/>
+						<line number="355" hits="0"/>
+						<line number="357" hits="0"/>
 						<line number="359" hits="0"/>
+						<line number="361" hits="0"/>
 						<line number="363" hits="0"/>
 						<line number="364" hits="0"/>
-						<line number="366" hits="1"/>
+						<line number="365" hits="0"/>
+						<line number="366" hits="0"/>
+						<line number="367" hits="0"/>
+						<line number="369" hits="0"/>
+						<line number="370" hits="0"/>
 						<line number="371" hits="0"/>
-						<line number="372" hits="0"/>
-						<line number="373" hits="0"/>
-						<line number="374" hits="0"/>
-						<line number="375" hits="0"/>
-						<line number="376" hits="0"/>
-						<line number="377" hits="0"/>
-						<line number="379" hits="0"/>
-						<line number="381" hits="0"/>
-						<line number="382" hits="0"/>
-						<line number="383" hits="0"/>
+						<line number="374" hits="1"/>
+						<line number="376" hits="1"/>
+						<line number="377" hits="1"/>
+						<line number="378" hits="1"/>
+						<line number="379" hits="1"/>
+						<line number="380" hits="1"/>
+						<line number="381" hits="1"/>
+						<line number="383" hits="1"/>
 						<line number="384" hits="0"/>
-						<line number="387" hits="1"/>
+						<line number="388" hits="0"/>
+						<line number="389" hits="0"/>
 						<line number="391" hits="1"/>
-						<line number="392" hits="1"/>
-						<line number="393" hits="1"/>
-						<line number="395" hits="1"/>
 						<line number="396" hits="0"/>
 						<line number="397" hits="0"/>
 						<line number="398" hits="0"/>
 						<line number="399" hits="0"/>
 						<line number="400" hits="0"/>
+						<line number="401" hits="0"/>
 						<line number="402" hits="0"/>
 						<line number="404" hits="0"/>
 						<line number="406" hits="0"/>
+						<line number="407" hits="0"/>
 						<line number="408" hits="0"/>
-						<line number="410" hits="0"/>
-						<line number="411" hits="0"/>
-						<line number="412" hits="0"/>
-						<line number="413" hits="0"/>
-						<line number="414" hits="0"/>
-						<line number="416" hits="0"/>
-						<line number="418" hits="0"/>
-						<line number="419" hits="0"/>
-						<line number="420" hits="0"/>
+						<line number="409" hits="0"/>
+						<line number="412" hits="1"/>
+						<line number="416" hits="1"/>
+						<line number="417" hits="1"/>
+						<line number="418" hits="1"/>
+						<line number="420" hits="1"/>
+						<line number="421" hits="0"/>
 						<line number="422" hits="0"/>
 						<line number="423" hits="0"/>
 						<line number="424" hits="0"/>
-						<line number="426" hits="0"/>
+						<line number="425" hits="0"/>
 						<line number="427" hits="0"/>
-						<line number="428" hits="0"/>
-						<line number="430" hits="1"/>
-						<line number="432" hits="1"/>
-						<line number="433" hits="1"/>
-						<line number="434" hits="1"/>
-						<line number="436" hits="1"/>
+						<line number="429" hits="0"/>
+						<line number="431" hits="0"/>
+						<line number="433" hits="0"/>
+						<line number="435" hits="0"/>
+						<line number="436" hits="0"/>
+						<line number="437" hits="0"/>
+						<line number="438" hits="0"/>
 						<line number="439" hits="0"/>
 						<line number="441" hits="0"/>
 						<line number="443" hits="0"/>
 						<line number="444" hits="0"/>
 						<line number="445" hits="0"/>
-						<line number="446" hits="0"/>
-						<line number="449" hits="1"/>
-						<line number="451" hits="1"/>
-						<line number="452" hits="1"/>
-						<line number="454" hits="1"/>
-						<line number="456" hits="0"/>
-						<line number="457" hits="0"/>
-						<line number="459" hits="0"/>
-						<line number="460" hits="0"/>
-						<line number="461" hits="0"/>
+						<line number="447" hits="0"/>
+						<line number="448" hits="0"/>
+						<line number="449" hits="0"/>
+						<line number="451" hits="0"/>
+						<line number="452" hits="0"/>
+						<line number="453" hits="0"/>
+						<line number="455" hits="1"/>
+						<line number="457" hits="1"/>
+						<line number="458" hits="1"/>
+						<line number="459" hits="1"/>
+						<line number="461" hits="1"/>
 						<line number="464" hits="0"/>
-						<line number="465" hits="0"/>
 						<line number="466" hits="0"/>
-						<line number="467" hits="0"/>
-						<line number="469" hits="1"/>
+						<line number="468" hits="0"/>
+						<line number="469" hits="0"/>
+						<line number="470" hits="0"/>
 						<line number="471" hits="0"/>
-						<line number="472" hits="0"/>
-						<line number="473" hits="0"/>
-						<line number="474" hits="0"/>
-						<line number="475" hits="0"/>
-						<line number="476" hits="0"/>
-						<line number="478" hits="1"/>
-						<line number="480" hits="1"/>
-						<line number="481" hits="1"/>
-						<line number="482" hits="1"/>
-						<line number="483" hits="1"/>
+						<line number="474" hits="1"/>
+						<line number="476" hits="1"/>
+						<line number="477" hits="1"/>
+						<line number="479" hits="1"/>
+						<line number="481" hits="0"/>
+						<line number="482" hits="0"/>
+						<line number="484" hits="0"/>
+						<line number="485" hits="0"/>
+						<line number="486" hits="0"/>
+						<line number="489" hits="0"/>
+						<line number="490" hits="0"/>
 						<line number="491" hits="0"/>
 						<line number="492" hits="0"/>
-						<line number="493" hits="0"/>
-						<line number="494" hits="0"/>
+						<line number="494" hits="1"/>
+						<line number="496" hits="0"/>
 						<line number="497" hits="0"/>
 						<line number="498" hits="0"/>
+						<line number="499" hits="0"/>
 						<line number="500" hits="0"/>
 						<line number="501" hits="0"/>
-						<line number="502" hits="0"/>
-						<line number="503" hits="0"/>
-						<line number="504" hits="0"/>
+						<line number="503" hits="1"/>
+						<line number="505" hits="1"/>
+						<line number="506" hits="1"/>
 						<line number="507" hits="1"/>
-						<line number="513" hits="1"/>
-						<line number="514" hits="1"/>
-						<line number="515" hits="1"/>
-						<line number="517" hits="1"/>
+						<line number="508" hits="1"/>
+						<line number="516" hits="0"/>
+						<line number="517" hits="0"/>
 						<line number="518" hits="0"/>
 						<line number="519" hits="0"/>
-						<line number="520" hits="0"/>
-						<line number="521" hits="0"/>
 						<line number="522" hits="0"/>
 						<line number="523" hits="0"/>
-						<line number="524" hits="0"/>
+						<line number="525" hits="0"/>
 						<line number="526" hits="0"/>
 						<line number="527" hits="0"/>
+						<line number="528" hits="0"/>
 						<line number="529" hits="0"/>
-						<line number="530" hits="0"/>
-						<line number="531" hits="0"/>
-						<line number="534" hits="0"/>
-						<line number="535" hits="0"/>
-						<line number="536" hits="0"/>
+						<line number="532" hits="1"/>
 						<line number="538" hits="1"/>
-						<line number="546" hits="1"/>
-						<line number="547" hits="1"/>
-						<line number="548" hits="1"/>
-						<line number="550" hits="1"/>
+						<line number="539" hits="1"/>
+						<line number="540" hits="1"/>
+						<line number="542" hits="1"/>
+						<line number="543" hits="0"/>
+						<line number="544" hits="0"/>
+						<line number="545" hits="0"/>
+						<line number="546" hits="0"/>
+						<line number="547" hits="0"/>
+						<line number="548" hits="0"/>
+						<line number="549" hits="0"/>
 						<line number="551" hits="0"/>
 						<line number="552" hits="0"/>
-						<line number="553" hits="0"/>
 						<line number="554" hits="0"/>
+						<line number="555" hits="0"/>
 						<line number="556" hits="0"/>
-						<line number="557" hits="0"/>
 						<line number="559" hits="0"/>
 						<line number="560" hits="0"/>
 						<line number="561" hits="0"/>
-						<line number="564" hits="0"/>
-						<line number="565" hits="0"/>
-						<line number="566" hits="0"/>
-						<line number="568" hits="1"/>
-						<line number="570" hits="1"/>
+						<line number="563" hits="1"/>
 						<line number="571" hits="1"/>
+						<line number="572" hits="1"/>
 						<line number="573" hits="1"/>
+						<line number="575" hits="1"/>
+						<line number="576" hits="0"/>
+						<line number="577" hits="0"/>
 						<line number="578" hits="0"/>
 						<line number="579" hits="0"/>
-						<line number="580" hits="0"/>
 						<line number="581" hits="0"/>
 						<line number="582" hits="0"/>
-						<line number="583" hits="0"/>
+						<line number="584" hits="0"/>
 						<line number="585" hits="0"/>
 						<line number="586" hits="0"/>
-						<line number="587" hits="0"/>
-						<line number="588" hits="0"/>
+						<line number="589" hits="0"/>
+						<line number="590" hits="0"/>
 						<line number="591" hits="0"/>
-						<line number="594" hits="0"/>
-						<line number="595" hits="0"/>
-						<line number="596" hits="0"/>
+						<line number="593" hits="1"/>
+						<line number="595" hits="1"/>
+						<line number="596" hits="1"/>
 						<line number="598" hits="1"/>
-						<line number="600" hits="1"/>
-						<line number="601" hits="1"/>
-						<line number="602" hits="1"/>
-						<line number="604" hits="1"/>
+						<line number="603" hits="0"/>
+						<line number="604" hits="0"/>
 						<line number="605" hits="0"/>
+						<line number="606" hits="0"/>
 						<line number="607" hits="0"/>
+						<line number="608" hits="0"/>
 						<line number="610" hits="0"/>
-						<line number="611" hits="1"/>
+						<line number="611" hits="0"/>
+						<line number="612" hits="0"/>
+						<line number="613" hits="0"/>
 						<line number="616" hits="0"/>
-						<line number="617" hits="0"/>
-						<line number="618" hits="0"/>
 						<line number="619" hits="0"/>
 						<line number="620" hits="0"/>
 						<line number="621" hits="0"/>
-						<line number="622" hits="0"/>
-						<line number="623" hits="0"/>
+						<line number="623" hits="1"/>
 						<line number="625" hits="1"/>
+						<line number="626" hits="1"/>
+						<line number="627" hits="1"/>
 						<line number="629" hits="1"/>
-						<line number="630" hits="1"/>
-						<line number="632" hits="1"/>
-						<line number="633" hits="0"/>
-						<line number="634" hits="0"/>
+						<line number="630" hits="0"/>
+						<line number="632" hits="0"/>
 						<line number="635" hits="0"/>
 						<line number="636" hits="1"/>
+						<line number="641" hits="0"/>
 						<line number="642" hits="0"/>
 						<line number="643" hits="0"/>
 						<line number="644" hits="0"/>
 						<line number="645" hits="0"/>
 						<line number="646" hits="0"/>
 						<line number="647" hits="0"/>
-						<line number="649" hits="0"/>
-						<line number="650" hits="0"/>
-						<line number="651" hits="0"/>
-						<line number="654" hits="0"/>
-						<line number="656" hits="0"/>
+						<line number="648" hits="0"/>
+						<line number="650" hits="1"/>
+						<line number="654" hits="1"/>
+						<line number="655" hits="1"/>
+						<line number="657" hits="1"/>
+						<line number="658" hits="0"/>
 						<line number="659" hits="0"/>
 						<line number="660" hits="0"/>
-						<line number="661" hits="0"/>
-						<line number="663" hits="1"/>
-						<line number="667" hits="1"/>
-						<line number="668" hits="1"/>
-						<line number="669" hits="1"/>
+						<line number="661" hits="1"/>
+						<line number="667" hits="0"/>
+						<line number="668" hits="0"/>
+						<line number="669" hits="0"/>
 						<line number="670" hits="0"/>
 						<line number="671" hits="0"/>
 						<line number="672" hits="0"/>
+						<line number="674" hits="0"/>
 						<line number="675" hits="0"/>
 						<line number="676" hits="0"/>
-						<line number="677" hits="0"/>
-						<line number="679" hits="1"/>
-						<line number="682" hits="0"/>
-						<line number="683" hits="0"/>
+						<line number="679" hits="0"/>
+						<line number="681" hits="0"/>
 						<line number="684" hits="0"/>
-						<line number="688" hits="0"/>
-						<line number="689" hits="0"/>
-						<line number="691" hits="0"/>
-						<line number="692" hits="0"/>
-						<line number="693" hits="0"/>
-						<line number="696" hits="1"/>
-						<line number="698" hits="1"/>
-						<line number="699" hits="1"/>
-						<line number="701" hits="1"/>
+						<line number="685" hits="0"/>
+						<line number="686" hits="0"/>
+						<line number="688" hits="1"/>
+						<line number="692" hits="1"/>
+						<line number="693" hits="1"/>
+						<line number="694" hits="1"/>
+						<line number="695" hits="0"/>
+						<line number="696" hits="0"/>
+						<line number="697" hits="0"/>
+						<line number="700" hits="0"/>
+						<line number="701" hits="0"/>
+						<line number="702" hits="0"/>
+						<line number="704" hits="1"/>
 						<line number="707" hits="0"/>
 						<line number="708" hits="0"/>
 						<line number="709" hits="0"/>
-						<line number="710" hits="0"/>
-						<line number="711" hits="0"/>
-						<line number="712" hits="0"/>
-						<line number="715" hits="0"/>
+						<line number="713" hits="0"/>
+						<line number="714" hits="0"/>
+						<line number="716" hits="0"/>
 						<line number="717" hits="0"/>
 						<line number="718" hits="0"/>
-						<line number="719" hits="0"/>
-						<line number="722" hits="1"/>
+						<line number="721" hits="1"/>
+						<line number="723" hits="1"/>
 						<line number="724" hits="1"/>
-						<line number="725" hits="1"/>
 						<line number="726" hits="1"/>
-						<line number="728" hits="1"/>
 						<line number="732" hits="0"/>
 						<line number="733" hits="0"/>
 						<line number="734" hits="0"/>
 						<line number="735" hits="0"/>
 						<line number="736" hits="0"/>
 						<line number="737" hits="0"/>
-						<line number="738" hits="0"/>
-						<line number="739" hits="0"/>
+						<line number="740" hits="0"/>
 						<line number="742" hits="0"/>
-						<line number="745" hits="0"/>
-						<line number="746" hits="0"/>
-						<line number="747" hits="0"/>
+						<line number="743" hits="0"/>
+						<line number="744" hits="0"/>
+						<line number="747" hits="1"/>
 						<line number="749" hits="1"/>
-						<line number="755" hits="1"/>
-						<line number="756" hits="1"/>
-						<line number="758" hits="1"/>
+						<line number="750" hits="1"/>
+						<line number="751" hits="1"/>
+						<line number="753" hits="1"/>
+						<line number="757" hits="0"/>
+						<line number="758" hits="0"/>
 						<line number="759" hits="0"/>
 						<line number="760" hits="0"/>
 						<line number="761" hits="0"/>
 						<line number="762" hits="0"/>
 						<line number="763" hits="0"/>
-						<line number="765" hits="0"/>
+						<line number="764" hits="0"/>
 						<line number="767" hits="0"/>
-						<line number="769" hits="0"/>
 						<line number="770" hits="0"/>
 						<line number="771" hits="0"/>
 						<line number="772" hits="0"/>
-						<line number="775" hits="0"/>
-						<line number="776" hits="0"/>
-						<line number="777" hits="0"/>
-						<line number="778" hits="0"/>
+						<line number="774" hits="1"/>
+						<line number="780" hits="1"/>
 						<line number="781" hits="1"/>
-						<line number="785" hits="1"/>
-						<line number="786" hits="1"/>
-						<line number="787" hits="1"/>
-						<line number="789" hits="1"/>
+						<line number="783" hits="1"/>
+						<line number="784" hits="0"/>
+						<line number="785" hits="0"/>
+						<line number="786" hits="0"/>
+						<line number="787" hits="0"/>
+						<line number="788" hits="0"/>
 						<line number="790" hits="0"/>
-						<line number="792" hits="1"/>
+						<line number="792" hits="0"/>
+						<line number="794" hits="0"/>
+						<line number="795" hits="0"/>
+						<line number="796" hits="0"/>
+						<line number="797" hits="0"/>
 						<line number="800" hits="0"/>
 						<line number="801" hits="0"/>
 						<line number="802" hits="0"/>
 						<line number="803" hits="0"/>
-						<line number="804" hits="0"/>
-						<line number="805" hits="0"/>
-						<line number="808" hits="1"/>
-						<line number="816" hits="0"/>
-						<line number="817" hits="0"/>
-						<line number="818" hits="0"/>
-						<line number="819" hits="0"/>
-						<line number="820" hits="0"/>
+						<line number="806" hits="1"/>
+						<line number="810" hits="1"/>
+						<line number="811" hits="1"/>
+						<line number="812" hits="1"/>
+						<line number="814" hits="1"/>
+						<line number="815" hits="0"/>
+						<line number="817" hits="1"/>
+						<line number="825" hits="0"/>
+						<line number="826" hits="0"/>
+						<line number="827" hits="0"/>
+						<line number="828" hits="0"/>
+						<line number="829" hits="0"/>
+						<line number="830" hits="0"/>
+						<line number="833" hits="1"/>
+						<line number="841" hits="0"/>
+						<line number="842" hits="0"/>
+						<line number="843" hits="0"/>
+						<line number="844" hits="0"/>
+						<line number="845" hits="0"/>
 					</lines>
 				</class>
 			</classes>
@@ -3837,7 +3860,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="notifications" line-rate="0.5882" branch-rate="0" complexity="0">
+		<package name="notifications" line-rate="0.597" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="notifications/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -3953,7 +3976,7 @@
 						<line number="16" hits="1"/>
 					</lines>
 				</class>
-				<class name="utils.py" filename="notifications/utils.py" complexity="0" line-rate="0.2967" branch-rate="0">
+				<class name="utils.py" filename="notifications/utils.py" complexity="0" line-rate="0.3068" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="5" hits="1"/>
@@ -4016,37 +4039,34 @@
 						<line number="104" hits="0"/>
 						<line number="106" hits="0"/>
 						<line number="107" hits="0"/>
-						<line number="108" hits="0"/>
+						<line number="109" hits="0"/>
 						<line number="110" hits="0"/>
-						<line number="111" hits="0"/>
-						<line number="114" hits="1"/>
-						<line number="116" hits="0"/>
-						<line number="121" hits="1"/>
-						<line number="123" hits="0"/>
+						<line number="113" hits="1"/>
+						<line number="115" hits="0"/>
+						<line number="120" hits="1"/>
+						<line number="122" hits="0"/>
+						<line number="127" hits="1"/>
 						<line number="128" hits="1"/>
-						<line number="129" hits="1"/>
-						<line number="134" hits="0"/>
-						<line number="137" hits="0"/>
+						<line number="133" hits="0"/>
+						<line number="136" hits="0"/>
+						<line number="139" hits="0"/>
 						<line number="140" hits="0"/>
 						<line number="141" hits="0"/>
-						<line number="142" hits="0"/>
-						<line number="143" hits="0"/>
 						<line number="145" hits="0"/>
-						<line number="149" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="154" hits="1"/>
-						<line number="155" hits="1"/>
-						<line number="163" hits="0"/>
-						<line number="164" hits="0"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="169" hits="1"/>
-						<line number="170" hits="1"/>
-						<line number="178" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="180" hits="0"/>
-						<line number="181" hits="0"/>
+						<line number="146" hits="0"/>
+						<line number="147" hits="0"/>
+						<line number="150" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="159" hits="0"/>
+						<line number="160" hits="0"/>
+						<line number="161" hits="0"/>
+						<line number="162" hits="0"/>
+						<line number="165" hits="1"/>
+						<line number="166" hits="1"/>
+						<line number="174" hits="0"/>
+						<line number="175" hits="0"/>
+						<line number="176" hits="0"/>
+						<line number="177" hits="0"/>
 					</lines>
 				</class>
 				<class name="views.py" filename="notifications/views.py" complexity="0" line-rate="0.6053" branch-rate="0">
@@ -4318,7 +4338,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="web_admin.serializers" line-rate="0.6619" branch-rate="0" complexity="0">
+		<package name="web_admin.serializers" line-rate="0.7316" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="web_admin/serializers/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -4606,7 +4626,7 @@
 						<line number="369" hits="1"/>
 					</lines>
 				</class>
-				<class name="auth_serializer.py" filename="web_admin/serializers/auth_serializer.py" complexity="0" line-rate="0.4429" branch-rate="0">
+				<class name="auth_serializer.py" filename="web_admin/serializers/auth_serializer.py" complexity="0" line-rate="0.9286" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="5" hits="1"/>
@@ -4625,40 +4645,40 @@
 						<line number="32" hits="1"/>
 						<line number="33" hits="1"/>
 						<line number="35" hits="1"/>
-						<line number="37" hits="0"/>
-						<line number="38" hits="0"/>
-						<line number="39" hits="0"/>
-						<line number="40" hits="0"/>
+						<line number="37" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="39" hits="1"/>
+						<line number="40" hits="1"/>
 						<line number="41" hits="0"/>
-						<line number="42" hits="0"/>
-						<line number="43" hits="0"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
 						<line number="45" hits="1"/>
-						<line number="50" hits="0"/>
-						<line number="51" hits="0"/>
-						<line number="52" hits="0"/>
-						<line number="54" hits="0"/>
-						<line number="57" hits="0"/>
-						<line number="59" hits="0"/>
-						<line number="60" hits="0"/>
-						<line number="67" hits="0"/>
+						<line number="50" hits="1"/>
+						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="59" hits="1"/>
+						<line number="60" hits="1"/>
+						<line number="67" hits="1"/>
 						<line number="70" hits="1"/>
 						<line number="74" hits="1"/>
 						<line number="75" hits="1"/>
 						<line number="77" hits="1"/>
 						<line number="79" hits="1"/>
 						<line number="81" hits="1"/>
-						<line number="86" hits="0"/>
-						<line number="87" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="91" hits="0"/>
-						<line number="92" hits="0"/>
-						<line number="93" hits="0"/>
+						<line number="86" hits="1"/>
+						<line number="87" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="92" hits="1"/>
+						<line number="93" hits="1"/>
 						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
+						<line number="95" hits="1"/>
 						<line number="96" hits="0"/>
-						<line number="97" hits="0"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
 						<line number="102" hits="1"/>
 						<line number="106" hits="1"/>
 						<line number="107" hits="1"/>
@@ -4667,18 +4687,18 @@
 						<line number="114" hits="1"/>
 						<line number="115" hits="1"/>
 						<line number="117" hits="1"/>
-						<line number="122" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="127" hits="0"/>
+						<line number="122" hits="1"/>
+						<line number="123" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="127" hits="1"/>
 						<line number="128" hits="0"/>
-						<line number="130" hits="0"/>
-						<line number="131" hits="0"/>
-						<line number="132" hits="0"/>
-						<line number="133" hits="0"/>
+						<line number="130" hits="1"/>
+						<line number="131" hits="1"/>
+						<line number="132" hits="1"/>
+						<line number="133" hits="1"/>
 						<line number="134" hits="0"/>
-						<line number="135" hits="0"/>
-						<line number="136" hits="0"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
 					</lines>
 				</class>
 				<class name="user_management_serializer.py" filename="web_admin/serializers/user_management_serializer.py" complexity="0" line-rate="0.5137" branch-rate="0">
@@ -4843,120 +4863,120 @@
 				<class name="test_article.py" filename="web_admin/tests/test_article.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
-						<line number="4" hits="1"/>
 						<line number="5" hits="1"/>
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
 						<line number="8" hits="1"/>
 						<line number="9" hits="1"/>
 						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
 						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
+						<line number="14" hits="1"/>
 						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
 						<line number="20" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
 						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
 						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
 						<line number="32" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
+						<line number="34" hits="1"/>
 						<line number="39" hits="1"/>
 						<line number="40" hits="1"/>
 						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
 						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
 						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
 						<line number="50" hits="1"/>
 						<line number="51" hits="1"/>
+						<line number="52" hits="1"/>
 						<line number="53" hits="1"/>
 						<line number="55" hits="1"/>
-						<line number="56" hits="1"/>
 						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
 						<line number="62" hits="1"/>
 						<line number="63" hits="1"/>
 						<line number="64" hits="1"/>
 						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
 						<line number="67" hits="1"/>
 						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
 						<line number="70" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
+						<line number="72" hits="1"/>
 						<line number="77" hits="1"/>
 						<line number="78" hits="1"/>
 						<line number="79" hits="1"/>
-						<line number="82" hits="1"/>
+						<line number="81" hits="1"/>
 						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="87" hits="1"/>
 						<line number="88" hits="1"/>
 						<line number="89" hits="1"/>
 						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
+						<line number="92" hits="1"/>
 						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
 						<line number="99" hits="1"/>
 						<line number="100" hits="1"/>
 						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
+						<line number="103" hits="1"/>
 						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="111" hits="1"/>
+						<line number="110" hits="1"/>
 						<line number="114" hits="1"/>
 						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
 						<line number="117" hits="1"/>
-						<line number="119" hits="1"/>
+						<line number="122" hits="1"/>
 						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
 						<line number="126" hits="1"/>
 						<line number="127" hits="1"/>
+						<line number="128" hits="1"/>
 						<line number="129" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="134" hits="1"/>
+						<line number="131" hits="1"/>
 						<line number="136" hits="1"/>
+						<line number="137" hits="1"/>
 						<line number="138" hits="1"/>
 						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
 						<line number="141" hits="1"/>
-						<line number="143" hits="1"/>
 						<line number="146" hits="1"/>
 						<line number="147" hits="1"/>
 						<line number="148" hits="1"/>
-						<line number="150" hits="1"/>
-						<line number="152" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="151" hits="1"/>
+						<line number="156" hits="1"/>
 						<line number="157" hits="1"/>
 						<line number="158" hits="1"/>
 						<line number="160" hits="1"/>
+						<line number="162" hits="1"/>
+						<line number="167" hits="1"/>
+						<line number="168" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="171" hits="1"/>
+						<line number="174" hits="1"/>
+						<line number="178" hits="1"/>
+						<line number="183" hits="1"/>
+						<line number="184" hits="1"/>
+						<line number="186" hits="1"/>
+						<line number="190" hits="1"/>
+						<line number="195" hits="1"/>
+						<line number="196" hits="1"/>
+						<line number="197" hits="1"/>
+						<line number="198" hits="1"/>
+						<line number="200" hits="1"/>
+						<line number="203" hits="1"/>
+						<line number="207" hits="1"/>
+						<line number="212" hits="1"/>
+						<line number="214" hits="1"/>
+						<line number="216" hits="1"/>
+						<line number="221" hits="1"/>
+						<line number="222" hits="1"/>
+						<line number="223" hits="1"/>
+						<line number="225" hits="1"/>
+						<line number="228" hits="1"/>
+						<line number="232" hits="1"/>
+						<line number="237" hits="1"/>
+						<line number="239" hits="1"/>
+						<line number="241" hits="1"/>
+						<line number="246" hits="1"/>
+						<line number="247" hits="1"/>
+						<line number="250" hits="1"/>
+						<line number="251" hits="1"/>
+						<line number="253" hits="1"/>
 					</lines>
 				</class>
-				<class name="test_set_up.py" filename="web_admin/tests/test_set_up.py" complexity="0" line-rate="1" branch-rate="0">
+				<class name="test_auth.py" filename="web_admin/tests/test_auth.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="4" hits="1"/>
@@ -4964,27 +4984,108 @@
 						<line number="6" hits="1"/>
 						<line number="7" hits="1"/>
 						<line number="9" hits="1"/>
-						<line number="11" hits="1"/>
+						<line number="10" hits="1"/>
+						<line number="12" hits="1"/>
 						<line number="13" hits="1"/>
-						<line number="102" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="15" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="20" hits="1"/>
+						<line number="25" hits="1"/>
+						<line number="30" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="33" hits="1"/>
+						<line number="38" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="42" hits="1"/>
+						<line number="43" hits="1"/>
+						<line number="45" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="54" hits="1"/>
+						<line number="57" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="67" hits="1"/>
+						<line number="68" hits="1"/>
+						<line number="69" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="75" hits="1"/>
+						<line number="77" hits="1"/>
+						<line number="83" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1"/>
+						<line number="91" hits="1"/>
+						<line number="93" hits="1"/>
+						<line number="98" hits="1"/>
 						<line number="103" hits="1"/>
 						<line number="104" hits="1"/>
 						<line number="105" hits="1"/>
 						<line number="106" hits="1"/>
 						<line number="109" hits="1"/>
+						<line number="114" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="127" hits="1"/>
+						<line number="129" hits="1"/>
+						<line number="134" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="137" hits="1"/>
+						<line number="143" hits="1"/>
+						<line number="144" hits="1"/>
+						<line number="145" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="152" hits="1"/>
+						<line number="158" hits="1"/>
+						<line number="159" hits="1"/>
+						<line number="160" hits="1"/>
+					</lines>
+				</class>
+				<class name="test_set_up.py" filename="web_admin/tests/test_set_up.py" complexity="0" line-rate="1" branch-rate="0">
+					<methods/>
+					<lines>
+						<line number="5" hits="1"/>
+						<line number="6" hits="1"/>
+						<line number="7" hits="1"/>
+						<line number="8" hits="1"/>
+						<line number="11" hits="1"/>
+						<line number="14" hits="1"/>
+						<line number="17" hits="1"/>
+						<line number="106" hits="1"/>
 						<line number="111" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="115" hits="1"/>
 						<line number="116" hits="1"/>
+						<line number="117" hits="1"/>
 						<line number="118" hits="1"/>
-						<line number="168" hits="1"/>
-						<line number="218" hits="1"/>
-						<line number="273" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
+						<line number="121" hits="1"/>
+						<line number="122" hits="1"/>
+						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="128" hits="1"/>
+						<line number="133" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="140" hits="1"/>
+						<line number="142" hits="1"/>
+						<line number="144" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
+						<line number="149" hits="1"/>
+						<line number="150" hits="1"/>
+						<line number="153" hits="1"/>
+						<line number="161" hits="1"/>
+						<line number="169" hits="1"/>
+						<line number="175" hits="1"/>
+						<line number="199" hits="1"/>
+						<line number="210" hits="1"/>
+						<line number="221" hits="1"/>
 					</lines>
 				</class>
 			</classes>
 		</package>
-		<package name="web_admin.views" line-rate="0.6094" branch-rate="0" complexity="0">
+		<package name="web_admin.views" line-rate="0.6594" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="web_admin/views/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -5216,7 +5317,7 @@
 						<line number="285" hits="0"/>
 					</lines>
 				</class>
-				<class name="auth.py" filename="web_admin/views/auth.py" complexity="0" line-rate="0.5" branch-rate="0">
+				<class name="auth.py" filename="web_admin/views/auth.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="5" hits="1"/>
@@ -5231,26 +5332,26 @@
 						<line number="23" hits="1"/>
 						<line number="25" hits="1"/>
 						<line number="27" hits="1"/>
-						<line number="33" hits="0"/>
-						<line number="34" hits="0"/>
-						<line number="35" hits="0"/>
-						<line number="36" hits="0"/>
-						<line number="37" hits="0"/>
+						<line number="33" hits="1"/>
+						<line number="34" hits="1"/>
+						<line number="35" hits="1"/>
+						<line number="36" hits="1"/>
+						<line number="37" hits="1"/>
 						<line number="39" hits="1"/>
 						<line number="41" hits="1"/>
-						<line number="47" hits="0"/>
-						<line number="48" hits="0"/>
-						<line number="49" hits="0"/>
-						<line number="50" hits="0"/>
+						<line number="47" hits="1"/>
+						<line number="48" hits="1"/>
+						<line number="49" hits="1"/>
+						<line number="50" hits="1"/>
 						<line number="52" hits="1"/>
 						<line number="54" hits="1"/>
-						<line number="60" hits="0"/>
-						<line number="61" hits="0"/>
-						<line number="62" hits="0"/>
-						<line number="63" hits="0"/>
-						<line number="64" hits="0"/>
-						<line number="65" hits="0"/>
-						<line number="66" hits="0"/>
+						<line number="60" hits="1"/>
+						<line number="61" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1"/>
+						<line number="64" hits="1"/>
+						<line number="65" hits="1"/>
+						<line number="66" hits="1"/>
 					</lines>
 				</class>
 				<class name="user_management.py" filename="web_admin/views/user_management.py" complexity="0" line-rate="0.4028" branch-rate="0">
diff --git a/web_admin/tests/test_article.py b/web_admin/tests/test_article.py
index 728907c..f77b26b 100644
--- a/web_admin/tests/test_article.py
+++ b/web_admin/tests/test_article.py
@@ -36,7 +36,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         test article create with default card_image
         :return:
         """
-        url = reverse('web_admin:article-list')
+        url = reverse(self.article_list_url)
         response = self.client.post(url, self.article_data_with_default_card_image, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         # Check that a new article was created
@@ -48,7 +48,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         :return:
         """
         self.client.force_authenticate(user=self.admin_user)
-        url = reverse('web_admin:article-list')
+        url = reverse(self.article_list_url)
         response = self.client.post(url, self.article_data_with_base64_card_image, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         # Check that a new article was created
@@ -60,13 +60,13 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         :return:
         """
         self.client.force_authenticate(user=self.admin_user)
-        url = reverse('web_admin:article-detail', kwargs={'pk': self.article.id})
+        url = reverse(self.article_detail_url, kwargs={'pk': self.article.id})
         response = self.client.put(url, self.article_update_data, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.article.refresh_from_db()
         self.assertEqual(self.article.title, self.article_update_data['title'])
         self.assertEqual(self.article.article_cards.count(), 1)
-        self.assertEqual(self.article.article_survey.count(), 5)
+        self.assertEqual(self.article.article_survey.count(), 6)
         self.assertEqual(self.article.article_survey.first().options.count(), 3)
 
     def test_articles_list(self):
@@ -74,7 +74,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         test articles list
         :return:
         """
-        url = reverse('web_admin:article-list')
+        url = reverse(self.article_list_url)
         response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         # Assuming only one article exists in the database
@@ -85,7 +85,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         test article retrieve
         :return:
         """
-        url = reverse('web_admin:article-detail', kwargs={'pk': self.article.id})
+        url = reverse(self.article_detail_url, kwargs={'pk': self.article.id})
         response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
@@ -94,7 +94,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         test article delete
         :return:
         """
-        url = reverse('web_admin:article-detail', kwargs={'pk': self.article.id})
+        url = reverse(self.article_detail_url, kwargs={'pk': self.article.id})
         response = self.client.delete(url)
         self.article.refresh_from_db()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -105,7 +105,7 @@ class ArticleViewSetTestCase(ArticleTestSetUp):
         test article create with invalid data
         :return:
         """
-        url = reverse('web_admin:article-list')
+        url = reverse(self.article_list_url)
         # Missing article_cards
         invalid_data = {
             "title": "Invalid Article",
diff --git a/web_admin/tests/test_auth.py b/web_admin/tests/test_auth.py
index 6033af1..fa16ced 100644
--- a/web_admin/tests/test_auth.py
+++ b/web_admin/tests/test_auth.py
@@ -19,7 +19,7 @@ User = get_user_model()
 
 class AdminOTPTestCase(BaseSetUp):
     """
-
+    test case to send otp to admin email
     """
 
     def setUp(self):
@@ -28,36 +28,35 @@ class AdminOTPTestCase(BaseSetUp):
         :return:
         """
         super(AdminOTPTestCase, self).setUp()
+        self.url = reverse('web_admin:admin-otp')
 
     def test_admin_otp_for_valid_email(self):
         """
-
+        test admin otp for valid email
         :return:
         """
-        url = reverse('web_admin:admin-otp')
         data = {
-            'email': 'admin@example.com'
+            'email': self.admin_email
         }
-        response = self.client.post(url, data, format='json')
+        response = self.client.post(self.url, data, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(UserEmailOtp.objects.count(), 1)
 
     def test_admin_otp_for_invalid_email(self):
         """
-
+        test admin otp for invalid email
         :return:
         """
-        url = reverse('web_admin:admin-otp')
         data = {
             'email': 'notadmin@example.com'
         }
-        response = self.client.post(url, data, format='json')
+        response = self.client.post(self.url, data, format='json')
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
 
 
 class AdminVerifyOTPTestCase(BaseSetUp):
     """
-
+    test case to verify otp for admin email
     """
 
     def setUp(self):
@@ -68,32 +67,94 @@ class AdminVerifyOTPTestCase(BaseSetUp):
         super(AdminVerifyOTPTestCase, self).setUp()
         self.verification_code = generate_otp()
         expiry = timezone.now() + timezone.timedelta(days=1)
-        self.user_email_otp = UserEmailOtp.objects.create(email='admin@example.com',
+        self.user_email_otp = UserEmailOtp.objects.create(email=self.admin_email,
                                                           otp=self.verification_code,
                                                           expired_at=expiry,
                                                           user_type=dict(USER_TYPE).get('3'),
                                                           )
+        self.url = reverse('web_admin:admin-verify-otp')
 
     def test_admin_verify_otp_with_valid_otp(self):
-        url = reverse('web_admin:admin-verify-otp')
+        """
+        test admin verify otp with valid otp
+        :return:
+        """
+
         data = {
-            'email': 'admin@example.com',
+            'email': self.admin_email,
             "otp": self.verification_code
         }
 
-        response = self.client.post(url, data)
+        response = self.client.post(self.url, data)
         self.user_email_otp.refresh_from_db()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(self.user_email_otp.is_verified, True)
 
     def test_admin_verify_otp_with_invalid_otp(self):
-        url = reverse('web_admin:admin-verify-otp')
+        """
+        test admin verify otp with invalid otp
+        :return:
+        """
         data = {
-            'email': 'admin@example.com',
+            'email': self.admin_email,
             "otp": generate_otp()
         }
 
-        response = self.client.post(url, data)
+        response = self.client.post(self.url, data)
         self.user_email_otp.refresh_from_db()
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(self.user_email_otp.is_verified, False)
+
+
+class AdminCreateNewPassword(BaseSetUp):
+    """
+    test case to create new password for admin email
+    """
+
+    def setUp(self):
+        """
+        inherit data here
+        :return:
+        """
+        super(AdminCreateNewPassword, self).setUp()
+        self.verification_code = generate_otp()
+        expiry = timezone.now() + timezone.timedelta(days=1)
+        self.user_email_otp = UserEmailOtp.objects.create(email=self.admin_email,
+                                                          otp=self.verification_code,
+                                                          expired_at=expiry,
+                                                          user_type=dict(USER_TYPE).get('3'),
+                                                          )
+        self.url = reverse('web_admin:admin-create-password')
+
+    def test_admin_create_new_password_after_verification(self):
+        """
+        test admin create new password
+        :return:
+        """
+        self.user_email_otp.is_verified = True
+        self.user_email_otp.save()
+
+        data = {
+            'email': self.admin_email,
+            "new_password": "New@1234",
+            "confirm_password": "New@1234"
+        }
+
+        response = self.client.post(self.url, data)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(UserEmailOtp.objects.count(), 0)
+
+    def test_admin_create_new_password_without_verification(self):
+        """
+        test admin create new password
+        :return:
+        """
+        data = {
+            'email': self.admin_email,
+            "new_password": "Some@1234",
+            "confirm_password": "Some@1234"
+        }
+
+        response = self.client.post(self.url, data)
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(UserEmailOtp.objects.count(), 1)
diff --git a/web_admin/tests/test_set_up.py b/web_admin/tests/test_set_up.py
index f5cf1f6..5225969 100644
--- a/web_admin/tests/test_set_up.py
+++ b/web_admin/tests/test_set_up.py
@@ -105,23 +105,31 @@ base64_image = ("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAoHCBIS
 
 class BaseSetUp(APITestCase):
     """
-
+    basic setup
     """
+
     def setUp(self) -> None:
         """
-
+        user data
         :return:
         """
+        self.user_email = 'user@example.com'
+        self.admin_email = 'admin@example.com'
         self.client = APIClient()
-        self.user = User.objects.create_user(username='user@example.com', password='user@1234')
-        self.admin_user = User.objects.create_user(username='admin@example.com', email='admin@example.com',
-                                                   password='admin@1234', is_staff=True, is_superuser=True)
+        self.user = User.objects.create_user(username=self.user_email, email=self.user_email)
+        self.user.set_password('user@1234')
+        self.user.save()
+        self.admin_user = User.objects.create_user(username=self.admin_email, email=self.admin_email,
+                                                   is_staff=True, is_superuser=True)
+        self.admin_user.set_password('admin@1234')
+        self.admin_user.save()
 
 
 class ArticleTestSetUp(BaseSetUp):
     """
     test cases data set up for article create, update
     """
+
     def setUp(self):
         """
         set up data for test
@@ -131,63 +139,71 @@ class ArticleTestSetUp(BaseSetUp):
 
         self.article = Article.objects.create(title="Existing Article", description="Existing Description",
                                               is_published=True)
-        self.article_card = ArticleCard.objects.create(article=self.article, title="Card 1",
-                                                       description="Card 1 Description")
+        self.article_card = ArticleCard.objects.create(article=self.article, title="Existing Card 1",
+                                                       description="Existing Card 1 Description")
         self.article_survey = ArticleSurvey.objects.create(article=self.article, points=5,
-                                                           question="Survey Question 1")
-        SurveyOption.objects.create(survey=self.article_survey, option="Option 1", is_answer=True)
-        SurveyOption.objects.create(survey=self.article_survey, option="Option 2", is_answer=False)
+                                                           question="Existing Survey Question 1")
+        SurveyOption.objects.create(survey=self.article_survey, option="Existing Option 1", is_answer=True)
+        SurveyOption.objects.create(survey=self.article_survey, option="Existing Option 2", is_answer=False)
+
+        self.article_list_url = 'web_admin:article-list'
+        self.article_detail_url = 'web_admin:article-detail'
+
+        # article card data with default card image
+        self.article_card_data_with_default_card_image = {
+            "title": "Card 1",
+            "description": "Card 1 Description",
+            "image_name": "card1.jpg",
+            "image_url": "https://example.com/card1.jpg"
+        }
+
+        # article card data with base64 image
+        self.article_card_data_with_base64_image = {
+            "title": "Card base64",
+            "description": "Card base64 Description",
+            "image_name": "base64_image.jpg",
+            "image_url": base64_image
+        }
+
+        # article survey option data
+        self.article_survey_option_data = [
+            {"option": "Option 1", "is_answer": True},
+            {"option": "Option 2", "is_answer": False}
+        ]
+
+        # article survey data
+        self.article_survey_data = [
+            {
+                "question": "Survey Question 1",
+                "options": self.article_survey_option_data
+            },
+            {
+                "question": "Survey Question 2",
+                "options": self.article_survey_option_data
+            },
+            {
+                "question": "Survey Question 3",
+                "options": self.article_survey_option_data
+            },
+            {
+                "question": "Survey Question 4",
+                "options": self.article_survey_option_data
+            },
+            {
+                "question": "Survey Question 5",
+                "options": self.article_survey_option_data
+            },
+        ]
 
         # article data with default card image
         self.article_data_with_default_card_image = {
             "title": "Test Article",
             "description": "Test Description",
             "article_cards": [
-                {
-                    "title": "Card 1",
-                    "description": "Card 1 Description",
-                    "image_name": "card1.jpg",
-                    "image_url": "https://example.com/updated_card1.jpg"
-                }
+                self.article_card_data_with_default_card_image
             ],
             # minimum 5 article survey needed
-            "article_survey": [
-                {
-                    "question": "Survey Question 1",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 2",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 3",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 4",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 5",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-            ]
+            "article_survey": self.article_survey_data
         }
 
         # article data with base64 card image
@@ -195,51 +211,10 @@ class ArticleTestSetUp(BaseSetUp):
             "title": "Test Article",
             "description": "Test Description",
             "article_cards": [
-                {
-                    "title": "Card 1",
-                    "description": "Card 1 Description",
-                    "image_name": "card1.jpg",
-                    "image_url": base64_image
-                }
+                self.article_card_data_with_base64_image
             ],
             # minimum 5 article survey needed
-            "article_survey": [
-                {
-                    "question": "Survey Question 1",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 2",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 3",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 4",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                {
-                    "question": "Survey Question 5",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                }
-            ]
+            "article_survey": self.article_survey_data
         }
 
         # article update data
@@ -259,55 +234,16 @@ class ArticleTestSetUp(BaseSetUp):
             ],
             # updated article survey
             "article_survey": [
-                # updated article survey
-                {
-                    "id": self.article_survey.id,
-                    "question": "Updated Survey Question 1",
-                    "options": [
-                        {"id": self.article_survey.options.first().id,
-                         "option": "Updated Option 1", "is_answer": False},
-                        # New option
-                        {"option": "Option 3", "is_answer": True}
-                    ]
-                },
-                # new article survey
-                {
-                    "question": "Survey Question 2",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                # new article survey
-                {
-                    "question": "Survey Question 3",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                # new article survey
-                {
-                    "question": "Survey Question 4",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                },
-                # new article survey
-                {
-                    "question": "Survey Question 5",
-                    "options": [
-                        {"option": "Option 1", "is_answer": True},
-                        {"option": "Option 2", "is_answer": False}
-                    ]
-                }
-            ]
-        }
-        # article card data with default card image
-        self.article_card_data_with_default_card_image = {
-            "title": "Card 1",
-            "description": "Card 1 Description",
-            "image_name": "card1.jpg",
-            "image_url": "https://example.com/card2.jpg"
+                                  # updated article survey
+                                  {
+                                      "id": self.article_survey.id,
+                                      "question": "Updated Survey Question 1",
+                                      "options": [
+                                          {"id": self.article_survey.options.first().id,
+                                           "option": "Updated Option 1", "is_answer": False},
+                                          # New option
+                                          {"option": "New Option 3", "is_answer": True}
+                                      ]
+                                      # added new articles
+                                  }] + self.article_survey_data
         }