eco-helpers 3.2.2 → 3.2.3

data/lib/eco/api/usecases/graphql/samples/location/command/service/tree_update.rb

@@ -9,7 +9,6 @@ class Eco::API::UseCases::GraphQL::Samples::Location
         def included(base)
           super
 
-          base.send :include, Eco::API::UseCases::GraphQL::Samples::Location::Service::TreeDiff
           base.send :include, Eco::API::UseCases::GraphQL::Samples::Location::Command::DSL
           base.send :include, Eco::API::UseCases::GraphQL::Utils::Sftp
           base.send :include, InstanceMethods
@@ -22,43 +21,9 @@ class Eco::API::UseCases::GraphQL::Samples::Location
             super
           end
         ensure
-          rescued { re_archive } unless exception?
           rescued { email_digest('TagTree Update') }
         end
 
-        # Before closing, run RE-ARCHIVE: those that where unarchived via archivedToken
-        # that should remain archived.
-        # @note this is an additional necessary step
-        def re_archive
-          return if simulate?
-          return if exception?
-
-          stage = :rearchive
-
-          nodes_diff_class.new(
-            hash_list(current_tree),
-            file_nodes_list,
-            original_tree: current_tree,
-            logger:        logger
-          ).tap do |nodes_diff|
-            archive_input = input(
-              nodes_diff.stage_commands(:archive),
-              force_continue: true
-            )
-
-            sliced_batches(
-              archive_input,
-              desc:            stage,
-              track_tree_mode: :once
-            ) do |sliced_input, response, page, pages, count, total| # rubocop:disable Metrics/ParameterLists
-              page_results = request_results_class.new(sliced_input, response)
-              (results[stage] ||= []) << page_results
-
-              self.error ||= page_errors?(page_results, page, pages, count, total, stage: stage)
-            end
-          end
-        end
-
         private
 
         # Work with adapted diff builders.
@@ -66,18 +31,6 @@ class Eco::API::UseCases::GraphQL::Samples::Location
           Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diffs
         end
 
-        def inputs(nodes_diff = comparer, force_continue: force_continue?)
-          {}.tap do |sequence|
-            nodes_diff.commands do |comms, stage|
-              sequence[stage] = input(comms, force_continue: force_continue)
-            end
-          end.tap do |sequence|
-            sequence.each do |stage, input|
-              yield(input, stage) if block_given?
-            end
-          end
-        end
-
         # Generates the file and pushes to the SFTP folder
         # @note it also displays the mappings on screen
         # @note the SFTP push only happens if `remote_subfolder` is defined, via:
@@ -106,10 +59,6 @@ class Eco::API::UseCases::GraphQL::Samples::Location
             options.deep_merge!({worfklow: {no_email: true}})
           end
         end
-
-        def print_diff_details?
-          false
-        end
       end
     end
   end

data/lib/eco/api/usecases/graphql/samples/location/command/track_changed_ids.rb

@@ -28,7 +28,7 @@ class Eco::API::UseCases::GraphQL::Samples::Location
     # @note this method used to only work if we could run cummulative dry-runs to the back-end.
     #   However, after RS P3, as mappings are one-to-one (not many-to-many per row),
     #   we can just display the mappings in dry-run as well.
-    def close_handling_tags_remap_csv
+    def close_handling_tags_remap_csv # rubocop:disable Naming/PredicateMethod
       if tags_remap_table.any?
         puts "REMAP LOC IDs CSV (content):"
         puts tags_remap_table
@@ -44,21 +44,13 @@ class Eco::API::UseCases::GraphQL::Samples::Location
     # @note The only update operation that generate tag remaps
     #   is `:id` (or `:id_name`).
     # @return [Boolean] whether new maps were inserted to the tracking table
-    def update_tags_remap_table(results, stage, ref_tree = nil)
-      return false unless %i[id id_name].include?(stage)
+    def update_tags_remap_table(command)
+      prev_id, new_id = command.values_at(:nodeId, :newId)
 
-      msg = "Expecting CommandResults object. Given: #{results.class}"
-      raise msg unless results.is_a?(request_results_class)
+      return if new_id.nil? # not an id change
+      return if prev_id == new_id
 
-      target = simulate?? results.results : results.applied
-
-      target.each do |result|
-        prev_id, new_id = result.command_input_data.values_at(:nodeId, :newId)
-        next if new_id.nil? # not an id change
-        next if prev_id == new_id
-
-        tags_remap_table << [[prev_id], [new_id]]
-      end
+      tags_remap_table << [[prev_id], [new_id]]
     end
 
     # Generates the final tags remap file

data/lib/eco/api/usecases/graphql/samples/location/command.rb

@@ -1,7 +1,7 @@
 # Use case to launch updates to a tagtree (i.e. upload new locations)
 module Eco::API::UseCases::GraphQL::Samples
   class Location::Command < Eco::API::UseCases::GraphQL::Samples::Location
-    name "location-command"
+    name 'location-command'
 
     require_relative 'command/results'
     require_relative 'command/track_changed_ids'

data/lib/eco/api/usecases/graphql/samples/location/service/tree_diff/convertible/inputable.rb

@@ -38,7 +38,10 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
 
         #@note via Eco::Data::Files
         def csv_files
-          self.class.csv_files(input_folder, regexp: input_file_pattern)
+          self.class.csv_files(
+            input_folder,
+            regexp: input_file_pattern
+          )
         end
 
         def input_file_pattern

data/lib/eco/api/usecases/graphql/samples/location/service/tree_diff.rb

@@ -53,6 +53,8 @@ module Eco::API::UseCases::GraphQL::Samples
 
       def process
         with_error_handling do
+          next unless compare_live_with_file?
+
           compare
         end
       end
@@ -87,6 +89,10 @@ module Eco::API::UseCases::GraphQL::Samples
         Eco::Data::Locations::NodeDiff::NodesDiff
       end
 
+      def compare_live_with_file?
+        true
+      end
+
       def print_diff_details?
         true
       end

data/lib/eco/api/usecases/graphql/samples/location/service/tree_to_list/converter/input.rb

@@ -6,6 +6,7 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
 
         private
 
+        # @todo this name is confusing. It is actually the `current_tagtree` :D
         def input_tagtree
           @input_tagtree ||= live_tree
         end

data/lib/eco/api/usecases/lib/error_handling.rb

@@ -30,7 +30,7 @@ module Eco::API::UseCases::Lib
     def rescued
       yield
     rescue StandardError => err
-      self.exception ||= err
+      @exception ||= err
 
       return unless exception_already_captured?(err)
 

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

@@ -42,6 +42,7 @@ module Eco
             class << self
               def included(base)
                 super
+
                 validate_base_type!(base)
                 base.include(InstanceMethods)
               end

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

@@ -40,6 +40,7 @@ module Eco
             class << self
               def included(base)
                 super
+
                 validate_base_type!(base)
                 base.include(InstanceMethods)
               end

data/lib/eco/data/hashes/array_diff.rb

@@ -95,14 +95,24 @@ module Eco
           when String
             to_array_of_hashes(Eco::CSV.parse(content))
           when Enumerable
-            sample = content.to_a.first
+            content_ary = content.to_a
+            content_cnt = content_ary.count
+            sample      = content_ary.first
+
             case sample
             when Hash, Array, ::CSV::Row
               Eco::CSV::Table.new(content).to_array_of_hashes
             else
-              log(:error) {
-                "(ArrayDiff) Input content 'Array' of '#{sample.class}' is not supported."
-              }
+              if content_cnt.zero?
+                log(:error) {
+                  "Inpout should not be empty"
+                }
+              else
+                log(:error) {
+                  "(ArrayDiff) Input content 'Array' of '#{sample.class}' is not supported."
+                }
+              end
+
               exit(1)
             end
           else

data/lib/eco/data/locations/node_base/csv_convert.rb

@@ -15,6 +15,7 @@ module Eco::Data::Locations::NodeBase
     def hash_list(value, &block)
       return hash_list(org_tree(value), &block) if value.is_a?(::CSV::Table)
       return value.as_nodes_json(&block)        if value.is_a?(tree_class)
+
       raise ArgumentError, "Expecting Eco::API::Organization::TagTree or CSV::Table. Given: #{value.class}"
     end
 
@@ -28,6 +29,7 @@ module Eco::Data::Locations::NodeBase
     def hash_tree(value, &block)
       return hash_tree_from_csv(value, &block) if value.is_a?(::CSV::Table)
       return value.as_json(&block)             if value.is_a?(tree_class)
+
       raise ArgumentError, "Expecting Eco::API::Organization::TagTree or CSV::Table. Given: #{value.class}"
     end
 
@@ -40,6 +42,7 @@ module Eco::Data::Locations::NodeBase
     def org_tree(value, &block)
       return tree_class.new(hash_tree(value), &block) if value.is_a?(::CSV::Table)
       return tree_class.new(value.as_json)            if value.is_a?(tree_class)
+
       raise ArgumentError, "Expecting Eco::API::Organization::TagTree or CSV::Table. Given: #{value.class}"
     end
 
@@ -49,7 +52,12 @@ module Eco::Data::Locations::NodeBase
     # @yieldreturn [Hash] the serialized Node
     # @return [CSV::Table] a table with L1 to Ln columns ready for dump to csv
     def csv_tree(value, encoding: 'utf-8', attrs: [:id], &block) # rubocop:disable Lint/UnusedMethodArgument
-      Eco::CSV::Table.new(hash_tree_to_tree_csv(hash_tree(value, &block), attrs: attrs))
+      Eco::CSV::Table.new(
+        hash_tree_to_tree_csv(
+          hash_tree(value, &block),
+          attrs: attrs
+        )
+      )
     end
 
     # @note it just converts to an organizational tagtree and uses a helper method.

data/lib/eco/data/locations/node_diff/nodes_diff.rb

@@ -20,10 +20,16 @@ class Eco::Data::Locations::NodeDiff
 
     def initialize(*args, original_tree:, **kargs, &block)
       super(*args, **kargs, &block)
+
       @original_tree = original_tree
       mark_implicit_unarchive!
     end
 
+    def any?
+      diffs.any?
+    end
+    alias_method :any_diff?, :any?
+
     def diffs
       @diffs ||= super.select do |dff|
         # discard entries that are to be inserted and archived at the same time

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-11 00:00:00.000000000 Z
+date: 2025-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -243,7 +243,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: 0.10.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.11
+        version: 0.10.14
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-graphql
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-v2
   requirement: !ruby/object:Gem::Requirement
@@ -845,7 +845,9 @@ files:
 - lib/eco/api/usecases/graphql/helpers/location/command/diffs/stages/diff_sortable/for_unarchive.rb
 - lib/eco/api/usecases/graphql/helpers/location/command/diffs/stages/sortable.rb
 - lib/eco/api/usecases/graphql/helpers/location/command/diffs/stages/sortable/relation_safe_sort.rb
-- lib/eco/api/usecases/graphql/helpers/location/command/optimizations.rb
+- lib/eco/api/usecases/graphql/helpers/location/command/end_points.rb
+- lib/eco/api/usecases/graphql/helpers/location/command/end_points/optimizations.rb
+- lib/eco/api/usecases/graphql/helpers/location/command/input_unit_response.rb
 - lib/eco/api/usecases/graphql/helpers/location/command/result.rb
 - lib/eco/api/usecases/graphql/helpers/location/command/results.rb
 - lib/eco/api/usecases/graphql/helpers/location/tags_remap.rb

data/lib/eco/api/usecases/graphql/helpers/location/command/optimizations.rb

@@ -1,84 +0,0 @@
-module Eco::API::UseCases::GraphQL::Helpers::Location
-  module Command::Optimizations
-    DEFAULT_COMMANDS_PER_PAGE = 45
-    DEFAULT_FORCE_CONTINUE    = false
-
-    # Available options are:
-    #   - :per_request -> on each request
-    #   - :per_batch   -> at the end of each batch / stage (on last page)
-    #   - :once        -> only when the script starts to run
-    def default_tree_tracking_mode
-      :per_request
-    end
-
-    # Helper to identify the commands payload block
-    # @note
-    #   1. Gives flexibility on at what time the structure should be retrieved
-    #   2. This increases performacne, as we don't retrieve the full tree on
-    #     each request unless necessary/specified
-    #   3. `nil` falls the block back to the `ecoportal-api-graphql` gem, which
-    #     has a default block that retrieves the structure
-    # @return [Proc, NilClass] the payload block
-    def scope_commands_block(idx, total, track_tree_mode: default_tree_tracking_mode)
-      case track_tree_mode
-      when :per_request
-        nil
-      when :once
-        commands_payload_without_structure_block
-      when :per_batch
-        return nil if idx == total
-        commands_payload_without_structure_block
-      end
-    end
-
-    # Prevents each request from timing out
-    def commands_per_page
-      if self.class.const_defined?(:COMMANDS_PER_PAGE)
-        self.class::COMMANDS_PER_PAGE
-      else
-        DEFAULT_COMMANDS_PER_PAGE
-      end
-    end
-
-    # Whether to stop or continue on command fail
-    def force_continue?
-      if self.class.const_defined?(:FORCE_CONTINUE)
-        self.class::FORCE_CONTINUE
-      else
-        DEFAULT_FORCE_CONTINUE
-      end
-    end
-
-    # Commands payload without querying Structure
-    # @note this servces the purpose of optimizing/speeding up the requests.
-    def commands_payload_without_structure_block
-      proc {
-        clientMutationId
-        error { # rubocop:disable Style/BlockDelimiters
-          message
-          conflictingIds
-          validationErrors { # rubocop:disable Style/BlockDelimiters
-            error
-            message
-          }
-        }
-        results { # rubocop:disable Style/BlockDelimiters
-          command { # rubocop:disable Style/BlockDelimiters
-            id
-            state
-            __typename
-          }
-          ok
-          error { # rubocop:disable Style/BlockDelimiters
-            conflictingIds
-            message
-            validationErrors { # rubocop:disable Style/BlockDelimiters
-              error
-              message
-            }
-          }
-        }
-      }
-    end
-  end
-end