egov_utils 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dcf2cc8a445a3720966d1c64529d216ec9bce421c1b59fefc1e3a8e611d0501
-  data.tar.gz: 95e2e7d35ad27dda72e70e95e130beea35699251acfe0197df821fed8d19c891
+  metadata.gz: 00a812c26a6b677a4a10133a12d51d5ebaf45d3b26153cc3cf98500c54c6a0e4
+  data.tar.gz: 55fb7eb4ff838991649061d715dbb6d0835ab6b90e611a71163e4bf8f3b07688
 SHA512:
-  metadata.gz: 3e78b105c52830f1495c15d55437e627c6556b771f19786eb44bd1124b3d1694d15be23b26c3979da27f10deed692099cf3c9d98001c85dc2fc2f72120be2481
-  data.tar.gz: 2f0219205440c8ee873c51673e8dda503917c39b28d36c3255f996deef676a8daf3e5c623f1a8b8e31e750302c6523959b890d6df60de8b7f92f891d56ff1dd0
+  metadata.gz: 99707ae89bc0a01b0510da1859267a00bf16bca2aaa35e3d70ce6f6af6a96512b57dfc852f19a60c5604dfa5c5d9ea5c597c0c9ec662c73b81096a8f133739a8
+  data.tar.gz: 45f59f259aa0010bca3b153a680d2a0ec171ef3d55562e7fc4e0c75e8d8775a129ec531bc7175a443858936d884c60d1042ecdc60257cef31d46fa5a4fc14ce9

data/app/models/egov_utils/person.rb

@@ -59,6 +59,44 @@ module EgovUtils
       person_entity.to_s
     end
 
+    def self.find_or_create_from_remote_id(create_attrs)
+      remote_id = create_attrs[:remote_id].presence
+      person_type = create_attrs[:person_type].presence
+
+      person = if remote_id.present?
+        EgovUtils::Person.find_by(
+          remote_id: remote_id.presence,
+          person_type: person_type.presence
+        )
+      end
+      return person if person
+
+      if remote_id
+        attributes =
+          if person_type == 'natural'
+            Iszr::NaturalPeople::SearchByRemoteId.run!(remote_id:)
+          else
+            Iszr::LegalPeople::SearchByRemoteId.run!(remote_id:)
+          end.to_h
+
+        person_entity =
+          if person_type == 'natural'
+            NaturalPerson.find_or_initialize_by(attributes.except(:remote_id))
+          else
+            LegalPerson.find_or_initialize_by(attributes.except(:remote_id))
+          end
+
+        if person_entity.persisted?
+          person_entity.person.update!(remote_id:)
+          person_entity.person
+        end
+      else
+        new(create_attrs).tap do
+          _1.save(validate: false)
+        end
+      end
+    end
+
     private
 
     def set_person_from_remote_id

data/app/models/egov_utils/user.rb

@@ -161,8 +161,21 @@ module EgovUtils
       end
     end
 
+    def groups
+      super.to_a.concat(Array.wrap(ldap_groups))
+    end
+
     def ldap_groups
-      groups.where.not(ldap_uid: nil)
+      if provider.present?
+        group_ids = persisted? && Rails.cache.read("#{cache_key}/ldap_group_ids", expires_in: 30.minutes)
+        if group_ids
+          groups = EgovUtils::Group.where(id: group_ids).to_a
+        else
+          groups = EgovUtils::Group.where(provider: provider).to_a.select{|g| auth_source.member?(ldap_dn, g.external_uid) }
+          Rails.cache.write("#{cache_key}/ldap_group_ids", groups.collect(&:id), expires_in: 30.minutes) if persisted?
+        end
+        groups
+      end
     end
 
     def must_change_password?

data/app/services/egov_utils/refresh_user_groups.rb

@@ -25,7 +25,7 @@ module EgovUtils
     end
 
     def current_non_ldap_groups
-      @current_non_ldap_groups ||= user.groups.where(ldap_uid: nil)
+      @current_non_ldap_groups ||= user.groups.select { _1.ldap_uid.nil? }
     end
   end
 end

data/lib/egov_utils/iszr/np_addresses.json

@@ -86,5 +86,16 @@
     "district": "Hlavní město Praha",
     "region": "Hlavní město Praha",
     "country": 203
+  },
+  {
+    "remote_id": "1234",
+    "street": "Vzorová",
+    "house_number": "123",
+    "orientation_number": "1",
+    "city": "Praha",
+    "postcode": "13000",
+    "district": "Hlavní město Praha",
+    "region": "Hlavní město Praha",
+    "country": 203
   }
 ]

data/lib/egov_utils/iszr/np_results.json

@@ -54,5 +54,12 @@
     "birth_date": "1984-01-27",
     "birth_place": "Ankh-Morpork",
     "remote_id": "789"
+  },
+  {
+    "firstname": "Tom",
+    "lastname": "Dundek",
+    "birth_date": "1990-10-01",
+    "birth_place": "Ústí nad Labem",
+    "remote_id": "1234"
   }
 ]

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '1.5.0'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: request_store_rails
   requirement: !ruby/object:Gem::Requirement