github_repo_statistics 2.2.11 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45284d03e5ffb00cb2ed37dc99c775c4cd5270aa82ab8b56e71280d095fdc6f0
-  data.tar.gz: 14b0536562640711fc5219302932b55eaeae6d5a0ce08caf6fe01f50d3ad86b3
+  metadata.gz: 363280a48b1083b29eaceaf52ed9b6fa1f7aed79668f4df3f8eed74706e99652
+  data.tar.gz: ec3fb212efb80c2c7332ea0a6c78a3584c940b42ff0c3f1574f71d34615de117
 SHA512:
-  metadata.gz: dd4cc361ad9a4e47ace0970e27fc201cfd73e14f2fe54d1be2378331c8e9de80b757c657bab8099633cf0c43cf57f972850e645e68649f19379cd0f6b613ef22
-  data.tar.gz: 93ac3757ec59d6ce9b433424bbf498635a9c26fa6b89324dcfb1b7164d4395588ed5cc31073b5692ae1014c8e474b374e160699d44904c6366b4181ef7119178
+  metadata.gz: 003bf782c6f5878e6ede5c82d142c95ef8ab3381aed6cc8317fec61a539433ca21134ed676ec5d12e3037ac64b2072755190d6eeb628b93d79656d0c637a174e
+  data.tar.gz: 6cefa1b4344439d38f6c49ae4e0f0ffcfd4ab4ace41074ce00eeefd1e3bee6058b41d85382e617669e0c14401a00381ad9bc7b28bfd5e89dfc013a97031ab0f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github_repo_statistics (2.2.10)
+    github_repo_statistics (2.2.12)
       date
       faraday-retry
       google-cloud-bigquery

data/lib/github_repo_statistics/force_merge_report.rb

@@ -31,9 +31,6 @@ class ForceMergeReport
 
     weeks = @duration_in_days / 7
 
-    require 'pry'
-    binding.pry
-
     (weekly_pull_requests.keys.sort[-weeks..] || []).each do |month|
       pull_requests_for_month = weekly_pull_requests[month]
       # Iterate through pull requests for the current month
@@ -94,6 +91,7 @@ class ForceMergeReport
         puts "  - #{workflow}: #{count}"
       end
 
+
       if ENV['BQ_CREDENTIALS']
         require "google/cloud/bigquery"
         require "json"
@@ -113,8 +111,8 @@ class ForceMergeReport
 
         query = <<~SQL
   MERGE INTO force_merges AS target
-  USING (SELECT '#{week}' AS calendar_week) AS source
-  ON target.calendar_week = source.calendar_week
+  USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
+  ON target.calendar_week = source.calendar_week AND target.platform = source.platform
   WHEN MATCHED THEN
     UPDATE SET
       target.force_merges_count = #{failed_count},
@@ -122,10 +120,11 @@ class ForceMergeReport
       target.unit_tests_count = #{unit_tests_check},
       target.size_check_count = #{size_check},
       target.sonarqube_count = #{sonarqube_check},
-      target.total_prs = #{total_prs}
+      target.total_prs = #{total_prs},
+      target.platform = '#{@repo}'
   WHEN NOT MATCHED THEN
-    INSERT (calendar_week, force_merges_count, ui_tests_count, unit_tests_count, size_check_count, sonarqube_count, total_prs)
-    VALUES ('#{week}', #{failed_count}, #{ui_tests_check}, #{unit_tests_check}, #{size_check}, #{sonarqube_check}, #{total_prs});
+    INSERT (calendar_week, force_merges_count, ui_tests_count, unit_tests_count, size_check_count, sonarqube_count, total_prs, platform)
+    VALUES ('#{week}', #{failed_count}, #{ui_tests_check}, #{unit_tests_check}, #{size_check}, #{sonarqube_check}, #{total_prs}, '#{@repo}');
         SQL
 
         dataset.query(query)

data/lib/github_repo_statistics/review_report.rb

@@ -86,8 +86,39 @@ class ReviewReport
         puts "  Total reviews: #{total_reviews}"
         puts "  Reviews with comments: #{reviews_with_comments}"
         puts "  Change requested reviews: #{change_requested_reviews}"
+
+
+        if ENV['BQ_CREDENTIALS']
+          require "google/cloud/bigquery"
+          require "json"
+          creds = JSON.parse(ENV['BQ_CREDENTIALS'])
+          bigquery = Google::Cloud::Bigquery.new(
+            project_id: "hellofresh-android",
+            credentials: creds
+          )
+          dataset = bigquery.dataset "github_data"
+
+          query = <<~SQL
+    MERGE INTO pr_reviews AS target
+    USING (SELECT '#{week}' AS calendar_week, '#{@repo}' AS platform) AS source
+    ON target.calendar_week = source.calendar_week AND target.platform = source.platform
+    WHEN MATCHED THEN
+      UPDATE SET
+        target.change_requested_reviews = #{change_requested_reviews},
+        target.reviews_with_comments = #{reviews_with_comments},
+        target.total_reviews = #{total_reviews},
+        target.average_review_time_hours = #{average_time_hours.round(2)},
+        target.total_prs = #{total_count},
+        target.platform = '#{@repo}'
+    WHEN NOT MATCHED THEN
+      INSERT (calendar_week, total_prs, average_review_time_hours, total_reviews, reviews_with_comments, change_requested_reviews, platform)
+      VALUES ('#{week}', #{total_count}, #{average_time_hours.round(2)}, #{total_reviews}, #{reviews_with_comments}, #{change_requested_reviews}, '#{@repo}');
+          SQL
+
+          dataset.query(query)
+        end
       else
-        puts "Month #{week}: No pull requests with reviews."
+        puts "#{week}: No pull requests with reviews."
       end
     end
   end

data/lib/github_repo_statistics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class GithubRepoStatistics
-  VERSION = '2.2.11'
+  VERSION = '2.2.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_repo_statistics
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.13
 platform: ruby
 authors:
 - Serghei Moret
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-03 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: date