From e2702877f6aa900e4fe05c520df84bdd96539c6e Mon Sep 17 00:00:00 2001
From: Jacek Grzybowski <jgrzybowski@artegence.com>
Date: Tue, 14 Apr 2015 14:11:46 +0200
Subject: squash

---
 app/helpers/queries_helper.rb         |   2 +
 app/models/issue_query.rb             |  57 ++++++++-
 app/models/query.rb                   |   6 +-
 config/locales/en.yml                 |   4 +
 config/locales/pl.yml                 |   4 +
 public/javascripts/application.js     |  66 ++++++++++-
 public/stylesheets/application.css    |  20 +++-
 test/fixtures/issues.yml              | 174 +++++++++++++++++++--------
 test/fixtures/journal_details.yml     |  55 ++++++++-
 test/fixtures/journals.yml            |  53 ++++++++-
 test/unit/query_issue_history_test.rb | 213 ++++++++++++++++++++++++++++++++++
 11 files changed, 593 insertions(+), 61 deletions(-)
 create mode 100644 test/unit/query_issue_history_test.rb

diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 8f0c5ae..ac3d548 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -26,6 +26,8 @@ module QueriesHelper
     query.available_filters.map do |field, field_options|
       if field_options[:type] == :relation
         group = :label_related_issues
+      elsif field =~ /_id_was\z/
+        group = :label_history
       elsif field =~ /^(.+)\./
         # association filters
         group = "field_#{$1}"
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index c58711b..a152372 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -168,6 +168,7 @@ class IssueQuery < Query
 
     add_available_filter "tracker_id",
       :type => :list, :values => trackers.collect{|s| [s.name, s.id.to_s] }
+
     add_available_filter "priority_id",
       :type => :list, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] }
 
@@ -208,6 +209,15 @@ class IssueQuery < Query
         :values => categories.collect{|s| [s.name, s.id.to_s] }
     end
 
+    add_available_filter "status_id_was",
+      :type => :list, :values => IssueStatus.sorted.collect{|s| [s.name, s.id.to_s] }
+    add_available_filter "priority_id_was",
+      :type => :list, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] }
+    add_available_filter "tracker_id_was",
+      :type => :list, :values => trackers.collect{|s| [s.name, s.id.to_s] }
+    add_available_filter "assigned_to_id_was",
+      :type => :list, :values => assigned_to_values unless assigned_to_values.empty?
+
     add_available_filter "subject", :type => :text
     add_available_filter "created_on", :type => :date_past
     add_available_filter "updated_on", :type => :date_past
@@ -289,9 +299,25 @@ class IssueQuery < Query
     end
   end
 
+  def history_filters
+    filters.select { |k,_| k =~ /_was\z/ }
+  end
+
+  def history_join_clause
+    return nil if history_filters.blank?
+    history_filters.keys.map do |f|
+      "INNER JOIN journals AS j_#{f} ON j_#{f}.journalized_id = issues.id AND j_#{f}.journalized_type = 'Issue'" +
+      "INNER JOIN journal_details AS jd_#{f} ON jd_#{f}.journal_id = j_#{f}.id"
+    end.join(' ')
+  end
+
   # Returns the issue count
   def issue_count
-    Issue.visible.joins(:status, :project).where(statement).count
+    Issue.visible.
+      joins(:status, :project).
+      joins(history_join_clause).
+      where(statement).
+      count
   rescue ::ActiveRecord::StatementInvalid => e
     raise StatementInvalid.new(e.message)
   end
@@ -304,6 +330,7 @@ class IssueQuery < Query
         # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
         r = Issue.visible.
           joins(:status, :project).
+          joins(history_join_clause).
           where(statement).
           joins(joins_for_order_statement(group_by_statement)).
           group(group_by_statement).
@@ -328,6 +355,7 @@ class IssueQuery < Query
 
     scope = Issue.visible.
       joins(:status, :project).
+      joins(history_join_clause).
       where(statement).
       includes(([:status, :project] + (options[:include] || [])).uniq).
       where(options[:conditions]).
@@ -360,6 +388,7 @@ class IssueQuery < Query
 
     Issue.visible.
       joins(:status, :project).
+      joins(history_join_clause).
       where(statement).
       includes(([:status, :project] + (options[:include] || [])).uniq).
       references(([:status, :project] + (options[:include] || [])).uniq).
@@ -401,6 +430,32 @@ class IssueQuery < Query
     raise StatementInvalid.new(e.message)
   end
 
+  # works for status_id_was & priority_id_was
+  def sql_for_history_field(field, operator, values)
+    field_name = field.sub('_was', '')
+    select_values = values[0..-3]
+    select_values = substitute_me_in_history_values(select_values) if field_name == 'assigned_to_id'
+    date_from, date_to = values[-2..-1]
+    journal_queries = []
+    journal_queries << "jd_#{field}.prop_key = '#{field_name}'"
+    journal_queries << sql_for_field(field_name, operator, select_values, "jd_#{field}", "old_value")
+    date_range_query = sql_for_history_date_range(field, date_from, date_to)
+    journal_queries << date_range_query if date_range_query
+    journal_queries.join(" AND ")
+  end
+
+  def substitute_me_in_history_values(values)
+    idx = values.index {|v| v == 'me'}
+    return values unless idx
+    values[idx] = User.current.logged? ? User.current.id.to_s : '0'
+    values
+  end
+
+  def sql_for_history_date_range(field, from, to)
+    from, to = parse_date(from), parse_date(to)
+    from || to ? date_clause("j_#{field}", 'created_on', from, to, false) : nil
+  end
+
   def sql_for_watcher_id_field(field, operator, value)
     db_table = Watcher.table_name
     "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +
diff --git a/app/models/query.rb b/app/models/query.rb
index 0e6064f..e091fa7 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -584,6 +584,8 @@ class Query < ActiveRecord::Base
       if field =~ /cf_(\d+)$/
         # custom field
         filters_clauses << sql_for_custom_field(field, operator, v, $1)
+      elsif field =~ /_was\z/ && respond_to?("sql_for_history_field")
+        filters_clauses << sql_for_history_field(field, operator, v)
       elsif respond_to?("sql_for_#{field}_field")
         # specific statement
         filters_clauses << send("sql_for_#{field}_field", field, operator, v)
@@ -712,9 +714,9 @@ class Query < ActiveRecord::Base
         end
       end
     when "o"
-      sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_false})" if field == "status_id"
+      sql = "#{db_table}.#{db_field} IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_false})" if field == "status_id"
     when "c"
-      sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_true})" if field == "status_id"
+      sql = "#{db_table}.#{db_field} IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_true})" if field == "status_id"
     when "><t-"
       # between today - n days and today
       sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0, is_custom_filter)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fe8b5a..311aac8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -247,14 +247,18 @@ en:
   field_project: Project
   field_issue: Issue
   field_status: Status
+  field_status_id_was: Previous status
   field_notes: Notes
   field_is_closed: Issue closed
   field_is_default: Default value
   field_tracker: Tracker
+  field_tracker_id_was: Previous tracker
   field_subject: Subject
   field_due_date: Due date
   field_assigned_to: Assignee
+  field_assigned_to_id_was: Previous assignee
   field_priority: Priority
+  field_priority_id_was: Previous priority
   field_fixed_version: Target version
   field_user: User
   field_principal: Principal
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1e79ad8..947f59a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -224,6 +224,7 @@ pl:
   field_admin: Administrator
   field_assignable: Zagadnienia mogą być przypisane do tej roli
   field_assigned_to: Przypisany do
+  field_assigned_to_id_was: Poprzednio przypisany do
   field_attr_firstname: Imię atrybut
   field_attr_lastname: Nazwisko atrybut
   field_attr_login: Login atrybut
@@ -282,6 +283,7 @@ pl:
   field_port: Port
   field_possible_values: Możliwe wartości
   field_priority: Priorytet
+  field_priority_id_was: Poprzedni priorytet
   field_project: Projekt
   field_redirect_existing_links: Przekierowanie istniejących odnośników
   field_regexp: Wyrażenie regularne
@@ -291,12 +293,14 @@ pl:
   field_start_date: Data rozpoczęcia
   field_start_page: Strona startowa
   field_status: Status
+  field_status_id_was: Poprzedni status
   field_subject: Temat
   field_subproject: Podprojekt
   field_summary: Podsumowanie
   field_time_zone: Strefa czasowa
   field_title: Tytuł
   field_tracker: Typ zagadnienia
+  field_tracker_id_was: Poprzedni typ zagadnienia
   field_type: Typ
   field_updated_on: Data modyfikacji
   field_url: URL
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a51eef4..7213987 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -168,7 +168,14 @@ function buildFilterRow(field, operator, values) {
       ' <span class="toggle-multiselect">&nbsp;</span></span>'
     );
     select = tr.find('td.values select');
-    if (values.length > 1) { select.attr('multiple', true); }
+    if ( isHistoryFilter(field) ) {
+      // history filters have 2 additional values in array
+      // corresponding to `from` and `to` dates
+      if (values.length > 3) { select.attr('multiple', true); }
+    } else {
+      if (values.length > 1) { select.attr('multiple', true); }
+    }
+
     for (i = 0; i < filterValues.length; i++) {
       var filterValue = filterValues[i];
       var option = $('<option>');
@@ -225,6 +232,18 @@ function buildFilterRow(field, operator, values) {
     $('#values_'+fieldId+'_2').val(values[1]);
     break;
   }
+
+  if ( isHistoryFilter(fieldId) ) {
+    tr.find('td.values').append(
+      '<a href="#" id="enable_daterange_'+field+'" class="enable_daterange"><img src="/images/calendar.png" alt="select daterange" title="select daterange"></a>' +
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_from" size="10" class="value date_value previous_date_range" /></span>' +
+      '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_to" size="10" class="value date_value previous_date_range" /></span>' +
+      '<a style="display:none;" class="disable_daterange icon icon-cancel" title="disable daterange" href="#" />'
+    );
+    date_values = values.slice(Math.max(values.length - 2, 1));
+    $('#values_'+fieldId+'_from').val(date_values[0]).datepicker(datepickerOptions);
+    $('#values_'+fieldId+'_to').val(date_values[1]).datepicker(datepickerOptions);
+  }
 }
 
 function toggleFilter(field) {
@@ -234,6 +253,11 @@ function toggleFilter(field) {
     toggleOperator(field);
   } else {
     $("#operators_" + fieldId).hide().attr('disabled', true);
+    if ( isHistoryFilter(field) ) {
+      $('#values_'+fieldId+'_from').parent().hide();
+      $('#values_'+fieldId+'_to').parent().hide();
+      $('#values_'+fieldId+'_to').parent().siblings('a').hide();
+    }
     enableValues(field, []);
   }
 }
@@ -241,6 +265,7 @@ function toggleFilter(field) {
 function enableValues(field, indexes) {
   var fieldId = field.replace('.', '_');
   $('#tr_'+fieldId+' td.values .value').each(function(index) {
+    if ( isHistoryFilter(this.id) ) return;
     if ($.inArray(index, indexes) >= 0) {
       $(this).removeAttr('disabled');
       $(this).parents('span').first().show();
@@ -298,6 +323,7 @@ function toggleOperator(field) {
       enableValues(field, [0]);
       break;
   }
+  showHistoryFiltersDateRange();
 }
 
 function toggleMultiSelect(el) {
@@ -313,6 +339,30 @@ function toggleMultiSelect(el) {
   }
 }
 
+function isHistoryFilter(filter) {
+  return filter.match(/_was$|_was_from$|_was_to$/);
+}
+
+function showHistoryFiltersDateRange() {
+  $('a.enable_daterange').each(function(){
+    var date_inputs = $(this).siblings().find('.previous_date_range');
+    var date_values = date_inputs.map(function(){
+                        return $(this).val();
+                      }).get();
+    var matches = $.grep(date_values, function(val){
+      return val.match(/^\d{4}-\d{2}-\d{2}$/);
+    });
+    if ( matches.length > 0 ) {
+      $(this).hide();
+      date_inputs.closest('span').show();
+      $(this).siblings('a.disable_daterange').show();
+    } else {
+      $(this).show();
+      $(this).siblings('a.disable_daterange').hide();
+    }
+  });
+}
+
 function showTab(name, url) {
   $('div#content .tab-content').hide();
   $('div.tabs a').removeClass('selected');
@@ -651,6 +701,20 @@ $(document).ready(addFormObserversForDoubleSubmit);
 $(document).ready(defaultFocus);
 
 $(function(){
+  $(document).on('click', 'a.enable_daterange', function(){
+    $(this).siblings().find('.previous_date_range').closest('span').show();
+    $(this).siblings('a.disable_daterange').show();
+    $(this).hide();
+  });
+
+  $(document).on('click', 'a.disable_daterange', function(){
+    $(this).siblings().find('.previous_date_range').val('').closest('span').hide();
+    $(this).siblings('a.enable_daterange').show();
+    $(this).hide();
+  });
+});
+
+$(function(){
   if ($('#issue_tree .issues').length){
     var fuzzyOptions = {
       searchClass: "fuzzy-search",
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0b6b3b4..3e709c0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1237,6 +1237,25 @@ h2 img { vertical-align:middle; }
   z-index: 999  !important;
 }
 
+.previous_date_range {
+  margin-left:15px;
+}
+
+a.enable_daterange {
+  margin-left:10px;
+}
+
+a.enable_daterange img {
+  cursor: pointer;
+  vertical-align: middle;
+  margin-left: 4px;
+}
+
+a.disable_daterange {
+  margin-left:5px;
+}
+
+
 /* js fuzzy search */
 
 input.fuzzy-search{
@@ -1279,7 +1298,6 @@ input.fuzzy-search:-ms-input-placeholder {
    color: #ccc;
 }
 
-
 table.team_time_sheet tr td{
   max-width: 200px;
   overflow: hidden;
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index fb2216b..f97154a 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -1,16 +1,16 @@
---- 
-issues_001: 
+---
+issues_001:
   created_on: <%= 3.days.ago.to_s(:db) %>
   project_id: 1
   updated_on: <%= 1.day.ago.to_s(:db) %>
   priority_id: 4
   subject: Cannot print recipes
   id: 1
-  fixed_version_id: 
+  fixed_version_id:
   category_id: 1
   description: Unable to print recipes
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   start_date: <%= 1.day.ago.to_date.to_s(:db) %>
@@ -19,7 +19,7 @@ issues_001:
   lft: 1
   rgt: 2
   lock_version: 3
-issues_002: 
+issues_002:
   created_on: 2006-07-19 21:04:21 +02:00
   project_id: 1
   updated_on: 2006-07-19 21:09:50 +02:00
@@ -27,28 +27,28 @@ issues_002:
   subject: Add ingredients categories
   id: 2
   fixed_version_id: 2
-  category_id: 
+  category_id:
   description: Ingredients of the recipe should be classified by categories
   tracker_id: 2
   assigned_to_id: 3
   author_id: 2
   status_id: 2
   start_date: <%= 2.day.ago.to_date.to_s(:db) %>
-  due_date: 
+  due_date:
   root_id: 2
   lft: 1
   rgt: 2
   lock_version: 3
   done_ratio: 30
-issues_003: 
+issues_003:
   created_on: 2006-07-19 21:07:27 +02:00
   project_id: 1
   updated_on: 2006-07-19 21:07:27 +02:00
   priority_id: 4
   subject: Error 281 when updating a recipe
   id: 3
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: Error 281 is encountered when saving a recipe
   tracker_id: 1
   assigned_to_id: 3
@@ -59,15 +59,15 @@ issues_003:
   root_id: 3
   lft: 1
   rgt: 2
-issues_004: 
+issues_004:
   created_on: <%= 5.days.ago.to_s(:db) %>
   project_id: 2
   updated_on: <%= 2.days.ago.to_s(:db) %>
   priority_id: 4
   subject: Issue on project 2
   id: 4
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: Issue on project 2
   tracker_id: 1
   assigned_to_id: 2
@@ -76,35 +76,35 @@ issues_004:
   root_id: 4
   lft: 1
   rgt: 2
-issues_005: 
+issues_005:
   created_on: <%= 5.days.ago.to_s(:db) %>
   project_id: 3
   updated_on: <%= 2.days.ago.to_s(:db) %>
   priority_id: 4
   subject: Subproject issue
   id: 5
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is an issue on a cookbook subproject
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   root_id: 5
   lft: 1
   rgt: 2
-issues_006: 
+issues_006:
   created_on: <%= 1.minute.ago.to_s(:db) %>
   project_id: 5
   updated_on: <%= 1.minute.ago.to_s(:db) %>
   priority_id: 4
   subject: Issue of a private subproject
   id: 6
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is an issue of a private subproject of cookbook
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
@@ -112,18 +112,18 @@ issues_006:
   root_id: 6
   lft: 1
   rgt: 2
-issues_007: 
+issues_007:
   created_on: <%= 10.days.ago.to_s(:db) %>
   project_id: 1
   updated_on: <%= 10.days.ago.to_s(:db) %>
   priority_id: 5
   subject: Issue due today
   id: 7
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is an issue that is due today
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   start_date: <%= 10.days.ago.to_s(:db) %>
@@ -132,39 +132,39 @@ issues_007:
   root_id: 7
   lft: 1
   rgt: 2
-issues_008: 
+issues_008:
   created_on: <%= 10.days.ago.to_s(:db) %>
   project_id: 1
   updated_on: <%= 10.days.ago.to_s(:db) %>
   priority_id: 5
   subject: Closed issue
   id: 8
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is a closed issue.
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 5
-  start_date: 
-  due_date: 
+  start_date:
+  due_date:
   lock_version: 0
   root_id: 8
   lft: 1
   rgt: 2
   closed_on: <%= 3.days.ago.to_s(:db) %>
-issues_009: 
+issues_009:
   created_on: <%= 1.minute.ago.to_s(:db) %>
   project_id: 5
   updated_on: <%= 1.minute.ago.to_s(:db) %>
   priority_id: 5
   subject: Blocked Issue
   id: 9
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is an issue that is blocked by issue #10
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
@@ -172,18 +172,18 @@ issues_009:
   root_id: 9
   lft: 1
   rgt: 2
-issues_010: 
+issues_010:
   created_on: <%= 1.minute.ago.to_s(:db) %>
   project_id: 5
   updated_on: <%= 1.minute.ago.to_s(:db) %>
   priority_id: 5
   subject: Issue Doing the Blocking
   id: 10
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is an issue that blocks issue #9
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   start_date: <%= Date.today.to_s(:db) %>
@@ -191,18 +191,18 @@ issues_010:
   root_id: 10
   lft: 1
   rgt: 2
-issues_011: 
+issues_011:
   created_on: <%= 3.days.ago.to_s(:db) %>
   project_id: 1
   updated_on: <%= 1.day.ago.to_s(:db) %>
   priority_id: 5
   subject: Closed issue on a closed version
   id: 11
-  fixed_version_id: 1 
+  fixed_version_id: 1
   category_id: 1
   description:
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 5
   start_date: <%= 1.day.ago.to_date.to_s(:db) %>
@@ -211,18 +211,18 @@ issues_011:
   lft: 1
   rgt: 2
   closed_on: <%= 1.day.ago.to_s(:db) %>
-issues_012: 
+issues_012:
   created_on: <%= 3.days.ago.to_s(:db) %>
   project_id: 1
   updated_on: <%= 1.day.ago.to_s(:db) %>
   priority_id: 5
   subject: Closed issue on a locked version
   id: 12
-  fixed_version_id: 2 
+  fixed_version_id: 2
   category_id: 1
   description:
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 3
   status_id: 5
   start_date: <%= 1.day.ago.to_date.to_s(:db) %>
@@ -238,11 +238,11 @@ issues_013:
   priority_id: 4
   subject: Subproject issue two
   id: 13
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
   description: This is a second issue on a cookbook subproject
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   root_id: 13
@@ -255,11 +255,83 @@ issues_014:
   updated_on: <%= 15.days.ago.to_s(:db) %>
   priority_id: 5
   subject: Private issue on public project
-  fixed_version_id: 
-  category_id: 
+  fixed_version_id:
+  category_id:
+  description: This is a private issue
+  tracker_id: 1
+  assigned_to_id:
+  author_id: 2
+  status_id: 1
+  is_private: true
+  root_id: 14
+  lft: 1
+  rgt: 2
+issues_015:
+  id: 15
+  created_on: <%= 15.days.ago.to_s(:db) %>
+  project_id: 1
+  updated_on: <%= 15.days.ago.to_s(:db) %>
+  priority_id: 5
+  subject: Private issue on public project
+  fixed_version_id:
+  category_id:
+  description: This is a private issue
+  tracker_id: 1
+  assigned_to_id:
+  author_id: 2
+  status_id: 1
+  is_private: true
+  root_id: 14
+  lft: 1
+  rgt: 2
+issues_016:
+  id: 16
+  created_on: <%= 15.days.ago.to_s(:db) %>
+  project_id: 1
+  updated_on: <%= 15.days.ago.to_s(:db) %>
+  priority_id: 5
+  subject: Private issue on public project
+  fixed_version_id:
+  category_id:
+  description: This is a private issue
+  tracker_id: 1
+  assigned_to_id:
+  author_id: 2
+  status_id: 1
+  is_private: true
+  root_id: 14
+  lft: 1
+  rgt: 2
+issues_015:
+  id: 15
+  created_on: <%= 15.days.ago.to_s(:db) %>
+  project_id: 1
+  updated_on: <%= 15.days.ago.to_s(:db) %>
+  priority_id: 5
+  subject: Private issue on public project
+  fixed_version_id:
+  category_id:
+  description: This is a private issue
+  tracker_id: 1
+  assigned_to_id:
+  author_id: 2
+  status_id: 1
+  is_private: true
+  root_id: 14
+  lft: 1
+  rgt: 2
+issues_016:
+  id: 16
+  created_on: <%= 15.days.ago.to_s(:db) %>
+  project_id: 1
+  updated_on: <%= 15.days.ago.to_s(:db) %>
+  priority_id: 5
+  subject: Private issue on public project
+  fixed_version_id:
+  category_id:
   description: This is a private issue
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id:
   author_id: 2
   status_id: 1
   is_private: true
diff --git a/test/fixtures/journal_details.yml b/test/fixtures/journal_details.yml
index ef028c8..06a3f04 100644
--- a/test/fixtures/journal_details.yml
+++ b/test/fixtures/journal_details.yml
@@ -1,12 +1,12 @@
---- 
-journal_details_001: 
+---
+journal_details_001:
   old_value: "1"
   property: attr
   id: 1
   value: "2"
   prop_key: status_id
   journal_id: 1
-journal_details_002: 
+journal_details_002:
   old_value: "40"
   property: attr
   id: 2
@@ -41,3 +41,52 @@ journal_details_006:
   value: 060719210727_picture.jpg
   prop_key: 4
   journal_id: 3
+journal_details_007:
+  old_value: '1'
+  value: '4'
+  property: attr
+  id: 7
+  prop_key: status_id
+  journal_id: 6
+journal_details_008:
+  old_value: '4'
+  value: '3'
+  property: attr
+  id: 8
+  prop_key: status_id
+  journal_id: 7
+journal_details_009:
+  old_value: '4'
+  value: '1'
+  property: attr
+  id: 9
+  prop_key: priority_id
+  journal_id: 8
+journal_details_010:
+  old_value: '4'
+  value: '1'
+  property: attr
+  id: 10
+  prop_key: priority_id
+  journal_id: 9
+journal_details_011:
+  old_value: ''
+  value: '2'
+  property: attr
+  id: 11
+  prop_key: assigned_to_id
+  journal_id: 10
+journal_details_012:
+  old_value: '2'
+  value: '3'
+  property: attr
+  id: 12
+  prop_key: assigned_to_id
+  journal_id: 11
+journal_details_013:
+  old_value: '1'
+  value: '2'
+  property: attr
+  id: 13
+  prop_key: tracker_id
+  journal_id: 12
diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml
index 2156b78..3e6b172 100644
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -1,4 +1,4 @@
---- 
+---
 journals_001:
   created_on: <%= 2.days.ago.to_date.to_s(:db) %>
   notes: "Journal notes"
@@ -6,7 +6,7 @@ journals_001:
   journalized_type: Issue
   user_id: 1
   journalized_id: 1
-journals_002: 
+journals_002:
   created_on: <%= 1.days.ago.to_date.to_s(:db) %>
   notes: "Some notes with Redmine links: #2, r2."
   id: 2
@@ -34,3 +34,52 @@ journals_005:
   user_id: 2
   journalized_type: Issue
   journalized_id: 14
+journals_006:
+  id: 6
+  created_on: <%= 14.days.ago.to_date.to_s(:db) %>
+  notes: "Change status"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 15
+journals_007:
+  id: 7
+  created_on: <%= 13.days.ago.to_date.to_s(:db) %>
+  notes: "Change status"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 15
+journals_008:
+  id: 8
+  created_on: <%= 12.days.ago.to_date.to_s(:db) %>
+  notes: "Change priority"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 15
+journals_009:
+  id: 9
+  created_on: <%= 5.days.ago.to_date.to_s(:db) %>
+  notes: "Change priority"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 16
+journals_010:
+  id: 10
+  created_on: <%= 8.days.ago.to_date.to_s(:db) %>
+  notes: "Change asignee"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 16
+journals_011:
+  id: 11
+  created_on: <%= 6.days.ago.to_date.to_s(:db) %>
+  notes: "Change asignee"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 16
+journals_012:
+  id: 12
+  created_on: <%= 4.days.ago.to_date.to_s(:db) %>
+  notes: "Change tracker"
+  user_id: 2
+  journalized_type: Issue
+  journalized_id: 16
diff --git a/test/unit/query_issue_history_test.rb b/test/unit/query_issue_history_test.rb
new file mode 100644
index 0000000..6efad97
--- /dev/null
+++ b/test/unit/query_issue_history_test.rb
@@ -0,0 +1,213 @@
+# Redmine - project management software
+# Copyright (C) 2006-2015  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class QueryTest < ActiveSupport::TestCase
+  include Redmine::I18n
+
+  fixtures :projects, :enabled_modules, :users, :members,
+           :member_roles, :roles, :trackers, :issue_statuses,
+           :issue_categories, :enumerations, :issues,
+           :watchers, :custom_fields, :custom_values, :versions,
+           :queries,
+           :projects_trackers,
+           :custom_fields_trackers,
+           :workflows,
+           :journals,
+           :journal_details
+
+  def setup
+    User.current = nil
+  end
+
+  def test_available_filters_includes_status_id_was
+    query = IssueQuery.new(:project => Project.find(1), :name => '_')
+    assert query.available_filters.has_key? 'status_id_was'
+    assert_equal :list, query.available_filters['status_id_was'][:type]
+    assert_equal query.available_filters['status_id'][:values], query.available_filters['status_id_was'][:values]
+  end
+
+  def test_available_filters_includes_priority_id_was
+    query = IssueQuery.new(:project => Project.find(1), :name => '_')
+    assert query.available_filters.has_key? 'priority_id_was'
+    assert_equal :list, query.available_filters['priority_id_was'][:type]
+    assert_equal query.available_filters['priority_id'][:values], query.available_filters['priority_id_was'][:values]
+  end
+
+  def test_status_id_was_is_added_as_filter
+    add_filter_to_query('status_id_was', '=', ['2', '', ''])
+    assert @query.available_filters.has_key? @field
+    assert @query.filters['status_id_was'] == { operator: @operator, values: @values }
+  end
+
+  def test_priority_id_was_is_added_as_filter
+    add_filter_to_query('priority_id_was', '=', ['1', '', ''])
+    assert @query.available_filters.has_key? @field
+    assert @query.filters['priority_id_was'] == { operator: @operator, values: @values }
+  end
+
+  def test_status_id_was_with_dates_is_added_as_filter
+    add_filter_to_query('status_id_was', '=', ['2', '2012-02-02', '2015-03-03'])
+    assert @query.available_filters.has_key? @field
+    assert @query.filters['status_id_was'] == { operator: @operator, values: @values }
+  end
+
+  def test_priority_id_was_with_dates_is_added_as_filter
+    add_filter_to_query('priority_id_was', '=', ['2', '2012-02-02', '2015-03-03'])
+    assert @query.available_filters.has_key? @field
+    assert @query.filters['priority_id_was'] == { operator: @operator, values: @values }
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_no_dates
+    add_filter_to_query('status_id_was', '=', ['2', '', ''])
+
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_status_id_was.prop_key = 'status_id' AND jd_status_id_was.old_value IN ('2')"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_priority_id_was_gets_proper_sql_query_with_no_dates
+    add_filter_to_query('priority_id_was', '=', ['2', '', ''])
+
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_priority_id_was.prop_key = 'priority_id' AND jd_priority_id_was.old_value IN ('2')"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_both_dates
+    add_filter_to_query('status_id_was', '=', ['2', '2012-02-02', '2015-03-03'])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_status_id_was.prop_key = 'status_id' AND jd_status_id_was.old_value IN ('2') AND j_status_id_was.created_on > '2012-02-01 23:59:59.999999' AND j_status_id_was.created_on <= '2015-03-03 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_both_dates
+    add_filter_to_query('priority_id_was', '=', ['2', '2012-02-02', '2015-03-03'])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_priority_id_was.prop_key = 'priority_id' AND jd_priority_id_was.old_value IN ('2') AND j_priority_id_was.created_on > '2012-02-01 23:59:59.999999' AND j_priority_id_was.created_on <= '2015-03-03 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_from_date
+    add_filter_to_query('status_id_was', '=', ['2', '2012-02-02', ''])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_status_id_was.prop_key = 'status_id' AND jd_status_id_was.old_value IN ('2') AND j_status_id_was.created_on > '2012-02-01 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_priority_id_was_gets_proper_sql_query_with_from_date
+    add_filter_to_query('priority_id_was', '=', ['2', '2012-02-02', ''])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_priority_id_was.prop_key = 'priority_id' AND jd_priority_id_was.old_value IN ('2') AND j_priority_id_was.created_on > '2012-02-01 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_to_date
+    add_filter_to_query('status_id_was', '=', ['2', '', '2012-02-02'])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_status_id_was.prop_key = 'status_id' AND jd_status_id_was.old_value IN ('2') AND j_status_id_was.created_on <= '2012-02-02 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_was_gets_proper_sql_query_with_to_date
+    add_filter_to_query('priority_id_was', '=', ['2', '', '2012-02-02'])
+    generated_query = @query.sql_for_history_field(@field, @operator, @values)
+    expected_query = "jd_priority_id_was.prop_key = 'priority_id' AND jd_priority_id_was.old_value IN ('2') AND j_priority_id_was.created_on <= '2012-02-02 23:59:59.999999'"
+    assert_equal expected_query, generated_query
+    assert_match expected_query, @query.statement, 'query not included in statement'
+  end
+
+  def test_status_id_issues_return_proper_issue_without_date
+    add_filter_to_query('status_id_was', '=', ['4', '', ''])
+    assert_include Issue.find(15), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_status_id_issues_return_proper_issue_with_date
+    add_filter_to_query('status_id_was', '=', ['4', (Date.today-15.days).to_s, (Date.today-10.days).to_s])
+    assert_include Issue.find(15), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_status_id_shouldnt_return_any_issue_for_a_specific_range
+    add_filter_to_query('status_id_was', '=', ['4', (Date.today-8.days).to_s, (Date.today-7.days).to_s])
+    assert_not_include Issue.find(15), @query.issues
+  end
+
+  def test_status_id_issues_return_proper_issues_without_date
+    add_filter_to_query('priority_id_was', '=', ['4', '', ''])
+    assert_include Issue.find(15), @query.issues
+    assert_include Issue.find(16), @query.issues
+    assert_equal 2, @query.issues.count
+  end
+
+  def test_status_id_issues_return_proper_issues_without_date
+    add_filter_to_query('priority_id_was', '=', ['4', (Date.today-7.days).to_s, (Date.today-3.days).to_s])
+    assert_not_include Issue.find(15), @query.issues
+    assert_include Issue.find(16), @query.issues
+  end
+
+  def test_assigned_to_id_issues_return_previous_asignee_with_dates
+    add_filter_to_query('assigned_to_id_was', '=', ['2', (Date.today-10.days).to_s, (Date.today-3.days).to_s])
+    assert_include Issue.find(16), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_assigned_to_id_issues_return_previous_asignee_without_dates
+    add_filter_to_query('assigned_to_id_was', '=', ['2', '', ''])
+    assert_include Issue.find(16), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_assigned_to_id_issues_return_proper_issues_for_me_value
+    User.current = User.find(2)
+    add_filter_to_query('assigned_to_id_was', '=', ['me', (Date.today-10.days).to_s, (Date.today-3.days).to_s])
+    assert_include Issue.find(16), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_tracker_id_issues_return_proper_issue_with_dates
+    add_filter_to_query('tracker_id_was', '=', ['1', (Date.today-10.days).to_s, (Date.today-3.days).to_s])
+    assert_include Issue.find(16), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  def test_filters_return_issue_for_a_combined_history_query
+    add_filter_to_query('priority_id_was', '=', ['4', (Date.today-7.days).to_s, (Date.today-3.days).to_s])
+    add_filter_to_query('tracker_id_was', '=', ['1', (Date.today-10.days).to_s, (Date.today-3.days).to_s])
+    add_filter_to_query('assigned_to_id_was', '=', ['2', (Date.today-10.days).to_s, (Date.today-3.days).to_s])
+    assert_include Issue.find(16), @query.issues
+    assert_equal 1, @query.issues.count
+  end
+
+  private
+
+  def add_filter_to_query(field, operator, values)
+    @query ||= IssueQuery.new(:project => Project.find(1), :name => '_')
+    @field, @operator, @values = field, operator, values
+    @query.add_filter(field, operator, values)
+    assert @query.valid?
+  end
+end
-- 
1.9.1