On foodcoops#764: Switched to enum for config options

lentschi · Oct 17, 2020 · 1dddd96 · 1dddd96
1 parent 8381a11
commit 1dddd96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/models/group_order_article.rb b/app/models/group_order_article.rb
@@ -128,16 +128,18 @@ def calculate_result(total = nil)
  order_quantities = GroupOrderArticleQuantity.where(group_order_article_id: order_article.group_order_article_ids).order('created_on')
  logger.debug "GroupOrderArticleQuantity records found: #{order_quantities.size}"
 
+ first_order_first_serve = (FoodsoftConfig[:distribution_strategy] == FoodsoftConfig::DistributionStrategy::FIRST_ORDER_FIRST_SERVE)
+
  # Determine quantities to be ordered...
  order_quantities.each do |goaq|
  q = goaq.quantity
- q = [q, total - total_quantity].min if FoodsoftConfig[:distribution_strategy] == :first_order_first_serve
+ q = [q, total - total_quantity].min if first_order_first_serve
  total_quantity += q
  if goaq.group_order_article_id == self.id
  logger.debug "increasing quantity by #{q}"
  quantity += q
  end
- break if total_quantity >= total && FoodsoftConfig[:distribution_strategy] == :first_order_first_serve
+ break if total_quantity >= total && first_order_first_serve
  end
 
  # Determine tolerance to be ordered...

diff --git a/app/serializers/config_serializer.rb b/app/serializers/config_serializer.rb
@@ -1,5 +1,4 @@
 class ConfigSerializer < ActiveModel::Serializer
-
  # details
  attributes :name, :homepage, :contact
 

diff --git a/app/views/admin/configs/_tab_others.html.haml b/app/views/admin/configs/_tab_others.html.haml
@@ -1,7 +1,7 @@
 = config_input form, :use_nick, as: :boolean
 = config_input form, :tolerance_is_costly, as: :boolean
-- distribution_options = [[t('config.keys.distribution_strategy_options.first_order_first_serve'), :first_order_first_serve],
- [t('config.keys.distribution_strategy_options.no_automatic_distribution'), :no_automatic_distribution]]
+- distribution_options = [[t('config.keys.distribution_strategy_options.first_order_first_serve'), FoodsoftConfig::DistributionStrategy::FIRST_ORDER_FIRST_SERVE],
+ [t('config.keys.distribution_strategy_options.no_automatic_distribution'), FoodsoftConfig::DistributionStrategy::NO_AUTOMATIC_DISTRIBUTION]]
 = config_input form, :distribution_strategy, as: :select, collection: distribution_options,
  include_blank: false, input_html: {class: 'input-xxlarge'}
 = config_input form, :disable_invite, as: :boolean

diff --git a/lib/foodsoft_config.rb b/lib/foodsoft_config.rb
@@ -54,6 +54,12 @@ class FoodsoftConfig
  # Loaded configuration
  APP_CONFIG = ActiveSupport::HashWithIndifferentAccess.new
 
+ # distribution strategy config values enum
+ module DistributionStrategy
+ FIRST_ORDER_FIRST_SERVE = 'first_order_first_serve'
+ NO_AUTOMATIC_DISTRIBUTION = 'no_automatic_distribution'
+ end
+
  class << self
 
  # Load and initialize foodcoop configuration file.
@@ -260,7 +266,7 @@ def get_default_config
  tasks_period_days: 7,
  tasks_upfront_days: 49,
  shared_supplier_article_sync_limit: 200,
- distribution_strategy: :first_order_first_serve,
+ distribution_strategy: FoodsoftConfig::DistributionStrategy::FIRST_ORDER_FIRST_SERVE,
  # The following keys cannot, by default, be set by foodcoops themselves.
  protected: {
  multi_coop_install: true,