Story#104711124 update domains state names + it has influenced to change forceDelete to serverForceDelete

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'

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",
+        # 11 => "validationWarning1",
-        13 => "notValidated",
+        # 13 => "notValidated",
-        14 => "nssetMissing",
+        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
 
 

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

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

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

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