Skip to content

NewsPaperからActiveSupport::Notificationsに3クラス分実装を置き換える #8935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komagata merged 9 commits into from
Aug 22, 2025
Merged

NewsPaperからActiveSupport::Notificationsに3クラス分実装を置き換える #8935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
61ebb19
user作成時の通知をNewsPaperからActiveSupport::Notificationに変更
thmz337 Jul 25, 2025
d3e71a3
conflictの解消
thmz337 Jul 25, 2025
2ef795d
定期イベント更新時の通知をNewsPaperからActiveSupport::Notificationに変更
thmz337 Jul 25, 2025
b141d0e
rubocopの指摘と、エラーが出ていたテストを修正
thmz337 Jul 25, 2025
4053be7
activity_mailer.rbを変更前の状態に戻す
thmz337 Jul 25, 2025
44493dd
SignUpNotifierの削除
thmz337 Jul 26, 2025
eb624cf
購読一覧の並びを変更
thmz337 Jul 30, 2025
9b50abd
Conflictの修正忘れの対応
thmz337 Aug 3, 2025
fd09bb9
PR8973に表記を合わせる
thmz337 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ def create
@user.build_discord_profile
@user.credit_card_payment = params[:credit_card_payment]
@user.uploaded_avatar = user_params[:avatar]

ActiveSupport::Notifications.instrument('user.create', user: @user)
@user.unsubscribe_email_token = SecureRandom.urlsafe_base64
Copy link
Copy Markdown
Member

@komagata komagata Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

この処理は無くなっても大丈夫でしょうか？

Copy link
Copy Markdown
Contributor Author

@thmz337 thmz337 Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@komagata

お疲れ様です。ご確認ありがとうございます。

こちらの処理でSignUpNotifierを呼び出しているのですが、行っている処理はメール配信停止用のトークンを発行して、ユーザーに設定を行うことです。

@tyrrell-IH さんともやり取りをしたのですが、クラス名と異なり通知機能を備えていない（通知は別の箇所で行っています）ため、メール配信停止トークンの設定は別途切り出し、
( @user.unsubscribe_email_token = SecureRandom.urlsafe_base64の箇所です)該当箇所を削除しました。

以上よろしくお願いいたします。


if @user.staff? || @user.trainee?
create_free_user!
Expand Down
8 changes: 0 additions & 8 deletions app/models/sign_up_notifier.rb
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions config/initializers/active_support_notifications.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
ActiveSupport::Notifications.subscribe('product.create', ProductNotifierForColleague.new)
ActiveSupport::Notifications.subscribe('product.create', ProductNotifierForPracticeWatcher.new)
ActiveSupport::Notifications.subscribe('came.inquiry', InquiryNotifier.new)
ActiveSupport::Notifications.subscribe('regular_event.update', RegularEventUpdateNotifier.new)
ActiveSupport::Notifications.subscribe('student_or_trainee.create', TimesChannelCreator.new)

learning_status_updater = LearningStatusUpdater.new
ActiveSupport::Notifications.subscribe('product.save', learning_status_updater)
Expand All @@ -38,7 +40,4 @@
learning_cache_destroyer = LearningCacheDestroyer.new
ActiveSupport::Notifications.subscribe('learning.create', learning_cache_destroyer)
ActiveSupport::Notifications.subscribe('learning.destroy', learning_cache_destroyer)
ActiveSupport::Notifications.subscribe('student_or_trainee.create', TimesChannelCreator.new)
ActiveSupport::Notifications.subscribe('user.create', SignUpNotifier.new)
ActiveSupport::Notifications.subscribe('regular_event.update', RegularEventUpdateNotifier.new)
end