OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Fix CostQuery
Klaus Zanders044936c4fd5e
diff --git a/modules/reporting/app/models/cost_query/custom_field_mixin.rb b/modules/reporting/app/models/cost_query/custom_field_mixin.rbindex 53ee5425d7c..9eedfdc55b8 100644--- a/modules/reporting/app/models/cost_query/custom_field_mixin.rb+++ b/modules/reporting/app/models/cost_query/custom_field_mixin.rb@@ -128,7 +128,7 @@ module CostQuery::CustomFieldMixinON #{db_field}.customized_type = 'WorkPackage'AND #{db_field}.custom_field_id = #{field.id}- AND #{db_field}.customized_id = entries.work_package_id+ AND #{db_field}.customized_id = entries.entity_id-- END Custom Field Join: #{db_field}SQLend@@ -147,7 +147,7 @@ module CostQuery::CustomFieldMixinAS %2$sON %2$s.customized_type = 'WorkPackage'AND %2$s.custom_field_id = %3$d- AND %2$s.customized_id = entries.work_package_id+ AND %2$s.customized_id = entries.entity_id-- END Custom Field Join: "%4$s"SQLenddiff --git a/modules/reporting/app/models/cost_query/filter/assigned_to_id.rb b/modules/reporting/app/models/cost_query/filter/assigned_to_id.rbindex b7d33e79c30..82ed5c6ddd6 100644--- a/modules/reporting/app/models/cost_query/filter/assigned_to_id.rb+++ b/modules/reporting/app/models/cost_query/filter/assigned_to_id.rb@@ -28,7 +28,7 @@class CostQuery::Filter::AssignedToId < CostQuery::Filter::UserIduse :null_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/author_id.rb b/modules/reporting/app/models/cost_query/filter/author_id.rbindex e1c0c827ed7..910eac962a6 100644--- a/modules/reporting/app/models/cost_query/filter/author_id.rb+++ b/modules/reporting/app/models/cost_query/filter/author_id.rb@@ -27,7 +27,7 @@#++class CostQuery::Filter::AuthorId < CostQuery::Filter::UserId- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/budget_id.rb b/modules/reporting/app/models/cost_query/filter/budget_id.rbindex 89354fc829d..bd47c0acf81 100644--- a/modules/reporting/app/models/cost_query/filter/budget_id.rb+++ b/modules/reporting/app/models/cost_query/filter/budget_id.rb@@ -27,7 +27,7 @@#++class CostQuery::Filter::BudgetId < Report::Filter::Base- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/category_id.rb b/modules/reporting/app/models/cost_query/filter/category_id.rbindex 34c4f1b8b9a..3345dcb5795 100644--- a/modules/reporting/app/models/cost_query/filter/category_id.rb+++ b/modules/reporting/app/models/cost_query/filter/category_id.rb@@ -28,7 +28,7 @@class CostQuery::Filter::CategoryId < Report::Filter::Baseuse :null_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/due_date.rb b/modules/reporting/app/models/cost_query/filter/due_date.rbindex 1a3c2652849..a88ea72eb16 100644--- a/modules/reporting/app/models/cost_query/filter/due_date.rb+++ b/modules/reporting/app/models/cost_query/filter/due_date.rb@@ -28,7 +28,7 @@class CostQuery::Filter::DueDate < Report::Filter::Baseuse :time_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/priority_id.rb b/modules/reporting/app/models/cost_query/filter/priority_id.rbindex 6d094e24f99..2da1612785e 100644--- a/modules/reporting/app/models/cost_query/filter/priority_id.rb+++ b/modules/reporting/app/models/cost_query/filter/priority_id.rb@@ -27,7 +27,7 @@#++class CostQuery::Filter::PriorityId < Report::Filter::Base- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/responsible_id.rb b/modules/reporting/app/models/cost_query/filter/responsible_id.rbindex 6787fd41c09..97f0ef79131 100644--- a/modules/reporting/app/models/cost_query/filter/responsible_id.rb+++ b/modules/reporting/app/models/cost_query/filter/responsible_id.rb@@ -28,7 +28,7 @@class CostQuery::Filter::ResponsibleId < CostQuery::Filter::UserIduse :null_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/start_date.rb b/modules/reporting/app/models/cost_query/filter/start_date.rbindex 443ad21bf93..7f01f69489f 100644--- a/modules/reporting/app/models/cost_query/filter/start_date.rb+++ b/modules/reporting/app/models/cost_query/filter/start_date.rb@@ -28,7 +28,7 @@class CostQuery::Filter::StartDate < Report::Filter::Baseuse :time_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/status_id.rb b/modules/reporting/app/models/cost_query/filter/status_id.rbindex e8684f39dd2..990a2934e46 100644--- a/modules/reporting/app/models/cost_query/filter/status_id.rb+++ b/modules/reporting/app/models/cost_query/filter/status_id.rb@@ -28,7 +28,7 @@class CostQuery::Filter::StatusId < Report::Filter::Baseavailable_operators "c", "o"- join_table WorkPackage, Status => [WorkPackage, :status]+ join_table WorkPackage => [Entry, :entity], Status => [WorkPackage, :status]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/subject.rb b/modules/reporting/app/models/cost_query/filter/subject.rbindex 2f8d16bc603..19820a1caf3 100644--- a/modules/reporting/app/models/cost_query/filter/subject.rb+++ b/modules/reporting/app/models/cost_query/filter/subject.rb@@ -28,7 +28,7 @@class CostQuery::Filter::Subject < Report::Filter::Baseuse :string_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/type_id.rb b/modules/reporting/app/models/cost_query/filter/type_id.rbindex ef240487435..749142f41bc 100644--- a/modules/reporting/app/models/cost_query/filter/type_id.rb+++ b/modules/reporting/app/models/cost_query/filter/type_id.rb@@ -27,7 +27,7 @@#++class CostQuery::Filter::TypeId < Report::Filter::Base- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/version_id.rb b/modules/reporting/app/models/cost_query/filter/version_id.rbindex 7b7a4ee3e6b..6feae8507f4 100644--- a/modules/reporting/app/models/cost_query/filter/version_id.rb+++ b/modules/reporting/app/models/cost_query/filter/version_id.rb@@ -28,7 +28,7 @@class CostQuery::Filter::VersionId < Report::Filter::Baseuse :null_operators- join_table WorkPackage+ join_table WorkPackage => [Entry, :entity]applies_for :label_work_package_attributesdef self.labeldiff --git a/modules/reporting/app/models/cost_query/filter/work_package_id.rb b/modules/reporting/app/models/cost_query/filter/work_package_id.rbindex 72894bf5dcd..7c195d09730 100644--- a/modules/reporting/app/models/cost_query/filter/work_package_id.rb+++ b/modules/reporting/app/models/cost_query/filter/work_package_id.rb@@ -29,6 +29,8 @@#++class CostQuery::Filter::WorkPackageId < Report::Filter::Base+ db_field "entries.entity_id"+def self.labelWorkPackage.model_name.humanend@@ -69,4 +71,10 @@ class CostQuery::Filter::WorkPackageId < Report::Filter::Basetext_for_tuple(wp.id, wp.subject)end++ def sql_statement+ super.tap do |query|+ query.where << "entries.entity_type = 'WorkPackage'"+ end+ endenddiff --git a/modules/reporting/app/models/cost_query/sql_statement.rb b/modules/reporting/app/models/cost_query/sql_statement.rbindex d43b2dc2920..bbacc8d996b 100644--- a/modules/reporting/app/models/cost_query/sql_statement.rb+++ b/modules/reporting/app/models/cost_query/sql_statement.rb@@ -28,7 +28,7 @@class CostQuery::SqlStatement < Report::SqlStatementCOMMON_FIELDS = %w[- user_id project_id work_package_id rate_id+ user_id project_id entity_type entity_id rate_idcomments spent_on created_at updated_at tyear tmonth tweekcosts overridden_costs type]@@ -58,7 +58,8 @@ class CostQuery::SqlStatement < Report::SqlStatement# id | id | id# user_id | user_id | user_id# project_id | project_id | project_id- # work_package_id | work_package_id | work_package_id+ # entity_type | entity_type | entity_type+ # entity_id | entity_id | entity_id# rate_id | rate_id | rate_id# comments | comments | comments# spent_on | spent_on | spent_ondiff --git a/modules/reporting/spec/models/cost_query/filter_spec.rb b/modules/reporting/spec/models/cost_query/filter_spec.rbindex b7e1facbf89..e475ee5a8f9 100644--- a/modules/reporting/spec/models/cost_query/filter_spec.rb+++ b/modules/reporting/spec/models/cost_query/filter_spec.rb@@ -38,7 +38,7 @@ RSpec.describe CostQuery, :reporting_query_helper dodef create_work_package_with_entry(entry_type, work_package_params = {}, entry_params = {})work_package_params = { project: }.merge!(work_package_params)work_package = create(:work_package, work_package_params)- entry_params = { work_package:,+ entry_params = { entity: work_package,project: work_package_params[:project],user: }.merge!(entry_params)create(entry_type, entry_params)@@ -73,11 +73,11 @@ RSpec.describe CostQuery, :reporting_query_helper do# Test Work Package attributes that are included in of the result set[- [CostQuery::Filter::ProjectId, "project", "project_id", 2],- [CostQuery::Filter::UserId, "user", "user_id", 2],- [CostQuery::Filter::CostTypeId, "cost_type", "cost_type_id", 1],+ [CostQuery::Filter::ProjectId, "project", "project_id", 2],+ [CostQuery::Filter::UserId, "user", "user_id", 2],+ [CostQuery::Filter::CostTypeId, "cost_type", "cost_type_id", 1],[CostQuery::Filter::WorkPackageId, "work_package", "work_package_id", 2],- [CostQuery::Filter::ActivityId, "activity", "activity_id", 1]+ [CostQuery::Filter::ActivityId, "activity", "activity_id", 1]].each do |filter, object_name, field, expected_count|describe filter dolet!(:non_matching_entry) { create(:cost_entry) }@@ -91,7 +91,7 @@ RSpec.describe CostQuery, :reporting_query_helper dolet!(:cost_type) { create(:cost_type) }let!(:cost_entry) docreate(:cost_entry,- work_package:,+ entity: work_package,user:,project:,cost_type:)@@ -99,7 +99,7 @@ RSpec.describe CostQuery, :reporting_query_helper dolet!(:activity) { create(:time_entry_activity) }let!(:time_entry) docreate(:time_entry,- work_package:,+ entity: work_package,user:,project:,activity:)@@ -108,7 +108,8 @@ RSpec.describe CostQuery, :reporting_query_helper doit "only return entries from the given #{filter}" doquery.filter field, value: object.idquery.result.each do |result|- expect(result[field].to_s).to eq(object.id.to_s)+ result_field = field == "work_package_id" ? "entity_id" : field+ expect(result[result_field].to_s).to eq(object.id.to_s)endend@@ -116,7 +117,8 @@ RSpec.describe CostQuery, :reporting_query_helper doquery.filter field, value: object.idquery.filter field, value: object.idquery.result.each do |result|- expect(result[field].to_s).to eq(object.id.to_s)+ result_field = field == "work_package_id" ? "entity_id" : field+ expect(result[result_field].to_s).to eq(object.id.to_s)endend@@ -146,7 +148,7 @@ RSpec.describe CostQuery, :reporting_query_helper dolet!(:cost_type) { create(:cost_type) }let!(:cost_entry) docreate(:cost_entry,- work_package:,+ entity: work_package,user:,project:,cost_type:)@@ -154,7 +156,7 @@ RSpec.describe CostQuery, :reporting_query_helper dolet!(:activity) { create(:time_entry_activity) }let!(:time_entry) docreate(:time_entry,- work_package:,+ entity: work_package,user:,project:,activity:)@@ -163,7 +165,7 @@ RSpec.describe CostQuery, :reporting_query_helper doit "only return entries from the given CostQuery::Filter::AuthorId" doquery.filter "author_id", value: author.idquery.result.each do |result|- work_package_id = result["work_package_id"]+ work_package_id = result["entity_id"]expect(WorkPackage.find(work_package_id).author.id).to eq(author.id)endend@@ -172,7 +174,7 @@ RSpec.describe CostQuery, :reporting_query_helper doquery.filter "author_id", value: author.idquery.filter "author_id", value: author.idquery.result.each do |result|- work_package_id = result["work_package_id"]+ work_package_id = result["entity_id"]expect(WorkPackage.find(work_package_id).author.id).to eq(author.id)endend