order_optimizer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3dec3fd3cab38f6a56c1fa13e3ee398e4b196c1c992cdf6f4c7e87c2c19e2f1
-  data.tar.gz: 9cd52e4ae25d980de2b8b4ba1988bbe42dac0dd686d0d1c7f23584c7889cb3e8
+  metadata.gz: c7436b34e3961c7cb835d33eb4212ce823fc050d362af7b3297eb80a2a5dda77
+  data.tar.gz: 366e5d4ba6d0fb9772a982ec0aeccf6aba82cc3e8bb79237954afdfebc42a5da
 SHA512:
-  metadata.gz: 958f1f99429e00465cdc9a562dff1717da0b145827430704766756626444559e25f1f0b615c7f19cb274bc1783e33fb2eb3ca34b8e4d114e08af5f01f75c05f2
-  data.tar.gz: 0cfb7dc00f8eacff31bff96cfedee003427e9e9e4677f8a382f7aa28e0148de5ca902ca576697aeba54c3b28a19a3302f451fb0944dc96464908742a9328287f
+  metadata.gz: cf15bc0ee13c1f1c244b9d5a54b7271f1f6fee150305411bab9f18353d80f701e148c86eeda665ab555222f4a0cd10f5a8370d18910f190dc886080fc0883e03
+  data.tar.gz: 0aa94e6ce45593754e611376e9a29389caa3ae1d167f3406d7ef232a0906918802dc6515bff0f63cc3d8830d5d863c1ed316f6197457719c2aa974afc7a3051b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # OrderOptimizer Gem Changelog
 
+## 0.2.1 (2019-12-18)
+
+- Improve result for mixed catalogs with discounts and multiple pack sizes
+
 ## 0.2.0 (2019-12-16)
 
 - Add support for discounts when ordering a minimum quantity

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    order_optimizer (0.1.0)
+    order_optimizer (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/order_optimizer.rb

@@ -1,8 +1,8 @@
 require 'bigdecimal'
 
-require "order_optimizer/catalog"
-require "order_optimizer/order"
-require "order_optimizer/version"
+require 'order_optimizer/catalog'
+require 'order_optimizer/order'
+require 'order_optimizer/version'
 
 class OrderOptimizer
   def initialize(skus)
@@ -10,39 +10,47 @@ class OrderOptimizer
   end
 
   def cheapest_order(required_qty:)
-    orders =
-      possible_orders(skus: @catalog.skus_without_min_quantities, required_qty: required_qty) +
-      possible_orders(skus: @catalog.skus_with_min_quantities, required_qty: required_qty) +
-      possible_orders(skus: @catalog.skus, required_qty: required_qty)
-
-    orders.min_by(&:total) || OrderOptimizer::Order.new
+    possible_orders(skus: @catalog.skus, required_qty: required_qty)
+      .min_by(&:total) || OrderOptimizer::Order.new(required_qty: required_qty)
   end
 
   private
 
   def possible_orders(required_qty:, skus:)
-    [].tap do |orders|
-      order = OrderOptimizer::Order.new
+    return [] if required_qty < 1 || skus.empty?
+
+    orders = []
 
-      while required_qty.positive? && (sku = skus.shift)
-        count, remainder = (required_qty - order.quantity).divmod(sku.quantity)
-        count, remainder = adjustment_for_skus_with_min_quantity(sku, count, remainder)
+    skus.each do |sku|
+      orders.reject(&:complete?).each do |order|
+        count, remainder = count_and_remainder_for_sku(order.missing_qty, sku)
 
-        order.add(sku, count: count) unless count.zero?
+        orders << order.dup.add(sku, count: count) unless count.zero?
+        orders << order.dup.add(sku, count: count + 1) if remainder
+      end
 
-        orders << (remainder.positive? ? order.dup.add(sku) : order.dup)
+      count, remainder = count_and_remainder_for_sku(required_qty, sku)
 
-        order = OrderOptimizer::Order.new if sku.min_quantity
+      unless count.zero?
+        orders << OrderOptimizer::Order.new(required_qty: required_qty).add(sku, count: count)
+      end
+      if remainder
+        orders << OrderOptimizer::Order.new(required_qty: required_qty).add(sku, count: count + 1)
       end
     end
-  end
 
-  def adjustment_for_skus_with_min_quantity(sku, count, remainder)
-    units = count * sku.quantity
+    orders.select(&:complete?)
+  end
 
-    return count, remainder if sku.min_quantity.nil? || units >= sku.min_quantity
+  def count_and_remainder_for_sku(quantity, sku)
+    count, remainder = quantity.divmod(sku.quantity)
 
-    delta = ((sku.min_quantity - units).to_f / sku.quantity).ceil
-    [count + delta, remainder - (delta * sku.quantity)]
+    if sku.min_quantity && count * sku.quantity < sku.min_quantity
+      new_count = (sku.min_quantity.to_f / sku.quantity).ceil
+      remainder -= (new_count - count) * sku.quantity
+      [new_count, [remainder, 0].max]
+    else
+      [count, remainder]
+    end
   end
 end

data/lib/order_optimizer/catalog.rb

@@ -9,13 +9,5 @@ class OrderOptimizer
     def skus
       @skus.dup
     end
-
-    def skus_without_min_quantities
-      @skus.reject(&:min_quantity)
-    end
-
-    def skus_with_min_quantities
-      @skus.select(&:min_quantity)
-    end
   end
 end

data/lib/order_optimizer/order.rb

@@ -2,17 +2,26 @@ class OrderOptimizer
   class Order
     attr_reader :quantity, :total, :skus
 
-    def initialize
-      @quantity = 0
-      @total    = 0
-      @skus     = {}
+    def initialize(required_qty:)
+      @quantity     = 0
+      @required_qty = required_qty
+      @total        = 0
+      @skus         = {}
     end
 
     def add(sku, count: 1)
       @quantity += count * sku.quantity
       @total    += count * sku.price_per_sku
-      @skus     = skus.merge(sku.id => count) { |identifier, current, plus| current + plus }
+      @skus = skus.merge(sku.id => count) { |_identifier, current, plus| current + plus }
       self
     end
+
+    def missing_qty
+      [@required_qty - quantity, 0].max
+    end
+
+    def complete?
+      missing_qty.zero?
+    end
   end
 end

data/lib/order_optimizer/sku.rb

@@ -2,24 +2,20 @@ class OrderOptimizer
   class Sku
     attr_reader :id, :quantity, :price_per_unit, :price_per_sku, :min_quantity
 
-    def initialize(id, quantity:, price_per_unit:, min_quantity: nil)
+    def initialize(id, quantity:, price_per_sku: nil, price_per_unit: nil, min_quantity: nil)
       @id = id
       @quantity = quantity
-      @price_per_unit = BigDecimal(price_per_unit, 2)
-      @price_per_sku = quantity * price_per_unit
       @min_quantity = min_quantity
-    end
-
-    private
 
-    def set_min_quantity(min_qty)
-      return unless min_qty
+      @price_per_unit = BigDecimal(price_per_unit, 2) if price_per_unit
+      @price_per_sku  = BigDecimal(price_per_sku,  2) if price_per_sku
 
-      if min_quantity.modulo(quantity).zero?
-        @min_quantity = min_qty
-      else
-        raise ':min_quantity must be a multiple of :quantity'
+      unless price_per_unit || price_per_sku
+        raise ':price_per_sku or :price_per_unit must be set'
       end
+
+      @price_per_unit ||= price_per_sku.to_f / quantity
+      @price_per_sku  ||= quantity * price_per_unit
     end
   end
 end

data/lib/order_optimizer/version.rb

@@ -1,3 +1,3 @@
 class OrderOptimizer
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: order_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - crispymtn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler