Fix tests (#139)

Author: thehighestmath

.github/workflows/smoke-tests.yml

@@ -90,6 +90,6 @@ jobs:
         else
           echo "::error::Header is invalid for ${{ matrix.args }}"
           echo "Expected: $HEADER"
-          echo "Actual: $FIRST_LINE"
+          echo "Actual:   $FIRST_LINE"
           exit 1
         fi

commits_parser.py

@@ -14,8 +14,9 @@
 class CommitData:
     repository_name: str = ''
     author_name: str = ''
+    author_login: str = ''
     author_email: str = ''
-    datetime: str = ''
+    date_and_time: str = ''
     changed_files: str = ''
     commit_id: str = ''
     branch: str = ''
@@ -51,8 +52,9 @@ def log_repository_commits(
             commit_data = CommitData(
                 repository_name=repository.name,
                 author_name=commit.author.username,
+                author_login=commit.author.login or EMPTY_FIELD,
                 author_email=commit.author.email or EMPTY_FIELD,
-                datetime=commit.date.astimezone(pytz.timezone(TIMEZONE)).isoformat(),
+                date_and_time=commit.date.astimezone(pytz.timezone(TIMEZONE)).isoformat(),
                 changed_files=changed_files,
                 commit_id=commit._id,
                 branch=branch,

issues_parser.py

@@ -23,23 +23,19 @@ class IssueData:
     creator_name: str = ''
     creator_login: str = ''
     creator_email: str = ''
-    closed_at: str | None = None
     closer_name: str | None = None
     closer_login: str | None = None
     closer_email: str | None = None
-    assignee_story: str = ''
-    connected_pull_requests: str = ''
-    labels: str = ''
-    milestone: str = ''
-
-
-@dataclass(kw_only=True, frozen=True)
-class IssueDataWithComment(IssueData):
+    closed_at: str | None = None
     comment_body: str = ''
     comment_created_at: str = ''
     comment_author_name: str = ''
     comment_author_login: str = ''
     comment_author_email: str = ''
+    assignee_story: str = ''
+    connected_pull_requests: str = ''
+    labels: str = ''
+    milestone: str = ''
 
 
 def get_connected_pulls(
@@ -223,13 +219,17 @@ def get_info(obj, attr):
 def log_issue_and_comments(csv_name, issue_data: IssueData, comments):
     if comments:
         for comment in comments:
-            comment_data = IssueDataWithComment(
-                **asdict(issue_data),
-                comment_body=comment.body,
-                comment_created_at=str(comment.created_at),
-                comment_author_name=comment.author.username,
-                comment_author_login=comment.author.login,
-                comment_author_email=comment.author.email,
+            comment_data = IssueData(
+                **(
+                    asdict(issue_data) |
+                    dict(
+                        comment_body=comment.body,
+                        comment_created_at=str(comment.created_at),
+                        comment_author_name=comment.author.username,
+                        comment_author_login=comment.author.login,
+                        comment_author_email=comment.author.email,
+                    )
+                )
             )
             comment_data = asdict(comment_data)
 
@@ -248,7 +248,7 @@ def log_issues(
     finish: datetime,
     fork_flag: bool,
 ):
-    info = asdict(IssueDataWithComment())
+    info = asdict(IssueData())
     logger.log_to_csv(csv_name, list(info.keys()))
 
     for client, repo, token in binded_repos:

pull_requests_parser.py

@@ -26,6 +26,11 @@ class PullRequestData:
     creator_login: str = ''
     creator_email: str = ''
     changed_files: str = ''
+    comment_body: str = ''
+    comment_created_at: str = ''
+    comment_author_name: str = ''
+    comment_author_login: str = ''
+    comment_author_email: str = ''
     merger_name: str | None = None
     merger_login: str | None = None
     merger_email: str | None = None
@@ -37,15 +42,6 @@ class PullRequestData:
     milestone: str = ''
 
 
-@dataclass(kw_only=True, frozen=True)
-class PullRequestDataWithComment(PullRequestData):
-    comment_body: str = ''
-    comment_created_at: str = ''
-    comment_author_name: str = ''
-    comment_author_login: str = ''
-    comment_author_email: str = ''
-
-
 def get_related_issues(pull_request_number, repo_owner, repo_name, token):
     # TODO как-то заменить
     return
@@ -164,13 +160,17 @@ def get_info(obj, attr):
             comments = client.get_comments(repository, pull)
             if comments:
                 for comment in comments:
-                    comment_data = PullRequestDataWithComment(
-                        **asdict(pr_data),
-                        comment_body=comment.body,
-                        comment_created_at=str(comment.created_at),
-                        comment_author_name=comment.author.name,
-                        comment_author_login=comment.author.login,
-                        comment_author_email=nvl(comment.author.email),
+                    comment_data = PullRequestData(
+                        **(
+                            asdict(pr_data) |
+                            dict(
+                                comment_body=comment.body,
+                                comment_created_at=str(comment.created_at),
+                                comment_author_name=comment.author.name,
+                                comment_author_login=comment.author.login,
+                                comment_author_email=nvl(comment.author.email),
+                            )
+                        )
                     )
                     comment_data = asdict(comment_data)
 
@@ -196,7 +196,7 @@ def log_pull_requests(
     fork_flag: bool,
     log_comments=False,
 ):
-    info = asdict(PullRequestDataWithComment())
+    info = asdict(PullRequestData())
     logger.log_to_csv(csv_name, list(info.keys()))
 
     for client, repo, token in binded_repos: