dolar-bna 1.1.4.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d0ad96740a9d45cebd34e7006831086a2916de234a76a781e8ae92908cf6b1
-  data.tar.gz: 9fe5220d14bb59d00bb505fcecfa879b4a6a14edc863f8f53a3440a1ed155097
+  metadata.gz: 9ebac018973d719e2fbc91b161530af5e89f0bf05b33ff38d3adbdb960fe0894
+  data.tar.gz: d3baec3653ea8ae1f8169a7753cf717de96d6a174014d32cfe17a81a0b88d2ad
 SHA512:
-  metadata.gz: 1c18049fac9cefede8ce3eb568b88b0c4adacfa99efba109a7462a56c73d81f130170215a1b910eff5c2130b045942464d63f01b64b8e20213bae819298d33e8
-  data.tar.gz: c88c7c11ffbfea46f555f3889189ce5835f9584ca829f7db95cfef8f15626af29bb08bb7f4579ac03a3e4e408201547c9bc80f8fb749f5fbebe46813516309d7
+  metadata.gz: 64918bff0a8fb9f20e67c952079f60c808a9b085d6ffc1fba7c023940e2a6a76b39db979121e04b217329c91ff3c13a15a5d7189d4a8768856c86dfc6478e1dc
+  data.tar.gz: 5d73d000445147844585c96ce285001d16361198c15571f5c40b01131a8c6340b88bac54b252e90073cc5f66b93a15bf5a7060bb08ff100671e93a4847d62725

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/exchange.rb

@@ -57,17 +57,17 @@ module Dolar
       private
 
       def check_cotization dolar_type, date
-        # query = Dolar::Bna::DolarCotization.where(date: date.to_date, dolar_type: dolar_type).first
+        query = Dolar::Bna::DolarCotization.where(date: date.to_date, dolar_type: dolar_type).where("dolar_cotizations.created_at >= ?", Time.now - 1.hours).first
         ddolar = nil
-        # if query.nil?
+        if query.nil?
           if dolar_type == "Divisa"
             ddolar = get_dolar_divisa()
           else
             ddolar = get_dolar()
           end
-          #ddolar = {compra: query.dolar_buy, venta: query.dolar_sell}
-        # else
-        # end
+        else
+          ddolar = {compra: query.dolar_buy, venta: query.dolar_sell}
+        end
         return ddolar
       end
 

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.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolar-bna
 version: !ruby/object:Gem::Version
-  version: 1.1.4.1
+  version: 1.2.1
 platform: ruby
 authors:
-- LITECODE
+- Ezequiel Lorenzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Cotizador de USD/ARS