conficts resolved, problem with pulls resolved

Author: abbadonref

git_logger.py

@@ -1,8 +1,9 @@
-from github import Github, Repository, GithubException
 import csv
 import requests
 import json
 
+from github import Github, Repository, GithubException, PullRequest
+
 EMPTY_FIELD = 'Empty field'
 
 
@@ -34,8 +35,27 @@ def get_next_repo(client: Github, repositories):
             yield repo
 
 
+def get_assignee_story(github_object):
+    assignee_result = ""
+    events = github_object.get_issue_events() if type(
+        github_object) is PullRequest.PullRequest else github_object.get_events()
+    for event in events:
+        if event.event == "assigned" or event.event == "unassigned":
+            date = event.created_at
+            if event.event == "assigned":
+                assigner = github_object.user.login
+                assignee = event.assignee.login
+                assignee_result += f"{date}: {assigner} -> {assignee}; "
+            else:
+                assigner = github_object.user.login
+                assignee = event.assignee.login
+                assignee_result += f"{date}: {assigner} -/> {assignee}; "
+    return assignee_result
+
+
 def log_commit_to_csv(info, csv_name):
-    fieldnames = ['repository name', 'author name', 'author login', 'author email', 'date and time', 'changed files', 'commit id']
+    fieldnames = ['repository name', 'commit id', 'author name', 'author login', 'author email', 'date and time',
+                  'changed files']
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -69,7 +89,9 @@ def log_repository_commits(repository: Repository, csv_name):
 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','connected pull requests']
+                  'comment created at', 'comment author name', 'comment author login', 'comment author email',
+                  'assignee story', 'connected pull requests']
+
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -78,7 +100,8 @@ def log_issue_to_csv(info, csv_name):
 def log_issue_to_stdout(info):
     print(info)
 
-def get_connected_pulls(issue_number,repo_owner,repo_name,token):
+
+def get_connected_pulls(issue_number, repo_owner, repo_name, token):
     access_token = token
     repo_owner = repo_owner.login
     # Формирование запроса GraphQL
@@ -124,16 +147,20 @@ def get_connected_pulls(issue_number,repo_owner,repo_name,token):
     response_data = response.json()
     # Обработка полученных данных
     pull_request_data = response_data["data"]["repository"]["issue"]
-    if(pull_request_data is not None):
+    list_url = []
+    if (pull_request_data is not None):
         issues_data = pull_request_data["timelineItems"]["nodes"]
-        list_url = []
         for pulls in issues_data:
-            if (pulls.get("CrossReferencedEvent") != None):
+            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):
+            if (pulls.get("ConnectedEvent") != None and pulls.get("ConnectedEvent").get("url") not in list_url):
                 list_url.append(pulls.get("ConnectedEvent").get("url"))
-        return list_url
-    return None
+        if (list_url == []):
+            return 'Empty field'
+        else:
+            return list_url
+    return 'Empty field'
+
 
 
 def log_repository_issues(repository: Repository, csv_name, token):
@@ -154,19 +181,23 @@ def log_repository_issues(repository: Repository, csv_name, token):
             'comment author name': EMPTY_FIELD,
             'comment author login': EMPTY_FIELD,
             'comment author email': EMPTY_FIELD,
-            'connected pull requests' : 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['connected pull requests'] = get_connected_pulls(issue.number, repository.owner, repository.name,
+                                                                      token)
+
+        info_tmp['assignee story'] = get_assignee_story(issue)
 
         if issue.user is not None:
             info_tmp['creator name'] = issue.user.name
             info_tmp['creator login'] = issue.user.login
 
         if issue.closed_by is not None:
             info_tmp['closed at'] = issue.closed_at
-            info_tmp['creator name'] = issue.closed_by.name
-            info_tmp['creator login'] = issue.user.login
+            info_tmp['closer name'] = issue.closed_by.name
+            info_tmp['closer login'] = issue.user.login
 
         if issue.get_comments().totalCount > 0:
             for comment in issue.get_comments():
@@ -187,7 +218,8 @@ def log_pr_to_csv(info, csv_name):
     fieldnames = ['repository name', 'title', 'state', 'commit into', 'commit from', 'created at', 'creator 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','related issues']
+                  'comment author email', 'merger name', 'merger login', 'merger email', 'source branch',
+                  'target branch', 'assignee story', 'related issues']
     with open(csv_name, 'a', newline='') as file:
         writer = csv.DictWriter(file, fieldnames=fieldnames)
         writer.writerow(info)
@@ -196,7 +228,8 @@ def log_pr_to_csv(info, csv_name):
 def log_pr_to_stdout(info):
     print(info)
 
-def get_related_issues(pull_request_number,repo_owner,repo_name,token):
+
+def get_related_issues(pull_request_number, repo_owner, repo_name, token):
     access_token = token
     repo_owner = repo_owner.login
 
@@ -242,7 +275,7 @@ def get_related_issues(pull_request_number,repo_owner,repo_name,token):
     return list_issues_url
 
 
-def log_repositories_pr(repository: Repository, csv_name,token):
+def log_repositories_pr(repository: Repository, csv_name, token):
     for pull in repository.get_pulls(state='all'):
         info_tmp = {
             'repository name': repository.full_name,
@@ -263,8 +296,9 @@ def log_repositories_pr(repository: Repository, csv_name,token):
             'merger name': EMPTY_FIELD,
             'merger login': EMPTY_FIELD,
             'merger email': EMPTY_FIELD,
-  	    'source branch': pull.head.ref,
+            '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:
@@ -275,6 +309,8 @@ def log_repositories_pr(repository: Repository, csv_name,token):
             info_tmp['merger login'] = pull.merged_by.login
             info_tmp['merger email'] = pull.merged_by.email
 
+        info_tmp['assignee story'] = get_assignee_story(pull)
+
         if pull.get_comments().totalCount > 0:
             for comment in pull.get_comments():
                 info = info_tmp
@@ -290,7 +326,7 @@ def log_repositories_pr(repository: Repository, csv_name,token):
             log_pr_to_stdout(info_tmp)
 
 
-def log_pull_requests(client: Github, repositories, csv_name,token):
+def log_pull_requests(client: Github, repositories, csv_name, token):
     with open(csv_name, 'w', newline='') as file:
         writer = csv.writer(file)
         writer.writerow(
@@ -313,9 +349,11 @@ def log_pull_requests(client: Github, repositories, csv_name,token):
                 'merger name',
                 'merger login',
                 'merger email',
-  		'source branch',
+                'source branch',
                 'target branch',
                 'related issues'
+                'assignee story',
+                'related issues'
             )
         )
 
@@ -335,8 +373,10 @@ def log_issues(client: Github, repositories, csv_name, token):
                 'task',
                 'created at',
                 'creator name',
+                'creator login',
                 'creator email',
                 'closer name',
+                'closer login',
                 'closer email',
                 'closed at',
                 'comment body',
@@ -345,6 +385,8 @@ def log_issues(client: Github, repositories, csv_name, token):
                 'comment author login',
                 'comment author email',
                 'connected pull requests'
+                'assignee story',
+                'connected pull requests'
             )
         )