eco-helpers 3.0.26 → 3.0.27

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

@@ -108,86 +108,102 @@ module Eco
           # @note `Eco::API::Common::People::EntryFactory#entries` adds this `idx` (i.e. row number)
           # @return [Integer] the entry number in the input file
           def idx
-            final_entry["idx"]
+            final_entry['idx']
           end
 
           # @return [String, nil] the _internal id_ of this person if defined.
           def id
-            final_entry["id"]
+            final_entry['id']
           end
 
           def id?
-            final_entry.key?("id")
+            final_entry.key?('id')
           end
 
           # @return [String, nil] the _external id_ of this person if defined.
           def external_id
-            final_entry["external_id"]
+            final_entry['external_id']
           end
 
           def external_id?
-            final_entry.key?("external_id")
+            final_entry.key?('external_id')
+          end
+
+          def archived
+            final_entry['archived']
+          end
+
+          def archived_flag?
+            final_entry.key?('archived')
           end
 
           # @return [String, nil] the _name_ of this person if defined.
           def name
-            final_entry["name"]
+            final_entry['name']
           end
 
           def name?
-            final_entry.key?("name")
+            final_entry.key?('name')
           end
 
           # @return [String, nil] the _email_ of this person if defined.
           def email
-            final_entry["email"]
+            final_entry['email']
           end
 
           def email?
-            final_entry.key?("email")
+            final_entry.key?('email')
           end
 
           # @return [String, nil] the _supervisor id_ of this person if defined.
           def supervisor_id
-            final_entry["supervisor_id"]
+            final_entry['supervisor_id']
           end
 
           def supervisor_id=(value)
-            final_entry["supervisor_id"] = value
+            final_entry['supervisor_id'] = value
           end
 
           def supervisor_id?
-            final_entry.key?("supervisor_id")
+            final_entry.key?('supervisor_id')
           end
 
           def filter_tags
-            final_entry["filter_tags"] || []
+            final_entry['filter_tags'] || []
           end
 
           def filter_tags?
-            final_entry.key?("filter_tags")
+            final_entry.key?('filter_tags')
+          end
+
+          def contractor_organization_id
+            final_entry['contractor_organization_id']
+          end
+
+          def contractor_organization_id?
+            final_entry.key?('contractor_organization_id')
           end
 
           def policy_group_ids
-            final_entry["policy_group_ids"] || []
+            final_entry['policy_group_ids'] || []
           end
 
           def policy_group_ids?
-            final_entry.key?("policy_group_ids")
+            final_entry.key?('policy_group_ids')
           end
 
           def default_tag?
-            final_entry.key?("default_tag")
+            final_entry.key?('default_tag')
           end
 
           def default_tag
-            final_entry["default_tag"]
+            final_entry['default_tag']
           end
 
           # Provides a reference to this person entry.
           # @return [String] string summary of this person identity.
           def identify
-            str_id = id ? "id: '#{id}'; " : ""
+            str_id = id ? "id: '#{id}'; " : ''
             "(row: #{idx}) '#{name}' (#{str_id}ext_id: '#{external_id}'; email: '#{email}')"
           end
 
@@ -200,7 +216,7 @@ module Eco
             else
               final_entry.each.map do |k, v|
                 "'#{k}': '#{v.to_json}'"
-              end.join(" | ")
+              end.join(' | ')
             end
           end
 
@@ -217,7 +233,7 @@ module Eco
             @final_entry.slice(*scoped_attrs).each do |attr, value|
               set_part(person, attr, value)
             rescue StandardError => e
-              raise unless attr == "email"
+              raise unless attr == 'email'
 
               log(:error) { "#{e} - setting blank email instead." }
               set_part(person, attr, nil)
@@ -284,7 +300,7 @@ module Eco
           def _external_serializing(mapped_entry)
             target_attrs    = @emap.all_model_attrs | @emap.aliased_attrs
             rest_keys       = mapped_entry.keys - target_attrs
-            target_attrs   -= ["send_invites"]
+            target_attrs   -= ['send_invites']
             external_entry  = target_attrs.each_with_object({}) do |attr, hash|
               unless hash.key?(ext_attr = @emap.to_external(attr))
                 hash[ext_attr] = mapped_entry[attr]
@@ -312,7 +328,7 @@ module Eco
           # @return [Hash] entry with **internal** names and **external** values and types.
           def _mapped_serializing(internal_entry)
             mapped_hash = internal_entry.merge(_serialize_values(internal_entry, :internal))
-            model_attrs = @person_parser.all_model_attrs - ["send_invites"]
+            model_attrs = @person_parser.all_model_attrs - ['send_invites']
             aux_hash    = mapped_hash.slice(*model_attrs)
             merge_missing_attrs(aux_hash, mapped_hash)
           end
@@ -383,7 +399,7 @@ module Eco
               hash.merge(hash_attr(attr, get_part(person.details, attr)))
             end
             merging(core_hash, account_hash, details_hash) do |final_entry|
-              final_entry["Has account?"] = !person.account.nil?
+              final_entry['Has account?'] = !person.account.nil?
               final_entry.merge(_serialize_values(person, :person))
             end
           end
@@ -412,14 +428,14 @@ module Eco
               end
               value = @person_parser.serialize(:multiple, value) if field.multiple
               if @person_parser.defined?(field.type.to_sym)
-                value = @person_parser.serialize(field.type.to_sym, value, deps: {"attr" => attr})
+                value = @person_parser.serialize(field.type.to_sym, value, deps: {'attr' => attr})
               end
               value
             elsif %w[policy_group_ids filter_tags login_provider_ids starred_ids].include?(attr)
               @person_parser.serialize(:multiple, value)
-            elsif %w[freemium accept_eula].include?(attr)
+            elsif %w[freemium accept_eula archived].include?(attr)
               @person_parser.serialize(:boolean, value)
-            elsif ["subordinates"].include?(attr)
+            elsif ['subordinates'].include?(attr)
               @person_parser.serialize(:number, value)
             else
               value
@@ -437,19 +453,19 @@ module Eco
               value = @person_parser.parse(:multiple, value) if field.multiple
 
               if @person_parser.defined?(field.type.to_sym)
-                value = @person_parser.parse(field.type.to_sym, value, deps: {"attr" => attr})
+                value = @person_parser.parse(field.type.to_sym, value, deps: {'attr' => attr})
               end
               value
-            elsif attr == "email"
+            elsif attr == 'email'
               value = value.strip.downcase if value
               value
             elsif %w[policy_group_ids filter_tags login_provider_ids starred_ids].include?(attr)
               value = @person_parser.parse(:multiple, value)
-              value = value.compact.map(&:upcase) if attr == "filter_tags"
+              value = value.compact.map(&:upcase) if attr == 'filter_tags'
               value
-            elsif %w[freemium accept_eula].include?(attr)
+            elsif %w[freemium accept_eula archived].include?(attr)
               @person_parser.parse(:boolean, value)
-            elsif ["subordinates"].include?(attr)
+            elsif ['subordinates'].include?(attr)
               @person_parser.parse(:number, value)
             else
               value
@@ -527,13 +543,13 @@ module Eco
             print_it = proc do |name, model|
               puts "#{name}:"
               pp model
-              puts "*" * 30
+              puts '*' * 30
             end
 
-            fin = proc { print_it.call("final_entry",    @final_entry)    }
-            int = proc { print_it.call("internal_entry", @internal_entry) }
-            mad = proc { print_it.call("mapped_entry",   @mapped_entry)   }
-            ext = proc { print_it.call("external_entry", @external_entry) }
+            fin = proc { print_it.call('final_entry',    @final_entry)    }
+            int = proc { print_it.call('internal_entry', @internal_entry) }
+            mad = proc { print_it.call('mapped_entry',   @mapped_entry)   }
+            ext = proc { print_it.call('external_entry', @external_entry) }
 
             call_order = parsing? ? [ext, mad, int, fin] : [fin, int, mad, ext]
             call_order.each(&:call)

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

@@ -12,14 +12,16 @@ module Eco
         #   name attributes, including _core_, _account_ and _details_.
         class PersonParser
           extend Eco::API::Common::ClassAutoLoader
-          autoloads_children_of     "Eco::API::Common::Loaders::Parser"
-          autoload_namespace_ignore "Eco::API"
+          autoloads_children_of     'Eco::API::Common::Loaders::Parser'
+          autoload_namespace_ignore 'Eco::API'
 
           CORE_ATTRS = %w[
             id external_id email name
             supervisor_id filter_tags
-            contractor_organization_id freemium
+            archived
+            contractor_organization_id
             brand_id
+            freemium
           ].freeze
           ACCOUNT_ATTRS = %w[
             policy_group_ids default_tag
@@ -39,7 +41,7 @@ module Eco
 
           # @example Example of usage:
           #  person_parser = PersonParser.new(schema: schema)
-          #  person_parser.define_attribute("example") do |parser|
+          #  person_parser.define_attribute('example') do |parser|
           #    parser.def_parser  do |str, deps|
           #      i = value.to_i rescue 0
           #      i +=5 if deps.dig(:sum_5)
@@ -82,7 +84,7 @@ module Eco
             return nil unless @schema
 
             @select_tables ||= @schema.fields.select do |fld|
-              fld.type == "select"
+              fld.type == 'select'
             end.to_h do |fld|
               msg = "The schema selection field '#{fld.name}' is missing selection options."
               raise msg unless fld.options&.any?
@@ -239,7 +241,7 @@ module Eco
           def define_attribute(attr, dependencies: {}, &definition)
             unless valid?(attr)
               msg =  "The attribute '#{attr_to_str(attr)}' is not part of "
-              msg << "core, account or target schema, or does "
+              msg << 'core, account or target schema, or does '
               msg << "not match any type: #{@details_attrs}"
               raise msg
             end

data/lib/eco/api/common/session/logger/channels.rb

@@ -15,7 +15,7 @@ module Eco
 
             module ClassMethods
               def channels!(&def_block)
-                str = "Block with channel implementation expected. None given."
+                str = 'Block with channel implementation expected. None given.'
                 raise ArgumentError, str unless block_given?
 
                 channels.each do |channel|

data/lib/eco/api/common/session/logger.rb

@@ -73,5 +73,5 @@ module Eco
   end
 end
 
-require_relative "logger/cache"
-require_relative "logger/log"
+require_relative 'logger/cache'
+require_relative 'logger/log'

data/lib/eco/api/common/session/mailer/aws_provider.rb

@@ -11,14 +11,14 @@ module Eco
                 source:      fetch_from,
                 message:     {
                   subject: {
-                    charset: "UTF-8",
+                    charset: 'UTF-8',
                     data:    subject
                   },
                   body:    {
                     # NOTE: (html) will let you send html instead
                     # you can use both at once if you like
                     text: {
-                      charset: "UTF-8",
+                      charset: 'UTF-8',
                       data:    body
                     }
                   }
@@ -59,6 +59,7 @@ module Eco
               }.tap do |dest|
                 cc  = [cc].flatten.compact.uniq
                 bcc = [bcc].flatten.compact.uniq
+
                 dest.merge!(cc_addresses: cc)   unless cc.empty?
                 dest.merge!(bcc_addresses: bcc) unless bcc.empty?
               end

data/lib/eco/api/common/session/mailer/provider_base.rb

@@ -9,6 +9,7 @@ module Eco
               def to_desc(to: nil, cc: nil, bcc: nil)
                 cc_to  = [cc].flatten.compact.uniq
                 bcc_to = [bcc].flatten.compact.uniq
+
                 { to_addresses: [to].flatten.compact.uniq }.tap do |dest|
                   dest.merge!(cc_addresses: cc_to)   unless cc_to.empty?
                   dest.merge!(bcc_addresses: bcc_to) unless bcc_to.empty?
@@ -26,7 +27,7 @@ module Eco
             end
 
             def send_mail(subject:, body:, to: nil, cc: nil, bcc: nil) # rubocop:disable Lint/UnusedMethodArgument
-              raise "You must implement this method"
+              raise 'You must implement this method'
             end
 
             def fetch_to(value = nil)

data/lib/eco/api/common/session/mailer/sendgrid_provider.rb

@@ -16,7 +16,7 @@ module Eco
                 bcc:     bcc
               )
 
-              mailer._("send").post(request_body: data)
+              mailer._('send').post(request_body: data)
             end
 
             def fetch_to(value = nil)
@@ -40,20 +40,20 @@ module Eco
 
             def to_data(subject:, body:, to: nil, cc: nil, bcc: nil)
               {
-                "personalizations" => [
+                'personalizations' => [
                   {
-                    "to"      => fetch_to(to).flatten,
-                    "subject" => subject
+                    'to'      => fetch_to(to).flatten,
+                    'subject' => subject
                   }.tap do |pers|
                     merge_if('cc', cc, target: pers)
                     merge_if('bcc', bcc, target: pers)
                   end
                 ],
-                "from"             => fetch_from,
-                "content"          => [
+                'from'             => fetch_from,
+                'content'          => [
                   {
-                    "type"  => "text/plain",
-                    "value" => body
+                    'type'  => 'text/plain',
+                    'value' => body
                   }
                 ]
               }
@@ -87,7 +87,7 @@ module Eco
                 return if value.to_s.strip.empty?
 
                 {
-                  "email" => value
+                  'email' => value
                 }
               end
             end

data/lib/eco/api/common/session/mailer.rb

@@ -31,7 +31,7 @@ module Eco
             return false unless (serv = service)
 
             unless serv.configured?
-              msg  = "Mailer: You are missing configuration parameters "
+              msg  = 'Mailer: You are missing configuration parameters '
               msg << "for '#{provider}'. Review your .env file"
               log(:error) { msg }
               return false
@@ -48,10 +48,11 @@ module Eco
 
               to_addr = serv.fetch_to(to)
               msg     = "Sent email #{ProviderBase.to_desc(
-                to: to_addr,
-                cc: cc,
+                to:  to_addr,
+                cc:  cc,
                 bcc: bcc
               )}"
+
               puts msg
               log(:debug) { msg }
             end
@@ -69,6 +70,7 @@ module Eco
               msg = "Unknown mail provider '#{provider}'"
               puts msg
               log(:debug) { msg }
+
               nil
             end
           end

data/lib/eco/api/common/session/sftp.rb

@@ -102,12 +102,12 @@ module Eco
           # @param local_folder [String] local destination folder (`"."` if not specified)
           # @return [Array<String>] list of created files
           def download(files, local_folder: nil, &block)
-            puts "Creating local files:"
+            puts 'Creating local files:'
             created_files = []
 
             [files].flatten.compact.map do |fullname|
               basename = windows_basename(fullname)
-              dest_fullname = File.join(local_folder || ".", basename)
+              dest_fullname = File.join(local_folder || '.', basename)
               puts " * #{dest_fullname}"
               created_files << dest_fullname
               sftp_session.download(fullname, dest_fullname)

data/lib/eco/api/common/version_patches/object.rb

@@ -2,8 +2,9 @@ Object.class_eval do
   unless method_defined?(:yield_self)
     define_method(:yield_self) do |&block|
       return block.call(self) if block
+
       out = self
-      out = [self] unless self.is_a?(Enumerable)
+      out = [self] unless is_a?(Enumerable)
       out.each
     end
   end

data/lib/eco/api/custom/mailer.rb

@@ -1,7 +1,7 @@
 # Helper class to create a custom `Config`
 # @example Example of usage:
 #  class Custom::Workflow::Mailer < Eco::API::Custom::Mailer
-#    ORG = "Org Name"
+#    ORG = 'Org Name'
 #  end
 class Eco::API::Custom::Mailer < Eco::API::Common::Loaders::Workflow::Mailer
   extend Eco::Language::Klass::WhenInherited

data/lib/eco/api/error/handlers.rb

@@ -2,8 +2,8 @@ module Eco
   module API
     class Error
       class Handlers < Eco::API::UseCases
-        autoloads_children_of "Eco::API::Common::Loaders::ErrorHandler"
-        autoload_namespace_ignore "Eco::API"
+        autoloads_children_of 'Eco::API::Common::Loaders::ErrorHandler'
+        autoload_namespace_ignore 'Eco::API'
 
         def define(*_args)
           raise "Missusage. You should use 'on' method instead"
@@ -12,7 +12,7 @@ module Eco
         # @param klass_err [Eco::API::Error] the specific error class that triggers this handler.
         def on(klass_err, type: :error_handler, retry: true, &block)
           Eco::API::Error.validate_err_class(klass_err)
-          raise "Expected block but not given" unless block
+          raise 'Expected block but not given' unless block
 
           Eco::API::Error::Handler.new(
             klass_err,

data/lib/eco/api/error.rb

@@ -9,82 +9,82 @@ module Eco
         end
       end
 
-      @str_err = "api error on the server reply"
+      @str_err = 'api error on the server reply'
       @match   = /.*/
       #RxValidId = /[a-f0-9]{24}/
 
       class Unclassified < Eco::API::Error
-        @str_error = "Unclassified error message"
+        @str_error = 'Unclassified error message'
         @match     = /.*/
       end
 
       class InternalServerError < Eco::API::Error
-        @str_err = "Internal Server Error"
+        @str_err = 'Internal Server Error'
         @match   = /#{@str_err}/
       end
 
       class UnknownPersonId < Eco::API::Error
-        @str_err = "Unknown person id"
+        @str_err = 'Unknown person id'
         @match   = /Cannot find person with id (.*)/
       end
 
       class ExternalIdTaken < Eco::API::Error
-        @str_err = "external ID already taken"
+        @str_err = 'external ID already taken'
         @match   = /#{@str_err}/
       end
 
       class EmailMissing < Eco::API::Error
-        @str_err = "missing email for account creation"
+        @str_err = 'missing email for account creation'
         @match   = /#{@str_err}/
       end
 
       class EmailInvalid < Eco::API::Error
-        @str_err = "Email is invalid"
+        @str_err = 'Email is invalid'
         @match   = /#{@str_err}/
       end
 
       class EmailTaken < Eco::API::Error
-        @str_err   = "user email already taken"
-        @str_err_2 = "Email is already taken"
+        @str_err   = 'user email already taken'
+        @str_err_2 = 'Email is already taken'
         @match     = /(?:#{@str_err}|#{@str_err_2})/
       end
 
       class SupervisorNotFound < Eco::API::Error
-        @str_err = "Supervisor not found"
+        @str_err = 'Supervisor not found'
         @match   = /Supervisor (.*?) not found/
       end
 
       class CyclicSupervisor < Eco::API::Error
-        @str_err = "Supervisor is cyclic!"
+        @str_err = 'Supervisor is cyclic!'
         @match   = /#{@str_err}/
       end
 
       class SchemaNotFound < Eco::API::Error
-        @str_err = "Schema not found"
+        @str_err = 'Schema not found'
         @match   = /Schema (.*?) not found/
       end
 
       class InvalidObjectId < Eco::API::Error
-        @str_err = "Invalid ObjectId."
+        @str_err = 'Invalid ObjectId.'
         @match   = /'(.*?)' is an invalid ObjectId./
       end
 
       class UnknownField < Eco::API::Error
-        @str_err = "Unknown field."
+        @str_err = 'Unknown field.'
         @match   = /(.+?) is an unknown field/
 
         class UnknownCoreField < UnknownField
-          @str_err = "Unknown core field."
+          @str_err = 'Unknown core field.'
           @match   = /(.+?) is an unknown field/
         end
 
         class UnknownAccountField < UnknownField
-          @str_err = "Unknown account field."
+          @str_err = 'Unknown account field.'
           @match   = /account > (.+?) is an unknown field/
         end
 
         class UnknownDetailsField < UnknownField
-          @str_err = "Unknown details field."
+          @str_err = 'Unknown details field.'
           @match   = /details > (.+?) is an unknown field/
         end
       end

data/lib/eco/api/microcases/people/apply_changes/set_account/account_excluded.rb

@@ -12,17 +12,9 @@ module Eco
                 [].tap do |account_excluded|
                   next if person.new?
 
-                  if options.dig(:exclude, :policy_groups)
-                    account_excluded.push('policy_group_ids')
-                  end
-
-                  if options.dig(:exclude, :default_tag)
-                    account_excluded.push('default_tag')
-                  end
-
-                  if options.dig(:exclude, :login_providers)
-                    account_excluded.push('login_provider_ids')
-                  end
+                  account_excluded.push('policy_group_ids')   if options.dig(:exclude, :policy_groups)
+                  account_excluded.push('default_tag')        if options.dig(:exclude, :default_tag)
+                  account_excluded.push('login_provider_ids') if options.dig(:exclude, :login_providers)
                 end
               end
             end

data/lib/eco/api/microcases/people/apply_changes/set_core/core_excluded.rb

@@ -5,13 +5,16 @@ module Eco
         module ApplyChanges
           module SetCore
             module CoreExcluded
+              CAN_EXCLUDE_CREATION = %w[filter_tags archived contractor_organization_id].freeze
+              CAN_EXCLUDE_UPDATE   = %w[name external_id email filter_tags contractor_organization_id].freeze
+
               # @note by default `supervisor_id` is always excluded.
               # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
               # @param options [Hash] the options.
               # @return [Array<String>] the core parameters that should not be included.
               def core_excluded(person, options)
                 ['supervisor_id'].tap do |core_excluded|
-                  can_exclude = person.new?? ['filter_tags'] : %w[name external_id email filter_tags]
+                  can_exclude = person.new?? CAN_EXCLUDE_CREATION : CAN_EXCLUDE_UPDATE
 
                   exclusions  = can_exclude.select do |attr|
                     options.dig(:exclude, attr.to_sym)

data/lib/eco/api/microcases/people/manage/search.rb

@@ -93,7 +93,9 @@ module Eco
                 next if !sup_id || request.include?(spr)
 
                 micro.with_supervisor(sup_id, people) do |supervisor|
-                  request.push(spr) unless supervisor
+                  next if supervisor
+
+                  request.push(spr)
                 end
               end
             end

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

@@ -14,6 +14,7 @@ module Eco
 
         def initialize(people = [], klass: Ecoportal::API::Internal::Person)
           @klass = Ecoportal::API::Internal::Person unless klass == Ecoportal::API::V1::Person
+
           super(people, klass: @klass)
           @caches_init = false
         end

data/lib/eco/api/policies.rb

@@ -3,8 +3,8 @@ module Eco
     # @todo the autoloading happens on `add`, and there could be multiple pending children to load.
     #   This could translate into the policies not being loaded in order
     class Policies < Eco::API::UseCases
-      autoloads_children_of "Eco::API::Common::Loaders::Policy"
-      autoload_namespace_ignore "Eco::API"
+      autoloads_children_of 'Eco::API::Common::Loaders::Policy'
+      autoload_namespace_ignore 'Eco::API'
 
       attr_reader :policies