From 8790657c4c2520a19b8a06a9992fd9b9b100df05 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Sat, 5 Feb 2022 21:58:25 +0900
Subject: [PATCH 01/25] first commit


From f859a3f9d0a11872f911d67632984c1243c25950 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Feb 2022 23:00:24 +0900
Subject: [PATCH 02/25] =?UTF-8?q?=E7=9B=B8=E8=AB=87=E9=83=A8=E5=B1=8B?=
 =?UTF-8?q?=E3=81=B8=E3=81=AE=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        |  8 ++++++++
 app/javascript/searchable.vue                       | 12 ++++++++++++
 app/views/api/searchables/_searchable.json.jbuilder |  9 +++++++++
 3 files changed, 29 insertions(+)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index e2395913a10..ed9178499a4 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -39,4 +39,12 @@ def filtered_message(searchable)
   def comment_or_answer?(searchable)
     searchable.is_a?(Comment) || searchable.is_a?(Answer)
   end
+
+  def has_talk?(searchable)
+    searchable.instance_of?(User) && Talk.find_by(user_id: searchable.id) ? true : false
+  end
+
+  def talk_id(searchable)
+    Talk.find_by(user_id: searchable.id).id
+  end
 end
diff --git a/app/javascript/searchable.vue b/app/javascript/searchable.vue
index 4cf7e48e23d..0989542403c 100644
--- a/app/javascript/searchable.vue
+++ b/app/javascript/searchable.vue
@@ -36,6 +36,8 @@
                   | {{ searchable.document_author_login_name }}
                 | &nbsp;{{ searchable.model_name_with_i18n }}
                 | ）
+            a(v-if='canDisplayTalk', :href='talkUrl')
+              | 相談部屋
 </template>
 <script>
 import dayjs from 'dayjs'
@@ -61,6 +63,16 @@ export default {
         'YYYY年MM月DD日(dd) HH:mm'
       )
     },
+    canDisplayTalk() {
+      if ((this.searchable.model_name === 'user' && this.searchable.talk_id) && this.searchable.admin || this.searchable.current_user) {
+        return true
+      } else {
+        return false
+      }
+    },
+    talkUrl() {
+      return `/talks/${this.searchable.talk_id}`
+    },
     summary() {
       const word = this.word
       const wordsPattern = word
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index 110160b3fdc..b9c18e6980d 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -14,3 +14,12 @@ if comment_or_answer?(searchable)
   json.document_author_login_name document.user.login_name
   json.document_author_id document.user.id
 end
+if has_talk?(searchable)
+  json.talk_id talk_id(searchable)
+end
+if current_user.admin?
+  json.admin true
+end
+if current_user.id == searchable.id
+  json.current_user true
+end

From 5b38b4a0d588a1d346f81c347f88b1d9bc39a1c1 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Feb 2022 23:15:59 +0900
Subject: [PATCH 03/25] =?UTF-8?q?=E5=86=97=E9=95=B7=E3=81=AA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=86=E5=B2=90=E3=82=92=E3=83=AA=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        | 4 ++++
 app/javascript/searchable.vue                       | 2 +-
 app/views/api/searchables/_searchable.json.jbuilder | 7 ++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index ed9178499a4..0cfc7e86d7f 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -47,4 +47,8 @@ def has_talk?(searchable)
   def talk_id(searchable)
     Talk.find_by(user_id: searchable.id).id
   end
+
+  def display_talk?(searchable)
+    current_user.admin? || current_user.id == searchable.id
+  end
 end
diff --git a/app/javascript/searchable.vue b/app/javascript/searchable.vue
index 0989542403c..a5b796f41ff 100644
--- a/app/javascript/searchable.vue
+++ b/app/javascript/searchable.vue
@@ -64,7 +64,7 @@ export default {
       )
     },
     canDisplayTalk() {
-      if ((this.searchable.model_name === 'user' && this.searchable.talk_id) && this.searchable.admin || this.searchable.current_user) {
+      if (this.searchable.model_name === 'user' && this.searchable.talk_id && this.searchable.display_talk) {
         return true
       } else {
         return false
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index b9c18e6980d..ff27d499697 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -17,9 +17,6 @@ end
 if has_talk?(searchable)
   json.talk_id talk_id(searchable)
 end
-if current_user.admin?
-  json.admin true
-end
-if current_user.id == searchable.id
-  json.current_user true
+if display_talk?(searchable)
+  json.display_talk true
 end

From b0f7b843780c350cc269cf02b773809719b58da0 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Feb 2022 23:23:00 +0900
Subject: [PATCH 04/25] =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=83=AA?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/searchable.vue                       | 6 +-----
 app/views/api/searchables/_searchable.json.jbuilder | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/javascript/searchable.vue b/app/javascript/searchable.vue
index a5b796f41ff..6f5155bd3ea 100644
--- a/app/javascript/searchable.vue
+++ b/app/javascript/searchable.vue
@@ -64,11 +64,7 @@ export default {
       )
     },
     canDisplayTalk() {
-      if (this.searchable.model_name === 'user' && this.searchable.talk_id && this.searchable.display_talk) {
-        return true
-      } else {
-        return false
-      }
+      return this.searchable.model_name === 'user' && this.searchable.talk_id
     },
     talkUrl() {
       return `/talks/${this.searchable.talk_id}`
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index ff27d499697..04675e54d64 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -14,9 +14,6 @@ if comment_or_answer?(searchable)
   json.document_author_login_name document.user.login_name
   json.document_author_id document.user.id
 end
-if has_talk?(searchable)
+if has_talk?(searchable) && display_talk?(searchable)
   json.talk_id talk_id(searchable)
 end
-if display_talk?(searchable)
-  json.display_talk true
-end

From 114206180d0c6af1487d62c31f0294151920a6a3 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Feb 2022 23:26:13 +0900
Subject: [PATCH 05/25] =?UTF-8?q?rubocop=E9=80=9A=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        | 2 +-
 app/views/api/searchables/_searchable.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 0cfc7e86d7f..1e1ebedd22f 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -40,7 +40,7 @@ def comment_or_answer?(searchable)
     searchable.is_a?(Comment) || searchable.is_a?(Answer)
   end
 
-  def has_talk?(searchable)
+  def talk?(searchable)
     searchable.instance_of?(User) && Talk.find_by(user_id: searchable.id) ? true : false
   end
 
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index 04675e54d64..17164e1b045 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -14,6 +14,6 @@ if comment_or_answer?(searchable)
   json.document_author_login_name document.user.login_name
   json.document_author_id document.user.id
 end
-if has_talk?(searchable) && display_talk?(searchable)
+if talk?(searchable) && display_talk?(searchable)
   json.talk_id talk_id(searchable)
 end

From 4059f8d8de7284a03dba5dc6361ebdb33c138a38 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Feb 2022 23:28:03 +0900
Subject: [PATCH 06/25] =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=83=AA?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 1e1ebedd22f..cfca996ed79 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -41,7 +41,7 @@ def comment_or_answer?(searchable)
   end
 
   def talk?(searchable)
-    searchable.instance_of?(User) && Talk.find_by(user_id: searchable.id) ? true : false
+    searchable.instance_of?(User) && Talk.find_by(user_id: searchable.id)
   end
 
   def talk_id(searchable)

From 4c85f20fc4ac3de610044a2833aa4ffe7aaf2ffe Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Mon, 14 Feb 2022 21:00:00 +0900
Subject: [PATCH 07/25] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E9=80=9A=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/system/comments_test.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/system/comments_test.rb b/test/system/comments_test.rb
index d5443d43c17..9e9772d5e04 100644
--- a/test/system/comments_test.rb
+++ b/test/system/comments_test.rb
@@ -237,11 +237,14 @@ class CommentsTest < ApplicationSystemTestCase
     visit_with_auth "/reports/#{reports(:report1).id}", 'komagata'
     find('#comments.loaded', wait: 10)
     first(:css, '.thread-comment__created-at').click
-    # クリップボードを直接読み取る方法がないので、未入力のテキストエリアを経由してクリップボードの値を読み取っている
-    # また、Ctrl-Vではペーストできなかったので、かわりにShift-Insertをショートカットキーとして使っている
-    # 参考 https://stackoverflow.com/a/57955123/1058763
-    find('#js-new-comment').send_keys %i[shift insert]
-    clip_text = find('#js-new-comment').value
+    # 参考：https://gist.github.com/ParamagicDev/5fe937ee60695ff1d227f18fe4b1d5c4
+    cdp_permission = {
+      origin: page.server_url,
+      permission: { name: 'clipboard-read' },
+      setting: 'granted'
+    }
+    page.driver.browser.execute_cdp('Browser.setPermission', **cdp_permission)
+    clip_text = page.evaluate_async_script('navigator.clipboard.readText().then(arguments[0])')
     assert_equal current_url + "#comment_#{comments(:comment1).id}", clip_text
   end
 

From 1bea3538f1999310153ab6305272787e3abf1f13 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 13:39:16 +0900
Subject: [PATCH 08/25] =?UTF-8?q?talk=3F=E3=83=A1=E3=82=BD=E3=83=83?=
 =?UTF-8?q?=E3=83=89=E3=81=AE=E8=BF=94=E3=82=8A=E5=80=A4=E3=82=92boolean?=
 =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index cfca996ed79..7372dd58209 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -41,7 +41,7 @@ def comment_or_answer?(searchable)
   end
 
   def talk?(searchable)
-    searchable.instance_of?(User) && Talk.find_by(user_id: searchable.id)
+    searchable.instance_of?(User) && searchable.talk.present?
   end
 
   def talk_id(searchable)

From 8e9eea598c575c303f0efda494aa206aaea101fa Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 13:42:43 +0900
Subject: [PATCH 09/25] =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E5=90=8D=E3=82=92=E5=85=B7=E4=BD=93=E7=9A=84=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        | 2 +-
 app/views/api/searchables/_searchable.json.jbuilder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 7372dd58209..7ca61e08614 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -44,7 +44,7 @@ def talk?(searchable)
     searchable.instance_of?(User) && searchable.talk.present?
   end
 
-  def talk_id(searchable)
+  def find_talk_id_from_user_id(searchable)
     Talk.find_by(user_id: searchable.id).id
   end
 
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index 17164e1b045..a7a7f5d0359 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -15,5 +15,5 @@ if comment_or_answer?(searchable)
   json.document_author_id document.user.id
 end
 if talk?(searchable) && display_talk?(searchable)
-  json.talk_id talk_id(searchable)
+  json.talk_id find_talk_id_from_user_id(searchable)
 end

From 11ea07102ff8177665aaaf0b3dbc0ffb3a9bc18c Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 19:05:22 +0900
Subject: [PATCH 10/25] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E3=81=A0?=
 =?UTF-8?q?=E3=81=91=E3=81=AB=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=8C=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 7ca61e08614..3415afcb8b0 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -49,6 +49,6 @@ def find_talk_id_from_user_id(searchable)
   end
 
   def display_talk?(searchable)
-    current_user.admin? || current_user.id == searchable.id
+    current_user.admin?
   end
 end

From 9cdc350847427a89b2a24780fe566db01f4e0988 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 19:08:22 +0900
Subject: [PATCH 11/25] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=86=E5=B2=90=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        | 4 ----
 app/views/api/searchables/_searchable.json.jbuilder | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 3415afcb8b0..851438ead55 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -47,8 +47,4 @@ def talk?(searchable)
   def find_talk_id_from_user_id(searchable)
     Talk.find_by(user_id: searchable.id).id
   end
-
-  def display_talk?(searchable)
-    current_user.admin?
-  end
 end
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index a7a7f5d0359..594bcdb7d14 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -14,6 +14,6 @@ if comment_or_answer?(searchable)
   json.document_author_login_name document.user.login_name
   json.document_author_id document.user.id
 end
-if talk?(searchable) && display_talk?(searchable)
+if talk?(searchable) && current_user.admin?
   json.talk_id find_talk_id_from_user_id(searchable)
 end

From f9d98ee6e9b4cee4a5ced4c70d600151486c2c01 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 19:41:57 +0900
Subject: [PATCH 12/25] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E3=81=8B?=
 =?UTF-8?q?=E3=82=92=E5=88=A4=E6=96=AD=E3=81=99=E3=82=8B=E3=83=AD=E3=82=B8?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92Vue=E5=81=B4=E3=81=AB=E6=8C=81?=
 =?UTF-8?q?=E3=81=9F=E3=81=9B=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/searchable.vue                       | 9 ++++++++-
 app/views/api/searchables/_searchable.json.jbuilder | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/searchable.vue b/app/javascript/searchable.vue
index 6f5155bd3ea..a6b375b9be6 100644
--- a/app/javascript/searchable.vue
+++ b/app/javascript/searchable.vue
@@ -36,18 +36,25 @@
                   | {{ searchable.document_author_login_name }}
                 | &nbsp;{{ searchable.model_name_with_i18n }}
                 | ）
-            a(v-if='canDisplayTalk', :href='talkUrl')
+            a(v-if='isRole("admin") && canDisplayTalk', :href='talkUrl')
               | 相談部屋
 </template>
 <script>
 import dayjs from 'dayjs'
 import ja from 'dayjs/locale/ja'
+import role from './role'
 dayjs.locale(ja)
 export default {
+  mixins: [role],
   props: {
     searchable: { type: Object, required: true },
     word: { type: String, required: true }
   },
+  data() {
+    return {
+      currentUser: window.currentUser
+    }
+  },
   computed: {
     modelName() {
       return `is-${this.searchable.model_name}`
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index 594bcdb7d14..78062268d43 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -14,6 +14,6 @@ if comment_or_answer?(searchable)
   json.document_author_login_name document.user.login_name
   json.document_author_id document.user.id
 end
-if talk?(searchable) && current_user.admin?
+if talk?(searchable)
   json.talk_id find_talk_id_from_user_id(searchable)
 end

From 65cfe98b0e3d5315a32ec647fff81a478337f730 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 17 Feb 2022 22:26:43 +0900
Subject: [PATCH 13/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/system/searchables_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/system/searchables_test.rb b/test/system/searchables_test.rb
index ed049d8fff8..f157447aa52 100644
--- a/test/system/searchables_test.rb
+++ b/test/system/searchables_test.rb
@@ -135,4 +135,24 @@ class SearchablesTest < ApplicationSystemTestCase
     assert_text 'kimura'
     assert_no_text 'machida'
   end
+
+  test 'check that link to talk room is displayed properly' do
+    visit_with_auth '/', 'hatsuno'
+    within('form[name=search]') do
+      select 'ユーザー'
+      fill_in 'word', with: 'a'
+    end
+    find('#test-search').click
+    assert_no_text '相談部屋'
+
+    logout
+
+    visit_with_auth '/', 'komagata'
+    within('form[name=search]') do
+      select 'ユーザー'
+      fill_in 'word', with: 'a'
+    end
+    find('#test-search').click
+    assert_text '相談部屋'
+  end
 end

From fe5ba3d343c71b8a69a7033c1985d7e9e054e87e Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Sat, 19 Feb 2022 20:21:49 +0900
Subject: [PATCH 14/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/system/searchables_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/system/searchables_test.rb b/test/system/searchables_test.rb
index bacba564f2d..e087d90249b 100644
--- a/test/system/searchables_test.rb
+++ b/test/system/searchables_test.rb
@@ -139,8 +139,8 @@ class SearchablesTest < ApplicationSystemTestCase
   test 'check that link to talk room is displayed properly' do
     visit_with_auth '/', 'hatsuno'
     within('form[name=search]') do
-      select 'ユーザー'
-      fill_in 'word', with: 'a'
+      select 'すべて'
+      fill_in 'word', with: ''
     end
     find('#test-search').click
     assert_no_text '相談部屋'
@@ -150,7 +150,7 @@ class SearchablesTest < ApplicationSystemTestCase
     visit_with_auth '/', 'komagata'
     within('form[name=search]') do
       select 'ユーザー'
-      fill_in 'word', with: 'a'
+      fill_in 'word', with: ''
     end
     find('#test-search').click
     assert_text '相談部屋'

From 33b922be95dc503469ad837a3389c9298db81177 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Tue, 22 Feb 2022 20:12:43 +0900
Subject: [PATCH 15/25] =?UTF-8?q?=E3=83=98=E3=83=AB=E3=83=91=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 test/helpers/search_hepler.rb

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
new file mode 100644
index 00000000000..c7bbf68efee
--- /dev/null
+++ b/test/helpers/search_hepler.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class  SearchHelperTest < ActionView::TestCase
+  test 'does it return correct boolean value in talk' do
+    user = users(:kimura)
+    assert_equal true, talk?(user)
+  end
+
+  test 'can get the correct user id' do
+    user = users(:kimura)
+    assert_equal 915604563, find_talk_id_from_user_id(user)
+  end
+end

From fba40bdabc04f255dc36e3efd56669d9a72f5d22 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Tue, 22 Feb 2022 20:13:01 +0900
Subject: [PATCH 16/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E5=90=8D?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index c7bbf68efee..2b77c8ffdb9 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -8,7 +8,7 @@ class  SearchHelperTest < ActionView::TestCase
     assert_equal true, talk?(user)
   end
 
-  test 'can get the correct user id' do
+  test 'can get correct user id' do
     user = users(:kimura)
     assert_equal 915604563, find_talk_id_from_user_id(user)
   end

From 6522a7317ac7aab829219815ad13546eff5e5b53 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Tue, 22 Feb 2022 20:36:08 +0900
Subject: [PATCH 17/25] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=98?=
 =?UTF-8?q?=E3=83=AB=E3=83=91=E3=83=BC=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/search_helper.rb                        | 4 ----
 app/views/api/searchables/_searchable.json.jbuilder | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 851438ead55..49e5de833ae 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -43,8 +43,4 @@ def comment_or_answer?(searchable)
   def talk?(searchable)
     searchable.instance_of?(User) && searchable.talk.present?
   end
-
-  def find_talk_id_from_user_id(searchable)
-    Talk.find_by(user_id: searchable.id).id
-  end
 end
diff --git a/app/views/api/searchables/_searchable.json.jbuilder b/app/views/api/searchables/_searchable.json.jbuilder
index 78062268d43..8dd6b6efe8d 100644
--- a/app/views/api/searchables/_searchable.json.jbuilder
+++ b/app/views/api/searchables/_searchable.json.jbuilder
@@ -15,5 +15,5 @@ if comment_or_answer?(searchable)
   json.document_author_id document.user.id
 end
 if talk?(searchable)
-  json.talk_id find_talk_id_from_user_id(searchable)
+  json.talk_id searchable.talk.id
 end

From 0072d922c503a4120ca813c0892a2684853d82e3 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Tue, 22 Feb 2022 20:37:22 +0900
Subject: [PATCH 18/25] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=98?=
 =?UTF-8?q?=E3=83=AB=E3=83=91=E3=83=BC=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index 2b77c8ffdb9..357bc71485f 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -7,9 +7,4 @@ class  SearchHelperTest < ActionView::TestCase
     user = users(:kimura)
     assert_equal true, talk?(user)
   end
-
-  test 'can get correct user id' do
-    user = users(:kimura)
-    assert_equal 915604563, find_talk_id_from_user_id(user)
-  end
 end

From 634086fbe1780eb9d44fed98caf4261dd48ffd35 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Fri, 25 Feb 2022 19:30:26 +0900
Subject: [PATCH 19/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E3=83=91=E3=82=BF=E3=83=BC=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index 357bc71485f..8342a9c3bbd 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -6,5 +6,8 @@ class  SearchHelperTest < ActionView::TestCase
   test 'does it return correct boolean value in talk' do
     user = users(:kimura)
     assert_equal true, talk?(user)
+
+    user = users(:taikai3)
+    assert_equal false, talk?(user)
   end
 end

From 8a7fa4415e9d50e2fe16ae33ac4cdfcb838acc62 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Mon, 28 Feb 2022 19:32:29 +0900
Subject: [PATCH 20/25] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B9?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B9=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index 8342a9c3bbd..be7caed8fb6 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class  SearchHelperTest < ActionView::TestCase
+class SearchHelperTest < ActionView::TestCase
   test 'does it return correct boolean value in talk' do
     user = users(:kimura)
     assert_equal true, talk?(user)

From 7f133ba3e0e3a5c3db7630bff84d890738b4e85f Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Wed, 2 Mar 2022 23:35:20 +0900
Subject: [PATCH 21/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E5=90=8D?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index be7caed8fb6..994d65a3ccf 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class SearchHelperTest < ActionView::TestCase
-  test 'does it return correct boolean value in talk' do
+  test 'return whether talk' do
     user = users(:kimura)
     assert_equal true, talk?(user)
 

From 57c1b365189e68cfbd1642fd519a64c3df85962e Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 3 Mar 2022 22:22:01 +0900
Subject: [PATCH 22/25] =?UTF-8?q?=E9=81=A9=E5=88=87=E3=81=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index 994d65a3ccf..fa96c052b6e 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -5,9 +5,9 @@
 class SearchHelperTest < ActionView::TestCase
   test 'return whether talk' do
     user = users(:kimura)
-    assert_equal true, talk?(user)
+    assert true, talk?(user)
 
     user = users(:taikai3)
-    assert_equal false, talk?(user)
+    assert_not false, talk?(user)
   end
 end

From e2093ac0bca699451456b9b14a3e5675b352f9f5 Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Mon, 7 Mar 2022 09:46:05 +0900
Subject: [PATCH 23/25] =?UTF-8?q?=E9=96=93=E9=81=95=E3=81=A3=E3=81=9F=20as?=
 =?UTF-8?q?sert=20=E3=81=AE=E5=BC=95=E6=95=B0=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index fa96c052b6e..5a1409a38f3 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -5,9 +5,9 @@
 class SearchHelperTest < ActionView::TestCase
   test 'return whether talk' do
     user = users(:kimura)
-    assert true, talk?(user)
+    assert talk?(user)
 
     user = users(:taikai3)
-    assert_not false, talk?(user)
+    assert_not talk?(user)
   end
 end

From ad279f95356196e8631a8e5d0682f5ed718730cd Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Tue, 8 Mar 2022 19:43:58 +0900
Subject: [PATCH 24/25] =?UTF-8?q?=E5=86=97=E9=95=B7=E3=81=AA=E5=A4=89?=
 =?UTF-8?q?=E6=95=B0=E5=AE=A3=E8=A8=80=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/helpers/search_hepler.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/helpers/search_hepler.rb b/test/helpers/search_hepler.rb
index 5a1409a38f3..332aa6114e4 100644
--- a/test/helpers/search_hepler.rb
+++ b/test/helpers/search_hepler.rb
@@ -4,10 +4,7 @@
 
 class SearchHelperTest < ActionView::TestCase
   test 'return whether talk' do
-    user = users(:kimura)
-    assert talk?(user)
-
-    user = users(:taikai3)
-    assert_not talk?(user)
+    assert talk?(users(:kimura))
+    assert_not talk?(users(:taikai3))
   end
 end

From 4b9677ec52a7eb9c189e371afefebb34a9cb9afa Mon Sep 17 00:00:00 2001
From: ot0m1 <coding_addiction@yahoo.co.jp>
Date: Thu, 10 Mar 2022 20:26:22 +0900
Subject: [PATCH 25/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E5=88=86=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/system/searchables_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/system/searchables_test.rb b/test/system/searchables_test.rb
index e087d90249b..b672bebb1bf 100644
--- a/test/system/searchables_test.rb
+++ b/test/system/searchables_test.rb
@@ -136,7 +136,7 @@ class SearchablesTest < ApplicationSystemTestCase
     assert_no_text 'machida'
   end
 
-  test 'check that link to talk room is displayed properly' do
+  test 'link to consultation room does not appear except for administrator' do
     visit_with_auth '/', 'hatsuno'
     within('form[name=search]') do
       select 'すべて'
@@ -144,9 +144,9 @@ class SearchablesTest < ApplicationSystemTestCase
     end
     find('#test-search').click
     assert_no_text '相談部屋'
+  end
 
-    logout
-
+  test 'administrator will see link to consultation room' do
     visit_with_auth '/', 'komagata'
     within('form[name=search]') do
       select 'ユーザー'