egov_utils 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999501817d4aa5533235375d0d182b3816dcbe25126e0b26649e8b121b505f3b
-  data.tar.gz: 030b79099740eb57801b9380908d57501607affc5c002e88c494e66bcfa70a3a
+  metadata.gz: 39d1cac9552de528bbd6fb76ab0f766289d3b0cbe795e2b5de0b0ac48558619a
+  data.tar.gz: ae2f54428922bd3a8ff814e243ceacad6fc65e06dee028351dcb64baf771a64b
 SHA512:
-  metadata.gz: d363f4c2a920a0b09234b68281c6a7da47b23347971d27f426968404ebfd653e07cd359d9c08d34439608f4d174d23bb6cece844cb4daa1abf5d83731850ce47
-  data.tar.gz: be24f8cd519b9812ef06d63e128a9bbe4fdd5ca09d2c261dbf128646c3ecb1fa30eabd4c9048269132ee1e66f867c7ae9c3daeaf78fe805e5ffb700b2a5c640f
+  metadata.gz: 13f02bb9e196af53330637d00e8127de164b19284f99988edcbfed14f0722449f04a70bb24dfcf7f93d08780b3eef8ad746e9923a51cc9bcc4b1e7558b4ac436
+  data.tar.gz: 9f3036d67042d62b3ec567e01da3fdbc60dc8a904026f883c60608d923e124a673a76d63f12dd9c81d149a3347389337aeafbad68ad529cbd3eef2703eae0b13

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

@@ -1,7 +1,7 @@
 module EgovUtils
   class PeopleController < ApplicationController
 
-    load_and_authorize_resource
+    load_and_authorize_resource only: :index
 
     def index
       @people_schema = PersonSchema.new
@@ -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/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.2'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-07-26 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