pronto-github_resolver 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8853fcc6e38eef6f5fbaac5dc815cabd7e3e81e18136675a9cddfbc203f538d7
-  data.tar.gz: ab3620bd675754fc045ff7619f3053f27829786f4076a19f0cbd317ed3f84d56
+  metadata.gz: 152e4319e389105c14b8c208f8b668c17a25eafbab0f1270b00c071994f9320c
+  data.tar.gz: b7a1b40e35543a93e7924e82a7b3596e35ac9e416df34855939112e5222db953
 SHA512:
-  metadata.gz: f7097355369c367d5d6232204fcc623cfb6755a494e4b81467904d97d671b46aa70c7d9339ebb92bc5a8a8e9ed4d56642cba344a73a31ecc56904959132d456a
-  data.tar.gz: cf0f065244dea041390ceabafb2cb76dcf71e46ea4d512666106b5ff9f1cc62f071bb5eb87945cb642cb08298d5873d9559db404ccd8f3cc5f64791248fa70db
+  metadata.gz: 46e7f768e794754c2e2d1159779332f980408d77f5fe4c88f825ed63c27c85dad49318c66da9236ca05d133532de5c6d20a3d39df9c8bd68eef7141bf1763368
+  data.tar.gz: '0758a279f57ba8c0a153528f0b2b06ab3baee909e396e92c86845b86672f18d312ec41f9efbc574f45cf5aa1ec093f988ae728fd987a72e3d571b31f074d5201'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pronto-github_resolver (0.0.1)
+    pronto-github_resolver (0.0.2)
       pronto (~> 0.11)
 
 GEM

data/lib/pronto/github_resolver/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module GithubResolver
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/pronto/github_resolver.rb

@@ -6,6 +6,20 @@ require 'pronto'
 module Pronto
 
   class Github < Client
+    # pronto messes up relative paths and does not have tests for this, patch to add repo.path.join
+    def pull_comments(sha)
+      @comment_cache["#{pull_id}/#{sha}"] ||= begin
+        client.pull_comments(slug, pull_id).map do |comment|
+          Comment.new(sha, comment.body, @repo.path.join(comment.path),
+                      comment.position || comment.original_position)
+        end
+      end
+    rescue Octokit::NotFound => e
+      @config.logger.log("Error raised and rescued: #{e}")
+      msg = "Pull request for sha #{sha} with id #{pull_id} was not found."
+      raise Pronto::Error, msg
+    end
+
     def publish_pull_request_comments(comments, event: nil)
       comments_left = comments.clone
       while comments_left.any?
@@ -40,7 +54,72 @@ module Pronto
     end
 
     def bot_user_id
-      client.user.id
+      bot_user.id
+    end
+
+    def bot_user
+      @bot_user ||= client.user
+    end
+
+    def get_review_threads
+      owner, repo_name = (slug || "").split('/')
+      res = client.post :graphql, { query: <<~GQL }.to_json
+        query getUserId {
+          repository(owner: "#{owner}", name: "#{repo_name}") {
+            pullRequest: issueOrPullRequest(number: #{pull_id}) {
+              ... on PullRequest {
+                reviewThreads(last:100) {
+                    totalCount
+                    nodes {
+                        id
+                        comments(last: 10) {
+                            nodes {
+                                author { ... on Node { id } }
+                                viewerDidAuthor
+                                path position body
+                            }
+                        }
+                    }
+                }
+              }
+            }
+          }
+        }
+      GQL
+
+      if res.errors || !res.data
+        # ex: [{:message=>"Parse error on \"11\" (INT) at [1, 22]", :locations=>[{:line=>1, :column=>22}]}]
+        # TODO: handle errors
+        return []
+      end
+
+      res.data.repository.pullRequest.reviewThreads.nodes.to_h { |node|
+        [
+          node.id,
+          node.comments.nodes.map{ |comment|
+            {
+              author_id: comment.author.id,
+              path: comment.path, position: comment.position, body: comment.body
+            }
+          }
+        ]
+      }
+    end
+
+    def resolve_review_threads(node_ids)
+      return unless node_ids.any?
+
+      owner, repo_name = (slug || "").split('/')
+      query = <<~GQL
+        mutation {
+          #{
+            node_ids.each_with_index.map {|id, index|
+              "q#{index}: resolveReviewThread(input: { threadId: \"#{id}\" }){ thread { id } } "
+            }.join("\n")
+          }
+        }
+      GQL
+      client.post :graphql, { query: query }.to_json
     end
   end
 
@@ -52,6 +131,9 @@ module Pronto
         comments = new_comments(messages, patches)
         additions = remove_duplicate_comments(existing, comments)
 
+        # TODO: we can reuse some threads from graphql for existing messages detection (but there's no pagination)
+        resolve_old_messages(client, repo, comments)
+
         if comments.none?
           bot_reviews = client.existing_pull_request_reviews.select { |review| review.user.type == 'Bot' }
           if bot_reviews.any?
@@ -84,6 +166,21 @@ module Pronto
       rescue Octokit::UnprocessableEntity, HTTParty::Error => e
         $stderr.puts "Failed to post: #{e.message}"
       end
+
+      def resolve_old_messages(client, repo, actual_comments)
+        thread_ids_to_resolve = []
+        bot_node_id = client.bot_user.node_id
+        client.get_review_threads.each_pair do |thread_id, thread_comments|
+          next unless thread_comments.all? do |comment|
+            comment[:author_id] == bot_node_id &&
+              (actual_comments[[repo.path.join(comment[:path]), comment[:position]]] || []).none? { |actual_comment|
+                comment[:body].include?(actual_comment.body)
+              }
+          end
+          thread_ids_to_resolve << thread_id
+        end
+        client.resolve_review_threads(thread_ids_to_resolve)
+      end
     end
 
     class GithubPullRequestResolvingReviewFormatter < PullRequestFormatter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto-github_resolver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vasily Fedoseyev