merging conflict in urls.py

sitcomm/api/serializers.py

@@ -6,7 +6,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Users
         fields = ('uid','email','password','role','created_date','active',
-        'slack_token','github_token','confluence_token','jira_token')
+        'profile_img')
 
 class ProjectSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:

sitcomm/api/urls.py

@@ -17,5 +17,8 @@ urlpatterns = [
     path('getRepos/',getReposViewSet.as_view()),
     path('getGitFiles/',getGitFilesViewSet.as_view()),
     path('getJiraTickets/',getJiraTicketsViewSet.as_view()),
+    path('getConfluencePages/',getConfluencePagesViewSet.as_view()),
+    path('getUserDetails/',getUserDetailsViewSet.as_view()),
+    path('postUserDetails/',postUserDetailsViewSet.as_view()),
     path('api-auth/',include('rest_framework.urls'))
 ]

sitcomm/api/views.py

@@ -93,4 +93,44 @@ class getGitFilesViewSet(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 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:
+            user = Users.objects.filter(uid=uid)
+            if user is None:
+                return Response({'status':False})
+            status = user.update(email=email,password=password,role=role,profile_img=profile_img)
+            return Response({'status':bool(status)})
+        except Exception as e:
+            print(e)
+            return Response({'status':False})
+
+class getConfluencePagesViewSet(views.APIView):
+    def get(self,request):
+        pid = request.GET.get('pid')
+        try:
+            project = Projects.objects.filter(pid=pid)
+            if project is None:
+                return Response({'status':False})
+            return Response({'pages':project.values('confluence_id'),'status':True})
+        except Exception as e:
+            print(e)
+            return Response({'status':False})

sitcomm/home/migrations/0003_remove_users_confluence_token_and_more.py

+# Generated by Django 4.1.1 on 2022-11-21 12:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("home", "0002_projects_confluence_id_projects_git_id_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(model_name="users", name="confluence_token",),
+        migrations.RemoveField(model_name="users", name="github_token",),
+        migrations.RemoveField(model_name="users", name="jira_token",),
+        migrations.RemoveField(model_name="users", name="slack_token",),
+        migrations.AddField(
+            model_name="users",
+            name="profile_img",
+            field=models.CharField(default="blank.png", max_length=100),
+        ),
+    ]

sitcomm/home/models.py

@@ -9,10 +9,7 @@ class Users(models.Model):
     role = models.CharField(max_length=30)
     created_date = models.DateTimeField(auto_now_add=True,blank=True)
     active = models.BooleanField(default=False)
-    slack_token = models.CharField(max_length=50)
-    github_token = models.CharField(max_length=50)
-    confluence_token = models.CharField(max_length=50)
-    jira_token = models.CharField(max_length=50)
+    profile_img = models.CharField(max_length=100,default='blank.png')
 
     def __str__(self):
         return f'{self.uid=},{self.email=},{self.password=},{self.role=},{self.created_date=},{self.active=}'