Merge branch 'master' into issue_16_ratelimit_exception

Author: Toropigeon

git_logger.py

@@ -1,4 +1,6 @@
 import csv
+import requests
+import json
 
 from github import Github, Repository, GithubException, PullRequest
 
@@ -7,6 +9,7 @@
 
 def login(token):
     client = Github(login_or_token=token)
+
     try:
         client.get_user().login
     except GithubException as err:
@@ -67,12 +70,12 @@ def log_repository_commits(repository: Repository, csv_name):
     for commit in repository.get_commits():
         if commit.commit is not None:
             info = {'repository name': repository.full_name,
-                    'commit id': commit.commit.sha,
                     'author name': commit.commit.author.name,
                     'author login': EMPTY_FIELD,
                     'author email': EMPTY_FIELD,
                     'date and time': commit.commit.author.date,
-                    'changed files': '; '.join([file.filename for file in commit.files])}
+                    'changed files': '; '.join([file.filename for file in commit.files]),
+                    'commit id': commit.commit.sha}
 
             if commit.author is not None:
                 info['author login'] = commit.author.login
@@ -89,7 +92,8 @@ def log_issue_to_csv(info, csv_name):
     fieldnames = ['repository name', 'number', 'title', 'state', 'task', 'created at', 'creator name', 'creator login',
                   'creator email', 'closer name', 'closer login', 'closer email', 'closed at', 'comment body',
                   'comment created at', 'comment author name', 'comment author login', 'comment author email',
-                  'assignee story', ]
+                  'assignee story', 'connected pull requests']
+
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -99,7 +103,69 @@ def log_issue_to_stdout(info):
     print(info)
 
 
-def log_repository_issues(repository: Repository, csv_name):
+def get_connected_pulls(issue_number, repo_owner, repo_name, token):
+    access_token = token
+    repo_owner = repo_owner.login
+    # Формирование запроса GraphQL
+    query = """
+    {
+      repository(owner: "%s", name: "%s") {
+        issue(number: %d) {
+          timelineItems(first: 50, itemTypes:[CONNECTED_EVENT,CROSS_REFERENCED_EVENT]) {
+            filteredCount
+            nodes {
+              ... on ConnectedEvent {
+                ConnectedEvent: subject {
+                  ... on PullRequest {
+                    number
+                    title
+                    url
+                  }
+                }
+              }
+              ... on CrossReferencedEvent {
+                CrossReferencedEvent: source {
+                  ... on PullRequest {
+                    number
+                    title
+                    url
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }""" % (repo_owner, repo_name, issue_number)
+
+    # Формирование заголовков запроса
+    headers = {
+        "Authorization": f"Bearer {access_token}",
+        "Content-Type": "application/json"
+    }
+
+    # Отправка запроса GraphQL
+    response = requests.post("https://api.github.com/graphql", headers=headers, data=json.dumps({"query": query}))
+    response_data = response.json()
+    # Обработка полученных данных
+    pull_request_data = response_data["data"]["repository"]["issue"]
+    list_url = []
+    if (pull_request_data is not None):
+        issues_data = pull_request_data["timelineItems"]["nodes"]
+        for pulls in issues_data:
+            if (pulls.get("CrossReferencedEvent") != None and pulls.get("CrossReferencedEvent").get("url") not in list_url) :
+                list_url.append(pulls.get("CrossReferencedEvent").get("url"))
+            if (pulls.get("ConnectedEvent") != None and pulls.get("ConnectedEvent").get("url") not in list_url):
+                list_url.append(pulls.get("ConnectedEvent").get("url"))
+        if (list_url == []):
+            return 'Empty field'
+        else:
+            return list_url
+    return 'Empty field'
+
+
+
+def log_repository_issues(repository: Repository, csv_name, token):
     for issue in repository.get_issues(state='all'):
         info_tmp = {
             'repository name': repository.full_name, 'number': issue.number, 'title': issue.title,
@@ -118,7 +184,11 @@ def log_repository_issues(repository: Repository, csv_name):
             'comment author login': EMPTY_FIELD,
             'comment author email': EMPTY_FIELD,
             'assignee story': EMPTY_FIELD,
+            'connected pull requests': EMPTY_FIELD
         }
+        if issue.number is not None:
+            info_tmp['connected pull requests'] = get_connected_pulls(issue.number, repository.owner, repository.name,
+                                                                      token)
 
         info_tmp['assignee story'] = get_assignee_story(issue)
 
@@ -152,7 +222,7 @@ def log_pr_to_csv(info, csv_name):
                   'creator login', 'creator email',
                   'changed files', 'comment body', 'comment created at', 'comment author name', 'comment author login',
                   'comment author email', 'merger name', 'merger login', 'merger email', 'source branch',
-                  'target branch', 'assignee story', ]
+                  'target branch', 'assignee story', 'related issues']
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -162,7 +232,53 @@ def log_pr_to_stdout(info):
     print(info)
 
 
-def log_repositories_pr(repository: Repository, csv_name):
+def get_related_issues(pull_request_number, repo_owner, repo_name, token):
+    access_token = token
+    repo_owner = repo_owner.login
+
+    # Формирование запроса GraphQL
+    query = """
+        {
+          repository(owner: "%s", name: "%s") {
+            pullRequest(number: %d) {
+              id
+              closingIssuesReferences(first: 50) {
+                edges {
+                  node {
+                    id
+                    body
+                    number
+                    title
+                    url
+                  }
+                }
+              }
+            }
+          }
+        }
+        """ % (repo_owner, repo_name, pull_request_number)
+
+    # Формирование заголовков запроса
+    headers = {
+        "Authorization": f"Bearer {access_token}",
+        "Content-Type": "application/json"
+    }
+
+    # Отправка запроса GraphQL
+    response = requests.post("https://api.github.com/graphql", headers=headers, data=json.dumps({"query": query}))
+    response_data = response.json()
+    # Обработка полученных данных
+    pull_request_data = response_data["data"]["repository"]["pullRequest"]
+    issues_data = pull_request_data["closingIssuesReferences"]["edges"]
+    list_issues_url = []
+    # сохранение информации об issues
+    for issue in issues_data:
+        issue_node = issue["node"]
+        list_issues_url.append(issue_node["url"])
+    return list_issues_url
+
+
+def log_repositories_pr(repository: Repository, csv_name, token):
     for pull in repository.get_pulls(state='all'):
         info_tmp = {
             'repository name': repository.full_name,
@@ -186,7 +302,10 @@ def log_repositories_pr(repository: Repository, csv_name):
             'source branch': pull.head.ref,
             'target branch': pull.base.ref,
             'assignee story': EMPTY_FIELD,
+            'related issues': EMPTY_FIELD
         }
+        if pull.issue_url is not None:
+            info_tmp['related issues'] = get_related_issues(pull.number, repository.owner, repository.name, token)
 
         if pull.merged_by is not None:
             info_tmp['merger name'] = pull.merged_by.name
@@ -211,7 +330,7 @@ def log_repositories_pr(repository: Repository, csv_name):
         sleep(0.05)
 
 
-def log_pull_requests(client: Github, repositories, csv_name):
+def log_pull_requests(client: Github, repositories, csv_name, token):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
@@ -236,7 +355,9 @@ def log_pull_requests(client: Github, repositories, csv_name):
                 'merger email',
                 'source branch',
                 'target branch',
+                'related issues'
                 'assignee story',
+                'related issues'
             )
         )
 
@@ -249,7 +370,7 @@ def log_pull_requests(client: Github, repositories, csv_name):
 
 
 
-def log_issues(client: Github, repositories, csv_name):
+def log_issues(client: Github, repositories, csv_name, token):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
@@ -272,7 +393,9 @@ def log_issues(client: Github, repositories, csv_name):
                 'comment author name',
                 'comment author login',
                 'comment author email',
+                'connected pull requests'
                 'assignee story',
+                'connected pull requests'
             )
         )
 
@@ -291,12 +414,12 @@ def log_commits(client: Github, repositories, csv_name):
         writer.writerow(
             (
                 'repository name',
-                'commit id',
                 'author name',
                 'author login',
                 'author email',
                 'date and time',
                 'changed files',
+                'commit id'
             )
         )
 

main.py

@@ -26,9 +26,9 @@ def main():
         if not args.p and not args.i:
             git_logger.log_commits(client, repositories, csv_name)
         if args.p:
-            git_logger.log_pull_requests(client, repositories, csv_name)
+            git_logger.log_pull_requests(client, repositories, csv_name, token)
         if args.i:
-            git_logger.log_issues(client, repositories, csv_name)
+            git_logger.log_issues(client, repositories, csv_name, token)
 
 
 if __name__ == '__main__':

requirements.txt

@@ -1 +1,2 @@
-PyGithub~=1.55
+PyGithub~=1.55
+requests~=2.31.0