jirametrics 2.22 → 2.23

data/lib/jirametrics/cycletime_histogram.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-require 'jirametrics/groupable_issue_chart'
+require 'jirametrics/time_based_histogram'
 
-class CycletimeHistogram < ChartBase
-  include GroupableIssueChart
+class CycletimeHistogram < TimeBasedHistogram
   attr_accessor :possible_statuses
-  attr_reader :show_stats
 
   def initialize block
     super()
 
-    percentiles [50, 85, 98]
-    @show_stats = true
+    @x_axis_title = 'Cycletime in days'
+    @y_axis_title = 'Count'
 
     header_text 'Cycletime Histogram'
     description_text <<-HTML
@@ -30,112 +28,26 @@ class CycletimeHistogram < ChartBase
     end
   end
 
-  def percentiles percs = nil
-    @percentiles = percs unless percs.nil?
-    @percentiles
-  end
-
-  def disable_stats
-    @show_stats = false
-  end
-
-  def run
+  def all_items
     stopped_issues = completed_issues_in_range include_unstarted: true
 
     # For the histogram, we only want to consider items that have both a start and a stop time.
-    histogram_issues = stopped_issues.select { |issue| issue.board.cycletime.started_stopped_times(issue).first }
-    rules_to_issues = group_issues histogram_issues
-
-    the_stats = {}
-
-    overall_stats = stats_for histogram_data: histogram_data_for(issues: histogram_issues), percentiles: @percentiles
-    the_stats[:all] = overall_stats
-    data_sets = rules_to_issues.keys.collect do |rules|
-      the_issue_type = rules.label
-      the_histogram = histogram_data_for(issues: rules_to_issues[rules])
-      the_stats[the_issue_type] = stats_for histogram_data: the_histogram, percentiles: @percentiles if @show_stats
-
-      data_set_for(
-        histogram_data: the_histogram,
-        label: the_issue_type,
-        color: rules.color
-      )
-    end
-
-    if data_sets.empty?
-      return "<h1 class='foldable'>#{@header_text}</h1><div>No data matched the selected criteria. Nothing to show.</div>"
-    end
-
-    wrap_and_render(binding, __FILE__)
+    stopped_issues.select { |issue| issue.board.cycletime.started_stopped_times(issue).first }
   end
 
-  def histogram_data_for issues:
-    count_hash = {}
-    issues.each do |issue|
-      days = issue.board.cycletime.cycletime(issue)
-      count_hash[days] = (count_hash[days] || 0) + 1 if days.positive?
-    end
-    count_hash
+  def value_for_item issue
+    issue.board.cycletime.cycletime(issue)
   end
 
-  def stats_for histogram_data:, percentiles:
-    return {} if histogram_data.empty?
-
-    total_values = histogram_data.values.sum
-
-    # Calculate the average
-    weighted_sum = histogram_data.reduce(0) { |sum, (value, frequency)| sum + (value * frequency) }
-    average = total_values.zero? ? 0 : weighted_sum.to_f / total_values
-
-    # Find the mode (or modes!) and the spread of the distribution
-    sorted_histogram = histogram_data.sort_by { |_value, frequency| frequency }
-    max_freq = sorted_histogram[-1][1]
-    mode = sorted_histogram.select { |_v, f| f == max_freq }
-
-    minmax = histogram_data.keys.minmax
-
-    # Calculate percentiles
-    sorted_values = histogram_data.keys.sort
-    cumulative_counts = {}
-    cumulative_sum = 0
-
-    sorted_values.each do |value|
-      cumulative_sum += histogram_data[value]
-      cumulative_counts[value] = cumulative_sum
-    end
-
-    percentile_results = {}
-    percentiles.each do |percentile|
-      rank = (percentile / 100.0) * total_values
-      percentile_value = sorted_values.find { |value| cumulative_counts[value] >= rank }
-      percentile_results[percentile] = percentile_value
-    end
-
-    {
-      average: average,
-      mode: mode.collect(&:first).sort,
-      min: minmax[0],
-      max: minmax[1],
-      percentiles: percentile_results
-    }
+  def title_for_item count:, value:
+    "#{count} items completed in #{label_days value}"
   end
 
-  def data_set_for histogram_data:, label:, color:
-    keys = histogram_data.keys.sort
-    {
-      type: 'bar',
-      label: label,
-      data: keys.sort.filter_map do |key|
-        next if histogram_data[key].zero?
+  def sort_items items
+    items.sort_by(&:key_as_i)
+  end
 
-        {
-          x: key,
-          y: histogram_data[key],
-          title: "#{histogram_data[key]} items completed in #{label_days key}"
-        }
-      end,
-      backgroundColor: color,
-      borderRadius: 0
-    }
+  def label_for_item issue, hint:
+    "#{issue.key} : #{issue.summary}#{" #{hint}" if hint}"
   end
 end

data/lib/jirametrics/cycletime_scatterplot.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'jirametrics/groupable_issue_chart'
-
-class CycletimeScatterplot < ChartBase
-  include GroupableIssueChart
+require 'jirametrics/time_based_scatterplot'
 
+class CycletimeScatterplot < TimeBasedScatterplot
   attr_accessor :possible_statuses
 
   def initialize block
@@ -26,6 +24,8 @@ class CycletimeScatterplot < ChartBase
       </div>
       #{describe_non_working_days}
     HTML
+    @x_axis_title = 'Date completed'
+    @y_axis_title = 'Cycletime in days'
 
     init_configuration_block block do
       grouping_rules do |issue, rule|
@@ -33,9 +33,6 @@ class CycletimeScatterplot < ChartBase
         rule.color = color_for type: issue.type
       end
     end
-
-    @percentage_lines = []
-    @highest_y_value = 0
   end
 
   def all_items
@@ -51,96 +48,10 @@ class CycletimeScatterplot < ChartBase
   end
 
   def title_value item
-    "#{item.key} : #{item.summary} (#{label_days(y_value(item))})"
-  end
-
-  def y_axis_heading
-    'Cycle time in days'
-  end
-
-  def run
-    items = all_items
-    data_sets = create_datasets items
-    overall_percent_line = calculate_percent_line(items)
-    @percentage_lines << [overall_percent_line, CssVariable['--cycletime-scatterplot-overall-trendline-color']]
-
-    return "<h1>#{@header_text}</h1>No data matched the selected criteria. Nothing to show." if data_sets.empty?
-
-    wrap_and_render(binding, __FILE__)
-  end
-
-  def create_datasets items
-    data_sets = []
-
-    group_issues(items).each do |rules, completed_items_by_type|
-      label = rules.label
-      color = rules.color
-      percent_line = calculate_percent_line completed_items_by_type
-      data = completed_items_by_type.filter_map { |issue| data_for_issue(issue) }
-      data_sets << {
-        label: "#{label} (85% at #{label_days(percent_line)})",
-        data: data,
-        fill: false,
-        showLine: false,
-        backgroundColor: color
-      }
-
-      data_sets << trend_line_data_set(label: label, data: data, color: color)
-
-      @percentage_lines << [percent_line, color]
-    end
-    data_sets
+    hint = @issue_hints&.fetch(item, nil)
+    "#{item.key} : #{item.summary} (#{label_days(y_value(item))})#{" #{hint}" if hint}"
   end
 
-  def show_trend_lines
-    @show_trend_lines = true
-  end
-
-  def trend_line_data_set label:, data:, color:
-    points = data.collect do |hash|
-      [Time.parse(hash[:x]).to_i, hash[:y]]
-    end
-
-    # The trend calculation works with numbers only so convert Time to an int and back
-    calculator = TrendLineCalculator.new(points)
-    data_points = calculator.chart_datapoints(
-      range: time_range.begin.to_i..time_range.end.to_i,
-      max_y: @highest_y_value
-    )
-    data_points.each do |point_hash|
-      point_hash[:x] = chart_format Time.at(point_hash[:x])
-    end
-
-    {
-      type: 'line',
-      label: "#{label} Trendline",
-      data: data_points,
-      fill: false,
-      borderWidth: 1,
-      markerType: 'none',
-      borderColor: color,
-      borderDash: [6, 3],
-      pointStyle: 'dash',
-      hidden: !@show_trend_lines
-    }
-  end
-
-  def data_for_issue item
-    cycle_time = y_value(item)
-    return nil if cycle_time < 1 # These will get called out on the quality report
-
-    @highest_y_value = cycle_time if @highest_y_value < cycle_time
-
-    {
-      y: cycle_time,
-      x: chart_format(x_value(item)),
-      title: [title_value(item)]
-    }
-  end
-
-  def calculate_percent_line items
-    times = items.collect { |item| y_value(item) }
-    index = times.size * 85 / 100
-    times.sort[index]
-  end
+  # Kept for backwards compatibility with existing callers and specs
+  alias data_for_issue data_for_item
 end

data/lib/jirametrics/daily_wip_chart.rb

@@ -3,12 +3,16 @@
 require 'jirametrics/chart_base'
 
 class DailyGroupingRules < GroupingRules
-  attr_accessor :current_date, :group_priority, :issue_hint
+  attr_accessor :current_date, :group_priority, :issue_hint, :highlight
 
   def initialize
     super
     @group_priority = 0
   end
+
+  def group
+    [@label, @color, @highlight ? true : false]
+  end
 end
 
 class DailyWipChart < ChartBase
@@ -19,6 +23,8 @@ class DailyWipChart < ChartBase
 
     header_text default_header_text
     description_text default_description_text
+    @x_axis_title = nil
+    @y_axis_title = 'Count of items'
 
     instance_eval(&block) if block
 
@@ -33,8 +39,15 @@ class DailyWipChart < ChartBase
     issue_rules_by_active_date = group_issues_by_active_dates
     possible_rules = select_possible_rules issue_rules_by_active_date
 
+    conflicting_labels = possible_rules
+      .group_by(&:label)
+      .select { |_label, rules| rules.any?(&:highlight) && rules.any? { |r| !r.highlight } }
+      .keys
+
     data_sets = possible_rules.collect do |grouping_rule|
-      make_data_set grouping_rule: grouping_rule, issue_rules_by_active_date: issue_rules_by_active_date
+      suffix = conflicting_labels.include?(grouping_rule.label) && grouping_rule.highlight ? '*' : ''
+      make_data_set grouping_rule: grouping_rule, issue_rules_by_active_date: issue_rules_by_active_date,
+                    label_suffix: suffix
     end
     if @trend_lines
       data_sets = @trend_lines.filter_map do |group_labels, line_color|
@@ -82,16 +95,16 @@ class DailyWipChart < ChartBase
     hash
   end
 
-  def make_data_set grouping_rule:, issue_rules_by_active_date:
+  def make_data_set grouping_rule:, issue_rules_by_active_date:, label_suffix: ''
     positive = grouping_rule.group_priority >= 0
+    display_label = "#{grouping_rule.label}#{label_suffix}"
 
     data = issue_rules_by_active_date.collect do |date, issue_rules|
-      # issues = []
       issue_strings = issue_rules
         .select { |_issue, rules| rules.group == grouping_rule.group }
         .sort_by { |issue, _rules| issue.key_as_i }
         .collect { |issue, rules| "#{issue.key} : #{issue.summary.strip} #{rules.issue_hint}" }
-      title = ["#{grouping_rule.label} (#{label_issues issue_strings.size})"] + issue_strings
+      title = ["#{display_label} (#{label_issues issue_strings.size})"] + issue_strings
 
       {
         x: date,
@@ -100,11 +113,18 @@ class DailyWipChart < ChartBase
       }
     end
 
+    color = grouping_rule.color || random_color
+    background_color = if grouping_rule.highlight
+                         RawJavascript.new("createDiagonalPattern(#{color.to_json})")
+                       else
+                         color
+                       end
+
     {
       type: 'bar',
-      label: grouping_rule.label,
+      label: display_label,
       data: data,
-      backgroundColor: grouping_rule.color || random_color,
+      backgroundColor: background_color,
       borderColor: CssVariable['--wip-chart-border-color'],
       borderWidth: grouping_rule.color.to_s == 'var(--body-background)' ? 1 : 0,
       borderRadius: positive ? 0 : 5

data/lib/jirametrics/download_config.rb

@@ -25,10 +25,25 @@ class DownloadConfig
     @no_earlier_than
   end
 
+  def github_repos
+    @github_repos ||= []
+  end
+
+  def github_repo *repos
+    github_repos.concat(repos.map { |r| normalize_github_repo(r) })
+  end
+
   def start_date today:
     date = today.to_date - @rolling_date_count if @rolling_date_count
     date = [date, @no_earlier_than].max if date && @no_earlier_than
     date = @no_earlier_than if date.nil? && @no_earlier_than
     date
   end
+
+  private
+
+  def normalize_github_repo repo
+    match = repo.match(%r{github\.com/([^/]+/[^/]+?)/?$})
+    match ? match[1] : repo
+  end
 end

data/lib/jirametrics/downloader.rb

@@ -33,21 +33,23 @@ class Downloader
   # For testing only
   attr_reader :start_date_in_query, :board_id_to_filter_id
 
-  def self.create download_config:, file_system:, jira_gateway:
+  def self.create download_config:, file_system:, jira_gateway:, github_pr_cache: {}
     is_cloud = jira_gateway.settings['jira_cloud'] || jira_gateway.cloud?
     (is_cloud ? DownloaderForCloud : DownloaderForDataCenter).new(
       download_config: download_config,
       file_system: file_system,
-      jira_gateway: jira_gateway
+      jira_gateway: jira_gateway,
+      github_pr_cache: github_pr_cache
     )
   end
 
-  def initialize download_config:, file_system:, jira_gateway:
+  def initialize download_config:, file_system:, jira_gateway:, github_pr_cache: {}
     @metadata = {}
     @download_config = download_config
     @target_path = @download_config.project_config.target_path
     @file_system = file_system
     @jira_gateway = jira_gateway
+    @github_pr_cache = github_pr_cache
     @board_id_to_filter_id = {}
 
     @issue_keys_downloaded_in_current_run = []
@@ -77,6 +79,7 @@ class Downloader
     download_users
 
     save_metadata
+    download_github_prs if @download_config.github_repos.any?
   end
 
   def log text, both: false
@@ -165,11 +168,28 @@ class Downloader
     # actually look at the returned json.
     @board_id_to_filter_id[board_id] = json['filter']['id'].to_i
 
+    if json['type'] == 'simple'
+      features_json = download_features board_id: board_id
+      if features_json['features']&.any? { |f| f['feature'] == 'jsw.agility.sprints' && f['state'] == 'ENABLED' }
+        download_sprints board_id: board_id
+      end
+    end
     download_sprints board_id: board_id if json['type'] == 'scrum'
     # TODO: Should be passing actual statuses, not empty list
     Board.new raw: json, possible_statuses: StatusCollection.new
   end
 
+  def download_features board_id:
+    log "  Downloading features for board #{board_id}", both: true
+    json = @jira_gateway.call_url relative_url: "/rest/agile/1.0/board/#{board_id}/features"
+
+    @file_system.save_json(
+      json: json,
+      filename: File.join(@target_path, "#{file_prefix}_board_#{board_id}_features.json")
+    )
+    json
+  end
+
   def download_sprints board_id:
     log "  Downloading sprints for board #{board_id}", both: true
     max_results = 100
@@ -211,19 +231,36 @@ class Downloader
         value = Date.parse(value) if value.is_a?(String) && value =~ /^\d{4}-\d{2}-\d{2}$/
         @metadata[key] = value
       end
+
+      # If rolling_date_count has changed, we may be missing data outside the previous range,
+      # so force a full re-download.
+      if @metadata['rolling_date_count'] != @download_config.rolling_date_count
+        log '  rolling_date_count has changed. Forcing a full download.', both: true
+        @cached_data_format_is_current = false
+        @metadata = {}
+      end
     end
 
     # Even if this is the old format, we want to obey this one tag
     @metadata['no-download'] = hash['no-download'] if hash['no-download']
   end
 
+  def timezone_offset
+    @download_config.project_config.exporter.timezone_offset
+  end
+
+  def today_in_project_timezone
+    Time.now.getlocal(timezone_offset).to_date
+  end
+
   def save_metadata
     @metadata['version'] = CURRENT_METADATA_VERSION
+    @metadata['rolling_date_count'] = @download_config.rolling_date_count
     @metadata['date_start_from_last_query'] = @start_date_in_query if @start_date_in_query
 
     if @download_date_range.nil?
       log "Making up a date range in meta since one wasn't specified. You'll want to change that.", both: true
-      today = Date.today
+      today = today_in_project_timezone
       @download_date_range = (today - 7)..today
     end
 
@@ -258,7 +295,8 @@ class Downloader
     end
   end
 
-  def make_jql filter_id:, today: Date.today
+  def make_jql filter_id:, today: nil
+    today ||= today_in_project_timezone
     segments = []
     segments << "filter=#{filter_id}"
 
@@ -283,6 +321,39 @@ class Downloader
     segments.join ' AND '
   end
 
+  def download_github_prs
+    project_keys = extract_project_keys_from_downloaded_issues
+    if project_keys.empty?
+      log '  No project keys found in downloaded issues, skipping GitHub PR download', both: true
+      return
+    end
+
+    prs = @download_config.github_repos.flat_map do |repo|
+      GithubGateway.new(
+        repo: repo,
+        project_keys: project_keys,
+        file_system: @file_system,
+        raw_pr_cache: @github_pr_cache
+      ).fetch_pull_requests(since: @download_date_range&.begin)
+    end
+
+    @file_system.save_json(
+      json: prs.map(&:raw),
+      filename: File.join(@target_path, "#{file_prefix}_github_prs.json")
+    )
+  end
+
+  def extract_project_keys_from_downloaded_issues
+    path = File.join(@target_path, "#{file_prefix}_issues")
+    return [] unless @file_system.dir_exist?(path)
+
+    keys = []
+    @file_system.foreach(path) do |filename|
+      keys << filename.split('-').first if filename.match?(/^[A-Z][A-Z_0-9]+-\d+-\d+\.json$/)
+    end
+    keys.uniq
+  end
+
   def file_prefix
     @download_config.project_config.get_file_prefix
   end

data/lib/jirametrics/downloader_for_cloud.rb

@@ -5,6 +5,45 @@ class DownloaderForCloud < Downloader
     'Jira Cloud'
   end
 
+  def run
+    super
+    download_fix_versions
+  end
+
+  def download_board_configuration board_id:
+    board = super
+    location = board.raw['location']
+    @project_key ||= location['key'] if location&.[]('type') == 'project'
+    board
+  end
+
+  def download_fix_versions
+    return unless @project_key
+
+    log "  Downloading fix versions for project #{@project_key}", both: true
+    max_results = 50
+    start_at = 0
+    all_versions = []
+
+    loop do
+      json = @jira_gateway.call_url(
+        relative_url: "/rest/api/3/project/#{@project_key}/version?" \
+          "startAt=#{start_at}&maxResults=#{max_results}"
+      )
+
+      values = json['values'] || []
+      all_versions.concat(values)
+      break if json['isLast'] || values.empty?
+
+      start_at += values.size
+    end
+
+    @file_system.save_json(
+      json: all_versions,
+      filename: File.join(@target_path, "#{file_prefix}_fix_versions.json")
+    )
+  end
+
   def search_for_issues jql:, board_id:, path:
     log "  JQL: #{jql}"
     escaped_jql = CGI.escape jql

data/lib/jirametrics/downloader_for_data_center.rb

@@ -63,7 +63,8 @@ class DownloaderForDataCenter < Downloader
     end
   end
 
-  def make_jql filter_id:, today: Date.today
+  def make_jql filter_id:, today: nil
+    today ||= today_in_project_timezone
     segments = []
     segments << "filter=#{filter_id}"
 

data/lib/jirametrics/estimate_accuracy_chart.rb

@@ -5,7 +5,7 @@ class EstimateAccuracyChart < ChartBase
     super()
 
     header_text 'Estimate Accuracy'
-    description_text <<-HTML
+    description_text <<~HTML
       <div class="p">
         This chart graphs estimates against actual recorded cycle times. Since
         estimates can change over time, we're graphing the estimate at the time that the story started.
@@ -20,8 +20,18 @@ class EstimateAccuracyChart < ChartBase
           far to the right then you know you have a problem.
         <% end %>
       </div>
+      <% if @correlation_coefficient %>
+        <div class="p">
+          The completed items here have a correlation coefficient of <b><%= @correlation_coefficient.round(3) %></b>.
+          The closer it is to +1, the stronger the positive correlation. The closer it is to -1,
+          the stronger the negative collalation. Zero would mean no correlation at all.
+        </div>
+      <% end %>
     HTML
 
+    @x_axis_title = 'Cycletime (days)'
+    @y_axis_title = 'Count of items'
+
     @y_axis_type = 'linear'
     @y_axis_block = ->(issue, start_time) { estimate_at(issue: issue, start_time: start_time)&.to_f }
     @y_axis_sort_order = nil
@@ -30,9 +40,9 @@ class EstimateAccuracyChart < ChartBase
   end
 
   def run
-    if @y_axis_label.nil?
+    if @y_axis_title.nil?
       text = current_board.estimation_configuration.units == :story_points ? 'Story Points' : 'Days'
-      @y_axis_label = "Estimated #{text}"
+      @y_axis_title = "Estimated #{text}"
     end
     data_sets = scan_issues
 
@@ -43,7 +53,7 @@ class EstimateAccuracyChart < ChartBase
 
   def scan_issues
     completed_hash, aging_hash = split_into_completed_and_aging issues: issues
-
+    @correlation_coefficient = correlation_coefficient(completed_hash) unless completed_hash.empty?
     estimation_units = current_board.estimation_configuration.units
     @has_aging_data = !aging_hash.empty?
 
@@ -170,4 +180,32 @@ class EstimateAccuracyChart < ChartBase
     end
     @y_axis_block = block
   end
+
+  # Correlation coefficient is calculated using the Pearson Correlation Coefficient
+  # r = Σ((xi - x̄)(yi - ȳ)) / sqrt(Σ(xi - x̄)² · Σ(yi - ȳ)²)
+  def correlation_coefficient completed_hash
+    list1 = []
+    list2 = []
+    completed_hash.each do |(estimate, cycle_time), issues|
+      issues.size.times do
+        list1 << estimate
+        list2 << cycle_time
+      end
+    end
+
+    n = list1.size
+    return nil if n < 2
+
+    mean1 = list1.sum.to_f / n
+    mean2 = list2.sum.to_f / n
+
+    numerator = list1.zip(list2).sum { |x, y| (x - mean1) * (y - mean2) }
+    sum_sq1 = list1.sum { |x| (x - mean1)**2 }
+    sum_sq2 = list2.sum { |y| (y - mean2)**2 }
+
+    denominator = Math.sqrt(sum_sq1 * sum_sq2)
+    return nil if denominator.zero?
+
+    numerator / denominator
+  end
 end