eco-helpers 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f068ac5a87fcddd53b2ade559622c0f4f9b603f2f5398822b067bb59aec9b348
-  data.tar.gz: 39834d2736e117269c1b1e0fb10f6f851d306643ea4ec65203ee62006f5cb4de
+  metadata.gz: 11b634b1d49337b52fe8d6a04876d706c14e44059410c77801d780a59c2d6276
+  data.tar.gz: 0fdc891abd28dd93339509f1b0d46a265f7754a1dfcc9eba9ff85ae8a1e6dd2e
 SHA512:
-  metadata.gz: 344a308dc23d4b462db4307aa3321c4dce1ef63bf322977a542dc6f2c46ce7a98320d51a0ab16ae765be5506565a93e4a85579684f985143deb1f6647e885ca4
-  data.tar.gz: ba70a2f335c345569a7f7295a501015cdb035fdfff90f01a6dd72fb63e9a348095f38adf40b5659fbcd3d181bf89abe62ec75620c505d420e95a2db451453fba
+  metadata.gz: 536f7e54656a444baf0d83213691127f194dd91ce3f45ff91bea7fae441eb7a69b8af0cc41c4a45d8edd08159daf8fa423331bad0fd9f918e0d4b7612fbfd84d
+  data.tar.gz: c93ef5b4e097999eccaf356be4fea1332e215355e71edf272d6ccf340baa1ac2025df645654b374bc5bbbb26919ebe98a10ab261c0a60eb94dfea16f406364c3

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

@@ -106,7 +106,14 @@ module Eco
             @internal_entry.key?("filter_tags")
           end
 
+          def default_tag?
+            @internal_entry.key?("default_tag")
+          end
 
+          def default_tag
+            @internal_entry["default_tag"]
+          end
+          
           # Provides a reference of this person.
           # @return [String] string summary of this person identity.
           def to_s(options)

data/lib/eco/api/common/version_patches/ecoportal_api/external_people.rb

@@ -13,7 +13,7 @@ module Ecoportal
           if status&.complete?
             operation.process_response job_result(job_id, operation)
           else
-            raise "Job `#{job_id}` not complete. Probably timeout after #{JOB_TIMEOUT + 60} seconds. Current status: #{status}"
+            raise "Job `#{job_id}` not complete. Probably timeout after #{JOB_TIMEOUT + 120} seconds. Current status: #{status}"
           end
         end
 
@@ -26,7 +26,7 @@ module Ecoportal
           while true
             status = job_status(job_id)
             break status if status.complete?
-            break status if Time.now >= before + (JOB_TIMEOUT + 60)
+            break status if Time.now >= before + (JOB_TIMEOUT + 120)
             sleep(DELAY_STATUS_CHECK)
             status
           end

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

@@ -66,13 +66,14 @@ module Eco
 
                   person.account.permissions_custom = session.new_preset(person) unless !create && options.dig(:exclude, :abilities)
 
-                  if session.tagtree
-                    person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
-                  else
-                    tags = person.filter_tags
-                    person.account.default_tag = tags.first unless tags.length > 1
+                  unless options.dig(:exclude, :filter_tags) || entry.default_tag?
+                    if session.tagtree
+                      person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
+                    else
+                      tags = person.filter_tags
+                      person.account.default_tag = tags.first unless tags.length > 1
+                    end
                   end
-
                 end
 
                 creation.add(person) if create

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

@@ -55,7 +55,7 @@ module Eco
 
                     person.account.permissions_custom = session.new_preset(person) unless options.dig(:exclude, :abilities)
 
-                    unless options.dig(:exclude, :filter_tags)
+                    unless options.dig(:exclude, :filter_tags) || entry.default_tag?
                       if session.tagtree
                         person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
                       else

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

@@ -59,11 +59,13 @@ module Eco
 
                   person.account.permissions_custom = session.new_preset(person) unless !create && options.dig(:exclude, :abilities)
 
-                  if session.tagtree
-                    person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
-                  else
-                    tags = person.filter_tags
-                    person.account.default_tag = tags.first unless tags.length > 1
+                  unless options.dig(:exclude, :filter_tags) || entry.default_tag?
+                    if session.tagtree
+                      person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
+                    else
+                      tags = person.filter_tags
+                      person.account.default_tag = tags.first unless tags.length > 1
+                    end
                   end
 
                 end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

metadata

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