Release 2024-11-18 04:22:29 +0000

app/components/learnings/learning_component.html.slim

@@ -0,0 +1,17 @@
+.card-main-actions
+  ul.card-main-actions__items
+    - if submission?
+      li.card-main-actions__item
+        = link_to product_link, class: 'a-button is-sm is-primary is-block test-product' do
+          i.fa-solid.fa-file
+          | #{product_label}
+    - if @practice.completed?(@current_user)
+      li.card-main-actions__item
+        button.a-button.is-sm.is-secondary.is-block.is-disabled.test-completed
+          i.fa-solid.fa-check
+          | 修了しています
+    - else
+      li.card-main-actions__item
+        = button_tag type: 'button', class: 'a-button is-sm is-warning is-block', id: 'js-complete', data: { practice_id: @practice.id } do
+          i.fa-solid.fa-check
+          | 修了

app/components/learnings/learning_component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Learnings::LearningComponent < ViewComponent::Base
+  def initialize(practice:, current_user:)
+    @practice = practice
+    @current_user = current_user
+    @learning = Learning.find_or_initialize_by(
+      user_id: @current_user.id,
+      practice_id: @practice.id
+    )
+    @learning.status = :unstarted if @learning.new_record?
+    @product = @practice.product(@current_user)
+  end
+
+  def product_link
+    @product ? product_path(@product) : new_product_path(practice_id: @practice.id)
+  end
+
+  def product_label
+    @product ? '提出物へ' : '提出物を作る'
+  end
+
+  def submission?
+    @practice.submission
+  end
+end

app/controllers/admin/faq_categories/faqs_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Admin::FAQCategories::FaqsController < AdminController
+  before_action :set_faq_category, only: %i[index update]
+
+  def index
+    @faqs = @faq_category.faqs
+  end
+
+  def update
+    faq = @faq_category.faqs.find(params[:id])
+    faq.insert_at(params[:faq][:insert_at].to_i)
+    head :ok
+  end
+
+  private
+
+  def set_faq_category
+    @faq_category = FAQCategory.find(params[:faq_category_id])
+  end
+end

app/controllers/admin/faq_categories_controller.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class Admin::FAQCategoriesController < AdminController
+  before_action :set_faq_category, only: %i[edit update destroy]
+
+  def index
+    @faq_categories = FAQCategory.order(:created_at)
+  end
+
+  def new
+    @faq_category = FAQCategory.new
+  end
+
+  def create
+    @faq_category = FAQCategory.new(faq_category_params)
+
+    if @faq_category.save
+      redirect_to admin_faq_categories_path, notice: 'FAQカテゴリーを作成しました。'
+    else
+      render 'new'
+    end
+  end
+
+  def edit; end
+
+  def update
+    if params[:faq_category][:insert_at]
+      @faq_category.insert_at(params[:faq_category][:insert_at].to_i)
+      return head :ok
+    end
+
+    if @faq_category.update(faq_category_params)
+      redirect_to admin_faq_categories_path, notice: 'FAQカテゴリーを更新しました。'
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @faq_category.destroy
+    redirect_to admin_faq_categories_path, notice: 'FAQカテゴリーを削除しました。'
+  end
+
+  private
+
+  def faq_category_params
+    params.require(:faq_category).permit(:name, :insert_at)
+  end
+
+  def set_faq_category
+    @faq_category = FAQCategory.find(params[:id])
+  end
+end

app/controllers/admin/faqs_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class Admin::FaqsController < AdminController
+  before_action :set_faq, only: %i[show edit update destroy]
+  before_action :set_faq_category, only: %i[index edit new update create]
+
+  def index; end
+
+  def new
+    @faq = FAQ.new
+  end
+
+  def create
+    @faq = FAQ.new(faq_params)
+
+    if @faq.save
+      redirect_to admin_faqs_path, notice: 'FAQを作成しました。'
+    else
+      render 'new'
+    end
+  end
+
+  def show; end
+  def edit; end
+
+  def update
+    if @faq.update(faq_params)
+      redirect_to admin_faqs_path, notice: 'FAQを更新しました。'
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @faq.destroy
+    redirect_to admin_faqs_path, notice: 'FAQを削除しました。'
+  end
+
+  private
+
+  def faq_params
+    params.require(:faq).permit(:answer, :question, :faq_category_id)
+  end
+
+  def set_faq
+    @faq = FAQ.find(params[:id])
+  end
+
+  def set_faq_category
+    @faq_categories = FAQCategory.all
+  end
+end

app/controllers/api/products/checker_controller.rb

@@ -2,7 +2,14 @@
 
 class API::Products::CheckerController < API::BaseController
   before_action :require_mentor_login_for_api
-  before_action :set_product, only: %i[update destroy]
+  before_action :set_product, only: %i[show update destroy]
+
+  def show
+    render json: {
+      checker_id: @product.checker_id,
+      checker_name: @product.checker_name
+    }
+  end
 
   def update
     if @product.save_checker(params[:current_user_id])

app/controllers/books_controller.rb

@@ -4,7 +4,13 @@ class BooksController < ApplicationController
   before_action :set_book, only: %i[edit update destroy]
   before_action :require_admin_or_mentor_login, except: %i[index]
 
-  def index; end
+  def index
+    books = Book.all
+    books = params[:practice_id].present? ? books.joins(:practices).where(practices: { id: params[:practice_id] }) : books
+    @books = books.with_attached_cover
+                  .includes(:practices)
+                  .order(updated_at: :desc, id: :desc)
+  end
 
   def new
     @book = Book.new

app/controllers/companies/products_controller.rb

@@ -3,5 +3,12 @@
 class Companies::ProductsController < ApplicationController
   def index
     @company = Company.find(params[:company_id])
+    @products = Product.joins(user: :company)
+                       .includes(comments: :user)
+                       .where({ users: { company_id: @company.id } })
+                       .order(id: :asc)
+                       .page(params[:page])
+                       .per(50)
+    @commented_users = @products.map { |product| [product.id, product.comments.map(&:user)] }.to_h
   end
 end

app/controllers/companies/users_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Companies::UsersController < ApplicationController
+  PAGER_NUMBER = 24
+
   ALLOWED_TARGETS = %w[all student_and_trainee graduate adviser mentor admin].freeze
 
   def index
@@ -9,7 +11,10 @@ def index
     @company = Company.find(params[:company_id])
 
     target_users = User.users_role(@target, allowed_targets: ALLOWED_TARGETS)
-
-    @users = target_users.with_attached_avatar.where(company: @company).order(updated_at: :desc)
+    @users = target_users.with_attached_avatar
+                         .where(company: @company)
+                         .order(updated_at: :desc)
+                         .page(params[:page])
+                         .per(PAGER_NUMBER)
   end
 end

app/controllers/hibernation_controller.rb

@@ -18,6 +18,7 @@ def create
       destroy_subscription!
       notify_to_chat
       notify_to_mentors_and_admins
+      current_user.cancel_participation_from_regular_events
       current_user.delete_and_assign_new_organizer
       logout
       redirect_to hibernation_path

app/controllers/retirement_controller.rb

@@ -12,6 +12,7 @@ def create
     current_user.retired_on = Date.current
     if current_user.save(context: :retirement)
       user = current_user
+      current_user.cancel_participation_from_regular_events
       current_user.delete_and_assign_new_organizer
       Newspaper.publish(:retirement_create, { user: })
 

app/controllers/users/courses_controller.rb

@@ -7,7 +7,13 @@ class Users::CoursesController < ApplicationController
 
   def index
     @target = ALLOWED_TARGETS.include?(params[:target]) ? params[:target] : ALLOWED_TARGETS.first
-    course_names = Course.where(published: true).where(title: I18n.t("course_names.#{@target}")).pluck(:title)
+    course_names =
+      if @target == 'other_courses'
+        Course.where(published: false).pluck(:title)
+      else
+        Course.where(published: true).where(title: I18n.t("course_names.#{@target}")).pluck(:title)
+      end
+
     target_users = User.by_course(course_names).students_and_trainees
     @users = target_users
              .page(params[:page]).per(PAGER_NUMBER)

app/controllers/users/mail_notification_controller.rb

@@ -2,17 +2,28 @@
 
 class Users::MailNotificationController < ApplicationController
   skip_before_action :require_active_user_login, raise: false
+  before_action :set_user, only: %i[edit update]
+  before_action :validate_user_access, only: %i[edit update]
   layout 'not_logged_in'
 
-  def edit
+  def edit; end
+
+  def update
+    if @user.update(mail_notification: false)
+      redirect_to root_path, notice: 'メール配信を停止しました。'
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def set_user
     @user = User.find_by(unsubscribe_email_token: params[:token])
-    redirect_to root_path, notice: 'メール配信停止にはTOKENが必要です。' unless @user
   end
 
-  def update
-    user = User.find(params[:user_id])
-    user.mail_notification = false
-    user.save!
-    redirect_to root_path, notice: 'メール配信を停止しました。'
+  def validate_user_access
+    is_unauthorized_user_access = !@user || @user.id != params[:user_id].to_i
+    redirect_to root_path, alert: 'ユーザーIDもしくはTOKENが違います。' if is_unauthorized_user_access
   end
 end

app/controllers/welcome_controller.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require_dependency 'faq_category'
 class WelcomeController < ApplicationController
   skip_before_action :require_active_user_login, raise: false
   layout 'lp'
   DEFAULT_COURSE = 'Railsエンジニア'
+  FAQ_CATEGORY_NAME = '法人利用について'
 
   def index
     @mentors = current_user ? User.mentors_sorted_by_created_at : User.visible_sorted_mentors
@@ -15,9 +17,22 @@ def job_support; end
 
   def pricing; end
 
-  def faq; end
+  def faq
+    @faq_categories = FAQCategory.order(:position).select do |faq_category|
+      faq_category.faqs.present?
+    end
+
+    if params[:category].present?
+      faq_category = FAQCategory.find_by(name: params[:category])
+      @faqs = faq_category.faqs
+    else
+      @faqs = FAQ.order(:position)
+    end
+  end
 
-  def training; end
+  def training
+    @faqs = FAQCategory.find_by(name: FAQ_CATEGORY_NAME).faqs
+  end
 
   def practices; end
 

app/helpers/faq_helper.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module FAQHelper
+  def format_question(question)
+    "#{question.delete('?？')}？"
+  end
+end

app/javascript/comments.vue

@@ -294,6 +294,15 @@ export default {
       }
     },
     postComment() {
+      if (this.commentableType === 'Report' && this.isRole('mentor')) {
+        const notChecked = !this.checkId
+        if (
+          notChecked &&
+          !window.confirm('日報を確認済みにしていませんがよろしいですか？')
+        ) {
+          return
+        }
+      }
       this.createComment()
       if (this.isUnassignedAndUnchekedProduct) {
         this.checkProduct(