seshbot-packing 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f77cf089e5f02caf10d7af67e7d75260d3529c560b2cfee232ba3b72f5f36e94
-  data.tar.gz: ec54cf2361668f1c92789f9337f0feb8f744a1208192e74368d46773eddf1f4f
+  metadata.gz: 53640497418fe974662502d80ff742cee86798e16223b506cbc880af98297f60
+  data.tar.gz: a4242121d15f8229c6828a1040a02c06aac2c00ac82c58a71ac98a6ad5ef7e24
 SHA512:
-  metadata.gz: 1e5539df5a295507c496115dfda6f972310c24ed88dfc97a2712f55e8c852e2f4f64bde98168e4d626f7a7f5484cfdf472705c0f4fec6139f06e90620bbc8ad4
-  data.tar.gz: c482b9e179a56795a7ff2559d72f708ab27a684dae5e11f9d9fca423ea543752f80dd0e377cccbdb6241e6605b7ec20c75412bb5f4984e6d67caf7935e0fe28e
+  metadata.gz: 90a06fc6a5a757edaadaf5b0242e90daca9384fb8390f9ecb2cc0a43ca24e0ff0f893a459aaf89612e40d6ceeb4350e5e3f59931bbc46fc41713173388a1f65e
+  data.tar.gz: ee480ed3de2a785a7e40651543280ba805a2681a0863f9bef800e4f65e0195861adfe50d4cf3c5bd5ce740b03a6ac5c66d38e0a3a60346b962e9f86991cafd74

data/.gitignore

@@ -9,3 +9,12 @@
 /spec/reports/
 /tmp/
 *.gem
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+!/tmp/.keep
+
+.idea/
+.DS_Store
+ngrok

data/lib/seshbot/packing/package.rb

@@ -8,21 +8,25 @@ module Seshbot
       @@logger = nil
       def logger
         if @@logger.nil?
-          @@logger = Logger.new(STDERR)
-          @@logger.level = 1
+          if defined?(Rails)
+            @@logger = Rails.logger
+          else
+            @@logger = Logger.new(STDERR)
+            @@logger.level = 1
+          end
         end
         @@logger
       end
 
       def bundle_items(recipes, items, fulfilled_at: nil)
         if !fulfilled_at.nil? && fulfilled_at < DateTime.parse('2020-01-14T08:00:00+09:00')
-          logger.debug "== Not Bundling (pre-2020 order) =="
+          logger.debug "bundling - Not Bundling (pre-2020 order) =="
           return items
         end
         is_legacy = _is_legacy(fulfilled_at)
         is_legacy_str = is_legacy ? " (LEGACY)" : ""
 
-        logger.debug "== Bundling Items: #{items.map(&:to_s)}. Fulfilled at: #{fulfilled_at || '(no fulfillment date)'}#{is_legacy_str}"
+        logger.debug "bundling - Bundling Items: #{items.map(&:to_s)}. Fulfilled at: #{fulfilled_at || '(no fulfillment date)'}#{is_legacy_str}"
 
         results = []
 
@@ -35,13 +39,38 @@ module Seshbot
           phases.each do |phase|
             phase_recipes = recipes.select { |name, recipe| (recipe['phase'] || 0) == phase }.to_h
 
-            logger.debug "=== Bundling phase #{phase}"
+            logger.debug "bundling - PHASE #{phase}"
 
             results = _bundle_items_single_phase(phase_recipes, results)
           end
         end
 
-        logger.debug "Bundled result:"
+        logger.debug "bundling - Bundled result:"
+        logger.debug " - IN: #{items.map(&:to_s)}"
+        logger.debug " - OUT: #{results.map(&:to_s)}"
+
+        results
+      end
+
+      def unbundle_items(recipes, items, fulfilled_at: nil)
+        logger.debug "bundling - Unbundling Items: #{items.map(&:to_s)}"
+
+        results = []
+
+        phases = recipes.values.map { |r| r['phase'] || 0 }.map(&:to_i).uniq.sort.reverse
+
+        results = items
+        phases.each do |phase|
+          phase_recipes = recipes.select { |name, recipe| (recipe['phase'] || 0) == phase }.to_h
+
+          logger.debug "bundling - PHASE #{phase}"
+
+          # get a list of items merged together by variant type (e.g., 10xBIGI-C301 + 5xBISS-C301 => 15xBUND-C301))
+          merged_items = LineItem.merge_line_items(results)
+          results = unpack(recipes, merged_items)
+        end
+
+        logger.debug "bundling - Unbundle result:"
         logger.debug " - IN: #{items.map(&:to_s)}"
         logger.debug " - OUT: #{results.map(&:to_s)}"
 
@@ -58,7 +87,7 @@ module Seshbot
 
           prev_result = new_result
         end
-        error_message = "could not unpack - infinite loop? (latest: #{prev_result.map(&:to_s)})"
+        error_message = "bundling - could not unpack - infinite loop? (latest: #{prev_result.map(&:to_s)})"
         logger.error error_message
         raise error_message
       end
@@ -75,7 +104,7 @@ module Seshbot
 
           prev_result = new_result
         end
-        error_message = "could not pack - infinite loop? (latest: #{prev_result.map(&:to_s)})"
+        error_message = "bundling - could not pack - infinite loop? (latest: #{prev_result.map(&:to_s)})"
         logger.error error_message
         raise error_message
       end
@@ -86,7 +115,7 @@ module Seshbot
 
       def _is_legacy(fulfilled_at)
         effective_fulfilled_at = fulfilled_at.nil? ? DateTime.now : fulfilled_at
-        is_legacy = effective_fulfilled_at < DateTime.parse('2021-04-07T09:00:00+09:00')
+        is_legacy = effective_fulfilled_at < DateTime.parse('2021-04-01T09:00:00+09:00')
         is_legacy
       end
 
@@ -100,7 +129,7 @@ module Seshbot
           new_can_items = pack(recipes, bundle_items_by_type)
           # separate out all the C324s
           separated_c324s = _filter_by_sku_fragment_prefix(new_can_items, 'C324')
-          logger.debug "Cans: #{cans.map(&:to_s)}"
+          logger.debug "bundling - Cans: #{cans.map(&:to_s)}"
           logger.debug " - Removed C324s: #{separated_c324s.map(&:to_s)}"
 
           remaining_cans = _filter_by_sku_fragment_prefix(new_can_items, 'C324', inverse: true)
@@ -110,7 +139,7 @@ module Seshbot
         # merge the remaining with the original leftover
         non_cans = _filter_by_sku_fragment_prefix(items, 'C', inverse: true)
         remaining_items = non_cans + remaining_cans
-        logger.debug "Substituting:"
+        logger.debug "bundling - Substituting:"
         logger.debug " - remaining items: #{remaining_items.map(&:to_s)}"
 
         # substitute C's for B's
@@ -160,7 +189,7 @@ module Seshbot
         before = LineItem::summarise(items)
         items = Recipe::apply_recipe(recipe, items)
         after = LineItem::summarise(items)
-        logger.debug "applying recipe (#{unpacking ? 'unpacking' : 'packing'}) #{Recipe::summarise(recipe)}: #{before} -> #{after}"
+        logger.debug "bundling - applying recipe (#{unpacking ? 'unpacking' : 'packing'}) #{Recipe::summarise(recipe)}: #{before} -> #{after}"
         items
       end
 

data/lib/seshbot/packing/version.rb

@@ -1,5 +1,5 @@
 module Seshbot
   module Packing
-    VERSION = '0.9.2'
+    VERSION = '0.9.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seshbot-packing
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Shaun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email: