定期イベント主催者ユーザーが退会/休会/研修終了した際の処理の見直し

app/controllers/hibernation_controller.rb

@@ -7,6 +7,7 @@ def show; end
 
   def new
     @hibernation = Hibernation.new
+    @holding_regular_events = RegularEvent.organizer_event(current_user).holding
   end
 
   def create
@@ -18,11 +19,11 @@ def create
       destroy_subscription!
       notify_to_chat
       notify_to_mentors_and_admins
-      current_user.cancel_participation_from_regular_events
-      current_user.delete_and_assign_new_organizer
+      current_user.clean_up_regular_events
       logout
       redirect_to hibernation_path
     else
+      @holding_regular_events = RegularEvent.organizer_event(current_user).holding
       render :new
     end
   end

app/controllers/regular_events_controller.rb

@@ -33,7 +33,7 @@ def create
     set_wip
     if @regular_event.save
       update_published_at
-      Organizer.create(user_id: current_user.id, regular_event_id: @regular_event.id)
+      @regular_event.regular_event_organizers.find_or_create_by(user: current_user)
       ActiveSupport::Notifications.instrument('regular_event.create', regular_event: @regular_event)
       set_all_user_participants_and_watchers
       select_redirect_path

app/controllers/retirement_controller.rb

@@ -5,7 +5,9 @@ class RetirementController < ApplicationController
 
   def show; end
 
-  def new; end
+  def new
+    @holding_regular_events = RegularEvent.organizer_event(current_user).holding
+  end
 
   def create
     retirement = Retirement.by_self(retire_reason_params, user: current_user)
@@ -15,6 +17,7 @@ def create
       redirect_to retirement_url
     else
       current_user.retired_on = nil
+      @holding_regular_events = RegularEvent.organizer_event(current_user).holding
       render :new
     end
   end

app/controllers/training_completion_controller.rb

@@ -6,15 +6,16 @@ class TrainingCompletionController < ApplicationController
 
   def show; end
 
-  def new; end
+  def new
+    @holding_regular_events = RegularEvent.organizer_event(current_user).holding
+  end
 
   def create
     current_user.assign_attributes(training_complete_params)
     current_user.training_completed_at = Time.current
     if current_user.save(context: :training_completion)
       user = current_user
-      current_user.cancel_participation_from_regular_events
-      current_user.delete_and_assign_new_organizer
+      current_user.clean_up_regular_events
       ActiveSupport::Notifications.instrument('training_completion.create', user:)
       user.clear_github_data
       notify_to_user(user)
@@ -25,6 +26,7 @@ def create
       redirect_to training_completion_url
     else
       current_user.training_completed_at = nil
+      @holding_regular_events = RegularEvent.organizer_event(current_user).holding
       render :new
     end
   end

app/models/organizer.rb

@@ -5,10 +5,4 @@ class Organizer < ApplicationRecord
   belongs_to :regular_event
 
   validates :user_id, uniqueness: { scope: :regular_event_id }
-
-  def delete_and_assign_new
-    event = regular_event
-    delete
-    event.assign_admin_as_organizer_if_none
-  end
 end

app/models/regular_event.rb

@@ -70,6 +70,8 @@ class RegularEvent < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   belongs_to :user
   has_many :organizers, dependent: :destroy
+  # TODO: テーブル名を変更したら修正する
+  has_many :regular_event_organizers, class_name: 'Organizer', dependent: :destroy
   has_many :users, through: :organizers
   has_many :regular_event_repeat_rules, dependent: :destroy
   accepts_nested_attributes_for :regular_event_repeat_rules, allow_destroy: true
@@ -120,13 +122,6 @@ def participated_by?(user)
     regular_event_participations.find_by(user_id: user.id).present?
   end
 
-  def assign_admin_as_organizer_if_none
-    return if organizers.exists?
-
-    admin_user = User.find_by(login_name: User::DEFAULT_REGULAR_EVENT_ORGANIZER)
-    Organizer.new(user: admin_user, regular_event: self).save if admin_user
-  end
-
   def all_scheduled_dates(
     from: Date.current,
     to: Date.current.next_year
@@ -159,6 +154,21 @@ def publish_with_announcement?
     wants_announcement? && !wip?
   end
 
+  # 定期イベントは主催者が1人以上必要なため
+  # 主催者が1人しかいない場合はイベントを終了状態にし
+  # それ以外の場合は主催者のみを削除する
+  #
+  # TODO: 本来は「主催者が0人のイベントは無効」という制約をバリデーションで担保する形にしたい
+  # https://github.com/fjordllc/bootcamp/pull/9732#discussion_r2969273381
+  def close_or_destroy_organizer(user)
+    if regular_event_organizers.count == 1
+      update(finished: true)
+    else
+      organizer = regular_event_organizers.find_by(user:)
+      organizer.destroy
+    end
+  end
+
   private
 
   def end_at_be_greater_than_start_at

app/models/regular_event_participation.rb

@@ -5,4 +5,6 @@ class RegularEventParticipation < ApplicationRecord
   belongs_to :regular_event
 
   validates :user_id, uniqueness: { scope: :regular_event_id }
+
+  scope :for_holding_events, -> { joins(:regular_event).merge(RegularEvent.holding) }
 end

app/models/retirement.rb

@@ -29,8 +29,7 @@ def execute
       destroy_subscription
     end
 
-    cancel_event_subscription
-    remove_as_event_organizer
+    clean_up_regular_events
     clear_github_info
     destroy_cards
     publish
@@ -74,12 +73,8 @@ def destroy_cards
     Card.destroy_all(@user.customer_id) if @user.customer_id?
   end
 
-  def cancel_event_subscription
-    @user.cancel_participation_from_regular_events
-  end
-
-  def remove_as_event_organizer
-    @user.delete_and_assign_new_organizer
+  def clean_up_regular_events
+    @user.clean_up_regular_events
   end
 
   def publish

app/models/user.rb

@@ -26,7 +26,6 @@ class User < ApplicationRecord # rubocop:todo Metrics/ClassLength
     'adviser' => :advisers,
     'admin' => :admins
   }.freeze
-  DEFAULT_REGULAR_EVENT_ORGANIZER = 'komagata'
   HIBERNATION_LIMIT = 3.months
   HIBERNATION_LIMIT_BEFORE_ONE_WEEK = HIBERNATION_LIMIT - 1.week
 
@@ -885,14 +884,6 @@ def become_watcher!(watchable)
     watches.find_or_create_by!(watchable:)
   end
 
-  def cancel_participation_from_regular_events
-    regular_event_participations.destroy_all
-  end
-
-  def delete_and_assign_new_organizer
-    organizers.each(&:delete_and_assign_new)
-  end
-
   def scheduled_retire_at
     hibernated_at + User::HIBERNATION_LIMIT if hibernated_at?
   end
@@ -960,6 +951,11 @@ def reports_with_learning_times
     reports.joins(:learning_times).distinct.order(reported_on: :asc)
   end
 
+  def clean_up_regular_events
+    regular_event_participations.for_holding_events.destroy_all
+    organize_regular_events.holding.each { |event| event.close_or_destroy_organizer(self) }
+  end
+
   private
 
   def password_required?

app/views/hibernation/new.html.slim

@@ -70,24 +70,12 @@ hr.a-border
                         | こちら
                       | のページの「分報 URL」欄に分報チャンネルの URL を登録してください。
 
-          - holding_regular_events = RegularEvent.organizer_event(current_user).holding
-          - if holding_regular_events.any?
+          - if @holding_regular_events.any?
             .form-item
-              label.a-form-label
-                | 定期イベント
-              .important-message
-                .important-message__body
-                  .a-short-text.is-sm
-                    p
-                      |ご自身が主催者である定期イベントがあります。
-                      br
-                      | 休会をお考えの場合、イベントの進行に影響がないよう、任意で他の参加者に主催を引き継ぐことを推奨します。
-                      | 休会手続きを完了する前に、以下のリンク先でイベント設定変更を行なってください。
-                    ul
-                      - holding_regular_events.holding.each do |event|
-                        li
-                          = link_to edit_regular_event_path(event), target: '_blank', rel: 'noopener' do
-                            | 定期イベント「#{event.title}」の設定変更
+              = render 'shared/regular_events_warning',
+                events: @holding_regular_events,
+                case_text: '休会をお考えの',
+                action_text: '休会'
 
           .form-item
             label.a-form-label.is-required

app/views/retirement/new.html.slim

@@ -16,23 +16,12 @@ hr.a-border
         = render 'errors', object: current_user
       = form_with model: current_user, local: true, url: retirement_path, method: :post, class: 'form' do |f|
         .form__items
-          - holding_regular_events = RegularEvent.organizer_event(current_user).holding
-          - if holding_regular_events.any?
+          - if @holding_regular_events.any?
             .form-item
-              .important-message
-                .important-message__body
-                  .a-short-text.is-sm
-                    p
-                      |ご自身が主催者である定期イベントがあります。
-                      br
-                      | 退会をお考えの場合、イベントの進行に影響がないよう、任意で他の参加者に主催を引き継ぐことを推奨します。
-                      | 退会手続きを完了する前に、
-                      | 以下のリンク先でイベント設定変更を行なってください。
-                    ul
-                      - holding_regular_events.each do |event|
-                        li
-                          = link_to edit_regular_event_path(event), target: '_blank', rel: 'noopener' do
-                            | 定期イベント「#{event.title}」の設定変更
+              = render 'shared/regular_events_warning',
+                events: @holding_regular_events,
+                case_text: '退会をお考えの',
+                action_text: '退会'
 
           .form-item
             = f.label :retire_reasons, '退会の理由を教えてください（複数選択可）', class: 'a-form-label'

app/views/shared/_regular_events_warning.html.slim

@@ -0,0 +1,18 @@
+label.a-form-label
+  | 定期イベント
+.important-message
+  .important-message__body
+    .a-short-text.is-sm
+      p
+        |ご自身が主催者である定期イベントがあります。
+        br
+        | #{case_text}場合、イベントの進行に影響がないよう、任意で他の参加者に主催を引き継ぐことを推奨します。
+        | #{action_text}手続きを完了する前に、
+        | 以下のリンク先でイベント設定変更を行なってください。
+        br
+        | #{action_text}後、ご自身のみが主催者である開催中のイベントは自動的に終了となります。
+      ul
+        - events.each do |event|
+          li
+            = link_to edit_regular_event_path(event), target: '_blank', rel: 'noopener' do
+              | 定期イベント「#{event.title}」の設定変更

app/views/training_completion/new.html.slim

@@ -16,22 +16,12 @@ hr.a-border
         = render 'errors', object: current_user
       = form_with model: current_user, local: true, url: training_completion_path, method: :post, class: 'form' do |f|
         .form__items
-          - if current_user.regular_events.any?
+          - if @holding_regular_events.any?
             .form-item
-              .important-message
-                .important-message__body
-                  .a-short-text.is-sm
-                    p
-                      |ご自身が主催者である定期イベントがあります。
-                      br
-                      | 研修を修了される場合、イベントの進行に影響がないよう、任意で他の参加者に主催を引き継ぐことを推奨します。
-                      | 退会手続きを完了する前に、
-                      | 以下のリンク先でイベント設定変更を行なってください。
-                    ul
-                      - current_user.regular_events.each do |event|
-                        li
-                          = link_to edit_regular_event_path(event), target: '_blank', rel: 'noopener' do
-                            | 定期イベント「#{event.title}」の設定変更
+              = render 'shared/regular_events_warning',
+                events: @holding_regular_events,
+                case_text: '研修を終了される',
+                action_text: '研修終了'
 
           .form-item
             = f.label :satisfaction, '全体の満足度を教えてください', class: 'a-form-label is-required'

test/fixtures/regular_event_participations.yml

@@ -25,4 +25,3 @@ regular_event_participation6:
 regular_event_participation7:
   user: kimura
   regular_event: regular_event34
-

test/models/regular_event_test.rb

@@ -98,21 +98,29 @@ class RegularEventTest < ActiveSupport::TestCase
     assert_not regular_event.participated_by?(user)
   end
 
-  test '#assign_admin_as_organizer_if_none' do
-    regular_event = RegularEvent.new(
-      title: '主催者のいないイベント',
-      description: '主催者のいないイベント',
-      finished: false,
-      hold_national_holiday: false,
-      start_at: Time.zone.local(2020, 1, 1, 21, 0, 0),
-      end_at: Time.zone.local(2020, 1, 1, 22, 0, 0),
-      user: users(:kimura),
-      category: 0,
-      published_at: '2023-08-01 00:00:00'
-    )
-    regular_event.save(validate: false)
-    regular_event.assign_admin_as_organizer_if_none
-    assert_equal User.find_by(login_name: User::DEFAULT_REGULAR_EVENT_ORGANIZER), regular_event.organizers.first
+  test '#close_or_destroy_organizer closes the event when only one organizer exists' do
+    user = users(:kimura)
+    regular_event = regular_events(:regular_event5) # kimuraが1人で主催しているイベント
+
+    assert_no_difference -> { regular_event.regular_event_organizers.count },
+                         -> { regular_event.regular_event_organizers.where(user: user).count } do
+      assert_changes -> { regular_event.finished }, from: false, to: true do
+        regular_event.close_or_destroy_organizer(user)
+      end
+    end
+  end
+
+  test '#close_or_destroy_organizer removes the organizer when multiple organizers exist' do
+    user = users(:kimura)
+    regular_event = regular_events(:regular_event5) # kimuraが1人で主催しているイベント
+    regular_event.regular_event_organizers.create!(user: users(:hatsuno))
+
+    assert_difference -> { regular_event.regular_event_organizers.count } => -1,
+                      -> { regular_event.regular_event_organizers.where(user: user).count } => -1 do
+      assert_no_changes -> { regular_event.finished } do
+        regular_event.close_or_destroy_organizer(user)
+      end
+    end
   end
 
   test '#all_scheduled_dates' do

test/models/retirement_test.rb

@@ -16,8 +16,7 @@ class RetirementTest < ActiveSupport::TestCase
       clear_hibernation_state
       save_user
       destroy_subscription
-      cancel_event_subscription
-      remove_as_event_organizer
+      clean_up_regular_events
       clear_github_info
       destroy_cards
       publish