From 59a9f22dcfc08b4a7b1f8a6811717677f1982512 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 25 May 2026 21:25:25 +0900
Subject: [PATCH 01/20] =?UTF-8?q?events=5Fhelper=E3=81=AE=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E5=86=85=E5=AE=B9=E3=82=92=E8=A6=8B=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/events_helper.rb | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 6fd292802a7..802a4789fa0 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -13,18 +13,8 @@ def google_calendar_url(event)
     uri.to_s
   end
 
-  def event_comment_count(event, styled: true)
-    length = event.comments.length
-
-    if styled
-      link_to '#comments', class: "a-meta #{'is-disabled' if length.zero?}" do
-        'コメント（'.html_safe +
-          content_tag(:span, length, class: length.zero? ? 'is-muted' : 'is-emphasized') +
-          '）'.html_safe
-      end
-    else
-      "コメント（#{length}名）"
-    end
+  def event_comment_count(event)
+    'コメント（'.html_safe + content_tag(:span, event.comments.length, class: 'is-emphasized') + '）'.html_safe
   end
 
   def event_participant_count(event)

From 7cacf2b11cdf6ae5c8520189eda335139afb2059 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 25 May 2026 21:26:09 +0900
Subject: [PATCH 02/20] =?UTF-8?q?anouncement=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/announcements/_announcement.html.slim | 7 ++++---
 app/views/announcements/show.html.slim          | 9 +++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim
index 417b5595707..be714d80408 100644
--- a/app/views/announcements/_announcement.html.slim
+++ b/app/views/announcements/_announcement.html.slim
@@ -30,6 +30,7 @@
                   | 公開
                 time.a-meta__value datetime=announcement.published_at.iso8601
                   | #{l announcement.published_at}
-          .card-list-item-meta__item
-            .a-meta
-              | コメント（#{announcement.comments.length}）
+          - if announcement.comments.any?
+            .card-list-item-meta__item
+              .a-meta
+                = event_comment_count(announcement)
diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim
index 301abc7f6fb..a705bef2806 100644
--- a/app/views/announcements/show.html.slim
+++ b/app/views/announcements/show.html.slim
@@ -45,12 +45,9 @@ hr.a-border
                       = @announcement.user.long_name
                 .page-content-header-metas__end
                   .page-content-header-metas__meta
-                    - length = @announcement.comments.length
-                    a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-                      | コメント（
-                      span#comment_count(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                        = length
-                      | ）
+                    - if @announcement.comments.any?
+                      a.a-meta(href='#comments')
+                        = event_comment_count(@announcement)
             .page-content-header__row
               .page-content-header-actions
                 .page-content-header-actions__start

From 8409ec9c3d1027cc64a006c59a977613cc5bfb27 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 26 May 2026 21:23:34 +0900
Subject: [PATCH 03/20] =?UTF-8?q?events=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/events/_event.html.slim  | 4 +++-
 app/views/events/_events.html.slim | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim
index bc5fa385e6e..286d6c5b59b 100644
--- a/app/views/events/_event.html.slim
+++ b/app/views/events/_event.html.slim
@@ -26,7 +26,9 @@
                   = l event.updated_at
           .page-content-header-metas__end
             .page-content-header-metas__meta
-              = event_comment_count(event, styled: true)
+              - if event.comments.any?
+                a.a-meta(href='#comments')
+                  = event_comment_count(event)
 
       .page-content-header__row
         .page-content-header-actions
diff --git a/app/views/events/_events.html.slim b/app/views/events/_events.html.slim
index e6a10ffdc69..6af6d420726 100644
--- a/app/views/events/_events.html.slim
+++ b/app/views/events/_events.html.slim
@@ -36,8 +36,8 @@ ul.card-list.a-card
                   .card-list-item-meta__item
                     .a-meta
                       | 補欠者（#{event.waitlist.count}名）
-                - if event.comments.size.positive?
+                - if event.comments.any?
                   .card-list-item-meta__item
                     .a-meta
-                      | コメント（#{event.comments.size}）
+                      = event_comment_count(event)
 = paginate @events

From b33f732e4189ea036a60fd69e17a31aeb1757fe5 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 26 May 2026 21:26:00 +0900
Subject: [PATCH 04/20] =?UTF-8?q?users/events=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/events/index.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/events/index.html.slim b/app/views/users/events/index.html.slim
index dd55a782c7d..0ff167b4a5e 100644
--- a/app/views/users/events/index.html.slim
+++ b/app/views/users/events/index.html.slim
@@ -57,10 +57,10 @@
                             .card-list-item-meta__item
                               .a-meta
                                 = event_waitlist_count(event)
-                          - if event.comments.size.positive?
+                          - if event.comments.any?
                             .card-list-item-meta__item
                               .a-meta
-                                = event_comment_count(event, styled: false)
+                                = event_comment_count(event)
           .pagination
             = paginate @events
         - else

From b30325cdf1b99f3129dae6d899ceef7afe057ee0 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 26 May 2026 21:29:42 +0900
Subject: [PATCH 05/20] =?UTF-8?q?users/regular=5Fevents=E3=81=AE=E3=82=B3?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/regular_events/index.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/regular_events/index.html.slim b/app/views/users/regular_events/index.html.slim
index 1d3c629e9de..f895a0fa014 100644
--- a/app/views/users/regular_events/index.html.slim
+++ b/app/views/users/regular_events/index.html.slim
@@ -56,10 +56,10 @@
                             time.a-meta(datetime="#{event.start_at}")
                               | 開催日時:
                               | #{event.holding_cycles} #{l event.start_at, format: :time_only} ～ #{l event.end_at, format: :time_only}
-                          - if event.comments.size.positive?
+                          - if event.comments.any?
                             .card-list-item-meta__item
                               .a-meta
-                                = event_comment_count(event, styled: false)
+                                = event_comment_count(event)
           .pagination
             = paginate @regular_events
         - else

From 9144ebcd6af0afdaf5a0e4fd883ba620f66a8bfe Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 26 May 2026 21:41:24 +0900
Subject: [PATCH 06/20] =?UTF-8?q?movies/:id=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/movies/_movie_header.html.slim | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/movies/_movie_header.html.slim b/app/views/movies/_movie_header.html.slim
index b2656eef695..b722dc525ef 100644
--- a/app/views/movies/_movie_header.html.slim
+++ b/app/views/movies/_movie_header.html.slim
@@ -56,12 +56,9 @@ header.page-content-header
         .page-content-header-metas__end
           .page-content-header-metas
             .page-content-header-metas__meta
-              - length = movie.comments.length
-              a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-                | コメント（
-                span#comment_count(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                  = length
-                | ）
+              - if movie.comments.any?
+                a.a-meta(href='#comments')
+                  = event_comment_count(movie)
 
     .page-content-header__row
       .page-content-header-actions

From d5541b9eb71d08fe6888142b3f18e1124eb3932c Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 26 May 2026 21:44:24 +0900
Subject: [PATCH 07/20] =?UTF-8?q?pages=E3=81=AE=E3=82=B3=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pages/_doc_header.html.slim | 9 +++------
 app/views/pages/_page.html.slim       | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim
index 645a4a54869..2f10774052f 100644
--- a/app/views/pages/_doc_header.html.slim
+++ b/app/views/pages/_doc_header.html.slim
@@ -59,12 +59,9 @@ header.page-content-header
         .page-content-header-metas__end
           .page-content-header-metas
             .page-content-header-metas__meta
-              - length = page.comments.length
-              a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-                | コメント（
-                span#comment_count(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                  = length
-                | ）
+              - if page.comments.any?
+                a.a-meta(href='#comments')
+                  = event_comment_count(page)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/pages/_page.html.slim b/app/views/pages/_page.html.slim
index 0c752206aff..8e46877044a 100644
--- a/app/views/pages/_page.html.slim
+++ b/app/views/pages/_page.html.slim
@@ -52,4 +52,4 @@
             - if page.comments.any?
               .card-list-item-meta__item
                 .a-meta
-                  | コメント（#{page.comments.length}）
+                  = event_comment_count(page)

From 6f224b2d95de38fb8e43768c38a2eaee3cca27a3 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 27 May 2026 08:51:19 +0900
Subject: [PATCH 08/20] =?UTF-8?q?products=E9=85=8D=E4=B8=8B=E3=81=AE?=
 =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/products/product_component.html.slim | 4 ++--
 app/views/products/_product.html.slim               | 2 +-
 app/views/products/_product_header.html.slim        | 9 +++------
 app/views/products/_product_list_item.html.slim     | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim
index 8e5e32a60da..730239a58e9 100644
--- a/app/components/products/product_component.html.slim
+++ b/app/components/products/product_component.html.slim
@@ -63,13 +63,13 @@
                 - else
                   | 約#{until_next_elapsed_days}時間
 
-      - if @product.comments.size > 0
+      - if @product.comments.any?
         hr.card-list-item__row-separator
         .card-list-item__row
           .card-list-item-meta
             .card-list-item-meta__items
               .card-list-item-meta__item
-                .a-meta コメント（#{@product.comments.size}）
+                .a-meta = helpers.event_comment_count(@product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   - @product.commented_users.distinct.each do |user|
diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim
index 78da650c7ce..b8c35f9f960 100644
--- a/app/views/products/_product.html.slim
+++ b/app/views/products/_product.html.slim
@@ -50,7 +50,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  | コメント（#{product.comments.size}）
+                  = event_comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'users/icon',
diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim
index 513dd931412..ef9864db658 100644
--- a/app/views/products/_product_header.html.slim
+++ b/app/views/products/_product_header.html.slim
@@ -71,12 +71,9 @@ header.page-content-header.is-product
 
         .page-content-header-metas__end
           .page-content-header-metas__meta
-            - length = product.comments.length
-            a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-              | コメント（
-              span(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                = length
-              | ）
+            - if product.comments.any?
+              a.a-meta(href='#comments')
+                = event_comment_count(product)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/products/_product_list_item.html.slim b/app/views/products/_product_list_item.html.slim
index 8d6075a7451..3f313e8cf0d 100644
--- a/app/views/products/_product_list_item.html.slim
+++ b/app/views/products/_product_list_item.html.slim
@@ -54,7 +54,7 @@ ruby:
         hr.card-list-item__row-separator
         .card-list-item-meta__items
           .card-list-item-meta__item
-            .a-meta コメント（#{product.comments.size}）
+            .a-meta = event_comment_count(product)
           .card-list-item-meta__item
             .card-list-item__user-icons
               = render partial: 'users/icon',

From 1c8e6a7bd7d5bba9d1470415792c7797837da0d3 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 27 May 2026 09:12:02 +0900
Subject: [PATCH 09/20] =?UTF-8?q?regular=5Fevents=E3=81=AE=E3=82=B3?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/regular_events/_regular_event.html.slim  | 9 +++------
 app/views/regular_events/_regular_events.html.slim | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim
index cd7166e6152..d781bcd56d8 100644
--- a/app/views/regular_events/_regular_event.html.slim
+++ b/app/views/regular_events/_regular_event.html.slim
@@ -24,12 +24,9 @@
                   = l regular_event.updated_at
           .page-content-header-metas__end
             .page-content-header-metas__meta
-              - length = regular_event.comments.length
-              a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-                | コメント（
-                span(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                  = length
-                | ）
+              - if regular_event.comments.any?
+                a.a-meta(href='#comments')
+                  = event_comment_count(regular_event)
 
       .page-content-header__row
         .page-content-header-actions
diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim
index 40c84d2590f..cc2086b5ce0 100644
--- a/app/views/regular_events/_regular_events.html.slim
+++ b/app/views/regular_events/_regular_events.html.slim
@@ -48,8 +48,8 @@ ul.card-list.a-card
                     span.a-meta__label 開催日時
                     span.a-meta__value = "#{event.holding_cycles} #{l event.start_at, format: :time_only} ~ #{l event.end_at, format: :time_only}"
                   .card-list-item-meta__item
-                - if event.comments.size.positive?
+                - if event.comments.any?
                   .card-list-item-meta__item
                     .a-meta
-                      | コメント（#{event.comments.size}）
+                      = event_comment_count(event)
 = paginate @regular_events

From 708f9c774ec660d55da415f042356211de92ff45 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 27 May 2026 10:16:05 +0900
Subject: [PATCH 10/20] =?UTF-8?q?reports=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/reports/_product.html.slim       | 2 +-
 app/views/reports/_report.html.slim        | 2 +-
 app/views/reports/_report_header.html.slim | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim
index 6b8752b96af..6208ace5354 100644
--- a/app/views/reports/_product.html.slim
+++ b/app/views/reports/_product.html.slim
@@ -31,7 +31,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  | コメント（#{product.comments.size}）
+                  = event_comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user
diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim
index 1e164b8319a..bc1a593d5a7 100644
--- a/app/views/reports/_report.html.slim
+++ b/app/views/reports/_report.html.slim
@@ -48,7 +48,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  | コメント（#{report.comments.size}）
+                  = event_comment_count(report)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user
diff --git a/app/views/reports/_report_header.html.slim b/app/views/reports/_report_header.html.slim
index d3221fd5845..f3281589da5 100644
--- a/app/views/reports/_report_header.html.slim
+++ b/app/views/reports/_report_header.html.slim
@@ -40,12 +40,9 @@ header.page-content-header.is-report
 
         .page-content-header-metas__end
           .page-content-header-metas__meta
-            - length = report.comments.length
-            a.a-meta(href='#comments' class="#{length.zero? ? 'is-disabled' : ''}")
-              | コメント（
-              span(class="#{length.zero? ? 'is-muted' : 'is-emphasized'}")
-                = length
-              | ）
+            - if report.comments.any?
+              a.a-meta(href='#comments')
+                = event_comment_count(report)
 
     .page-content-header__row
       .page-content-header-actions

From 75ff6eb6c921f85edc7d4518cadd4ecef0242610 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 27 May 2026 10:43:45 +0900
Subject: [PATCH 11/20] =?UTF-8?q?pair=5Fwork=E3=81=AE=E3=82=B3=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=81=A8CSS=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/atoms/_a-meta.css  | 4 ++++
 app/views/pair_works/_pair_work.html.slim | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/atoms/_a-meta.css b/app/assets/stylesheets/atoms/_a-meta.css
index 6cc0054b364..9ecbb46d306 100644
--- a/app/assets/stylesheets/atoms/_a-meta.css
+++ b/app/assets/stylesheets/atoms/_a-meta.css
@@ -22,6 +22,10 @@
   font-weight: 600;
 }
 
+.a-meta.is-important  .is-emphasized {
+  color: inherit;
+}
+
 a.a-meta {
   text-decoration: none;
   cursor: pointer;
diff --git a/app/views/pair_works/_pair_work.html.slim b/app/views/pair_works/_pair_work.html.slim
index d019380dc03..b06e0c847da 100644
--- a/app/views/pair_works/_pair_work.html.slim
+++ b/app/views/pair_works/_pair_work.html.slim
@@ -40,9 +40,10 @@
                 - else
                   time.a-meta__value datetime=pair_work.published_at.iso8601
                     = l pair_work.published_at
-            .card-list-item-meta__item
-              .a-meta(class="#{pair_work.important? ? 'is-important' : ''}")
-                | コメント（#{pair_work.comments.length}）
+            - if pair_work.comments.any?
+              .card-list-item-meta__item
+                .a-meta(class="is-important")
+                  = event_comment_count(pair_work)
 
     - if pair_work.solved?
       .stamp.is-circle.is-solved

From 74186fdcf8d581955433d88193fc0909d903060f Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 27 May 2026 10:48:55 +0900
Subject: [PATCH 12/20] =?UTF-8?q?talk=E3=81=AE=E3=82=B3=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E5=AE=9F=E8=A3=85=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/talks/_talk.html.slim | 49 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/app/views/talks/_talk.html.slim b/app/views/talks/_talk.html.slim
index d7a6ab4bc9d..cbeec6575c4 100644
--- a/app/views/talks/_talk.html.slim
+++ b/app/views/talks/_talk.html.slim
@@ -8,31 +8,30 @@
           h2.card-list-item-title__title(itemprop='name')
             = link_to "/talks/#{talk.id}#latest-comment", itemprop: 'url', class: 'card-list-item-title__link a-text-link' do
               | #{talk.user.long_name} さんの相談部屋
-      - if talk.comments.present?
+      - if talk.comments.any?
         hr.card-list-item__row-separator
-      - if talk.comments.present?
-        .card-list-item__row
-          .card-list-item-meta__items
-            .card-list-item-meta__item
-              .card-list-item-meta
-                .card-list-item-meta__items
-                  .card-list-item-meta__item
-                    .a-meta
-                      | コメント（#{talk.comments.size}）
-                  .card-list-item-meta__item
-                    .card-list-item__user-icons
-                      = render partial: 'users/icon',
-                        collection: talk.commented_users.distinct,
-                        locals: { link_class: 'card-list-item__user-icons-icon', image_class: 'a-user-icon' },
-                        as: :user,
-                        cached: true
-                  .card-list-item-meta__item
-                    .a-meta
-                      | 〜 #{l talk.comments.last.updated_at}
-                  .card-list-item-meta__item
-                    - if talk.comments.last.user.admin
+          .card-list-item__row
+            .card-list-item-meta__items
+              .card-list-item-meta__item
+                .card-list-item-meta
+                  .card-list-item-meta__items
+                    .card-list-item-meta__item
                       .a-meta
-                        | （管理者）
-                    - else
+                        = event_comment_count(talk)
+                    .card-list-item-meta__item
+                      .card-list-item__user-icons
+                        = render partial: 'users/icon',
+                          collection: talk.commented_users.distinct,
+                          locals: { link_class: 'card-list-item__user-icons-icon', image_class: 'a-user-icon' },
+                          as: :user,
+                          cached: true
+                    .card-list-item-meta__item
                       .a-meta
-                        | （#{talk.user.login_name}）
+                        | 〜 #{l talk.comments.last.updated_at}
+                    .card-list-item-meta__item
+                      - if talk.comments.last.user.admin
+                        .a-meta
+                          | （管理者）
+                      - else
+                        .a-meta
+                          | （#{talk.user.login_name}）

From e0635feb52e2cd86e6e10418ace5640f0b433486 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Thu, 28 May 2026 21:35:02 +0900
Subject: [PATCH 13/20] =?UTF-8?q?companies/:id/products=E3=81=AE=E3=82=B3?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/companies/products/_product.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim
index 0976b956832..adf12b4bc17 100644
--- a/app/views/companies/products/_product.html.slim
+++ b/app/views/companies/products/_product.html.slim
@@ -37,14 +37,14 @@
                   time.a-meta datetime=product.updated_at.iso8601
                     span.a-meta__label 更新
                     | #{l product.updated_at}
-      - if !product.comments.empty?
+      - if product.comments.any?
         hr.card-list-item__row-separator
         .card-list-item__row
           .card-list-item-meta
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  | コメント（#{product.comments.size}）
+                  = event_comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   - commented_users[product.id].uniq.each do |user|

From 945a47c9feec5e0b8f63bbf89a080801fe916f47 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 1 Jun 2026 20:16:45 +0900
Subject: [PATCH 14/20] =?UTF-8?q?=E3=82=A2=E3=83=89=E3=83=90=E3=82=A4?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=81=A7=E6=89=80=E5=B1=9E=E4=BC=81=E6=A5=AD=E3=81=AB=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E3=81=97=E3=83=88=E3=83=83=E3=83=97=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E7=A0=94=E4=BF=AE=E7=94=9F=E3=81=AE=E6=97=A5=E5=A0=B1=E4=B8=80?=
 =?UTF-8?q?=E8=A6=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/home/_colleague_trainee.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/home/_colleague_trainee.html.slim b/app/views/home/_colleague_trainee.html.slim
index e86b92666e0..904d8784d6c 100644
--- a/app/views/home/_colleague_trainee.html.slim
+++ b/app/views/home/_colleague_trainee.html.slim
@@ -22,4 +22,4 @@
             - if user.comments.present?
               .card-list-item-meta__item
                 = link_to user_comments_path(user), class: 'card-list-item-meta__item-link a-text-link' do
-                  | コメント（#{user.comments.count}）
+                  = event_comment_count(user)

From 7c1d77611ea7bf0c12bb0e17b3f3c0243f639dfb Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 1 Jun 2026 20:38:01 +0900
Subject: [PATCH 15/20] =?UTF-8?q?html=5Fsafe=E3=81=8B=E3=82=89safe=5Fjoin?=
 =?UTF-8?q?=E3=81=AB=E5=87=A6=E7=90=86=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 802a4789fa0..2886b4f7278 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -14,7 +14,7 @@ def google_calendar_url(event)
   end
 
   def event_comment_count(event)
-    'コメント（'.html_safe + content_tag(:span, event.comments.length, class: 'is-emphasized') + '）'.html_safe
+    safe_join(['コメント（', content_tag(:span, event.comments.length, class: 'is-emphasized'), '）'])
   end
 
   def event_participant_count(event)

From d2a40fd9a0a76735f805b554595bea3d40ecbf5c Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Tue, 2 Jun 2026 20:30:22 +0900
Subject: [PATCH 16/20] =?UTF-8?q?rails=20test=E3=81=A7=E5=A4=B1=E6=95=97?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=83=86=E3=82=B9=E3=83=88=E6=96=87=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/system/announcements_test.rb        | 2 +-
 test/system/movies_test.rb               | 3 +--
 test/system/pages_test.rb                | 3 +--
 test/system/product/product_list_test.rb | 2 +-
 test/system/reports_test.rb              | 4 +---
 test/system/talks/user_list_test.rb      | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/system/announcements_test.rb b/test/system/announcements_test.rb
index c07a3cae76d..38a0b6c5c81 100644
--- a/test/system/announcements_test.rb
+++ b/test/system/announcements_test.rb
@@ -44,7 +44,7 @@ class AnnouncementsTest < ApplicationSystemTestCase
     assert_selector 'p', text: 'コメント数表示のテストです。'
 
     visit current_path
-    assert_selector '#comment_count', text: '2'
+    assert_selector 'span', text: '2'
   end
 
   test 'using file uploading by file selection dialogue in textarea' do
diff --git a/test/system/movies_test.rb b/test/system/movies_test.rb
index 862a5e8b2e2..1a4a0a1c707 100644
--- a/test/system/movies_test.rb
+++ b/test/system/movies_test.rb
@@ -41,14 +41,13 @@ class MoviesTest < ApplicationSystemTestCase
       content_type: 'video/mp4'
     )
     visit_with_auth "/movies/#{movie.id}", 'kimura'
-    assert_selector '#comment_count', text: 0
 
     wait_for_comment_form
     post_comment('コメント数表示のテストです。')
 
     visit_with_auth "/movies/#{movie.id}", 'kimura'
     wait_for_javascript_components
-    assert_selector '#comment_count', text: 1
+    assert_selector 'span', text: 1
   end
 
   test 'show the edit movie page' do
diff --git a/test/system/pages_test.rb b/test/system/pages_test.rb
index 72a590ba349..9de4a80b270 100644
--- a/test/system/pages_test.rb
+++ b/test/system/pages_test.rb
@@ -40,14 +40,13 @@ class PagesTest < ApplicationSystemTestCase
   test 'show comment count' do
     page = pages(:page1)
     visit_with_auth "/pages/#{page.id}", 'kimura'
-    assert_selector '#comment_count', text: 0
 
     wait_for_comment_form
     post_comment('コメント数表示のテストです。')
 
     visit current_path
     wait_for_javascript_components
-    assert_selector '#comment_count', text: 1
+    assert_selector 'span', text: 1
   end
 
   test 'show last updated user icon' do
diff --git a/test/system/product/product_list_test.rb b/test/system/product/product_list_test.rb
index 5dee2c91492..8a554bbef68 100644
--- a/test/system/product/product_list_test.rb
+++ b/test/system/product/product_list_test.rb
@@ -37,7 +37,7 @@ class Product::ProductListTest < ApplicationSystemTestCase
     visit_with_auth '/products', 'komagata'
     product_item = find("a[href='/products/#{product.id}']").ancestor('.card-list-item')
     within product_item do
-      assert_text "コメント（#{product.comments.size}）"
+      assert_text(/コメント（\s*#{product.comments.size}\s*）/)
       assert_selector '.card-list-item__user-icons'
     end
   end
diff --git a/test/system/reports_test.rb b/test/system/reports_test.rb
index e41c91c9ebc..8c909cbe2bc 100644
--- a/test/system/reports_test.rb
+++ b/test/system/reports_test.rb
@@ -19,9 +19,7 @@ class ReportsTest < ApplicationSystemTestCase
 
   test 'show number of comments' do
     visit_with_auth report_path(reports(:report1)), 'komagata'
-    within(:css, '.is-emphasized') do
-      assert_text '2'
-    end
+    assert_selector '.is-emphasized', text: '2'
   end
 
   test 'hide user icon from recent reports in report show' do
diff --git a/test/system/talks/user_list_test.rb b/test/system/talks/user_list_test.rb
index 4c68976038e..b50753c1b4b 100644
--- a/test/system/talks/user_list_test.rb
+++ b/test/system/talks/user_list_test.rb
@@ -51,7 +51,7 @@ class UserListTest < ApplicationSystemTestCase
       within('.card-list-item-meta') do
         assert_text 'コメント'
         assert_selector 'img.a-user-icon'
-        assert_text '（1）'
+        assert_text '1'
         assert_text '2019年01月02日(水) 00:00'
         assert_text '（hajime）'
       end

From cba3c715cc2e08ecf9afdd86fc2168e2a5a0e703 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Wed, 3 Jun 2026 15:21:05 +0900
Subject: [PATCH 17/20] =?UTF-8?q?coderabbit=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/events_helper.rb                  |  2 +-
 app/views/movies/_movie_header.html.slim      | 13 +++---
 app/views/pages/_doc_header.html.slim         |  9 ++--
 app/views/products/_product_header.html.slim  |  7 ++-
 .../regular_events/_regular_event.html.slim   |  6 +--
 .../regular_events/_regular_events.html.slim  |  1 -
 app/views/talks/_talk.html.slim               | 46 +++++++++----------
 test/system/announcements_test.rb             |  2 +-
 test/system/movies_test.rb                    |  2 +-
 test/system/pages_test.rb                     |  2 +-
 test/system/talks/user_list_test.rb           |  2 +-
 11 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 2886b4f7278..2c0473a42e3 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -14,7 +14,7 @@ def google_calendar_url(event)
   end
 
   def event_comment_count(event)
-    safe_join(['コメント（', content_tag(:span, event.comments.length, class: 'is-emphasized'), '）'])
+    safe_join(['コメント（', content_tag(:span, event.comments.size, class: 'is-emphasized'), '）'])
   end
 
   def event_participant_count(event)
diff --git a/app/views/movies/_movie_header.html.slim b/app/views/movies/_movie_header.html.slim
index b722dc525ef..76062b4f48f 100644
--- a/app/views/movies/_movie_header.html.slim
+++ b/app/views/movies/_movie_header.html.slim
@@ -52,13 +52,12 @@ header.page-content-header
                           = image_tag 'users/avatars/ghost.png', class: 'thread-header__user-icon a-user-icon'
                       .a-user-name
                         | ghost
-
-        .page-content-header-metas__end
-          .page-content-header-metas
-            .page-content-header-metas__meta
-              - if movie.comments.any?
-                a.a-meta(href='#comments')
-                  = event_comment_count(movie)
+        - if movie.comments.any?
+          .page-content-header-metas__end
+            .page-content-header-metas
+                .page-content-header-metas__meta
+                  a.a-meta(href='#comments')
+                    = event_comment_count(movie)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim
index 2f10774052f..eaf5ca97052 100644
--- a/app/views/pages/_doc_header.html.slim
+++ b/app/views/pages/_doc_header.html.slim
@@ -55,11 +55,10 @@ header.page-content-header
                       image_class: 'thread-header__user-icon'
                     = link_to page.last_updated_user, class: 'a-user-name' do
                       | #{page.last_updated_user.login_name}
-
-        .page-content-header-metas__end
-          .page-content-header-metas
-            .page-content-header-metas__meta
-              - if page.comments.any?
+        - if page.comments.any?
+          .page-content-header-metas__end
+            .page-content-header-metas
+              .page-content-header-metas__meta
                 a.a-meta(href='#comments')
                   = event_comment_count(page)
 
diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim
index ef9864db658..da21b7b9e57 100644
--- a/app/views/products/_product_header.html.slim
+++ b/app/views/products/_product_header.html.slim
@@ -68,10 +68,9 @@ header.page-content-header.is-product
                   | 更新
                 time.a-meta__value datetime=product.updated_at.iso8601
                   = l product.updated_at
-
-        .page-content-header-metas__end
-          .page-content-header-metas__meta
-            - if product.comments.any?
+        - if product.comments.any?
+          .page-content-header-metas__end
+            .page-content-header-metas__meta
               a.a-meta(href='#comments')
                 = event_comment_count(product)
 
diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim
index d781bcd56d8..4fc24b122d9 100644
--- a/app/views/regular_events/_regular_event.html.slim
+++ b/app/views/regular_events/_regular_event.html.slim
@@ -22,9 +22,9 @@
               .a-meta
                 time.a-meta__value datetime=regular_event.updated_at.iso8601
                   = l regular_event.updated_at
-          .page-content-header-metas__end
-            .page-content-header-metas__meta
-              - if regular_event.comments.any?
+          - if regular_event.comments.any?
+            .page-content-header-metas__end
+              .page-content-header-metas__meta
                 a.a-meta(href='#comments')
                   = event_comment_count(regular_event)
 
diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim
index cc2086b5ce0..a662205b5dc 100644
--- a/app/views/regular_events/_regular_events.html.slim
+++ b/app/views/regular_events/_regular_events.html.slim
@@ -47,7 +47,6 @@ ul.card-list.a-card
                   .a-meta
                     span.a-meta__label 開催日時
                     span.a-meta__value = "#{event.holding_cycles} #{l event.start_at, format: :time_only} ~ #{l event.end_at, format: :time_only}"
-                  .card-list-item-meta__item
                 - if event.comments.any?
                   .card-list-item-meta__item
                     .a-meta
diff --git a/app/views/talks/_talk.html.slim b/app/views/talks/_talk.html.slim
index cbeec6575c4..0d88c74a010 100644
--- a/app/views/talks/_talk.html.slim
+++ b/app/views/talks/_talk.html.slim
@@ -10,28 +10,28 @@
               | #{talk.user.long_name} さんの相談部屋
       - if talk.comments.any?
         hr.card-list-item__row-separator
-          .card-list-item__row
-            .card-list-item-meta__items
-              .card-list-item-meta__item
-                .card-list-item-meta
-                  .card-list-item-meta__items
-                    .card-list-item-meta__item
+        .card-list-item__row
+          .card-list-item-meta__items
+            .card-list-item-meta__item
+              .card-list-item-meta
+                .card-list-item-meta__items
+                  .card-list-item-meta__item
+                    .a-meta
+                      = event_comment_count(talk)
+                  .card-list-item-meta__item
+                    .card-list-item__user-icons
+                      = render partial: 'users/icon',
+                        collection: talk.commented_users.distinct,
+                        locals: { link_class: 'card-list-item__user-icons-icon', image_class: 'a-user-icon' },
+                        as: :user,
+                        cached: true
+                  .card-list-item-meta__item
+                    .a-meta
+                      | 〜 #{l talk.comments.last.updated_at}
+                  .card-list-item-meta__item
+                    - if talk.comments.last.user.admin
                       .a-meta
-                        = event_comment_count(talk)
-                    .card-list-item-meta__item
-                      .card-list-item__user-icons
-                        = render partial: 'users/icon',
-                          collection: talk.commented_users.distinct,
-                          locals: { link_class: 'card-list-item__user-icons-icon', image_class: 'a-user-icon' },
-                          as: :user,
-                          cached: true
-                    .card-list-item-meta__item
+                        | （管理者）
+                    - else
                       .a-meta
-                        | 〜 #{l talk.comments.last.updated_at}
-                    .card-list-item-meta__item
-                      - if talk.comments.last.user.admin
-                        .a-meta
-                          | （管理者）
-                      - else
-                        .a-meta
-                          | （#{talk.user.login_name}）
+                        | （#{talk.user.login_name}）
diff --git a/test/system/announcements_test.rb b/test/system/announcements_test.rb
index 38a0b6c5c81..0a616cf7f98 100644
--- a/test/system/announcements_test.rb
+++ b/test/system/announcements_test.rb
@@ -44,7 +44,7 @@ class AnnouncementsTest < ApplicationSystemTestCase
     assert_selector 'p', text: 'コメント数表示のテストです。'
 
     visit current_path
-    assert_selector 'span', text: '2'
+    assert_selector 'a.a-meta[href="#comments"] span.is-emphasized', text: '2'
   end
 
   test 'using file uploading by file selection dialogue in textarea' do
diff --git a/test/system/movies_test.rb b/test/system/movies_test.rb
index 1a4a0a1c707..fa899e3ebb8 100644
--- a/test/system/movies_test.rb
+++ b/test/system/movies_test.rb
@@ -47,7 +47,7 @@ class MoviesTest < ApplicationSystemTestCase
 
     visit_with_auth "/movies/#{movie.id}", 'kimura'
     wait_for_javascript_components
-    assert_selector 'span', text: 1
+    assert_selector 'a.a-meta[href="#comments"] span.is-emphasized', text: 1
   end
 
   test 'show the edit movie page' do
diff --git a/test/system/pages_test.rb b/test/system/pages_test.rb
index 9de4a80b270..7ed0d8cc27f 100644
--- a/test/system/pages_test.rb
+++ b/test/system/pages_test.rb
@@ -46,7 +46,7 @@ class PagesTest < ApplicationSystemTestCase
 
     visit current_path
     wait_for_javascript_components
-    assert_selector 'span', text: 1
+    assert_selector 'span.is-emphasized', text: 1
   end
 
   test 'show last updated user icon' do
diff --git a/test/system/talks/user_list_test.rb b/test/system/talks/user_list_test.rb
index b50753c1b4b..942f7782479 100644
--- a/test/system/talks/user_list_test.rb
+++ b/test/system/talks/user_list_test.rb
@@ -51,7 +51,7 @@ class UserListTest < ApplicationSystemTestCase
       within('.card-list-item-meta') do
         assert_text 'コメント'
         assert_selector 'img.a-user-icon'
-        assert_text '1'
+        assert_selector 'span.is-emphasized', text: 1
         assert_text '2019年01月02日(水) 00:00'
         assert_text '（hajime）'
       end

From cd501215fb490283d0bd180b9e1a38f786459002 Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 15 Jun 2026 09:27:12 +0900
Subject: [PATCH 18/20] =?UTF-8?q?comment=E3=83=98=E3=83=AB=E3=83=91?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E5=90=8D?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 2c0473a42e3..672fd2ac18d 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -13,8 +13,8 @@ def google_calendar_url(event)
     uri.to_s
   end
 
-  def event_comment_count(event)
-    safe_join(['コメント（', content_tag(:span, event.comments.size, class: 'is-emphasized'), '）'])
+  def comment_count(commentable)
+    safe_join(['コメント（', content_tag(:span, commentable.comments.size, class: 'is-emphasized'), '）'])
   end
 
   def event_participant_count(event)

From 72fc6a610c09b27578650ffd590ef9cf6b51530c Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 15 Jun 2026 10:06:01 +0900
Subject: [PATCH 19/20] =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E5=90=8D=E5=A4=89=E6=9B=B4=E3=81=AB=E3=82=88=E3=82=8Bviews?=
 =?UTF-8?q?=E3=82=82=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/products/product_component.html.slim | 2 +-
 app/views/announcements/_announcement.html.slim     | 2 +-
 app/views/announcements/show.html.slim              | 2 +-
 app/views/companies/products/_product.html.slim     | 2 +-
 app/views/events/_event.html.slim                   | 2 +-
 app/views/events/_events.html.slim                  | 2 +-
 app/views/home/_colleague_trainee.html.slim         | 4 ++--
 app/views/movies/_movie_header.html.slim            | 2 +-
 app/views/pages/_doc_header.html.slim               | 2 +-
 app/views/pages/_page.html.slim                     | 2 +-
 app/views/pair_works/_pair_work.html.slim           | 2 +-
 app/views/products/_product.html.slim               | 2 +-
 app/views/products/_product_header.html.slim        | 2 +-
 app/views/products/_product_list_item.html.slim     | 2 +-
 app/views/regular_events/_regular_event.html.slim   | 2 +-
 app/views/regular_events/_regular_events.html.slim  | 2 +-
 app/views/reports/_product.html.slim                | 2 +-
 app/views/reports/_report.html.slim                 | 2 +-
 app/views/reports/_report_header.html.slim          | 2 +-
 app/views/talks/_talk.html.slim                     | 2 +-
 app/views/users/events/index.html.slim              | 2 +-
 app/views/users/regular_events/index.html.slim      | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim
index 730239a58e9..76c773e6004 100644
--- a/app/components/products/product_component.html.slim
+++ b/app/components/products/product_component.html.slim
@@ -69,7 +69,7 @@
           .card-list-item-meta
             .card-list-item-meta__items
               .card-list-item-meta__item
-                .a-meta = helpers.event_comment_count(@product)
+                .a-meta = helpers.comment_count(@product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   - @product.commented_users.distinct.each do |user|
diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim
index be714d80408..c818c47d57d 100644
--- a/app/views/announcements/_announcement.html.slim
+++ b/app/views/announcements/_announcement.html.slim
@@ -33,4 +33,4 @@
           - if announcement.comments.any?
             .card-list-item-meta__item
               .a-meta
-                = event_comment_count(announcement)
+                = comment_count(announcement)
diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim
index a705bef2806..e30306e2900 100644
--- a/app/views/announcements/show.html.slim
+++ b/app/views/announcements/show.html.slim
@@ -47,7 +47,7 @@ hr.a-border
                   .page-content-header-metas__meta
                     - if @announcement.comments.any?
                       a.a-meta(href='#comments')
-                        = event_comment_count(@announcement)
+                        = comment_count(@announcement)
             .page-content-header__row
               .page-content-header-actions
                 .page-content-header-actions__start
diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim
index adf12b4bc17..2b1ecc99f5b 100644
--- a/app/views/companies/products/_product.html.slim
+++ b/app/views/companies/products/_product.html.slim
@@ -44,7 +44,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  = event_comment_count(product)
+                  = comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   - commented_users[product.id].uniq.each do |user|
diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim
index 286d6c5b59b..6512235a9d2 100644
--- a/app/views/events/_event.html.slim
+++ b/app/views/events/_event.html.slim
@@ -28,7 +28,7 @@
             .page-content-header-metas__meta
               - if event.comments.any?
                 a.a-meta(href='#comments')
-                  = event_comment_count(event)
+                  = comment_count(event)
 
       .page-content-header__row
         .page-content-header-actions
diff --git a/app/views/events/_events.html.slim b/app/views/events/_events.html.slim
index 6af6d420726..90e1bd77aff 100644
--- a/app/views/events/_events.html.slim
+++ b/app/views/events/_events.html.slim
@@ -39,5 +39,5 @@ ul.card-list.a-card
                 - if event.comments.any?
                   .card-list-item-meta__item
                     .a-meta
-                      = event_comment_count(event)
+                      = comment_count(event)
 = paginate @events
diff --git a/app/views/home/_colleague_trainee.html.slim b/app/views/home/_colleague_trainee.html.slim
index 904d8784d6c..ece25f5c9ba 100644
--- a/app/views/home/_colleague_trainee.html.slim
+++ b/app/views/home/_colleague_trainee.html.slim
@@ -19,7 +19,7 @@
               .card-list-item-meta__item
                 = link_to user_products_path(user), class: 'card-list-item-meta__item-link a-text-link' do
                   | 提出物一覧（#{user.products.count}）
-            - if user.comments.present?
+            - if user.comments.any?
               .card-list-item-meta__item
                 = link_to user_comments_path(user), class: 'card-list-item-meta__item-link a-text-link' do
-                  = event_comment_count(user)
+                  = comment_count(user)
diff --git a/app/views/movies/_movie_header.html.slim b/app/views/movies/_movie_header.html.slim
index 76062b4f48f..624e2b251b4 100644
--- a/app/views/movies/_movie_header.html.slim
+++ b/app/views/movies/_movie_header.html.slim
@@ -57,7 +57,7 @@ header.page-content-header
             .page-content-header-metas
                 .page-content-header-metas__meta
                   a.a-meta(href='#comments')
-                    = event_comment_count(movie)
+                    = comment_count(movie)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim
index eaf5ca97052..5dc8796c405 100644
--- a/app/views/pages/_doc_header.html.slim
+++ b/app/views/pages/_doc_header.html.slim
@@ -60,7 +60,7 @@ header.page-content-header
             .page-content-header-metas
               .page-content-header-metas__meta
                 a.a-meta(href='#comments')
-                  = event_comment_count(page)
+                  = comment_count(page)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/pages/_page.html.slim b/app/views/pages/_page.html.slim
index 8e46877044a..1ef03e2ca64 100644
--- a/app/views/pages/_page.html.slim
+++ b/app/views/pages/_page.html.slim
@@ -52,4 +52,4 @@
             - if page.comments.any?
               .card-list-item-meta__item
                 .a-meta
-                  = event_comment_count(page)
+                  = comment_count(page)
diff --git a/app/views/pair_works/_pair_work.html.slim b/app/views/pair_works/_pair_work.html.slim
index b06e0c847da..e8934468ec1 100644
--- a/app/views/pair_works/_pair_work.html.slim
+++ b/app/views/pair_works/_pair_work.html.slim
@@ -43,7 +43,7 @@
             - if pair_work.comments.any?
               .card-list-item-meta__item
                 .a-meta(class="is-important")
-                  = event_comment_count(pair_work)
+                  = comment_count(pair_work)
 
     - if pair_work.solved?
       .stamp.is-circle.is-solved
diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim
index b8c35f9f960..31693707083 100644
--- a/app/views/products/_product.html.slim
+++ b/app/views/products/_product.html.slim
@@ -50,7 +50,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  = event_comment_count(product)
+                  = comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'users/icon',
diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim
index da21b7b9e57..6f9fcc9a53f 100644
--- a/app/views/products/_product_header.html.slim
+++ b/app/views/products/_product_header.html.slim
@@ -72,7 +72,7 @@ header.page-content-header.is-product
           .page-content-header-metas__end
             .page-content-header-metas__meta
               a.a-meta(href='#comments')
-                = event_comment_count(product)
+                = comment_count(product)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/products/_product_list_item.html.slim b/app/views/products/_product_list_item.html.slim
index 3f313e8cf0d..bda708ebb7f 100644
--- a/app/views/products/_product_list_item.html.slim
+++ b/app/views/products/_product_list_item.html.slim
@@ -54,7 +54,7 @@ ruby:
         hr.card-list-item__row-separator
         .card-list-item-meta__items
           .card-list-item-meta__item
-            .a-meta = event_comment_count(product)
+            .a-meta = comment_count(product)
           .card-list-item-meta__item
             .card-list-item__user-icons
               = render partial: 'users/icon',
diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim
index 4fc24b122d9..ecc4715c707 100644
--- a/app/views/regular_events/_regular_event.html.slim
+++ b/app/views/regular_events/_regular_event.html.slim
@@ -26,7 +26,7 @@
             .page-content-header-metas__end
               .page-content-header-metas__meta
                 a.a-meta(href='#comments')
-                  = event_comment_count(regular_event)
+                  = comment_count(regular_event)
 
       .page-content-header__row
         .page-content-header-actions
diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim
index a662205b5dc..5475b2e830c 100644
--- a/app/views/regular_events/_regular_events.html.slim
+++ b/app/views/regular_events/_regular_events.html.slim
@@ -50,5 +50,5 @@ ul.card-list.a-card
                 - if event.comments.any?
                   .card-list-item-meta__item
                     .a-meta
-                      = event_comment_count(event)
+                      = comment_count(event)
 = paginate @regular_events
diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim
index 6208ace5354..faae089d483 100644
--- a/app/views/reports/_product.html.slim
+++ b/app/views/reports/_product.html.slim
@@ -31,7 +31,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  = event_comment_count(product)
+                  = comment_count(product)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user
diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim
index bc1a593d5a7..018c0a1756e 100644
--- a/app/views/reports/_report.html.slim
+++ b/app/views/reports/_report.html.slim
@@ -48,7 +48,7 @@
             .card-list-item-meta__items
               .card-list-item-meta__item
                 .a-meta
-                  = event_comment_count(report)
+                  = comment_count(report)
               .card-list-item-meta__item
                 .card-list-item__user-icons
                   = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user
diff --git a/app/views/reports/_report_header.html.slim b/app/views/reports/_report_header.html.slim
index f3281589da5..f29ea3acedc 100644
--- a/app/views/reports/_report_header.html.slim
+++ b/app/views/reports/_report_header.html.slim
@@ -42,7 +42,7 @@ header.page-content-header.is-report
           .page-content-header-metas__meta
             - if report.comments.any?
               a.a-meta(href='#comments')
-                = event_comment_count(report)
+                = comment_count(report)
 
     .page-content-header__row
       .page-content-header-actions
diff --git a/app/views/talks/_talk.html.slim b/app/views/talks/_talk.html.slim
index 0d88c74a010..840d63ec57a 100644
--- a/app/views/talks/_talk.html.slim
+++ b/app/views/talks/_talk.html.slim
@@ -17,7 +17,7 @@
                 .card-list-item-meta__items
                   .card-list-item-meta__item
                     .a-meta
-                      = event_comment_count(talk)
+                      = comment_count(talk)
                   .card-list-item-meta__item
                     .card-list-item__user-icons
                       = render partial: 'users/icon',
diff --git a/app/views/users/events/index.html.slim b/app/views/users/events/index.html.slim
index 0ff167b4a5e..1d5c2875de3 100644
--- a/app/views/users/events/index.html.slim
+++ b/app/views/users/events/index.html.slim
@@ -60,7 +60,7 @@
                           - if event.comments.any?
                             .card-list-item-meta__item
                               .a-meta
-                                = event_comment_count(event)
+                                = comment_count(event)
           .pagination
             = paginate @events
         - else
diff --git a/app/views/users/regular_events/index.html.slim b/app/views/users/regular_events/index.html.slim
index f895a0fa014..17ae63e8c77 100644
--- a/app/views/users/regular_events/index.html.slim
+++ b/app/views/users/regular_events/index.html.slim
@@ -59,7 +59,7 @@
                           - if event.comments.any?
                             .card-list-item-meta__item
                               .a-meta
-                                = event_comment_count(event)
+                                = comment_count(event)
           .pagination
             = paginate @regular_events
         - else

From def9e248be508b5102bbb1a7966b9819b957d6ca Mon Sep 17 00:00:00 2001
From: zecky1120 <takahide1120@gmail.com>
Date: Mon, 15 Jun 2026 15:34:58 +0900
Subject: [PATCH 20/20] =?UTF-8?q?N+1=E3=82=AF=E3=82=A8=E3=83=AA=E5=AF=BE?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 63413607521..4ed236ae670 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -14,7 +14,7 @@ class ReportsController < ApplicationController # rubocop:todo Metrics/ClassLeng
   before_action :set_watch, only: %i[show]
 
   def index
-    @reports = Report.list.page(params[:page]).per(PAGER_NUMBER)
+    @reports = Report.list.includes(:comments).page(params[:page]).per(PAGER_NUMBER)
     @reports = @reports.joins(:practices).where(practices: { id: params[:practice_id] }) if params[:practice_id].present?
   end