eco-helpers 2.0.10 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8ca1a088cf60b7608e9f92da680a631c73228ae92fed33484b5669c480350fb
-  data.tar.gz: 6733d55fbdcf24c2766529c275f86f3132f1c3232b4c8d31f34880f9253dbc82
+  metadata.gz: 9ea76fb273e572c873b2f23348c54b56fd4e51cd39d9bf1109ddbc4594ba260f
+  data.tar.gz: 56d64b1eb28202f4bd18997ff8854fdd6ae36c758217796f4739012f59d4ef5c
 SHA512:
-  metadata.gz: d1cdc2aacd52c590230fe606b079d91e6f3dea01ddbd8857d48170467bbfd089ffa7081c8630aac93ebae4c6e3b8125a446cd7ddc8a6b290c174e906661b2474
-  data.tar.gz: 356ccf7e50d3f0e12f9ad1dde6f1fe7ad4fd13205334f9319cecd45736f110684eb404113512aca4b1d2c49070fe61eb48b1e69c3ae13f423ae8895288ea0d2d
+  metadata.gz: bf49254f9b3f162f278d65f734fba3d3f683906cb1202df4d4cc4f7a90f2d663655e5168cf5bdea13d78b63d8ece32bcd22541655b001f3a9bfad429d89d2de8
+  data.tar.gz: 3dcd85969e34079aa050546e427ebe0d28cb7ec358b121f066cd603af23c9c44bb05551ce8db061f1721832981c2b74c1a46aa095c031f9ea0fb8b29b1b65310

data/CHANGELOG.md

@@ -1,7 +1,47 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.10] - 2021-03-xx
+## [2.0.15] - 2021-04-xx
+
+### Added
+  - Use case `Eco::API::UseCases::DefaultCases::SupersHierarchy`, invokable via `-supers-hiearchy`
+### Changed
+### Fixed
+  - `eco/cli/config/default/workflow.rb` prevent `rescue` looping
+
+## [2.0.14] - 2021-04-15
+
+### Added
+  - `Eco::API::UseCases::DefaultCases::ToCsvCase` added option `-internal-names` to avoid overriding data on export
+  - `Eco::API::Common::People::PersonEntry#mapped_entry` exposed method for raw `csv` generation
+  - `Eco::API::Organization::PresetsFactory` added integrity validation for `person_*` abilities
+  - `Eco::API::Session::Batch::Job` more debug info on erron handlers
+
+### Changed
+### Fixed
+  - `Eco::API::Error.get_type` was almost always matching `Eco::API::Error::Unclassified` -> fixed
+
+## [2.0.13] - 2021-03-31
+
+### Added
+  - Stats on the `Eco::API::Session::Batch`
+  - Allow to inherit and re-use the `Eco::API::UseCases::DefaultCase::HrisCase`
+
+### Fixed
+  - Ensure auto-loading for `Eco::API::UseCases`
+
+## [2.0.12] - 2021-03-29
+
+### Changed
+  - `Eco::CLI#run` it does include any defined states on the workflow
+
+
+## [2.0.11] - 2021-03-29
+
+### Fixed
+  - `Eco::API::Session::Batch:Errors#errors` changed `Array#filter` call to `Array#select` call
+
+## [2.0.10] - 2021-03-26
 
 ### Added
   - `Eco::API::Common::People::PersonParser`
@@ -16,34 +56,24 @@ All notable changes to this project will be documented in this file.
     - Ranamed `#defined_attrs` to `#defined_model_attrs`
     - Ranamed `#undefined_attrs` to `#undefined_model_attrs`
 
-### Fixed
-
 ## [2.0.9] - 2021-03-19
 
-### Added
 ### Changed
   - `Eco::API::Session::Batch:Errors#person_ref` moved to the public method
 
-### Fixed
-
 ## [2.0.8] - 2021-03-09
 
-### Added
-### Changed
 ### Fixed
   - `Ecoportal::API::V1::Person#identity` adjust behavior
 
 ## [2.0.7] - 2021-03-09
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Session::Batch::JobsGroups` and `Eco::API::Session::Batch::Jobs`: when new `Batch::Job`s are creating during launch, they remained unlaunched
     - this fix makes `#launch` method to iterate until there are no pending
 
 ## [2.0.6] - 2021-03-08
 
-### Added
 ### Changed
   - `Eco::API::Session::Batch:Errors` moved some methods to be private
 ### Fixed
@@ -51,46 +81,33 @@ All notable changes to this project will be documented in this file.
 
 ## [2.0.5] - 2021-02-24
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Common::People::PersonParser#symbol_keys` to use `Array#select`
     - as `Array#filter` was introduced in ruby `2.5.5`
 
 ## [2.0.4] - 2021-02-23
 
-### Added
 ### Changed
   - `Eco::API::Common::People::PersonParser#defined_attrs` to include virtual attributes
 
-### Fixed
-
 ## [2.0.3] - 2021-02-23
 
 ### Added
   - `Eco::API::UseCases::OozeSamples::OozeUpdateCase`: added integration to update page instances (non-templates)
 
-### Changed
 ### Fixed
   - `Eco::API::Policies::DefaultPolicies::UserAccess` complete default policy code.
 
 ## [2.0.2] - 2021-02-22
 
-### Added
 ### Changed
   - upgraded dependencies with `ecoportal-api`
 
-### Fixed
-
-
 ## [2.0.1] - 2021-02-22
 
-### Added
 ### Changed
   - upgraded dependencies with `ecoportal-api-oozes` to `ecoportal-api-v2`
 
-### Fixed
-
 ## [1.5.15] - 2021-02-17
 
 ### Added
@@ -104,7 +121,6 @@ All notable changes to this project will be documented in this file.
     - `Eco::API::MicroCases#people_search`
     - `Eco::API::MicroCases#refresh`
 
-### Changed
 ### Fixed
   - `Eco::API::Policies::DefaultPolicies::UserAccess` typos in default api policy
 
@@ -126,11 +142,8 @@ All notable changes to this project will be documented in this file.
   - `Eco::API::Common::People::PersonEntry` add error log when wrong email error is detected
     - previously it would have crashed
 
-### Fixed
-
 ## [1.5.13] - 2021-02-01
 
-### Added
 ### Changed
   - upgraded dependency with `ecoportal-api-oozes`
 
@@ -146,23 +159,16 @@ All notable changes to this project will be documented in this file.
 ### Changed
   - upgraded `ecoportal-api` dependency
 
-### Fixed
-
-
 ## [1.5.11] - 2021-01-25
 
 ### Added
   - `Eco::API::Organization::TagTree#subtag?` to check if the tag is in any subtree.
 
-### Changed
-
 ### Fixed
   - `Eco::API::MicroCases#set_supervisor` shouldn't set it if the entry does not have it.
 
 ## [1.5.10] - 2021-01-19
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Session::Batch::Errors#print` show the row number of the input data.
 
@@ -171,14 +177,8 @@ All notable changes to this project will be documented in this file.
 ### Added
   - `Eco::API::Organization::TagTree#subtags` to get all the tags but those of the highest level.
 
-### Changed
-### Fixed
-
-
 ## [1.5.8] - 2021-01-05
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Session::Batch::Jobs#job` shouldn't be calling the post-launch callback function on creation.
   - `Eco::API::Session#new_job` should include a `&block` parameter.
@@ -186,15 +186,11 @@ All notable changes to this project will be documented in this file.
 
 ## [1.5.7] - 2020-12-17
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Sesssion#parse_attribute` was not using phase argument
 
 ## [1.5.6] - 2020-12-04
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::UseCases::DefaultCases::RestoreDBCase` fixed typo and slightly improved
   - fixed some back-end errors when chaining usecases
@@ -202,8 +198,6 @@ All notable changes to this project will be documented in this file.
 
 ## [1.5.5] - 2020-12-03
 
-### Added
-### Changed
 ### Fixed
   - rubies previous to `2.5` do not have `yield_self`
 
@@ -211,14 +205,11 @@ All notable changes to this project will be documented in this file.
 
 ### Added
   - update `ecoportal-api` dependency
-### Changed
 ### Fixed
   - `Eco::API::MicroCases#people_refresh` typo
 
 ## [1.5.3] - 2020-11-30
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Session::Batch::RequestStats#blanked_value?` better blank detection
   - `Eco::API::MicroCases#with_each_starter` rectified typo
@@ -359,14 +350,11 @@ All notable changes to this project will be documented in this file.
 
 ## [1.4.2] - 2020-07-23
 
-### Added
-### Changed
 ### Fixed
   - preserve backtrace on logging
 
 ## [1.4.0] - 2020-07-14
 
-### Added
 ### Changed
   - change abilities to align with ecoPortal release `1.5.0`
   - remove some patches on `ecoportal-api`
@@ -376,22 +364,17 @@ All notable changes to this project will be documented in this file.
 
 ## [1.3.19] - 2020-07-23
 
-### Added
-### Changed
 ### Fixed
   - preserve backtrace on logging
 
 ## [1.3.18] - 2020-07-08
 
-### Added
-### Changed
 ### Fixed
   - the `update` case was missing the code to use the `default_usergroup`
 
 
 ## [1.3.17] - 2020-07-06
 
-### Added
 ### Changed
   - the `hris` case should not only include as `leavers` those that have account, but anyone that leaves
     * as we could have active people with no account
@@ -414,7 +397,6 @@ All notable changes to this project will be documented in this file.
 ### Added
   - default usecase to export to `csv` (`-detailed`) now includes `"Supervisor Name"` column
 ### Changed
-### Fixed
 
 ## [1.3.14] - 2020-06-10
 
@@ -422,33 +404,24 @@ All notable changes to this project will be documented in this file.
   - `Eco::API::Common::People::SupervisorHelpers` now has its methods as class methods
 ### Changed
   - upgraded `ecoportal-api` gem dependency to minimum version `0.5.6`
-### Fixed
 
 
 ## [1.3.13] - 2020-05-29
 
-### Added
-### Changed
 ### Fixed
   - `Eco::API::Organization::TagTree#tag?` to accept `nil` by returning `false`
   - `Eco::API::Common::People::DefaultParsers::DateParser` will parse to `Date` class
     * it was parsing to `Time` class, while the native gem `ecoportal-api` parses as `Date` ([reference](https://gitlab.com/ecoPortal/ecoportal-api/-/blob/master/lib/ecoportal/api/v1/schema_field.rb))
 ## [1.3.12] - 2020-05-19
 
-### Added
 ### Changed
   - stop using `email` as `external_id` on `People#person` & `People#find`
     * this should result in more accurate searches when using `:strict` options
-### Fixed
-
 
 ## [1.3.11] - 2020-05-12
 
-### Added
 ### Changed
   - remove popping up comments on `Eco::API::Organization::PolicyGroups#`
-### Fixed
-
 
 ## [1.3.10] - 2020-05-12
 
@@ -457,14 +430,11 @@ All notable changes to this project will be documented in this file.
   - `config.people.default_usergroup`, when defined, will have effect on usecases: `update` (this case was missing the change)
     * on account creation, if the input file did not specify `policy_group_ids`
 
-### Changed
 ### Fixed
   - `upsert`, `hris` and `create` usecases: fixed condition for use of default_usergroup
 
 ## [1.3.9] - 2020-05-12
 
-### Added
-### Changed
 ### Fixed
 
 - `usecase` callback was not receiving `usecase` paramater

data/lib/eco/api/common/loaders/use_case.rb

@@ -8,7 +8,7 @@ module Eco
             # @return [Symbol] the `type` of usecase (i.e. `:sync`, `:transform`, `:import`, `:other`)
             def type(value = nil)
               unless value
-                return @type || raise("You should specify a type of case [:sync, :transform, :import, :other] for #{self.class}")
+                return @type || raise("You should specify a type of case [:sync, :transform, :import, :other] for #{self}")
               end
               @type = value
             end

data/lib/eco/api/common/people/person_entry.rb

@@ -57,6 +57,11 @@ module Eco
             @internal_entry
           end
 
+          # @return [Hash] entry `Hash` with **internal** attribute names, but **external** types and values.
+          def mapped_entry
+            @mapped_entry
+          end
+
           # @note values ready to be set to a person.
           # @return [Hash] entry `Hash` with **internal** attribute names, values and types.
           def final_entry

data/lib/eco/api/error.rb

@@ -80,6 +80,7 @@ module Eco
             next  1 if k1 < k2
             0
           end.tap do |siblings|
+            siblings.delete(Unclassified)
             if direct
               siblings.reject! do |si|
                 siblings.any? {|s| si < s}
@@ -96,17 +97,18 @@ module Eco
           err_msg =~ @match
         end
 
-        def get_type(err_msg)
+        def get_type(err_msg, first: true)
           type = nil
           descendants(direct: true).reverse.each do |klass|
             if klass.err_match?(err_msg)
               type = klass
               if klass.descendants?(direct: true)
-                type = klass.get_type(err_msg) || type
+                type = klass.get_type(err_msg, first: false) || type
               end
             end
           end
-          type
+          return type unless first
+          type || Unclassified
         end
 
         def known_err_class?(klass)

data/lib/eco/api/organization/presets_factory.rb

@@ -4,38 +4,27 @@ module Eco
 
       class PresetsFactory
         ABILITIES = File.join(__dir__, 'presets_values.json')
+        INTEGRITY = File.join(__dir__, 'presets_integrity.json')
         DEFAULT_CUSTOM = 'presets_custom.json'
         DEFAULT_MAP    = 'presets_map.json'
 
         def initialize(presets_custom: DEFAULT_CUSTOM, presets_map: DEFAULT_MAP, enviro: nil, policy_groups: nil)
-          @abilities  = JSON.load(File.open(ABILITIES))
-          @habilities = @abilities.map do |key, values|
-            h_values = values.map { |v| [v, true] }.to_h
-            [key, h_values]
-          end.to_h
-
           fatal("Expecting Environment object. Given: #{enviro}") if enviro && !enviro.is_a?(Eco::API::Common::Session::Environment)
-          @enviro = enviro
-
-          policy_groups = policy_groups || @enviro&.api&.policy_groups.to_a
-          if policy_groups.is_a?(Eco::API::Organization::PolicyGroups)
-            @policy_groups = policy_groups
-          else
-            @policy_groups = Eco::API::Organization::PolicyGroups.new(policy_groups)
-          end
+          @enviro        = enviro
 
-          init_custom(presets_custom)
-          init_map(presets_map)
+          @policy_groups       = policy_groups
+          @presets_custom_file = presets_custom || DEFAULT_CUSTOM
+          @presets_map_file    = presets_map    || DEFAULT_MAP
         end
 
         def new(*policy_group_ids_or_names)
 
           names = policy_group_ids_or_names.map do |id_name|
-            @policy_groups.to_name(id_name)&.downcase
+            policy_groups.to_name(id_name)&.downcase
           end.compact
 
-          if @presets_map
-            preset_names = names.map { |name| @presets_map.fetch(name, nil) }
+          if presets_map
+            preset_names = names.map { |name| presets_map.fetch(name, nil) }
           else # option to do not use preset mapping (so just the policy group name)
             preset_names = names
           end
@@ -44,69 +33,11 @@ module Eco
 
         # @return [Array<String>] all the abilities
         def keys
-          @abilities.keys
+          abilities_model.keys
         end
 
         private
 
-        def init_custom(file = DEFAULT_CUSTOM)
-          @presets_custom = nil
-
-          return if !file
-          file = File.expand_path(file)
-
-          if File.exists?(file)
-            @presets_custom = JSON.load(File.open(file))
-
-            errors = @presets_custom.map do |key, preset|
-              (err = preset_errors(preset)) ? "{ '#{key}' preset -> #{err}}": nil
-            end.compact
-
-            fatal("File '#{file}' contains invalid presets:\n  #{errors.join("\n  ")}") if errors.length > 0
-          end
-
-        end
-
-        def init_map(file = DEFAULT_MAP)
-          @presets_map = nil
-
-          return if !file
-          file = File.expand_path(file)
-
-          if File.exists?(file)
-            fatal("Maps file specified without custom presets file. Aborting!") if !@presets_custom
-            @presets_map = JSON.load(File.open(file))
-
-            errors = []
-            if @policy_groups.length > 0
-              errors = @policy_groups.map do |pg|
-                exists = @presets_map[pg.name.downcase] || @presets_custom[pg.name.downcase]
-                exists ? nil : "'#{pg.name}'"
-              end.compact
-
-              warn("No maps or no preset for policy group(s): #{errors.join(", ")}") if errors.length > 0
-            end
-
-            errors = @presets_map.map do |source, dest|
-              @presets_custom[dest] ? nil : "'#{dest}'"
-            end.compact
-
-            warn("Unexisting mapped preset(s): #{errors.uniq.join(", ")}") if errors.length > 0
-          end
-
-        end
-
-        def fatal(msg)
-          raise msg if !@enviro
-          @enviro.logger.fatal(msg)
-          raise msg
-        end
-
-        def warn(msg)
-          raise msg if !@enviro
-          @enviro.logger.warn(msg)
-        end
-
         def compile(*preset_names)
           fatal("You need to specify an existing file for the custom presets.") if !@presets_custom
           @presets_custom.values_at(*preset_names).compact.reduce({}) do |p1, p2|
@@ -117,7 +48,7 @@ module Eco
         def merge(preset1, preset2)
           keys = preset1.keys | preset2.keys
 
-          @abilities.each_with_object({}) do |(key, values), result|
+          abilities_model.each_with_object({}) do |(key, values), result|
             next unless keys.include?(key)
             idx = [
               values.index(preset1[key]),
@@ -129,17 +60,149 @@ module Eco
 
         # unsused: only play with the given abilities
         def empty_model
-          JSON.parse(@abilities.to_json).transform_values {|v| nil }
+          JSON.parse(abilities_model.to_json).transform_values {|v| nil }
         end
 
         def preset_errors(preset)
           return "No preset given" if !preset
           errors = preset.map do |k, v|
-            @habilities.dig(k, v) ? nil : "#{k}:#{v}"
+            value_exists?(k, v) ? nil : "#{k}:#{v}"
           end.compact
-          return " unknown: {#{errors.join(", ")}}" if errors.length > 0
+          return " Unknown: {#{errors.join(", ")}}" if errors.length > 0
           nil
         end
+
+        def preset_integrity(preset)
+          preset.each_with_object([]) do |(ability, value), errors|
+            next unless checks = integrity_model[ability]
+
+            suberrors = []
+
+            checks.each do |check|
+              next unless check["value"] == value
+              check["conditions"].each do |cond, targets|
+                case cond
+                when "at_least"
+                  targets.each do |other, minimum|
+                    unless (ability_value_idx(other, minimum) <= ability_value_idx(other, preset[other]))
+                      suberrors << "'#{other}' should be at least '#{minimum}'"
+                    end
+                  end
+                when "one_of"
+                  unless targets.any? {|other, expected| preset[other] == expected}
+                    suberrors << targets.each_with_object([]) do |(other, expected), out|
+                      out << "'#{other}': '#{expected}'"
+                    end.join(", ").yield_self do |msg|
+                      "there should be at least one of: {#{msg}}"
+                    end
+                  end
+                else
+                  warn("Unsuported integrity condition statement '#{cond}' in '#{ability}' with level '#{value}'")
+                end
+              end
+            end
+
+            if suberrors.length > 0
+              errors << "Incorrect value '#{value}' for '#{ability}' - reasons: {#{suberrors.join(", ")}}"
+            end
+          end.yield_self do |errors|
+            " Integrity errors: { #{errors.join(", ")} }" if errors.length > 0
+          end
+        end
+
+        def integrity_model
+          @integrity_model ||= JSON.load(File.open(INTEGRITY))
+        end
+
+        def value_exists?(ability, value)
+          abilities_model_inverted.dig(ability, value)
+        end
+
+        def abilities_model_inverted
+          @abilities_model_inverted ||= abilities_model.each_with_object({}) do |(key, values), out|
+            out[key] = values.each_with_object({}) {|v, h| h[v] = true }
+          end
+        end
+
+        def ability_value_idx(ability, value)
+          abilities_model[ability].index(value)
+        end
+
+        def abilities_model
+          @abilities_model ||= JSON.load(File.open(ABILITIES))
+        end
+
+        def policy_groups
+          return @policy_groups if @policy_groups.is_a?(Eco::API::Organization::PolicyGroups)
+          @policy_groups ||= @enviro&.api&.policy_groups.to_a
+
+          unless @policy_groups.is_a?(Eco::API::Organization::PolicyGroups)
+            @policy_groups = Eco::API::Organization::PolicyGroups.new(@policy_groups)
+          end
+          @policy_groups
+        end
+
+        def presets_custom
+          return @presets_custom if instance_variable_defined?(:@presets_custom)
+          @presets_custom = nil
+          if @presets_custom_file
+            if (file = File.expand_path(@presets_custom_file)) && File.exists?(file)
+              @presets_custom = JSON.load(File.open(file)).tap do |custom_presets|
+                errors = custom_presets.each_with_object([]) do |(key, preset), errors|
+                  if err = preset_errors(preset)
+                    errors << "{ '#{key}' preset -> #{err}}"
+                  end
+                  if err = preset_integrity(preset)
+                    errors << "{ '#{key}' preset -> #{err}}"
+                  end
+                end
+
+                fatal("File '#{file}' contains invalid presets:\n  #{errors.join("\n  ")}") if errors.length > 0
+              end
+            end
+          end
+        end
+
+        def presets_map
+          return @presets_map if instance_variable_defined?(:@presets_map)
+          @presets_map = nil
+          if @presets_map_file
+            if (file = File.expand_path(@presets_map_file)) && File.exists?(file)
+              fatal("Maps file specified without 'presets_custom.json' file. Aborting!") if !presets_custom
+              @presets_map = JSON.load(File.open(file)).tap do |map_presets|
+
+                errors = []
+                if policy_groups.length > 0
+                  errors = policy_groups.map do |pg|
+                    exists = map_presets[pg.name.downcase] || presets_custom[pg.name.downcase]
+                    exists ? nil : "'#{pg.name}'"
+                  end.compact
+
+                  warn("No maps or no preset for policy group(s): #{errors.join(", ")}") if errors.length > 0
+                end
+
+                errors = map_presets.map do |source, dest|
+                  presets_custom[dest] ? nil : "'#{dest}'"
+                end.compact
+
+                warn("Unexisting mapped preset(s): #{errors.uniq.join(", ")}") if errors.length > 0
+
+              end
+            end
+          end
+        end
+
+        def fatal(msg)
+          raise msg if !@enviro
+          @enviro.logger.fatal(msg)
+          raise msg
+        end
+
+        def warn(msg)
+          raise msg if !@enviro
+          @enviro.logger.warn(msg)
+        end
+
       end
 
     end

data/lib/eco/api/organization/presets_integrity.json

@@ -0,0 +1,52 @@
+{
+  "person_core_create": [
+    { "value": "create", "conditions": {
+        "at_least": {"person_core": "view_people_manager"}
+      }
+    }
+  ],
+  "person_core_edit": [
+    { "value": "edit", "conditions": {
+        "at_least": {"person_core": "view_people_manager"}
+      }
+    }
+  ],
+  "person_details": [
+    { "value": "view", "conditions": {
+        "at_least": {"person_core": "attach"}
+      }
+    },
+    { "value": "edit_public", "conditions": {
+        "one_of": {
+          "person_core_edit":   "edit",
+          "person_core_create": "create"
+        }
+      }
+    },
+    { "value": "view_private", "conditions": {
+        "at_least": {"person_core": "attach" }
+      }
+    },
+    { "value": "edit_private", "conditions": {
+        "one_of": {
+          "person_core_edit":   "edit",
+          "person_core_create": "create"
+        }
+      }
+    }
+  ],
+  "person_account": [
+    { "value": "view", "conditions": {
+        "at_least": {"person_core": "attach" }
+      }
+    },
+    { "value": "create", "conditions": {
+        "at_least": {"person_core_create": "create"}
+      }
+    },
+    { "value": "edit", "conditions": {
+        "at_least": {"person_core_edit": "edit"}
+      }
+    }
+  ]
+}

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

@@ -105,10 +105,15 @@ module Eco
           iterations = (data.length.to_f / per_page).ceil
 
           Eco::API::Session::Batch::Status.new(enviro, queue: data, method: method).tap do |status|
+            start_time  = Time.now
+            start_slice = Time.now; slice = []
             data.each_slice(per_page) do |slice|
-              msg = "starting batch '#{method}' iteration #{iteration}/#{iterations}, with #{slice.length} entries of #{data.length} -- #{done} done"
+              msg  = "starting batch '#{method}' iteration #{iteration}/#{iterations},"
+              msg += " with #{slice.length} entries of #{data.length} -- #{done} done"
+              msg += " (last: #{str_stats(start_slice, slice.length)}; total: #{str_stats(start_time, done)})"
               logger.info(msg) unless silent
 
+              start_slice = Time.now
               people_api.batch do |batch|
                 slice.each do |person|
                   batch.public_send(method, person) do |response|
@@ -118,12 +123,23 @@ module Eco
                 end
               end # next batch
 
-              iteration += 1
-              done += slice.length
+              iteration  += 1
+              done       += slice.length
             end # next slice
           end
         end
 
+        def str_stats(start, count)
+          now     = Time.now
+          secs    = (now - start).round(3)
+          if secs > 0.0
+            per_sec = (count.to_f / secs).round(2)
+            "#{secs}s -> #{per_sec} people/s"
+          else
+            " -- "
+          end
+        end
+
       end
     end
   end

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

@@ -124,7 +124,7 @@ module Eco
           #   - please, observe that this can only happen if there were repeated entries in the `source_queue`
           # @return [Array<Hash>, Array<Ecoportal::API::V1::Person>, Array<Ecoportal::API::Internal::Person>]
           def entries
-            queue.filter.with_index do |query, i|
+            queue.select.with_index do |query, i|
               unless response = status[i]
                 msg  = "Error: query with no response. You might have duplicated entries in your queue.\n"
                 msg += "Queue length: #{queue.length}; Queue elements class: #{queue.first.class}\n"

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

@@ -45,25 +45,22 @@ module Eco
           # @!group Pure feedback methods
 
           # Slightly modifies the behaviour of `Ecoportal::API::Common::BaseModel#as_update`, so schema details fields show the `alt_id`
+          # It also fixes possible patch updates that are incomplete or unnecessary.
           # @note for better feedback
           # @param entry [Hash, Ecoportal::API::V1::Person, Ecoportal::API::Internal::Person]
-          def as_update(entry)
+          # @param add_feedback [Boolean] if `true` it tweak the hash update with additional data.
+          def as_update(entry, add_feedback: true)
             case
             when entry.is_a?(Hash)
               hash = entry
             else #entry.is_a?(Ecoportal::API::V1::Person)
               if only_ids?
-                hash = {
-                  "id"          => entry.id,
-                  "external_id" => entry.external_id,
-                  "email"       => entry.email
-                }
                 hash = entry.as_json.slice("id", "external_id", "email")
               else
                 hash = entry.as_update
-                #if entry.details
-                if hash["details"]
-                  if hfields = hash.dig("details", "fields")
+
+                if add_feedback && details = hash["details"]
+                  if hfields = details["fields"]
                     hfields.each do |fld|
                       fld.merge!("alt_id" => entry.details.get_field(fld["id"]).alt_id)
                     end

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

@@ -169,7 +169,8 @@ module Eco
 
             unless simulate
               if pqueue.length > 0
-                backup_update(requests)
+                req_backup = pqueue.map {|e| as_update(e, add_feedback: false)}
+                backup_update(req_backup)
                 session.batch.launch(pqueue, method: type).tap do |job_status|
                   @status     = job_status
                   status.root = self
@@ -217,7 +218,7 @@ module Eco
             [].tap do |msg|
               subjobs.map {|subjob| msg << subjob.summary}
             end.join("\n")
-          end          
+          end
 
           def as_update(*args)
             feedback.as_update(*args)
@@ -287,10 +288,13 @@ module Eco
               handlers = session.config.error_handlers
               if status.errors.any? && !handlers.empty? && !error_handler?
                 err_types = status.errors.by_type
+                logger.debug("(#{self.name}) got these error types: #{err_types.keys}")
                 handlers.each do |handler|
                   if entries = err_types[handler.name]
                     handler_job = subjobs_add("#{self.name} => #{handler.name}", usecase: handler)
+                    logger.debug("Running error handler #{handler.name}")
                     handler.launch(people: people(entries), session: session, options: options, job: handler_job)
+                    logger.debug("Launching job of error handler: #{handler_job.name}")
                     handler_job.launch(simulate: simulate)
                   end
                 end

data/lib/eco/api/usecases.rb

@@ -30,6 +30,7 @@ module Eco
         @usecases      = {}
         @cache_init    = false
         @cases_by_name = {}
+        init_caches
       end
 
       def length
@@ -79,6 +80,7 @@ module Eco
 
       # @return [Eco::API::UseCases] a copy of instance object of `self`.
       def dup
+        init_caches
         self.class.new.merge(self)
       end
 

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

@@ -32,6 +32,7 @@ require_relative 'default_cases/reset_landing_page_case'
 require_relative 'default_cases/restore_db_case'
 require_relative 'default_cases/set_default_tag_case'
 require_relative 'default_cases/set_supervisor_case'
+require_relative 'default_cases/supers_hierarchy_case'
 require_relative 'default_cases/switch_supervisor_case'
 require_relative 'default_cases/to_csv_case'
 require_relative 'default_cases/to_csv_detailed_case'

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

@@ -2,18 +2,17 @@ class Eco::API::UseCases::DefaultCases::HrisCase < Eco::API::Common::Loaders::Us
   name "hris"
   type :sync
 
+  attr_reader :creation, :update, :supers, :leavers
+
   def main(entries, people, session, options, usecase)
     micro    = session.micro
-    creation = session.new_job("main", "create",  :create, usecase)
-    update   = session.new_job("main", "update",  :update, usecase)
-    supers   = session.new_job("post", "supers",  :update, usecase, :core)
-    leavers  = session.new_job("post", "leavers", :update, usecase, :account)
+    @creation = session.new_job("main", "create",  :create, usecase)
+    @update   = session.new_job("main", "update",  :update, usecase)
+    @supers   = session.new_job("post", "supers",  :update, usecase, :core)
+    @leavers  = session.new_job("post", "leavers", :update, usecase, :account)
 
     micro.with_each_leaver(entries, people, options) do |person|
-      leavers.add(person) do |person|
-        person.supervisor_id = nil
-        person.account       = nil if person.account
-      end
+      leavers.add(person, &method(:leavers_callback))
     end
 
     micro.with_each(entries, people, options) do |entry, person|
@@ -24,4 +23,11 @@ class Eco::API::UseCases::DefaultCases::HrisCase < Eco::API::Common::Loaders::Us
     end
   end
 
+  private
+
+  def leavers_callback(person)
+    person.supervisor_id = nil
+    person.account       = nil if person.account
+  end
+
 end

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

@@ -0,0 +1,59 @@
+class Eco::API::UseCases::DefaultCases::SupersHierarchy < Eco::API::Common::Loaders::UseCase
+  name "supers-hierarchy"
+  type :export
+
+  attr_reader :session, :people, :options
+
+  def main(people, session, options, usecase)
+    @session = session; @options = options; @people = people
+
+    save!(hierarchy)
+    exit(0)
+  end
+
+  private
+
+  def hierarchy
+    Eco::API::Common::People::SupervisorHelpers.supervisors_tree(people)
+  end
+
+  def file
+    @file ||= options.dig(:output, :file) || "supers_hierarchy.txt"
+  end
+
+  def save!(data)
+    ext  = File.extname(file).downcase.delete(".")
+
+    File.open(file, "w") do |fd|
+      if ext == "txt"
+        create_file(data, file: file, format: :txt)
+      elsif ext == "html"
+        puts "html is still not supported"
+        exit(1)
+        create_file(data, file: file, format: :html)
+      elsif ext == "json"
+        puts "json is still not supported"
+        exit(1)
+        create_file(data, file: file, format: :json)
+      end
+    end
+  end
+
+  def create_file(tree, file:, format: :txt)
+    File.open(file, "w") do |fd|
+      fd << tree_to_str(tree, format: format)
+    end
+    puts "Generated file #{file}"
+  end
+
+  def tree_to_str(tree, lev: 0, format: :txt)
+    raise "Required Hash tree structure. Given: #{tree.class}" unless tree.is_a?(Hash)
+    "".tap do |str|
+      tree.each do |entry, subtree|
+        str << "#{"  " * lev}#{(lev > 0)? "+-#{lev}- " : ""}#{entry.name} (#{entry.external_id}|#{entry.email}|#{entry.id})\n"
+        str << tree_to_str(subtree, lev: lev + 1, format: format) unless !subtree || subtree.empty?
+      end
+    end
+  end
+
+end

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

@@ -2,7 +2,11 @@ class Eco::API::UseCases::DefaultCases::ToCsvCase < Eco::API::Common::Loaders::U
   name "to-csv"
   type :export
 
+  attr_reader :session, :options, :people
+
   def main(people, session, options, usecase)
+    @session = session; @options = options; @people = people
+
     unless people && !people.empty?
       session.logger.warn("No source people to create the file... aborting!")
       return false
@@ -14,32 +18,48 @@ class Eco::API::UseCases::DefaultCases::ToCsvCase < Eco::API::Common::Loaders::U
     end
 
     session.logger.info("going to create file: #{file}")
-    CSV.open(file, "w") do |csv|
-      deps   = {"supervisor_id" => {people: people}}
-      entry  = session.new_entry(people.first, dependencies: deps)
-      header = entry.external_entry.keys
-
-      if options.dig(:nice_header) || options.dig(:export, :options, :nice_header)
-        name_maps = session.schema.fields_by_alt_id.transform_values do |fld|
-          fld.name
-        end.merge({
-          "policy_group_ids" => "User Group(s)",
-          "email"            => "Email",
-          "name"             => "Name",
-          "supervisor_id"    => "Manager ID",
-          "filter_tags"      => "Locations",
-          "default_tag"      => "Default Location",
-          "id"               => "ecoPortal ID"
-        })
-        header = header.map {|name| name_maps[name] ? name_maps[name] : name}
-      end
 
-      csv << header
+    CSV.open(file, "w") do |csv|
+      csv << spot_header
       people.each do |person|
-        csv << session.new_entry(person, dependencies: deps).external_entry.values
+        csv << target_entry_type(person).values
       end
     end
     exit(0)
   end
 
+  private
+
+  def target_entry_type(person)
+    session.new_entry(person, dependencies: deps).yield_self do |person_entry|
+      options.dig(:export, :options, :internal_names) ? person_entry.mapped_entry : person_entry.external_entry
+    end
+  end
+
+  def deps
+    @deps ||= {"supervisor_id" => {people: people}}
+  end
+
+  def spot_header
+    entry  = target_entry_type(people.first)
+    header = entry.keys
+
+    if options.dig(:nice_header) || options.dig(:export, :options, :nice_header)
+      name_maps = session.schema.fields_by_alt_id.transform_values do |fld|
+        fld.name
+      end.merge({
+        "policy_group_ids" => "User Group(s)",
+        "email"            => "Email",
+        "name"             => "Name",
+        "supervisor_id"    => "Manager ID",
+        "filter_tags"      => "Locations",
+        "default_tag"      => "Default Location",
+        "id"               => "ecoPortal ID"
+      })
+      header = header.map {|name| name_maps[name] ? name_maps[name] : name}
+    end
+    header
+  end
+
+
 end

data/lib/eco/cli.rb

@@ -22,16 +22,17 @@ module Eco
 
     def run(session:)
       io = Eco::API::UseCases::BaseIO.new(session: session, options: options)
-      #session.workflow.run(io: io)
-      session.workflow(io: io) do |wf, io|
-        io = wf.run(:options, io: io)
-        io = wf.run(:load, io: io)
-        io = wf.run(:usecases, io: io)
-        io = wf.run(:launch_jobs, io: io)
-        io = wf.run(:post_launch, io: io)
-        io = wf.run(:end, io: io)
-        io = wf.run(:close, io: io)
-      end
+      session.workflow(io: io).run(io: io)
+      #session.workflow(io: io) do |wf, io|
+      #  io = wf.run(:options, io: io)
+      #  io = wf.run(:load, io: io)
+      #  io = wf.run(:usecases, io: io)
+      #  io = wf.run(:launch_jobs, io: io)
+      #  io = wf.run(:post_launch, io: io)
+      #  io = wf.run(:report, io: io)
+      #  io = wf.run(:end, io: io)
+      #  io = wf.run(:close, io: io)
+      #end
     end
 
   end

data/lib/eco/cli/config/default/usecases.rb

@@ -1,12 +1,18 @@
 ASSETS.cli.config do |cnf|
   cnf.usecases do |cases|
 
+    desc = "Draws the Supervisors hiearchy in a file (use option -to file.ext)"
+    cases.add("-supers-hierarchy", :export, desc, case_name: "supers-hierarchy") do |people, session, options|
+      file = (SCR.get_arg("-to") && SCR.get_file("-to", required: true, should_exist: false)) || "supers_hierarchy.txt"
+      options.deep_merge!(output: {file: file})
+    end
+
     desc = "It exports to a CSV the (filtered) people"
     cases.add("-people-to-csv", :export, desc) do |people, session, options|
       file = SCR.get_file("-people-to-csv", required: true, should_exist: false)
       options.deep_merge!(export: {file: {name: file, format: :csv}})
       options.deep_merge!(export: {options: {nice_header: true}}) if SCR.get_arg("-nice-header")
-
+      options.deep_merge!(export: {options: {internal_names: true}})  if SCR.get_arg("-internal-names")
       case_name = SCR.get_arg("-detailed")? "to-csv-detailed" : "to-csv"
       session.usecases.case(case_name)
     end
@@ -73,7 +79,7 @@ ASSETS.cli.config do |cnf|
       end
 
       options.deep_merge!(ignore: {missing: {policy_groups: true}}) if SCR.get_arg("-ignore-missing-policy-groups")
-      
+
     end
 
     desc = "Restores the people manager by using a backup.json file"

data/lib/eco/cli/config/default/workflow.rb

@@ -2,8 +2,13 @@ ASSETS.cli.config do |config|
   ASSETS.config.workflow do |wf|
 
     io = nil
+    rescued = false
+
     # default rescue
     wf.rescue do |exception, io|
+      next io if rescued
+      rescued = true
+
       io.session.logger.debug(exception.patch_full_message)
       wf.run(:close, io: io)
       io

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.10"
+  VERSION = "2.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.15
 platform: ruby
 authors:
 - Oscar Segura
@@ -340,6 +340,7 @@ files:
 - lib/eco/api/organization/preferences.rb
 - lib/eco/api/organization/preferences_reference.json
 - lib/eco/api/organization/presets_factory.rb
+- lib/eco/api/organization/presets_integrity.json
 - lib/eco/api/organization/presets_reference.json
 - lib/eco/api/organization/presets_values.json
 - lib/eco/api/organization/tag_tree.rb
@@ -398,6 +399,7 @@ files:
 - lib/eco/api/usecases/default_cases/restore_db_case.rb
 - lib/eco/api/usecases/default_cases/set_default_tag_case.rb
 - lib/eco/api/usecases/default_cases/set_supervisor_case.rb
+- lib/eco/api/usecases/default_cases/supers_hierarchy_case.rb
 - lib/eco/api/usecases/default_cases/switch_supervisor_case.rb
 - lib/eco/api/usecases/default_cases/to_csv_case.rb
 - lib/eco/api/usecases/default_cases/to_csv_detailed_case.rb