From d2b5266887fe67a0180753383f0548bc290deef6 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Thu, 29 Oct 2015 15:22:03 +0200 Subject: [PATCH 1/2] in the migration script add state to the Contact --- app/models/legacy/contact.rb | 3 +- app/models/legacy/object_state.rb | 55 ++++++++++++++++--------------- lib/tasks/import.rake | 5 +-- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/app/models/legacy/contact.rb b/app/models/legacy/contact.rb index e77c39b36..04f8c34a4 100644 --- a/app/models/legacy/contact.rb +++ b/app/models/legacy/contact.rb @@ -3,6 +3,7 @@ module Legacy self.table_name = :contact belongs_to :object_registry, foreign_key: :id belongs_to :object, foreign_key: :id - belongs_to :object_state, foreign_key: :id, primary_key: :object_id + + has_one :object_state, -> { where('valid_to IS NULL') }, foreign_key: :object_id end end diff --git a/app/models/legacy/object_state.rb b/app/models/legacy/object_state.rb index 0a59cf021..11ba8008b 100644 --- a/app/models/legacy/object_state.rb +++ b/app/models/legacy/object_state.rb @@ -2,32 +2,31 @@ module Legacy class ObjectState < Db self.table_name = :object_state - def name - # legacy values - # 2 => "serverRenewProhibited", - # 5 => "serverOutzoneManual", - # 6 => "serverInzoneManual", - # 7 => "serverBlocked", - # 8 => "expirationWarning", - # 9 => "expired", - # 10 => "unguarded", - # 11 => "validationWarning1", - # 12 => "validationWarning2", - # 13 => "notValidated", - # 14 => "nssetMissing", - # 15 => "outzone", - # 18 => "serverRegistrantChangeProhibited", - # 19 => "deleteWarning", - # 20 => "outzoneUnguarded", - # 1 => "serverDeleteProhibited", - # 3 => "serverTransferProhibited", - # 4 => "serverUpdateProhibited", - # 16 => "linked", - # 17 => "deleteCandidate", - # 21 => "forceDelete" + # legacy values + # 2 => "serverRenewProhibited", + # 5 => "serverOutzoneManual", + # 6 => "serverInzoneManual", + # 7 => "serverBlocked", + # 8 => "expirationWarning", + # 9 => "expired", + # 10 => "unguarded", + # 11 => "validationWarning1", + # 12 => "validationWarning2", + # 13 => "notValidated", + # 14 => "nssetMissing", + # 15 => "outzone", + # 18 => "serverRegistrantChangeProhibited", + # 19 => "deleteWarning", + # 20 => "outzoneUnguarded", + # 1 => "serverDeleteProhibited", + # 3 => "serverTransferProhibited", + # 4 => "serverUpdateProhibited", + # 16 => "linked", + # 17 => "deleteCandidate", + # 21 => "forceDelete" - # new values - map = { + # new values + STATE_NAMES = { 2 => "serverRenewProhibited", 5 => "serverHold", 6 => "serverManualInzone", @@ -44,9 +43,11 @@ module Legacy 16 => "linked", 17 => "deleteCandidate", # grupistaatus 21 => "forceDelete" # grupistaatus - } + }.freeze - map[state_id] + + def name + STATE_NAMES[state_id] end def desc diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 661c94c22..2a13f8a28 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -164,11 +164,11 @@ namespace :import do zip state country_code + statuses ) contacts = [] existing_contact_ids = Contact.pluck(:legacy_id) - user = "rake-#{`whoami`.strip} #{ARGV.join ' '}" count = 0 Legacy::Contact.includes(:object_registry, :object, object_registry: :registrar) @@ -200,7 +200,8 @@ namespace :import do x.city.try(:strip), x.postalcode.try(:strip), x.stateorprovince.try(:strip), - x.country.try(:strip) + x.country.try(:strip), + [x.object_state.try(:name)|| Contact::OK] ] if contacts.size % 10000 == 0 From e92f21dee4edd8593f4455fcac01ee5d92fbf7ab Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Thu, 29 Oct 2015 16:51:06 +0200 Subject: [PATCH 2/2] Story#104711124 update domains state names + it has influenced to change forceDelete to serverForceDelete --- app/models/domain_status.rb | 2 +- app/models/legacy/object_state.rb | 12 ++++---- lib/tasks/import.rake | 4 +-- lib/tasks/statuses.rake | 46 +++++++++++++++--------------- spec/features/admin/domain_spec.rb | 4 +-- spec/models/domain_spec.rb | 4 +-- 6 files changed, 35 insertions(+), 37 deletions(-) diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb index 3f88de39f..fa64f732e 100644 --- a/app/models/domain_status.rb +++ b/app/models/domain_status.rb @@ -68,7 +68,7 @@ class DomainStatus < ActiveRecord::Base SERVER_REGISTRANT_CHANGE_PROHIBITED = 'serverRegistrantChangeProhibited' SERVER_ADMIN_CHANGE_PROHIBITED = 'serverAdminChangeProhibited' SERVER_TECH_CHANGE_PROHIBITED = 'serverTechChangeProhibited' - FORCE_DELETE = 'forceDelete' + FORCE_DELETE = 'serverForceDelete' DELETE_CANDIDATE = 'deleteCandidate' EXPIRED = 'expired' RESERVED = 'reserved' diff --git a/app/models/legacy/object_state.rb b/app/models/legacy/object_state.rb index 11ba8008b..379d4d175 100644 --- a/app/models/legacy/object_state.rb +++ b/app/models/legacy/object_state.rb @@ -2,7 +2,7 @@ module Legacy class ObjectState < Db self.table_name = :object_state - # legacy values + # legacy values. Just for log # 2 => "serverRenewProhibited", # 5 => "serverOutzoneManual", # 6 => "serverInzoneManual", @@ -30,11 +30,11 @@ module Legacy 2 => "serverRenewProhibited", 5 => "serverHold", 6 => "serverManualInzone", - 7 => "serverBlocked", + # 7 => "serverBlocked", 9 => "expired", - 11 => "validationWarning1", - 13 => "notValidated", - 14 => "nssetMissing", + # 11 => "validationWarning1", + # 13 => "notValidated", + 14 => "inactive", 15 => "serverHold", 18 => "serverRegistrantChangeProhibited", 1 => "serverDeleteProhibited", @@ -42,7 +42,7 @@ module Legacy 4 => "serverUpdateProhibited", 16 => "linked", 17 => "deleteCandidate", # grupistaatus - 21 => "forceDelete" # grupistaatus + 21 => "serverForceDelete" # grupistaatus }.freeze diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 2a13f8a28..2fc2d5bb8 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -303,15 +303,13 @@ namespace :import do begin # domain statuses domain_statuses = [] - ok = true x.object_states.each do |state| next if state.name.blank? domain_statuses << state.name - ok = false end # OK status is default - domain_statuses << DomainStatus::OK if ok + domain_statuses << DomainStatus::OK if domain_statuses.empty? domains << [ x.object_registry.name.try(:strip), diff --git a/lib/tasks/statuses.rake b/lib/tasks/statuses.rake index a8d3af0c9..61adf372d 100644 --- a/lib/tasks/statuses.rake +++ b/lib/tasks/statuses.rake @@ -17,7 +17,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -36,7 +36,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -55,7 +55,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -73,7 +73,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -91,7 +91,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -115,7 +115,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -139,7 +139,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -163,7 +163,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -187,7 +187,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -211,7 +211,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -235,7 +235,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -255,7 +255,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -274,7 +274,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -292,7 +292,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' @@ -311,7 +311,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -329,7 +329,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -353,7 +353,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -378,7 +378,7 @@ task statuses: [:environment] do 'serverManualInzone', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -403,7 +403,7 @@ task statuses: [:environment] do 'serverManualInzone', 'serverRegistrantChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -428,11 +428,11 @@ task statuses: [:environment] do 'serverManualInzone', 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], - 'forceDelete': [ + 'serverForceDelete': [ 'clientHold', 'serverHold', 'inactive', @@ -465,7 +465,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate', 'expired' ], @@ -491,7 +491,7 @@ task statuses: [:environment] do 'serverRegistrantChangeProhibited', 'serverAdminChangeProhibited', 'serverTechChangeProhibited', - 'forceDelete', + 'serverForceDelete', 'deleteCandidate' ] } diff --git a/spec/features/admin/domain_spec.rb b/spec/features/admin/domain_spec.rb index fc9548996..755a30c6f 100644 --- a/spec/features/admin/domain_spec.rb +++ b/spec/features/admin/domain_spec.rb @@ -59,7 +59,7 @@ feature 'Domain', type: :feature do click_link 'Edit statuses' page.should have_content('ok') click_link 'Set force delete' - page.should have_content('forceDelete') + page.should have_content('serverForceDelete') page.should have_content('serverRenewProhibited') page.should have_content('serverTransferProhibited') page.should have_content('serverUpdateProhibited') @@ -74,7 +74,7 @@ feature 'Domain', type: :feature do click_link 'Back to domain' click_link 'Edit statuses' click_link 'Unset force delete' - page.should_not have_content('forceDelete') + page.should_not have_content('serverForceDelete') page.should_not have_content('serverRenewProhibited') page.should_not have_content('serverTransferProhibited') page.should_not have_content('serverUpdateProhibited') diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 8ec5f4b25..c8c5f1ddf 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -240,7 +240,7 @@ describe Domain do @domain.set_force_delete @domain.statuses.should match_array([ - "forceDelete", + "serverForceDelete", "pendingDelete", "serverManualInzone", "serverRenewProhibited", @@ -281,7 +281,7 @@ describe Domain do "clientHold", "deleteCandidate", "expired", - "forceDelete", + "serverForceDelete", "pendingDelete", "serverHold", "serverRenewProhibited",