fjordllc · komagata · Dec 1, 2022 · Nov 11, 2022 · Nov 12, 2022 · Nov 9, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,15 +2,18 @@ version: 2.1
 
 orbs:
   ruby: circleci/[email protected]
-  node: circleci/[email protected].2
-  browser-tools: circleci/browser-tools@1.3.0
+  node: circleci/[email protected].3
+  browser-tools: circleci/browser-tools@1.4.0
 jobs:
   build:
     docker:
       - image: cimg/ruby:3.1.0-node
     steps:
       - checkout
       - ruby/install-deps
+      - node/install:
+          install-yarn: true
+          node-version: '16.13.0'
       - node/install-packages:
           pkg-manager: yarn
   check:
@@ -28,6 +31,9 @@ jobs:
       - run:
           name: Traceroute
           command: FAIL_ON_ERROR=1 bundle exec rake traceroute
+      - node/install:
+          install-yarn: true
+          node-version: '16.13.0'
       - node/install-packages:
           pkg-manager: yarn
       - run:
@@ -58,6 +64,9 @@ jobs:
       - browser-tools/install-chromedriver
       - checkout
       - ruby/install-deps
+      - node/install:
+          install-yarn: true
+          node-version: '16.13.0'
       - node/install-packages:
           pkg-manager: yarn
       - run:
@@ -76,8 +85,7 @@ jobs:
       - store_test_results:
           path: test/reports
       - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
+          path: tmp/screenshots
 workflows:
   build_and_test:
     jobs:

diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,17 @@
+## Issue
+
+- Issue番号
+
+## 概要
+
+## 変更確認方法
+
+1. {branch_name}をローカルに取り込む
+2. 
+
+## Screenshot
+
+### 変更前
+
+### 変更後
+
diff --git a/app/assets/images/banners/ima1zumi.svg b/app/assets/images/banners/ima1zumi.svg
diff --git a/app/assets/images/banners/rubykaigi_2022.png b/app/assets/images/banners/rubykaigi_2022.png
diff --git a/app/assets/images/help/feed-url.png b/app/assets/images/help/feed-url.png
diff --git a/app/assets/stylesheets/atoms/_a-short-text.sass b/app/assets/stylesheets/atoms/_a-short-text.sass
@@ -9,7 +9,8 @@
     border: none
     border-top: dashed 1px $border
     +margin(vertical, 1.25em)
-  &.is-ta-center
+  &.is-ta-center,
+  .is-ta-center
     text-align: center
   &.is-sm
     font-size: .8125rem
diff --git a/app/controllers/api/comments_controller.rb b/app/controllers/api/comments_controller.rb
@@ -6,6 +6,8 @@ class API::CommentsController < API::BaseController
 
   def index
     if params[:commentable_type].present?
+      return if commentable.comments.nil?
+
       @comments = commentable.comments.order(created_at: :desc)
       @comment_total_count = @comments.size
       @comments = @comments.limit(params[:comment_limit])

diff --git a/app/controllers/current_user_controller.rb b/app/controllers/current_user_controller.rb
@@ -31,7 +31,8 @@ def user_params
       :nda, :avatar, :trainee,
       :mail_notification, :job_seeker, :tag_list,
       :after_graduation_hope, :training_ends_on, :profile_image,
-      :profile_name, :profile_job, :profile_text, { authored_books_attributes: %i[id title url cover _destroy] }
+      :profile_name, :profile_job, :profile_text, { authored_books_attributes: %i[id title url cover _destroy] },
+      :feed_url
     ]
     user_attribute.push(:retired_on, :graduated_on, :free, :github_collaborator) if current_user.admin?
     params.require(:user).permit(user_attribute)

diff --git a/app/controllers/scheduler/daily_controller.rb b/app/controllers/scheduler/daily_controller.rb
@@ -6,6 +6,7 @@ def show
     notify_certain_period_passed_after_retirement
     notify_tomorrow_regular_event
     notify_product_review_not_completed
+    Question.notify_certain_period_passed_after_last_answer
     head :ok
   end
 

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -150,7 +150,7 @@ def user_params
       :os, :experience, :prefecture_code,
       :company_id, :nda, :avatar,
       :trainee, :adviser, :job_seeker,
-      :tag_list, :after_graduation_hope
+      :tag_list, :after_graduation_hope, :feed_url
     )
   end
 

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -4,7 +4,7 @@ class WelcomeController < ApplicationController
   layout 'welcome'
 
   def index
-    @mentors = User.with_attached_profile_image.mentor.includes(authored_books: { cover_attachment: :blob })
+    @mentors = User.mentors_sorted_by_created_at
   end
 
   def pricing; end

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
@@ -193,4 +193,12 @@ def update_regular_event
     subject = "[FBC] 定期イベント【#{@regular_event.title}】が更新されました。"
     mail to: @user.email, subject: subject
   end
+
+  # required params: question, receiver
+  def no_correct_answer
+    @user = @receiver
+    @notification = @user.notifications.find_by(link: "/questions/#{@question.id}", kind: Notification.kinds[:no_correct_answer])
+    subject = "[FBC] #{@user.login_name}さんの質問【 #{@question.title} 】のベストアンサーがまだ選ばれていません。"
+    mail to: @user.email, subject: subject
+  end
 end
diff --git a/app/models/answer.rb b/app/models/answer.rb
@@ -23,4 +23,8 @@ def receiver
   def path
     Rails.application.routes.url_helpers.polymorphic_path(question, anchor: anchor)
   end
+
+  def certain_period_has_passed?
+    created_at.since(1.week).to_date == Date.current
+  end
 end
diff --git a/app/models/authored_book.rb b/app/models/authored_book.rb
@@ -9,4 +9,6 @@ class AuthoredBook < ApplicationRecord
                       in: %w[image/png image/jpg image/jpeg image/gif],
                       message: 'はPNG, JPG, GIF形式にしてください'
                     }
+
+  scope :sorted, -> { order(created_at: :desc) }
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
@@ -37,7 +37,8 @@ class Notification < ApplicationRecord
     graduated: 18,
     hibernated: 19,
     signed_up: 20,
-    regular_event_updated: 21
+    regular_event_updated: 21,
+    no_correct_answer: 22
   }
 
   scope :unreads, -> { where(read: false) }

diff --git a/app/models/notification_facade.rb b/app/models/notification_facade.rb
@@ -229,4 +229,14 @@ def self.update_regular_event(regular_event, receiver)
       receiver: receiver
     ).update_regular_event.deliver_later(wait: 5)
   end
+
+  def self.no_correct_answer(question, receiver)
+    ActivityNotifier.with(question: question, receiver: receiver).no_correct_answer.notify_now
+    return unless receiver.mail_notification? && !receiver.retired?
+
+    NotificationMailer.with(
+      question: question,
+      receiver: receiver
+    ).no_correct_answer.deliver_later(wait: 5)
+  end
 end
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -34,6 +34,28 @@ class Question < ApplicationRecord
 
   mentionable_as :description
 
+  class << self
+    def notify_certain_period_passed_after_last_answer
+      return if Question.not_solved_and_certain_period_has_passed.blank?
+
+      Question.not_solved_and_certain_period_has_passed.each do |not_solved_question|
+        NotificationFacade.no_correct_answer(not_solved_question, not_solved_question.user)
+      end
+    end
+
+    def not_solved_and_certain_period_has_passed
+      not_solved.select do |not_solved_question|
+        next if not_solved_question.answers.empty?
+
+        not_solved_question.last_answer.certain_period_has_passed?
+      end
+    end
+  end
+
+  def last_answer
+    answers.max_by(&:created_at)
+  end
+
   private
 
   def will_be_published?

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -154,6 +154,13 @@ class User < ApplicationRecord
               message: 'はDiscordのチャンネルURLを入力してください'
             }
 
+  validates :feed_url,
+            format: {
+              allow_blank: true,
+              with: URI::DEFAULT_PARSER.make_regexp(%w[http https]),
+              message: 'は「http://example.com」や「https://example.com」のようなURL形式で入力してください'
+            }
+
   validates :login_name, exclusion: { in: RESERVED_LOGIN_NAMES, message: 'に使用できない文字列が含まれています' }
 
   validates :avatar, attached: false,
@@ -285,6 +292,12 @@ class User < ApplicationRecord
   }
   scope :year_end_party, -> { where(retired_on: nil) }
   scope :mentor, -> { where(mentor: true) }
+  scope :mentors_sorted_by_created_at, lambda {
+    with_attached_profile_image
+      .mentor
+      .includes(authored_books: { cover_attachment: :blob })
+      .order(:created_at)
+  }
   scope :working, lambda {
     active.where(
       adviser: false,

diff --git a/app/notifiers/activity_notifier.rb b/app/notifiers/activity_notifier.rb
@@ -322,4 +322,19 @@ def update_regular_event(params = {})
       read: false
     )
   end
+
+  def no_correct_answer(params = {})
+    params.merge!(@params)
+    question = params[:question]
+    receiver = params[:receiver]
+
+    notification(
+      body: "Q&A「#{question.title}」のベストアンサーがまだ選ばれていません。",
+      kind: :no_correct_answer,
+      receiver: receiver,
+      sender: question.sender,
+      link: Rails.application.routes.url_helpers.polymorphic_path(question),
+      read: false
+    )
+  end
 end
diff --git a/app/views/application/_user_menu.html.slim b/app/views/application/_user_menu.html.slim
@@ -17,9 +17,10 @@
     li.header-dropdown__item
       = link_to logout_path, class: 'header-dropdown__item-link' do
         | ログアウト
-    li.header-dropdown__item
-      = link_to new_hibernation_path, class: 'header-dropdown__item-link' do
-        | 休会手続き
+    - if current_user.student_or_trainee_or_retired?
+        li.header-dropdown__item
+          = link_to new_hibernation_path, class: 'header-dropdown__item-link' do
+            | 休会手続き
     li.header-dropdown__item
       = link_to new_retirement_path, class: 'header-dropdown__item-link' do
         | 退会手続き
diff --git a/app/views/current_user/products/index.html.slim b/app/views/current_user/products/index.html.slim
@@ -5,6 +5,17 @@ header.page-header
     .page-header__inner
       h2.page-header__title
         | ダッシュボード
+      .page-header-actions
+        .page-header-actions__items
+          .page-header-actions__item
+            = link_to current_user, class: 'a-button is-md is-secondary is-block' do
+              i.fa-solid.fa-user
+              | マイプロフィール
+          - unless current_user.adviser?
+            .page-header-actions__item
+              = link_to new_report_path, class: 'a-button is-md is-secondary is-block' do
+                i.fa-regular.fa-plus
+                | 日報作成
 
 = render 'home/page_tabs', user: @user
 

diff --git a/app/views/current_user/watches/index.html.slim b/app/views/current_user/watches/index.html.slim
@@ -5,6 +5,17 @@ header.page-header
     .page-header__inner
       h2.page-header__title
         | ダッシュボード
+      .page-header-actions
+        .page-header-actions__items
+          .page-header-actions__item
+            = link_to current_user, class: 'a-button is-md is-secondary is-block' do
+              i.fa-solid.fa-user
+              | マイプロフィール
+          - unless current_user.adviser?
+            .page-header-actions__item
+              = link_to new_report_path, class: 'a-button is-md is-secondary is-block' do
+                i.fa-regular.fa-plus
+                | 日報作成
 
 = render 'home/page_tabs', user: @user
 

diff --git a/app/views/events/index.html.slim b/app/views/events/index.html.slim
@@ -11,6 +11,10 @@ header.page-header
             = link_to new_event_path, class: 'a-button is-md is-secondary is-block' do
               i.fa-regular.fa-plus
               | イベント作成
+          .page-header-actions__item
+            = link_to new_regular_event_path, class: 'a-button is-md is-secondary is-block' do
+              i.fa-regular.fa-plus
+              | 定期イベント作成
 
 = render 'events/tabs'
 

diff --git a/app/views/notification_mailer/no_correct_answer.html.slim b/app/views/notification_mailer/no_correct_answer.html.slim
@@ -0,0 +1 @@
+= render 'notification_mailer_template', title: "#{@user.login_name}さんの質問【 #{@question.title} 】のベストアンサーがまだ選ばれていません。", link_url: notification_url(@notification), link_text: "#{@user.login_name}さんの質問へ"
diff --git a/app/views/users/_form.html.slim b/app/views/users/_form.html.slim
@@ -18,7 +18,8 @@
     = render 'users/form/description', f: f, user: user
     = render 'users/form/tags', f: f, user: user
     - unless user.adviser?
-      = render 'users/form/after_graduation_hope', f: f, user: user
+      - unless user.mentor?
+        = render 'users/form/after_graduation_hope', f: f, user: user
       = render 'users/form/job', f: f
       = render 'users/form/os', f: f
       = render 'users/form/prefecture', f: f

diff --git a/app/views/users/form/_sns.html.slim b/app/views/users/form/_sns.html.slim
@@ -59,6 +59,18 @@
   .a-form-help
     p URL を入力。
 
+.form-item
+  = f.label :feed_url, class: 'a-form-label'
+  = f.text_field :feed_url, class: 'a-text-input', placeholder: 'https://docs.komagata.org/rss'
+  .a-form-help
+    p
+      | RSS ・ Atom の URL を入力。
+      label.a-form-help-link.is-danger(for='modal-feed-url')
+        span.a-form-help-link__label
+          | 調べ方
+        span.a-help
+          i.fa-solid.fa-question
+
 = render '/shared/modal', id: 'modal-discord-account', modal_title: 'Discord のアカウントの調べ方'
   .modal__description.is-md
     .a-short-text
@@ -79,3 +91,16 @@
         | 自分の分報チャンネルが開かれた状態で、ブラウザのアドレスバーに表示されている URL をコピーしてください。
       p
         = image_tag('help/discord-channel-url.png', alt: '分報チャンネルの URL の調べ方')
+
+= render '/shared/modal', id: 'modal-feed-url', modal_title: 'フィード URL の調べ方'
+  .modal__description.is-md
+    .a-short-text
+      p
+        = link_to 'https://berss.com/feed/', target: '_blank', rel: 'noopener noreferrer' do
+          | RSSフィード取得・検出ツール – RSSリスティング
+        | このページにアクセス。
+      p
+        | 自分のブログの URL (記事の URL ではなく、トップページ)を入力し、「検索スタートをクリック」。
+      p.is-ta-center
+        = link_to 'https://berss.com/feed/', target: '_blank', rel: 'noopener noreferrer' do
+          = image_tag('help/feed-url.png', alt: 'フィード URL の調べ方', width: '300')
diff --git a/app/views/welcome/_mentor.html.slim b/app/views/welcome/_mentor.html.slim
@@ -33,7 +33,7 @@ section.welcome-member.a-card
   - if mentor.authored_books.present?
     .welcome-member-books
       ul.welcome-member-books__items
-        - mentor.authored_books.each do |authored_book|
+        - mentor.authored_books.sorted.each do |authored_book|
           - if authored_book.cover.attached?
             li.welcome-member-books__item
               = link_to authored_book.url, target: :_blank, rel: 'noopener noreferrer', class: 'welcome-member-books__item-link' do

diff --git a/app/views/welcome/index.html.slim b/app/views/welcome/index.html.slim
@@ -5,13 +5,6 @@
 
 = render 'welcome/main_visual'
 
-.welcome-sections
-  .home-banners.welcome-section.has-no-padding-bottom
-    .container.is-md
-      .home-banners__inner
-        = link_to 'https://bootcamp.fjord.jp/articles/50', rel: 'noopener', target: 'blank' do
-          = image_tag 'banners/rubykaigi_2022.png'
-
 .welcome-sections
   = render 'welcome/campaign' if Campaign.today_campaign?
   = render 'welcome/about'