dolar-bna 1.1.4.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d0ad96740a9d45cebd34e7006831086a2916de234a76a781e8ae92908cf6b1
-  data.tar.gz: 9fe5220d14bb59d00bb505fcecfa879b4a6a14edc863f8f53a3440a1ed155097
+  metadata.gz: 00f9c3eecb0c447d83374c1a27f1f948e596ccafb287b27aa10a1f88427ed430
+  data.tar.gz: 9c5c2d739ee77f30c007523983180b2a29896927bb7b3ccd94d1c6989a01bd36
 SHA512:
-  metadata.gz: 1c18049fac9cefede8ce3eb568b88b0c4adacfa99efba109a7462a56c73d81f130170215a1b910eff5c2130b045942464d63f01b64b8e20213bae819298d33e8
-  data.tar.gz: c88c7c11ffbfea46f555f3889189ce5835f9584ca829f7db95cfef8f15626af29bb08bb7f4579ac03a3e4e408201547c9bc80f8fb749f5fbebe46813516309d7
+  metadata.gz: 732000c8b7d7c4e42cea223bb373b848a4cb004f52ea9a8138c8a7e1356df7bfc2750b2cf0e5b78ec651b020e946f7ae75ab2ea3e8fd3ae5c87e8a0b4ddd063a
+  data.tar.gz: 25c5d91dd0964a7677c19e611ca7dfb7da099fca0f6f097bd0f51539eca6a1154565fc5f8f3b7433766d903924e6be4f9100358ef6a757d01ea73cfe3ace79e7

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

@@ -8,7 +8,7 @@ module Dolar
       validates_presence_of :dolar_sell, message: 'Indicar cotizacion de venta'
       validates_numericality_of :dolar_buy, greater_than: 0, message: 'La cotizacion debe ser mayor a 0'
       validates_numericality_of :dolar_sell, greater_than: 0, message: 'La cotizacion debe ser mayor a 0'
-      validates_uniqueness_of :date, scope: :dolar_type, message: 'Ya existe una cotización de ese tipo para la fecha ingresada'
+      validates_uniqueness_of :date, scope: [:dolar_type, :dolar_sell], message: 'Ya existe una cotización de ese tipo para la fecha ingresada'
       DOLAR_TYPES = ["Divisa", "Billete"]
 
       validates_inclusion_of :dolar_type, in: DOLAR_TYPES, message: 'Tipo de cotización inválido'

data/lib/dolar/bna/today_exchange.rb

@@ -7,31 +7,25 @@ module Dolar
       end
 
       def perform
-        billete, divisa = check_today_cotization()
-        if @dolar_type == "Billete"
-          return billete
-        else
-          return divisa
-        end
+        dolar = check_today_cotization()
+        return dolar
       end
 
       private
 
       def check_today_cotization
-        divisa_query = Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: "Divisa").first
-        billete_query = Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: "Billete").first
-        ddivisa = {compra: "-", venta: "-"}
-        if divisa_query.nil?
-          ddivisa = Dolar::Bna::Exchange.new(Date.today).perform_bna_divisa
-        else
-          dbillete = {compra: divisa_query.dolar_buy, venta: divisa_query.dolar_sell}
-        end
-        if billete_query.nil?
-          dbillete = Dolar::Bna::Exchange.new(Date.today).perform_bna_billete
+        query = Dolar::Bna::DolarCotization.where(date: Date.today, dolar_type: @dolar_type).order("dolar_cotizations.created_at DESC").first
+        #data = {compra: "-", venta: "-"}
+        if query.nil?
+          if @dolar_type == "Billete"
+            data = Dolar::Bna::Exchange.new(Date.today).perform_bna_billete
+          else
+            data = Dolar::Bna::Exchange.new(Date.today).perform_bna_divisa
+          end
         else
-          dbillete = {compra: billete_query.dolar_buy, venta: billete_query.dolar_sell}
+          data = {compra: query.dolar_buy, venta: query.dolar_sell}
         end
-        return dbillete, ddivisa
+        return data
       end
     end
   end

data/lib/dolar/bna/version.rb

@@ -1,5 +1,5 @@
 module Dolar
   module Bna
-    VERSION = "1.1.4.1"
+    VERSION = "1.1.5"
   end
 end

metadata

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