Q&Aページの未解決タブおよびグローバルメニューに表示する未解決質問数の表示にキャッシュを使う

Gemfile.lock

@@ -415,7 +415,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.17)
+    rack (2.2.18)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-dev-mark (0.8.0)

app/controllers/api/answers_controller.rb

@@ -30,7 +30,6 @@ def create
     @answer.user = current_user
     if @answer.save
       ActiveSupport::Notifications.instrument('answer.create', answer: @answer)
-      Newspaper.publish(:answer_save, { answer: @answer })
       render partial: 'questions/answer', locals: { question:, answer: @answer, user: current_user }, status: :created
     else
       head :bad_request
@@ -39,16 +38,20 @@ def create
 
   def update
     if @answer.update(answer_params)
-      Newspaper.publish(:answer_save, { answer: @answer })
       head :ok
     else
       head :bad_request
     end
   end
 
   def destroy
+    if @answer.is_a?(CorrectAnswer)
+      Newspaper.publish(:answer_destroy, {
+                          answer: @answer,
+                          action: "#{self.class.name}##{action_name}"
+                        })
+    end
     @answer.destroy
-    Newspaper.publish(:answer_destroy, { answer: @answer })
   end
 
   private

app/controllers/api/correct_answers_controller.rb

@@ -7,8 +7,11 @@ def create
     @answer = @question.answers.find(params[:answer_id])
     @answer.type = 'CorrectAnswer'
     if @answer.save
-      Newspaper.publish(:answer_save, { answer: @answer })
-      Newspaper.publish(:correct_answer_save, { answer: @answer })
+      Newspaper.publish(:answer_save, {
+                          answer: @answer,
+                          action: "#{self.class.name}##{action_name}"
+                        })
+      ActiveSupport::Notifications.instrument('correct_answer.save', answer: @answer)
       head :ok
     else
       head :bad_request
@@ -18,7 +21,10 @@ def create
   def update
     answer = @question.answers.find(params[:answer_id])
     answer.update!(type: '')
-    Newspaper.publish(:answer_save, { answer: @answer })
+    Newspaper.publish(:answer_save, {
+                        answer:,
+                        action: "#{self.class.name}##{action_name}"
+                      })
   end
 
   private

app/controllers/comeback_controller.rb

@@ -12,7 +12,7 @@ def create
     if @user
       if @user&.hibernated?
         @user.comeback!
-        Newspaper.publish(:comeback_update, { user: @user })
+        ActiveSupport::Notifications.instrument('comeback.update', user: @user)
         @user.create_comebacked_comment
         redirect_to root_url, notice: '休会から復帰しました。'
       else

app/controllers/events_controller.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 class EventsController < ApplicationController
+  PAGER_NUMBER = 20
+
   before_action :set_event, only: %i[edit update destroy]
 
   def index
+    @events = Event.with_avatar.includes(:comments, :users).order(start_at: :desc).page(params[:page]).per(PAGER_NUMBER)
     @upcoming_events_groups = UpcomingEvent.upcoming_events_groups
   end
 

app/controllers/graduation_controller.rb

@@ -9,7 +9,7 @@ class GraduationController < ApplicationController
   def update
     if @user.update(graduated_on: Date.current)
       Subscription.new.destroy(@user.subscription_id) if @user.subscription_id
-      Newspaper.publish(:graduation_update, { user: @user })
+      ActiveSupport::Notifications.instrument('graduation.update', user: @user)
       redirect_to @redirect_url, notice: 'ユーザー情報を更新しました。'
     else
       redirect_to @redirect_url, alert: 'ユーザー情報の更新に失敗しました'

app/controllers/reports/unchecked_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Reports::UncheckedController < ApplicationController
+  PAGER_NUMBER = 25
+  before_action :require_admin_or_mentor!
+
+  def index
+    @reports = Report.list.page(params[:page]).per(PAGER_NUMBER)
+    @reports = @reports.unchecked.not_wip
+    render 'reports/index'
+  end
+
+  private
+
+  def require_admin_or_mentor!
+    redirect_to reports_path unless admin_or_mentor_login?
+  end
+end

app/controllers/reports_controller.rb

@@ -16,7 +16,6 @@ class ReportsController < ApplicationController # rubocop:todo Metrics/ClassLeng
   def index
     @reports = Report.list.page(params[:page]).per(PAGER_NUMBER)
     @reports = @reports.joins(:practices).where(practices: { id: params[:practice_id] }) if params[:practice_id].present?
-    @reports = @reports.unchecked.not_wip if params[:unchecked].present? && admin_or_mentor_login?
   end
 
   def show

app/helpers/meta_tags_helper.rb

@@ -7,7 +7,7 @@ def default_meta_tags
       site: 'FBC',
       reverse: true,
       charset: 'utf-8',
-      description: '月額29,800円、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。',
+      description: '月額32,780円（税込）、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。',
       viewport: 'width=device-width, initial-scale=1.0',
       og: {
         title: :title,
@@ -31,7 +31,7 @@ def default_meta_tags
   def welcome_meta_tags
     default_meta_tags.deep_merge({
                                    title:,
-                                   description: '月額29,800円、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。',
+                                   description: '月額32,780円（税込）、全機能が使えるお試し期間付き。FBCは現場の即戦力になるためのスキルとプログラミングの楽しさを伝える、現役ソフトウェアエンジニアが考える理想のプログラミングスクールの実現に励んでいます。',
                                    og: {
                                      title: title || 'FJORD BOOT CAMP（フィヨルドブートキャンプ）',
                                      description: :description

app/javascript/initializeAnswer.js

@@ -115,7 +115,6 @@ export default function initializeAnswer(answer) {
       if (window.confirm('本当に宜しいですか？')) {
         deleteAnswer(answerId)
         if (answerBadgeElement.classList.contains('correct-answer')) {
-          cancelBestAnswer(answerId, questionId)
           const otherCancelBestAnswerButtons = document.querySelectorAll(
             '.make-best-answer-button'
           )

app/javascript/markdown-initializer.js

@@ -12,7 +12,6 @@ import MarkDownItContainerMessage from 'markdown-it-container-message'
 import MarkDownItContainerDetails from 'markdown-it-container-details'
 import MarkDownItLinkAttributes from 'markdown-it-link-attributes'
 import MarkDownItContainerSpeak from 'markdown-it-container-speak'
-import MarkdownItPurifier from 'markdown-it-purifier'
 import ReplaceLinkToCard from 'replace-link-to-card'
 import MarkDownItContainerFigure from 'markdown-it-container-figure'
 import MarkdownItVimeo from 'markdown-it-vimeo'
@@ -62,7 +61,6 @@ export default class {
     md.use(MarkDownItContainerFigure)
     md.use(MarkdownItVimeo)
     md.use(MarkdownItYoutube)
-    md.use(MarkdownItPurifier)
     return md.render(text)
   }
 }

app/javascript/stylesheets/lp/blocks/lp/_lp-price.sass

@@ -9,20 +9,22 @@
     font-size: .875rem
   +media-breakpoint-down(sm)
     font-size: .5625rem
+  &.is-total
+    gap: .25em
   &.is-sm
     justify-content: flex-start
     +media-breakpoint-up(lg)
       font-size: .5625em
       .lp-price__tax
-        font-size: 1rem
+        font-size: 1.5rem
     +media-breakpoint-only(md)
       font-size: .5em
       .lp-price__tax
-        font-size: .875rem
+        font-size: 1rem
     +media-breakpoint-down(sm)
       font-size: .375em
       .lp-price__tax
-        font-size: .75rem
+        font-size: .875rem
 
 .lp-price__label
   +text-block(1.25em 1, 700)
@@ -40,6 +42,7 @@
   display: flex
   align-self: baseline
   gap: .5em
+  flex-wrap: wrap
 
 .lp-price__amount
   +text-block(6.25em 1, 900)
@@ -51,14 +54,28 @@
   align-self: baseline
 
 .lp-price__details
-  +text-block(1.25em 1, 800)
+  +text-block(2.25em 1, 800)
   display: flex
   align-self: baseline
   gap: .125em
 
 .lp-price__separator
   font-weight: 100
+  align-self: baseline
+
+.lp-price__per-person
+  align-self: baseline
+
+.lp-price__tax
+  font-size: 1.25em
+  align-self: baseline
+
+.lp-price__total-value
+  display: flex
+  align-self: baseline
+  gap: .25em
+  font-size: 1.5em
+  font-weight: 600
 
 .lp-price-note
-  +media-breakpoint-down(sm)
-    font-size: .75rem
+  line-height: 1.4

app/javascript/stylesheets/lp/layouts/_l-cards.sass

@@ -35,6 +35,6 @@
 
 .l-cards__item-inner
   flex: 0 0 40rem
-  max-width: 100%
+  max-width: calc(100vw - 2rem)
   .a-card
     margin-inline: 0

app/javascript/textarea-initializer.js

@@ -17,7 +17,6 @@ import CSRF from 'csrf'
 import TextareaMarkdownLinkify from 'textarea-markdown-linkify'
 import ReplaceLinkToCard from 'replace-link-to-card'
 import MarkDownItContainerFigure from 'markdown-it-container-figure'
-import MarkdownItPurifier from 'markdown-it-purifier'
 import MarkdownItVimeo from 'markdown-it-vimeo'
 import MarkdownItYoutube from 'markdown-it-youtube'
 
@@ -90,8 +89,7 @@ export default class {
           MarkDownItContainerSpeak,
           MarkDownItContainerFigure,
           MarkdownItVimeo,
-          MarkdownItYoutube,
-          MarkdownItPurifier
+          MarkdownItYoutube
         ],
         markdownOptions: MarkdownOption
       })

app/models/announcement.rb

@@ -7,6 +7,7 @@ class Announcement < ApplicationRecord
   include Reactionable
   include WithAvatar
   include Watchable
+  include Bookmarkable
 
   enum target: {
     all: 0,

app/models/answer_cache_destroyer.rb

@@ -3,6 +3,8 @@
 class AnswerCacheDestroyer
   def call(payload)
     _answer = payload[:answer]
+    action = payload[:action]
     Cache.delete_not_solved_question_count
+    Rails.logger.info "[AnswerCacheDestroyer] #{action} Cache destroyed for unsolved question count."
   end
 end

app/models/cache.rb

@@ -54,7 +54,8 @@ def delete_self_assigned_no_replied_product_count(user_id)
 
     def not_solved_question_count
       Rails.cache.fetch 'not_solved_question_count' do
-        Question.not_solved.count
+        Rails.logger.info '[CACHE MISS] Executing DB query for not_solved_question_count'
+        Question.not_solved.not_wip.count
       end
     end
 

app/models/comeback_notifier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ComebackNotifier
-  def call(payload)
+  def call(_name, _started, _finished, _unique_id, payload)
     user = payload[:user]
     User.admins_and_mentors.each do |admin_or_mentor|
       ActivityDelivery.with(sender: user, receiver: admin_or_mentor).notify(:comebacked)

app/models/correct_answer_notifier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CorrectAnswerNotifier
-  def call(payload)
+  def call(_name, _started, _finished, _unique_id, payload)
     answer = payload[:answer]
     notify_correct_answer(answer)
     notify_to_chat(answer)

app/models/graduation_notifier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class GraduationNotifier
-  def call(payload)
+  def call(_name, _started, _finished, _unique_id, payload)
     user = payload[:user]
     User.mentor.each do |mentor|
       ActivityDelivery.with(sender: user, receiver: mentor).notify(:graduated)

app/models/grass.rb

@@ -1,45 +1,7 @@
 # frozen_string_literal: true
 
 class Grass
-  # rubocop:disable Metrics/MethodLength
   def self.times(user, end_date)
-    start_date = end_date.prev_year.sunday
-    sql = <<~SQL
-      WITH series AS (
-        SELECT
-          date
-        FROM
-          generate_series(:start_date::DATE, :end_date, '1 day') AS series(date)
-        ),
-        summary AS (
-          SELECT
-            reported_on AS date,
-            EXTRACT(epoch FROM SUM(finished_at - started_at)) / 60 / 60 AS total_hour
-          FROM
-            learning_times JOIN reports ON learning_times.report_id = reports.id
-          WHERE
-            reports.user_id = :user_id
-          GROUP BY
-            reported_on
-          ORDER BY
-            reported_on
-        )
-      SELECT
-        series.date AS date,
-        CASE
-          WHEN summary.total_hour > 6 THEN 4
-          WHEN 6 >= summary.total_hour AND summary.total_hour > 4 THEN 3
-          WHEN 4 >= summary.total_hour AND summary.total_hour > 2 THEN 2
-          WHEN 2 >= summary.total_hour AND summary.total_hour > 0 THEN 1
-          ELSE 0
-        END AS velocity
-      FROM
-        series
-      LEFT JOIN
-        summary ON series.date = summary.date
-    SQL
-
-    LearningTime.find_by_sql([sql, { start_date:, end_date:, user_id: user.id }])
+    GrassLearningTimeQuery.call(user, end_date)
   end
-  # rubocop:enable Metrics/MethodLength
 end