Make use of confirmed scope

Use confirmed scope for finding user by slug so there is no need checking the user record directly
rubygems · Oct 19, 2024 · 2958b9f · 2958b9f
1 parent 99891bf
commit 2958b9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
@@ -8,8 +8,8 @@ class ProfilesController < ApplicationController
   before_action :disable_cache, only: :edit
 
   def show
-    @user = User.find_by_slug!(params[:id])
-    return render_not_found unless @user.email_confirmed?
+    @user = User.confirmed.find_by_slug!(params[:id])
+    return render_not_found unless @user
     @rubygems = @user.rubygems_downloaded.includes(%i[latest_version gem_download]).strict_loading
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,6 +27,7 @@ class User < ApplicationRecord
   scope :not_deleted, -> { kept }
   scope :deleted, -> { with_discarded.discarded }
   scope :with_deleted, -> { with_discarded }
+  scope :confirmed, -> { where(email_confirmed: true) }
 
   has_many :ownerships, -> { confirmed }, dependent: :destroy, inverse_of: :user