From c73f35fc82785a00059ecf894fc2b0365304ee63 Mon Sep 17 00:00:00 2001
From: a-kuroki-gs <a.kuroki@genbasupport.com>
Date: Fri, 9 Feb 2024 10:56:25 +0900
Subject: [PATCH] =?UTF-8?q?=E5=95=8F=E3=81=84=E5=90=88=E3=82=8F=E3=81=9B?=
 =?UTF-8?q?=E3=81=8C=E6=9D=A5=E3=81=9F=E3=82=89=E7=AE=A1=E7=90=86=E8=80=85?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E3=83=94=E3=83=A8=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E3=81=8B=E3=82=89=E9=80=9A=E7=9F=A5=E3=82=92=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/inquiries_controller.rb   |  11 ++++++++-
 app/models/notification.rb                |  27 ++--------------------
 app/notifiers/activity_notifier.rb        |  16 +++++++++++++
 db/fixtures/discord_profiles.yml          |   2 +-
 db/fixtures/files/users/avatars/pjord.jpg | Bin 0 -> 4100 bytes
 test/fixtures/users.yml                   |  18 +++++++++++++++
 test/notifiers/activity_notifier_test.rb  |  17 ++++++++++++++
 7 files changed, 64 insertions(+), 27 deletions(-)
 create mode 100644 db/fixtures/files/users/avatars/pjord.jpg

diff --git a/app/controllers/inquiries_controller.rb b/app/controllers/inquiries_controller.rb
index ceac6676435..6cc0da406fc 100644
--- a/app/controllers/inquiries_controller.rb
+++ b/app/controllers/inquiries_controller.rb
@@ -10,9 +10,10 @@ def new
 
   def create
     @inquiry = Inquiry.new(inquiry_params)
-
     result = valid_recaptcha?('inquiry')
+
     if result && @inquiry.save
+      notify_inquiry
       InquiryMailer.incoming(@inquiry).deliver_later
       redirect_to new_inquiry_url, notice: 'お問い合わせを送信しました。'
     else
@@ -26,4 +27,12 @@ def create
   def inquiry_params
     params.require(:inquiry).permit(:name, :email, :body, :privacy_policy)
   end
+
+  def notify_inquiry
+    sender = User.find_by(login_name: 'pjord')
+
+    User.admins.each do |receiver|
+      ActivityDelivery.with(inquiry: @inquiry, receiver:, sender:).notify(:came_inquiry)
+    end
+  end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3a6e2eaedbd..b991079e30a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -39,7 +39,8 @@ class Notification < ApplicationRecord
     signed_up: 20,
     regular_event_updated: 21,
     no_correct_answer: 22,
-    comebacked: 23
+    comebacked: 23,
+    came_inquiry: 24
   }
 
   scope :unreads, -> { where(read: false) }
@@ -58,30 +59,6 @@ class Notification < ApplicationRecord
   after_update NotificationCallbacks.new
   after_destroy NotificationCallbacks.new
 
-  class << self
-    def checked(check)
-      Notification.create!(
-        kind: kinds[:checked],
-        user: check.receiver,
-        sender: check.sender,
-        link: Rails.application.routes.url_helpers.polymorphic_path(check.checkable),
-        message: "#{check.sender.login_name}さんが#{check.checkable.title}を確認しました。",
-        read: false
-      )
-    end
-
-    def came_answer(answer)
-      Notification.create!(
-        kind: kinds[:answered],
-        user: answer.receiver,
-        sender: answer.sender,
-        link: Rails.application.routes.url_helpers.polymorphic_path(answer.question),
-        message: "#{answer.user.login_name}さんから回答がありました。",
-        read: false
-      )
-    end
-  end
-
   def unread?
     !read
   end
diff --git a/app/notifiers/activity_notifier.rb b/app/notifiers/activity_notifier.rb
index b4f679d6439..8fddba00d3e 100644
--- a/app/notifiers/activity_notifier.rb
+++ b/app/notifiers/activity_notifier.rb
@@ -352,4 +352,20 @@ def moved_up_event_waiting_user(params = {})
       read: false
     )
   end
+
+  def came_inquiry(params = {})
+    params.merge!(@params)
+    inquiry = params[:inquiry]
+    sender = params[:sender]
+    receiver = params[:receiver]
+
+    notification(
+      body: "#{inquiry.name}さんから問い合わせがありました。",
+      kind: :came_inquiry,
+      receiver:,
+      sender:,
+      link: Rails.application.routes.url_helpers.admin_inquiry_path(inquiry),
+      read: false
+    )
+  end
 end
diff --git a/db/fixtures/discord_profiles.yml b/db/fixtures/discord_profiles.yml
index a49ebfe138a..9df7a00b204 100644
--- a/db/fixtures/discord_profiles.yml
+++ b/db/fixtures/discord_profiles.yml
@@ -285,7 +285,7 @@ discord_profile_nagai-kyuukai:
   account_name:
   times_url:
 
-discord_profire_pjord:
+discord_profile_pjord:
   user: pjord
   account_name:
   times_url:
diff --git a/db/fixtures/files/users/avatars/pjord.jpg b/db/fixtures/files/users/avatars/pjord.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7ecce2f41ff80a3520b593d6818002c38e0e4a86
GIT binary patch
literal 4100
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

literal 0
HcmV?d00001

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 9eb74b51342..def66ff83c4 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -963,3 +963,21 @@ marumarushain<%= i %>: # ページネーション確認のためのユーザー
   last_activity_at: "2014-01-01 00:00:0<%= 2 + (i - 1) / 2 %>"
   sent_student_followup_message: true
 <% end %>
+
+pjord:
+  login_name: pjord
+  email: pjord@fjord.jp
+  crypted_password: $2a$10$n/xv4/1luueN6plzm2OyDezWlZFyGHjQEf4hwAW1r3k.lCm0frPK. # testtest
+  salt: zW3kQ9ubsxQQtzzzs4ap
+  name: ピヨルド
+  name_kana: ピヨルド
+  company: company1
+  description: "管理者のピヨルドです。バイキングの末裔です。"
+  course: course1
+  job: office_worker
+  os: 回答なし
+  admin: true
+  adviser: true
+  updated_at: "2014-01-01 00:00:01"
+  created_at: "2014-01-01 00:00:01"
+  last_activity_at: "2014-01-01 00:00:01"
diff --git a/test/notifiers/activity_notifier_test.rb b/test/notifiers/activity_notifier_test.rb
index fa082caa190..c0dc34b3950 100644
--- a/test/notifiers/activity_notifier_test.rb
+++ b/test/notifiers/activity_notifier_test.rb
@@ -144,4 +144,21 @@ class ActivityNotifierTest < ActiveSupport::TestCase
       notification.notify_later
     end
   end
+
+  test '#came_inquiry' do
+    params = {
+      inquiry: Inquiry.first,
+      sender: users(:pjord),
+      receiver: users(:komagata)
+    }
+    notification = ActivityNotifier.with(params).came_inquiry
+
+    assert_difference -> { AbstractNotifier::Testing::Driver.deliveries.count }, 1 do
+      notification.notify_now
+    end
+
+    assert_difference -> { AbstractNotifier::Testing::Driver.enqueued_deliveries.count }, 1 do
+      notification.notify_later
+    end
+  end
 end