Skip to content

Commit

Permalink
bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Zerskk committed Apr 23, 2024
1 parent e54e9cb commit 2c710ac
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions app/gitlab/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def __init__(self):
self.headers = {"Authorization": f'{"Bearer "}{self.api_token}'}
self.api_path = "/api/v4"


def _make_request(self, url, method="GET", data=None):
try:
response = requests.request(method, url, timeout=5, headers=self.headers, json=data)
Expand Down Expand Up @@ -85,7 +84,7 @@ def get_userid_by_mail(self, email):
except requests.exceptions.RequestException as err:
print(err)

def get_project_members(self,project_id):
def get_project_members(self, project_id):
url = f"{self.api_url}/projects/{project_id}/members"

response = requests.get(url, headers=self.headers)
Expand All @@ -112,15 +111,14 @@ def get_group_members(self, group_id):
return [member['id'] for member in members]
return []

def get_project_and_group_members(project_id):
def get_project_and_group_members(self, project_id):
project_members = self.get_project_members(project_id)
groups_with_access = self.get_groups_with_access_to_project(project_id)
group_members = []
for group_id in groups_with_access:
group_members.extend(self.get_group_members(group_id))
return project_members, group_members


def userid_is_member(self, userid, project_id):
self.get_project_and_group_members(project_id)
project_members, group_members = get_project_and_group_members(project_id)
Expand All @@ -134,8 +132,6 @@ def userid_is_member(self, userid, project_id):
else:
return False



def userid_is_member_old(self, userid, project_id):
path = "/projects/"
member_path = "/members"
Expand Down Expand Up @@ -410,7 +406,6 @@ def add_badge(self, project_id: int, badge_data: BadgeEdit):
except requests.exceptions.RequestException as err:
print(err)


def remove_badge(self, project_id: int, badge_id: int):
path = "/projects/"
badge_path = "/badges/"
Expand Down Expand Up @@ -513,7 +508,6 @@ def get_job_artifact_arcjson(self, project_id: int, branch: str, filename: str,
except requests.exceptions.RequestException as err:
print(err)


def get_job_artifact_md(self, project_id: int, branch: str, filename: str, job_name: str):
path = "/projects/"
job_path = "/jobs/artifacts/"
Expand All @@ -530,7 +524,6 @@ def get_job_artifact_md(self, project_id: int, branch: str, filename: str, job_n
response.raise_for_status()
# response_json = response.json()#


# print("-->", response_json)

# metadata = Metadata(**response_json)
Expand Down

0 comments on commit 2c710ac

Please sign in to comment.