avmtrf1-tools 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087a54a4caf473fa94935484dad0a43c184c15789ba50177e8c0613a581cf78f'
-  data.tar.gz: 9694989db13cf4858b41dc451b27c028ab9bee39439926775f956693fb248a10
+  metadata.gz: 488a4826095240654ea0d4de46002cbf385a7c064ed2c860c4f2f13d9befcdd3
+  data.tar.gz: 68a6d46f0388d806bd6248aca8b89161726b7a3c32d964e5bf361392f3bb37a2
 SHA512:
-  metadata.gz: 8d3911fda72f48d6bea4b636983907c843ee1bf20572fc5125981559ba2dce197cbabb76e3ea5cecdfbe10400656daf6adb334ec0cd80007637ce00017d0f177
-  data.tar.gz: cd1b31974108d9cae30b962b4fd6d078703900e7e40c6f1c50550a36673d82e3925c9557c7162bcf3f264a4a4fdd682157d208572de300be0490be478c20c326
+  metadata.gz: 9a411e8c9120b8b4d88963184a6a4d05343d3905b7807ea41707c423a443bb38e06af62ffc53141cf29e310f0c49c416f28ae884b88ebffc598efb7db4bd2c85
+  data.tar.gz: 58b316650009ad2e76fd7d0890eb191da17bc53492222155a4a807e5906e0e06d9b838d0fb2b01633111c9521a6f1455d0ae30959b7557bb038c3e6a9300d779

data/lib/avmtrf1/default_esosti.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/esosti/session'
+require 'avmtrf1/esosti/instance'
 require 'avmtrf1/ad_user'
 
 module Avmtrf1
   class << self
     def default_esosti
-      @default_esosti ||= ::Avmtrf1::Esosti::Session.new(
+      @default_esosti ||= ::Avmtrf1::Esosti::Instance.new(
         'https://esosti.trf1.jus.br',
-        ::Avmtrf1.ad_user.username,
-        ::Avmtrf1.ad_user.password,
-        ::Avmtrf1.ad_user.domain.upcase
+        "#{::Avmtrf1.ad_user.username}@#{::Avmtrf1.ad_user.domain.downcase}.gov.br",
+        ::Avmtrf1.ad_user.password
       )
     end
   end

data/lib/avmtrf1/esosti/entities/issue.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/rest_provider/entity'
+
+module Avmtrf1
+  module Esosti
+    module Entities
+      class Issue < ::Avmtrf1::RestProvider::Entity
+        class << self
+          def raw_data_to_data(raw_data)
+            sanitize_data(raw_data.fetch('QueryMS_RMTICKETResponse').fetch('MS_RMTICKETSet')
+                .fetch('TICKET'))
+          end
+
+          def sanitize_data(data)
+            if data.is_a?(Array)
+              sanitize_array_data(data)
+            elsif data.is_a?(Hash)
+              sanitize_hash_data(data)
+            else
+              data
+            end
+          end
+
+          private
+
+          def sanitize_array_data(data)
+            data.map { |v| sanitize_data(v) }
+          end
+
+          def sanitize_hash_data(data)
+            if content_hash?(data)
+              sanitize_data(data.fetch('content'))
+            else
+              data.map { |k, v| [k, sanitize_data(v)] }.to_h
+            end
+          end
+
+          def content_hash?(data)
+            data.is_a?(Hash) && data.count == 1 && data.key?('content')
+          end
+        end
+
+        def initialize(instance, data)
+          super instance, self.class.raw_data_to_data(data)
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/esosti/entities.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Esosti
+    module Entities
+      require 'avmtrf1/redmine/entities/issue'
+    end
+  end
+end

data/lib/avmtrf1/esosti/instance.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/esosti/entities/issue'
+require 'avmtrf1/rest_provider/instance'
+
+module Avmtrf1
+  module Esosti
+    class Instance < ::Avmtrf1::RestProvider::Instance
+      def build_service_url(service_url_suffix)
+        "#{root_url}/maxrest/rest#{service_url_suffix}"
+      end
+
+      def issue_get_url_suffix(provider_issue_id)
+        "/os/MS_RMTICKET/?ticketid=#{provider_issue_id}"
+      end
+    end
+  end
+end

data/lib/avmtrf1/esosti.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Avmtrf1
+  module Esosti
+    require 'avmtrf1/esosti/entities'
+    require 'avmtrf1/esosti/instance'
+  end
+end

data/lib/avmtrf1/rest_provider/instance.rb

@@ -3,6 +3,7 @@
 require 'curb'
 require 'json'
 require 'avmtrf1/jira/entities/issue'
+require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
   module RestProvider
@@ -11,6 +12,8 @@ module Avmtrf1
     #   * self.build_service_url(service_url_suffix)
     #   * self.issue_get_url_suffix(provider_issue_id)
     class Instance
+      include ::EacRubyUtils::Console::Speaker
+
       attr_reader :root_url, :username, :password
 
       def initialize(root_url, username, password)
@@ -29,18 +32,39 @@ module Avmtrf1
       end
 
       def request(service_url_suffix)
-        c = ::Curl::Easy.new(build_service_url(service_url_suffix))
+        url = build_service_url(service_url_suffix)
+        infov 'URL', url
+        c = ::Curl::Easy.new(url)
         c.http_auth_types = :basic
         c.username = username
         c.password = password
-        raise 'Curl failed' unless c.perform
-
-        JSON.parse(c.body_str)
+        c.headers['Accept'] = 'application/json'
+        curl_perform(c)
       end
 
       def issue_class
         "#{self.class.name.deconstantize}::Entities::Issue".constantize
       end
+
+      private
+
+      def curl_perform(curl)
+        raise 'Curl failed' unless curl.perform
+
+        infov 'Return status', curl.status
+        return JSON.parse(curl.body_str) if curl.status.to_i == 200
+
+        raise curl_raise_message(curl)
+      end
+
+      def curl_raise_message(curl)
+        raise <<~MESSAGE
+          "#{curl.url} returned #{curl.status.to_i}:
+          #{'=' * 10}
+          #{curl.body_str}
+          #{'=' * 10}"
+        MESSAGE
+      end
     end
   end
 end

data/lib/avmtrf1/tools/runner/esosti.rb

@@ -3,9 +3,9 @@
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_ruby_utils/simple_cache'
+require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
 require 'avmtrf1/red/profile'
-require 'avmtrf1/esosti/session'
 
 module Avmtrf1
   module Tools
@@ -34,21 +34,11 @@ module Avmtrf1
           end
         end
 
-        private
-
-        def login
-          infom "Logando em #{session.url} com #{session.uf}\\#{session.user}..."
-          session.login
-        end
-
         def fetch
-          login
           infom "Recuperando informações de #{options.fetch('<solicitacao_id>')}..."
-          pp session.solicitacao_get_data(options.fetch('<solicitacao_id>'))
-        end
-
-        def session_uncached
-          ::Avmtrf1.default_esosti
+          issue = ::Avmtrf1.default_esosti.issue(options.fetch('<solicitacao_id>'))
+          fatal_error("Issue não encontrado: #{options.fetch('<solicitacao_id>')}") unless issue
+          out issue.data.to_yaml
         end
       end
     end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -176,6 +176,10 @@ files:
 - lib/avmtrf1/default_esosti.rb
 - lib/avmtrf1/default_jira.rb
 - lib/avmtrf1/default_redmine.rb
+- lib/avmtrf1/esosti.rb
+- lib/avmtrf1/esosti/entities.rb
+- lib/avmtrf1/esosti/entities/issue.rb
+- lib/avmtrf1/esosti/instance.rb
 - lib/avmtrf1/esosti/parsers/solicitacao/main.rb
 - lib/avmtrf1/esosti/session.rb
 - lib/avmtrf1/esosti/session/action_base.rb