Merge pull request opf#18419 from opf/bugfix/62429-missing-fields

Work Package Subject Patterns - Adds Missing Fields

Author: mereghost

app/models/types/pattern_resolver.rb

@@ -56,6 +56,8 @@ def stringify(value)
       case value
       when Date, Time, DateTime
         value.strftime("%Y-%m-%d")
+      when Array
+        value.join(", ")
       when NilClass
         "NA"
       else

app/models/types/patterns/token_property_mapper.rb

@@ -39,14 +39,18 @@ class TokenPropertyMapper
 
       TOKEN_PROPERTY_MAP = IceNine.deep_freeze(
         {
+          id: { fn: ->(wp) { wp.id }, label: -> { WorkPackage.human_attribute_name(:id) } },
           accountable: { fn: ->(wp) { wp.responsible&.name }, label: -> { WorkPackage.human_attribute_name(:responsible) } },
           assignee: { fn: ->(wp) { wp.assigned_to&.name }, label: -> { WorkPackage.human_attribute_name(:assigned_to) } },
           author: { fn: ->(wp) { wp.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } },
           category: { fn: ->(wp) { wp.category&.name }, label: -> { WorkPackage.human_attribute_name(:category) } },
           creation_date: { fn: ->(wp) { wp.created_at }, label: -> { WorkPackage.human_attribute_name(:created_at) } },
           estimated_time: { fn: ->(wp) { wp.estimated_hours }, label: -> { WorkPackage.human_attribute_name(:estimated_hours) } },
           finish_date: { fn: ->(wp) { wp.due_date }, label: -> { WorkPackage.human_attribute_name(:due_date) } },
-          parent: { fn: ->(wp) { wp.parent&.id }, label: -> { WorkPackage.human_attribute_name(:parent) } },
+          parent_id: { fn: ->(wp) { wp.parent&.id }, label: -> { WorkPackage.human_attribute_name(:parent_id) } },
+          parent_assignee: { fn: ->(wp) { wp.parent&.assigned_to&.name }, label: -> {
+            WorkPackage.human_attribute_name(:assigned_to)
+          } },
           parent_author: { fn: ->(wp) { wp.parent&.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } },
           parent_category: { fn: ->(wp) { wp.parent&.category&.name },
                              label: -> { WorkPackage.human_attribute_name(:category) } },
@@ -57,6 +61,7 @@ class TokenPropertyMapper
           parent_finish_date: { fn: ->(wp) { wp.parent&.due_date },
                                 label: -> { WorkPackage.human_attribute_name(:due_date) } },
           parent_priority: { fn: ->(wp) { wp.parent&.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } },
+          parent_subject: { fn: ->(wp) { wp.parent&.subject }, label: -> { WorkPackage.human_attribute_name(:subject) } },
           priority: { fn: ->(wp) { wp.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } },
           project: { fn: ->(wp) { wp.project_id }, label: -> { WorkPackage.human_attribute_name(:project) } },
           project_active: { fn: ->(wp) { wp.project&.active? }, label: -> { Project.human_attribute_name(:active) } },
@@ -111,7 +116,7 @@ def work_package_cfs_for(type)
       end
 
       def all_work_package_cfs
-        WorkPackageCustomField.where(multi_value: false).where.not(field_format: %w[text bool link empty]).order(:name)
+        WorkPackageCustomField.where.not(field_format: %w[text bool link empty]).order(:name)
       end
 
       def project_attributes

spec/models/types/pattern_resolver_spec.rb

@@ -61,23 +61,32 @@
 
   context "when the pattern has custom fields" do
     let(:custom_field) { create(:string_wp_custom_field) }
-    let(:type) { create(:type, custom_fields: [custom_field]) }
-    let(:project) { create(:project, types: [type], work_package_custom_fields: [custom_field]) }
+    let(:multi_value_field) { create(:multi_list_wp_custom_field) }
+    let(:type) { create(:type, custom_fields: [custom_field, multi_value_field]) }
+    let(:project) { create(:project, types: [type], work_package_custom_fields: [custom_field, multi_value_field]) }
     let(:project_custom_field) { create(:project_custom_field, projects: [project], field_format: "string") }
 
     let(:subject_pattern) do
       "{{project_custom_field_#{project_custom_field.id}}} A custom field value: {{custom_field_#{custom_field.id}}}"
     end
 
     let(:work_package) do
-      create(:work_package, type:, project:, custom_values: { custom_field.id => "Important Information" })
+      create(:work_package, type:, project:,
+                            custom_values: { custom_field.id => "Important Information",
+                                             multi_value_field.id => multi_value_field.possible_values.take(2) })
     end
 
     before do
       project.public_send :"custom_field_#{project_custom_field.id}=", "PROSPEC"
       project.save
     end
 
+    it "multi value fields are joined by comma" do
+      subject_pattern = "MCF: {{custom_field_#{multi_value_field.id}}}"
+      resolver = described_class.new(subject_pattern)
+      expect(resolver.resolve(work_package)).to eq("MCF: A, B")
+    end
+
     it "resolves the pattern" do
       User.current = SystemUser.first
 

spec/models/types/patterns/token_property_mapper_spec.rb

@@ -33,13 +33,15 @@
 RSpec.describe Types::Patterns::TokenPropertyMapper do
   shared_let(:responsible) { create(:user, firstname: "Responsible") }
   shared_let(:assignee) { create(:user, firstname: "Assignee") }
+  shared_let(:parent_assignee) { create(:user, firstname: "Parent", lastname: "Assignee") }
 
   shared_let(:category) { create(:category) }
 
   shared_let(:project) { create(:project, parent: create(:project), status_code: 1, status_explanation: "A Mess") }
 
   shared_let(:work_package_parent) do
-    create(:work_package, project:, category:, start_date: Date.yesterday, estimated_hours: 120, due_date: 3.months.from_now)
+    create(:work_package, project:, category:, start_date: Date.yesterday, estimated_hours: 120,
+                          due_date: 3.months.from_now, assigned_to: parent_assignee)
   end
 
   shared_let(:work_package) do
@@ -51,8 +53,16 @@
     create(:string_wp_custom_field).tap do |custom_field|
       project.work_package_custom_fields << custom_field
       work_package.type.custom_fields << custom_field
+    end
+  end
+
+  shared_let(:mult_list_custom_field) do
+    create(:multi_list_wp_custom_field).tap do
+      project.work_package_custom_fields << it
+      work_package.type.custom_fields << it
 
-      create(:work_package_custom_value, custom_field:, customized: work_package, value: "test")
+      work_package.send(:"custom_field_#{it.id}=", it.possible_values.take(2))
+      work_package.save
     end
   end
 
@@ -63,6 +73,11 @@
     end
   end
 
+  it "multi value fields are supported" do
+    function = described_class.new.fetch :"custom_field_#{mult_list_custom_field.id}"
+    expect(function.call(work_package)).to eq(%w[A B])
+  end
+
   it "returns all possible tokens" do
     cf = string_custom_field
     tokens = described_class.new.tokens_for_type(work_package.type)