ユーザー一覧の非Vue化をする

app/controllers/api/followings_controller.rb

@@ -7,7 +7,7 @@ def create
     user = User.find(params[:id])
     watch = params[:watch] == 'true'
     if current_user.follow(user, watch:)
-      render json: { id: user.id }
+      head :no_content
     else
       head :bad_request
     end

app/controllers/generations_controller.rb

@@ -2,6 +2,7 @@
 
 class GenerationsController < ApplicationController
   ALLOWED_TARGETS = %w[all trainee adviser graduate mentor retired].freeze
+  PAGER_NUMBER = 24
 
   def show
     @generation = params[:id].to_i
@@ -10,5 +11,8 @@ def show
   def index
     @target = ALLOWED_TARGETS.include?(params[:target]) ? params[:target] : ALLOWED_TARGETS.first
     redirect_to root_path, alert: '管理者としてログインしてください' if @target == 'retired' && !current_user.admin?
+
+    result = Generation.generations(@target).reverse
+    @generations = Kaminari.paginate_array(result).page(params[:page]).per(PAGER_NUMBER)
   end
 end

app/controllers/talks/action_uncompleted_controller.rb

@@ -8,25 +8,17 @@ def index
                  .includes(user: [{ avatar_attachment: :blob }, :discord_profile])
                  .action_uncompleted
                  .order(updated_at: :desc, id: :asc)
-    params[:search_word] = validate_search_word(params[:search_word]) if params[:search_word]
 
     if params[:search_word]
-      @searched_talks = @talks.merge(
-        User.search_by_keywords({ word: params[:search_word] })
-            .unscope(where: :retired_on)
-      ).page(params[:page])
-    else
-      @talks = @talks.page(params[:page])
+      search_user = SearchUser.new(word: params[:search_word], require_retire_user: true)
+      @validated_search_word = search_user.validate_search_word
     end
-  end
 
-  private
-
-  def validate_search_word(search_word)
-    if search_word.match?(/^[\w-]+$/)
-      search_word.strip if search_word.strip.length >= 3
-    elsif search_word.strip.length >= 2
-      search_word.strip
+    if @validated_search_word
+      searched_users = search_user.search
+      @searched_talks = @talks.merge(searched_users).page(params[:page])
+    else
+      @talks = @talks.page(params[:page])
     end
   end
 end

app/controllers/talks_controller.rb

@@ -15,14 +15,14 @@ def index
                  .includes(user: [{ avatar_attachment: :blob }, :discord_profile])
                  .order(updated_at: :desc, id: :asc)
     users = User.users_role(@target, allowed_targets: ALLOWED_TARGETS, default_target: 'all')
-    params[:search_word] = validate_search_word(params[:search_word]) if params[:search_word]
 
     if params[:search_word]
-      # search_by_keywords内では { unretired } というスコープが設定されている
-      # 退会したユーザーも検索対象に含めたいので、unscope(where: :retired_on) で上記のスコープを削除
-      searched_users = users.search_by_keywords(word: params[:search_word]).unscope(where: :retired_on)
-      # もし検索対象が退会したユーザーである場合、searched_usersには退会していないユーザーも含まれているため、retired スコープを設定する
-      searched_users = searched_users.retired if @target == 'retired'
+      search_user = SearchUser.new(word: params[:search_word], users:, target: @target, require_retire_user: true)
+      @validated_search_word = search_user.validate_search_word
+    end
+
+    if @validated_search_word
+      searched_users = search_user.search
       @searched_talks = @talks.merge(searched_users).page(params[:page])
     else
       @talks = @talks.merge(users).page(params[:page])
@@ -52,12 +52,4 @@ def set_members
                    .where(id: User.admins.ids.push(@talk.user_id))
                    .order(:id)
   end
-
-  def validate_search_word(search_word)
-    if search_word.match?(/^[\w-]+$/)
-      search_word.strip if search_word.strip.length >= 3
-    elsif search_word.strip.length >= 2
-      search_word.strip
-    end
-  end
 end

app/controllers/users_controller.rb

@@ -5,29 +5,26 @@ class UsersController < ApplicationController
   before_action :require_token, only: %i[new] if Rails.env.production?
   before_action :set_user, only: %w[show]
 
-  PAGER_NUMBER = 20
+  PAGER_NUMBER = 24
 
   def index
     @target = params[:target]
     @target = 'student_and_trainee' unless target_allowlist.include?(@target)
+    @entered_tag = params[:tag]
     @watch = params[:watch]
 
-    target_users =
-      if @target == 'followings'
-        current_user.followees_list(watch: @watch)
-      elsif params[:tag]
-        User.tagged_with(params[:tag])
-      else
-        users = User.users_role(@target, allowed_targets: target_allowlist)
-        @target == 'inactive' ? users.order(:last_activity_at) : users
-      end
+    target_users = fetch_target_users
 
     @users = target_users
              .page(params[:page]).per(PAGER_NUMBER)
              .preload(:avatar_attachment, :course, :taggings)
              .order(updated_at: :desc)
 
     @users = @users.unhibernated.unretired unless @target.in? %w[hibernated retired]
+    if params[:search_word]
+      search_user = SearchUser.new(word: params[:search_word], users: @users, target: @target)
+      @users = search_user.search
+    end
 
     @random_tags = User.tags.sample(20)
     @top3_tags_counts = User.tags.limit(3).map(&:count).uniq
@@ -77,6 +74,17 @@ def create
 
   private
 
+  def fetch_target_users
+    if @target == 'followings'
+      current_user.followees_list(watch: @watch)
+    elsif @entered_tag
+      User.tagged_with(@entered_tag)
+    else
+      users = User.users_role(@target, allowed_targets: target_allowlist)
+      @target == 'inactive' ? users.order(:last_activity_at) : users
+    end
+  end
+
   def target_allowlist
     target_allowlist = %w[student_and_trainee followings mentor graduate adviser trainee year_end_party]
     target_allowlist.push('job_seeking') if current_user.adviser?

app/helpers/users_helper.rb

@@ -51,6 +51,19 @@ def users_name
     User.pluck(:login_name, :id).sort
   end
 
+  def button_label(user)
+    if current_user.following?(user)
+      current_user.watching?(user) ? 'コメントあり' : 'コメントなし'
+    else
+      'フォローする'
+    end
+  end
+
+  def desc_paragraphs(user)
+    max_description = user.description.length <= 200 ? user.description : "#{user.description[0...200]}..."
+    max_description.split(/\n|\r\n/).map.with_index { |text, i| { id: i, text: } }
+  end
+
   def all_countries_with_subdivisions
     ISO3166::Country.all
                     .map { |country| [country.alpha2, country.subdivision_names_with_codes(I18n.locale.to_s)] }

app/javascript/components/user.vue

@@ -60,7 +60,7 @@
           user-tags(:user='user')
       user-practice-progress(:user='user')
       hr.a-border-tint
-      footer.card-footer
+      footer.card-footer.users-item__footer
         .card-main-actions
           ul.card-main-actions__items
             li.card-main-actions__item(