dolar-bna 1.2.5.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2967be9be678555da83cae839848b941e967b15cec9999e8cc594186fc035a
-  data.tar.gz: 55c0a03df7284b7f2179d76fc4f27a04274a5250ee5e329f4a59806126e1051e
+  metadata.gz: 3a5ee0e822588ab6a2953797cb21c2e828fd00d2693ef0a597e942c1720abf44
+  data.tar.gz: f1d44673bcdf075ab1f77c77f7c360055caf65a872e45a8de59e96ee564c227a
 SHA512:
-  metadata.gz: ac383946adf1a573f3764088dda0347f0eb742aaafcf38d8613418129abdb0dbeb9c18cd23ac387cb67cde61cdbab733b35ac402990ff7363cf0ad1ca34b1a41
-  data.tar.gz: 10cbbc2c1fed12b0fc2af7ec2d52a06aa4cecb806b59447e838f51f9a5b2c232f4c8fb7954cb1f8e024abcd7b6f800c0b4f58e1192c82e93a6eea07149f880f6
+  metadata.gz: f0cfb28dcc754e6f79eb97f24e5ddb6aa1b970a03f67c5f6b362c8685b7418ed52348e9694833227e7dab0e44736e03bbe58af4fc7e1386019d881d128355147
+  data.tar.gz: b3b404f210d48ca266302fab94838fc88358295c9d92604a05381035fd36fffbac2d6a21399c599a5a79fa49e662fc103299772e7880a2746fcec5faa7a0cbc0

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

@@ -46,10 +46,12 @@ module Dolar
       end
 
       def set_dolar_agro
-        divisa_value = Dolar::Bna::DolarCotization.where(dolar_type: dolar_type == 'MEP' ? 'Divisa' : 'MEP', 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.1"
+    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.1
+  version: 1.2.6
 platform: ruby
 authors:
 - LITECODE