abank 0.2.10 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84af9c14c7d615540fdb2b6ca02452fc7401fe6ba15e1f67e9cda7b7e1e776c2
-  data.tar.gz: 0d062d44e2a74adc8435e169c79289924b187e222f40b176ed8829e3ee363c2f
+  metadata.gz: 38252e611997b04e79e9743c3e9027906a47b3eb9252cf2a0d26526fe957d422
+  data.tar.gz: 927a605ae99f62cd66439d0f5468bb2da4ba2174ac9d3b7888fe72bda4dc6043
 SHA512:
-  metadata.gz: 169af6db74fa54a8dddef3cbc504b0e5f1d902c0628df9d4f60b742c6deef19e4a400e7065c2fe9031c4a1f98519991b3a5f84c1ed8cfa7fd01de784bbd677ee
-  data.tar.gz: 11786fa35a4b31532c2b0cea7c728f5e73ad7b0e2a8d95630a941822c7a713fda7848ae263c8d9f4d4550d4942f6741fc796d0b3ec1928930090f46a0fbdb5d7
+  metadata.gz: 0dc5655f4c39df0465f00506df19c87b81359c1d2c7ac5fe910b8daf25bd6aa2c59514693437bed6d35dc2c90ef022ab703afc3c14db18e38672fd90fd67318d
+  data.tar.gz: 5f97e3013d807922e1e6cc18d0636f5f02dbe0e0d83485520a582ab285915f7f71f44b526ad45a16f8931251c3c94d0f0453903db720570b89770a8d8d3fec4f

data/Gemfile.lock

@@ -1,23 +1,27 @@
 PATH
   remote: .
   specs:
-    abank (0.2.10)
+    abank (0.3.1)
       google-cloud-bigquery
       roo
       thor
-      yard
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    backport (1.1.2)
+    benchmark (0.1.0)
     concurrent-ruby (1.1.7)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    faraday (1.0.1)
+    e2mmap (0.1.0)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.45.0)
+      ruby2_keywords
+    google-api-client (0.50.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
@@ -26,19 +30,19 @@ GEM
       retriable (>= 2.0, < 4.0)
       rexml
       signet (~> 0.12)
-    google-cloud-bigquery (1.23.0)
+    google-cloud-bigquery (1.25.0)
       concurrent-ruby (~> 1.0)
-      google-api-client (~> 0.33)
+      google-api-client (~> 0.47)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
+    google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    googleauth (0.13.1)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -46,7 +50,10 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
+    jaro_winkler (1.5.4)
     jwt (2.2.2)
+    kwalify (0.7.2)
+    maruku (0.7.3)
     memoist (0.16.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -55,25 +62,67 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     os (1.1.1)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    psych (3.2.0)
     public_suffix (4.0.6)
+    rainbow (3.0.0)
     rake (12.3.3)
+    reek (6.0.2)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
+      psych (~> 3.1)
+      rainbow (>= 2.0, < 4.0)
+    regexp_parser (2.0.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    reverse_markdown (2.0.0)
+      nokogiri
     rexml (3.2.4)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.2.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     signet (0.14.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    solargraph (0.39.17)
+      backport (~> 1.1)
+      benchmark
+      bundler (>= 1.17.2)
+      e2mmap
+      jaro_winkler (~> 1.5)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
+      parser (~> 2.3)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (~> 0.52)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
     thor (1.0.1)
+    tilt (2.0.10)
     uber (0.1.0)
+    unicode-display_width (1.7.0)
     yard (0.9.25)
 
 PLATFORMS
@@ -83,6 +132,10 @@ DEPENDENCIES
   abank!
   bundler
   rake (~> 12.0)
+  reek
+  rubocop
+  solargraph
+  yard
 
 BUNDLED WITH
    2.1.4

data/abank.gemspec

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require_relative 'lib/abank/version'
+require_relative('lib/abank/version')
 
 Gem::Specification.new do |spec|
-  spec.name          = 'abank'
-  spec.version       = Abank::VERSION
+  spec.name        = 'abank'
+  spec.version     = Abank::VERSION
   spec.authors     = ['Hernâni Rodrigues Vaz']
   spec.email       = ['hernanirvaz@gmail.com']
   spec.homepage    = 'https://github.com/hernanirvaz/abank'
   spec.license     = 'MIT'
-
   spec.summary     = 'Arquiva movimentos conta-corrente, conta-cartao do activobank no bigquery.'
-  spec.description = spec.summary + ' Permite apagar/recriar movimentos/rendas ja no bigquery. ' \
+  spec.description = "#{spec.summary} Permite apagar/recriar movimentos/rendas ja no bigquery. "\
                      ' Permite ainda classificar movimentos no bigquery.'
 
+  spec.required_ruby_version    = Gem::Requirement.new('~> 2.7')
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['yard.run'] = 'yard'
-
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.metadata['yard.run']     = 'yard'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads files in RubyGem that have been added into git.
@@ -29,11 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('reek')
+  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency('solargraph')
+  spec.add_development_dependency('yard')
 
-  spec.add_dependency 'google-cloud-bigquery'
-  spec.add_dependency 'roo'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'yard'
+  spec.add_dependency('google-cloud-bigquery')
+  spec.add_dependency('roo')
+  spec.add_dependency('thor')
 end

data/lib/abank.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require('thor')
-require('abank/big')
-require('abank/contrato')
-require('abank/rendas')
-require('abank/folha')
+require('abank/big1')
+require('abank/big2')
+require('abank/big3')
+require('abank/folha1')
+require('abank/folha2')
 require('abank/version')
 
 # @author Hernani Rodrigues Vaz
@@ -12,30 +13,19 @@ module Abank
   DR = "/home/#{`whoami`.chomp}/Downloads"
   BD = 'hernanilr.ab'
 
-  class Error < StandardError; end
-
   # CLI para carregar folhas calculo comuns no bigquery
   class CLI < Thor
     desc 'tag', 'classifica movimentos'
     # classifica movimentos
     def tag
-      Big.new.mv_classifica
+      Big.new(options.to_h).mv_classifica.ct_dados.re_insert
     end
 
     desc 'apagamv', 'apaga movimentos'
     option :k, banner: 'KEY[,KEY...]', required: true, desc: 'keys movimentos a apagar'
     # apaga movimentos
     def apagamv
-      Big.new(k: options[:k]).mv_delete.mv_insert.re_work
-    end
-
-    desc 'criact', 'cria contrato arrendamento'
-    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
-    option :t, type: :boolean, default: true,      desc: 'cria todas as rendas?'
-    option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
-    # cria contrato arrendamento
-    def criact
-      Big.new(c: options[:c], t: options[:t], d: options[:d]).ct_cria
+      Big.new(options.transform_keys(&:to_sym)).mv_delete.ct_dados.re_insert
     end
 
     desc 'apagact', 'apaga contrato arrendamento'
@@ -43,50 +33,53 @@ module Abank
     option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     # apaga contrato arrendamento
     def apagact
-      Big.new(c: options[:c], t: options[:t]).ct_apaga
+      Big.new(options.transform_keys(&:to_sym)).ct_apaga
+    end
+
+    desc 'criact', 'cria contrato arrendamento'
+    option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
+    option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
+    option :t, type: :boolean, default: true,      desc: 'cria todas as rendas?'
+    # cria contrato arrendamento
+    def criact
+      Big.new(options.transform_keys(&:to_sym)).ct_cria
     end
 
     desc 'recriact', 'atualiza rendas de contrato arrendamento'
     option :c, banner: 'CONTRATO', required: true, desc: 'Identificador contrato arrendamento'
-    option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     option :d, banner: 'DATA', default: '',        desc: 'data contrato arrendamento'
+    option :t, type: :boolean, default: false,     desc: 'apaga todas as rendas?'
     # atualiza rendas de contrato arrendamento
     def recriact
-      Big.new(c: options[:c], t: options[:t]).ct_apaga
-      Big.new(c: options[:c], t: true, d: options[:d]).ct_cria
+      opc = options[:c]
+      Big.new(c: opc, t: options[:t]).ct_apaga
+      Big.new(c: opc, t: true, d: options[:d]).ct_cria
     end
 
     desc 'recriare', 'atualiza rendas dos contratos ativos'
     option :t, type: :boolean, default: false, desc: 'atualiza todas as rendas?'
     # atualiza rendas dos contratos ativos
     def recriare
-      Big.new(t: options[:t]).re_atualiza
+      Big.new(options.transform_keys(&:to_sym)).re_atualiza
     end
 
     desc 'work', 'carrega/apaga dados da folha calculo'
     option :s, type: :boolean, default: false, desc: 'apaga movimento similar'
     option :e, type: :boolean, default: false, desc: 'apaga movimento igual'
     option :v, banner: 'DATA', default: '',    desc: 'data valor para movimentos a carregar'
-    option :g, banner: 'TAG', default: '',     desc: 'classificacao para movimentos a carregar'
+    option :g, banner: 'TAG',  default: '',    desc: 'classificacao para movimentos a carregar'
     # carrega/apaga dados da folha calculo
     def work
-      Dir.glob("#{DR}/*.xlsx").sort.each do |f|
-        Folha.new(work_opc.merge(f: f)).processa_xls
+      Dir.glob("#{DR}/*.xlsx").sort.each do |file|
+        Folha.new(options.transform_keys(&:to_sym).merge(f: file, i: true)).processa_xls
       end
     end
 
     desc 'show', 'mostra dados da folha calculo'
     # mostra folha calculo
     def show
-      Dir.glob("#{DR}/*.xlsx").sort.each do |f|
-        Folha.new(f: f).processa_xls
-      end
-    end
-
-    no_commands do
-      # @return [Hash] opcoes trabalho com movimentos para work
-      def work_opc
-        { s: options[:s], e: options[:e], i: true, v: options[:v], g: options[:g] }
+      Dir.glob("#{DR}/*.xlsx").sort.each do |file|
+        Folha.new(options.merge(f: file)).processa_xls
       end
     end
 

data/lib/abank/big1.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require('google/cloud/bigquery')
+
+module Abank
+  # @see Big
+  class Big
+    # @return [Hash] opcoes trabalho
+    attr_reader :opcao
+
+    # @return [Google::Cloud::Bigquery::Data] resultado do Structured Query Language (SQL) no bigquery
+    attr_reader :bqres
+
+    # @return [Integer] numero linhas afetadas pelo Data Manipulation Language (DML) no bigquery
+    attr_reader :bqnrs
+
+    # acesso a base dados abank no bigquery
+    #
+    # @param [Thor::CoreExt::HashWithIndifferentAccess] opcoes trabalho
+    # @option opcoes [String]  :k ('') movimentos a apagar (keysin.mv)
+    # @option opcoes [String]  :c ('') id contrato arrendamento (re)
+    # @option opcoes [String]  :d ('') data inicio contrato arrendamento (re)
+    # @option opcoes [Boolean] :t (false) trabalha todas as rendas? (re)
+    # @return [Hash] opcoes trabalho
+    def initialize(opcoes = {})
+      @opcao = opcoes
+      opcao
+    end
+
+    # @return [Google::Cloud::Bigquery] API bigquery
+    def bqapi
+      @bqapi ||= Google::Cloud::Bigquery.new
+    end
+
+    # @return [String] movimentos a apagar (keysin.mv)
+    def mvkys
+      opcao[:k][/([-+]*\d)+(,[-+]*\d+)*/].to_s
+    end
+
+    # apaga movimentos & suas rendas associadas no bigquery
+    #
+    # @return [Big] acesso a base dados abank no bigquery
+    def mv_delete
+      @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'")
+
+        # apaga todas as rendas dos contratos arrendamento associados aos movimentos a apagar
+        opcao[:t] = true unless ctlct.empty?
+        re_apaga.mv_delete_dml
+      end
+      self
+    end
+
+    # apaga movimentos no bigquery
+    def mv_delete_dml
+      dml("delete from #{BD}.mv where #{ky_mv} 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")
+      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
+
+    # @param [String] cmd comando a executar
+    # @return [Google::Cloud::Bigquery::QueryJob] tarefa SQL/DML no bigquery
+    def job(cmd)
+      bqjob = bqapi.query_job(cmd)
+      bqjob.wait_until_done!
+      err = bqjob.error
+      puts(err['message']) if err
+      bqjob
+    end
+
+    # executa Structured Query Language (SQL) no bigquery
+    #
+    # @param (see job)
+    # @param [Array] erro resultado quando falha execucao
+    # @return [Google::Cloud::Bigquery::Data] resultado do SQL
+    def sql(cmd, erro = [])
+      # se job.failed? executa job(cmd).data => StandardError
+      @bqres = job(cmd).data
+    rescue StandardError
+      @bqres = erro
+    end
+
+    # executa Data Manipulation Language (DML) no bigquery
+    #
+    # @param (see job)
+    # @return [Integer] numero rows afetadas pelo DML
+    def dml(cmd)
+      # se job.failed? executa Integer(nil) => StandardError
+      @bqnrs = Integer(job(cmd).num_dml_affected_rows)
+    rescue StandardError
+      @bqnrs = 0
+    end
+  end
+end

data/lib/abank/big2.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Abank
+  # acesso a base dados abank no bigquery
+  class Big
+    DF = '%Y-%m-%d'
+
+    # @return [Integer] contrato arrendamento em tratamento
+    attr_reader :ctpos
+
+    # (see CLI#criact)
+    def ct_cria
+      unless ct_existe?
+        dml("insert into #{BD}.re #{sql_contrato_mv}")
+        puts("CONTRATO #{opcao[:c]} #{bqnrs.zero? ? 'NAO ' : ''}INSERIDO")
+      end
+      # processar rendas sim/nao?
+      return unless bqnrs.positive? && opcao[:t]
+
+      # processa rendas associadas ao contrato arrendamento
+      ct_dados.re_insert
+    end
+
+    # @return [Boolean] contrato arrendamento ja existe sim/nao?
+    def ct_existe?
+      @ctlct = [{ ct: opcao[:c] }]
+      vaz = sql("select ct from #{BD}.re where ct in(#{str_lc}) and cnt=0").empty?
+      unless vaz
+        @bqnrs = 1
+        puts('CONTRATO JA EXISTE')
+      end
+      !vaz
+    end
+
+    # (see CLI#apagact)
+    def ct_apaga
+      @ctlct = [{ ct: opcao[:c] }]
+      re_delete_dml
+    end
+
+    # optem lista dados contrato arrendamento (inclui lista movimentos novos)
+    #
+    # @return [Big] acesso a base dados abank no bigquery
+    def ct_dados
+      ctlct.map! do |ctr|
+        opcao[:c] = ctr[:ct]
+        lre = sql(sql_last_re)[0]
+        ctr.merge(lre, mv: sql(sql_novo_mv(lre[:dl])))
+      end
+      self
+    end
+
+    # @param [Array] are lista rendas novas atual
+    # @return [Array<String>] lista rendas novas duma lista contratos arrendamento
+    def ct_rendas(lre = [])
+      while ctpos < ctlct.size
+        @mvpos = 0
+        lre += re_rendas
+        @ctpos += 1
+      end
+      lre
+    end
+
+    # @example sem dados movimentos
+    #   [{ ct: 'r03000' }, ...]
+    # @example com dados movimentos
+    #   [{ct: 'r03000', dc: '2020-03-01', ano: 2020, cnt: 0, dl: '2020-03-01', mv: [{dl: '2020-03-02', vl: 30}, ...]  }]
+    # @return [Array<Hash>] lista dados contrato arrendamento (inclui lista movimentos novos)
+    def ctlct
+      @ctlct ||= []
+    end
+
+    # @return [String] texto formatado que representa lista de contratos arrendamento
+    def str_lc(sep = "'")
+      ctlct.map { |cid| sep + cid[:ct] + sep }.join(',')
+    end
+
+    # @return [String] sql para obter ultima renda do contrato arrendamento
+    def sql_last_re
+      'select ct,DATE_SUB(DATE_SUB(dl,INTERVAL dias DAY),INTERVAL IF(cnt=0,0,cnt-1) MONTH) dc,ano,cnt,dl'\
+            ',CAST(REGEXP_EXTRACT(ct,r"\d+") as numeric)/100 vr '\
+        "from #{BD}.re where ct='#{opcao[:c]}' order by ano desc,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"
+    end
+
+    # @return [String] sql para obter dados do inicio contrato arrendamento
+    def sql_contrato_mv
+      cti = opcao[:c]
+      dat = opcao[:d]
+      if dat.empty?
+        'select ct,EXTRACT(YEAR FROM DATE_TRUNC(dl,MONTH)) ano,0 cnt,DATE_TRUNC(dl,MONTH) dl,0 dias '\
+          "from #{BD}.mv where ct='#{cti}' order by dl limit 1"
+      else
+        "select '#{cti}' ct,EXTRACT(YEAR FROM DATE '#{dat}') ano,0 cnt,DATE '#{dat}' dl,0 dias"
+      end
+    end
+  end
+end