eco-helpers 2.0.48 → 2.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d2573c1aecfe5839a1867d549ae47af247cbb7819f4733a8c0a07ff98d9e65
-  data.tar.gz: c2318e2dd890bdf4a973332c6849c271bb8593c3f799c2add8b34064b022d54e
+  metadata.gz: 9b4a2ad99ea2e78519b611cdcdb74743ae9dd1a8f5707164ebcc686c21d83700
+  data.tar.gz: b9387499878102825b1396bf35394cc12c35c4b738380f3bfd52e2407c4239af
 SHA512:
-  metadata.gz: 9319378014f0c596dfd3f458e2fe8f3852906c22bf04234f29c5bc28d3e2b677f1e801310d37fcb4505e555b1b258e5ba2a0c0a46c2ac5b7c32c96e274fda45a
-  data.tar.gz: 61cfb4fe7e2a7d125e3cc3c0c25175bd732fe048654e7b11044c4b897414d51253ab16f7b97d8178d4ec6167d4e216ec13af7666efc72fb278d332d5a6723c27
+  metadata.gz: d574a346ba439207b85cfd1e265ed4b3c3f3742dd6308adfc8a873717bea8fd0f9ceaec49fcde1ea5575068c4e00395a4a200b42d624b45e707bd89d68b4560a
+  data.tar.gz: 99a77ede34b322d1ebe6ad54822db841ae111e7063a4dbd6317dd092222a43919e8e059536db9f9c386bbbc31cd8043e64192f425a4fae055f3511ae6f622e67

data/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.48] - 2022-02-xx
+## [2.0.49] - 2022-02-14
 
 ### Added
+  - `Eco::API::Session::Batch::RequestStats#message` now it shows which details have changed
+  - `Eco::API::UseCases::DefaultCases::ReinviteTransCase` the option `-force` will also send an invite to users that have accepted the invitation
+
+### Changed
+### Fixed
+
+## [2.0.48] - 2022-02-04
+
 ### Changed
   - upgraded `ecoportal-api-v2` dependency
 

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

@@ -9,6 +9,7 @@ module Eco
           ACCOUNT_ATTRS  = (Eco::API::Common::People::PersonParser::ACCOUNT_ATTRS + ["permissions_custom"]).uniq
           DETAILS_ATTRS  = ["fields"]
           BLANKED_PREFIX = "blanked_"
+          DETAILS_FIELDS = "details_fields"
 
           class << self
 
@@ -74,44 +75,43 @@ module Eco
           end
 
           def message(percent: false)
-            key_val_delimiter = ": "; attr_delimiter = " ++ "
-            pairs_to_line = Proc.new do |pairs|
-              pairs.map do |p|
-                [p.first.to_s, "#{p.last.to_s}" + (percent ? "%" : "")].join(key_val_delimiter)
-              end.join(attr_delimiter)
-            end
-
             lines = []
-            lines << pairs_to_line.call(core_pairs(percent: percent))
-            lines << pairs_to_line.call(account_pairs(percent: percent))
-            lines << pairs_to_line.call(details_pairs(percent: percent))
+            lines << pairs_to_line(core_pairs(percent: percent))
+            lines << pairs_to_line(account_pairs(percent: percent))
+            lines << pairs_to_line(details_pairs(percent: percent))
             lines.join("\n")
           end
 
           private
 
-          def attr(attr, percent: false, total: count)
-            i = @stats["#{attr}"]
+          def attr_value(attr, percent: false, total: count, details: false)
+            target = details ? (@stats[DETAILS_FIELDS] || {}) : @stats
+            i = target["#{attr}"]
             return i unless percent
             percentage(i, total: total)
           end
 
           def core(percent: false)
-            attr("core", percent: percent)
+            attr_value("core", percent: percent)
           end
 
           def account(percent: false)
-            attr("account", percent: percent)
+            attr_value("account", percent: percent)
           end
 
           def details(percent: false)
-            attr("details", percent: percent)
+            attr_value("details", percent: percent)
+          end
+
+          def stats
+            @stats ||= Hash.new(0)
           end
 
           def build(requests)
-            Hash.new(0).tap do |stats|
+            stats.tap do |stats|
               stats[type] = count
               unless !requests || !requests.is_a?(Enumerable) || requests.empty?
+                stats[DETAILS_FIELDS] = Hash.new(0)
                 requests.each_with_index do |request|
                   add_core_stats(stats, request || {})
                   add_account_stats(stats, request || {})
@@ -149,16 +149,15 @@ module Eco
             if request.key?("details")
               stats["details"] += 1
               stats["details_remove"] += 1 if !request["details"]
+
+              det_attrs = {}
               if fields = request.dig("details", "fields")
                 stats["fields"] += fields.length
+                det_attrs = fields.each_with_object(det_attrs) {|fld, hash| hash[fld["alt_id"]] = fld["value"]}
               end
-            end
-          end
 
-          def pairs(attrs, percent: false, total: count)
-            pairs = attrs.map do |a|
-              (v = attr(a, percent: percent, total: count)) > 0 ? [a, v] : nil
-            end.compact
+              attrs_to_stat(stats[DETAILS_FIELDS], det_attrs, det_attrs.keys)
+            end
           end
 
           def core_pairs(percent: false)
@@ -172,22 +171,23 @@ module Eco
           end
 
           def details_pairs(percent: false)
-            details_pairs  = [["details", details(percent: percent)]]
-            details_pairs += [["fields", fields_average]] if attr("fields") && fields_average
-            details_pairs += pairs(["details_remove"], percent: percent, total: details)
+            det_pairs  = [["details", details(percent: percent)]]
+            det_pairs += [["fields", fields_average]] if attr_value("fields") && fields_average
+            det_pairs += pairs(["details_remove"], percent: percent, total: details)
+            det_pairs += pairs(details_field_attrs, percent: percent, total: details, details: true)
           end
 
-          def fields_average
-            if (fields_num = attr("fields")) && (total = details) > 0
-              (fields_num.to_f / total.to_f).round(2)
-            end
+          def pairs(attrs, percent: false, total: count, details: false)
+            pairs = attrs.map do |a|
+              (v = attr_value(a, percent: percent, total: count, details: details)) > 0 ? [a, v] : nil
+            end.compact
           end
 
-          def percentage(num, total: count)
-            total ||= count
-            if num
-              (num.to_f / total * 100).round(2)
-            end
+          def pairs_to_line(pairs, percent: false)
+            key_val_delimiter = ": "; attr_delimiter = " ++ "
+            pairs.map do |p|
+              [p.first.to_s, "#{p.last.to_s}" + (percent ? "%" : "")].join(key_val_delimiter)
+            end.join(attr_delimiter)
           end
 
           def core_attrs
@@ -202,6 +202,10 @@ module Eco
             @details_attrs ||= self.class.details_attrs
           end
 
+          def details_field_attrs
+            @stats[DETAILS_FIELDS].keys
+          end
+
           def blank_attrs(attrs)
             self.class.blank_attrs(attrs)
           end
@@ -225,6 +229,18 @@ module Eco
             end
           end
 
+          def fields_average
+            if (fields_num = attr_value("fields")) && (total = details) > 0
+              (fields_num.to_f / total.to_f).round(2)
+            end
+          end
+
+          def percentage(num, total: count)
+            total ||= count
+            if num
+              (num.to_f / total * 100).round(2)
+            end
+          end
         end
       end
     end

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

@@ -2,16 +2,25 @@ class Eco::API::UseCases::DefaultCases::ReinviteTransCase < Eco::API::Common::Lo
   name "reinvite"
   type :transform
 
+  def main(people, session, options, usecase)
+    reinvite(people.users, session, options, usecase)
+  end
+
+  private
+
   def reinvite(users, session, options, usecase)
     invite   = session.new_job("main", "invite", :update, usecase, :account)
     users.each do |person|
-      person.account.send_invites = true
+      if force_invite?
+        person.account.send_invites = true
+      else
+        person.account.force_send_invites = true
+      end
       invite.add(person)
     end
   end
 
-  def main(people, session, options, usecase)
-    reinvite(people.users, session, options, usecase)
+  def force_invite?
+    options.dig(:force, :invite)
   end
-
 end

data/lib/eco/api/usecases/default_cases/samples/sftp_case.rb

@@ -28,7 +28,7 @@ class Eco::API::UseCases::DefaultCases::Samples::Sftp < Eco::API::Common::Loader
 
   # Ex: "/IN/Personnel"
   def remote_subfolder
-    raise "You should redefine remote_subfolder as the folder where the target file sits"
+    raise "You should redefine remote_subfolder as the folder where the target file sits. Ex: /IN/Personnel"
   end
 
   def archive_subfolder

data/lib/eco/cli/config/default/usecases.rb

@@ -183,9 +183,15 @@ ASSETS.cli.config do |cnf|
 
     desc = "Re-sends invites to all filtered users that have not accepted the invite as yet"
     cases.add("-reinvite", :transform, desc, case_name: "reinvite")
+    .add_option("-force", "If also send an invite email to those that have accepted the invite") do |options|
+      options.deep_merge!(force: {invite: true})
+    end
 
     desc = "Re-sends invites to target users that have not accepted the invite as yet"
     cases.add("-reinvite-from", :sync, desc, case_name: "reinvite")
+    .add_option("-force", "If also send an invite email to those that have accepted the invite") do |options|
+      options.deep_merge!(force: {invite: true})
+    end
 
     desc = "Deletes everybody that has been filtered from the people manager"
     cases.add("-delete", :transform, desc, case_name: "delete")

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.48"
+  VERSION = "2.0.49"
 end

metadata

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