concernを使用して共通化

fjordllc · Oct 26, 2022 · 543bcdb · 543bcdb
1 parent d6a69cb
commit 543bcdb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/app/models/check_box.rb b/app/models/check_box.rb
@@ -6,11 +6,7 @@ class CheckBox < ApplicationRecord
   has_many :check_box_choices, dependent: :destroy
   accepts_nested_attributes_for :check_box_choices, allow_destroy: true
   validates_associated :check_box_choices
-  before_save do
-    columns = %i[title_of_reason description_of_reason]
-    normalize_blank!(columns)
-  end
-
+  before_save :normalize_blank_check_box_and_radio_button!
   with_options if: -> { survey_question.format == 'check_box' }, presence: true do
     validates :check_box_choices
     validates :title_of_reason

diff --git a/app/models/check_box_choice.rb b/app/models/check_box_choice.rb
@@ -3,10 +3,7 @@
 class CheckBoxChoice < ApplicationRecord
   include SurveyQuestionFormat
   belongs_to :check_box
-  before_save do
-    columns = %i[choices]
-    normalize_blank!(columns)
-  end
+  before_save :normalize_blank_check_box_choice_and_radio_button_choice!
 
   validates :choices, presence: true, if: -> { check_box.survey_question.format == 'check_box' }
 end
diff --git a/app/models/concerns/survey_question_format.rb b/app/models/concerns/survey_question_format.rb
@@ -3,7 +3,22 @@
 module SurveyQuestionFormat
   extend ActiveSupport::Concern
 
-  def normalize_blank!(columns)
+  def normalize_blank_check_box_and_radio_button!
+    columns = %i[title_of_reason description_of_reason]
+    columns.each do |column|
+      self[column] = nil if self[column].blank?
+    end
+  end
+
+  def normalize_blank_check_box_choice_and_radio_button_choice!
+    columns = %i[choices]
+    columns.each do |column|
+      self[column] = nil if self[column].blank?
+    end
+  end
+
+  def normalize_blank_linear_scale!
+    columns = %i[first last title_of_reason description_of_reason]
     columns.each do |column|
       self[column] = nil if self[column].blank?
     end

diff --git a/app/models/linear_scale.rb b/app/models/linear_scale.rb
@@ -3,10 +3,7 @@
 class LinearScale < ApplicationRecord
   include SurveyQuestionFormat
   belongs_to :survey_question
-  before_save do
-    columns = %i[first last title_of_reason description_of_reason]
-    normalize_blank!(columns)
-  end
+  before_save :normalize_blank_linear_scale!
 
   with_options if: -> { survey_question.format == 'linear_scale' }, presence: true do
     validates :first

diff --git a/app/models/radio_button.rb b/app/models/radio_button.rb
@@ -6,10 +6,7 @@ class RadioButton < ApplicationRecord
   has_many :radio_button_choices, dependent: :destroy
   accepts_nested_attributes_for :radio_button_choices, allow_destroy: true
   validates_associated :radio_button_choices
-  before_save do
-    columns = %i[title_of_reason description_of_reason]
-    normalize_blank!(columns)
-  end
+  before_save :normalize_blank_check_box_and_radio_button!
 
   with_options if: -> { survey_question.format == 'radio_button' }, presence: true do
     validates :radio_button_choices

diff --git a/app/models/radio_button_choice.rb b/app/models/radio_button_choice.rb
@@ -3,10 +3,7 @@
 class RadioButtonChoice < ApplicationRecord
   include SurveyQuestionFormat
   belongs_to :radio_button
-  before_save do
-    columns = %i[choices]
-    normalize_blank!(columns)
-  end
+  before_save :normalize_blank_check_box_choice_and_radio_button_choice!
 
   validates :choices, presence: true, if: -> { radio_button.survey_question.format == 'radio_button' }
 end