Merge pull request #1073 from morucci/merged_commit_sha

crawler - github - index the mergeCommit's sha
change-metrics · Oct 30, 2023 · 7915520 · 7915520
2 parents 159f027 + c5e4148
commit 7915520
Show file tree

Hide file tree

Showing 13 changed files with 249 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
 
 - [crawler] Enable usage of the GitHub user PRs crawler via the Monocle config.
 - [cli] Add a Janitor command to reset the commit date of a crawler
+- [crawler] Github crawler gathers the `mergeCommit`'s SHA. `Change` and `ChangeEvent*` objects
+  get a new field `merged_commit_sha` in the database.
 
 ### Changed
 

diff --git a/codegen/Monocle/Protob/Change.hs b/codegen/Monocle/Protob/Change.hs
diff --git a/schemas/monocle/protob/change.proto b/schemas/monocle/protob/change.proto
@@ -80,6 +80,9 @@ message Change {
   oneof optional_self_merged {
     bool self_merged = 31;
   }
+  oneof optional_merged_commit_sha {
+    string merged_commit_sha = 32;
+  }
 }
 
 message ChangeCreatedEvent {}
@@ -127,4 +130,7 @@ message ChangeEvent {
     int32 duration = 23;
   }
   bool draft = 24;
+  oneof optional_merged_commit_sha {
+    string merged_commit_sha = 25;
+  }
 }
diff --git a/src/Lentille/Gerrit.hs b/src/Lentille/Gerrit.hs
@@ -266,6 +266,7 @@ streamChange' env identCB serverUrl query prefixM = go 0
           changeEventType = Just eType
           changeEventOptionalDuration = swapDuration <$> changeOptionalDuration
           changeEventDraft = changeDraft
+          changeEventOptionalMergedCommitSha = Nothing
        in ChangePB.ChangeEvent {..}
     toChangeCreatedEvent =
       baseEvent (ChangePB.ChangeEventTypeChangeCreated ChangePB.ChangeCreatedEvent) $ "CCE" <> changeId
@@ -343,6 +344,7 @@ streamChange' env identCB serverUrl query prefixM = go 0
           if status == MERGED
             then ChangePB.ChangeOptionalMergedByMergedBy <$> merger
             else Nothing
+        changeOptionalMergedCommitSha = Nothing
         changeBranch = from branch
         changeTargetBranch = from branch
         changeCreatedAt = Just $ toTimestamp created

diff --git a/src/Lentille/GitHub/GraphQLFragments.hs b/src/Lentille/GitHub/GraphQLFragments.hs
@@ -40,6 +40,10 @@ fragmentPRData =
     bodyText
     state
     reviewDecision
+    mergeCommit {
+      __typename
+      mergedCommitOid: oid
+    }
     number
     mergeable
     isDraft

diff --git a/src/Lentille/GitHub/PullRequests.hs b/src/Lentille/GitHub/PullRequests.hs
@@ -149,6 +149,9 @@ transformResponse host identCB result = do
   getPRMergedBy :: GetProjectPullRequestsRepositoryPullRequestsNodesMergedBy -> Text
   getPRMergedBy (GetProjectPullRequestsRepositoryPullRequestsNodesMergedBy _ login) = login
 
+  getPRMergedCommitSHA :: GetProjectPullRequestsRepositoryPullRequestsNodesMergeCommit -> LText
+  getPRMergedCommitSHA (GetProjectPullRequestsRepositoryPullRequestsNodesMergeCommit _ sha) = from $ getSHA sha
+
   toLabels :: GetProjectPullRequestsRepositoryPullRequestsNodesLabels -> [Text]
   toLabels (GetProjectPullRequestsRepositoryPullRequestsNodesLabels nodes) =
     toLabel <$> catMaybes (fromMaybe [] nodes)
@@ -250,6 +253,7 @@ transformResponse host identCB result = do
             , changeRepositoryShortname = from . snd $ repoOwnerName repository
             , changeAuthor = Just $ maybe getGhostIdent (getIdent . getPRAuthor) author
             , changeOptionalMergedBy = ChangeOptionalMergedByMergedBy . getIdent . getPRMergedBy <$> mergedBy
+            , changeOptionalMergedCommitSha = ChangeOptionalMergedCommitShaMergedCommitSha . getPRMergedCommitSHA <$> mergeCommit
             , changeBranch = from headRefName
             , changeTargetBranch = from baseRefName
             , changeCreatedAt = Just $ from createdAt