refs #40 reuse preloaded cache for supply/resource items

Author: sanak

lib/redmine_resource_manager/issue_patch.rb

@@ -21,10 +21,20 @@ def self.apply
 
 
     def issue_human_resource_item_names
-      IssueResourceItemsPresenter.new(issue_human_resource_items).to_s
+      cached_items = instance_variable_get("@issue_human_resource_items")
+      if !cached_items.nil?
+        IssueResourceItemsPresenter.new(cached_items).to_s
+      else
+        IssueResourceItemsPresenter.new(issue_human_resource_items).to_s
+      end
     end
     def issue_asset_resource_item_names
-      IssueResourceItemsPresenter.new(issue_asset_resource_items).to_s
+      cached_items = instance_variable_get("@issue_asset_resource_items")
+      if !cached_items.nil?
+        IssueResourceItemsPresenter.new(cached_items).to_s
+      else
+        IssueResourceItemsPresenter.new(issue_asset_resource_items).to_s
+      end
     end
 
     def issue_human_resource_items

lib/redmine_resource_manager/issue_resource_items_presenter.rb

@@ -1,11 +1,17 @@
 module RedmineResourceManager
   class IssueResourceItemsPresenter < RedmineSupply::Presenter
-    def initialize(scope)
-      @scope = scope.sorted
+    def initialize(obj)
+      if obj.instance_of?(Array)
+        @scope = nil
+        @issue_resource_items = obj
+      else
+        @scope = obj.sorted
+        @issue_resource_items = @scope.to_a
+      end
     end
 
     def call
-      @scope.to_a.map{|ri| issue_resource_item_tag ri}
+      @issue_resource_items.map{|ri| issue_resource_item_tag ri}
     end
 
     def to_s

lib/redmine_supply/issue_supply_items_presenter.rb

@@ -1,11 +1,17 @@
 module RedmineSupply
   class IssueSupplyItemsPresenter < Presenter
-    def initialize(scope)
-      @scope = scope.sorted
+    def initialize(obj)
+      if obj.instance_of?(Array)
+        @scope = nil
+        @issue_supply_items = obj
+      else
+        @scope = obj.sorted
+        @issue_supply_items = @scope.to_a
+      end
     end
 
     def call
-      @scope.to_a.map{|isi| issue_supply_item_tag isi}
+      @issue_supply_items.map{|isi| issue_supply_item_tag isi}
     end
 
     def to_s
@@ -16,7 +22,9 @@ def to_s
 
     def issue_supply_item_tag(issue_supply_item)
       item = issue_supply_item.supply_item
-      "#{h item.name} (#{h issue_supply_item.quantity} #{h item.unit_name})"
+      # TODO: improve prealod cache logic
+      unit_name = @scope.nil? ? item.custom_values.first.value : item.unit_name
+      "#{h item.name} (#{h issue_supply_item.quantity} #{h unit_name})"
     end
   end
 end

lib/redmine_supply/patches/issue_patch.rb

@@ -22,7 +22,12 @@ def self.apply
       end
 
       def issue_supply_item_names
-        IssueSupplyItemsPresenter.new(issue_supply_items).to_s
+        cached_items = instance_variable_get("@issue_supply_items")
+        if !cached_items.nil?
+          IssueSupplyItemsPresenter.new(cached_items).to_s
+        else
+          IssueSupplyItemsPresenter.new(issue_supply_items).to_s
+        end
       end
 
       def issue_supply_items_attributes=(attributes = [])
@@ -62,7 +67,10 @@ module ClassMethods
         def load_issue_supply_items(issues, user=User.current)
           if issues.any?
             issue_ids = issues.map(&:id)
-            _issue_supply_items = IssueSupplyItem.where(:issue_id => issue_ids)
+            _issue_supply_items = IssueSupplyItem.includes(supply_item: [:custom_values]).
+                                    where(:issue_id => issue_ids).
+                                    order(:issue_id).
+                                    order("#{SupplyItem.table_name}.name ASC").to_a
             issues.each do |issue|
               issue.instance_variable_set "@issue_supply_items", _issue_supply_items.select {|s| s.issue_id == issue.id}
             end
@@ -72,7 +80,9 @@ def load_issue_supply_items(issues, user=User.current)
         def load_issue_human_resource_items(issues, user=User.current)
           if issues.any?
             issue_ids = issues.map(&:id)
-            _issue_human_resource_items = IssueResourceItem.where(resource_item_id: ResourceItem.humans.ids).where(:issue_id => issue_ids)
+            _issue_human_resource_items = IssueResourceItem.includes(:resource_item).
+                                            where(resource_items: {type: "Human"}).
+                                            where(:issue_id => issue_ids).to_a
             issues.each do |issue|
               issue.instance_variable_set "@issue_human_resource_items", _issue_human_resource_items.select {|h| h.issue_id == issue.id}
             end
@@ -82,7 +92,9 @@ def load_issue_human_resource_items(issues, user=User.current)
         def load_issue_asset_resource_items(issues, user=User.current)
           if issues.any?
             issue_ids = issues.map(&:id)
-            _issue_asset_resource_items = IssueResourceItem.where(resource_item_id: ResourceItem.assets.ids).where(:issue_id => issue_ids)
+            _issue_asset_resource_items = IssueResourceItem.includes(:resource_item).
+                                            where(resource_items: {type: "Asset"}).
+                                            where(:issue_id => issue_ids).to_a
             issues.each do |issue|
               issue.instance_variable_set "@issue_asset_resource_items", _issue_asset_resource_items.select {|a| a.issue_id == issue.id}
             end