From cd98af77050c44b67ffa4f28f4f91c5bdb89159a Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Thu, 12 Jul 2018 13:44:59 +0200 Subject: [PATCH] swh.lister.gitlab: Change uid format --- swh/lister/gitlab/lister.py | 5 ++++- swh/lister/gitlab/models.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/swh/lister/gitlab/lister.py b/swh/lister/gitlab/lister.py index 85c0a52..ac3cb31 100644 --- a/swh/lister/gitlab/lister.py +++ b/swh/lister/gitlab/lister.py @@ -66,10 +66,13 @@ class GitLabLister(PageByPageHttpLister): params['auth'] = (auth['username'], auth['password']) return params + def uid(self, repo): + return '%s/%s' % (self.instance, repo['path_with_namespace']) + def get_model_from_repo(self, repo): return { 'instance': self.instance, - 'uid': repo['id'], + 'uid': self.uid(repo), 'name': repo['name'], 'full_name': repo['path_with_namespace'], 'html_url': repo['web_url'], diff --git a/swh/lister/gitlab/models.py b/swh/lister/gitlab/models.py index 8b1d950..68841bf 100644 --- a/swh/lister/gitlab/models.py +++ b/swh/lister/gitlab/models.py @@ -13,8 +13,7 @@ class GitLabModel(ModelBase): """ __tablename__ = 'gitlab_repo' - id = Column(Integer, primary_key=True) - uid = Column(Integer, index=True) + uid = Column(String, primary_key=True) instance = Column(String, index=True) def __init__(self, uid=None, indexable=None, name=None,