Fix bug model User, create Apply, apply process

app/controllers/application_controller.rb

 class ApplicationController < ActionController::Base
 class ApplicationController < ActionController::Base
-    # Prevent CSRF attacks by raising an exception.
-    # For APIs, you may want to use :null_session instead.
-    protect_from_forgery with: :exception
-    before_action :configure_permitted_parameters, if: :devise_controller?
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+  before_action :configure_permitted_parameters, if: :devise_controller?
 
 
-    protected
 
 
-    def configure_permitted_parameters
-      added_attrs = [:remember_me, :username, :first_name, :last_name]
-      devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
-      devise_parameter_sanitizer.permit :account_update, keys: added_attrs
-    end
+  def check_user_logged_in?
+    redirect_to login_path unless user_signed_in?
+  end
 
 
-    def after_sign_in_path_for(resource)
-      stored_location_for(resource) || my_path
-    end
+  protected
+
+  def configure_permitted_parameters
+    added_attrs = [:remember_me, :username, :first_name, :last_name]
+    devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
+    devise_parameter_sanitizer.permit :account_update, keys: added_attrs
+  end
+
+  def after_sign_in_path_for(resource)
+    stored_location_for(resource) || my_path
+  end
 end
 end

app/controllers/apply_controller.rb

 class ApplyController < ApplicationController
 class ApplyController < ApplicationController
+  before_action :check_user_logged_in?
   before_action :load_job, only: [:new, :done, :confirm]
   before_action :load_job, only: [:new, :done, :confirm]
 
 
+  def new
+    @apply = if params[:apply].present?
+               current_user.applies.new(apply_job_params)
+             else
+               current_user.applies.new
+             end
+  end
+
+
+  def confirm
+    @apply = current_user.applies.new(apply_job_params)
+  end
+
   def done
   def done
-    binding.pry
-    @apply = UserJob.new(apply_job_params)
+    @apply = current_user.applies.new(apply_job_params)
     if @apply.save
     if @apply.save
-      redirect_to done_path
+      flash[:success] = "Your application has been saved successfully!"
     else
     else
       render :new
       render :new
     end
     end
   end
   end
 
 
-  def new
-    @apply = UserJob.new
-  end
-
-  def confirm
-    @apply = UserJob.new(apply_job_params)
-  end
-
   private
   private
 
 
-  def apply_job_params
-    params.require(:user_job).permit(:cv_url, :first_name, :last_name, :username, :email)
-  end
-
   def load_job
   def load_job
     @job = Job.find_by(id: params[:job_id])
     @job = Job.find_by(id: params[:job_id])
   end
   end
+
+  def apply_job_params
+    params.require(:apply)
+          .permit(:cv_url, :first_name, :last_name, :username, :email)
+          .merge(job_id: @job.id)
+  end
 end
 end

app/models/apply.rb

+class Apply < UserJob
+end

app/models/apply_job.rb

-class ApplyJob < UserJob
-  belongs_to :users
-  belongs_to :jobs
-end

app/models/favorite.rb

+class Favorite < UserJob
+end

app/models/history.rb

+class History < UserJob
+end

app/models/user.rb

 class User < ApplicationRecord
 class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :validatable
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable
 
 
-  has_many :user_jobs
-  has_many :apply_jobs
+  has_many :applies
+  has_many :favorites
+  has_many :histories
 
 
   VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
   VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
   VALID_USERNAME_REGEX = /\A[a-zA-Z0-9]+\z/
   VALID_USERNAME_REGEX = /\A[a-zA-Z0-9]+\z/

config/routes.rb

@@ -22,7 +22,7 @@ Rails.application.routes.draw do
   get "jobs/industry/:industry_id", to: "jobs#index", as: "industry_jobs"
   get "jobs/industry/:industry_id", to: "jobs#index", as: "industry_jobs"
   get "detail/:job_id", to: "jobs#show", as: "job"
   get "detail/:job_id", to: "jobs#show", as: "job"
   get "apply/:job_id", to: "apply#new", as: "apply"
   get "apply/:job_id", to: "apply#new", as: "apply"
-  post "confirm/:job_id/", to: "apply#confirm", as: "confirm"
+  post "confirm/:job_id", to: "apply#confirm", as: "confirm"
   post "done/:job_id", to: "apply#done", as: "done"
   post "done/:job_id", to: "apply#done", as: "done"
 
 
   concern :paginatable do
   concern :paginatable do

db/migrate/20200115030911_modify_user.rb

+class ModifyUser < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :users, :password_digest, :string
+  end
+end

db/migrate/20200115032331_change_type_user_job.rb

+class ChangeTypeUserJob < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :user_jobs, :job_type, :type
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 #
 # It's strongly recommended that you check this file into your version control system.
 # It's strongly recommended that you check this file into your version control system.
 
 
-ActiveRecord::Schema.define(version: 2020_01_13_080045) do
+ActiveRecord::Schema.define(version: 2020_01_15_032331) do
 
 
   create_table "cities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
   create_table "cities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name"
     t.string "name"
@@ -71,7 +71,7 @@ ActiveRecord::Schema.define(version: 2020_01_13_080045) do
   create_table "user_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
   create_table "user_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.integer "user_id"
     t.integer "user_id"
     t.integer "job_id"
     t.integer "job_id"
-    t.integer "job_type"
+    t.integer "type"
     t.datetime "favorited_at"
     t.datetime "favorited_at"
     t.datetime "viewed_at"
     t.datetime "viewed_at"
     t.datetime "applied_at"
     t.datetime "applied_at"
@@ -96,7 +96,6 @@ ActiveRecord::Schema.define(version: 2020_01_13_080045) do
     t.string "first_name"
     t.string "first_name"
     t.string "last_name"
     t.string "last_name"
     t.text "cv_url"
     t.text "cv_url"
-    t.string "password_digest"
     t.integer "role"
     t.integer "role"
     t.string "remember_digest"
     t.string "remember_digest"
     t.datetime "activated_at"
     t.datetime "activated_at"