Merge branch 'master' into 2-0-stable-jan-8th

db/migrate/20181008201815_update_instagram_data.rb

@@ -0,0 +1,8 @@
+class UpdateInstagramData < ActiveRecord::Migration
+  def change
+    Enterprise.where("instagram like ?", "%instagram.com%").find_each do |e|
+      e.instagram = e.instagram.split('/').last
+      e.save
+    end
+  end
+end

db/migrate/20181128054803_simplify_variant_override_stock_settings.rb

@@ -0,0 +1,165 @@
+# This simplifies variant overrides to have only the following combinations:
+#
+#    on_demand | count_on_hand
+#   -----------+---------------
+#    true      | nil
+#    false     | set
+#    nil       | nil
+#
+# Refer to the table {here}[https://github.com/openfoodfoundation/openfoodnetwork/issues/3067] for
+# the effect of different variant and variant override stock configurations.
+#
+# Furthermore, this will allow all existing variant overrides to satisfy the newly added model
+# validation rules.
+class SimplifyVariantOverrideStockSettings < ActiveRecord::Migration
+  class VariantOverride < ActiveRecord::Base
+    belongs_to :variant
+    belongs_to :hub, class_name: "Enterprise"
+
+    scope :with_count_on_hand, -> { where("count_on_hand IS NOT NULL") }
+    scope :without_count_on_hand, -> { where(count_on_hand: nil) }
+  end
+
+  class Variant < ActiveRecord::Base
+    self.table_name = "spree_variants"
+
+    belongs_to :product
+
+    def name
+      namer = OpenFoodNetwork::OptionValueNamer.new(self)
+      namer.name
+    end
+  end
+
+  class Product < ActiveRecord::Base
+    self.table_name = "spree_products"
+
+    belongs_to :supplier, class_name: "Enterprise"
+  end
+
+  class Enterprise < ActiveRecord::Base; end
+
+  def up
+    ensure_reports_path_exists
+
+    CSV.open(csv_path, "w") do |csv|
+      csv << csv_header_row
+
+      update_use_producer_stock_settings_with_count_on_hand(csv)
+      update_on_demand_with_count_on_hand(csv)
+      update_limited_stock_without_count_on_hand(csv)
+    end
+
+    split_csv_by_distributor
+  end
+
+  def down
+    CSV.foreach(csv_path, headers: true) do |row|
+      VariantOverride.where(id: row["variant_override_id"])
+        .update_all(on_demand: row["previous_on_demand"],
+                    count_on_hand: row["previous_count_on_hand"])
+    end
+  end
+
+  private
+
+  def reports_path
+    Rails.root.join("reports", "SimplifyVariantOverrideStockSettings")
+  end
+
+  def ensure_reports_path_exists
+    Dir.mkdir(reports_path) unless File.exist?(reports_path)
+  end
+
+  def csv_path
+    reports_path.join("changed_variant_overrides.csv")
+  end
+
+  def distributor_csv_path(name, id)
+    reports_path.join("changed_variant_overrides-#{name.parameterize('_')}-#{id}.csv")
+  end
+
+  # When on_demand is nil but count_on_hand is set, force limited stock.
+  def update_use_producer_stock_settings_with_count_on_hand(csv)
+    variant_overrides = VariantOverride.where(on_demand: nil).with_count_on_hand
+    update_variant_overrides_and_log(csv, variant_overrides) do |variant_override|
+      variant_override.update_attributes!(on_demand: false)
+    end
+  end
+
+  # Clear count_on_hand if forcing on demand.
+  def update_on_demand_with_count_on_hand(csv)
+    variant_overrides = VariantOverride.where(on_demand: true).with_count_on_hand
+    update_variant_overrides_and_log(csv, variant_overrides) do |variant_override|
+      variant_override.update_attributes!(count_on_hand: nil)
+    end
+  end
+
+  # When on_demand is false but count on hand is not specified, set this to use producer stock
+  # settings.
+  def update_limited_stock_without_count_on_hand(csv)
+    variant_overrides = VariantOverride.where(on_demand: false).without_count_on_hand
+    update_variant_overrides_and_log(csv, variant_overrides) do |variant_override|
+      variant_override.update_attributes!(on_demand: nil)
+    end
+  end
+
+  def update_variant_overrides_and_log(csv, variant_overrides)
+    variant_overrides.find_each do |variant_override|
+      csv << variant_override_log_row(variant_override) do
+        yield variant_override
+      end
+    end
+  end
+
+  def csv_header_row
+    %w(
+      variant_override_id
+      distributor_name distributor_id
+      producer_name producer_id
+      product_name product_id
+      variant_description variant_id
+      previous_on_demand previous_count_on_hand
+      updated_on_demand updated_count_on_hand
+    )
+  end
+
+  def variant_override_log_row(variant_override)
+    variant = variant_override.variant
+    distributor = variant_override.hub
+    product = variant.andand.product
+    supplier = product.andand.supplier
+
+    row = [
+      variant_override.id,
+      distributor.andand.name, distributor.andand.id,
+      supplier.andand.name, supplier.andand.id,
+      product.andand.name, product.andand.id,
+      variant.andand.name, variant.andand.id,
+      variant_override.on_demand, variant_override.count_on_hand
+    ]
+
+    yield variant_override
+
+    row + [variant_override.on_demand, variant_override.count_on_hand]
+  end
+
+  def split_csv_by_distributor
+    table = CSV.read(csv_path)
+    distributor_ids = table[1..-1].map { |row| row[2] }.uniq # Don't use the header row.
+
+    distributor_ids.each do |distributor_id|
+      distributor_data_rows = filter_data_rows_for_distributor(table[1..-1], distributor_id)
+      distributor_name = distributor_data_rows.first[1]
+
+      CSV.open(distributor_csv_path(distributor_name, distributor_id), "w") do |csv|
+        csv << table[0] # Header row
+        distributor_data_rows.each { |row| csv << row }
+      end
+    end
+  end
+
+  def filter_data_rows_for_distributor(data_rows, distributor_id)
+    data_rows.select { |row| row[2] == distributor_id }
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20181123012635) do
+ActiveRecord::Schema.define(:version => 20181128054803) do
 
   create_table "account_invoices", :force => true do |t|
     t.integer  "user_id",    :null => false