resolve git_logger.py

Author: Toropigeon

git_logger.py

@@ -1,4 +1,6 @@
 import csv
+import requests
+import json
 import pytz
 
 from github import Github, Repository, GithubException, PullRequest
@@ -76,7 +78,8 @@ def log_repository_commits(repository: Repository, csv_name, start, finish):
                     'author login': EMPTY_FIELD,
                     'author email': EMPTY_FIELD,
                     'date and time': commit.commit.author.date.astimezone(pytz.timezone('Europe/Moscow')),
-                    '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
@@ -103,7 +106,68 @@ def log_issue_to_stdout(info):
     print(info)
 
 
-def log_repository_issues(repository: Repository, csv_name, start, finish):
+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, start, finish):
     for issue in repository.get_issues(state='all'):
         if issue.created_at.astimezone(pytz.timezone('Europe/Moscow')) < start or issue.created_at.astimezone(
                 pytz.timezone('Europe/Moscow')) > finish:
@@ -172,7 +236,53 @@ def log_pr_to_stdout(info):
     print(info)
 
 
-def log_repositories_pr(repository: Repository, csv_name, start, finish):
+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, start, finish):
     for pull in repository.get_pulls(state='all'):
         if pull.created_at.astimezone(pytz.timezone('Europe/Moscow')) < start or pull.created_at.astimezone(
                 pytz.timezone('Europe/Moscow')) > finish:
@@ -227,7 +337,7 @@ def log_repositories_pr(repository: Repository, csv_name, start, finish):
             log_pr_to_stdout(info_tmp)
 
 
-def log_pull_requests(client: Github, repositories, csv_name, start, finish):
+def log_pull_requests(client: Github, repositories, csv_name, token, start, finish):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
@@ -260,10 +370,10 @@ def log_pull_requests(client: Github, repositories, csv_name, start, finish):
         )
 
     for repo in get_next_repo(client, repositories):
-        log_repositories_pr(repo, csv_name, start, finish)
+        log_repositories_pr(repo, csv_name, token, start, finish)
 
 
-def log_issues(client: Github, repositories, csv_name, start, finish):
+def log_issues(client: Github, repositories, csv_name, token, start, finish):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
@@ -293,7 +403,7 @@ def log_issues(client: Github, repositories, csv_name, start, finish):
         )
 
     for repo in get_next_repo(client, repositories):
-        log_repository_issues(repo, csv_name, start, finish)
+        log_repository_issues(repo, csv_name, token, start, finish)
 
 
 def log_commits(client: Github, repositories, csv_name, start, finish):