zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'story/104711124-statuses' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2015-10-29 16:52:16 +02:00
commit 11e8701458
7 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/domain_status.rb
View file

@ -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'

3
app/models/legacy/contact.rb
View file

@ -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

21
app/models/legacy/object_state.rb
View file

@ -2,8 +2,7 @@ module Legacy
class ObjectState < Db
self.table_name = :object_state
def name
# legacy values
# legacy values. Just for log
# 2 => "serverRenewProhibited",
# 5 => "serverOutzoneManual",
# 6 => "serverInzoneManual",
@ -27,15 +26,15 @@ module Legacy
# 21 => "forceDelete"
# new values
map = {
STATE_NAMES = {
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",
@ -43,10 +42,12 @@ module Legacy
4 => "serverUpdateProhibited",
16 => "linked",
17 => "deleteCandidate", # grupistaatus
21 => "forceDelete" # grupistaatus
}
21 => "serverForceDelete" # grupistaatus
}.freeze
map[state_id]
def name
STATE_NAMES[state_id]
end
def desc

9
lib/tasks/import.rake
View file

@ -163,11 +163,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)
@ -198,7 +198,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
@ -300,15 +301,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),

46
lib/tasks/statuses.rake
View file

@ -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'
]
}

4
spec/features/admin/domain_spec.rb
View file

@ -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')

4
spec/models/domain_spec.rb
View file

@ -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",