Merge pull request #503 from alphagov/laurent/fix-org-importer

Fix organisation importer

Author: Laurent Curau

app/services/legacy/organisation_import_service.rb

@@ -6,11 +6,7 @@ def initialize(legacy_organisation)
   end
 
   def run
-    if organisation.persisted?
-      organisation.update_columns(organisation_attributes)
-    else
-      organisation.update_attributes(organisation_attributes)
-    end
+    organisation.update_attributes!(organisation_attributes)
   end
 
   def organisation_attributes
@@ -30,7 +26,7 @@ def organisation_attributes
       foi_web: legacy_organisation["foi-web"],
       category: legacy_organisation["category"],
       org_type: get_org_type,
-      ancestry: get_parent_organisation_id
+      parent: get_parent_organisation
     }
   end
 
@@ -40,7 +36,7 @@ def organisation
     @organisation ||= Organisation.find_or_initialize_by(name: legacy_organisation["name"])
   end
 
-  def get_parent_organisation_id
+  def get_parent_organisation
     Organisation.find_by(name: groups[0]["name"]) if groups.any?
   end