decidim-surveys 0.15.2 → 0.16.0

data/lib/decidim/surveys/component.rb

@@ -21,12 +21,11 @@ Decidim.register_component(:surveys) do |component|
     end
   end
 
-  component.data_portable_entities = ["Decidim::Surveys::SurveyAnswer"]
+  component.data_portable_entities = ["Decidim::Forms::Answer"]
 
   component.on(:before_destroy) do |instance|
-    survey_answers_for_component = Decidim::Surveys::SurveyAnswer
-                                   .includes(:survey)
-                                   .where(decidim_surveys_surveys: { decidim_component_id: instance.id })
+    survey = Decidim::Surveys::Survey.find_by(decidim_component_id: instance.id)
+    survey_answers_for_component = Decidim::Forms::Answer.where(questionnaire: survey.questionnaire)
 
     raise "Can't destroy this component when there are survey answers" if survey_answers_for_component.any?
   end
@@ -39,8 +38,8 @@ Decidim.register_component(:surveys) do |component|
   end
 
   component.register_stat :answers_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    surveys = Decidim::Surveys::Survey.where(component: components)
-    answers = Decidim::Surveys::SurveyAnswer.where(survey: surveys)
+    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?
     answers = answers.where("created_at <= ?", end_at) if end_at.present?
     answers.group(:decidim_user_id).count.size
@@ -61,10 +60,10 @@ Decidim.register_component(:surveys) do |component|
   component.exports :survey_user_answers do |exports|
     exports.collection do |f|
       survey = Decidim::Surveys::Survey.find_by(component: f)
-      Decidim::Surveys::SurveyUserAnswers.for(survey)
+      Decidim::Forms::QuestionnaireUserAnswers.for(survey.questionnaire)
     end
 
-    exports.serializer Decidim::Surveys::SurveyUserAnswersSerializer
+    exports.serializer Decidim::Forms::UserAnswersSerializer
   end
 
   component.seeds do |participatory_space|
@@ -89,8 +88,7 @@ Decidim.register_component(:surveys) do |component|
       Decidim::Component.create!(params)
     end
 
-    params = {
-      component: component,
+    questionnaire = Decidim::Forms::Questionnaire.new(
       title: Decidim::Faker::Localized.paragraph,
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
@@ -98,9 +96,14 @@ Decidim.register_component(:surveys) do |component|
       tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(2)
       end
+    )
+
+    params = {
+      component: component,
+      questionnaire: questionnaire
     }
 
-    survey = Decidim.traceability.create!(
+    Decidim.traceability.create!(
       Decidim::Surveys::Survey,
       admin_user,
       params,
@@ -108,16 +111,16 @@ Decidim.register_component(:surveys) do |component|
     )
 
     %w(short_answer long_answer).each do |text_question_type|
-      Decidim::Surveys::SurveyQuestion.create!(
-        survey: survey,
+      Decidim::Forms::Question.create!(
+        questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
         question_type: text_question_type
       )
     end
 
     %w(single_option multiple_option).each do |multiple_choice_question_type|
-      question = Decidim::Surveys::SurveyQuestion.create!(
-        survey: survey,
+      question = Decidim::Forms::Question.create!(
+        questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
         question_type: multiple_choice_question_type
       )

data/lib/decidim/surveys/engine.rb

@@ -15,10 +15,6 @@ module Decidim
         root to: "surveys#show"
       end
 
-      initializer "decidim_surveys.assets" do |app|
-        app.config.assets.precompile += %w(decidim_surveys_manifest.js)
-      end
-
       initializer "decidim_changes" do
         Decidim::SettingsChange.subscribe "surveys" do |changes|
           Decidim::Surveys::SettingsChangeJob.perform_later(
@@ -28,6 +24,23 @@ module Decidim
           )
         end
       end
+
+      initializer "decidim_surveys.register_metrics" do
+        Decidim.metrics_registry.register(:survey_answers) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Surveys::Metrics::AnswersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(participatory_process)
+            settings.attribute :weight, type: :integer, default: 5
+            settings.attribute :stat_block, type: :string, default: "small"
+          end
+        end
+
+        Decidim.metrics_operation.register(:participants, :surveys) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Surveys::Metrics::SurveyParticipantsMetricMeasure"
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
@@ -11,48 +12,7 @@ FactoryBot.define do
   end
 
   factory :survey, class: Decidim::Surveys::Survey do
-    title { generate_localized_title }
-    description do
-      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        generate_localized_title
-      end
-    end
-    tos { generate_localized_title }
+    questionnaire { build(:questionnaire) }
     component { build(:surveys_component) }
   end
-
-  factory :survey_question, class: Decidim::Surveys::SurveyQuestion do
-    transient do
-      answer_options { [] }
-    end
-
-    body { generate_localized_title }
-    mandatory { false }
-    position { 0 }
-    question_type { Decidim::Surveys::SurveyQuestion::TYPES.first }
-    survey
-
-    before(:create) do |question, evaluator|
-      evaluator.answer_options.each do |answer_option|
-        question.answer_options.build(
-          body: answer_option["body"],
-          free_text: answer_option["free_text"]
-        )
-      end
-    end
-  end
-
-  factory :survey_answer, class: Decidim::Surveys::SurveyAnswer do
-    body { "hola" }
-    survey
-    question { create(:survey_question, survey: survey) }
-    user { create(:user, organization: survey.organization) }
-  end
-
-  factory :survey_answer_option, class: Decidim::Surveys::SurveyAnswerOption do
-    body { generate_localized_title }
-  end
-
-  factory :survey_answer_choice, class: Decidim::Surveys::SurveyAnswerChoice do
-  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.15.2"
+      "0.16.0"
     end
   end
 end

data/lib/tasks/decidim_surveys_tasks.rake

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+namespace :decidim_surveys do
+  desc "Migrate data from decidim_surveys tables to decidim_forms tables"
+  task migrate_data_to_decidim_forms: :environment do
+    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
+
+    unless [Answer, AnswerChoice, AnswerOption, Question].all? { |model| ActiveRecord::Base.connection.table_exists? model.table_name }
+      puts "ERROR: There are not all the necessary surveys tables. Have you already migrated the data?"
+      next
+    end
+
+    ActiveRecord::Base.transaction do
+      Decidim::Surveys::Survey.find_each do |survey|
+        puts "Migrating survey #{survey.id}..."
+
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: decidim-forms
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -79,19 +93,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_surveys_manifest.js
-- app/assets/config/decidim_surveys_manifest.js
-- app/assets/images/decidim/surveys/icon.svg
-- app/assets/javascripts/decidim/surveys/admin/auto_buttons_by_min_items.component.js.es6
-- app/assets/javascripts/decidim/surveys/admin/auto_select_options_by_total_items.component.js.es6
-- app/assets/javascripts/decidim/surveys/admin/surveys.js.es6
-- app/assets/javascripts/decidim/surveys/autosortable_checkboxes.component.js.es6
-- app/assets/javascripts/decidim/surveys/option_attached_inputs.component.js.es6
-- app/assets/javascripts/decidim/surveys/surveys.js.es6
 - app/assets/stylesheets/decidim/surveys/surveys.scss
 - app/cells/decidim/surveys/survey_activity_cell.rb
-- app/commands/decidim/surveys/admin/update_survey.rb
-- app/commands/decidim/surveys/answer_survey.rb
 - app/commands/decidim/surveys/create_survey.rb
 - app/controllers/decidim/surveys/admin/application_controller.rb
 - app/controllers/decidim/surveys/admin/surveys_controller.rb
@@ -99,29 +102,13 @@ files:
 - app/controllers/decidim/surveys/surveys_controller.rb
 - app/events/decidim/surveys/closed_survey_event.rb
 - app/events/decidim/surveys/opened_survey_event.rb
-- app/forms/decidim/surveys/admin/survey_answer_option_form.rb
-- app/forms/decidim/surveys/admin/survey_form.rb
-- app/forms/decidim/surveys/admin/survey_question_form.rb
-- app/forms/decidim/surveys/survey_answer_choice_form.rb
-- app/forms/decidim/surveys/survey_answer_form.rb
-- app/forms/decidim/surveys/survey_form.rb
-- app/helpers/decidim/surveys/admin/application_helper.rb
 - app/jobs/decidim/surveys/settings_change_job.rb
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
-- app/models/decidim/surveys/survey_answer.rb
-- app/models/decidim/surveys/survey_answer_choice.rb
-- app/models/decidim/surveys/survey_answer_option.rb
-- app/models/decidim/surveys/survey_question.rb
 - app/permissions/decidim/surveys/admin/permissions.rb
 - app/permissions/decidim/surveys/permissions.rb
-- app/queries/decidim/surveys/survey_user_answers.rb
-- app/views/decidim/surveys/admin/surveys/_answer_option.html.erb
-- app/views/decidim/surveys/admin/surveys/_form.html.erb
-- app/views/decidim/surveys/admin/surveys/_question.html.erb
-- app/views/decidim/surveys/admin/surveys/edit.html.erb
-- app/views/decidim/surveys/surveys/_answer.html.erb
-- app/views/decidim/surveys/surveys/show.html.erb
+- app/queries/decidim/surveys/metrics/answers_metric_manage.rb
+- app/queries/decidim/surveys/metrics/survey_participants_metric_measure.rb
 - config/locales/ca.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -163,11 +150,10 @@ files:
 - lib/decidim/surveys/admin.rb
 - lib/decidim/surveys/admin_engine.rb
 - lib/decidim/surveys/component.rb
-- lib/decidim/surveys/data_portability_survey_user_answers_serializer.rb
 - lib/decidim/surveys/engine.rb
-- lib/decidim/surveys/survey_user_answers_serializer.rb
 - lib/decidim/surveys/test/factories.rb
 - lib/decidim/surveys/version.rb
+- lib/tasks/decidim_surveys_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -188,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim surveys module

data/app/assets/config/admin/decidim_surveys_manifest.js

@@ -1 +0,0 @@
-//= link decidim/surveys/admin/surveys.js