eco-helpers 1.3.19 → 1.5.1

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

@@ -26,17 +26,24 @@ module Eco
             end
           end
 
-          def add(name, key:, host:, version: :internal, mode: :local)
+          def add(name, key:, host:, version: :internal, mode: :local, user_key: nil, external_key: nil)
             apis[name] = Session::Config::Api.new(
-              key: key,
-              host: host,
-              version: version,
-              mode: mode,
-              root: self
+              name,
+              key:      key,
+              host:     host,
+              version:  version,
+              mode:     mode,
+              root:     self,
+              user_key: user_key,
+              external_key: external_key
             )
             self
           end
 
+          def active_api
+            self["active-api"]
+          end
+
           def active_name=(name)
             raise "'#{name}' Api environment not defined" if !apis[name]
             self["active-name"] = name
@@ -53,34 +60,26 @@ module Eco
             active_name
           end
 
-          def active_api
-            self["active-api"]
-          end
-
           def service_up?
-            api_klass = (active_api.version == :external)? Ecoportal::API::External : Ecoportal::API::Internal
-            @api_test ||= api_klass.new("foobar", host: active_api.host, logger: ::Logger.new(IO::NULL))
+            @api_test ||= Session::Config::Api.api_class(active_api.version).new("foobar", host: active_api.host, logger: ::Logger.new(IO::NULL))
             status = @api_test.client.get("/policy_groups").status
             # 401 Unauthorized "Permission denied. API key may be invalid."
             status == 401
           end
 
-          def api(logger = ::Logger.new(IO::NULL), force_new: false)
-            key     = active_api.key
-            host    = active_api.host
-            mode    = active_api.mode
-            version = active_api.version
-            return @api if (!force_new) && @api && key == @key && host == @host && @mode == mode && version == @version
-
-            api_klass = (version == :external)? Ecoportal::API::External : Ecoportal::API::Internal
+          def api(logger = ::Logger.new(IO::NULL), version: nil)
+            unless active_api
+              raise "There's no 'active_api'. Use apis.active_name='api_enviro_name' to set the active api"
+            end
+            active_api.api(version: version, logger: logger)
+          end
 
-            @api  = api_klass.new(key, host: host, logger: logger)
-            @key  = key; @host = host; @mode = mode; @version = version
-            @api
+          def default_user_key=(key)
+            self["user_key"] = key
           end
 
-          def new_api(logger = ::Logger.new(IO::NULL))
-            api(logger, force_new: true)
+          def default_user_key
+            self["user_key"]
           end
 
         end

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

@@ -40,6 +40,7 @@ module Eco
                     person.email         = entry.email         unless options.dig(:exclude, :email)
                     person.supervisor_id = entry.supervisor_id unless options.dig(:exclude, :supervisor)
                     person.filter_tags   = entry.filter_tags || [] unless options.dig(:exclude, :filter_tags)
+                    person.freemium      = entry.freemium
                   end
 
                   unless options.dig(:exclude, :account)

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

@@ -0,0 +1,53 @@
+module Eco
+  module API
+    class UseCases
+      class DefaultCases
+        class HrisCase < DefaultCase
+
+          def process
+            @cases.define("hris", type: :sync) do |entries, people, session, options, usecase|
+              micro = session.microcases
+
+              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_leavers(entries, people, options, leavers) do |person|
+                person.supervisor_id = nil
+                person.account       = nil if person.account
+              end
+              
+              people.each_with_index  do |person, i|
+                if person = people.find(entry, strict: micro.strict_search(options))
+                if !entries.find(person, strict: strict: micro.strict_search(options))
+                  leavers.add(person) do |person|
+                    person.supervisor_id = nil
+                    person.account       = nil if person.account
+                  end
+                end
+              end
+
+              entries.each_with_index do |entry, i|
+                if person = people.find(entry, strict: micro.strict_search(options))
+                  update.add(person)
+                else
+                  person = session.new_person
+                  creation.add(person)
+                end
+
+                micro.set_core(entry, person, options, people, supers)
+                entry.set_details(person) unless options.dig(:exclude, :details)
+                micro.set_account(entry, person, options)
+              end
+
+            end
+
+
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Eco
+  module API
+    class UseCases
+      class DefaultCases
+        class UpdateCase < DefaultCase
+
+          def process
+            @cases.define("update", type: :sync) do |entries, people, session, options, usecase|
+              micro = session.microcases
+
+              update   = session.new_job("main", "update", :update, usecase)
+              supers   = session.new_job("post", "supers", :update, usecase, :core)
+
+              entries.each.with_index do |entry, i|
+                if person = people.find(entry, strict: micro.strict_search(**params))
+                  micro.set_core(entry, person, options, people, supers)
+                  entry.set_details(person) unless options.dig(:exclude, :details)
+                  micro.set_account(entry, person, options)
+
+                  update.add(person)
+                else
+                  session.logger.error("Entry(#{i}) - this person does not exist: #{entry.to_s(:identify)}")
+                end
+              end
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/eco/api/usecases/microed_cases/update_details_case.rb

@@ -0,0 +1,30 @@
+module Eco
+  module API
+    class UseCases
+      class DefaultCases
+        class UpdateDetailsCase < DefaultCase
+
+          def process
+            @cases.define("update-details", type: :sync) do |entries, people, session, options, usecase|
+              micro = session.microcases
+
+              update   = session.new_job("main", "update", :update, usecase)
+              supers   = session.new_job("post", "supers", :update, usecase, :core)
+
+              entries.each.with_index do |entry, i|
+                if person = people.find(entry, strict: micro.strict_search(options))
+                  micro.set_core(entry, person, options, people, supers)
+                  entry.set_details(person) unless options.dig(:exclude, :details)
+                  update.add(person)
+                else
+                  session.logger.error("Entry(#{i}) - this person does not exist: #{entry.to_s(:identify)}")
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Eco
+  module API
+    class UseCases
+      class DefaultCases
+        class UpsertCase < DefaultCase
+
+          def process
+            @cases.define("upsert", type: :sync) do |entries, people, session, options, usecase|
+              micro = session.microcases
+
+              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)
+
+              entries.each_with_index do |entry, i|
+                params = [entry, person, session, options]
+
+                if person = people.find(entry, strict: micro.strict_search(options))
+                  update.add(person)
+                else
+                  person = session.new_person
+                  creation.add(person)
+                end
+
+                micro.set_core(entry, person, options, people, supers)
+                entry.set_details(person) unless options.dig(:exclude, :details)
+                micro.set_account(entry, person, options)
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/eco/csv.rb

@@ -15,9 +15,14 @@ module Eco
       end
 
       def read(file, **kargs)
-        coding = Eco::API::Common::Session::FileManager.encoding(file)
-        kargs = {headers: true,  skip_blanks: true,  encoding: coding}.merge(kargs)
-        out = super(file, **kargs).reject do |row|
+        kargs = {headers: true,  skip_blanks: true}.merge(kargs)
+
+        args = [file].tap do |arg|
+          coding = Eco::API::Common::Session::FileManager.encoding(file)
+          arg.push("rb:bom|utf-8") if coding == "bom"
+        end
+
+        out = super(*args, **kargs).reject do |row|
           values = row.to_hash.values
           values.all?(&:nil?) || values.map(&:to_s).all?(&:empty?)
         end

data/lib/eco/data/files/helpers.rb

@@ -62,8 +62,13 @@ module Eco
           File.write(dest_file, File.read(source_file))
         end
 
+        def file_empty?(path)
+          return true if !File.file?(path)
+          File.zero?(path)
+        end
+
         def has_bom?(path)
-          return false if !path
+          return false if !path || file_empty?(path)
           File.open(path, "rb") do |f|
             bytes = f.read(3)
             return bytes.unpack("C*") == [239, 187, 191]
@@ -71,7 +76,7 @@ module Eco
         end
 
         def encoding(path)
-          has_bom?(path) ? "bom|utf-8" : "utf-8"
+          has_bom?(path) ? "bom" : "utf-8"
         end
 
         def script_subfolder

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.3.19"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.5.1
 platform: ruby
 authors:
 - Oscar Segura
@@ -14,76 +14,82 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -91,9 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,69 +107,89 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: ecoportal-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: ecoportal-api-oozes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.64.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.64.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.29.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.29.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -171,9 +197,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,29 +207,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: 
 email:
 - oscar@ecoportal.co.nz
@@ -230,8 +256,10 @@ files:
 - lib/eco/api/common/people/default_parsers/boolean_parser.rb
 - lib/eco/api/common/people/default_parsers/csv_parser.rb
 - lib/eco/api/common/people/default_parsers/date_parser.rb
+- lib/eco/api/common/people/default_parsers/freemium_parser.rb
 - lib/eco/api/common/people/default_parsers/multi_parser.rb
 - lib/eco/api/common/people/default_parsers/numeric_parser.rb
+- lib/eco/api/common/people/default_parsers/policy_groups_parser.rb
 - lib/eco/api/common/people/default_parsers/select_parser.rb
 - lib/eco/api/common/people/default_parsers/send_invites_parser.rb
 - lib/eco/api/common/people/entries.rb
@@ -253,8 +281,6 @@ files:
 - lib/eco/api/common/session/sftp.rb
 - lib/eco/api/common/version_patches.rb
 - lib/eco/api/common/version_patches/ecoportal_api.rb
-- lib/eco/api/common/version_patches/ecoportal_api/account_preferences.rb
-- lib/eco/api/common/version_patches/ecoportal_api/base_model.rb
 - lib/eco/api/common/version_patches/ecoportal_api/external_person.rb
 - lib/eco/api/common/version_patches/ecoportal_api/internal_person.rb
 - lib/eco/api/common/version_patches/exception.rb
@@ -263,6 +289,15 @@ files:
 - lib/eco/api/error.rb
 - lib/eco/api/error/handler.rb
 - lib/eco/api/error/handlers.rb
+- lib/eco/api/microcases.rb
+- lib/eco/api/microcases/core_excluded.rb
+- lib/eco/api/microcases/fix_filter_tags.rb
+- lib/eco/api/microcases/set_account.rb
+- lib/eco/api/microcases/set_core.rb
+- lib/eco/api/microcases/set_default_group.rb
+- lib/eco/api/microcases/set_default_tag.rb
+- lib/eco/api/microcases/set_supervisor.rb
+- lib/eco/api/microcases/strict_search.rb
 - lib/eco/api/organization.rb
 - lib/eco/api/organization/login_providers.rb
 - lib/eco/api/organization/people.rb
@@ -331,6 +366,10 @@ files:
 - lib/eco/api/usecases/default_cases/update_case.rb
 - lib/eco/api/usecases/default_cases/update_details_case.rb
 - lib/eco/api/usecases/default_cases/upsert_case.rb
+- lib/eco/api/usecases/microed_cases/hris_case.rb
+- lib/eco/api/usecases/microed_cases/update_case.rb
+- lib/eco/api/usecases/microed_cases/update_details_case.rb
+- lib/eco/api/usecases/microed_cases/upsert_case.rb
 - lib/eco/api/usecases/use_case.rb
 - lib/eco/api/usecases/use_case_chain.rb
 - lib/eco/api/usecases/use_case_io.rb