abank 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de10c87be621e35389199acb7ffd3d3cab6108d47e6a4567843498676aa9d406
-  data.tar.gz: 6522e24a538f2614e149c528e51c136bc4d382e048fedf613ee6c1a2c2a5e5a5
+  metadata.gz: a0c532723fa1fdbba391b26c59f6f48348ae894aa3d77e78f8157e48130b868a
+  data.tar.gz: b29c85587e6369483bb98c31df0ae3a37dbd3f136b1cd7b86f96d627b7a577d4
 SHA512:
-  metadata.gz: ec9e2dccd22fa3a0a1516354069564f6794a678a0cb918d96e28e27bade10435cfe19b42a8795d54a58bf12be331c67427673e7d5bdfe2ed1211997e62e69f87
-  data.tar.gz: 0ff5bbc6dad1e8bebed8fd0b29dd3a3b3e4ac4f3387e1ae93c8553b7cd6ab01c403bc032dfb3f4c5f741237375a5f20b83af75b9fcba3656dca4e7ea34bb6b66
+  metadata.gz: 38b7dc65b7c119aba2f8ca470ed690cabfbf778b5a5d295686194ede2d5327cc58fce5b2e3724ac23f1800aff307ac48829eee23474d64ef05e8712afcb0d88f
+  data.tar.gz: 6e6815d2d870ed30711671d6d6aae45cc86ed93c17d6cb054af9e196a8bc6ccb76f3d0074172133d116e338326375df707517da850a59fa652ebbff0eb5550e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abank (0.4.6)
+    abank (0.4.8)
       google-cloud-bigquery
       roo
       thor
@@ -16,7 +16,7 @@ GEM
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     declarative (0.0.20)
     diff-lcs (1.5.1)
     dry-configurable (1.3.0)
@@ -57,7 +57,7 @@ GEM
       net-http (>= 0.5.0)
     google-apis-bigquery_v2 (0.83.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-core (0.15.1)
+    google-apis-core (0.16.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)

data/lib/abank/big.rb

@@ -54,7 +54,7 @@ module Abank
       @ctlct = []
       unless mvkys.empty?
         # obtem lista contratos arrendamento associados aos movimentos a apagar
-        @ctlct = sql("select distinct ct from #{BD}.mv where #{ky_mv} in(#{mvkys}) and substr(ct,1,1)='r'")
+        @ctlct = sql("select distinct ct from #{BD}.mv where #{BD}.ky(dl,dv,ds,vl,nc) in(#{mvkys}) and substr(ct,1,1)='r'")
 
         # apaga todas as rendas dos contratos arrendamento associados aos movimentos a apagar
         opcao[:t] = true unless ctlct.empty?
@@ -65,23 +65,18 @@ module Abank
 
     # apaga movimentos no bigquery
     def mv_delete_dml
-      dml("delete from #{BD}.mv where #{ky_mv} in(#{mvkys})")
+      dml("delete from #{BD}.mv where #{BD}.ky(dl,dv,ds,vl,nc) in(#{mvkys})")
       puts("MOVIMENTOS APAGADOS #{bqnrs}")
     end
 
     # (see CLI#tag)
     def mv_classifica
-      dml("update #{BD}.mv set mv.ct=tt.nct from (select * from #{BD}.cl) as tt where #{ky_mv}=tt.ky")
+      dml("update #{BD}.mv set mv.ct=tt.nct from (select * from #{BD}.cl) as tt where #{BD}.ky(mv.dl,mv.dv,mv.ds,mv.vl,mv.nc)=tt.ky")
       puts("MOVIMENTOS CLASSIFICADOS #{bqnrs}")
       @ctlct = sql("select distinct ct from #{BD}.re") if bqnrs.positive?
       self
     end
 
-    # @return [String] expressao sql da chave de movimentos
-    def ky_mv
-      'FARM_FINGERPRINT(CONCAT(CAST(mv.nc as STRING),mv.ds,CAST(mv.dl as STRING),CAST(mv.vl as STRING)))'
-    end
-
     # (see CLI#criact)
     def ct_cria
       unless ct_existe?
@@ -119,6 +114,7 @@ module Abank
       ctlct.map! do |ctr|
         opcao[:c] = ctr[:ct]
         lre = sql(sql_last_re)[0]
+        lre[:dl] += -1 if lre[:cnt] == 0
         ctr.merge(lre, mv: sql(sql_novo_mv(lre[:dl])))
       end
       self
@@ -152,13 +148,13 @@ module Abank
     # @return [String] sql para obter ultima renda do contrato arrendamento
     def sql_last_re
       'select r1.ct,r0.dl dc,r1.ano,r1.cnt,r1.dl,CAST(REGEXP_EXTRACT(r1.ct,r"\d+") as numeric)/100 vr '\
-        "from #{BD}.re r1 join hernanilr.ab.re r0 on (r0.ct=r1.ct and r0.cnt=0 and r1.cnt>0)"\
-      " where r1.ct='#{opcao[:c]}' order by ano desc,cnt desc limit 1"
+        "from #{BD}.re r1 join hernanilr.ab.re r0 on (r0.ct=r1.ct and r0.cnt=0)"\
+      " where r1.ct='#{opcao[:c]}' order by r1.ano desc,r1.cnt desc limit 1"
     end
 
     # @return [String] sql para obter movimentos novos (depois da ultima renda do contrato arrendamento)
     def sql_novo_mv(mdl)
-      "select dl,vl from #{BD}.mv where ct='#{opcao[:c]}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
+      "select dl,vl from #{BD}.mvgem where ct='#{opcao[:c]}' and dl>='#{(mdl + 1).strftime(DF)}' order by dl,dv"
     end
 
     # @return [String] sql para obter dados do inicio contrato arrendamento
@@ -225,7 +221,7 @@ module Abank
     def re_proximos_dados
       # valor renda paga retirada do movimento
       re_atual_mv[:vl] -= re_atual[:vr]
-      dre = cnt.zero? ? Date.new(ano, 1, 1) : Date.new(ano, cnt, 1) >> 1
+      dre = cnt.zero? ? Date.new(re_atual[:dc].year, re_atual[:dc].month, 1) : Date.new(ano, cnt, 1) >> 1
       re_atual.merge!(ano: dre.year, cnt: dre.month)
     end
 
@@ -262,7 +258,7 @@ module Abank
 
     # @return [Integer] dias atraso/antecipo neste pagamento renda
     def dias
-      re_atual_mv[:dl].mjd - (Date.new(ano, cnt, 1) >> (re_atual[:dc].month - 1)).mjd
+      re_atual_mv[:dl].mjd - Date.new(ano, cnt, 1).mjd
     end
 
     # @param [String] cmd comando a executar

data/lib/abank/folha.rb

@@ -147,7 +147,7 @@ module Abank
 
     # @return [String] sql para movimentos no bigquery
     def sql_existe_mv
-      "select *,#{ky_mv} as ky from #{BD}.mv where nc=#{conta} and dl='#{rowfc[0].strftime(DF)}' and vl=#{rowfc[3]}"
+      "select *,#{BD}.ky(dl,dv,ds,vl,nc) ky from #{BD}.mv where nc=#{conta} and dl='#{rowfc[0].strftime(DF)}' and vl=#{rowfc[3]}"
     end
 
     # obtem movimento (values.mv) para inserir

data/lib/abank/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abank
-  VERSION = '0.4.6'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abank
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler