Merge branch 'feature_engine_tear_out' of https://dev.finn.de/git/redmine-reporting into feature_engine_tear_out

app/models/cost_query.rb

@@ -1,2 +1,3 @@
 class CostQuery < Report
+  lookup CostQuery
 end

app/models/cost_query/filter.rb

@@ -1,10 +1,7 @@
 require "set"
 
-module CostQuery::Filter
-  include Report::Filter
-  extend self
-
-  def all
+class CostQuery::Filter < Report::Filter
+  def self.all
     @all ||= super + Set[
       CostQuery::Filter::ActivityId,
       CostQuery::Filter::AssignedToId,

app/models/cost_query/filter/custom_field.rb

@@ -1,4 +1,4 @@
-module CostQuery::Filter
+class CostQuery::Filter
   class CustomField < Base
     extend CostQuery::CustomFieldMixin
 

app/models/cost_query/filter/no_filter.rb

@@ -3,6 +3,6 @@ class CostQuery::Filter::NoFilter < Report::Filter::NoFilter
   singleton
 
   def sql_statement
-    Report::SqlStatement.for_entries
+    Report.lookup::SqlStatement.for_entries
   end
 end

app/models/cost_query/group_by.rb

@@ -1,7 +1,6 @@
 require "set"
 
-module CostQuery::GroupBy
-  include Report::GroupBy
+class CostQuery::GroupBy < Report::GroupBy
   def self.all
     @all ||= super + Set[
       CostQuery::GroupBy::ActivityId,

app/models/cost_query/group_by/activity_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class ActivityId < Base
     label :field_activity
   end

app/models/cost_query/group_by/assigned_to_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class AssignedToId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/author_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class AuthorId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/category_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class CategoryId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/cost_object_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class CostObjectId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/cost_type_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class CostTypeId < Base
     label :field_cost_type
   end

app/models/cost_query/group_by/custom_field.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class CustomField < Base
     applies_for :label_issue_attributes
     extend CostQuery::CustomFieldMixin

app/models/cost_query/group_by/fixed_version_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class FixedVersionId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/issue_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class IssueId < Base
     label :field_issue
   end

app/models/cost_query/group_by/priority_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class PriorityId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/project_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class ProjectId < Base
     label :field_project
   end

app/models/cost_query/group_by/spent_on.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class SpentOn < Base
     label :label_spent_on_reporting
   end

app/models/cost_query/group_by/sql_aggregation.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   module SqlAggregation
     include Report::GroupBy::SqlAggregation
 

app/models/cost_query/group_by/status_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class StatusId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/tmonth.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class Tmonth < Base
     label :label_month_reporting
   end

app/models/cost_query/group_by/tracker_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class TrackerId < Base
     join_table Issue
     applies_for :label_issue_attributes

app/models/cost_query/group_by/tweek.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class Tweek < Base
     label :label_week_reporting
   end

app/models/cost_query/group_by/tyear.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class Tyear < Base
     label :label_year_reporting
   end

app/models/cost_query/group_by/user_id.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class UserId < Base
     label :field_user
   end

app/models/cost_query/group_by/week.rb

@@ -1,4 +1,4 @@
-module CostQuery::GroupBy
+class CostQuery::GroupBy
   class Week < Base
     label :label_week_reporting
   end

app/models/cost_query/sql_statement.rb

@@ -1,4 +1,4 @@
-class CostQuery::SqlStatement < Report
+class CostQuery::SqlStatement < Report::SqlStatement
 
   COMMON_FIELDS = %w[
     user_id project_id issue_id rate_id