decidim-surveys 0.21.0 → 0.23.2

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200609090533_check_legacy_tables.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+# rubocop:disable Rails/Output
+# rubocop:disable Style/GuardClause
+class CheckLegacyTables < ActiveRecord::Migration[5.2]
+  class Answer < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answers
+  end
+
+  class AnswerChoice < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answer_choices
+  end
+
+  class AnswerOption < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_answer_options
+  end
+
+  class Question < ApplicationRecord
+    self.table_name = :decidim_surveys_survey_questions
+  end
+
+  def up
+    if tables_exists.any?
+      if tables_exists.all?
+        migrate_legacy_data if Question.any?
+      else
+        puts "Some legacy surveys tables exist but not all. Have you migrated all the data?"
+        puts "Migrate or backup your data and then remove the following raise statement to continue with the migrations (that will remove surveys legacy tables)"
+        puts "For migrating your data you can do that with the command:"
+        puts "bundle exec rake decidim_surveys:migrate_data_to_decidim_forms"
+        raise "ERROR:  there's the risk to loose legacy information from old surveys!"
+      end
+    end
+  end
+
+  def tables_exists
+    @tables_exists ||= [Answer, AnswerChoice, AnswerOption, Question].collect { |model| ActiveRecord::Base.connection.table_exists? model.table_name }
+  end
+
+  def migrate_legacy_data
+    puts "Migrating data from decidim_surveys tables to decidim_forms tables..."
+    ActiveRecord::Base.transaction do
+      Decidim::Surveys::Survey.find_each do |survey|
+        puts "Migrating survey #{survey.id}..."
+        if survey.questionnaire.present?
+          puts("already migrated at questionnaire #{survey.questionnaire.id}")
+          next
+        end
+
+        questionnaire = ::Decidim::Forms::Questionnaire.create!(
+          questionnaire_for: survey,
+          title: survey.title,
+          description: survey.description,
+          tos: survey.tos,
+          published_at: survey.published_at,
+          created_at: survey.created_at,
+          updated_at: survey.updated_at
+        )
+
+        Question.where(decidim_survey_id: survey.id).find_each do |survey_question|
+          puts "Migrating question #{survey_question.id}..."
+
+          question = ::Decidim::Forms::Question.create!(
+            questionnaire: questionnaire,
+            position: survey_question.position,
+            question_type: survey_question.question_type,
+            mandatory: survey_question.mandatory,
+            body: survey_question.body,
+            description: survey_question.description,
+            max_choices: survey_question.max_choices,
+            created_at: survey_question.created_at,
+            updated_at: survey_question.updated_at
+          )
+
+          # A hash with the old answer_option id as key, and the new form answer option as value
+          answer_option_mapping = {}
+
+          AnswerOption.where(decidim_survey_question_id: survey_question.id).find_each do |survey_answer_option|
+            answer_option_mapping[survey_answer_option.id] = ::Decidim::Forms::AnswerOption.create!(
+              question: question,
+              body: survey_answer_option.body,
+              free_text: survey_answer_option.free_text
+            )
+          end
+
+          Answer.where(decidim_survey_id: survey.id, decidim_survey_question_id: survey_question.id).find_each do |survey_answer|
+            answer = ::Decidim::Forms::Answer.new(
+              questionnaire: questionnaire,
+              question: question,
+              decidim_user_id: survey_answer.decidim_user_id,
+              body: survey_answer.body,
+              created_at: survey_answer.created_at,
+              updated_at: survey_answer.updated_at
+            )
+
+            AnswerChoice.where(decidim_survey_answer_id: survey_answer.id).find_each do |survey_answer_choice|
+              answer.choices.build(
+                answer_option: answer_option_mapping[survey_answer_choice.decidim_survey_answer_option_id],
+                body: survey_answer_choice.body,
+                custom_body: survey_answer_choice.custom_body,
+                position: survey_answer_choice.position
+              )
+            end
+
+            answer.save!
+          end
+        end
+      end
+    end
+  end
+end
+
+# rubocop:enable Style/GuardClause
+# rubocop:enable Rails/Output

data/db/migrate/20200610090533_remove_survey_answer_choices.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveSurveyAnswerChoices < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :decidim_surveys_survey_answer_choices, if_exists: true
+  end
+end

data/db/migrate/20200610090650_remove_survey_answer_options.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveSurveyAnswerOptions < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :decidim_surveys_survey_answer_options, if_exists: true
+  end
+end

data/db/migrate/20200610090725_remove_survey_answers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveSurveyAnswers < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :decidim_surveys_survey_answers, if_exists: true
+  end
+end

data/db/migrate/20200610090845_remove_survey_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveSurveyQuestions < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :decidim_surveys_survey_questions, if_exists: true
+  end
+end

data/db/migrate/20200610105927_remove_survey_columns.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RemoveSurveyColumns < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_surveys_surveys, :title if ActiveRecord::Base.connection.column_exists?(:decidim_surveys_surveys, :title)
+    remove_column :decidim_surveys_surveys, :description if ActiveRecord::Base.connection.column_exists?(:decidim_surveys_surveys, :description)
+    remove_column :decidim_surveys_surveys, :tos if ActiveRecord::Base.connection.column_exists?(:decidim_surveys_surveys, :tos)
+    remove_column :decidim_surveys_surveys, :published_at if ActiveRecord::Base.connection.column_exists?(:decidim_surveys_surveys, :published_at)
+  end
+end

data/lib/decidim/surveys/admin_engine.rb

@@ -10,10 +10,20 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        get "/answer/:session_token", to: "surveys#show", as: :show_survey
+        get "/answer/:session_token/export", to: "surveys#export_response", as: :export_response_survey
+        get "/answers", to: "surveys#index", as: :index_survey
+        get "/answer_options", to: "surveys#answer_options", as: :answer_options_survey
         put "/", to: "surveys#update", as: :survey
         root to: "surveys#edit"
       end
 
+      initializer "decidim.notifications.components" do
+        Decidim::EventsManager.subscribe(/^decidim\.events\.components/) do |event_name, data|
+          CleanSurveyAnswersJob.perform_later(event_name, data)
+        end
+      end
+
       def load_seed
         nil
       end

data/lib/decidim/surveys/component.rb

@@ -43,7 +43,7 @@ Decidim.register_component(:surveys) do |component|
     surveys.count
   end
 
-  component.register_stat :answers_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+  component.register_stat :answers_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     surveys = Decidim::Surveys::Survey.includes(:questionnaire).where(component: components)
     answers = Decidim::Forms::Answer.where(questionnaire: surveys.map(&:questionnaire))
     answers = answers.where("created_at >= ?", start_at) if start_at.present?
@@ -55,7 +55,10 @@ Decidim.register_component(:surveys) do |component|
   component.actions = %w(answer)
 
   component.settings(:global) do |settings|
+    settings.attribute :scopes_enabled, type: :boolean, default: false
+    settings.attribute :scope_id, type: :scope
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :clean_after_publish, type: :boolean, default: true
   end
 
   component.settings(:step) do |settings|
@@ -70,6 +73,8 @@ Decidim.register_component(:surveys) do |component|
       Decidim::Forms::QuestionnaireUserAnswers.for(survey.questionnaire)
     end
 
+    exports.formats %w(CSV JSON Excel FormPDF)
+
     exports.serializer Decidim::Forms::UserAnswersSerializer
   end
 
@@ -117,23 +122,46 @@ Decidim.register_component(:surveys) do |component|
       visibility: "all"
     )
 
-    %w(short_answer long_answer).each do |text_question_type|
+    %w(short_answer long_answer).each_with_index do |text_question_type, index|
       Decidim::Forms::Question.create!(
         questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
-        question_type: text_question_type
+        question_type: text_question_type,
+        position: index
+      )
+    end
+
+    %w(single_option multiple_option).each_with_index do |multiple_choice_question_type, index|
+      question = Decidim::Forms::Question.create!(
+        questionnaire: questionnaire,
+        body: Decidim::Faker::Localized.paragraph,
+        question_type: multiple_choice_question_type,
+        position: index + 2
+      )
+
+      3.times do
+        question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
+      end
+
+      question.display_conditions.create!(
+        condition_question: questionnaire.questions.find_by(position: question.position - 2),
+        question: question,
+        condition_type: :answered,
+        mandatory: true
       )
     end
 
-    %w(single_option multiple_option).each do |multiple_choice_question_type|
+    %w(matrix_single matrix_multiple).each_with_index do |matrix_question_type, index|
       question = Decidim::Forms::Question.create!(
         questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
-        question_type: multiple_choice_question_type
+        question_type: matrix_question_type,
+        position: index
       )
 
       3.times do
         question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
+        question.matrix_rows.create!(body: Decidim::Faker::Localized.sentence)
       end
     end
   end

data/lib/decidim/surveys/test/factories.rb

@@ -12,7 +12,7 @@ FactoryBot.define do
   end
 
   factory :survey, class: "Decidim::Surveys::Survey" do
-    questionnaire { build(:questionnaire) }
+    questionnaire { build(:questionnaire, :with_questions) }
     component { build(:surveys_component) }
   end
 end

data/lib/decidim/surveys/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.21.0"
+      "0.23.2"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.2
+- !ruby/object:Gem::Dependency
+  name: decidim-templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.2
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -103,6 +117,7 @@ files:
 - app/events/decidim/surveys/closed_survey_event.rb
 - app/events/decidim/surveys/opened_survey_event.rb
 - app/helpers/decidim/surveys/survey_helper.rb
+- app/jobs/decidim/surveys/clean_survey_answers_job.rb
 - app/jobs/decidim/surveys/settings_change_job.rb
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
@@ -115,38 +130,74 @@ files:
 - app/types/decidim/surveys/survey_type.rb
 - app/types/decidim/surveys/surveys_type.rb
 - app/views/decidim/surveys/surveys/no_permission.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170511092231_create_decidim_surveys.rb
 - db/migrate/20170515090916_create_decidim_survey_questions.rb
 - db/migrate/20170515144119_create_decidim_survey_answers.rb
@@ -163,6 +214,12 @@ files:
 - db/migrate/20180405015258_add_free_text_to_survey_answer_options.rb
 - db/migrate/20180405015314_add_custom_body_to_survey_answer_choices.rb
 - db/migrate/20180406201818_add_position_to_decidim_survey_answer_choices.rb
+- db/migrate/20200609090533_check_legacy_tables.rb
+- db/migrate/20200610090533_remove_survey_answer_choices.rb
+- db/migrate/20200610090650_remove_survey_answer_options.rb
+- db/migrate/20200610090725_remove_survey_answers.rb
+- db/migrate/20200610090845_remove_survey_questions.rb
+- db/migrate/20200610105927_remove_survey_columns.rb
 - lib/decidim/surveys.rb
 - lib/decidim/surveys/admin.rb
 - lib/decidim/surveys/admin_engine.rb
@@ -175,7 +232,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,15 +240,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Decidim surveys module
 test_files: []