Don't create default user. Create when agree to terms of service

app/controllers/application_controller.rb

@@ -13,21 +13,15 @@ class ApplicationController < ActionController::Base
   rescue_from ActionController::RoutingError, with: :not_found
 
   def set_user
-    if session[:user_id]
-      @user = User.find(session[:user_id])
-    else
-      create_and_set_user
-    end
-  rescue ActiveRecord::RecordNotFound
-    create_and_set_user
+    @user = User.find(session[:user_id]) if session[:user_id]
   end
 
   def set_plan
-    @plan = @user.plans.where(event: @event).recent&.first ||
-            @user.plans.build(title: "My RubyKaigi #{@event.name} set list",
-                              description: "Enjoy my RubyKaigi #{@event.name} set list",
-                              public: true,
-                              event: @event)
+    @plan = (@user && @user.plans.where(event: @event).recent&.first) ||
+            Plan.new(title: "My RubyKaigi #{@event.name} set list",
+                     description: "Enjoy my RubyKaigi #{@event.name} set list",
+                     public: true,
+                     event: @event)
   end
 
   def not_found(err)

app/controllers/plans_controller.rb

@@ -41,6 +41,7 @@ def editable
   end
 
   def create
+    create_and_set_user unless @user
     @plan = @user.plans.where(event: @event).create!(plan_params)
     add_and_remove_plans if plan_add_or_remove?
     redirect_to event_schedules_path(event_name: @plan.event.name)