Skip to content

初日報の投稿を自己紹介チャンネルに通知する #6179

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 4 commits into from
Feb 7, 2023
Merged

初日報の投稿を自己紹介チャンネルに通知する #6179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b637b8
初日報投稿をDiscordチャンネルに通知する
futa4095 Feb 5, 2023
4e623cb
初日報discord通知のテスト追加
futa4095 Feb 5, 2023
630bec3
チャンネル投稿メッセージにURLを付加
futa4095 Feb 5, 2023
ea09bb1
投稿メッセージにタイトルを追加
futa4095 Feb 6, 2023
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
1 change: 1 addition & 0 deletions app/models/report_callbacks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def delete_notification(report)
end

def notify_to_chat(report)
DiscordNotifier.with(report: report).first_report.notify_now if report.first?
ChatNotifier.message(<<~TEXT, webhook_url: ENV['DISCORD_REPORT_WEBHOOK_URL'])
#{report.user.login_name}さんが#{I18n.l report.reported_on}の日報を公開しました。
タイトル：「#{report.title}」
Expand Down
17 changes: 17 additions & 0 deletions app/notifiers/discord_notifier.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,21 @@ def product_review_not_completed(params = {})
webhook_url: webhook_url
)
end

def first_report(params = {})
params.merge!(@params)
webhook_url = params[:webhook_url] || Rails.application.secrets[:webhook][:introduction]
report = params[:report]
body = <<~TEXT.chomp
🎉 #{report.user.login_name}さんがはじめての日報を書きました！
タイトル：「#{report.title}」
URL： #{Rails.application.routes.url_helpers.report_url(report)}
TEXT

notification(
body: body,
name: 'ピヨルド',
webhook_url: webhook_url
)
end
end
1 change: 1 addition & 0 deletions config/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ shared:
admin: <%= ENV['DISCORD_ADMIN_WEBHOOK_URL'] || 'https://discord.com/api/webhooks/0123456789/admin' %>
mentor: <%= ENV['DISCORD_MENTOR_WEBHOOK_URL'] || 'https://discord.com/api/webhooks/0123456789/mentor' %>
all: <%= ENV['DISCORD_ALL_WEBHOOK_URL'] || 'https://discord.com/api/webhooks/0123456789/all' %>
introduction: <%= ENV['DISCORD_INTRODUCTION_WEBHOOK_URL'] || 'https://discord.com/api/webhooks/0123456789/introduction' %>
Copy link
Copy Markdown
Member

@komagata komagata Feb 7, 2023

Choose a reason for hiding this comment

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

👍

stripe:
public_key: pk_test_Je8A9BUHRC8oqsqx8wtfbKwg
secret_key: sk_test_XLP1Ajz1JvT9jUt5uKGvL0Wd
Expand Down
28 changes: 28 additions & 0 deletions test/notifiers/discord_notifier_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,32 @@ class DiscordNotifierTest < ActiveSupport::TestCase
DiscordNotifier.with(params).hibernated.notify_later
end
end

test '.first_report' do
params = {
report: reports(:report10),
webhook_url: 'https://discord.com/api/webhooks/0123456789/xxxxxxxx'
}

body = <<~TEXT.chomp
🎉 hajimeさんがはじめての日報を書きました！
タイトル：「初日報です」
URL： http://localhost:3000/reports/819157022
TEXT
expected = {
body: body,
name: 'ピヨルド',
webhook_url: 'https://discord.com/api/webhooks/0123456789/xxxxxxxx'
}

assert_notifications_sent 2, **expected do
DiscordNotifier.first_report(params).notify_now
DiscordNotifier.with(params).first_report.notify_now
end

assert_notifications_enqueued 2, **expected do
DiscordNotifier.first_report(params).notify_later
DiscordNotifier.with(params).first_report.notify_later
end
end
end