Refactored gitlab data_api

Sergio Oliveira · Gust
1 parent 16da24cf
Showing 3 changed files with 53 additions and 36 deletions Show diff stats
colab/management/initconfig.py
colab/proxy/gitlab/data_api.py
colab/proxy/proxybase/proxy_data_api.py
@@ -70,7 +70,7 @@ ROBOTS_NOINDEX: false
 # PROXIED_APPS:
 #   gitlab:
 #     upstream: 'http://localhost:8090/gitlab/'
-#     auth_token: ''
+#     private_token: ''
 #   trac:
 #     upstream: 'http://localhost:5000/trac/'
-from colab.proxy.gitlab.models import *
-from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
-from django.db.models.fields import DateTimeField
-from dateutil.parser import parse
-import urllib2
+
 import json
+import urllib
+import urllib2
+import urlparse
+
+from dateutil.parser import parse
+
 from django.conf import settings
+from django.db.models.fields import DateTimeField
+
+from colab.proxy.gitlab.models import GitlabProject
+from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
+
 class GitlabDataAPI(ProxyDataAPI):
+    def get_request_url(self, path, **kwargs):
+        proxy_config = settings.PROXIED_APPS.get(self.app_label, {})
-  def fetchProjects(self):
-    page = 1
-    projects = []
+        upstream = proxy_config.get('upstream')
+        kwargs['private_token'] = proxy_config.get('private_token')
+        params = urllib.urlencode(kwargs)
-    proxy_config = settings.PROXIED_APPS.get(self.app_label, {})
-    admin_token = proxy_config.get('auth_token')
+        url = u'{}?{}'.format(path, params)
+        return urlparse.urljoin(upstream, url)
-    # Iterates throughout all projects pages
-    while(True):
-      data = urllib2.urlopen(proxy_config.get('upstream')+'api/v3/projects/all?private_token={}&per_page=100&page={}'.format(admin_token, page))
-      json_data = json.load(data)
+    def fetchProjects(self):
+        page = 1
+        projects = []
-      if len(json_data) == 0:
-        break
+        # Iterates throughout all projects pages
+        while(True):
+            url = self.get_request_url('/api/v3/projects/all',
+                                       per_page=100,
+                                       page=page)
+            data = urllib2.urlopen(url)
+            json_data = json.load(data)
-      page = page + 1
+            if len(json_data) == 0:
+                break
-      for element in json_data:
-        project = GitlabProject()
+            page = page + 1
-        for field in GitlabProject._meta.fields:
-          value = element[field.name]
-          value = parse(element[field.name]) if isinstance(field, DateTimeField) else value
-          setattr(project, field.name, value)
+            for element in json_data:
+                project = GitlabProject()
-        projects.append(project)
+                for field in GitlabProject._meta.fields:
+                    if isinstance(field, DateTimeField):
+                        value = parse(element[field.name])
+                    else:
+                        value = element[field.name]
-    return projects
+                    setattr(project, field.name, value)
+                projects.append(project)
-  def fetchData(self):
-    data = self.fetchProjects()
+        return projects
-    for datum in data:
-      datum.save()
+    def fetchData(self):
+        data = self.fetchProjects()
-  @property
-  def app_label(self):
-    return 'gitlab'
+        for datum in data:
+            datum.save()
+    @property
+    def app_label(self):
+        return 'gitlab'
-class ProxyDataAPI():
+class ProxyDataAPI(object):
-  def fetchData(self):
-    raise NotImplementedError('fetchData not yet implemented')
 \ No newline at end of file
+    def fetchData(self):
+        raise NotImplementedError('fetchData not yet implemented')
	@@ -70,7 +70,7 @@ ROBOTS_NOINDEX: false		@@ -70,7 +70,7 @@ ROBOTS_NOINDEX: false
70	# PROXIED_APPS:	70	# PROXIED_APPS:
71	# gitlab:	71	# gitlab:
72	# upstream: 'http://localhost:8090/gitlab/'	72	# upstream: 'http://localhost:8090/gitlab/'
73	-# auth_token: ''	73	+# private_token: ''
74	# trac:	74	# trac:
75	# upstream: 'http://localhost:5000/trac/'	75	# upstream: 'http://localhost:5000/trac/'
76		76
1		1
2	-class ProxyDataAPI():
3		2
		3	+class ProxyDataAPI(object):
4		4
5	- def fetchData(self):
6	- raise NotImplementedError('fetchData not yet implemented')
7	\ No newline at end of file	5	\ No newline at end of file
		6	+ def fetchData(self):
		7	+ raise NotImplementedError('fetchData not yet implemented')