egov_utils 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46866bd8cd323b73b2c99ad7f027e7b3ae9042f871d93b9b5ca0f45677fe643e
-  data.tar.gz: b233828c37f7dc42a4093aaee39ec5339f28e11ddd539910004803ba035be4eb
+  metadata.gz: c3af04b2760bc38581e430b5ad1195fbf621e0ac1e2d013fb256be44ca6a3ce4
+  data.tar.gz: bee321a601dfc6cd190770b16f58dc10c001d75588ae25274f5d7ee33061863c
 SHA512:
-  metadata.gz: 5b165226cc59161621b0645957accb50a58e153c4f139aaf6a22b19772a22900f75b7a99b4ab84899a732820d25e43c14bea28546ac7b648e8205f64a6a476c5
-  data.tar.gz: e25fd828cad3f7116847a65471415624493ccf04011987f5584a96bfb67598e3cff944ddc300947226b24232946bf696fa07b5b80d6c4e636ed9815dbf53fadd
+  metadata.gz: 3fb0a3419d585ab1cb4b5d8abf72204839fdb4d182720cefd0a2a2c0452b512fe6e52778676644e7a085bbedc21c1a3dd2e1b0437c691343e8b83f955529950f
+  data.tar.gz: e147fd2ecbee0e689636b62cec8865f3041f12a9aa9e3b8871d18e334bd61ba7498b883d08a021c0fff58598ac916e3f69df22201b8c08afc50cdc1a01a5a4d2

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -78,6 +78,7 @@ window.eGovUtilities =
   initSelect2: ($container)->
     $container ||= $(document)
     $('[data-provide="select2"]', $container).select2(width: null)
+    $('[data-provide="select2"]', $container).trigger("select2:initialized")
 
   destroySelect2: ($container)->
     $container ||= $(document)

data/app/controllers/egov_utils/people_controller.rb

@@ -9,8 +9,8 @@ module EgovUtils
       respond_to do |format|
         if params['_type'] == 'query'
           format.json{ render json: {
-            results: @people_schema.entities.includes(:residence).collect do |p|
-                {id: p.id, text: p.to_s, residence: p.residence.to_s}
+            results: @people_schema.entities.includes(:residence, :addresses).collect do |p|
+                {id: p.id, text: p.to_s, residence: p.residence.to_s, addresses: p.addresses}
               end
           }}
         else
@@ -22,5 +22,21 @@ module EgovUtils
     def show
     end
 
+    def addresses
+      addresses = Address.where(person_id: params[:person_id])
+
+      render json: {
+        results: addresses.map do |a|
+          {
+            id: a.id,
+            text: a.to_s,
+            street: a.street,
+            number: a.number,
+            postcode: a.postcode,
+            city: a.city
+          }
+        end
+      }
+    end
   end
 end

data/app/models/egov_utils/person.rb

@@ -1,7 +1,10 @@
 module EgovUtils
   class Person < ApplicationRecord
 
-    belongs_to :residence, class_name: 'EgovUtils::Address', optional: true
+    # This is kept for accepts_nested_attributes_for compatibility, but
+    # overloaded below.
+    has_one :residence, class_name: 'EgovUtils::Address'
+    has_many :addresses
     has_one :natural_person, dependent: :destroy
     has_one :legal_person, dependent: :destroy
 
@@ -22,6 +25,14 @@ module EgovUtils
       end
     end
 
+    def residence
+      addresses.order(created_at: :desc).first
+    end
+
+    def residence=(address)
+      addresses << address
+    end
+
     def to_s
       person_entity.to_s
     end

data/app/models/egov_utils/user.rb

@@ -142,6 +142,13 @@ module EgovUtils
       all_role_names.map{|rn| EgovUtils::UserUtils::Role.find(rn) }.compact.collect{|cls| cls.new }
     end
 
+    def ldap_dn
+      @ldap_dn ||= begin
+        dn = auth_source.send(:get_user_dn, login)
+        dn[:dn] if dn
+      end
+    end
+
     def ldap_groups
       groups.where.not(ldap_uid: nil)
     end

data/app/services/egov_utils/refresh_user_groups.rb

@@ -15,19 +15,12 @@ module EgovUtils
 
     attr_reader :user
 
-    def ldap_dn
-      @ldap_dn ||= begin
-        dn = user.auth_source.send(:get_user_dn, user.login)
-        dn[:dn] if dn
-      end
-    end
-
     def ldap_groups
       return [] if user.provider.blank?
 
       @ldap_groups ||= begin
         EgovUtils::Group.where(provider: user.provider).to_a.select do |g|
-          user.auth_source.member?(ldap_dn, g.external_uid)
+          user.auth_source.member?(user.ldap_dn, g.external_uid)
         end
       end
     end

data/config/routes.rb

@@ -12,7 +12,9 @@ EgovUtils::Engine.routes.draw do
     get :confirm, on: :member
   end
 
-  resources :people
+  resources :people do
+    get :addresses
+  end
 
   resources :groups do
     member do

data/db/migrate/20220624070709_migrate_person_residence_to_addresses.rb

@@ -0,0 +1,20 @@
+class MigratePersonResidenceToAddresses < ActiveRecord::Migration[6.1]
+  def up
+    add_column :egov_utils_addresses, :person_id, :bigint, index: true
+    add_foreign_key :egov_utils_addresses, :egov_utils_people, column: :person_id
+
+    execute <<-SQL
+      UPDATE egov_utils_addresses
+      SET person_id = egov_utils_people.id
+      FROM egov_utils_people
+      WHERE egov_utils_addresses.id = egov_utils_people.residence_id;
+    SQL
+
+    remove_index  :egov_utils_people, :residence_id
+    remove_column :egov_utils_people, :residence_id
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -616,6 +616,7 @@ files:
 - db/migrate/20180403150556_create_egov_utils_legal_people.rb
 - db/migrate/20180424143207_add_titles_to_natural_people.rb
 - db/migrate/20220331113917_add_days_before_inactive_to_egov_utils_users.rb
+- db/migrate/20220624070709_migrate_person_residence_to_addresses.rb
 - lib/azahara_schema_currency.rb
 - lib/azahara_schema_currency/aggregation_attribute_patch.rb
 - lib/azahara_schema_currency/association_attribute_patch.rb