eco-helpers 2.1.7 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57558123bd83d606799604772ef717673f58bd089efc90458116a3126b1742f4
-  data.tar.gz: 99ec5e1bf52f4cd3ce3bbab5da60c64bfb42aa7742dfbe85897b40bfd6c76471
+  metadata.gz: dac932bad9c679aa2f0c5aaa3a5c33ed16f04bde3ca37c55e6b19ae2cae6a418
+  data.tar.gz: 7d533e95f2738ba4633ac4e62ea06ff414de63b059fbc5f532b2fde4d5940233
 SHA512:
-  metadata.gz: 4d5bbe4a67ec3b9f18025877ecc3ce8735a8e816be686a17deee58be2e9f1d1c35b54b73a004440210905b113230224c8ce9f2b225746e7bf7c276b274f67b5e
-  data.tar.gz: 3d492d4ead671bc288621135e197ee3ce42ed40a10b73546ca7b8f3c3b9d137c2048105beda464d2d7b0d443dde510f3c86edac0bdb68f5262ae434f063864f8
+  metadata.gz: 3bfb8e874d539c0a8d24ba1a4858130fb48c2a6e905f425bf7ca530d29c05bb01fd371a8d0fa58a9c736bd82f18409867461c6e3f3e2405a5135a700ad4f7784
+  data.tar.gz: a707033b2e34ca9fbc5c98514319a5d2d034aa8f37d6fd7b81ffa2d0eaddd516c9aac4471393284334225c03b7c75cdcc0cc2ac8938530cb8d53e5de23f52d68

data/CHANGELOG.md

@@ -1,12 +1,34 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.1.8] - 2022-11-xx
+## [2.1.10] - 2022-11-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [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
+  - `Eco::API::UseCases::OozeSamples::RegisterMigrationCase`
+    - When in `dry-run` mode, it adds one line before creation feedback, so it is clear the feedback is about creation (i.e. none of the source entries got mistakenly updated)
+  - **enhanced** `Eco::API::UseCases::OozeSamples::OozeBaseCase#with_fields`
+    - It allows to optionally pass as first parameter a section or a stage (default: ooze)
+
+### Changed
+  - upgraded gem dependency `ecoportal-api-v2`
+
 ## [2.1.7] - 2022-11-17
 
 ### 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.5', '< 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/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

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/api/usecases/ooze_samples/ooze_base_case.rb

@@ -70,8 +70,14 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
 
   def with_fields(entry = target, type: nil, label: nil)
     flds = entry.components
-    flds = flds.get_by_type(type) if type
-    flds = flds.select do |fld|
+    if type
+      if flds.respond_to?(:get_by_type)
+        flds = flds.get_by_type(type)
+      else
+        flds = flds.select {|fld| fld.type == type}
+      end
+    end
+    flds.select do |fld|
       value = (label == :unnamed) ? nil : label
       !label || same_string?(fld.label, value)
     end.each do |field|

data/lib/eco/api/usecases/ooze_samples/register_migration_case.rb

@@ -160,6 +160,7 @@ class Eco::API::UseCases::OozeSamples::RegisterMigrationCase < Eco::API::UseCase
       if !options[:dry_run]
         create_ooze(draft, template_id: from).page_id
       else
+        logger.info("Creation sample follows...")
         dry_run_feedback(draft)
         false
       end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.1.7"
+  VERSION = "2.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.9
 platform: ruby
 authors:
 - Oscar Segura
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        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'