Meet final p1

sitcomm/api/serializers.py

@@ -6,12 +6,12 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Users
         fields = ('uid','email','password','role','created_date','active',
-        'profile_img')
+        'profile_img','bio', 'first_name', 'last_name')
 
 class ProjectSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Projects
-        fields = ('pid','pname','created_date','powner','git_id','jira_id','confluence_id')
+        fields = ('pid','pname','created_date','powner','git_id','jira_id','confluence_id', 'description', 'content')
 
 class AccessSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:

sitcomm/api/urls.py

@@ -18,8 +18,14 @@ urlpatterns = [
     path('getRepos/',getReposViewSet.as_view()),
     path('getGitFiles/',getGitFilesViewSet.as_view()),
     path('getJiraTickets/',getJiraTicketsViewSet.as_view()),
+    path('getJiraBoards/',getJiraBoardViewSet.as_view()),
+    path('createJiraTicket/',createJiraTicketViewSet.as_view()),
+    path('updateJiraTicket/',updateJiraTicketViewSet.as_view()),
+    path('postFileChange/',postFileChangeViewSet.as_view()),
+    path('postFileCreate/',postFileCreateViewSet.as_view()),
     path('getConfluencePages/',getConfluencePagesViewSet.as_view()),
     path('getUserDetails/',getUserDetailsViewSet.as_view()),
     path('postUserDetails/',postUserDetailsViewSet.as_view()),
+    path('getProjectDetails/',getProjectDetailsViewSet.as_view()),
     path('api-auth/',include('rest_framework.urls'))
 ]

sitcomm/api/views.py

@@ -41,24 +41,33 @@ class authenticateViewSet(views.APIView):
     def post(self,request):
         email = request.data.get('email')
         password = request.data.get('password')
+        #print(email,password)
         try:
-            user = Users.objects.get(email=email,password=password)
-            if user is None:
+            user = Users.objects.filter(email=email)
+            #print(user)
+            user = user.filter(password=password)
+            #print(user, len(user), user is None)
+            if len(user) == 0:
                 return Response({'status':False})
-            status = Users.objects.update(email=email,password=password,active=True)
+            status = user.update(active=True)
             return Response({'email':email,'status':bool(status)})
         except:
             return Response({'status':False})
 
 class registerViewSet(views.APIView):
     def post(self,request):
-        email = request.data.get('email')
-        password = request.data.get('password')
-        role = request.data.get('role')
         try:
-            user = Users.objects.create(email=email,password=password,role=role,active=True)
+            print("Registering user")
+            email = request.data.get('email')
+            password = request.data.get('password')
+            role = request.data.get('role')
+            first_name = request.data.get('first_name')
+            last_name = request.data.get('last_name')
+            #print(email,password,role)
+            user = Users.objects.create(email=email,password=password,role=role,first_name=first_name,last_name=last_name)
             return Response({'uid':user.uid,'status':True})
-        except:
+        except Exception as e:
+            print(e)
             return Response({'status':False})
 
 class getJiraTicketsViewSet(views.APIView):
@@ -86,7 +95,7 @@ class getJiraBoardViewSet(views.APIView):
             project = Projects.objects.filter(pid=pid)
             if project is None:
                 return Response({'status':False})
-            tickets = Tickets.objects.filter(pname=pid)
+            tickets = Tickets.objects.filter(pid=pid)
             if tickets is None:
                 return Response({'status':False})
             if col_name != 'All':
@@ -131,12 +140,15 @@ class updateJiraTicketViewSet(views.APIView):
 class getReposViewSet(views.APIView):
     def get(self,request):
         uid = request.GET.get('uid')
+        print(uid)
         try:
-            user = Users.objects.get(uid=uid)
-            if user is None:
+            user = Users.objects.filter(uid=uid)
+            if len(user) == 0:
+                print("User not found")
                 return Response({'status':False})
-            access = Access.objects.filter(uid=user).values('pid').distinct()
+            access = Access.objects.filter(uid=uid).values('pid').distinct()
             try:
+                print('finding pid in access')
                 repos = Projects.objects.filter(pid__in=access)
                 #print("Projects",Projects.objects.values())
             except Exception as e:
@@ -204,7 +216,7 @@ class getUserDetailsViewSet(views.APIView):
         uid = request.GET.get('uid')
         try:
             user = Users.objects.filter(uid=uid)
-            if user is None:
+            if len(user) == 0:
                 return Response({'status':False})
             return Response({'user':user.values(),'status':True})
         except Exception as e:
@@ -214,16 +226,18 @@ class getUserDetailsViewSet(views.APIView):
     
 class postUserDetailsViewSet(views.APIView):
     def post(self,request):
-        uid = request.data.get('uid')
-        email = request.data.get('email')
-        password = request.data.get('password')
-        role = request.data.get('role')
-        profile_img = request.data.get('profile_img')
         try:
+            uid = request.data.get('uid')
+            first_name = request.data.get('first_name')
+            last_name = request.data.get('last_name')
+            bio = request.data.get('bio')
+            profile_img = request.data.get('profile_img')
+            #print(uid,first_name,last_name,bio,profile_img)
+            #return Response({'status':False})
             user = Users.objects.filter(uid=uid)
-            if user is None:
+            if len(user) == 0:
                 return Response({'status':False})
-            status = user.update(email=email,password=password,role=role,profile_img=profile_img)
+            status = user.update(first_name=first_name,last_name=last_name,bio=bio,profile_img=profile_img)
             return Response({'status':bool(status)})
         except Exception as e:
             print(e)
@@ -241,17 +255,6 @@ class getConfluencePagesViewSet(views.APIView):
             print(e)
             return Response({'status':False})
 
-class getUserDetailsViewSet(views.APIView):
-    def get(self,request):
-        uid = request.GET.get('uid')
-        try:
-            user = Users.objects.filter(uid=uid)
-            if user is None:
-                return Response({'status':False})
-            return Response({'user':user.values(),'status':True})
-        except Exception as e:
-            print(e)
-            return Response({'status':False})
 
 class getProjectDetailsViewSet(views.APIView):
     def get(self,request):

sitcomm/home/migrations/0004_tickets.py

+# Generated by Django 4.1.1 on 2022-11-22 05:14
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("home", "0003_remove_users_confluence_token_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Tickets",
+            fields=[
+                (
+                    "tid",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("name", models.CharField(max_length=50)),
+                ("content", models.CharField(max_length=50)),
+                ("status", models.CharField(max_length=50)),
+                ("pid", models.CharField(max_length=50)),
+            ],
+        ),
+    ]

sitcomm/home/migrations/0005_users_bio.py

+# Generated by Django 4.1.1 on 2022-11-22 06:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("home", "0004_tickets"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="users",
+            name="bio",
+            field=models.CharField(default="", max_length=100),
+        ),
+    ]

sitcomm/home/migrations/0006_users_first_name_users_last_name.py

+# Generated by Django 4.1.1 on 2022-11-22 07:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("home", "0005_users_bio"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="users",
+            name="first_name",
+            field=models.CharField(default="John", max_length=30),
+        ),
+        migrations.AddField(
+            model_name="users",
+            name="last_name",
+            field=models.CharField(default="Doe", max_length=30),
+        ),
+    ]

sitcomm/home/migrations/0007_projects_content_projects_description.py

+# Generated by Django 4.1.1 on 2022-11-22 09:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("home", "0006_users_first_name_users_last_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="projects",
+            name="content",
+            field=models.CharField(default="Project Content", max_length=100),
+        ),
+        migrations.AddField(
+            model_name="projects",
+            name="description",
+            field=models.CharField(default="This project is about...", max_length=100),
+        ),
+    ]

sitcomm/home/models.py

@@ -10,9 +10,12 @@ class Users(models.Model):
     created_date = models.DateTimeField(auto_now_add=True,blank=True)
     active = models.BooleanField(default=False)
     profile_img = models.CharField(max_length=100,default='blank.png')
+    bio = models.CharField(max_length=100,default='')
+    first_name = models.CharField(max_length=30,default='John')
+    last_name = models.CharField(max_length=30,default='Doe')
 
     def __str__(self):
-        return f'{self.uid=},{self.email=},{self.password=},{self.role=},{self.created_date=},{self.active=}'
+        return f'{self.uid=},{self.email=},{self.password=},{self.role=},{self.created_date=},{self.active=}, {self.profile_img=}, {self.bio=}, {self.first_name=}, {self.last_name=}'
 
 class Projects(models.Model):
     pid = models.UUIDField(primary_key=True,default=uuid.uuid4,editable=False)
@@ -22,6 +25,8 @@ class Projects(models.Model):
     git_id = models.CharField(max_length=50,default='')
     jira_id = models.CharField(max_length=50, default='')
     confluence_id = models.CharField(max_length=50, default='')
+    description = models.CharField(max_length=100,default='This project is about...')
+    content = models.CharField(max_length=100,default='Project Content')
 
 
     def __str__(self):