eco-helpers 2.1.8 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fabf1bbcb318ac7860992bc5a24a5b27e7941e6976cda455d1e65e274fa16c
-  data.tar.gz: e44bc288d08d82ce98921f63c978d84e8813883a729e17a718978aab293d9c44
+  metadata.gz: 7a10a887a29d2f0e2bbfba835c32c6fb2f35ed6cbbc674ad108ec1da81192d50
+  data.tar.gz: afc195b30a643cffaadb8b2b271e5d83d4981d1fed3d4111525ec83279a6f825
 SHA512:
-  metadata.gz: a94bc6ca7d5c012dc03491e6e96456d4ae620c4ecfc52023716525caadb4e6683e49de8fe8d56479dc883b4710bef1c2a3b9f51fd4a7d6e7da52e0cf1d15cb50
-  data.tar.gz: 7ca163e67e3675bf3d0a84b4f11cb57cf25c164b169d418164da94963cfdbdcb5d6cc8b8ae78fb5311e955119190b93d254c715e24a05de73f90974e6ed154dd
+  metadata.gz: 303c97a14c92ec6b0f6b0011726f8836a5d3cc2e096afc4fdcf991b3160e771015b4cf642fb781214b256d0119216a44710fbac4daab700c58950a0c01ca9a9d
+  data.tar.gz: 52a52c731cd43dbb56dad4910a26ea5e3e1658f919ff78e6e15d7bc57383e03841e0642c12e801585600abc89f9571dad895b66208703402c25e2a252da46b59

data/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.1.9] - 2022-11-xx
+## [2.1.11] - 2022-11-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.1.10] - 2022-11-30
+
+### Fixed
+  - `Eco::API::Session::Batch::Errors#errors`
+    - include errors with no `error` property in body (i.e. `!response.success?`)
+
+## [2.1.9] - 2022-11-29
+
+### Changed
+  - upgrade `ecoportal-api-v2` **gem** dependency
+  - upgrade `ecoportal-api-graphql` **gem** dependency
+
+### Fixed
+  - `Eco::API::Session::Batch::Job`
+    - Ability to skip prefilter of entries with no `id` on `:update`
+    - Enhanced error tracking (bug resilience)
+
 ## [2.1.8] - 2022-11-18
 
 ### Added

data/eco-helpers.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
 
   spec.add_dependency 'ecoportal-api', '>= 0.8.5', '< 0.9'
-  spec.add_dependency 'ecoportal-api-v2', '>= 0.9.6', '< 0.10'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.1.10', '< 0.2'
+  spec.add_dependency 'ecoportal-api-v2', '>= 0.9.7', '< 0.10'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.1.11', '< 0.2'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.7.6', '< 2.8'

data/lib/eco/api/error.rb

@@ -76,7 +76,6 @@ module Eco
           @str_err = "Unknown details field."
           @match   = /details \> (.+?) is an unknown field/
         end
-
       end
 
       class << self
@@ -135,7 +134,6 @@ module Eco
         @err_msg = err_msg
         @session = session
         @entry   = entry
-
         super(built_error)
       end
 

data/lib/eco/api/session/batch/errors.rb

@@ -84,16 +84,20 @@ module Eco
             entries.each_with_object([]) do |entry, arr|
               response = status[entry]
               if body = response.body
+                errs = []
                 if errs = body["errors"] || body["error"]
                   errs = [errs].flatten(1).compact
-                  errs.each do |msg|
-                    arr.push(ErrorCache.new(
-                      klass = Eco::API::Error.get_type(msg),
-                      klass.new(err_msg: msg, entry: entry, session: session),
-                      entry,
-                      response
-                    ))
-                  end
+                end
+                if errs.empty? && !response.success?
+                  errs = [body["response"]].flatten(1).compact
+                end
+                errs.each do |msg|
+                  arr.push(ErrorCache.new(
+                    klass = Eco::API::Error.get_type(msg),
+                    klass.new(err_msg: msg, entry: entry, session: session),
+                    entry,
+                    response
+                  ))
                 end
               end
             end
@@ -185,7 +189,6 @@ module Eco
               logger.error(str(key))
             end
           end
-
         end
       end
     end

data/lib/eco/api/session/batch/job.rb

@@ -34,7 +34,10 @@ module Eco
           # @param type [Symbol] a valid batch operation.
           # @param usecase [Eco::API::UseCases::UseCase, nil] when provided: `usecase` that generated this `batch job`.
           #   This is necessary to know the `options` used to run the usecase, which could modify the `Batch::Job` behviour.
-          def initialize(e, name:, type:, sets:, usecase: nil)
+          # @param accept_update_with_no_id [Boolean] temporary contingency
+          #   This parameter has been added due to a bug on server side.
+          #   An external_id is still required.
+          def initialize(e, name:, type:, sets:, usecase: nil, accept_update_with_no_id: false)
             raise "A name is required to refer a job. Given: #{name}" if !name
             raise "Type should be one of #{self.class.types}. Given: #{type}"    unless self.class.valid_type?(type)
             raise "Sets should be some of #{self.class.sets}. Given: #{sets}"    unless self.class.valid_sets?(sets)
@@ -46,6 +49,7 @@ module Eco
             @sets     = [sets].flatten.compact
             @usecase  = usecase
             @feedback = Eco::API::Session::Batch::Feedback.new(job: self)
+            @accept_update_with_no_id = accept_update_with_no_id
             reset
           end
 
@@ -244,12 +248,18 @@ module Eco
           #   - The contingency above wouldn't be necessary if the server worked perfectly.
           def processed_queue
             pre_filtered = @queue.select do |entry|
+              by_pass_filter = false
               if unexisting = entry.new? && !entry.id && type != :create
                 ref = Eco::API::Session::Batch::Feedback.person_ref(entry)
-                msg = "Job ('#{name}':#{type}): excluded unexisting entry (failed creation): #{ref}"
+                msg = "Job ('#{name}':#{type}): "
+                if (by_pass_filter = entry.external_id && @accept_update_with_no_id)
+                  msg << "entry errored on creation (failed creation) but will try with person code: #{ref}"
+                else
+                  msg << "excluded unexisting entry (failed creation): #{ref}"
+                end
                 session.logger.warn(msg)
               end
-              !unexisting
+              !unexisting || by_pass_filter
             end
             pre_filtered.each {|e| @callbacks[e].call(e) if @callbacks.key?(e) }
             apply_policies(api_included(pre_filtered)).select do |e|
@@ -321,9 +331,25 @@ module Eco
               status.queue.map do |entry|
                 if status.success?(entry)
                   if type == :create && entry.respond_to?(:id=)
-                    entry.id = status[entry].body["id"]
+                    entry.id = status[entry].body["id"].tap do |id|
+                      if id.to_s.strip.empty?
+                        ref = Eco::API::Session::Batch::Feedback.person_ref(entry)
+                        msg = "Entry has been created but API did not return its 'id': #{ref}"
+                        if response = status[entry]
+                          msg << " (Response - status: #{response.status.code}; body: #{response.body.pretty_inspect})"
+                        end
+                        logger.error(msg)
+                      end
+                    end
+                  end
+                  if entry.respond_to?(:consolidate!)
+                    entry.consolidate!
+                    if entry.respond_to?(:dirty?) && entry.dirty? && entry.respond_to?(:as_update)
+                      msg  = "After consolidate there's still a dirty model:\n"
+                      msg << entry.as_update.pretty_inspect
+                      logger.debug(msg)
+                    end
                   end
-                  entry.consolidate! if entry.respond_to?(:consolidate!)
                 #else # do not entry.reset! (keep track on changes still)
                 end
               end
@@ -370,7 +396,6 @@ module Eco
               subjobs.add(subjob, &block)
             end
           end
-
         end
       end
     end

data/lib/eco/api/session/batch/jobs.rb

@@ -49,9 +49,9 @@ module Eco
           #   - the block should only be passed when creating the job
           # @param [see @Eco::API::Session::Batch::Jobs#new]
           # @return [Eco::API::Session::Batch::Job]
-          def job(name, type: nil, sets: nil, usecase: nil, &block)
+          def job(name, type: nil, sets: nil, usecase: nil, accept_update_with_no_id: false, &block)
             fatal "Can't give a job post-launch callback &block to an already existing job" if exists?(name)
-            new(name, type: type, sets: sets, usecase: usecase, &block) unless exists?(name)
+            new(name, type: type, sets: sets, usecase: usecase, accept_update_with_no_id: accept_update_with_no_id, &block) unless exists?(name)
             self[name]
           end
 
@@ -61,10 +61,10 @@ module Eco
           # @yieldparam job [Eco::API::Session::Batch::Job] the job we have launched against the server.
           # @yieldparam status [Eco::API::Session::Batch::Status] the status of the batch job launch.
           # @return [Eco::API::Session::Batch::Job]
-          def new(name, type:, sets:, usecase: nil, &block)
+          def new(name, type:, sets:, usecase: nil, accept_update_with_no_id: false, &block)
             fatal "Can't create job named '#{name}' because it already exists." if exists?(name)
 
-            Batch::Job.new(enviro, name: name, type: type, sets: sets, usecase: usecase).tap do |job|
+            Batch::Job.new(enviro, name: name, type: type, sets: sets, usecase: usecase, accept_update_with_no_id: accept_update_with_no_id).tap do |job|
               add(job, &block)
             end
           end

data/lib/eco/api/session.rb

@@ -251,8 +251,8 @@ module Eco
       # Shortcut to create a job of certain type within a group
       # @param [see @Eco::API::Session::Batch::Jobs#new]
       # @return [Eco::API::Session::Batch::Job]
-      def new_job(group, name, type, usecase, sets = [:core, :details, :account], &block)
-        job_group(group).new(name, usecase: usecase, type: type, sets: sets, &block)
+      def new_job(group, name, type, usecase, sets = [:core, :details, :account], accept_update_with_no_id = false, &block)
+        job_group(group).new(name, usecase: usecase, type: type, sets: sets, accept_update_with_no_id: accept_update_with_no_id, &block)
       end
 
       # @see Eco::API::Session::Batch::JobsGroups#launch

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.1.8"
+  VERSION = "2.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.10
 platform: ruby
 authors:
 - Oscar Segura
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.2'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.2'