eco-helpers 2.6.3 → 2.7.0

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

@@ -1,16 +1,14 @@
 class ::Exception
   def patch_full_message(trace_count: -1)
-    begin
-      msg = []
-      tracing   = backtrace ? backtrace : []
-      tracing   = (self.class == SystemStackError) ? tracing[1..30] : tracing[1..trace_count]
-      tracing ||= []
-      msg << "\n#{tracing.first} \n#{message} (#{self.class.to_s})"
-      tracing.each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
-      msg.join("\n")
-    rescue Exception => e
-      puts "Something is wrong with 'patch_full_message': #{e}"
-    end
+    msg = []
+    tracing   = backtrace || []
+    tracing   = instance_of?(SystemStackError) ? tracing[1..30] : tracing[1..trace_count]
+    tracing ||= []
+    msg << "\n#{tracing.first} \n#{message} (#{self.class})"
+    tracing.each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
+    msg.join("\n")
+  rescue StandardError => e
+    puts "Something is wrong with 'patch_full_message': #{e}"
   end
 end
 
@@ -23,7 +21,7 @@ Exception.class_eval do
         String(message) + super()
       end
     end
-    self.extend mod
+    extend mod
   end
 
   def append_message(message)
@@ -32,6 +30,6 @@ Exception.class_eval do
         super() + String(message)
       end
     end
-    self.extend mod
+    extend mod
   end
 end

data/lib/eco/api/error.rb

@@ -10,56 +10,65 @@ module Eco
       end
 
       @str_err = "api error on the server reply"
-      @match  = /.*/
+      @match   = /.*/
       #RxValidId = /[a-f0-9]{24}/
 
-
       class Unclassified < Eco::API::Error
         @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"
         @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"
         @match   = /#{@str_err}/
       end
+
       class EmailInvalid < Eco::API::Error
         @str_err = "Email is invalid"
         @match   = /#{@str_err}/
       end
+
       class EmailTaken < Eco::API::Error
-        @str_err  = "user email already taken"
-        @str_err2 = "Email is already taken"
-        @match    = /(?:#{@str_err}|#{@str_err2})/
+        @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"
         @match   = /Supervisor (.*?) not found/
       end
+
       class CyclicSupervisor < Eco::API::Error
         @str_err = "Supervisor is cyclic!"
         @match   = /#{@str_err}/
       end
+
       class SchemaNotFound < Eco::API::Error
         @str_err = "Schema not found"
         @match   = /Schema (.*?) not found/
       end
+
       class InvalidObjectId < Eco::API::Error
         @str_err = "Invalid ObjectId."
         @match   = /'(.*?)' is an invalid ObjectId./
       end
+
       class UnknownField < Eco::API::Error
         @str_err = "Unknown field."
         @match   = /(.+?) is an unknown field/
@@ -68,13 +77,15 @@ module Eco
           @str_err = "Unknown core field."
           @match   = /(.+?) is an unknown field/
         end
+
         class UnknownAccountField < UnknownField
           @str_err = "Unknown account field."
-          @match   = /account \> (.+?) is an unknown field/
+          @match   = /account > (.+?) is an unknown field/
         end
+
         class UnknownDetailsField < UnknownField
           @str_err = "Unknown details field."
-          @match   = /details \> (.+?) is an unknown field/
+          @match   = /details > (.+?) is an unknown field/
         end
       end
 
@@ -82,9 +93,9 @@ module Eco
         def descendants(direct: false)
           ObjectSpace.each_object(::Class).select do |klass|
             klass < self
-          end.sort do |k1, k2|
-            next -1 if k2 < k1
-            next  1 if k1 < k2
+          end.sort do |k_1, k_2|
+            next -1 if k_2 < k_1
+            next  1 if k_1 < k_2
             0
           end.tap do |siblings|
             siblings.delete(Unclassified)
@@ -97,7 +108,7 @@ module Eco
         end
 
         def descendants?(direct: false)
-          descendants(direct: direct).length > 0
+          descendants(direct: direct).length.positive?
         end
 
         def err_match?(err_msg)
@@ -106,15 +117,16 @@ module Eco
 
         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, first: false) || type
-              end
-            end
+            next unless klass.err_match?(err_msg)
+            type = klass
+            next unless klass.descendants?(direct: true)
+            type = klass.get_type(err_msg, first: false) || type
           end
+
           return type unless first
+
           type || Unclassified
         end
 
@@ -138,7 +150,7 @@ module Eco
       end
 
       def built_error
-        str ||= msg
+        msg
       end
     end
   end

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

@@ -38,17 +38,14 @@ module Eco
       def descrease_subordinates(person, by = 1)
         if person.is_a?(Ecoportal::API::V1::Person)
           person.subordinates -= by
-          #person.subordinates  = 0 if person.subordinates < 0
         end
       end
 
       def increase_subordinates(person, by = 1)
         if person.is_a?(Ecoportal::API::V1::Person)
-          #person.subordinates  = 0 if person.subordinates < 0
           person.subordinates += by
         end
       end
-
     end
   end
 end

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

@@ -0,0 +1,82 @@
+module Eco
+  module API
+    module Organization
+      class NodeClassifications < Eco::Language::Models::Collection
+        # build the shortcuts of Collection
+        attr_collection :id, :name # , :active
+
+        def initialize(types = [], klass: Ecoportal::API::GraphQL::Base::LocationClassificationType) # rubocop:disable Lint/UnusedMethodArgument
+          @klass       = Ecoportal::API::GraphQL::Base::LocationClassificationType
+          @caches_init = false
+          super(types, klass: @klass)
+          init_caches
+        end
+
+        def ids
+          @items.map(&:id)
+        end
+
+        def names
+          @items.map(&:name)
+        end
+
+        def to_id(name)
+          case name
+          when Enumerable
+            name.map do |n|
+              type(n)&.id
+            end.compact
+          else
+            type(name)&.id
+          end
+        end
+
+        def to_name(id)
+          case id
+          when Enumerable
+            id.map do |n|
+              type(n)&.name
+            end.compact
+          else
+            type(id)&.name
+          end
+        end
+
+        def type(id_name)
+          self[id_name]
+        end
+
+        def [](id_name)
+          @by_id[type_id(id_name)]
+        end
+
+        private
+
+        def type_name(id_name)
+          key = treat_classication(id_name)
+          val = (@by_id[key] || @by_name[key])&.name
+          treat_classication(val)
+        end
+
+        def type_id(id_name)
+          key = treat_classication(id_name)
+          val = (@by_name[key] || @by_id[key])&.id
+          treat_classication(val)
+        end
+
+        def treat_classication(value)
+          return value unless value.is_a?(String)
+          value.strip.gsub(/\W+/, '').downcase
+        end
+
+        def init_caches
+          return if @caches_init
+
+          @by_id   = @items.to_h { |nc| [treat_classication(nc.id), nc] }
+          @by_name = @items.to_h { |nc| [treat_classication(nc.name), nc] }
+          @caches_init = true
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Eco
   module API
     module Organization
-      class PolicyGroups <  Eco::Language::Models::Collection
+      class PolicyGroups < Eco::Language::Models::Collection
         # build the shortcuts of Collection
         attr_collection :id, :name
 
@@ -40,7 +40,6 @@ module Eco
           else
             policy_group(id)&.name
           end
-
         end
 
         def policy_group(id_name)
@@ -61,7 +60,7 @@ module Eco
 
           if !non_custom_not_used && preserve_custom
             initial_custom = initial - non_custom
-            final = final + initial_custom
+            final         += initial_custom
           end
 
           new_pg_ids = final - initial
@@ -81,11 +80,10 @@ module Eco
 
         def init_caches
           return if @caches_init
-          @by_id   = self.map { |pg| [pg.id, pg] }.to_h
-          @by_name = self.map { |pg| [pg.name&.downcase, pg] }.to_h
+          @by_id   = map { |pg| [pg.id, pg] }.to_h
+          @by_name = map { |pg| [pg.name&.downcase, pg] }.to_h
           @caches_init = true
         end
-
       end
     end
   end