eco-helpers 2.7.7 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6610ab2a1e5ce009eedeac2deafb3232d3c8266123b6f8784b5f4542e4f4b24b
-  data.tar.gz: 809cab1fd71f909e04fa16a3ac84cc053d564b1888511defc91126b9765b4008
+  metadata.gz: 41e63439f7a3d89c5e3c9e10be328b9487ecffe4dde6a83a6fd6f9a561d924a8
+  data.tar.gz: bafc6c443ce57b2611c177b00eca9aca0fd06718712511eb2b93762ff957179b
 SHA512:
-  metadata.gz: bdfdf7afeff13f228c47febc677e6c39f8639dc4bdb6f0bee60d836418a8f14a1dc9ac9919fc7c5986d20386203719db597418e03f1c3dad82a755016a5ae4a1
-  data.tar.gz: 868e92852ec88fd3315080883f4c4854ef80ec04ca85d46c76ac62e995233e225dcf99b9ceadb51436546400968e72152933163dfdfb244a5e7d0151df89361f
+  metadata.gz: '0094ce51df0b47838a44b679fe82a4acacfc64953edeea38ef2c51b6efeb08f0629f019751b319542dddcac5e77838786cdd1b7333b16babb0bf02ad4e197fb3'
+  data.tar.gz: ee5243547b98cdeabba4cf1fdbbd8759b0f24d1e5ea4f4e42b998569ebe0c00bf3d5139ef2c28886bfa96efe6cd7e65344245b4eb6d7c9bb0a08964d075ddd12

data/CHANGELOG.md

@@ -1,16 +1,42 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.7.8] - 2024-05-xx
+## [2.7.10] - 2024-05-xx
 
 ### Added
 ### Changed
 ### Fixed
 
-## [2.7.7] - 2024-05-16
+## [2.7.9] - 2024-05-16
+
+### Fixed
+  - `Eco::Data::Locations::NodeDiff::NodesDiff#unarchive`
+    - It must include archived nodes that will receive new children
+
+## [2.7.8] - 2024-05-16
 
 ### Added
+  - `Eco::API::UseCases::GraphQL::Helpers::Location::Command:Result`
+    - Feedback original command.
+
 ### Changed
+  - upgraded `ecoportal-api-graphql` gem
+  - able to skip email via options (`-no-email`)
+
+## [2.7.8] - 2024-05-xx
+
+### Added
+  - `Eco::API::UseCases::GraphQL::Helpers::Location::Command:Result`
+    - Feedback original command.
+
+### Changed
+  - upgraded `ecoportal-api-graphql` gem
+  - able to skip email via options (`-no-email`)
+
+### Fixed
+
+## [2.7.7] - 2024-05-16
+
 ### Fixed
   - `Eco::API::UseCases::OozeSamples::TargetOozesUpdateCase`
     - default prompt to user to `Y` when in remote mode.

data/eco-helpers.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ecoportal-api',         '>= 0.9.8', '< 0.10'
   spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.8', '< 1.2'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.17', '< 0.4'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.18', '< 0.4'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'

data/lib/eco/api/common/people/default_parsers/date_parser.rb

@@ -24,7 +24,7 @@ class Eco::API::Common::People::DefaultParsers::DateParser < Eco::API::Common::L
     date = Date.parse(value)
     return date if valid_range?(date)
 
-    wrong!(value, attr: attr, desc: 'Date out of range (1900-2099). Given: ')
+    wrong!(value, attr: attr, desc: 'Date out of range (1900-2099). Given:')
   rescue TypeError, Date::Error
     nil
   end

data/lib/eco/api/usecases/graphql/base.rb

@@ -9,7 +9,6 @@ class Eco::API::UseCases::GraphQL::Base < Eco::API::Common::Loaders::UseCase
   include Eco::Language::Methods::CallDetector
 
   def main(_sess, options, _case)
-    options.deep_merge!(workflow: {no_email: true}) # prevent the default mailer to quick in
     options[:end_get] = false
     process
   end

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

@@ -35,8 +35,10 @@ class Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diff
             h['parentId'] = after_id_update ? parent_id : parent_id_prev
           end
         else
+          return h if marked_for_unarchive?
+
           # Something is wrong (not expected to be any other category)
-          raise "Unexpected condition, please review code base"
+          raise "Please review code base, unexpected condition for #{h.pretty_inspect}"
         end
       end
     end

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

@@ -41,13 +41,16 @@ module Eco::API::UseCases::GraphQL::Helpers::Location::Command
 
     def error_msg
       return nil unless error?
-      msg  = ''
-      msg << "(#{command} '#{node_id}') #{error.message}\n"
-      return msg if error.validationErrors.empty?
 
-      msg << "  • "
-      msg << error.validationErrors.map(&:message).join("\n  • ")
-      msg
+      msg  = []
+      msg << "(#{command} '#{node_id}') #{error.message}"
+
+      feed = []
+      feed.concat(error.validationErrors.map(&:message)) unless error.validationErrors.empty?
+      feed << "Command: #{command_input_data.pretty_inspect}"
+
+      msg  << "  • #{feed.join("\n  • ")}"
+      msg.join("\n")
     end
 
     def command_result

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

@@ -66,7 +66,7 @@ module Eco::API::UseCases::GraphQL::Helpers::Location::Command
     end
 
     def errored?
-      !errored.empty?
+      errored.any?
     end
 
     def first_errored

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

@@ -82,6 +82,8 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
         def email_digest(title)
           return if simulate?
+          return if options.dig(:workflow, :no_email)
+
           digest_msgs = logger.cache.logs(level: %i[info error warn])
           exception   = exception ? " - Exception!" : ''
           subject     = "#{config.active_enviro} - #{title}#{exception}"

data/lib/eco/cli_default/options.rb

@@ -1,8 +1,8 @@
-ASSETS.cli.config do |cnf|
-  cnf.options_set do |options_set, options|
-    options_set.add("--help", "Offers a HELP") do |options, sesssion|
+ASSETS.cli.config do |cnf| # rubocop:disable Metrics/BlockLength
+  cnf.options_set do |options_set, options| # rubocop:disable Metrics/BlockLength
+    options_set.add("--help", "Offers a HELP") do |options, session|
       conf   = ASSETS.cli.config
-      active = Proc.new do |opt|
+      active = proc do |opt|
         if there = SCR.get_arg(opt)
           refine = SCR.get_arg(opt, with_param: true)
         end
@@ -37,7 +37,7 @@ ASSETS.cli.config do |cnf|
     desc = "Redirect Standard Ouput to file"
     options_set.add("-stdout", desc) do |options, session|
       file = SCR.get_arg("-stdout", with_param: true) || "output.txt"
-      STDOUT.reopen(file, "w+")
+      $stdout.reopen(file, "w+")
     end
 
     desc = "Skips the check of the headers"
@@ -125,14 +125,14 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(report: {people: {csv: file}})
     end
 
-    desc  = "Runs in dry-run (no requests sent to server)"
+    desc = "Runs in dry-run (no requests sent to server)"
     options_set.add(["-dry-run", "-simulate"], desc) do |options, session|
       options[:dry_run]  = true
       options[:simulate] = true
       session.config.dry_run!
     end
 
-    desc  = "Runs runs post_launch cases even if in dry-run"
+    desc = "Runs runs post_launch cases even if in dry-run"
     options_set.add("-run-postlaunch", desc) do |options, session|
       options.deep_merge!(post_launch: {run: true})
     end
@@ -181,6 +181,11 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(search: {soft: true, strict: false})
     end
 
+    desc = "Prevent email to be sent (experimental)"
+    options_set.add("-no-email", desc) do |options|
+      options.deep_merge!(workflow: {no_email: true})
+    end
+
     desc = "Silence notifications on account creation or invites"
     options_set.add(["-no-invites", "-exclude-invites"], desc) do |options|
       options.merge!(send_invites: false)

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

@@ -20,8 +20,8 @@ class Eco::Data::Locations::NodeDiff
       def attr_expose(*attrs)
         attrs.each do |attr|
           meth  = attr.to_sym
-          methp = "#{meth}_prev".to_sym
-          methq = "#{meth}?".to_sym
+          methp = :"#{meth}_prev"
+          methq = :"#{meth}?"
 
           # current value
           define_method meth do

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

@@ -5,8 +5,9 @@ class Eco::Data::Locations::NodeDiff::NodesDiff
     # @note the selector method name with a question mark should exist in the `diff_result_class`
     def selector(*attrs)
       attrs.each do |attr|
-        meth  = attr.to_sym
-        methq = "#{meth}?".to_sym
+        meth = attr.to_sym
+        methq = :"#{meth}?"
+
         define_method meth do
           diffs.select(&methq)
         end

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

@@ -21,6 +21,7 @@ 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 diffs
@@ -95,6 +96,14 @@ class Eco::Data::Locations::NodeDiff
       msg.compact.join("\n")
     end
 
+    alias_method :unarchive_src, :unarchive
+
+    # @note we must unarchive destination parents that will get
+    #   some children as well
+    def unarchive
+      unarchive_src | @implicit_unarchive
+    end
+
     private
 
     def when_present(list, default = nil)
@@ -103,5 +112,26 @@ class Eco::Data::Locations::NodeDiff
       return yield(count) if count&.positive?
       default
     end
+
+    def mark_implicit_unarchive!
+      @implicit_unarchive = source_results.select do |result|
+        result.archived_prev && implicit_unarchive?(result)
+      end.tap do |results|
+        results.each(&:unarchive!)
+      end
+    end
+
+    def implicit_unarchive?(result)
+      [result.node_id, result.node_id_prev].compact.any? do |id|
+        target_parent_ids.include?(id)
+      end
+    end
+
+    def target_parent_ids
+      return @target_parent_ids if instance_variable_defined?(:@target_parent_ids)
+
+      @target_parent_ids  = insert.map(&:parent_id).uniq
+      @target_parent_ids |= move.map(&:parent_id)
+    end
   end
 end

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

@@ -59,8 +59,17 @@ module Eco::Data::Locations
       parent_id?
     end
 
+    def unarchive!
+      @marked_for_unarchived = true
+    end
+
+    def marked_for_unarchive?
+      @marked_for_unarchived || false
+    end
+
     # Has the `archived` property changed and it was `true`?
     def unarchive?
+      return true  if     marked_for_unarchive?
       return false if     archived
       return false unless update?
       archived?

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.7'.freeze
+  VERSION = '2.7.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.7.9
 platform: ruby
 authors:
 - Oscar Segura
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.3.18
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.3.18
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'