eco-helpers 2.0.16 → 2.0.17

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

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

@@ -3,6 +3,8 @@ module Eco
     module Organization
 
       class PresetsFactory
+        ABILITIES = File.join(__dir__, 'presets_values.json')
+        INTEGRITY = File.join(__dir__, 'presets_integrity.json')
 
         class << self
 
@@ -24,44 +26,36 @@ module Eco
 
         end
 
-        ABILITIES = File.join(__dir__, 'presets_values.json')
-        INTEGRITY = File.join(__dir__, 'presets_integrity.json')
-        DEFAULT_CUSTOM = 'presets_custom.json'
-        DEFAULT_MAP    = 'presets_map.json'
-
-        def initialize(presets_custom: DEFAULT_CUSTOM, presets_map: DEFAULT_MAP, enviro: nil, policy_groups: nil)
+        def initialize(enviro: nil, policy_groups: nil)
           fatal("Expecting Environment object. Given: #{enviro}") if enviro && !enviro.is_a?(Eco::API::Common::Session::Environment)
           @enviro        = enviro
-
-          @policy_groups       = policy_groups
-          @presets_custom_file = presets_custom || DEFAULT_CUSTOM
-          @presets_map_file    = presets_map    || DEFAULT_MAP
+          @policy_groups = policy_groups
         end
 
-        def new(*policy_group_ids_or_names)
-
-          names = policy_group_ids_or_names.map do |id_name|
-            policy_groups.to_name(id_name)&.downcase
-          end.compact
+        # @return [Array<String>] all the abilities
+        def keys
+          self.class.abilities
+        end
 
-          if presets_map
-            preset_names = names.map { |name| presets_map.fetch(name, nil) }
-          else # option to do not use preset mapping (so just the policy group name)
-            preset_names = names
-          end
-          compile(*preset_names)
+        def valid?(preset)
+          validate(perset).length == 0
         end
 
-        # @return [Array<String>] all the abilities
-        def keys
-          abilities_model.keys
+        def validate(preset)
+          [].tap do |errors|
+            if err = preset_errors(preset)
+              errors << "{ '#{key}' preset -> #{err}}"
+            end
+            if err = preset_integrity(preset)
+              errors << "{ '#{key}' preset -> #{err}}"
+            end
+          end
         end
 
         private
 
-        def compile(*preset_names)
-          fatal("You need to specify an existing file for the custom presets.") if !@presets_custom
-          @presets_custom.values_at(*preset_names).compact.reduce({}) do |p1, p2|
+        def compile(*presets)
+          presets.compact.reduce({}) do |p1, p2|
             merge(p1, p2)
           end
         end
@@ -79,11 +73,6 @@ module Eco
           end
         end
 
-        # unsused: only play with the given abilities
-        def empty_model
-          JSON.parse(abilities_model.to_json).transform_values {|v| nil }
-        end
-
         def preset_errors(preset)
           return "No preset given" if !preset
           errors = preset.map do |k, v|
@@ -146,7 +135,7 @@ module Eco
         end
 
         def ability_value_idx(ability, value)
-          abilities_model[ability].index(value)
+          abilities_model[ability].index(value) || -1
         end
 
         def abilities_model
@@ -163,56 +152,6 @@ module Eco
           @policy_groups
         end
 
-        def presets_custom
-          return @presets_custom if instance_variable_defined?(:@presets_custom)
-          @presets_custom = nil
-          if @presets_custom_file
-            if (file = File.expand_path(@presets_custom_file)) && File.exists?(file)
-              @presets_custom = JSON.load(File.open(file)).tap do |custom_presets|
-                errors = custom_presets.each_with_object([]) do |(key, preset), errors|
-                  if err = preset_errors(preset)
-                    errors << "{ '#{key}' preset -> #{err}}"
-                  end
-                  if err = preset_integrity(preset)
-                    errors << "{ '#{key}' preset -> #{err}}"
-                  end
-                end
-
-                fatal("File '#{file}' contains invalid presets:\n  #{errors.join("\n  ")}") if errors.length > 0
-              end
-            end
-          end
-        end
-
-        def presets_map
-          return @presets_map if instance_variable_defined?(:@presets_map)
-          @presets_map = nil
-          if @presets_map_file
-            if (file = File.expand_path(@presets_map_file)) && File.exists?(file)
-              fatal("Maps file specified without 'presets_custom.json' file. Aborting!") if !presets_custom
-              @presets_map = JSON.load(File.open(file)).tap do |map_presets|
-
-                errors = []
-                if policy_groups.length > 0
-                  errors = policy_groups.map do |pg|
-                    exists = map_presets[pg.name.downcase] || presets_custom[pg.name.downcase]
-                    exists ? nil : "'#{pg.name}'"
-                  end.compact
-
-                  warn("No maps or no preset for policy group(s): #{errors.join(", ")}") if errors.length > 0
-                end
-
-                errors = map_presets.map do |source, dest|
-                  presets_custom[dest] ? nil : "'#{dest}'"
-                end.compact
-
-                warn("Unexisting mapped preset(s): #{errors.uniq.join(", ")}") if errors.length > 0
-
-              end
-            end
-          end
-        end
-
         def fatal(msg)
           raise msg if !@enviro
           @enviro.logger.fatal(msg)

data/lib/eco/api/organization/presets_integrity.json

@@ -48,5 +48,11 @@
         "at_least": {"person_core_edit": "edit"}
       }
     }
+  ],
+  "person_abilities": [
+    { "value": "view", "conditions": {
+        "at_least": {"person_core_edit": "edit"}
+      }
+    }
   ]
 }

data/lib/eco/api/organization/presets_values.json

@@ -2,14 +2,15 @@
   "files": [null, "download", "upload", "browse", "administrate"],
   "data": [null, "view", "update", "administrate", "implement"],
   "reports": [null, "view", "edit", "administrate"],
+  "pages": [null, "view", "update", "create", "administrate"],
+  "page_editor": [null, "basic", "intermediate", "advanced", "implement"],
+  "registers": [null, "view", "dashboard", "administrate", "implement"],
   "tasks": [null, "reassign_self", "reassign", "administrate"],
   "organization": [null, "view", "administrate", "implement"],
   "person_core": [null, "attach", "view_people_manager", "dashboard"],
   "person_core_create": [null, "create"],
   "person_core_edit": [null, "edit"],
-  "person_account": [null, "view", "create", "edit"],
   "person_details": [null, "view", "edit_public", "view_private", "edit_private"],
-  "pages": [null, "view", "update", "create", "administrate"],
-  "page_editor": [null, "basic", "intermediate", "advanced", "implement"],
-  "registers": [null, "view", "dashboard", "administrate", "implement"]
+  "person_account": [null, "view", "create", "edit"],
+  "person_abilities": [null, "view", "edit"]
 }

data/lib/eco/api/policies/default_policies/99_user_access_policy.rb

@@ -12,7 +12,6 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
     people.each do |person|
       remove_account_when_no_email!(person)    if person.email.to_s.empty?
       person.account.policy_group_ids = defid  if no_policy_group_ids?(person)
-      refresh_abilities!(person)
     end
 
     warn_account_removal!
@@ -40,39 +39,10 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
     return !!person.original_doc["account"]
   end
 
-  def refresh_abilities!(person)
-    return nil if options.dig(:exclude, :abilities)
-    return nil unless account = person.account
-    account.permissions_custom = session.new_preset(person)
-    account.permissions_custom = min_abilities if no_abilities?(person)
-  end
-
   def no_policy_group_ids?(person)
     (account = person.account) &&  account.policy_group_ids.empty?
   end
 
-  def no_abilities?(person)
-    return true unless account = person.account
-    account.permissions_custom && account.permissions_custom.values.all?(&:nil?)
-  end
-
-  def min_abilities
-    {
-      "files"         => "upload",
-      "data"          => nil,
-      "reports"       => nil,
-      "pages"         => "create",
-      "page_editor"   => "basic",
-      "registers"     => "view",
-      "organization"  => nil,
-      "person_core"         => "attach",
-      "person_core_edit"    => nil,
-      "person_core_create"  => nil,
-      "person_details"      => "view",
-      "person_account"      => nil
-    }
-  end
-
   def defid
     @defid ||= policy_groups.to_id([default_group]).compact
   end

data/lib/eco/api/session.rb

@@ -61,28 +61,9 @@ module Eco
         self
       end
 
-      # Builds the presets using the usergroup ids of the input.
-      # @note for each flag/ability it will take the highest among those mapped for the present usergroups.
-      # @param input [Ecoportal::API::Internal::Person, Array<String>] the array should be of usegroup names or ids.
-      # @return [Hash] with custom presets.
-      def new_preset(input)
-        case input
-        when Ecoportal::API::Internal::Person
-          presets_factory.new(*input&.account&.policy_group_ids)
-        when Array
-          presets_factory.new(*input)
-        else
-          presets_factory.new(input)
-        end
-      end
-
       # Helper to state the abilities that a person should have with given their usergroups
       def presets_factory
-        @presets_factory ||= Eco::API::Organization::PresetsFactory.new({
-          presets_custom: file_manager.dir.file(config.people.presets_custom, should_exist: true),
-          presets_map:    file_manager.dir.file(config.people.presets_map,    should_exist: true),
-          enviro:         enviro
-        })
+        @presets_factory ||= Eco::API::Organization::PresetsFactory.new(enviro: enviro)
       end
 
       # Helper to obtain a EntryFactory

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

@@ -114,14 +114,16 @@ module Eco
               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|
-                    faltal("Request with no response") unless !!response
-                    status[person] = response
+              offer_retry_on(Ecoportal::API::Errors::TimeOut) do
+                people_api.batch do |batch|
+                  slice.each do |person|
+                    batch.public_send(method, person) do |response|
+                      faltal("Request with no response") unless !!response
+                      status[person] = response
+                    end
                   end
-                end
-              end # next batch
+                end # end batch
+              end
 
               iteration  += 1
               done       += slice.length
@@ -129,6 +131,20 @@ module Eco
           end
         end
 
+        def offer_retry_on(error_type, retries_left = 3, &block)
+          begin
+            block.call
+          rescue error_type => e
+            raise unless retries_left > 0
+            print "Batch TimeOut. You have #{retries_left} retries left. Do you want to retry (y/N)? "
+            if (res = STDIN.gets.chomp) && res[0].downcase == "y"
+              offer_retry_on(error_type, retries_left - 1, &block)
+            else
+              raise
+            end
+          end
+        end
+
         def str_stats(start, count)
           now     = Time.now
           secs    = (now - start).round(3)

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

@@ -297,16 +297,6 @@ module Eco
           people.default_schema = name
         end
 
-        # Specify the file with the account custom abilities presets
-        def presets_custom=(file)
-          people.presets_custom = file
-        end
-
-        # Specify the file with the usergroup to custom presets mapping
-        def presets_map=(file)
-          people.presets_map = file
-        end
-
         # @see Eco::API::Session::Config::People
         # @param (see Eco::API::Session::Config::People)
         # @return [Eco::API::Common::People::PersonParser] parser/serializer for the defined `format`.

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

@@ -86,23 +86,7 @@ module Eco
           def default_schema?
             !!self["default_schema"]
           end
-
-          def presets_custom=(file)
-            self["presets_custom"] = file
-          end
-
-          def presets_custom
-            self["presets_custom"]
-          end
-
-          def presets_map=(file)
-            self["presets_map"] = file
-          end
-
-          def presets_map
-            self["presets_map"]
-          end
-
+          
           # @return [Hash] with defined pairs format `key` and Person parsers.
           def parsers
             self["parsers"] ||= {}