Merge pull request #8144 from fjordllc/chore/add-return-date-and-reas…

…on-to-suspension-notification

休会時のお知らせメール内に復帰予定日と理由を表示するようにした

app/mailers/activity_mailer.rb

@@ -287,6 +287,7 @@ def hibernated(args = {})
       link: "/users/#{@sender.id}",
       kind: Notification.kinds[:hibernated]
     )
+    @hibernation = Hibernation.find_by(user_id: @sender.id)
 
     subject = "[FBC] #{@sender.login_name}さんが休会しました。"
     message = mail(to: @user.email, subject:)

app/views/activity_mailer/hibernated.html.slim

@@ -1,3 +1,10 @@
 = render '/notification_mailer/notification_mailer_template',
   title: "#{@sender.login_name}さんが休会しました。",
   link_url: @link_url, link_text: "#{@sender.login_name}さんのページへ" do
+  .a-long-text
+    h2
+      = Hibernation.human_attribute_name('scheduled_return_on')
+    = @hibernation.scheduled_return_on
+    h2
+      = Hibernation.human_attribute_name('reason')
+    = md2html(@hibernation.reason)

test/mailers/activity_mailer_test.rb

@@ -721,13 +721,13 @@ class ActivityMailerTest < ActionMailer::TestCase
   end
 
   test 'hibernated using synchronous mailer' do
-    user = users(:kimura)
+    user = users(:kyuukai)
     mentor = users(:komagata)
     Notification.create!(
       kind: 19,
       sender: user,
       user: mentor,
-      message: 'kimuraさんが休会しました。',
+      message: 'kyuukaiさんが休会しました。',
       link: "/users/#{user.id}",
       read: false
     )
@@ -740,18 +740,18 @@ class ActivityMailerTest < ActionMailer::TestCase
     email = ActionMailer::Base.deliveries.last
     assert_equal ['noreply@bootcamp.fjord.jp'], email.from
     assert_equal ['komagata@fjord.jp'], email.to
-    assert_equal '[FBC] kimuraさんが休会しました。', email.subject
+    assert_equal '[FBC] kyuukaiさんが休会しました。', email.subject
     assert_match(/休会/, email.body.to_s)
   end
 
   test 'hibernated with params using asynchronous mailer' do
-    user = users(:kimura)
+    user = users(:kyuukai)
     mentor = users(:komagata)
     Notification.create!(
       kind: 19,
       sender: user,
       user: mentor,
-      message: 'kimuraさんが休会しました。',
+      message: 'kyuukaiさんが休会しました。',
       link: "/users/#{user.id}",
       read: false
     )
@@ -768,7 +768,7 @@ class ActivityMailerTest < ActionMailer::TestCase
     email = ActionMailer::Base.deliveries.last
     assert_equal ['noreply@bootcamp.fjord.jp'], email.from
     assert_equal ['komagata@fjord.jp'], email.to
-    assert_equal '[FBC] kimuraさんが休会しました。', email.subject
+    assert_equal '[FBC] kyuukaiさんが休会しました。', email.subject
     assert_match(/休会/, email.body.to_s)
   end