eco-helpers 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3506fbbcb2da4707ebb9451ea0f4afe1549923a4af2aed306d929243a94016df
-  data.tar.gz: 5279c8a96662b19c097cb9d2e0a35b2d29ccb917ec77873ff0fb248b83d51069
+  metadata.gz: 726f5a5930889b9fd59b4acc4ce7b938e3c6011909c2f5a5bb1a105a36df4d9b
+  data.tar.gz: 804bc3ae796491543ec3615e9f11308333e7ea6fc9a10f943778f66922aa4a25
 SHA512:
-  metadata.gz: 5100d854ec4b3ca20f8127d4128325ad8e557d554167917af7d495761da81f2e21be2f45b33dd00b02d1d7f830299f1bcde6e88134db62b021ddef6c7a234f88
-  data.tar.gz: d65ef75ed11d804ee4d45768533c8d4ccef60c88fc435dc6d9df909d87f962a7914036e110cf8c4231b53b1738c85369458ca2e464dc7efefce3e3760a9d4c04
+  metadata.gz: f2e1c852b4660ae1bdc3e94bab274f3d4b7168c6affef57315b370af102b71cff19cdb0c2de0b59899f82b7f2f8b0478688cf018f3c52f26c1f1d891ed19cd65
+  data.tar.gz: 032a93267eb45f7550fbdad7805d0f472a0ea1a98353b089147bd71de785cdeaa4933b233bdd22d4ab69f7a85bfa65ec1f0850fe82e446dcf4d5f503ba1f191b

data/CHANGELOG.md

@@ -1,21 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.12] - 2021-03-29
+## [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`
 
 ### Changed
-  - `Eco::CLI#run` it does include any defined states on the workflow
 
 ### Fixed
+  - Ensure auto-loading for `Eco::API::UseCases`
 
+## [2.0.12] - 2021-03-29
 
-## [2.0.11] - 2021-03-29
+### Changed
+  - `Eco::CLI#run` it does include any defined states on the workflow
 
-### Added
 
-### Changed
+## [2.0.11] - 2021-03-29
 
 ### Fixed
   - `Eco::API::Session::Batch:Errors#errors` changed `Array#filter` call to `Array#select` call
@@ -35,34 +38,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
@@ -70,46 +63,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
@@ -123,7 +103,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
 
@@ -145,11 +124,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`
 
@@ -165,23 +141,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.
 
@@ -190,14 +159,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.
@@ -205,15 +168,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
@@ -221,8 +180,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`
 
@@ -230,14 +187,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
@@ -378,14 +332,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`
@@ -395,22 +346,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
@@ -433,7 +379,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
 
@@ -441,33 +386,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
 
@@ -476,14 +412,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/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/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/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/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.12"
+  VERSION = "2.0.13"
 end

metadata

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