Merge pull request #59 from FRRouting/master

Release 2.3.0

Author: RodrigoMNardi

db/migrate/20240326112530_create_github_user_info.rb

@@ -0,0 +1,26 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  20240326112530_create_github_user_info.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+class CreateGithubUserInfo < ActiveRecord::Migration[6.0]
+  def change
+    create_table :github_users do |t|
+      t.string :github_login
+      t.string :github_username
+      t.string :github_email
+      t.integer :github_id
+      t.string :github_organization
+      t.string :github_type
+      t.string :organization_name
+      t.string :organization_url
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20240326121605_add_github_user_relations.rb

@@ -0,0 +1,17 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  20240326121605_add_github_user_relations.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+class AddGithubUserRelations < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :pull_requests, :github_user, foreign_key: true
+    add_reference :check_suites, :github_user, foreign_key: true
+    add_reference :audit_retries, :github_user, foreign_key: true
+  end
+end

db/migrate/20240327112035_add_github_users_github_id_index.rb

@@ -0,0 +1,15 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  20240327112035_add_github_users_github_id_index.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+class AddGithubUsersGithubIdIndex < ActiveRecord::Migration[6.0]
+  def change
+    add_index :github_users, :github_id, name: 'index_github_users_on_github_id', unique: true
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_03_12_134402) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_27_112035) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -22,7 +22,9 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "check_suite_id"
+    t.bigint "github_user_id"
     t.index ["check_suite_id"], name: "index_audit_retries_on_check_suite_id"
+    t.index ["github_user_id"], name: "index_audit_retries_on_github_user_id"
   end
 
   create_table "audit_retries_ci_jobs", id: false, force: :cascade do |t|
@@ -55,6 +57,8 @@
     t.boolean "re_run", default: false
     t.integer "retry", default: 0
     t.boolean "sync", default: false
+    t.bigint "github_user_id"
+    t.index ["github_user_id"], name: "index_check_suites_on_github_user_id"
     t.index ["pull_request_id"], name: "index_check_suites_on_pull_request_id"
   end
 
@@ -73,6 +77,20 @@
     t.index ["stage_id"], name: "index_ci_jobs_on_stage_id"
   end
 
+  create_table "github_users", force: :cascade do |t|
+    t.string "github_login"
+    t.string "github_username"
+    t.string "github_email"
+    t.integer "github_id"
+    t.string "github_organization"
+    t.string "github_type"
+    t.string "organization_name"
+    t.string "organization_url"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["github_id"], name: "index_github_users_on_github_id", unique: true
+  end
+
   create_table "plans", force: :cascade do |t|
     t.string "bamboo_ci_plan_name", null: false
     t.string "github_repo_name", default: "0", null: false
@@ -101,6 +119,8 @@
     t.string "plan"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "github_user_id"
+    t.index ["github_user_id"], name: "index_pull_requests_on_github_user_id"
   end
 
   create_table "stage_configurations", force: :cascade do |t|
@@ -138,11 +158,14 @@
   end
 
   add_foreign_key "audit_retries", "check_suites"
+  add_foreign_key "audit_retries", "github_users"
+  add_foreign_key "check_suites", "github_users"
   add_foreign_key "check_suites", "pull_requests"
   add_foreign_key "ci_jobs", "check_suites"
   add_foreign_key "ci_jobs", "stages"
   add_foreign_key "plans", "check_suites"
   add_foreign_key "pull_request_subscriptions", "pull_requests"
+  add_foreign_key "pull_requests", "github_users"
   add_foreign_key "stages", "check_suites"
   add_foreign_key "stages", "stage_configurations"
   add_foreign_key "topotest_failures", "ci_jobs"

lib/github/build_plan.rb

@@ -16,6 +16,7 @@
 require_relative '../bamboo_ci/plan_run'
 require_relative 'check'
 require_relative 'build/action'
+require_relative 'user_info'
 
 module Github
   class BuildPlan
@@ -91,9 +92,13 @@ def create_pull_request
           repository: @payload.dig('repository', 'full_name'),
           plan: fetch_plan
         )
+
+      Github::UserInfo.new(@payload.dig('pull_request', 'user', 'id'), pull_request: @pull_request)
     end
 
     def start_new_execution
+      Github::UserInfo.new(@payload.dig('pull_request', 'user', 'id'), check_suite: @check_suite)
+
       @bamboo_plan_run = BambooCi::PlanRun.new(@check_suite, logger_level: @logger.level)
       @bamboo_plan_run.ci_variables = ci_vars
       @bamboo_plan_run.start_plan

lib/github/re_run/base.rb

@@ -16,6 +16,7 @@
 require_relative '../check'
 require_relative '../build/action'
 require_relative '../build/unavailable_jobs'
+require_relative '../user_info'
 
 module Github
   module ReRun
@@ -81,11 +82,14 @@ def start_new_execution(check_suite)
         bamboo_plan_run.ci_variables = ci_vars
         bamboo_plan_run.start_plan
 
-        AuditRetry.create(check_suite: check_suite,
-                          github_username: @payload.dig('sender', 'login'),
-                          github_id: @payload.dig('sender', 'id'),
-                          github_type: @payload.dig('sender', 'type'),
-                          retry_type: 'full')
+        audit_retry =
+          AuditRetry.create(check_suite: check_suite,
+                            github_username: @payload.dig('sender', 'login'),
+                            github_id: @payload.dig('sender', 'id'),
+                            github_type: @payload.dig('sender', 'type'),
+                            retry_type: 'full')
+
+        Github::UserInfo.new(@payload.dig('sender', 'id'), check_suite: check_suite, audit_retry: audit_retry)
 
         bamboo_plan_run
       end

lib/github/retry.rb

@@ -68,6 +68,8 @@ def create_ci_jobs(check_suite)
                           github_type: @payload.dig('sender', 'type'),
                           retry_type: 'partial')
 
+      Github::UserInfo.new(@payload.dig('sender', 'id'), check_suite: check_suite, audit_retry: audit_retry)
+
       build_retry = Github::Build::Retry.new(check_suite, github_check, audit_retry)
 
       build_retry.enqueued_stages

lib/github/user_info.rb

@@ -0,0 +1,85 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  user_info.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+module Github
+  class UserInfo
+    def initialize(github_id, pull_request: nil, check_suite: nil, audit_retry: nil)
+      @github_id = github_id
+      @github = Github::Check.new nil
+      @info = @github.fetch_username(github_id)
+
+      @pull_request = pull_request
+      @check_suite = check_suite
+      @audit_retry = audit_retry
+
+      @logger = GithubLogger.instance.create('github_user_info.log', Logger::INFO)
+
+      @logger.info("Fetching user info for github_id: #{@github_id}")
+      @logger.info(@info.inspect)
+
+      fetch
+    end
+
+    private
+
+    def fetch
+      @user = GithubUser.find_by(github_id: @github_id)
+
+      @logger.info("User: #{@user.inspect}")
+
+      create_user_info if @user.nil?
+
+      update_user_info
+
+      add_pull_request unless @pull_request.nil?
+      add_check_suite unless @check_suite.nil?
+      add_retry unless @audit_retry.nil?
+    end
+
+    def add_pull_request
+      @user.pull_requests << @pull_request
+      @user.save
+    end
+
+    def add_check_suite
+      @user.check_suites << @check_suite
+      @user.save
+    end
+
+    def add_retry
+      @user.audit_retries << @audit_retry
+      @user.save
+    end
+
+    def update_user_info
+      @user.update(
+        github_login: @info[:login],
+        github_username: @info[:name],
+        github_email: @info[:email],
+        github_type: @info[:type],
+        organization_url: @info[:organizations_url],
+        github_organization: @info[:company]
+      )
+    end
+
+    def create_user_info
+      @user =
+        GithubUser.create(
+          github_id: @github_id,
+          github_login: @info[:login],
+          github_username: @info[:name],
+          github_email: @info[:email],
+          github_type: @info[:type],
+          organization_url: @info[:organizations_url],
+          github_organization: @info[:company]
+        )
+    end
+  end
+end

lib/github_ci_app.rb

@@ -26,6 +26,7 @@
 require_relative 'github/retry'
 require_relative 'github/update_status'
 require_relative 'github/plan_execution/finished'
+require_relative 'github/user_info'
 
 # Helpers libs
 require_relative 'helpers/configuration'

lib/models/github_user.rb

@@ -0,0 +1,17 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  github_user_info.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+require 'otr-activerecord'
+
+class GithubUser < ActiveRecord::Base
+  has_many :pull_requests, dependent: :nullify
+  has_many :check_suites, dependent: :nullify
+  has_many :audit_retries, dependent: :nullify
+end

reports/re_run_report.rb

@@ -9,6 +9,7 @@
 #  frozen_string_literal: true
 
 require 'json'
+require 'csv'
 require_relative '../database_loader'
 
 module Reports
@@ -57,6 +58,8 @@ def save_rerun_info(result, output, filename)
       case output
       when 'json'
         File.write(filename, result.to_json)
+      when 'csv'
+        create_csv(filename)
       when 'file'
         File.open(filename, 'a') do |f|
           raw_output(result, file_descriptor: f)
@@ -66,6 +69,19 @@ def save_rerun_info(result, output, filename)
       end
     end
 
+    def create_csv(filename)
+      CSV.open(filename, 'wb') do |csv_input|
+        csv_input << %w[PullRequest CheckSuiteId BambooJob GithubUsername RequestedAt Type TestsOrBuilds]
+        @result.each_pair do |pull_requst, info|
+          info[:check_suites].each do |cs|
+            csv_input << [pull_requst,
+                          cs[:check_suite_id], cs[:bamboo_job], cs[:requested_at],
+                          cs[:github_username], cs[:type], cs[:tests_or_builds].join(',')]
+          end
+        end
+      end
+    end
+
     def raw_output(result, file_descriptor: nil)
       result.each_pair do |pull_request, info|
         print("\nPull Request: ##{pull_request} - Reruns: #{info[:total]}", file_descriptor)