dolar-bna 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02242b5a3c76e60de04841f3bacd3d61663df1e4ef46ee2f814cefd9786cbda8
-  data.tar.gz: 515ce9858b121266e0e9c4148c550d21e562e5945b386c962e3b6332f64141a9
+  metadata.gz: 3a5ee0e822588ab6a2953797cb21c2e828fd00d2693ef0a597e942c1720abf44
+  data.tar.gz: f1d44673bcdf075ab1f77c77f7c360055caf65a872e45a8de59e96ee564c227a
 SHA512:
-  metadata.gz: d2929210f18902108d4003e371c5628785769596c1d5347584b17301103d6f7e803d45d913a1d3b4d4bb529e4918266a5624b2d165d5910d7aeeee7fbf573ce2
-  data.tar.gz: 2ba4e95572a52fd78966d5c5e873c996cbee96ab3ae59c8cba1be2ff8900ad2798b32c75e49265c33d4588a11b081ed1cd0499a93184be72c04b885624802455
+  metadata.gz: f0cfb28dcc754e6f79eb97f24e5ddb6aa1b970a03f67c5f6b362c8685b7418ed52348e9694833227e7dab0e44736e03bbe58af4fc7e1386019d881d128355147
+  data.tar.gz: b3b404f210d48ca266302fab94838fc88358295c9d92604a05381035fd36fffbac2d6a21399c599a5a79fa49e662fc103299772e7880a2746fcec5faa7a0cbc0

data/lib/dolar/app/models/dolar_cotization.rb

@@ -13,7 +13,7 @@ module Dolar
 
       validates_inclusion_of :dolar_type, in: DOLAR_TYPES, message: 'Tipo de cotización inválido'
 
-      after_save :set_dolar_agro, if: :dolar_mep?
+      after_save :set_dolar_agro, if: :dolar_agro_changer?
 
       def self.search_by_date_range search
         unless search.blank?
@@ -41,15 +41,17 @@ module Dolar
         end
       end
 
-      def dolar_mep?
-        dolar_type == "MEP"
+      def dolar_agro_changer?
+        dolar_type == 'MEP' || dolar_type == 'Divisa'
       end
 
       def set_dolar_agro
-        divisa_value = Dolar::Bna::DolarCotization.where(dolar_type: 'Divisa', date: self.date).order(date: :asc, created_at: :asc).last
-        if divisa_value
-          dolar_buy_average = ((self.dolar_buy.to_f * 0.2) + (divisa_value.dolar_buy.to_f * 0.8)).round(2)
-          dolar_sell_average = ((self.dolar_sell.to_f * 0.2) + (divisa_value.dolar_sell.to_f * 0.8)).round(2)
+        first_dolar_multiplier = (dolar_type == 'MEP' ? 0.2 : 0.8)
+        second_dolar_multiplier = (dolar_type == 'MEP' ? 0.8 : 0.2)
+        other_dolar_to_calc = Dolar::Bna::DolarCotization.where(dolar_type: dolar_type == 'MEP' ? 'Divisa' : 'MEP', date: self.date).order(date: :asc, created_at: :asc).last
+        if other_dolar_to_calc
+          dolar_buy_average = ((self.dolar_buy.to_f * first_dolar_multiplier) + (other_dolar_to_calc.dolar_buy.to_f * second_dolar_multiplier)).round(2)
+          dolar_sell_average = ((self.dolar_sell.to_f * first_dolar_multiplier) + (other_dolar_to_calc.dolar_sell.to_f * second_dolar_multiplier)).round(2)
           Dolar::Bna::DolarCotization.create(dolar_type: 'Agro', dolar_buy: dolar_buy_average, dolar_sell: dolar_sell_average, date: self.date)
         end
       end

data/lib/dolar/bna/version.rb

@@ -1,5 +1,5 @@
 module Dolar
   module Bna
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolar-bna
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - LITECODE