Fix account creation and import updates

app/controllers/imports_controller.rb

@@ -1,5 +1,5 @@
 class ImportsController < ApplicationController
-  disallow_account_scope
+  disallow_account_scope only: %i[ new create ]
 
   layout "public"
 
@@ -7,32 +7,28 @@ class ImportsController < ApplicationController
   end
 
   def create
-    account = create_account_for_import
+    signup = Signup.new(identity: Current.identity, full_name: "Import", skip_account_seeding: true)
 
-    Current.set(account: account) do
+    if signup.complete
-      @import = account.imports.create!(identity: Current.identity, file: params[:file])
+      start_import(signup.account)
+    else
+      render :new, alert: "Couldn't create account."
     end
-
-    @import.perform_later
-    redirect_to import_path(@import)
   end
 
   def show
-    @import = Current.identity.imports.find(params[:id])
+    @import = Current.account.imports.find(params[:id])
   end
 
   private
-    def create_account_for_import
+    def start_import(account)
-      Account.create_with_owner(
+      import = nil
-        account: { name: account_name_from_zip },
-        owner: { name: Current.identity.email_address.split("@").first, identity: Current.identity }
-      )
-    end
 
-    def account_name_from_zip
+      Current.set(account: account) do
-      Zip::File.open(params[:file].tempfile.path) do |zip|
+        import = account.imports.create!(identity: Current.identity, file: params[:file])
-        entry = zip.find_entry("data/account.json")
+        import.process_later
-        JSON.parse(entry.get_input_stream.read)["name"]
       end
+
+      redirect_to import_path(import, script_name: account.slug)
     end
 end

app/models/signup.rb

@@ -3,7 +3,7 @@ class Signup
   include ActiveModel::Attributes
   include ActiveModel::Validations
 
-  attr_accessor :full_name, :email_address, :identity
+  attr_accessor :full_name, :email_address, :identity, :skip_account_seeding
   attr_reader :account, :user
 
   validates :email_address, format: { with: URI::MailTo::EMAIL_REGEXP }, on: :identity_creation
@@ -65,7 +65,7 @@ class Signup
         }
       )
       @user = @account.users.find_by!(role: :owner)
-      @account.setup_customer_template
+      @account.setup_customer_template unless skip_account_seeding
     end
 
     def generate_account_name