separated print hook's resource_items key to asset/human

Author: sanak

lib/redmine_supply/hooks.rb

@@ -7,7 +7,9 @@ def redmine_gtt_print_issue_to_json(context)
       json = context[:json]
       attributes = json[:attributes] ||= {}
       attributes[:supply_items] = IssueSupplyItemsPresenter.(issue.issue_supply_items).join("\r\n")
-      attributes[:resource_items] = ResourceItemsPresenter.(issue.resource_items).join("\r\n")
+      items_by_type = issue.resource_items_by_type
+      attributes[:asset_resource_items] = ResourceItemsPresenter.(items_by_type['asset']).join("\r\n")
+      attributes[:human_resource_items] = ResourceItemsPresenter.(items_by_type['human']).join("\r\n")
     end
   end
 end

test/test_helper.rb

@@ -44,7 +44,7 @@ def self.generate!(name: 'an asset', project:,
 
 Human.class_eval do
   def self.generate!(name: 'a human', project:,
-                     category: ResourceCategory.generate!(project: project))
+                     category: ResourceCategory.generate!(project: project, for_assets: false))
     r = RedmineResourceManager::SaveResourceItem.(
       { name: name, category_id: category.id },
       project: project, resource_class: Human
@@ -58,9 +58,12 @@ def self.generate!(name: 'a human', project:,
 end
 
 ResourceCategory.class_eval do
-  def self.generate!(name: "resource category", project:)
+  def self.generate!(name: "", project:, for_assets: true)
+    if name.empty?
+      name = for_assets ? "asset resource category" : "human resource_category"
+    end
     r = RedmineResourceManager::SaveResourceCategory.(
-      { name: name, for_assets: true }, project: project
+      { name: name, for_assets: for_assets, for_humans: !for_assets }, project: project
     )
     if r.category_saved?
       r.category

test/unit/hooks_test.rb

@@ -10,8 +10,11 @@ class HooksTest < ActiveSupport::TestCase
     @item = SupplyItem.generate! project: @project
     @isi = IssueSupplyItem.create! issue: @issue, supply_item: @item, quantity: 1
 
-    @resource = Asset.generate! project: @project
-    @iri = IssueResourceItem.create! issue: @issue, resource_item: @resource
+    @asset_resource = Asset.generate! project: @project
+    @iari = IssueResourceItem.create! issue: @issue, resource_item: @asset_resource
+
+    @human_resource = Human.generate! project: @project
+    @ihri = IssueResourceItem.create! issue: @issue, resource_item: @human_resource
   end
 
   test 'should add supply and resource items to json' do
@@ -22,9 +25,13 @@ class HooksTest < ActiveSupport::TestCase
     assert_equal 1, items.size
     assert_equal "#{@item.name} (1.0 pcs)", items.first
 
-    assert items = json[:attributes][:resource_items].split('\r\n')
+    assert items = json[:attributes][:asset_resource_items].split('\r\n')
+    assert_equal 1, items.size
+    assert_equal @asset_resource.name, items.first
+
+    assert items = json[:attributes][:human_resource_items].split('\r\n')
     assert_equal 1, items.size
-    assert_equal @resource.name, items.first
+    assert_equal @human_resource.name, items.first
 
   end
 end