eco-helpers 2.6.2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0904af2dd434adc72c1ca3e889d4e0b11595ce991f6de1c997f613d80c8866ce'
-  data.tar.gz: b21748a878327830d5c813340ab2fcfe69ebace8137480bc9dfc42f290296cbf
+  metadata.gz: 0ecd2c2f2849623bb76d4eb53883c5d7564cb1bf1a3c6365b4d96d3de8c9c68e
+  data.tar.gz: 8e4ef9ddee2ca1d9750b9df3aabda5200d93e4a30216306dbe44d68b175883be
 SHA512:
-  metadata.gz: 2bccc140b8ec44d41aaccdffde8e5b51a1c755fc75dcede5e08526be6daed4482a5f733ceba6a75155f1dee74dbc8e2edc52ee9f2ab55f7ebf6521acfd3aac47
-  data.tar.gz: b362a14bf0a872ee04928ace6c05600df37ecfd56cb754b5f2a0cc3a417115cc8d9a889ce5f40de80ed41f281b16005eed78eadf04a330dc6fa80066baa56e63
+  metadata.gz: 68001b392d5eba8ee710bc315b88adc5c0111ff9b7b6e862e1037b31c10a4269e9453c0514eabb8768c46bf9e9e0128187d072e9eec5ed017b38920cde9fc3c0
+  data.tar.gz: 71904f2040ab00bf8cc4fd31b07fef8a80259de806ca63cff717c559c953ade2d99f76a4b336e9dbfc0c48a07ce94616fe49b9daf285cc488fcd3a8c8373281c

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.6.4] - 2024-03-xx
+
+### Added
+### Changed
+  - updated core **gem** `ecoportal-api`
+  - The `subordinates` core people property has been removed from the back-end
+    - This was due to some performance issues with org hierarchy model.
+    - As a consequence a temporary patch has been added temporarily in the current gem.
+
+### Fixed
+  - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
+    - initialize `@total_search_results`
+
+## [2.6.3] - 2024-02-29
+
+### Changed
+  - upgrade `ecoportal-api-v2` **gem**
+
+### Fixed
+  - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
+    - `dry_run_feedback` fixed typo
+
 ## [2.6.2] - 2024-02-23
 
 ### Added

data/eco-helpers.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard",      ">= 0.9.34", "< 1"
   spec.add_development_dependency "redcarpet", ">= 3.6.0",  "< 4"
 
-  spec.add_dependency 'ecoportal-api',         '>= 0.9.6', '< 0.10'
-  spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.5', '< 1.2'
+  spec.add_dependency 'ecoportal-api',         '>= 0.9.7', '< 0.10'
+  spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.6', '< 1.2'
   spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.13', '< 0.4'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'

data/lib/eco/api/common/version_patches/ecoportal_api/external_person.rb

@@ -6,12 +6,16 @@ module Eco
         attr_accessor :entry
 
         def identify(section = :person)
-          if entry && section == :entry
-            entry.to_s(:identify)
-          else
-            str_id = id ? "id: '#{id}'; " : ""
-            "'#{name}' (#{str_id}ext_id: '#{external_id}'; email: '#{email}')"
-          end
+          return entry.to_s(:identify) if entry && section == :entry
+          str_id = id ? "id: '#{id}'; " : ""
+          "'#{name}' (#{str_id}ext_id: '#{external_id}'; email: '#{email}')"
+        end
+
+        attr_writer :subordinates
+
+        # 2024-03-04 patch for API property deletetion
+        def subordinates
+          @subordinates ||= 0
         end
       end
       Ecoportal::API::V1::Person.include PersonPatch

data/lib/eco/api/microcases/set_supervisor.rb

@@ -38,17 +38,14 @@ module Eco
       def descrease_subordinates(person, by = 1)
         if person.is_a?(Ecoportal::API::V1::Person)
           person.subordinates -= by
-          #person.subordinates  = 0 if person.subordinates < 0
         end
       end
 
       def increase_subordinates(person, by = 1)
         if person.is_a?(Ecoportal::API::V1::Person)
-          #person.subordinates  = 0 if person.subordinates < 0
           person.subordinates += by
         end
       end
-
     end
   end
 end

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

@@ -6,7 +6,6 @@ class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::
 
   def to_row(person)
     data = super(person)
-    data << person.subordinates
     data << person_supervisor(person)
     data += user_abilities(person)
     data += user_permissions_custom(person) if options.dig(:export, :options, :permissions_custom)
@@ -39,7 +38,6 @@ class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::
 
   def spot_header(person = people.first)
     super(person) do |header|
-      header << "Subordinates"
       header << "Supervisor Name"
       header += abilities_header
       header += abilities_header("custom") if options.dig(:export, :options, :permissions_custom)

data/lib/eco/api/usecases/ooze_samples/helpers/rescuable.rb

@@ -8,12 +8,13 @@ module Eco
               private
 
               # Helper to prevent script from stopping
-              def with_rescue(reference)
+              def with_rescue(reference, trace_count: 1)
                 raise ArgumentError, "Expecting block, but not given" unless block_given?
                 yield
-              rescue StandardError => e
+              rescue StandardError => err
+                str_err = err.patch_full_message(trace_count: trace_count)
                 log(:error) {
-                  [reference, e.message].join(' => \n')
+                  [reference, str_err].join(" => \n")
                 }
                 lines = []
                 lines << "\nThere was an error. Choose one option:\n"

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

@@ -151,7 +151,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
     @ooze_create_attempts += 1
 
     if dry_run?
-      dry_run_feedback(ooze)
+      dry_run_feedback(draft)
       false
     else
       apiv2.pages.create(draft, from: template_id).tap do |result|
@@ -204,6 +204,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
   end
 
   def init_kpis
+    @total_search_oozes     = 0
     @retrieved_oozes        = 0
     @non_retrieved_oozes    = 0
     @dupped_search_oozes    = 0

data/lib/eco/cli_default/input_filters.rb

@@ -40,11 +40,6 @@ ASSETS.cli.config do |cnf|
       end
     end
 
-    #filters.add("-input-supervisors") do |people, session, options|
-    #  options.deep_merge!(input: {filter: {subordinates: true}})
-    #  people.newFrom people.to_a.select {|person| person.subordinates > 0}
-    #end
-
     filters.add("-input-supervisor-id", "only those with certain supervisor id or external_id") do |input, session, options|
       id     = SCR.get_arg("-input-supervisor-id", with_param: true)
       options.deep_merge!(input: {filter: {supervisor_id: id}})

data/lib/eco/cli_default/people_filters.rb

@@ -21,10 +21,10 @@ ASSETS.cli.config do |cnf|
       people.external_id_present(false)
     end
 
-    filters.add("-supervisors", "only those that have subordinates") do |people, session, options|
-      options.deep_merge!(people: {filter: {subordinates: true}})
-      people.newFrom people.to_a.select {|person| person.subordinates > 0}
-    end
+    # filters.add("-supervisors", "only those that have subordinates") do |people, session, options|
+    #   options.deep_merge!(people: {filter: {subordinates: true}})
+    #   people.newFrom people.to_a.select {|person| person.subordinates > 0}
+    # end
 
     filters.add("-supervisor-id", "only those with certain supervisor") do |people, session, options|
       id     = SCR.get_arg("-supervisor-id", with_param: true)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.6.2"
+  VERSION = "2.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.4
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 0.9.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.2'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.2'