Pass product id on to line item service

lib/SF_services/line_item.rb

@@ -16,20 +16,13 @@ def find_line_item(order_id, product_id)
       results.any? ? results.first['Id'] : nil
     end
 
-    def upsert!(line_item_attr = {}, opportunity_id, product_code)
-      # FIXME product ids are already fetched before on the stack
-      results = salesforce.query("select Id from Product2 where ProductCode = '#{product_code}'")
-      raise SalesfoceIntegrationError, "Product #{product_code} not found" unless results.first
-
-      product_id = results.first["Id"]
-
+    def upsert!(line_item_attr = {}, opportunity_id, product_id)
       # FIXME same here standard price book id is already fetched before
       unless standard = salesforce.query("select Id from Pricebook2 where isStandard=true").first
-        raise SalesfoceIntegrationError, "Standard price book not found for #{product_code}"
+        raise SalesfoceIntegrationError, "Standard price book when building opportunity line"
       end
 
       standard_id = standard['Id']
-      product_id = results.first['Id']
 
       pricebookentry = SFService::Base.new "PricebookEntry", config
 

lib/integrations/order.rb

@@ -17,7 +17,7 @@ def upsert!
       opportunity_id = order_service.upsert! params
 
       product_integration = Product.new(config, object[:order])
-      line_item_integration = LineItem.new(config, object[:order])
+      line_item_integration = LineItem.new(config)
 
       object[:order][:line_items].each do |line_item|
 
@@ -27,9 +27,9 @@ def upsert!
 
           product_id = product_integration.create! params
         end
-      end
 
-      LineItem.new(config, object[:order]).upsert! opportunity_id
+        line_item_integration.upsert! line_item, opportunity_id, product_id
+      end
     end
 
     private
@@ -38,4 +38,15 @@ def order_params
       Builder::Order.new(object[:order]).build
     end
   end
+
+  class LineItem < Base
+    def upsert!(item, opportunity_id, product_id)
+      params = build_oportunity_line item
+      line_item_service.upsert!(params, opportunity_id, product_id)
+    end
+
+    def build_oportunity_line(item)
+      Builder::LineItem.new(item).build
+    end
+  end
 end

lib/salesforce_integration.rb

@@ -9,7 +9,6 @@
 require 'integrations/contact_account'
 require 'integrations/product'
 require 'integrations/order'
-require 'integrations/line_item'
 require 'integrations/payment'
 require 'integrations/return'