jirametrics 2.22 → 2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a0ee85ee8d7d0d2ff071357afdea2aefdfeea8734f96eb789721d4a9f2607b
-  data.tar.gz: 11008f97848d8e3034cf95c5f615496c5677d8057f40b06d2724247d6087318d
+  metadata.gz: a1f64f63f13e8cb59d3b18fb1e1ad90f77ca06d0e2f59a75ff7b7bae4db1870f
+  data.tar.gz: 9b7d6b8759102d7590e86c114d2ac8b1b2e7c4cc9f45a168002752196a6bf797
 SHA512:
-  metadata.gz: 1e5ad6c1d5dddf5a89cc63498f1967f35c4761b6418c90019c8c6756599efb5b8badaf0ac4d50f94be4644508a97641430f178b3d40217cb02560aa017f33b80
-  data.tar.gz: a6a7f74dadbb8a2f7961a02e396a39dd994ff1a11756f57a5eadfd60af5c71bd79c3df65b7bfd77ca998059018f60cd6306b2006512b7cf5f760d75e2d0dfdf4
+  metadata.gz: 8ec0bee468f8c34c001ea9151b0d78b1018d246cc86f9c2588a70ee55e3940b6263f69032884ec5c2dc596d3182909829f6ee63fe51b6c65444ce667bf70a6ca
+  data.tar.gz: 9b9f5337d0fc671639f9f651977cb2ecc60b2d27105cdce1b75a2a4188c093c111ba29ed880adccb515d548b8bd9209b4cf703482a0ede4ccea6b182212a3a57

data/bin/jirametrics-mcp

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'jirametrics'
+JiraMetrics.start(['mcp'] + ARGV)

data/lib/jirametrics/aggregate_config.rb

@@ -65,8 +65,16 @@ class AggregateConfig
 
     if issues.nil?
       file_system.warning "No issues found for #{project_name}"
-    else
-      @project_config.add_issues issues
+      return
+    end
+
+    @project_config.add_issues issues
+
+    # Bring fix versions over
+    project.fix_versions.each do |fix_version|
+      unless @project_config.fix_versions.find { |fv| fv.id == fix_version.id }
+        @project_config.fix_versions << fix_version
+      end
     end
   end
 

data/lib/jirametrics/aging_work_bar_chart.rb

@@ -15,7 +15,7 @@ class AgingWorkBarChart < ChartBase
         newest at the bottom.
       </p>
       <p>
-        There are three bars for each issue, and hovering over any of the bars will provide more details.
+        There are <%= (aggregated_project? || current_board.scrum?) ? 'four' : 'three' %> bars for each issue, and hovering over any of the bars will provide more details.
         <ol>
           <li>Status: The status the issue was in at any time. The colour indicates the
           status category, which will be one of #{color_block '--status-category-todo-color'} To Do,
@@ -25,6 +25,9 @@ class AgingWorkBarChart < ChartBase
           or #{color_block '--stalled-color'} stalled.</li>
           <li>Priority: This shows the priority over time. If one of these priorities is considered expedited
           then it will be drawn with diagonal lines.</li>
+          <% if aggregated_project? || current_board.scrum? %>
+            <li>Sprints: The sprints that the issue was in.</li>
+          <% end %>
         </ol>
       </p>
       #{describe_non_working_days}
@@ -63,7 +66,7 @@ class AgingWorkBarChart < ChartBase
 
   def adjust_time_date_ranges_to_start_from_earliest_issue_start aging_issues
     earliest_start_time = aging_issues.collect do |issue|
-      issue.board.cycletime.started_stopped_times(issue).first
+      issue.started_stopped_times.first
     end.min
     return if earliest_start_time.nil? || earliest_start_time >= @time_range.begin
 
@@ -81,7 +84,9 @@ class AgingWorkBarChart < ChartBase
       ['blocked', collect_blocked_stalled_ranges(issue: issue, issue_start_time: issue_start_time)],
       ['priority', collect_priority_ranges(issue: issue)]
     ]
-    bar_data << ['sprints', collect_sprint_ranges(issue: issue)] if current_board.scrum?
+    bar_data << ['sprints', collect_sprint_ranges(issue: issue)] if aggregated_project? || current_board.scrum?
+
+    bar_data.each { |entry| clip_ranges_to_start_time(ranges: entry.last, issue_start_time: issue_start_time) }
 
     issue_label = "[#{label_days cycletime.age(issue, today: today)}] #{issue.key}: #{issue.summary}"[0..60]
     bar_data.collect do |stack, ranges|
@@ -97,7 +102,7 @@ class AgingWorkBarChart < ChartBase
 
   def select_aging_issues issues:
     issues.select do |issue|
-      started_time, stopped_time = issue.board.cycletime.started_stopped_times(issue)
+      started_time, stopped_time = issue.started_stopped_times
       next false unless started_time && stopped_time.nil?
 
       age = (date_range.end - started_time.to_date).to_i + 1
@@ -108,15 +113,22 @@ class AgingWorkBarChart < ChartBase
   def grow_chart_height_if_too_many_issues aging_issue_count:
     px_per_bar = 10
     bars_per_issue = 3
-    bars_per_issue += 1 if current_board.scrum?
+    bars_per_issue += 1 if aggregated_project? || current_board.scrum?
 
     preferred_height = aging_issue_count * px_per_bar * bars_per_issue
     @canvas_height = preferred_height if @canvas_height.nil? || @canvas_height < preferred_height
   end
 
+  def clip_ranges_to_start_time ranges:, issue_start_time:
+    return if issue_start_time.nil?
+
+    ranges.each { |range| range.start = issue_start_time if range.start < issue_start_time }
+    ranges.reject! { |range| range.start >= range.stop }
+  end
+
   def collect_status_ranges issue:, now:
     ranges = []
-    issue_started_time = issue.board.cycletime.started_stopped_times(issue).first
+    issue_started_time = issue.started_stopped_times.first
     previous_start = nil
     previous_status = nil
     issue.status_changes.each do |change|
@@ -223,10 +235,12 @@ class AgingWorkBarChart < ChartBase
       previous_change = change
     end
 
-    results << create_range_for_priority(
-      previous_change: previous_change, stop_time: time_range.end,
-      expedited_priority_names: expedited_priority_names
-    )
+    if previous_change
+      results << create_range_for_priority(
+        previous_change: previous_change, stop_time: time_range.end,
+        expedited_priority_names: expedited_priority_names
+      )
+    end
     results
   end
 
@@ -263,6 +277,8 @@ class AgingWorkBarChart < ChartBase
     end
 
     open_sprints.each_value do |data|
+      next if data[:sprint].future?
+
       stop = data[:sprint].completed_time || time_range.end
       results << BarChartRange.new(
         start: data[:start_time], stop: stop,

data/lib/jirametrics/aging_work_in_progress_chart.rb

@@ -6,6 +6,7 @@ require 'jirametrics/board_movement_calculator'
 
 class AgingWorkInProgressChart < ChartBase
   include GroupableIssueChart
+
   attr_accessor :possible_statuses, :board_id
   attr_reader :board_columns
 
@@ -55,7 +56,7 @@ class AgingWorkInProgressChart < ChartBase
   def run
     determine_board_columns
 
-    @header_text += " on board: #{@all_boards[@board_id].name}"
+    @header_text += " on board: #{current_board.name}"
     data_sets = make_data_sets
 
     adjust_visibility_of_unmapped_status_column data_sets: data_sets
@@ -76,7 +77,7 @@ class AgingWorkInProgressChart < ChartBase
 
     @fake_column = BoardColumn.new({
       'name' => '[Unmapped Statuses]',
-      'statuses' => unmapped_statuses.collect { |id| { 'id' => id.to_s } }.uniq # rubocop:disable Performance/ChainArrayAllocation
+      'statuses' => unmapped_statuses.collect { |id| { 'id' => id.to_s } }.uniq
     })
     @board_columns = columns + [@fake_column]
   end
@@ -114,14 +115,7 @@ class AgingWorkInProgressChart < ChartBase
 
     calculator = BoardMovementCalculator.new board: @all_boards[@board_id], issues: issues, today: date_range.end
 
-    column_indexes_to_remove = []
-    unless @show_all_columns
-      column_indexes_to_remove = indexes_of_leading_and_trailing_zeros(calculator.age_data_for(percentage: 100))
-
-      column_indexes_to_remove.reverse_each do |index|
-        @board_columns.delete_at index
-      end
-    end
+    column_indexes_to_remove = trim_board_columns data_sets: data_sets, calculator: calculator
 
     @row_index_offset = data_sets.size
 
@@ -177,6 +171,44 @@ class AgingWorkInProgressChart < ChartBase
     result
   end
 
+  def trim_board_columns data_sets:, calculator:
+    return [] if @show_all_columns
+
+    columns_with_aging_items = data_sets.flat_map do |set|
+      set['data'].filter_map { |d| d['x'] if d.is_a? Hash }
+    end.uniq
+
+    # @fake_column is always the last element and is handled separately.
+    real_column_count = @board_columns.size - 1
+
+    # The last visible column always has artificially inflated age_data because
+    # ages_of_issues_when_leaving_column uses `today` as end_date when there is no
+    # next column. Exclude it from the right-boundary search so it is only kept when
+    # it has current aging items (handled by the last_aging fallback below).
+    age_data = calculator.age_data_for(percentage: 100)
+    last_data = (0...(real_column_count - 1)).to_a.reverse.find { |i| !age_data[i].zero? }
+
+    in_current = ->(i) { columns_with_aging_items.include?(@board_columns[i].name) }
+    first_aging = (0...real_column_count).find(&in_current)
+    last_aging  = (0...real_column_count).to_a.reverse.find(&in_current)
+
+    # Combine: include any column with age_data (up to but not including the last visible
+    # column) and any column with current aging items.
+    first_data = (0...real_column_count).find { |i| !age_data[i].zero? }
+    left_bound  = [first_data, first_aging].compact.min
+    right_bound = [last_data, last_aging].compact.max
+
+    indexes_to_remove =
+      if left_bound && right_bound
+        (0...left_bound).to_a + ((right_bound + 1)...real_column_count).to_a
+      else
+        (0...real_column_count).to_a
+      end
+
+    indexes_to_remove.reverse_each { |index| @board_columns.delete_at index }
+    indexes_to_remove
+  end
+
   def column_for issue:
     @board_columns.find do |board_column|
       board_column.status_ids.include? issue.status.id
@@ -192,7 +224,7 @@ class AgingWorkInProgressChart < ChartBase
       end
     end
 
-    if has_unmapped
+    if has_unmapped && @description_text
       @description_text += "<p>The items shown in #{column_name.inspect} are not visible on the " \
         'board but are still active. Most likely everyone has forgotten about them.</p>'
     else

data/lib/jirametrics/aging_work_table.rb

@@ -45,20 +45,21 @@ class AgingWorkTable < ChartBase
   # This is its own method simply so the tests can initialize the calculator without doing a full run.
   def initialize_calculator
     @today = date_range.end
-    @calculator = BoardMovementCalculator.new board: current_board, issues: issues, today: @today
+    @calculators = @all_boards.transform_values do |board|
+      BoardMovementCalculator.new board: board, issues: issues, today: @today
+    end
   end
 
   def expedited_but_not_started
     @issues.select do |issue|
-      started_time, stopped_time = issue.board.cycletime.started_stopped_times(issue)
+      started_time, stopped_time = issue.started_stopped_times
       started_time.nil? && stopped_time.nil? && issue.expedited?
     end.sort_by(&:created)
   end
 
   def select_aging_issues
     aging_issues = @issues.select do |issue|
-      cycletime = issue.board.cycletime
-      started, stopped = cycletime.started_stopped_times(issue)
+      started, stopped = issue.started_stopped_times
       next false if started.nil? || stopped
       next true if issue.blocked_on_date?(@today, end_time: time_range.end) || issue.expedited?
 
@@ -77,7 +78,7 @@ class AgingWorkTable < ChartBase
   end
 
   def blocked_text issue
-    started_time, _stopped_time = issue.board.cycletime.started_stopped_times(issue)
+    started_time, _stopped_time = issue.started_stopped_times
     return nil if started_time.nil?
 
     current = issue.blocked_stalled_changes(end_time: time_range.end)[-1]
@@ -124,7 +125,8 @@ class AgingWorkTable < ChartBase
     due = issue.due_date
     message = nil
 
-    days_remaining, error = @calculator.forecasted_days_remaining_and_message issue: issue, today: @today
+    calculator = @calculators[issue.board.id]
+    days_remaining, error = calculator.forecasted_days_remaining_and_message issue: issue, today: @today
 
     unless error
       if due
@@ -174,6 +176,6 @@ class AgingWorkTable < ChartBase
   end
 
   def priority_text issue
-    "<img src='#{issue.priority_url}' title='Priority: #{issue.priority_name}' />"
+    "<img src='#{issue.priority_url}' title='Priority: #{issue.priority_name}' style='max-width: 1em;'/>"
   end
 end

data/lib/jirametrics/anonymizer.rb

@@ -21,6 +21,10 @@ class Anonymizer < ChartBase
     anonymize_column_names
     # anonymize_issue_statuses
     anonymize_board_names
+    anonymize_labels_and_components
+    anonymize_sprints
+    anonymize_fix_versions
+    anonymize_server_url
     shift_all_dates unless @date_adjustment.zero?
     @file_system.log 'Anonymize done'
   end
@@ -38,13 +42,25 @@ class Anonymizer < ChartBase
 
   def anonymize_issue_keys_and_titles issues: @issues
     counter = 0
+    seen_author_raws = {}
     issues.each do |issue|
       new_key = "ANON-#{counter += 1}"
 
       issue.raw['key'] = new_key
       issue.raw['fields']['summary'] = random_phrase
+      issue.raw['fields']['description'] = nil
       issue.raw['fields']['assignee']['displayName'] = random_name unless issue.raw['fields']['assignee'].nil?
 
+      anonymize_author_raw(issue.raw['fields']['creator'], seen_author_raws)
+
+      issue.changes.each do |change|
+        anonymize_author_raw(change.author_raw, seen_author_raws)
+        if change.comment? || change.description?
+          change.value = nil
+          change.old_value = nil
+        end
+      end
+
       issue.issue_links.each do |link|
         other_issue = link.other_issue
         next if other_issue.key.match?(/^ANON-\d+$/) # Already anonymized?
@@ -55,6 +71,49 @@ class Anonymizer < ChartBase
     end
   end
 
+  def anonymize_labels_and_components
+    @issues.each do |issue|
+      issue.raw['fields']['labels'] = []
+      issue.raw['fields']['components'] = []
+    end
+  end
+
+  def anonymize_sprints
+    sprint_counter = 0
+    sprint_name_map = {}
+    @all_boards.each_value do |board|
+      board.sprints.each do |sprint|
+        name = sprint.raw['name']
+        unless sprint_name_map[name]
+          sprint_counter += 1
+          sprint_name_map[name] = "Sprint-#{sprint_counter}"
+        end
+        sprint.raw['name'] = sprint_name_map[name]
+      end
+    end
+  end
+
+  def anonymize_fix_versions
+    version_counter = 0
+    version_name_map = {}
+    @issues.each do |issue|
+      issue.raw['fields']['fixVersions']&.each do |fix_version|
+        name = fix_version['name']
+        unless version_name_map[name]
+          version_counter += 1
+          version_name_map[name] = "Version-#{version_counter}"
+        end
+        fix_version['name'] = version_name_map[name]
+      end
+    end
+  end
+
+  def anonymize_server_url
+    @all_boards.each_value do |board|
+      board.raw['self'] = board.raw['self']&.sub(/^https?:\/\/[^\/]+/, 'https://anon.example.com')
+    end
+  end
+
   def anonymize_column_names
     @all_boards.each_key do |board_id|
       @file_system.log "Anonymizing column names for board #{board_id}"
@@ -143,7 +202,7 @@ class Anonymizer < ChartBase
     end
 
     range = @project_config.time_range
-    @project_config.time_range = (range.begin + date_adjustment)..(range.end + date_adjustment)
+    @project_config.time_range = (range.begin + adjustment_in_seconds)..(range.end + adjustment_in_seconds)
   end
 
   def random_name
@@ -186,4 +245,18 @@ class Anonymizer < ChartBase
       board.raw['name'] = "#{random_phrase} board"
     end
   end
+
+  private
+
+  def anonymize_author_raw author_raw, seen
+    return unless author_raw
+    return if seen[author_raw.object_id]
+
+    seen[author_raw.object_id] = true
+    name = random_name
+    author_raw['displayName'] = name
+    author_raw['name'] = name
+    author_raw.delete('emailAddress')
+    author_raw.delete('avatarUrls')
+  end
 end

data/lib/jirametrics/atlassian_document_format.rb

@@ -23,105 +23,95 @@ class AtlassianDocumentFormat
     end
   end
 
+  def to_text input
+    if input.is_a? String
+      input
+    elsif input&.[]('content')
+      input['content'].collect { |element| adf_node_to_text element }.join
+    else
+      ''
+    end
+  end
+
   # ADF is Atlassian Document Format
   # https://developer.atlassian.com/cloud/jira/platform/apis/document/structure/
   def adf_node_to_html node # rubocop:disable Metrics/CyclomaticComplexity
-    closing_tag = nil
-    node_attrs = node['attrs']
-
-    result = +''
-    case node['type']
-    when 'blockquote'
-      result << '<blockquote>'
-      closing_tag = '</blockquote>'
-    when 'bulletList'
-      result << '<ul>'
-      closing_tag = '</ul>'
-    when 'codeBlock'
-      result << '<code>'
-      closing_tag = '</code>'
-    when 'date'
-      result << Time.at(node_attrs['timestamp'].to_i / 1000, in: @timezone_offset).to_date.to_s
-    when 'decisionItem'
-      result << '<li>'
-      closing_tag = '</li>'
-    when 'decisionList'
-      result << '<div>Decisions<ul>'
-      closing_tag = '</ul></div>'
-    when 'emoji'
-      result << node_attrs['text']
-    when 'expand'
-      # TODO: Maybe, someday, make this actually expandable. For now it's always open
-      result << "<div>#{node_attrs['title']}</div>"
-    when 'hardBreak'
-      result << '<br />'
-    when 'heading'
-      level = node_attrs['level']
-      result << "<h#{level}>"
-      closing_tag = "</h#{level}>"
-    when 'inlineCard'
-      url = node_attrs['url']
-      result << "[Inline card]: <a href='#{url}'>#{url}</a>"
-    when 'listItem'
-      result << '<li>'
-      closing_tag = '</li>'
-    when 'media'
-      text = node_attrs['alt'] || node_attrs['id']
-      result << "Media: #{text}"
-    when 'mediaSingle', 'mediaGroup'
-      result << '<div>'
-      closing_tag = '</div>'
-    when 'mention'
-      user = node_attrs['text']
-      result << "<b>#{user}</b>"
-    when 'orderedList'
-      result << '<ol>'
-      closing_tag = '</ol>'
-    when 'panel'
-      type = node_attrs['panelType']
-      result << "<div>#{type.upcase}</div>"
-    when 'paragraph'
-      result << '<p>'
-      closing_tag = '</p>'
-    when 'rule'
-      result << '<hr />'
-    when 'status'
-      text = node_attrs['text']
-      result << text
-    when 'table'
-      result << '<table>'
-      closing_tag = '</table>'
-    when 'tableCell'
-      result << '<td>'
-      closing_tag = '</td>'
-    when 'tableHeader'
-      result << '<th>'
-      closing_tag = '</th>'
-    when 'tableRow'
-      result << '<tr>'
-      closing_tag = '</tr>'
-    when 'text'
-      marks = adf_marks_to_html node['marks']
-      result << marks.collect(&:first).join
-      result << node['text']
-      result << marks.collect(&:last).join
-    when 'taskItem'
-      state = node_attrs['state'] == 'TODO' ? '☐' : '☑'
-      result << "<li>#{state} "
-      closing_tag = '</li>'
-    when 'taskList'
-      result << "<ul class='taskList'>"
-      closing_tag = '</ul>'
-    else
-      result << "<p>Unparseable section: #{node['type']}</p>"
+    adf_node_render(node) do |n|
+      node_attrs = n['attrs']
+      case n['type']
+      when 'blockquote'                then ['<blockquote>', '</blockquote>']
+      when 'bulletList'                then ['<ul>', '</ul>']
+      when 'codeBlock'                 then ['<code>', '</code>']
+      when 'date'
+        [Time.at(node_attrs['timestamp'].to_i / 1000, in: @timezone_offset).to_date.to_s, nil]
+      when 'decisionItem', 'listItem'  then ['<li>', '</li>']
+      when 'decisionList'              then ['<div>Decisions<ul>', '</ul></div>']
+      when 'emoji', 'status'           then [node_attrs['text'], nil]
+      when 'expand'                    then ["<div>#{node_attrs['title']}</div>", nil]
+      when 'hardBreak'                 then ['<br />', nil]
+      when 'heading'
+        level = node_attrs['level']
+        ["<h#{level}>", "</h#{level}>"]
+      when 'inlineCard'
+        url = node_attrs['url']
+        ["[Inline card]: <a href='#{url}'>#{url}</a>", nil]
+      when 'media'
+        text = node_attrs['alt'] || node_attrs['id']
+        ["Media: #{text}", nil]
+      when 'mediaSingle', 'mediaGroup' then ['<div>', '</div>']
+      when 'mention'                   then ["<b>#{node_attrs['text']}</b>", nil]
+      when 'orderedList'               then ['<ol>', '</ol>']
+      when 'panel'                     then ["<div>#{node_attrs['panelType'].upcase}</div>", nil]
+      when 'paragraph'                 then ['<p>', '</p>']
+      when 'rule'                      then ['<hr />', nil]
+      when 'table'                     then ['<table>', '</table>']
+      when 'tableCell'                 then ['<td>', '</td>']
+      when 'tableHeader'               then ['<th>', '</th>']
+      when 'tableRow'                  then ['<tr>', '</tr>']
+      when 'text'
+        marks = adf_marks_to_html(n['marks'])
+        [marks.collect(&:first).join + n['text'], marks.collect(&:last).join]
+      when 'taskItem'
+        state = node_attrs['state'] == 'TODO' ? '☐' : '☑'
+        ["<li>#{state} ", '</li>']
+      when 'taskList'                  then ["<ul class='taskList'>", '</ul>']
+      else
+        ["<p>Unparseable section: #{n['type']}</p>", nil]
+      end
     end
+  end
 
-    node['content']&.each do |child|
-      result << adf_node_to_html(child)
+  def adf_node_to_text node # rubocop:disable Metrics/CyclomaticComplexity
+    adf_node_render(node) do |n|
+      node_attrs = n['attrs']
+      case n['type']
+      when 'blockquote', 'bulletList', 'codeBlock',
+           'mediaSingle', 'mediaGroup',
+           'orderedList', 'table', 'taskList'  then ['', nil]
+      when 'date'
+        [Time.at(node_attrs['timestamp'].to_i / 1000, in: @timezone_offset).to_date.to_s, nil]
+      when 'decisionItem'              then ['- ', "\n"]
+      when 'decisionList'              then ["Decisions:\n", nil]
+      when 'emoji', 'mention', 'status' then [node_attrs['text'], nil]
+      when 'expand'                    then ["#{node_attrs['title']}\n", nil]
+      when 'hardBreak'                 then ["\n", nil]
+      when 'heading', 'paragraph', 'tableRow' then ['', "\n"]
+      when 'inlineCard'                then [node_attrs['url'], nil]
+      when 'listItem'                  then ['- ', nil]
+      when 'media'
+        text = node_attrs['alt'] || node_attrs['id']
+        ["Media: #{text}", nil]
+      when 'panel'                     then ["#{node_attrs['panelType'].upcase}\n", nil]
+      when 'rule'                      then ["---\n", nil]
+      when 'tableCell', 'tableHeader'  then ['', "\t"]
+      when 'text'                      then [n['text'], nil]
+      when 'taskItem'
+        state = node_attrs['state'] == 'TODO' ? '☐' : '☑'
+        ["#{state} ", "\n"]
+      else
+        ["[Unparseable: #{n['type']}]\n", nil]
+      end
     end
-
-    result << closing_tag if closing_tag
-    result
   end
 
   def adf_marks_to_html list
@@ -157,4 +147,14 @@ class AtlassianDocumentFormat
     text = "@#{user.display_name}" if user
     "<span class='account_id'>#{text}</span>"
   end
+
+  private
+
+  def adf_node_render node, &render_node
+    prefix, suffix = render_node.call(node)
+    result = +(prefix || '')
+    node['content']&.each { |child| result << adf_node_render(child, &render_node) }
+    result << suffix if suffix
+    result
+  end
 end

data/lib/jirametrics/blocked_stalled_change.rb

@@ -4,10 +4,12 @@ require 'jirametrics/value_equality'
 
 class BlockedStalledChange
   include ValueEquality
-  attr_reader :time, :blocking_issue_keys, :flag, :status, :stalled_days, :status_is_blocking
+  attr_reader :time, :blocking_issue_keys, :flag, :flag_reason, :status, :stalled_days, :status_is_blocking
 
-  def initialize time:, flagged: nil, status: nil, status_is_blocking: true, blocking_issue_keys: nil, stalled_days: nil
+  def initialize time:, flagged: nil, flag_reason: nil, status: nil, status_is_blocking: true,
+    blocking_issue_keys: nil, stalled_days: nil
     @flag = flagged
+    @flag_reason = flag_reason
     @status = status
     @status_is_blocking = status_is_blocking
     @blocking_issue_keys = blocking_issue_keys
@@ -25,7 +27,7 @@ class BlockedStalledChange
   def reasons
     result = []
     if blocked?
-      result << 'Blocked by flag' if @flag
+      result << (@flag_reason ? "Blocked by flag: #{@flag_reason}" : 'Blocked by flag') if @flag
       result << "Blocked by status: #{@status}" if blocked_by_status?
       result << "Blocked by issues: #{@blocking_issue_keys.join(', ')}" if @blocking_issue_keys
     elsif stalled_by_status?