Release 2024-08-21 02:39:36 +0000

Gemfile.lock

@@ -133,7 +133,7 @@ GEM
     cocoon (1.2.15)
     coderay (1.1.3)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     countries (5.7.0)
       unaccent (~> 0.3)
@@ -162,7 +162,7 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.12.0)
-    et-orbi (1.2.7)
+    et-orbi (1.2.11)
       tzinfo
     event_emitter (0.2.6)
     event_stream_parser (0.3.0)
@@ -176,8 +176,8 @@ GEM
     faraday-net_http (3.0.2)
     ffi (1.16.3)
     foreman (0.87.2)
-    fugit (1.9.0)
-      et-orbi (~> 1, >= 1.2.7)
+    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)

app/controllers/admin/users_controller.rb

@@ -61,7 +61,7 @@ def user_params
       :twitter_account, :facebook_url, :blog_url,
       :password, :password_confirmation, :job,
       :organization, :os, :study_place,
-      :experience, :company_id,
+      { experiences: [] }, :company_id,
       :trainee, :job_seeking, :nda,
       :graduated_on, :retired_on, :free,
       :job_seeker, :github_collaborator,

app/controllers/articles_controller.rb

@@ -67,7 +67,8 @@ def set_article
   end
 
   def list_articles
-    articles = Article.with_attached_thumbnail.includes(user: { avatar_attachment: :blob }).order(created_at: :desc).page(params[:page])
+    articles = Article.with_attached_thumbnail.includes(user: { avatar_attachment: :blob })
+                      .order(published_at: :desc, created_at: :desc).page(params[:page])
     admin_or_mentor_login? ? articles : articles.where(wip: false)
   end
 

app/controllers/current_user_controller.rb

@@ -25,7 +25,7 @@ def user_params
       :github_account, :twitter_account, :facebook_url,
       :blog_url, :password, :password_confirmation,
       :job, :organization, :os,
-      :experience, :editor, :other_editor, :company_id,
+      { experiences: [] }, :editor, :other_editor, :company_id,
       :nda, :avatar, :trainee,
       :mail_notification, :job_seeker, :tag_list,
       :after_graduation_hope, :training_ends_on, :profile_image,

app/controllers/mentor/home_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class Mentor::HomeController < MentorController
-  def index; end
+  def index
+    @worried_users = User.delayed.order(completed_at: :asc)
+  end
 end

app/controllers/products_controller.rb

@@ -16,6 +16,7 @@ def show
     @practice = find_practice
     @learning = @product.learning # decoratorメソッド用にcontrollerでインスタンス変数化
     @tweet_url = @practice.tweet_url(practice_completion_url(@practice.id))
+    @recent_reports = Report.list.where(user_id: @product.user.id).limit(10)
     respond_to do |format|
       format.html
       format.md

app/controllers/reports_controller.rb

@@ -20,6 +20,7 @@ def index
 
   def show
     @products = @report.user.products.not_wip.order(published_at: :desc)
+    @recent_reports = Report.list.where(user_id: @report.user.id).limit(10)
     respond_to do |format|
       format.html
       format.md

app/controllers/retirement_controller.rb

@@ -14,15 +14,12 @@ def create
       user = current_user
       current_user.delete_and_assign_new_organizer
       Newspaper.publish(:retirement_create, { user: })
-      begin
-        UserMailer.retire(user).deliver_now
-      rescue Postmark::InactiveRecipientError => e
-        logger.warn "[Postmark] 受信者由来のエラーのためメールを送信できませんでした。：#{e.message}"
-      end
-
-      destroy_subscription
-      notify_to_admins
-      notify_to_mentors
+
+      destroy_subscription(user)
+      destroy_card(user)
+      notify_to_user(user)
+      notify_to_admins(user)
+      notify_to_mentors(user)
       logout
       redirect_to retirement_url
     else
@@ -37,19 +34,29 @@ def retire_reason_params
     params.require(:user).permit(:retire_reason, :satisfaction, :opinion, retire_reasons: [])
   end
 
-  def destroy_subscription
-    Subscription.new.destroy(current_user.subscription_id) if current_user.subscription_id
+  def destroy_subscription(user)
+    Subscription.new.destroy(user.subscription_id) if user.subscription_id?
+  end
+
+  def destroy_card(user)
+    Card.destroy_all(user.customer_id) if user.customer_id?
+  end
+
+  def notify_to_user(user)
+    UserMailer.retire(user).deliver_now
+  rescue Postmark::InactiveRecipientError => e
+    logger.warn "[Postmark] 受信者由来のエラーのためメールを送信できませんでした。：#{e.message}"
   end
 
-  def notify_to_admins
+  def notify_to_admins(user)
     User.admins.each do |admin_user|
-      ActivityDelivery.with(sender: current_user, receiver: admin_user).notify(:retired)
+      ActivityDelivery.with(sender: user, receiver: admin_user).notify(:retired)
     end
   end
 
-  def notify_to_mentors
+  def notify_to_mentors(user)
     User.mentor.each do |mentor_user|
-      ActivityDelivery.with(sender: current_user, receiver: mentor_user).notify(:retired)
+      ActivityDelivery.with(sender: user, receiver: mentor_user).notify(:retired)
     end
   end
 end

app/controllers/users_controller.rb

@@ -174,7 +174,7 @@ def user_params
       :github_account, :twitter_account,
       :facebook_url, :blog_url, :password,
       :password_confirmation, :job, :organization,
-      :os, :experience, :editor, :other_editor,
+      :os, { experiences: [] }, :editor, :other_editor,
       :company_id, :nda, :avatar,
       :trainee, :adviser, :job_seeker,
       :tag_list, :after_graduation_hope, :feed_url,

app/javascript/packs/application.js

@@ -60,12 +60,10 @@ import '../invitation-url-updater.js'
 import VueMounter from '../VueMounter.js'
 import Books from '../components/books.vue'
 import Questions from '../components/questions.vue'
-import WorriedUsers from '../components/worried-users.vue'
 import UsersAnswers from '../components/users-answers.vue'
 import User from '../components/user.vue'
 import Watches from '../components/watches.vue'
 import WatchToggle from '../components/watch-toggle.vue'
-import UserRecentReports from '../components/user-recent-reports.vue'
 import Footprints from '../components/footprints.vue'
 import QuestionAnswers from '../components/question-answers.vue'
 import SadReports from '../components/sad_reports.vue'
@@ -78,12 +76,10 @@ import '../stylesheets/application'
 const mounter = new VueMounter()
 mounter.addComponent(Books)
 mounter.addComponent(Questions)
-mounter.addComponent(WorriedUsers)
 mounter.addComponent(UsersAnswers)
 mounter.addComponent(User)
 mounter.addComponent(Watches)
 mounter.addComponent(WatchToggle)
-mounter.addComponent(UserRecentReports)
 mounter.addComponent(Footprints)
 mounter.addComponent(QuestionAnswers)
 mounter.addComponent(SadReports)

app/javascript/textarea-initializer.js

@@ -57,8 +57,8 @@ export default class {
         responseKey: 'url',
         csrfToken: CSRF.getToken(),
         placeholder: '%filenameをアップロード中...',
-        //  uploadImageTag:
-        //  '<img src=%url width="100" height="100" loading="lazy" decoding="async" alt="%filename">\n',
+        uploadImageTag:
+          '<img src=%url width="%width" height="%height" loading="lazy" decoding="async" alt="%filename">\n',
         afterPreview: () => {
           autosize.update(textarea)
 

app/models/card.rb

@@ -1,6 +1,23 @@
 # frozen_string_literal: true
 
 class Card
+  def self.all(customer_id)
+    Stripe::Customer.list_sources(customer_id)&.data || []
+  end
+
+  def self.destroy_all(customer_id)
+    all(customer_id).each do |card|
+      destroy(customer_id, card['id'])
+    end
+  end
+
+  def self.destroy(customer_id, card_id)
+    Stripe::Customer.delete_source(
+      customer_id,
+      card_id
+    )
+  end
+
   def create(user, card_token, idempotency_key = SecureRandom.uuid)
     Stripe::Customer.create({
                               email: user.email,

app/models/generation.rb

@@ -46,8 +46,6 @@ def target_users(target)
   end
 
   def count_classmates_by_target(target)
-    return classmates.students.count - classmates.hibernated.count if target == :students
-
     classmates.send(target).count
   end
 end