eco-helpers 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b634b1d49337b52fe8d6a04876d706c14e44059410c77801d780a59c2d6276
-  data.tar.gz: 0fdc891abd28dd93339509f1b0d46a265f7754a1dfcc9eba9ff85ae8a1e6dd2e
+  metadata.gz: 4eb9a6d4fc09ab97362ab384856a32562c1f61321277e2537f1cc6859a5a4d54
+  data.tar.gz: 550fd9ce9a7510dca05bbcd80c153d7c114a25798e5d5af89059351db13f4b7d
 SHA512:
-  metadata.gz: 536f7e54656a444baf0d83213691127f194dd91ce3f45ff91bea7fae441eb7a69b8af0cc41c4a45d8edd08159daf8fa423331bad0fd9f918e0d4b7612fbfd84d
-  data.tar.gz: c93ef5b4e097999eccaf356be4fea1332e215355e71edf272d6ccf340baa1ac2025df645654b374bc5bbbb26919ebe98a10ab261c0a60eb94dfea16f406364c3
+  metadata.gz: ef1c26368f22e5b06ead30ab4aeb042d337fbfb5cd2b68369aa1407350993e38109e7cfde86295e046fcbcc5295a87a97da3cefd91873460cd7a3e535471afb1
+  data.tar.gz: 84f36840162ec228b41a923476aae26917ab1254c4c4e86e848b9b276ea84f0e1a33a69f9c0e8c15497262cebfd99151b91a6dd7a2b7779105096ee97593285d

data/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+## [1.3.8] - 2020-05-DD (Unreleased)
+
+### Added
+
+- this change log file
+- `config.people.default_usergroup`, when defined, will have effect on usecases: `create`, `upsert` and `hris`
+  * on account creation, if the input file did not specify `policy_group_ids`
+
+### Changed
+
+- `policy` callback to receive new parameter with the `Batch::Job` that it is currently processing/checking
+
+**Example of usage**
+
+```ruby
+ASSETS.config.policies do |policies|
+  policies.define("update-status") do |people, session, options, policy, job|
+    if job.type == :create
+      people.each do |person|
+        person.details["status"] = "Active" if person.details
+      end
+    end
+    if job.name == "leavers"
+      person.details["status"] = "Inactive" if person.details
+    end
+  end
+end
+```
+
+### Fixed
+
+- `reinvite` `:sync` native usecase (`-reinvite-from`): should skip people with no account.

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

@@ -106,6 +106,10 @@ module Eco
             @internal_entry.key?("filter_tags")
           end
 
+          def policy_group_ids?
+            @internal_entry.key?("policy_group_ids")
+          end
+
           def default_tag?
             @internal_entry.key?("default_tag")
           end
@@ -113,7 +117,7 @@ module Eco
           def default_tag
             @internal_entry["default_tag"]
           end
-          
+
           # Provides a reference of this person.
           # @return [String] string summary of this person identity.
           def to_s(options)

data/lib/eco/api/policies.rb

@@ -14,11 +14,12 @@ module Eco
         end
       end
 
-      def launch(people:, session:, options: {})
+      def launch(people:, session:, job:, options: {})
 
         args = {
           people:  people,
           session: session,
+          job: job,
           options: options
         }
 

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

@@ -229,7 +229,7 @@ module Eco
             people(pre_queue).tap do |entries|
               policies = session.config.policies
               unless policies.empty? || options.dig(:skip, :api_policies)
-                policies.launch(people: entries, session: session, options: options)
+                policies.launch(people: entries, session: session, options: options, job: self)
               end
             end
           end

data/lib/eco/api/session/config/people.rb

@@ -71,6 +71,10 @@ module Eco
             self["default_usergroup"]
           end
 
+          def default_usergroup?
+            !!self["default_usergroup"]
+          end
+
           def default_schema=(name)
             self["default_schema"] = name
           end
@@ -79,6 +83,10 @@ module Eco
             self["default_schema"]
           end
 
+          def default_schema?
+            !!self["default_schema"]
+          end
+
           def presets_custom=(file)
             self["presets_custom"] = file
           end

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

@@ -12,6 +12,10 @@ module Eco
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs = session.policy_groups
 
+              if session.config.people.default_usergroup?
+                def_id  = pgs.to_id(session.config.people.default_usergroup)
+              end
+
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)
                   session.logger.error("Entry(#{i}) - this person (id: '#{person.id}') already exists: #{entry.to_s(:identify)}")
@@ -34,15 +38,31 @@ module Eco
                   entry.set_details(person) unless options.dig(:exclude, :details)
 
                   unless options.dig(:exclude, :account)
-                    ini_pg_ids = person.account&.policy_group_ids || []
-                    entry.set_account(person)
+                    add_account = !person.account
+                    ini_pg_ids  = person.account&.policy_group_ids || []
+
+                    account_excluded = []
+                    account_excluded.push("policy_group_ids") if options.dig(:exclude, :policy_groups) && !create
+
+                    entry.set_account(person, exclude: account_excluded)
 
                     person.account&.send_invites = options[:send_invites] if options.key?(:send_invites)
 
-                    person.account.policy_group_ids   = pgs.user_pg_ids(
-                      initial:         ini_pg_ids,
-                      final:           person.account.policy_group_ids
-                    )
+                    unless options.dig(:exclude, :policy_groups) && !create
+                      end_pg_ids = person.account.policy_group_ids || []
+
+                      unless entry.policy_group_ids? && !add_account && !def_id
+                        # on account creation, if missing policy_group_ids column in the input
+                        # use default_usergroup, if it's defined
+                        end_pg_ids = [def_id]
+                      end
+
+                      # avoid false updates by preserving the original order
+                      person.account.policy_group_ids   = pgs.user_pg_ids(
+                        initial:         ini_pg_ids,
+                        final:           end_pg_ids
+                      )
+                    end
 
                     person.account.permissions_custom = session.new_preset(person)
 

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

@@ -9,11 +9,11 @@ module Eco
               creation = session.job_group("main").new("create", usecase: usecase, type: :create, sets: [:core, :details, :account])
               update   = session.job_group("main").new("update", usecase: usecase, type: :update, sets: [:core, :details, :account])
               supers   = session.job_group("post").new("supers", usecase: usecase, type: :update, sets: :core)
-              remove   = session.job_group("post").new("remove_account", usecase: usecase, type: :update, sets: :account)
+              leavers  = session.job_group("post").new("leavers", usecase: usecase, type: :update, sets: :account)
 
               people.users.each_with_index  do |person, i|
                 if !entries.find(person)
-                  remove.add(person) do |person|
+                  leavers.add(person) do |person|
                     person.supervisor_id = nil
                     person.account       = nil
                   end
@@ -23,6 +23,10 @@ module Eco
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs           = session.policy_groups
 
+              if session.config.people.default_usergroup?
+                def_id  = pgs.to_id(session.config.people.default_usergroup)
+              end
+
               entries.each_with_index do |entry, i|
                 person = people.find(entry, strict: strict_search)
                 person = session.new_person if create = !person
@@ -48,7 +52,8 @@ module Eco
                 entry.set_details(person) unless options.dig(:exclude, :details)
 
                 unless options.dig(:exclude, :account)
-                  ini_pg_ids = person.account&.policy_group_ids || []
+                  add_account = !person.account
+                  ini_pg_ids  = person.account&.policy_group_ids || []
 
                   account_excluded = []
                   account_excluded.push("policy_group_ids") if options.dig(:exclude, :policy_groups) && !create
@@ -58,9 +63,18 @@ module Eco
                   person.account.send_invites = options[:send_invites] if options.key?(:send_invites)
 
                   unless options.dig(:exclude, :policy_groups) && !create
+                    end_pg_ids = person.account.policy_group_ids || []
+
+                    unless entry.policy_group_ids? && !add_account && !def_id
+                      # on account creation, if missing policy_group_ids column in the input
+                      # use default_usergroup, if it's defined
+                      end_pg_ids = [def_id]
+                    end
+
+                    # avoid false updates by preserving the original order
                     person.account.policy_group_ids   = pgs.user_pg_ids(
                       initial:         ini_pg_ids,
-                      final:           person.account.policy_group_ids
+                      final:           end_pg_ids
                     )
                   end
 

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

@@ -22,13 +22,15 @@ module Eco
 
               entries.each_with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)
-                  person.account.send_invites = true
-                  invite.add(person)
+                  if person.account
+                    person.account.send_invites = true
+                    invite.add(person)
+                  end
                 else
                   session.logger.error("Entry(#{i}) - this person does not exist: #{entry.to_s(:identify)}")
                 end
               end
-              
+
             end
           end
 

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

@@ -10,7 +10,7 @@ module Eco
               supers   = session.job_group("post").new("supers", usecase: usecase, type: :update, sets: :core)
 
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
-              pgs = session.policy_groups
+              pgs           = session.policy_groups
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)
@@ -47,6 +47,7 @@ module Eco
                     person.account.send_invites = options[:send_invites] if options.key?(:send_invites)
 
                     unless options.dig(:exclude, :policy_groups)
+                      # avoid false updates by preserving the original order
                       person.account.policy_group_ids   = pgs.user_pg_ids(
                         initial:         ini_pg_ids,
                         final:           person.account.policy_group_ids

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

@@ -13,6 +13,10 @@ module Eco
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
               pgs           = session.policy_groups
 
+              if session.config.people.default_usergroup?
+                def_id  = pgs.to_id(session.config.people.default_usergroup)
+              end
+
               entries.each_with_index do |entry, i|
                 person = people.find(entry, strict: strict_search)
                 person = session.new_person if create = !person
@@ -41,7 +45,8 @@ module Eco
                 entry.set_details(person) unless options.dig(:exclude, :details)
 
                 unless options.dig(:exclude, :account)
-                  ini_pg_ids = person.account&.policy_group_ids || []
+                  add_account = !person.account
+                  ini_pg_ids  = person.account&.policy_group_ids || []
 
                   account_excluded = []
                   account_excluded.push("policy_group_ids") if options.dig(:exclude, :policy_groups) && !create
@@ -51,9 +56,18 @@ module Eco
                   person.account.send_invites = options[:send_invites] if options.key?(:send_invites)
 
                   unless options.dig(:exclude, :policy_groups) && !create
+                    end_pg_ids = person.account.policy_group_ids || []
+
+                    unless entry.policy_group_ids? && !add_account && !def_id
+                      # on account creation, if missing policy_group_ids column in the input
+                      # use default_usergroup, if it's defined
+                      end_pg_ids = [def_id]
+                    end
+
+                    # avoid false updates by preserving the original order
                     person.account.policy_group_ids   = pgs.user_pg_ids(
                       initial:         ini_pg_ids,
-                      final:           person.account.policy_group_ids
+                      final:           end_pg_ids
                     )
                   end
 

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

@@ -25,10 +25,8 @@ module Eco
         # @param usecase [Eco::API::UseCases::UseCase] target usecase
         # @return [Eco::API::UseCases::UseCaseIO]
         def new(usecase:, **kargs)
-          default = {
-            usecase: usecase,
-            job:     @job
-          }
+          default = { usecase: usecase }
+          default.merge!(job: @job) if @job
           super(**default.merge(kargs))
         end
 
@@ -53,12 +51,10 @@ module Eco
         def params(keyed: false)
           super(keyed: keyed).tap do |res|
             if keyed
-              res.merge!({
-                usecase: usecase,
-                job:     @job
-              })
+              res.merge!(usecase: usecase)
+              res.merge!(job: @job) if @job
             else
-              res.push(usecase).push(@job)
+              res.push(usecase).push(@job) if @job
             end
           end
         end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Oscar Segura
@@ -208,6 +208,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile