eco-helpers 2.1.9 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac932bad9c679aa2f0c5aaa3a5c33ed16f04bde3ca37c55e6b19ae2cae6a418
-  data.tar.gz: 7d533e95f2738ba4633ac4e62ea06ff414de63b059fbc5f532b2fde4d5940233
+  metadata.gz: fe9a800859ad998e9d89ef67bf62bf00f9a300f05ff8ebf7491be210d1d5056e
+  data.tar.gz: 37ca33fede2bd9f642da312ff5bcbbac20b583509d09b3418357dd47e6b52d06
 SHA512:
-  metadata.gz: 3bfb8e874d539c0a8d24ba1a4858130fb48c2a6e905f425bf7ca530d29c05bb01fd371a8d0fa58a9c736bd82f18409867461c6e3f3e2405a5135a700ad4f7784
-  data.tar.gz: a707033b2e34ca9fbc5c98514319a5d2d034aa8f37d6fd7b81ffa2d0eaddd516c9aac4471393284334225c03b7c75cdcc0cc2ac8938530cb8d53e5de23f52d68
+  metadata.gz: 289fed1d974aee2a906ccf6d5dbee843da583e0a5ba1ff4a85df180057c5f42477ffb60b280cd20ad09d7efb0994017d60685cf05cd402b3a5835bbedabe8e38
+  data.tar.gz: 26d36e3d9647f1f35168375383eece7694ca0829a2550118ee3f22d793f1ea21886e7232f2532b35329ba5b12d19754290676ee200f13d6f9407a2f3596d1668

data/CHANGELOG.md

@@ -1,12 +1,25 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.1.10] - 2022-11-xx
+## [2.1.12] - 2022-11-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.1.11] - 2022-11-30
+
+### Changed
+  - Bring the `-set-supervisor` native case up to date
+  - `Eco::API::Session::Batch::Errors#errors`
+    - better error catching and description
+
+## [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

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

@@ -81,19 +81,29 @@ module Eco
           #   3. `entry` -> the entry that generated the error
           #   4. `response` -> the original response from the server that carries the error
           def errors
+            require 'byebug'
             entries.each_with_object([]) do |entry, arr|
               response = status[entry]
               if body = response.body
-                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
-                    ))
+                errs = []
+                case body
+                when Hash
+                  if errs = (body["errors"] || body["error"])
+                    errs = [errs].flatten(1).compact
                   end
+                  if errs.empty? && !response.success?
+                    errs = [body["response"]].flatten(1).compact
+                  end
+                when String
+                  errs = [body]
+                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
@@ -174,7 +184,7 @@ module Eco
               i        = to_index(key)
               entry    = queue.to_a[i]
               response = status[i]
-              msg      = "Error #{response.status}: #{response.body}\n"
+              msg      = "Error #{response.status} (#{response.status.reason}): #{response.body}\n"
               msg     += "-- Failed to batch #{method}. Person: #{person_ref(entry)}"
             end
             msg
@@ -185,7 +195,6 @@ module Eco
               logger.error(str(key))
             end
           end
-
         end
       end
     end

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

@@ -396,7 +396,6 @@ module Eco
               subjobs.add(subjob, &block)
             end
           end
-
         end
       end
     end

data/lib/eco/api/usecases/default_cases/set_supervisor_case.rb

@@ -7,17 +7,11 @@ class Eco::API::UseCases::DefaultCases::SetSupervisorCase < Eco::API::Common::Lo
     update   = session.new_job("main", "update", :update, usecase)
 
     micro.with_each_present(entries, people, options, log_starter: true) do |entry, person|
-      micro.with_supervisor(entry.supervisor_id, people) do |supervisor|
-        if supervisor
-          update.add(person)
-          person.supervisor_id = supervisor.id unless options.dig(:exclude, :supervisor)
-        else
-          unless !entry.supervisor_id
-            session.logger.warn("Supervisor '#{entry.supervisor_id}' does not exist. Entry: #{entry.to_s(:identify)}")
-          end
+      if entry.supervisor_id?
+        micro.set_supervisor(person, entry.supervisor_id, people, options) do |unknown_id|
+          session.logger.warn("Supervisor '#{entry.supervisor_id}' does not exist. Entry: #{entry.to_s(:identify)}")
         end
       end
     end
   end
-
 end

data/lib/eco/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.11
 platform: ruby
 authors:
 - Oscar Segura