eco-helpers 2.0.24 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d943cd8ff8df507a2285548d7bf0c8fffa4009df45de1c26f38e4c966c747f
-  data.tar.gz: 14cdb53085deec51b406000048aa00199478ef9458290061cb47d324957ec1f2
+  metadata.gz: 06a58306abadf9b27421583990eb14960f7f30368515481b16aa474de1bc1b08
+  data.tar.gz: 0eef93068fdb31bc6d1949f1022eac325403ac3dbb47c95b593a5b9623655773
 SHA512:
-  metadata.gz: 8563f5eaac3f8b650b62138fd31252d990467be498f9620bf7276a430ab8470acf1f2a8ab7b3e6ebcb9accedc1af94ac7168e6acdf3eb94de516259069a49c80
-  data.tar.gz: 881d6742b555d4b3cf42addef76470b35764684cbca0f903252ae5a39f503dc6a89d9bd7f7f774c587c0b6a23a6f898274af227baf14090d40ae30a16144eecc
+  metadata.gz: 80b0d2fc7bedb99deabae6d7d273cb4967eb0022db2e743078a82cace02d4f499fe8ad51ec02b7c5bcef549aac9fb03b0ea7ef5358fb602c65856654c7c20814
+  data.tar.gz: 553e1342f38c244ab57bb259b639d55ddc4a4d5d6f72bd54ed9290111636f4dffb29834f69a5b7d2707ee3d44951fa52efccf81589194f11dfa1a709309ddb77

data/CHANGELOG.md

@@ -1,13 +1,23 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.24] - 2021-06-xx
+## [2.0.25] - 2021-06-xx
 
 ### Added
-  - `Eco::API::Session::Batch::Job` made **native** `-include-excluded`
-    * also added new option `-include-only-excluded` to be able to only target people HRIS excluded
+  - `Eco::API::UseCases::DefaultCases::HrisCase` validation error to require `-schema-id` command line when there are people in schemas other than the active one
+  
 ### Changed
+  - `Eco::API::Session::Batch::Job`
+    * for backwards compatibility `-include-only-excluded` should bring an options structure compatible with `-include-excluded`
+
 ### Fixed
+  - `Eco::API::Session::Batch` fixed typo that would prevent `prompt_user` to work
+
+## [2.0.24] - 2021-06-22
+
+### Added
+  - `Eco::API::Session::Batch::Job` made **native** `-include-excluded`
+    * also added new option `-include-only-excluded` to be able to only target people HRIS excluded
 
 
 ## [2.0.23] - 2021-06-22

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

@@ -164,7 +164,7 @@ module Eco
 
             run = true
             if Eco::API::Common::Session::FileManager.file_exists?(file)
-              prompt_user("The file '#{file}' already exists. Do you want to overwrite it? (Y/n):", default: "Y") do |response|
+              prompt_user("Do you want to overwrite it? (Y/n):", explanation: "The file '#{file}' already exists.", default: "Y") do |response|
                 run = (response == "") || reponse.upcase.start_with?("Y")
               end
             end

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

@@ -210,6 +210,12 @@ module Eco
           to_h(:supervisor_id)
         end
 
+        def group_by_schema
+          to_h do |person|
+            person.details && person.details.schema_id
+          end
+        end
+
         def to_h(attr = "id")
           super(attr || "id")
         end

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

@@ -137,7 +137,7 @@ module Eco
           rescue error_type => e
             raise unless retries_left > 0
             explanation = "Batch TimeOut. You have #{retries_left} retries left."
-            prompt_user("Do you want to retry (y/N)?", explanation, default: "Y", timeout: 10) do |response|
+            prompt_user(" Do you want to retry (y/N)?", default: "Y", explanation: explanation, timeout: 10) do |response|
               if response.upcase.start_with?("Y")
                 offer_retry_on(error_type, retries_left - 1, &block)
               else

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

@@ -253,7 +253,7 @@ module Eco
           def api_included(full_queue)
             return full_queue if type == :create
             return full_queue unless excluded = session.config.people.api_excluded
-            if options.dig(:include, :only_excluded)
+            if options.dig(:include, :excluded, :only)
               full_queue.select {|entry| excluded.call(entry, session, options, self)}
             elsif options.dig(:include, :excluded)
               full_queue

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

@@ -3,8 +3,11 @@ class Eco::API::UseCases::DefaultCases::HrisCase < Eco::API::Common::Loaders::Us
   type :sync
 
   attr_reader :creation, :update, :supers, :leavers
+  attr_reader :people, :session, :options
 
   def main(entries, people, session, options, usecase)
+    @session = session; @options = options; @people = people
+    require_only_one_schema!
     micro    = session.micro
     @creation = session.new_job("main", "create",  :create, usecase)
     @update   = session.new_job("main", "update",  :update, usecase)
@@ -30,4 +33,21 @@ class Eco::API::UseCases::DefaultCases::HrisCase < Eco::API::Common::Loaders::Us
     person.account       = nil if person.account
   end
 
+  def require_only_one_schema!
+    unless schema_id = options.dig(:people, :filter, :details, :schema_id)
+      active_schema = session.schema
+      other_schemas = session.schemas.map(&:id) - [active_schema.id]
+      other_people  = people.group_by_schema.values_at(*other_schemas).map(&:to_a).flatten
+      if other_people.length > 3
+        msg  = "There are #{other_people.length} people in schemas other than #{active_schema.name}."
+        msg << " Please, use the filter option '-schema_id SchemaName' for the 'hris' case to only include those of that schema"
+        msg << " in the current update. The HRIS case identifies people that are not in the file as leavers."
+        msg << " (as it will remove the account of all the people of other schemas if they are not in the input file)."
+        msg << "\n For example: -schema-id '#{active_schema.name.downcase}'"
+        logger.error(msg)
+        raise msg
+      end
+    end
+  end
+
 end

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

@@ -95,7 +95,7 @@ ASSETS.cli.config do |cnf|
 
     desc = "Includes in API updates ONLY people that evaluate true as people excluded from periodic upates."
     options_set.add("-include-only-excluded", desc) do |options|
-      options.deep_merge!(include: {only_excluded: true})
+      options.deep_merge!(include: {excluded: {only: true}})
     end
 
     desc = "Ignores threshold limitations on requests for this session (skip batch belt)"

data/lib/eco/language/models/collection.rb

@@ -134,8 +134,11 @@ module Eco
           to_a.group_by(&block) if block
         end
 
-        def to_h(attr)
-          return {} if !attr
+        # By a specific `attr` or a block
+        # @note either one or the other should be present
+        def to_h(attr, &block)
+          return to_a.group_by(&block) if block
+          raise "And attr or a block are required. Given attr: #{attr}" unless attr
           to_a.group_by { |object| object.method(attr).call }
         end
         # @!endgroup

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.24"
+  VERSION = "2.0.25"
 end

metadata

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