Merge pull request #605 from rootstrap/add_base_branch_to_prs

Add base branch to prs and dashboard

Author: gonzaM

app/assets/stylesheets/application.scss

@@ -177,8 +177,13 @@ main {
 }
 
 .title_sidebar{
-  padding-top: 48px;
-  padding-bottom: 10px;
+  padding-top: 3rem;
+  padding-bottom: 0.6rem;
+}
+
+.filters-bar{
+  padding-top: 0.6rem;
+  padding-bottom: 0.6rem;
 }
 
 .btn-secondary {

app/assets/stylesheets/metrics/_base-branch-filter.scss

@@ -0,0 +1,9 @@
+.base-branch-selection {
+  display: flex;
+  align-items: baseline;
+  
+  select {
+    margin: 0 0.2rem;
+    width: 120px;
+  }
+}

app/controllers/development_metrics_controller.rb

@@ -22,6 +22,7 @@ def repositories
     build_overall_calculations(entity_name)
 
     @code_owners = repository.code_owners.pluck(:login)
+    @available_base_branches = repository.base_branches
   end
 
   def departments
@@ -57,8 +58,14 @@ def build_overall_calculations(entity_name)
 
   def build_metrics(entity_id, entity_name)
     validate_from_to(from: metric_params[:from], to: metric_params[:to])
-    metrics = Builders::Chartkick::DevelopmentMetrics.const_get(entity_name)
-                                                     .call(entity_id, @from, @to)
+    metrics = Builders::Chartkick::DevelopmentMetrics
+              .const_get(entity_name)
+              .call(
+                entity_id,
+                @from,
+                @to,
+                metric_params[:base_branch]
+              )
     @merge_time = metrics[:merge_time]
     @pull_request_size = metrics[:pull_request_size]
     @review_coverage = metrics[:review_coverage]

app/controllers/pull_requests/pull_requests_controller.rb

@@ -12,7 +12,8 @@ def index
       @pull_requests = repository.call(
         from: @from,
         to: @to,
-        repository_name: @repository_name
+        repository_name: @repository_name,
+        base_branch: metric_params[:base_branch]
       )
       respond_to do |format|
         format.html { render :index }
@@ -23,7 +24,7 @@ def index
     private
 
     def metric_params
-      params.require(:metric).permit(:to, :from)
+      params.require(:metric).permit(:to, :from, :base_branch)
     end
   end
 end

app/helpers/filters_helper.rb

@@ -13,4 +13,8 @@ def current_department
   def chosen_contribution_period
     params[:from] || 4
   end
+
+  def base_branch_chosen
+    params.dig(:metric, :base_branch) || ''
+  end
 end

app/models/events/pull_request.rb

@@ -3,6 +3,7 @@
 # Table name: events_pull_requests
 #
 #  id            :bigint           not null, primary key
+#  base_branch   :string
 #  body          :text
 #  branch        :string
 #  closed_at     :datetime

app/models/repository.rb

@@ -147,6 +147,10 @@ def organization_name
     ENV['GITHUB_ORGANIZATION']
   end
 
+  def base_branches
+    pull_requests.distinct.pluck(:base_branch).sort
+  end
+
   private
 
   def set_default_language

app/services/builders/chartkick/development_metrics.rb

@@ -1,10 +1,11 @@
 module Builders
   module Chartkick
     class DevelopmentMetrics < BaseService
-      def initialize(entity_id, from, to)
+      def initialize(entity_id, from, to, base_branch = nil)
         @entity_id = entity_id
         @from = from&.to_datetime&.beginning_of_day
         @to = to&.to_datetime&.end_of_day
+        @base_branch = base_branch
       end
 
       def call
@@ -25,11 +26,14 @@ def metric_names
 
       def metric_data(metric_name)
         Builders::Chartkick::MetricData.call(
-          @entity_id,
-          entities_by_metric[metric_name],
-          metric_name,
-          @from,
-          @to
+          entity_id: @entity_id,
+          entities: entities_by_metric[metric_name],
+          metric_name: metric_name,
+          params: {
+            from: @from,
+            to: @to,
+            base_branch: @base_branch
+          }
         )
       end
 

app/services/builders/chartkick/metric_data.rb

@@ -1,12 +1,13 @@
 module Builders
   module Chartkick
     class MetricData < BaseService
-      def initialize(entity_id, entities, metric_name, from, to)
+      def initialize(entity_id:, entities:, metric_name:, params: {})
         @entity_id = entity_id
         @entities = entities
         @metric_name = metric_name
-        @from = from
-        @to = to
+        @from = params[:from]
+        @to = params[:to]
+        @base_branch = params[:base_branch]
       end
 
       def call
@@ -15,9 +16,11 @@ def call
             entity_name: entity,
             entity_id: @entity_id,
             metric_name: @metric_name,
-            from: @from,
-            to: @to
-            # prev: (@to.to_date - @from.to_date).to_i / 7
+            params: {
+              from: @from,
+              to: @to,
+              base_branch: @base_branch
+            }
           )
         end
       end

app/services/builders/chartkick/repository_distribution_data.rb

@@ -21,7 +21,8 @@ def repository_name
       def retrieve_records
         @retrieve_records ||= metric.retrieve_records(
           entity_id: @entity_id,
-          time_range: @query[:value_timestamp]
+          time_range: @query[:value_timestamp],
+          base_branch: @query[:base_branch]
         )
       end