decidim-elections 0.26.2 → 0.27.0.rc2

data/db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RenameBbStatusTallyToTallyStarted < ActiveRecord::Migration[6.1]
+  class Election < ApplicationRecord
+    self.table_name = :decidim_elections_elections
+  end
+
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Election.where(bb_status: "tally").update_all(bb_status: "tally_started")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    Election.where(bb_status: "tally_started").update_all(bb_status: "tally")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/db/migrate/20220424121541_add_show_check_census_to_votings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddShowCheckCensusToVotings < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_votings_votings, :show_check_census, :boolean, default: true
+  end
+end

data/db/migrate/20220615102642_remove_description_from_elections_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveDescriptionFromElectionsQuestions < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :decidim_elections_questions, :description, :jsonb
+  end
+end

data/db/migrate/20220711112802_rename_dataset_file_to_filename.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameDatasetFileToFilename < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :decidim_votings_census_datasets, :file, :filename
+  end
+end

data/lib/decidim/api/election_question_type.rb

@@ -11,7 +11,6 @@ module Decidim
 
       field :id, GraphQL::Types::ID, "The internal ID of this question", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this question", null: false
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this question", null: false
       field :max_selections, GraphQL::Types::Int, "The maximum number of possible selections for this question", null: false
       field :weight, GraphQL::Types::Int, "The ordering weight for this question", null: true
       field :random_answers_order, GraphQL::Types::Boolean, "Should this question order answers in random order?", null: true

data/lib/decidim/elections/component.rb

@@ -113,9 +113,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: upcoming_election,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: Faker::Number.between(from: 1, to: 3),
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -145,7 +142,7 @@ Decidim.register_component(:elections) do |component|
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -213,9 +210,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: finished_election,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: 2,
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -245,7 +239,7 @@ Decidim.register_component(:elections) do |component|
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -336,9 +330,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: election_with_results,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: 2,
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -369,7 +360,7 @@ Decidim.register_component(:elections) do |component|
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
             content_type: "image/jpeg",
-            file: ActiveStorage::Blob.create_after_upload!(
+            file: ActiveStorage::Blob.create_and_upload!(
               io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
               filename: "city.jpeg",
               content_type: "image/jpeg",
@@ -456,9 +447,6 @@ Decidim.register_component(:elections) do |component|
         {
           election: ongoing_election,
           title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
           max_selections: 2,
           weight: Faker::Number.number(digits: 1),
           random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -488,7 +476,7 @@ Decidim.register_component(:elections) do |component|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: answer,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",

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

@@ -70,7 +70,7 @@ FactoryBot.define do
 
     trait :ready_for_setup do
       transient do
-        trustee_keys { 3.times.map { [Faker::Name.name, generate(:private_key).export.to_json] }.to_h }
+        trustee_keys { 3.times.to_h { [Faker::Name.name, generate(:private_key).export.to_json] } }
       end
 
       upcoming
@@ -124,13 +124,13 @@ FactoryBot.define do
       end
     end
 
-    trait :tally do
+    trait :tally_started do
       vote_ended
-      bb_status { "tally" }
+      bb_status { "tally_started" }
     end
 
     trait :tally_ended do
-      tally
+      tally_started
       bb_status { "tally_ended" }
       verifiable_results_file_hash { SecureRandom.hex(32) }
       verifiable_results_file_url { Faker::Internet.url }
@@ -170,7 +170,6 @@ FactoryBot.define do
 
     election
     title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     min_selections { 1 }
     max_selections { 1 }
     weight { Faker::Number.number(digits: 1) }

data/lib/decidim/elections/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.26.2"
+      "0.27.0.rc2"
     end
   end
 end

data/lib/decidim/votings/participatory_space.rb

@@ -51,7 +51,7 @@ Decidim.register_participatory_space(:votings) do |participatory_space|
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first,
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -99,8 +99,8 @@ Decidim.register_participatory_space(:votings) do |participatory_space|
           user.update!(
             name: Faker::Name.name,
             nickname: Faker::Twitter.unique.screen_name,
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             organization: organization,
             confirmed_at: Time.current,
             locale: I18n.default_locale,

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

@@ -29,6 +29,7 @@ FactoryBot.define do
     introductory_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     voting_type { "hybrid" }
     census_contact_information { nil }
+    show_check_census { true }
 
     trait :unpublished do
       published_at { nil }
@@ -105,7 +106,7 @@ FactoryBot.define do
 
   factory :dataset, class: "Decidim::Votings::Census::Dataset" do
     voting { create(:voting) }
-    file { "file.csv" }
+    filename { "file.csv" }
     status { "init_data" }
     csv_row_raw_count { 1 }
     csv_row_processed_count { 1 }
@@ -174,7 +175,7 @@ FactoryBot.define do
       with_questions
 
       after(:create) do |ballot_style, evaluator|
-        evaluator.election.questions.first(2).map { |question| create(:ballot_style_question, question: question, ballot_style: ballot_style) }
+        evaluator.election.reload.questions.first(2).map { |question| create(:ballot_style_question, question: question, ballot_style: ballot_style) }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-elections
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Leonardo Diez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-bulletin_board
@@ -17,84 +17,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: voting_schemes-dummy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: voting_schemes-electionguard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.3
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
@@ -115,28 +115,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 description: The Elections module adds elections to any participatory space.
 email:
 - leo@codegram.com
@@ -391,7 +391,7 @@ files:
 - app/packs/entrypoints/decidim_elections_election_log.js
 - app/packs/entrypoints/decidim_elections_onboarding.js
 - app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js
-- app/packs/entrypoints/decidim_elections_trustee_tally.js
+- app/packs/entrypoints/decidim_elections_trustee_tally_started.js
 - app/packs/entrypoints/decidim_elections_trustee_trustee_zone.js
 - app/packs/entrypoints/decidim_elections_trustee_zone.js
 - app/packs/entrypoints/decidim_elections_trustee_zone.scss
@@ -418,6 +418,7 @@ files:
 - app/packs/src/decidim/elections/admin/pending_action.js
 - app/packs/src/decidim/elections/admin/trustees_process.js
 - app/packs/src/decidim/elections/admin/vote_statistics.js
+- app/packs/src/decidim/elections/broken_promises_handler.js
 - app/packs/src/decidim/elections/election_log.js
 - app/packs/src/decidim/elections/onboarding.js
 - app/packs/src/decidim/elections/trustee/key_ceremony.js
@@ -495,11 +496,9 @@ files:
 - app/queries/decidim/votings/votes/pending_in_person_votes.rb
 - app/serializers/decidim/votings/census/datum_serializer.rb
 - app/services/decidim/elections/current_user_vote_flow.rb
-- app/services/decidim/elections/election_search.rb
 - app/services/decidim/elections/vote_flow.rb
 - app/services/decidim/votings/census/access_codes_exporter.rb
 - app/services/decidim/votings/census_vote_flow.rb
-- app/services/decidim/votings/voting_search.rb
 - app/uploaders/decidim/cw/votings/census/voting_census_uploader.rb
 - app/views/decidim/elections/admin/answers/_form.html.erb
 - app/views/decidim/elections/admin/answers/edit.html.erb
@@ -521,8 +520,8 @@ files:
 - app/views/decidim/elections/admin/steps/_key_ceremony.html.erb
 - app/views/decidim/elections/admin/steps/_key_ceremony_ended.html.erb
 - app/views/decidim/elections/admin/steps/_results_published.html.erb
-- app/views/decidim/elections/admin/steps/_tally.html.erb
 - app/views/decidim/elections/admin/steps/_tally_ended.html.erb
+- app/views/decidim/elections/admin/steps/_tally_started.html.erb
 - app/views/decidim/elections/admin/steps/_vote.html.erb
 - app/views/decidim/elections/admin/steps/_vote_ended.html.erb
 - app/views/decidim/elections/admin/steps/_vote_stats.html.erb
@@ -539,11 +538,12 @@ files:
 - app/views/decidim/elections/elections/index.html.erb
 - app/views/decidim/elections/elections/index.js.erb
 - app/views/decidim/elections/elections/show.html.erb
+- app/views/decidim/elections/shared/_broken_promises_modal.html.erb
 - app/views/decidim/elections/trustee_mailer/notification.html.erb
 - app/views/decidim/elections/trustee_zone/elections/_backup_modal.html.erb
 - app/views/decidim/elections/trustee_zone/elections/_key_ceremony_steps.html.erb
 - app/views/decidim/elections/trustee_zone/elections/_restore_modal.html.erb
-- app/views/decidim/elections/trustee_zone/elections/_tally_steps.html.erb
+- app/views/decidim/elections/trustee_zone/elections/_tally_started_steps.html.erb
 - app/views/decidim/elections/trustee_zone/elections/show.html.erb
 - app/views/decidim/elections/trustee_zone/elections/update.js.erb
 - app/views/decidim/elections/trustee_zone/trustees/show.html.erb
@@ -751,6 +751,10 @@ files:
 - db/migrate/20210422124826_add_verifiable_results_to_decidim_elections_election.rb
 - db/migrate/20210426072845_add_signed_at_to_polling_station_closure.rb
 - db/migrate/20210427131742_add_validated_at_to_votings_polling_station_closures.rb
+- db/migrate/20220404112802_rename_bb_status_tally_to_tally_started.rb
+- db/migrate/20220424121541_add_show_check_census_to_votings.rb
+- db/migrate/20220615102642_remove_description_from_elections_questions.rb
+- db/migrate/20220711112802_rename_dataset_file_to_filename.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -806,14 +810,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A decidim elections module (votings space and elections component)

data/app/services/decidim/elections/election_search.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Elections
-    # This class handles search and filtering of elections.
-    class ElectionSearch < ResourceSearch
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the election from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(Election.all, options)
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where("decidim_elections_elections.title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("decidim_elections_elections.description::text ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the state filter
-      def search_state
-        active = state.member?("active") ? query.active : nil
-        upcoming = state.member?("upcoming") ? query.upcoming : nil
-        finished = state.member?("finished") ? query.finished : nil
-
-        query
-          .where(id: upcoming)
-          .or(query.where(id: active))
-          .or(query.where(id: finished))
-      end
-    end
-  end
-end

data/app/services/decidim/votings/voting_search.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Votings
-    # Service that encapsulates all logic related to filtering votings.
-    class VotingSearch < Searchlight::Search
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Votings::Voting.where(organization: options[:organization]).published
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        active = state.member?("active") ? query.active : nil
-        upcoming = state.member?("upcoming") ? query.upcoming : nil
-        finished = state.member?("finished") ? query.finished : nil
-
-        query
-          .where(id: upcoming)
-          .or(query.where(id: active))
-          .or(query.where(id: finished))
-      end
-
-      private
-
-      def current_locale
-        I18n.locale.to_s
-      end
-    end
-  end
-end