Merge branch 'osw-avoid-wrong-set-of-closed-dates-on-burndown-charts' into 'master'

Avoid wrong closing dates being caught by the query on Burndown charts

Closes gitlab-com/support-forum#3273

See merge request gitlab-org/gitlab-ee!5400

ee/app/models/burndown.rb

@@ -88,7 +88,7 @@ class Burndown
         # reopened.
         internal_clause =
           ::Issue
-            .joins("LEFT OUTER JOIN events e ON issues.id = e.target_id AND e.target_type = 'Issue'")
+            .joins("LEFT OUTER JOIN events e ON issues.id = e.target_id AND e.target_type = 'Issue' AND e.action = #{Event::CLOSED}") # rubocop:disable GitlabSecurity/SqlInjection
             .where(milestone: @milestone)
             .where("state = 'closed' OR (state = 'opened' AND e.action = #{Event::CLOSED})") # rubocop:disable GitlabSecurity/SqlInjection
 

ee/changelogs/unreleased/osw-avoid-wrong-set-of-closed-dates-on-burndown-charts.yml

+---
+title: Avoid wrong closing dates being caught by the query on Burndown charts
+merge_request:
+author:
+type: fixed

ee/spec/models/burndown_spec.rb

@@ -110,6 +110,15 @@ describe Burndown do
         # Create issues
         issues = create_list(:issue, count, issue_params)
 
+        issues.each do |issue|
+          # Turns out we need to make sure older events that are not "closed"
+          # won't be caught by the query.
+          Event.create!(author: user,
+                        target: issue,
+                        created_at: Date.yesterday,
+                        action: Event::CREATED)
+        end
+
         # Close issues
         closed = issues.slice(0..count / 2)
         closed.each { |issue| close_issue(issue) }