Make questions publicable

ferblape · ferblape · commit b8b38c80840a · 2021-05-14T10:06:27.000+02:00
diff --git a/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb b/decidim-forms/app/commands/decidim/forms/admin/update_questionnaire.rb
@@ -49,7 +49,8 @@ def update_questionnaire_question(form_question)
             mandatory: form_question.mandatory,
             question_type: form_question.question_type,
             max_choices: form_question.max_choices,
-            max_characters: form_question.max_characters
+            max_characters: form_question.max_characters,
+            published_at: Time.current
           }
 
           update_nested_model(form_question, question_attributes, @questionnaire.questions) do |question|
diff --git a/decidim-forms/app/models/decidim/forms/question.rb b/decidim-forms/app/models/decidim/forms/question.rb
@@ -5,6 +5,7 @@ module Forms
     # The data store for a Question in the Decidim::Forms component.
     class Question < Forms::ApplicationRecord
       include Decidim::TranslatableResource
+      include Decidim::Publicable
 
       QUESTION_TYPES = %w(short_answer long_answer single_option multiple_option sorting files matrix_single matrix_multiple).freeze
       SEPARATOR_TYPE = "separator"
diff --git a/decidim-forms/db/migrate/20210513094440_add_published_at_to_decidim_questions.rb b/decidim-forms/db/migrate/20210513094440_add_published_at_to_decidim_questions.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddPublishedAtToDecidimQuestions < ActiveRecord::Migration[5.2]
+  class Question < ApplicationRecord
+    self.table_name = :decidim_forms_questions
+  end
+
+  def change
+    add_column :decidim_forms_questions, :published_at, :datetime, index: true
+
+    Question.reset_column_information
+
+    Question.find_each do |question|
+      question.published_at = Time.current
+      question.save!
+    end
+  end
+end
diff --git a/decidim-forms/lib/decidim/forms/test/factories.rb b/decidim-forms/lib/decidim/forms/test/factories.rb
@@ -49,6 +49,7 @@
     end
     mandatory { false }
     position { 0 }
+    published_at { Time.current }
     question_type { Decidim::Forms::Question::TYPES.first }
     questionnaire
 
diff --git a/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb b/decidim-forms/spec/commands/decidim/forms/admin/update_questionnaire_spec.rb
@@ -239,27 +239,30 @@ module Admin
             expect(questionnaire.questions[1].description["en"]).to eq(form_params["questions"]["1"]["description"]["en"])
             expect(questionnaire.questions[1].question_type).to eq("long_answer")
             expect(questionnaire.questions[1].max_characters).to eq(100)
-            expect(questionnaire.questions[2].answer_options[1]["body"]["en"]).to eq(form_params["questions"]["2"]["answer_options"]["1"]["body"]["en"])
+            expect(questionnaire.questions[1].published_at).not_to be_nil
 
             expect(questionnaire.questions[2].question_type).to eq("single_option")
             expect(questionnaire.questions[2].max_choices).to be_nil
             expect(questionnaire.questions[2].max_characters).to eq(0)
-
-            expect(questionnaire.questions[3].question_type).to eq("multiple_option")
+            expect(questionnaire.questions[2].answer_options[1]["body"]["en"]).to eq(form_params["questions"]["2"]["answer_options"]["1"]["body"]["en"])
+            expect(questionnaire.questions[2].published_at).not_to be_nil
             expect(questionnaire.questions[2].answer_options[0].free_text).to eq(false)
             expect(questionnaire.questions[2].max_choices).to be_nil
 
             expect(questionnaire.questions[3].question_type).to eq("multiple_option")
             expect(questionnaire.questions[3].answer_options[0].free_text).to eq(true)
             expect(questionnaire.questions[3].max_choices).to eq(2)
+            expect(questionnaire.questions[3].published_at).not_to be_nil
 
             expect(questionnaire.questions[4].question_type).to eq("matrix_single")
             expect(questionnaire.questions[4].answer_options[0].free_text).to eq(true)
             expect(questionnaire.questions[4].matrix_rows[0].body["en"]).to eq(form_params["questions"]["4"]["matrix_rows"]["0"]["body"]["en"])
+            expect(questionnaire.questions[4].published_at).not_to be_nil
 
             expect(questionnaire.questions[5].question_type).to eq("matrix_multiple")
             expect(questionnaire.questions[5].answer_options[0].free_text).to eq(true)
             expect(questionnaire.questions[5].matrix_rows[0].body["en"]).to eq(form_params["questions"]["5"]["matrix_rows"]["0"]["body"]["en"])
+            expect(questionnaire.questions[5].published_at).not_to be_nil
           end
         end
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ def update_questionnaire_question(form_question)`
`49`	`49`	`mandatory: form_question.mandatory,`
`50`	`50`	`question_type: form_question.question_type,`
`51`	`51`	`max_choices: form_question.max_choices,`
`52`		`- max_characters: form_question.max_characters`
	`52`	`+ max_characters: form_question.max_characters,`
	`53`	`+ published_at: Time.current`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`update_nested_model(form_question, question_attributes, @questionnaire.questions) do \|question\|`