Commit b646a750 authored by Meet Narendra's avatar Meet Narendra 💬

added columns

parent 5adda3ff
...@@ -11,7 +11,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): ...@@ -11,7 +11,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
class ProjectSerializer(serializers.HyperlinkedModelSerializer): class ProjectSerializer(serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
model = Projects model = Projects
fields = ('pid','pname','created_date','powner') fields = ('pid','pname','created_date','powner','git_id','jira_id','confluence_id')
class AccessSerializer(serializers.HyperlinkedModelSerializer): class AccessSerializer(serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
......
...@@ -15,5 +15,6 @@ urlpatterns = [ ...@@ -15,5 +15,6 @@ urlpatterns = [
path('authenticate/',authenticateViewSet.as_view()), path('authenticate/',authenticateViewSet.as_view()),
path('register/',registerViewSet.as_view()), path('register/',registerViewSet.as_view()),
path('getRepos/',getReposViewSet.as_view()), path('getRepos/',getReposViewSet.as_view()),
path('getGitFiles/',getGitFilesViewSet.as_view()),
path('api-auth/',include('rest_framework.urls')) path('api-auth/',include('rest_framework.urls'))
] ]
...@@ -62,10 +62,24 @@ class getReposViewSet(views.APIView): ...@@ -62,10 +62,24 @@ class getReposViewSet(views.APIView):
access = Access.objects.filter(uid=user).values('pid').distinct() access = Access.objects.filter(uid=user).values('pid').distinct()
try: try:
repos = Projects.objects.filter(pid__in=access) repos = Projects.objects.filter(pid__in=access)
print("Projects",Projects.objects.values()) #print("Projects",Projects.objects.values())
except Exception as e: except Exception as e:
print(e) print(e)
print("Repos",repos) print("Repos",repos)
return Response({'repos':repos.values(),'status':True}) return Response({'repos':repos.values(),'status':True})
except: except:
return Response({'status':False}) return Response({'status':False})
class getGitFilesViewSet(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({'files':project.values('git_id'),'status':True})
except Exception as e:
print(e)
return Response({'status':False})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment