From b0c5e4b0f571cbb1bbaa5cb46ad37c3c53191cbb Mon Sep 17 00:00:00 2001
From: Jason Frey <jfrey@redhat.com>
Date: Tue, 6 Feb 2018 14:47:11 -0500
Subject: [PATCH 1/2] Move PivotalPrChecker to be a commit_range worker

---
 .../{commit => commit_range}/pivotal_pr_checker.rb                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/workers/commit_monitor_handlers/{commit => commit_range}/pivotal_pr_checker.rb (100%)

diff --git a/app/workers/commit_monitor_handlers/commit/pivotal_pr_checker.rb b/app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb
similarity index 100%
rename from app/workers/commit_monitor_handlers/commit/pivotal_pr_checker.rb
rename to app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb

From 15a762768a4f77546ce660ceac5bc9c8c9baf1cd Mon Sep 17 00:00:00 2001
From: Jason Frey <jfrey@redhat.com>
Date: Tue, 6 Feb 2018 14:52:56 -0500
Subject: [PATCH 2/2] Change PivotalPrChecker to be a commit_range worker

---
 .../commit_range/pivotal_pr_checker.rb             | 14 +++++++-------
 lib/pivotal_service.rb                             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb b/app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb
index 57984fbe..56dffceb 100644
--- a/app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb
+++ b/app/workers/commit_monitor_handlers/commit_range/pivotal_pr_checker.rb
@@ -1,5 +1,5 @@
 module CommitMonitorHandlers
-  module Commit
+  module CommitRange
     class PivotalPrChecker
       include Sidekiq::Worker
       sidekiq_options :queue => :miq_bot
@@ -10,15 +10,15 @@ def self.handled_branch_modes
         [:pr]
       end
 
-      attr_reader :commit, :message
-
-      def perform(branch_id, commit, commit_details)
+      def perform(branch_id, new_commits)
         return unless find_branch(branch_id, :pr)
 
-        @commit  = commit
-        @message = commit_details["message"]
+        story_ids = new_commits.flat_map do |commit|
+          message = repo.git_service.commit(commit).full_message
+          PivotalService.ids_in_git_commit_message(message)
+        end
 
-        PivotalService.ids_in_git_commit_message(message).each do |story_id|
+        story_ids.uniq.each do |story_id|
           update_pivotal_story(story_id)
         end
       end
diff --git a/lib/pivotal_service.rb b/lib/pivotal_service.rb
index 9bad222e..bf007c0b 100644
--- a/lib/pivotal_service.rb
+++ b/lib/pivotal_service.rb
@@ -20,7 +20,7 @@ def service
 
   def self.ids_in_git_commit_message(message)
     ids = []
-    message.each_line.collect do |line|
+    message.each_line do |line|
       match = URL_REGEX.match(line)
       ids << match[:id].to_i if match
     end