fixup! Save the commit info from the webhook

Signed-off-by: Cristian Le <git@lecris.dev>

Author: LecrisUT

packit_service/events/github/push.py

@@ -1,19 +1,13 @@
 # Copyright Contributors to the Packit project.
 # SPDX-License-Identifier: MIT
-from typing import TypedDict
 
-from packit_service.service.db_project_events import AddBranchPushEventToDb
+from packit_service.service.db_project_events import AddBranchPushEventToDb, CommitInfo
 
 from .abstract import GithubEvent
 
 
-class CommitInfo(TypedDict, total=False):
-    id: str
-    title: str
-    message: str
-    added: list[str]
-    modified: list[str]
-    removed: list[str]
+class GithubCommitInfo(CommitInfo):
+    pass
 
 
 class Commit(AddBranchPushEventToDb, GithubEvent):
@@ -25,7 +19,7 @@ def __init__(
         project_url: str,
         commit_sha: str,
         commit_sha_before: str,
-        commits: list[CommitInfo],
+        commits: list[GithubCommitInfo],
     ):
         super().__init__(project_url=project_url)
         self.repo_namespace = repo_namespace

packit_service/events/gitlab/push.py

@@ -1,21 +1,13 @@
 # Copyright Contributors to the Packit project.
 # SPDX-License-Identifier: MIT
-from typing import TypedDict
 
-from packit_service.service.db_project_events import (
-    AddBranchPushEventToDb,
-)
+from packit_service.service.db_project_events import AddBranchPushEventToDb, CommitInfo
 
 from .abstract import GitlabEvent
 
 
-class CommitInfo(TypedDict, total=False):
-    id: str
-    title: str
-    message: str
-    added: list[str]
-    modified: list[str]
-    removed: list[str]
+class GitlabCommitInfo(CommitInfo):
+    pass
 
 
 class Commit(AddBranchPushEventToDb, GitlabEvent):
@@ -27,7 +19,7 @@ def __init__(
         project_url: str,
         commit_sha: str,
         commit_sha_before: str,
-        commits: list[CommitInfo],
+        commits: list[GitlabCommitInfo],
     ):
         super().__init__(project_url=project_url)
         self.repo_namespace = repo_namespace

packit_service/service/db_project_events.py

@@ -5,7 +5,7 @@
 This file contains helper classes for events.
 """
 
-from typing import Optional
+from typing import Optional, TypedDict
 
 from ogr.abstract import GitProject
 
@@ -61,12 +61,22 @@ def get_dict(self, default_dict: Optional[dict] = None) -> dict:
         return result
 
 
+class CommitInfo(TypedDict, total=False):
+    id: str
+    title: str
+    message: str
+    added: list[str]
+    modified: list[str]
+    removed: list[str]
+
+
 class AddBranchPushEventToDb:
     git_ref: str
     repo_namespace: str
     repo_name: str
     project_url: str
     commit_sha: str
+    commits: list[CommitInfo]
     _branch: GitBranchModel = None
     _event: ProjectEventModel = None
 

packit_service/worker/parser.py

@@ -64,9 +64,9 @@ class _GitlabCommonData:
     project_url: str
     parsed_url: Optional[RepoUrl]
     ref: str
-    head_commit: gitlab.push.CommitInfo
+    head_commit: gitlab.push.GitlabCommitInfo
     commit_sha_before: str
-    commits: list[gitlab.push.CommitInfo]
+    commits: list[gitlab.push.GitlabCommitInfo]
 
     @property
     def commit_sha(self) -> str:
@@ -421,7 +421,9 @@ def get_gitlab_push_common_data(event) -> _GitlabCommonData:
         before = event.get("before")
         checkout_sha = event.get("checkout_sha")
         actor = event.get("user_username")
-        commits = [cast(gitlab.push.CommitInfo, commit) for commit in event.get("commits", [])]
+        commits = [
+            cast(gitlab.push.GitlabCommitInfo, commit) for commit in event.get("commits", [])
+        ]
         number_of_commits = event.get("total_commits_count")
 
         if not Parser.is_gitlab_push_a_create_event(event):
@@ -564,7 +566,7 @@ def parse_github_push_event(event) -> Optional[github.push.Commit]:
 
         repo_url = nested_get(event, "repository", "html_url")
 
-        commits = [cast(github.push.CommitInfo, commit) for commit in event.get("commits")]
+        commits = [cast(github.push.GithubCommitInfo, commit) for commit in event.get("commits")]
 
         return github.push.Commit(
             repo_namespace=repo_namespace,