eco-helpers 2.0.12 → 2.0.17

data/lib/eco/api/common/people/default_parsers/login_providers_parser.rb

@@ -20,7 +20,7 @@ class Eco::API::Common::People::DefaultParsers::LoginProvidersParser < Eco::API:
   private
 
   def login_providers
-    @login_providers ||= ASSETS.config.login_providers
+    @login_providers ||= config.login_providers
   end
 
 end

data/lib/eco/api/common/people/default_parsers/policy_groups_parser.rb

@@ -1,31 +1,31 @@
 class Eco::API::Common::People::DefaultParsers::PolicyGroupsParser < Eco::API::Common::Loaders::Parser
   attribute "policy_group_ids"
+  parsing_phase     :final
 
   def parser(hash, deps)
-    policy_group_ids = []
-    if policy_ids = hash["policy_group_ids"]
-      policy_group_ids = policy_ids.split("|").map do |name|
-        policy_groups.to_id(name&.downcase.strip)
-      end.compact
+    policy_group_ids = hash["policy_group_ids"] || []
+    policy_group_ids.map do |name|
+      policy_groups.to_id(name&.downcase.strip)
+    end.compact.tap do |pg_names|
+      pg_names.push(default_id) if pg_names.empty?
     end
-    policy_group_ids.empty?? default_id : policy_group_ids.join("|")
   end
 
   def serializer(person, deps)
     ids   = person&.account&.policy_group_ids || []
     ids.map do |id|
       policy_groups.to_name(id)
-    end.compact.join("|")
+    end.compact
   end
 
   private
 
-  def policy_groups
-    @policy_groups ||= ASSETS.config.policy_groups
+  def default_id
+    @default_id    ||= policy_groups.to_id(config.people.default_usergroup)
   end
 
-  def default_id
-    @default_id    ||= policy_groups.to_id(ASSETS.config.people.default_usergroup)
+  def policy_groups
+    @policy_groups ||= config.policy_groups
   end
 
 end

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

@@ -57,6 +57,11 @@ module Eco
             @internal_entry
           end
 
+          # @return [Hash] entry `Hash` with **internal** attribute names, but **external** types and values.
+          def mapped_entry
+            @mapped_entry
+          end
+
           # @note values ready to be set to a person.
           # @return [Hash] entry `Hash` with **internal** attribute names, values and types.
           def final_entry
@@ -205,7 +210,6 @@ module Eco
           # @param exclude [String, Array<String>] account properties that should not be set/changed to the person.
           def set_account(person, exclude: nil)
             person.account = {} if !person.account
-            person.account.permissions_preset = nil unless person.account.permissions_preset = "custom"
             scoped_attrs = @emap.account_attrs - into_a(exclude)
             @final_entry.slice(*scoped_attrs).each do |attr, value|
               set_part(person.account, attr, value)
@@ -285,7 +289,10 @@ module Eco
           # @param internal_entry [Hash] entry with **internal** names and values, but **external** types.
           # @return [Hash] entry with **internal** names and **external** values and types.
           def _mapped_serializing(internal_entry)
-            internal_entry.merge(_serialize_values(internal_entry, :internal))
+            mapped_hash = internal_entry.merge(_serialize_values(internal_entry, :internal))
+            model_attrs = @person_parser.all_model_attrs - ["send_invites"]
+            aux_hash    = mapped_hash.slice(*model_attrs)
+            merge_missing_attrs(aux_hash, mapped_hash)
           end
 
           # Parsing helper that just **parses the values** that have a parser/serializer defined.

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

@@ -15,6 +15,7 @@ module Eco
             # Reorders as follows:
             #   1. supervisors, people with no supervisor or where their supervisor not present
             #   2. subordinates
+            # @return [Array<Entry>] `values` sorted by supervisors/subordinates
             def sort_by_supervisors(values, supervisors_first: true)
               raise "Expected non hash Enumerable. Given: #{values.class}" if values.is_a?(Hash)
               return [] unless values && values.is_a?(Enumerable)
@@ -32,6 +33,32 @@ module Eco
               roam.call(supervisors_tree(values))
             end
 
+            # Identifies all the cyclic supervisor chains
+            # @note as `supervisors_tree` will have any entry involved in a cycle at the top, it just checks all the top entries against their offspring
+            # @return [Array<Array>] the sets of entries that are cyclic
+            def identify_cyclic_chains(values)
+              raise "Expected non hash Enumerable. Given: #{values.class}" if values.is_a?(Hash)
+              return [] unless values && values.is_a?(Enumerable)
+
+              identify  = Proc.new do |top_sup, offspring, chain = [top_sup]|
+                next [] if offspring.empty?
+                offspring.each_with_object([]) do |(sup, subordinates), set|
+                  break set unless set.empty?
+                  if top_sup.supervisor_id == sup.id
+                    set.concat(chain, [sup])
+                  else
+                    set = identify.call(top_sup, subordinates, chain | [sup])
+                  end
+                end
+              end
+
+              supervisors_tree(values).each_with_object([]) do |(top_sup, offspring), sets|
+                if (set = identify.call(top_sup, offspring)) && !set.empty?
+                  sets.push(set)
+                end
+              end
+            end
+
             def tree_to_str(tree, lev: 0)
               raise "Required Hash tree structure. Given: #{tree.class}" unless tree.is_a?(Hash)
               "".tap do |str|

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

@@ -20,8 +20,8 @@ module Eco
             begin
               @dir = Eco::Data::Files::Directory.new(value)
               @dir_path = @dir.create
-            rescue
-              logger.error("could not create or make any sense of directory '#{value}'")
+            rescue Exception => e
+              logger.error("could not create or make any sense of directory '#{value}': #{e.to_s}")
             end
           end
 

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

@@ -1,5 +1,4 @@
 require 'aws-sdk-ses'
-require 'dotenv/load'
 
 module Eco
   module API

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

@@ -1,5 +1,4 @@
 require 'aws-sdk-s3'
-require 'dotenv/load'
 
 module Eco
   module API

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

@@ -1,5 +1,4 @@
 require "net/sftp"
-require 'dotenv/load'
 
 module Eco
   module API

data/lib/eco/api/error.rb

@@ -80,6 +80,7 @@ module Eco
             next  1 if k1 < k2
             0
           end.tap do |siblings|
+            siblings.delete(Unclassified)
             if direct
               siblings.reject! do |si|
                 siblings.any? {|s| si < s}
@@ -96,17 +97,18 @@ module Eco
           err_msg =~ @match
         end
 
-        def get_type(err_msg)
+        def get_type(err_msg, first: true)
           type = nil
           descendants(direct: true).reverse.each do |klass|
             if klass.err_match?(err_msg)
               type = klass
               if klass.descendants?(direct: true)
-                type = klass.get_type(err_msg) || type
+                type = klass.get_type(err_msg, first: false) || type
               end
             end
           end
-          type
+          return type unless first
+          type || Unclassified
         end
 
         def known_err_class?(klass)

data/lib/eco/api/microcases.rb

@@ -19,7 +19,9 @@ require_relative 'microcases/people_cache'
 require_relative 'microcases/people_load'
 require_relative 'microcases/people_refresh'
 require_relative 'microcases/people_search'
-require_relative 'microcases/refresh_abilities'
+require_relative 'microcases/preserve_filter_tags'
+require_relative 'microcases/preserve_default_tag'
+require_relative 'microcases/preserve_policy_groups'
 require_relative 'microcases/set_account'
 require_relative 'microcases/set_core_with_supervisor'
 require_relative 'microcases/set_core'

data/lib/eco/api/microcases/append_usergroups.rb

@@ -9,7 +9,6 @@ module Eco
         unless options.dig(:exclude, :account)
           if person.account
             person.account.policy_group_ids |= entry.policy_group_ids
-            micro.refresh_abilities(person, options)
           end
         end
       end

data/lib/eco/api/microcases/people_cache.rb

@@ -9,9 +9,9 @@ module Eco
 
         start = Time.now
         people = session.batch.get_people
-        secs    = Time.now - start
+        secs    = (Time.now - start).round(3)
         cnt     = people.count
-        per_sec = (cnt.to_f / secs).floor
+        per_sec = (cnt.to_f / secs).round(2)
         logger.info("Loaded #{cnt} people in #{secs} seconds (#{per_sec} people/sec)")
 
         file   = file_manager.save_json(people, filename, :timestamp)

data/lib/eco/api/microcases/people_load.rb

@@ -34,9 +34,9 @@ module Eco
 
           start = Time.now
           session.batch.get_people.tap do |people|
-            secs    = Time.now - start
+            secs    = (Time.now - start).round(3)
             cnt     = people.count
-            per_sec = (cnt.to_f / secs).floor
+            per_sec = (cnt.to_f / secs).round(2)
             logger.info("Loaded #{cnt} people in #{secs} seconds (#{per_sec} people/sec)")
 
             if modifier.include?(:save) && people && people.length > 0

data/lib/eco/api/microcases/people_refresh.rb

@@ -21,9 +21,9 @@ module Eco
 
         start = Time.now
         entries = session.batch.get_people(people, silent: true)
-        secs    = Time.now - start
+        secs    = (Time.now - start).round(3)
         cnt     = entries.count
-        per_sec = (cnt.to_f / secs).floor
+        per_sec = (cnt.to_f / secs).round(2)
         logger.info("Re-loaded #{cnt} people (out of #{people.length}) in #{secs} seconds (#{per_sec} people/sec)")
 
         missing = people.length - entries.length

data/lib/eco/api/microcases/people_search.rb

@@ -14,10 +14,10 @@ module Eco
 
         start = Time.now
         people = session.batch.search(data, silent: silent).yield_self do |status|
-          secs    = Time.now - start
+          secs    = (Time.now - start).round(3)
           Eco::API::Organization::People.new(status.people).tap do |people|
             cnt     = people.count
-            per_sec = (cnt.to_f / secs).floor
+            per_sec = (cnt.to_f / secs).round(2)
             msg     = "... could get #{cnt} people (out of #{data.length} entries) in #{secs} seconds (#{per_sec} people/sec)"
             session.logger.info(msg)
           end
@@ -29,10 +29,10 @@ module Eco
           session.logger.info("  Going to api get #{supers.length} current supervisors...")
           start = Time.now
           people = session.batch.search(supers, silent: silent).yield_self do |status|
-            secs    = Time.now - start
+            secs    = (Time.now - start).round(3)
             found   = status.people
             cnt     = found.count
-            per_sec = (cnt.to_f / secs).floor
+            per_sec = (cnt.to_f / secs).round(2)
             msg     = "... could find #{cnt} current supers (out of #{supers.length}) in #{secs} seconds (#{per_sec} people/sec)"
             session.logger.info(msg)
             people.merge(found, strict: micro.strict_search?(options))
@@ -46,10 +46,10 @@ module Eco
           start = Time.now
 
           people = session.batch.search(supers, silent: silent).yield_self do |status|
-            secs    = Time.now - start
+            secs    = (Time.now - start).round(3)
             found   = status.people
             cnt     = found.count
-            per_sec = (cnt.to_f / secs).floor
+            per_sec = (cnt.to_f / secs).round(2)
             msg     = "... could find #{cnt} input supers (out of #{supers.length}) in #{secs} seconds (#{per_sec} people/sec)"
             session.logger.info(msg)
             people.merge(found, strict: micro.strict_search?(options))

data/lib/eco/api/microcases/preserve_default_tag.rb

@@ -0,0 +1,23 @@
+module Eco
+  module API
+    class MicroCases
+      # Helper to preserve the original `default_tag`.
+      # @note
+      #   1. It only works if the original value of `default_tag` was **not** empty
+      # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
+      # @param options [Hash] the options.
+      # @return [String] the final value of `default_tag`.
+      def preserve_default_tag(person, options)
+        if account = person.account
+          if account.as_update.key?("default_tag")
+            if original = person.original_doc.dig("account", "default_tag")
+              person.account.default_tag = original
+            end
+          end
+        end
+        person.account&.default_tag
+      end
+
+    end
+  end
+end

data/lib/eco/api/microcases/preserve_filter_tags.rb

@@ -0,0 +1,28 @@
+module Eco
+  module API
+    class MicroCases
+      # Helper to preserve the original filter tags.
+      # @note
+      #   1. It only works if the original value of `filter_tags` was **not** empty
+      # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
+      # @param options [Hash] the options.
+      # @param keep_new [Boolean] tells if it should keep the new tags or get rid of them.
+      # @return [Array<String>] the final value of `filter_tags`.
+      def preserve_filter_tags(person, options, keep_new: false)
+        if person.as_update.key?("filter_tags")
+          if original  = person.original_doc["filter_tags"]
+            unless original.empty?
+              if keep_new
+                person.filter_tags += original
+              else
+                person.filter_tags  = original
+              end
+            end
+          end
+        end
+        person.filter_tags
+      end
+
+    end
+  end
+end

data/lib/eco/api/microcases/preserve_policy_groups.rb

@@ -0,0 +1,30 @@
+module Eco
+  module API
+    class MicroCases
+      # Helper to preserve the original `policy_group_ids`.
+      # @note
+      #   1. It only works if the original value of `policy_group_ids` was **not** empty
+      # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
+      # @param options [Hash] the options.
+      # @param keep_new [Boolean] tells if it should keep the new policy groups or get rid of them.
+      # @return [String] the final value of `policy_group_ids`.
+      def preserve_policy_groups(person, options, keep_new: false)
+        if account = person.account
+          if account.as_update.key?("policy_group_ids")
+            if original = person.original_doc.dig("account", "policy_group_ids")
+              unless original.empty?
+                if keep_new
+                  person.account.policy_group_ids += original
+                else
+                  person.account.policy_group_ids  = original
+                end
+              end
+            end
+          end
+        end
+        person.account&.policy_group_ids
+      end
+
+    end
+  end
+end

data/lib/eco/api/microcases/set_account.rb

@@ -11,7 +11,6 @@ module Eco
           person.account.send_invites = options[:send_invites] if options.key?(:send_invites)
           micro.refresh_default_tag(entry, person, options)
           micro.fix_default_group(entry, person, options)
-          micro.refresh_abilities(person, options)
         end
       end
 

data/lib/eco/api/organization.rb

@@ -9,6 +9,7 @@ require_relative 'organization/tag_tree'
 require_relative 'organization/presets_factory'
 require_relative 'organization/preferences'
 require_relative 'organization/people'
+require_relative 'organization/people_analytics'
 require_relative 'organization/person_schemas'
 require_relative 'organization/policy_groups'
 require_relative 'organization/login_providers'

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

@@ -176,6 +176,12 @@ module Eco
         end
         # @!endgroup
 
+        # @!group Helper methods
+        def analytics
+          Eco::API::Organization::PeopleAnalytics.new(self.to_a)
+        end
+        # @!endgroup
+
         protected
 
         def on_change
@@ -190,6 +196,7 @@ module Eco
           @by_external_id     = to_h('external_id')
           @by_users_email     = users.to_h('email')
           @by_non_users_email = non_users.to_h('email')
+          @by_email           = to_h('email')
           @caches_init = true
         end
 

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

@@ -0,0 +1,60 @@
+module Eco
+  module API
+    module Organization
+      class PeopleAnalytics <  Eco::API::Organization::People
+        include Eco::Data::FuzzyMatch
+
+        # @!group Helpers
+
+        # @!endgroup
+
+        # @!group Searchers
+
+        # It gathers those that have the same `email`
+        # @return [Hash] where `keys` are `email`s and `values` an `Array<Person>`
+        def repeated_emails
+          init_caches
+          @by_email.select do |email, people|
+            people.count > 1
+          end
+        end
+
+        # @!endgroup
+
+        # @!group Analysers
+
+        # TODO: Sort results by `results.first.methods`
+        def similarity(**options)
+          each_with_object({}) do |person, results|
+            results[person.id] = find_all_with_score(person, **options)
+          end
+        end
+
+
+        def print_analysis(threshold)
+          similarity.each do |id, results|
+            msg = results.results.select do |result|
+              result.threshold?(threshold)
+            end.map do |result|
+              result.print
+            end.join("\n  ")
+
+            puts "'#{self[id].identify}':\n  " + msg
+          end
+        end
+        # @!endgroup
+
+        protected
+
+        def on_change
+          remove_instance_variable(@fuzzy_match)
+          super
+        end
+
+        private
+
+
+      end
+    end
+  end
+end