eco-helpers 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fab21c8ca261ba89cae934637d3dab47fc613e958a9b3e281025e8a65a1aaf
-  data.tar.gz: 76bafdf3364c2de16005575b31c134e56155ba29c6ecd980005c816105a5c886
+  metadata.gz: 7c7e7c6c61dc2fa5886b5a396f54051e216bf8ffbf6e31ab98388b3ed21c5e5b
+  data.tar.gz: 4cea27b25b939efd57a4bfcf1d540df660f94cd7b48be45cf96b67dde5d01033
 SHA512:
-  metadata.gz: c5938821d5251b6fad7c87ff1cabd97526b4831a68c3f5a1d877886209f7d17b2f08c52e0a3d4d8560a6905abe01afae44a5b4640db1856bbf05ccbfeb368926
-  data.tar.gz: f13c1eb5103017726144b5b2924137af7fe501899c6c7c521ff52111e4f8e2f6a005eac005adb52b1ea5bfd1bb0da49bc8aaac71ae1c93b72534923ccf4beb43
+  metadata.gz: 4c0a48790cf660cb326fa6a06e60e8fc4395f4cfcefd00ca71aa79be79daceb8bf5e4dfd74c33957e07f1cb1f7d8cf298fd062544ecdecd620681c33706fec57
+  data.tar.gz: 0dfb7e2c7ad703782373bd6c6b24bacc872238009cc9552998e40c55ff05f7bb61b667ee65d333e55b3623f8b139792ea42f5f3eab6a2f737ff182c01b28cd16

data/CHANGELOG.md

@@ -1,13 +1,21 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.7.5] - 2024-05-xx
+## [2.7.6] - 2024-05-xx
 
 ### Added
 ### Changed
+  - upgraded `ecoportal-api-graphql` gem, and `ecoportal-api` gem
+  - `Eco::API::Common::People::Entries` (**optimization**)
+    - Remove supervisors order
+    - It could create cyclic supervisors.
+  - `Eco::API::MicroCases#set_supervisor` slight improvemnent to prevent cyclic supers (self + added one to one)
+
 ### Fixed
+  - `Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diff::AsUpdate`
+    - `classificationIds` should be always an `Array`
 
-## [2.7.5] - 2024-05-08
+## [2.7.5] - 2024-05-07
 
 ### Fixed
   - `Eco::API::UseCases::GraphQL::Utils` typo

data/eco-helpers.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard",      ">= 0.9.34", "< 1"
   spec.add_development_dependency "redcarpet", ">= 3.6.0",  "< 4"
 
-  spec.add_dependency 'ecoportal-api',         '>= 0.9.7', '< 0.10'
+  spec.add_dependency 'ecoportal-api',         '>= 0.9.8', '< 0.10'
   spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.8', '< 1.2'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.16', '< 0.4'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.17', '< 0.4'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'

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

@@ -1,3 +1,4 @@
+# rubocop:disable Style/Attr
 module Eco
   module API
     module Common
@@ -6,13 +7,15 @@ module Eco
         # @attr_reader entries [Array<Eco::API::Common::PeopleEntry] a pure `Array` object.
         class Entries < Eco::Language::Models::Collection
           # Error class that allows to handle cases where multiple entries were found for the same criterion.
-          # @note its main purpose to prevent the false pairing of duplicates or override information between different people.
+          # @note its main purpose to prevent the false pairing of duplicates or override information between
+          #   different people.
           class MultipleSearchResults < StandardError
             attr_reader :candidates, :property
 
             # @param msg [String] the basic message error.
             # @param candiates [Array<PersonEntry>] the entries that match the same search criterion.
-            # @param property [String] the property of the entry model that triggered the error (base of the search criterion).
+            # @param property [String] the property of the entry model that triggered the error
+            #   (base of the search criterion).
             def initialize(msg, candidates: [], property: "email")
               @candidates = candidates
               @property   = property
@@ -46,8 +49,6 @@ module Eco
 
           alias_method :entries, :to_a
 
-          include Eco::API::Common::People::SupervisorHelpers
-
           def initialize(data = [], klass:, factory:)
             super(data, klass: klass, factory: factory)
             @caches_init = false
@@ -136,8 +137,8 @@ module Eco
           # Override `each` to make it work with supervisor hiearchy
           def each(&block)
             return to_enum(:each) unless block
-            @array_supers = sort_by_supervisors(@items) unless @caches_init
-            @array_supers.each(&block)
+
+            @items.each(&block)
           end
 
           def exclude(object)
@@ -208,7 +209,6 @@ module Eco
             @by_id          = no_nil_key(to_h)
             @by_external_id = no_nil_key(to_h('external_id'))
             @by_email       = no_nil_key(to_h('email'))
-            @array_supers   = sort_by_supervisors(@items)
             @caches_init = true
           end
 
@@ -220,3 +220,5 @@ module Eco
     end
   end
 end
+
+# rubocop:enable Style/Attr

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

@@ -11,40 +11,51 @@ module Eco
       # @yield [supervisor_id] callback when the supervisor_id is **unknown** (not `nil` nor any one's in `people`).
       # @yieldparam supervisor_id [String] the **unknown** `supervisor_id`.
       def set_supervisor(person, sup_id, people, options)
-        unless options.dig(:exclude, :core) || options.dig(:exclude, :supervisor)
-          return false if sup_id && ((person.id == sup_id) || (person.external_id == sup_id))
-          cur_id    = person.supervisor_id
-          cur_super = cur_id && with_supervisor(cur_id, people)
-          micro.with_supervisor(sup_id, people) do |new_super|
-            if !sup_id
-              person.supervisor_id = nil
-              descrease_subordinates(cur_super)
-            elsif new_super && id = new_super.id
-              person.supervisor_id = id
-              descrease_subordinates(cur_super)
-              increase_subordinates(new_super)
-            elsif !block_given?
-              descrease_subordinates(cur_super)
-              person.supervisor_id = sup_id
-            else
-              yield(sup_id) if block_given?
-            end
+        return false if options.dig(:exclude, :core) || options.dig(:exclude, :supervisor)
+        return false if sup_id && ((person.id == sup_id) || (person.external_id == sup_id))
+
+        cur_id    = person.supervisor_id
+        cur_super = cur_id && with_supervisor(cur_id, people)
+
+        micro.with_supervisor(sup_id, people) do |new_super|
+          if !sup_id
+            person.supervisor_id = nil
+            descrease_subordinates(cur_super)
+          elsif new_super && (id = new_super.id)
+            set_supervisor(new_super, nil, people, options) if new_super_direct_cyclic?(person, new_super)
+            person.supervisor_id = id
+            descrease_subordinates(cur_super)
+            increase_subordinates(new_super)
+          elsif !block_given?
+            descrease_subordinates(cur_super)
+            person.supervisor_id = sup_id
+          elsif block_given?
+            yield(sup_id)
           end
         end
       end
 
       private
 
+      def new_super_direct_cyclic?(person, new_super)
+        return false unless new_super.is_a?(Ecoportal::API::V1::Person)
+        return false if new_super.supervisor_id.nil?
+        return true  if person.id == new_super.id
+        return true  if new_super.supervisor_id == person.id
+        return true  if new_super.supervisor_id == person.external_id
+        false
+      end
+
       def descrease_subordinates(person, by = 1)
-        if person.is_a?(Ecoportal::API::V1::Person)
-          person.subordinates -= by
-        end
+        return unless person.is_a?(Ecoportal::API::V1::Person)
+
+        person.subordinates -= by
       end
 
       def increase_subordinates(person, by = 1)
-        if person.is_a?(Ecoportal::API::V1::Person)
-          person.subordinates += by
-        end
+        return unless person.is_a?(Ecoportal::API::V1::Person)
+
+        person.subordinates += by
       end
     end
   end

data/lib/eco/api/usecases/graphql/helpers/location/command/diff/as_update.rb

@@ -11,7 +11,12 @@ class Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diff
     def diff_hash(after_id_update: true) # rubocop:disable Metrics/AbcSize
       super().tap do |h|
         h.delete('archived')
-        h['classificationIds'] = h.delete('classifications') if h.key?('classifications')
+
+        if h.key?('classifications')
+          class_ids = h.delete('classifications')
+          class_ids = [class_ids].flatten.compact unless class_ids.is_a?(Array)
+          h['classificationIds'] = class_ids
+        end
 
         if archive? || insert?
           # We assume archives do not have `move` nor update `id` or `name`

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.5'.freeze
+  VERSION = '2.7.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.3.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.3.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'