Merge pull request #18486 from lpichler/use_currencies_from_money_gem

Use currencies from money gem in Chargeback
ManageIQ · Feb 26, 2019 · 4a76123 · 4a76123
2 parents 67d4a6c + fe9ecbd
commit 4a76123
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 38 deletions.
diff --git a/app/models/chargeback_rate.rb b/app/models/chargeback_rate.rb
@@ -85,7 +85,7 @@ def self.seed
         rates = cbr.delete(:rates)
 
         rates.each do |rate_detail|
-          currency = ChargebackRateDetailCurrency.find_by(:name => rate_detail.delete(:type_currency))
+          currency = ChargebackRateDetailCurrency.find_by(:code => rate_detail.delete(:type_currency))
           field = ChargeableField.find_by(:metric => rate_detail.delete(:metric))
           rate_detail[:chargeable_field_id] = field.id
           if currency

diff --git a/app/models/chargeback_rate_detail.rb b/app/models/chargeback_rate_detail.rb
@@ -278,7 +278,7 @@ def self.default_rate_details_for(rate_type)
 
       chargeback_rate[:rates].each do |detail|
         detail_new = ChargebackRateDetail.new(detail.slice(*ChargebackRateDetail::FORM_ATTRIBUTES))
-        detail_new.detail_currency = ChargebackRateDetailCurrency.find_by(:name => detail[:type_currency])
+        detail_new.detail_currency = ChargebackRateDetailCurrency.find_by(:code => detail[:type_currency])
         detail_new.metric = detail[:metric]
         detail_new.chargeable_field = ChargeableField.find_by(:metric => detail.delete(:metric))
 

diff --git a/app/models/chargeback_rate_detail_currency.rb b/app/models/chargeback_rate_detail_currency.rb
@@ -8,6 +8,9 @@ class ChargebackRateDetailCurrency < ApplicationRecord
 
   has_many :chargeback_rate_detail, :foreign_key => "chargeback_rate_detail_currency_id"
 
+  CURRENCY_FILE = "/currency_iso.json".freeze
+  FIXTURE_DIR = Money::Currency::Loader::DATA_PATH.freeze
+
   def self.currencies_for_select
     # Return a hash where the keys are the possible currencies and the values are their ids
     ChargebackRateDetailCurrency.all.each_with_object({}) do |currency, hsh|
@@ -16,21 +19,33 @@ def self.currencies_for_select
     end
   end
 
+  def self.currency_file_source
+    File.join(FIXTURE_DIR, CURRENCY_FILE)
+  end
+
+  def self.currencies
+    parse_currency_file.transform_values.map do |x|
+      {:code => x[:iso_code], :name => x[:name], :full_name => x[:name], :symbol => x[:symbol]}
+    end
+  end
+
+  def self.parse_currency_file
+    json = File.read(currency_file_source)
+    json.force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
+    JSON.parse(json, :symbolize_names => true)
+  end
+
   def self.seed
-    fixture_file_currency = File.join(FIXTURE_DIR, 'chargeback_rate_detail_currencies.yml')
-    if File.exist?(fixture_file_currency)
-      fixture = YAML.load_file(fixture_file_currency)
-      fixture_mtime_currency = File.mtime(fixture_file_currency).utc
-      fixture.each do |cbr|
-        rec = ChargebackRateDetailCurrency.find_by(:name => cbr[:name])
+    if File.exist?(currency_file_source)
+      fixture_mtime_currency = File.mtime(currency_file_source).utc
+      currencies.each do |currency|
+        rec = ChargebackRateDetailCurrency.find_by(:code => currency[:code])
         if rec.nil?
-          _log.info("Creating [#{cbr[:name]}] with symbols=[#{cbr[:symbol]}]")
-          rec = ChargebackRateDetailCurrency.create(cbr)
+          _log.info("Creating [#{currency[:code]}] with symbols=[#{currency[:symbol]}]")
+          ChargebackRateDetailCurrency.create(currency)
         elsif fixture_mtime_currency > rec.created_at
-          _log.info("Updating [#{cbr[:name]}] with symbols=[#{cbr[:symbol]}]")
-          rec.update_attributes(cbr)
-          rec.created_at = fixture_mtime_currency
-          rec.save
+          _log.info("Updating [#{currency[:code]}] with symbols=[#{currency[:symbol]}]")
+          rec.update_attributes(currency.merge(:created_at => fixture_mtime_currency))
         end
       end
     end

diff --git a/db/fixtures/chargeback_rates.yml b/db/fixtures/chargeback_rates.yml
@@ -8,7 +8,7 @@
     :metric: cpu_usagemhz_rate_average
     :per_time: hourly
     :per_unit: megahertz
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -18,7 +18,7 @@
     :metric: v_derived_cpu_total_cores_used
     :per_time: hourly
     :per_unit: cpu core
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -28,7 +28,7 @@
     :metric: derived_vm_numvcpus
     :per_time: hourly
     :per_unit: cpu
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -38,7 +38,7 @@
     :metric: derived_vm_numvcpu_cores
     :per_time: hourly
     :per_unit: cpu core
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -48,7 +48,7 @@
     :metric: derived_memory_used
     :per_time: hourly
     :per_unit: megabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -58,7 +58,7 @@
     :metric: derived_memory_available
     :per_time: hourly
     :per_unit: megabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -68,7 +68,7 @@
     :metric: net_usage_rate_average
     :per_time: hourly
     :per_unit: kbps
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: 100
@@ -82,7 +82,7 @@
     :metric: disk_usage_rate_average
     :per_time: hourly
     :per_unit: kbps
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -91,7 +91,7 @@
   - :description: Fixed Compute Cost 1
     :metric: fixed_compute_1
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -100,7 +100,7 @@
   - :description: Fixed Compute Cost 2
     :metric: fixed_compute_2
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -115,7 +115,7 @@
     :metric: derived_vm_allocated_disk_storage
     :per_time: hourly
     :per_unit: gigabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -125,7 +125,7 @@
     :metric: derived_vm_used_disk_storage
     :per_time: hourly
     :per_unit: gigabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -134,7 +134,7 @@
   - :description: Fixed Storage Cost 1
     :metric: fixed_storage_1
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -143,7 +143,7 @@
   - :description: Fixed Storage Cost 2
     :metric: fixed_storage_2
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -158,7 +158,7 @@
     :metric: cpu_usagemhz_rate_average
     :per_time: hourly
     :per_unit: megahertz
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -168,7 +168,7 @@
     :metric: v_derived_cpu_total_cores_used
     :per_time: hourly
     :per_unit: cpu core
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -178,7 +178,7 @@
     :metric: derived_vm_numvcpus
     :per_time: hourly
     :per_unit: cpu
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -188,7 +188,7 @@
     :metric: derived_vm_numvcpu_cores
     :per_time: hourly
     :per_unit: cpu core
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -198,7 +198,7 @@
     :metric: derived_memory_used
     :per_time: hourly
     :per_unit: megabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -208,7 +208,7 @@
     :metric: derived_memory_available
     :per_time: hourly
     :per_unit: megabytes
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -218,7 +218,7 @@
     :metric: net_usage_rate_average
     :per_time: hourly
     :per_unit: kbps
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: 100
@@ -232,7 +232,7 @@
     :metric: disk_usage_rate_average
     :per_time: hourly
     :per_unit: kbps
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -241,7 +241,7 @@
   - :description: Fixed Compute Cost 1
     :metric: fixed_compute_1
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity
@@ -250,7 +250,7 @@
   - :description: Fixed Compute Cost 2
     :metric: fixed_compute_2
     :per_time: hourly
-    :type_currency: Dollars
+    :type_currency: USD
     :tiers:
     - :start: 0
       :finish: Infinity

diff --git a/spec/models/chargeback_rate_detail_currency_spec.rb b/spec/models/chargeback_rate_detail_currency_spec.rb
@@ -1,4 +1,19 @@
 describe ChargebackRateDetailCurrency do
+  describe '.seed' do
+    before do
+      ChargebackRateDetailCurrency.seed
+    end
+
+    let(:expected_currencies) do
+      %w(AED AFN ALL AMD ANG AOA ARS AUD AWG AZN BAM BBD BDT BGN BHD BIF BMD BND BOB BRL BSD BTN BWP BYN BYR BZD CAD CDF CHF CLF CLP CNY COP CRC CUC CUP CVE CZK DJF DKK DOP DZD EGP ERN ETB EUR FJD FKP GBP GEL GHS GIP GMD GNF GTQ GYD HKD HNL HRK HTG HUF IDR ILS INR IQD IRR ISK JMD JOD JPY KES KGS KHR KMF KPW KRW KWD KYD KZT LAK LBP LKR LRD LSL LYD MAD MDL MGA MKD MMK MNT MOP MRO MUR MVR MWK MXN MYR MZN NAD NGN NIO NOK NPR NZD OMR PAB PEN PGK PHP PKR PLN PYG QAR RON RSD RUB RWF SAR SBD SCR SDG SEK SGD SHP SKK SLL SOS SRD SSP STD SVC SYP SZL THB TJS TMT TND TOP TRY TTD TWD TZS UAH UGX USD UYU VES VND VUV WST XAF XAG XAU XCD XDR XOF XPD XPF XPT YER ZAR ZMK ZMW)
+    end
+
+    it "returns supported currencies" do
+      expect(ChargebackRateDetailCurrency.count).to eq(164)
+      expect(ChargebackRateDetailCurrency.all.map(&:code)).to eq(expected_currencies)
+    end
+  end
+
   it "has a valid factory" do
     expect(FactoryBot.create(:chargeback_rate_detail_currency)).to be_valid
   end