From f6a2d5da0eebde1564bb3b9f217152b94e2606ef Mon Sep 17 00:00:00 2001
From: Ethan Xie <ethankeystone@live.com>
Date: Mon, 1 Mar 2021 11:11:21 -0500
Subject: [PATCH 1/3] removed zappa files

---
 .DS_Store | Bin 0 -> 6148 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..fe2586a0c5eb67cd825f26cef524e3ea871f0cae
GIT binary patch
literal 6148
zcmeHK!A{#i5S=BVY+Rw{fPmv(ddndZ5vGSqR-lJUl?rkN2S8xgQL&nOk?mknH^_g{
z!Ve+7puf|Z-6aA-dO>PYv?I;D*`1xW=1IHj0RYw;Mje1A0B}^ox`XBsp*ZP;%$b=w
zB2#+|A%PDNKo}MitL=nkz%uaM7@)J;fK8B)!B@C*ezVhXAVZ8^ho^%$%iHbWY_3+H
zf3d*1!<|Lv&_9udp9lFc>jmjPjkbgQBsBgfDF<Ue2zTRtanxMelt~`MNk3J|an#2p
z2YYc6$)YERNtCI5d>!Dt!5c@-<+60&w1nFowM6N<?Uv}St&c_xzVf>B_Wkj<^Y7)4
z(Zx^AEW?XP$t#1m@C%(s3O)1FWFV6-7^O@Hc94V^J|h_)A%zI~kcP#WjGO;W#%fu1
zx*ILgaX0=-$EB`&DjiqTihV$c-p1NlWWXF1{&E(Jvo%=;ECWwsfbIu@O6VD^G^(ou
zjcNf9={G_N`qWEMjxgvMtTbW-h3Qm8oyts$!E`##3$xBMSZUPhz)bVO%$J$zP?-8U
z?l07GV4g;6Ed!Q;`wZ0duu1R#yXpP^{UkfG3|IzciUC&N^0#_el6hMviletypdO==
p(7H;aN<m|uW986Oyo#y>V}cw+&tRnyXHe{qfTF<~%fLTn;17PVnT`Me

literal 0
HcmV?d00001


From 6d9c608ecc9b7bd43de11274687056e8c3be6f25 Mon Sep 17 00:00:00 2001
From: Ethan Xie <ethankeystone@live.com>
Date: Mon, 1 Mar 2021 11:14:09 -0500
Subject: [PATCH 2/3] ds_store

---
 .DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index fe2586a0c5eb67cd825f26cef524e3ea871f0cae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A{#i5S=BVY+Rw{fPmv(ddndZ5vGSqR-lJUl?rkN2S8xgQL&nOk?mknH^_g{
z!Ve+7puf|Z-6aA-dO>PYv?I;D*`1xW=1IHj0RYw;Mje1A0B}^ox`XBsp*ZP;%$b=w
zB2#+|A%PDNKo}MitL=nkz%uaM7@)J;fK8B)!B@C*ezVhXAVZ8^ho^%$%iHbWY_3+H
zf3d*1!<|Lv&_9udp9lFc>jmjPjkbgQBsBgfDF<Ue2zTRtanxMelt~`MNk3J|an#2p
z2YYc6$)YERNtCI5d>!Dt!5c@-<+60&w1nFowM6N<?Uv}St&c_xzVf>B_Wkj<^Y7)4
z(Zx^AEW?XP$t#1m@C%(s3O)1FWFV6-7^O@Hc94V^J|h_)A%zI~kcP#WjGO;W#%fu1
zx*ILgaX0=-$EB`&DjiqTihV$c-p1NlWWXF1{&E(Jvo%=;ECWwsfbIu@O6VD^G^(ou
zjcNf9={G_N`qWEMjxgvMtTbW-h3Qm8oyts$!E`##3$xBMSZUPhz)bVO%$J$zP?-8U
z?l07GV4g;6Ed!Q;`wZ0duu1R#yXpP^{UkfG3|IzciUC&N^0#_el6hMviletypdO==
p(7H;aN<m|uW986Oyo#y>V}cw+&tRnyXHe{qfTF<~%fLTn;17PVnT`Me


From ca53f864071ecf73cf74fe068edf4870f5342d19 Mon Sep 17 00:00:00 2001
From: Ethan Xie <ethankeystone@live.com>
Date: Mon, 1 Mar 2021 11:16:29 -0500
Subject: [PATCH 3/3] changed models and migrations

---
 .DS_Store                                     | Bin 0 -> 8196 bytes
 UserManagement/migrations/0003_user_token.py  |  18 +++++++
 .../migrations/0004_auto_20201024_1712.py     |  23 +++++++++
 UserManagement/models.py                      |  44 +++++++++---------
 UserManagement/views.py                       |   3 ++
 5 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 UserManagement/migrations/0003_user_token.py
 create mode 100644 UserManagement/migrations/0004_auto_20201024_1712.py

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4d2ece39239cd92a837842ff7c7fda12e15ce161
GIT binary patch
literal 8196
zcmeI1%Wl&^6o${V0i1Bl0zsCuVV6ZBB3u?oR$7pdK!Cz!0jRZc)LM1z%5iFe3G!QT
zc_G9T@H+f+Q3SbdKp_%mq;r0IW{xNGX~vV25RvGQ!!A*ah#Z*G=0&&#MYSuND_gck
zH44NNjVYmr<Wmq7bG^BO2`~XBzyz286W9a-II~r8mYn;hl|2(+0{<le^?r~rrJmKw
zsD5?8=@bB3L$xlrMjoJJq*c#qWmJdanI?M>HdNRYLzr;1OVu6fS*?tka1th*gdJJf
z3`OYC5hrzb5}r}^On?c@6HwcxPP>%Sh>m~F-$$oGoCaw97M#Y>DDQNBh^_6~x$_qs
zr{Od%H{J}6(qfSN`FPa#vsdcwiJu<@_WD_x#?xy*co7YY{pPjZG|Bxa8D=^-3Ww<O
z`el@aY0*!|NjTEa8JGsgsXO)k=Jm34@3f`co3v%=x}CP{-MT%Q)SVkQyLTTPoV<Hq
zewcjxWacL9`+=^`%=Po)iJlFzBu<k<w5rHU6w{E-U@_f?_bCUIjD|rm1@ir018J3I
zuj2xP+gXX^i$Smy$=6jAo&nRKrvMSrTdb1D01^UDwqa1Zy`8q~x;uXiW#MFJfLx*H
z*fM}XkFZJ-*dgvtU<u_L2IjA=mX(wK4G=byRLc+QS*?t!ZKmqY0nX>Y#=(vWtewEN
z8L_4E|9i`S|6lv(;sKce6IdSsQQI5r^)a3~n&$^rN410<z*JHFDx*3CPM_vbosL7N
ce;DFgqN|GWtX4)*gTh|~GzNA|V66mx0t0R@3jhEB

literal 0
HcmV?d00001

diff --git a/UserManagement/migrations/0003_user_token.py b/UserManagement/migrations/0003_user_token.py
new file mode 100644
index 0000000..d3115f9
--- /dev/null
+++ b/UserManagement/migrations/0003_user_token.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-10-19 22:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserManagement', '0002_research_approved'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='token',
+            field=models.CharField(default='null', max_length=200),
+        ),
+    ]
diff --git a/UserManagement/migrations/0004_auto_20201024_1712.py b/UserManagement/migrations/0004_auto_20201024_1712.py
new file mode 100644
index 0000000..2615fc3
--- /dev/null
+++ b/UserManagement/migrations/0004_auto_20201024_1712.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2020-10-24 21:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserManagement', '0003_user_token'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='first_time',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='name',
+            field=models.CharField(max_length=30),
+        ),
+    ]
diff --git a/UserManagement/models.py b/UserManagement/models.py
index 75b936a..585b723 100644
--- a/UserManagement/models.py
+++ b/UserManagement/models.py
@@ -1,21 +1,23 @@
-from django.db import models
-from django.contrib.auth.models import User
-
-# Create your models here.
-class User(models.Model):
-    name = models.CharField(max_length=30, unique=True)
-    email = models.CharField(max_length=100, unique=True)
-    role = models.CharField(max_length=15)
-    phone_number = models.IntegerField(blank=True, null=True, unique=True)
-    is_deleted = models.BooleanField(default = False)
-
-
-class Research(models.Model):
-    name = models.CharField(max_length=30)
-    description = models.CharField(max_length=4000)
-    due_date = models.DateTimeField()
-    approved = models.BooleanField()
-
-class Dashboard(models.Model):
-    research = models.ForeignKey(Research, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
+from django.db import models
+from django.contrib.auth.models import User
+
+# Create your models here.
+class User(models.Model):
+    name = models.CharField(max_length=30)
+    email = models.CharField(max_length=100, unique=True)
+    role = models.CharField(max_length=15)
+    phone_number = models.IntegerField(blank=True, null=True, unique=True)
+    first_time = models.BooleanField(default=True)
+    token = models.CharField(max_length=200, default="null")
+    is_deleted = models.BooleanField(default = False)
+
+
+class Research(models.Model):
+    name = models.CharField(max_length=30)
+    description = models.CharField(max_length=4000)
+    due_date = models.DateTimeField()
+    approved = models.BooleanField()
+
+class Dashboard(models.Model):
+    research = models.ForeignKey(Research, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
diff --git a/UserManagement/views.py b/UserManagement/views.py
index e83719d..d927e1c 100644
--- a/UserManagement/views.py
+++ b/UserManagement/views.py
@@ -78,6 +78,9 @@ def updateUser(request):
         if ("name" in body_data.keys()):
             newName = body_data["name"]
             User.objects.filter(pk = user_id).update(name=newName)
+
+        User.objects.filter(pk = user_id).update(first_time=False)
+
         user = User.objects.get(pk = user_id)
         serializer = UserSerializer(user)
         return Response(serializer.data)