Merge branch 'story/104711124-statuses' into staging

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

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),

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