decidim-elections 0.24.3 → 0.25.0.rc1

data/lib/decidim/elections/answer_serializer.rb

@@ -28,13 +28,14 @@ module Decidim
           question_title: question.title,
           answer_id: answer.id,
           answer_title: answer.title,
-          answer_votes: answer.votes_count
+          answer_votes: answer.results_total
         }
       end
 
       private
 
       attr_reader :answer
+      alias resource answer
 
       def election
         answer.question.election

data/lib/decidim/elections/api.rb

@@ -2,10 +2,12 @@
 
 module Decidim
   module Elections
+    autoload :ElectionResultType, "decidim/api/election_result_type"
     autoload :ElectionAnswerType, "decidim/api/election_answer_type"
     autoload :ElectionQuestionType, "decidim/api/election_question_type"
     autoload :ElectionType, "decidim/api/election_type"
     autoload :ElectionsType, "decidim/api/elections_type"
     autoload :TrusteeType, "decidim/api/trustee_type"
+    autoload :BulletinBoardClosureType, "decidim/api/bulletin_board_closure_type"
   end
 end

data/lib/decidim/elections/component.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/components/namer"
+require "decidim/components/namer"
 
 Decidim.register_component(:elections) do |component|
   component.engine = Decidim::Elections::Engine
   component.admin_engine = Decidim::Elections::AdminEngine
-  component.icon = "decidim/elections/icon.svg"
+  component.icon = "media/images/decidim_elections.svg"
   component.stylesheet = "decidim/elections/elections"
   component.permissions_class_name = "Decidim::Elections::Permissions"
   component.query_type = "Decidim::Elections::ElectionsType"
@@ -27,7 +27,7 @@ Decidim.register_component(:elections) do |component|
 
   component.register_stat :elections_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
     elections = Decidim::Elections::FilteredElections.for(components, start_at, end_at)
-    elections.count
+    elections.published.count
   end
 
   component.register_resource(:election) do |resource|
@@ -99,7 +99,8 @@ Decidim.register_component(:elections) do |component|
           end,
           start_time: 3.weeks.from_now,
           end_time: 3.weeks.from_now + 4.hours,
-          published_at: Faker::Boolean.boolean(true_ratio: 0.5) ? 1.week.ago : nil
+          published_at: Faker::Boolean.boolean(true_ratio: 0.5) ? 1.week.ago : nil,
+          salt: Decidim::Tokenizer.random_salt
         },
         visibility: "all"
       )
@@ -133,8 +134,7 @@ Decidim.register_component(:elections) do |component|
                 Decidim::Faker::Localized.paragraph(sentence_count: 3)
               end,
               weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.2), # false
-              votes_count: 0
+              selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
             },
             visibility: "all"
           )
@@ -143,7 +143,13 @@ Decidim.register_component(:elections) do |component|
             title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
-            file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
+            content_type: "image/jpeg",
+            file: ActiveStorage::Blob.create_after_upload!(
+              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
+              filename: "city.jpeg",
+              content_type: "image/jpeg",
+              metadata: nil
+            ) # Keep after attached_to
           )
         end
 
@@ -193,7 +199,8 @@ Decidim.register_component(:elections) do |component|
           end,
           start_time: 4.weeks.ago,
           end_time: 3.weeks.ago,
-          published_at: 4.weeks.ago
+          published_at: 4.weeks.ago,
+          salt: Decidim::Tokenizer.random_salt
         },
         visibility: "all"
       )
@@ -227,8 +234,7 @@ Decidim.register_component(:elections) do |component|
                 Decidim::Faker::Localized.paragraph(sentence_count: 3)
               end,
               weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.2), # false
-              votes_count: 0
+              selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
             },
             visibility: "all"
           )
@@ -237,7 +243,13 @@ Decidim.register_component(:elections) do |component|
             title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
-            file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
+            content_type: "image/jpeg",
+            file: ActiveStorage::Blob.create_after_upload!(
+              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
+              filename: "city.jpeg",
+              content_type: "image/jpeg",
+              metadata: nil
+            ) # Keep after attached_to
           )
         end
 
@@ -288,12 +300,34 @@ Decidim.register_component(:elections) do |component|
           start_time: 4.weeks.ago,
           end_time: 3.weeks.ago,
           published_at: 3.weeks.ago,
-          bb_status: "results_published"
+          bb_status: "results_published",
+          salt: Decidim::Tokenizer.random_salt
 
         },
         visibility: "all"
       )
 
+      bb_closure = Decidim::Elections::BulletinBoardClosure.create!(
+        election: election_with_results
+      )
+
+      valid_ballots = Faker::Number.number(digits: 3)
+      Decidim::Elections::Result.create!(
+        value: valid_ballots,
+        closurable: bb_closure,
+        question: nil,
+        answer: nil,
+        result_type: :valid_ballots
+      )
+
+      Decidim::Elections::Result.create!(
+        value: valid_ballots,
+        closurable: bb_closure,
+        question: nil,
+        answer: nil,
+        result_type: :total_ballots
+      )
+
       rand(1...4).times do
         result_question = Decidim.traceability.create!(
           Decidim::Elections::Question,
@@ -312,6 +346,7 @@ Decidim.register_component(:elections) do |component|
           visibility: "all"
         )
 
+        question_pending = valid_ballots
         rand(2...5).times do
           answer = Decidim.traceability.create!(
             Decidim::Elections::Answer,
@@ -323,8 +358,7 @@ Decidim.register_component(:elections) do |component|
                 Decidim::Faker::Localized.paragraph(sentence_count: 3)
               end,
               weight: Faker::Number.number(digits: 1),
-              selected: Faker::Boolean.boolean(true_ratio: 0.5),
-              votes_count: Faker::Number.number(digits: 3)
+              selected: Faker::Boolean.boolean(true_ratio: 0.5)
             },
             visibility: "all"
           )
@@ -333,7 +367,33 @@ Decidim.register_component(:elections) do |component|
             title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.sentence(word_count: 5),
             attached_to: answer,
-            file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
+            content_type: "image/jpeg",
+            file: ActiveStorage::Blob.create_after_upload!(
+              io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
+              filename: "city.jpeg",
+              content_type: "image/jpeg",
+              metadata: nil
+            ) # Keep after attached_to
+          )
+
+          answer_value = Faker::Number.between(from: 0, to: question_pending)
+          Decidim::Elections::Result.create!(
+            value: answer_value,
+            closurable: bb_closure,
+            question: result_question,
+            answer: answer,
+            result_type: :valid_answers
+          )
+          question_pending -= answer_value
+        end
+
+        if result_question.nota_option? && result_question.max_selections == 1
+          Decidim::Elections::Result.create!(
+            value: question_pending,
+            closurable: bb_closure,
+            question: result_question,
+            answer: nil,
+            result_type: :blank_answers
           )
         end
 
@@ -382,7 +442,8 @@ Decidim.register_component(:elections) do |component|
         end,
         start_time: 2.weeks.ago,
         end_time: 2.weeks.from_now + 4.hours,
-        published_at: 3.weeks.ago
+        published_at: 3.weeks.ago,
+        salt: Decidim::Tokenizer.random_salt
       },
       visibility: "all"
     )
@@ -416,8 +477,7 @@ Decidim.register_component(:elections) do |component|
               Decidim::Faker::Localized.paragraph(sentence_count: 3)
             end,
             weight: Faker::Number.number(digits: 1),
-            selected: Faker::Boolean.boolean(true_ratio: 0.2), # false
-            votes_count: 0
+            selected: Faker::Boolean.boolean(true_ratio: 0.2) # false
           },
           visibility: "all"
         )
@@ -426,7 +486,13 @@ Decidim.register_component(:elections) do |component|
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: answer,
-          file: File.new(File.join(__dir__, "seeds", "city.jpeg")) # Keep after attached_to
+          content_type: "image/jpeg",
+          file: ActiveStorage::Blob.create_after_upload!(
+            io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
+            filename: "city.jpeg",
+            content_type: "image/jpeg",
+            metadata: nil
+          ) # Keep after attached_to
         )
       end
     end

data/lib/decidim/elections/engine.rb

@@ -15,10 +15,12 @@ module Decidim
             post :answer
           end
 
-          resource :vote, only: [:new, :update] do
-            post :cast
+          resources :votes, only: [:new, :create, :update, :show] do
             get :verify
+            match "new", action: :new, via: :post, as: :login, on: :collection
           end
+
+          get :election_log, on: :member
         end
 
         root to: "elections#index"
@@ -28,10 +30,6 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Elections::Engine.root}/app/views") # for partials
       end
-
-      initializer "decidim_elections.assets" do |app|
-        app.config.assets.precompile += %w(decidim_elections_manifest.js decidim_elections_manifest.css)
-      end
     end
   end
 end

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

@@ -17,6 +17,8 @@ FactoryBot.define do
   factory :election, class: "Decidim::Elections::Election" do
     transient do
       organization { build(:organization) }
+      number_of_votes { Faker::Number.number(digits: 2) }
+      base_id { 10_000 }
     end
 
     upcoming
@@ -28,10 +30,11 @@ FactoryBot.define do
     bb_status { nil }
     questionnaire
     component { create(:elections_component, organization: organization) }
+    salt { SecureRandom.hex(32) }
 
     trait :bb_test do
       bb_status { "key_ceremony" }
-      id { (10_000 + Decidim::Elections::Election.bb_statuses.keys.index(bb_status)) }
+      id { (base_id + Decidim::Elections::Election.bb_statuses.keys.index(bb_status)) }
     end
 
     trait :upcoming do
@@ -116,12 +119,8 @@ FactoryBot.define do
       finished
       bb_status { "vote_ended" }
 
-      after(:build) do |election|
-        election.questions.each do |question|
-          question.answers.each do |answer|
-            answer.votes_count = Faker::Number.number(digits: 1)
-          end
-        end
+      after(:create) do |election, evaluator|
+        create_list(:vote, evaluator.number_of_votes, :accepted, election: election)
       end
     end
 
@@ -133,6 +132,12 @@ FactoryBot.define do
     trait :tally_ended do
       tally
       bb_status { "tally_ended" }
+      verifiable_results_file_hash { SecureRandom.hex(32) }
+      verifiable_results_file_url { Faker::Internet.url }
+
+      after(:create) do |election|
+        create(:bb_closure, :with_results, election: election)
+      end
     end
 
     trait :results_published do
@@ -219,10 +224,11 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     weight { Faker::Number.number(digits: 1) }
     selected { false }
-    votes_count { 0 }
 
     trait :with_votes do
-      votes_count { Faker::Number.number(digits: 1) }
+      after(:build) do |answer|
+        create(:election_result, election: answer.question.election, question: answer.question, answer: answer)
+      end
     end
 
     trait :with_photos do
@@ -242,6 +248,60 @@ FactoryBot.define do
     end
   end
 
+  factory :bb_closure, class: "Decidim::Elections::BulletinBoardClosure" do
+    initialize_with do
+      Decidim::Elections::BulletinBoardClosure.find_or_create_by(
+        decidim_elections_election_id: election.id
+      )
+    end
+
+    election { create(:election, :complete) }
+
+    trait :with_results do
+      after :create do |closure|
+        total_votes = closure.election.votes.count
+        closure.election.questions.each do |question|
+          max = total_votes
+          question.answers.each do |answer|
+            value = Faker::Number.between(from: 0, to: max)
+            closure.results << create(:election_result, election: closure.election, question: question, answer: answer, value: value)
+            max -= value
+          end
+          closure.results << create(:election_result, :blank_ballots, election: closure.election, question: question, value: max)
+        end
+        closure.results << create(:election_result, :total_ballots, election: closure.election, value: total_votes)
+      end
+    end
+  end
+
+  factory :election_result, class: "Decidim::Elections::Result" do
+    transient do
+      election { create(:election, :tally_ended) }
+    end
+
+    closurable { create :bb_closure, election: election }
+    question { create :question, election: election }
+    answer { create :election_answer, question: question }
+    value { Faker::Number.number(digits: 1) }
+    result_type { "valid_answers" }
+
+    trait :null_ballots do
+      result_type { "null_ballots" }
+      answer { nil }
+    end
+
+    trait :blank_ballots do
+      result_type { "blank_ballots" }
+      answer { nil }
+    end
+
+    trait :total_ballots do
+      result_type { "total_ballots" }
+      answer { nil }
+      question { nil }
+    end
+  end
+
   factory :action, class: "Decidim::Elections::Action" do
     election
     message_id { "a.message+id" }
@@ -252,11 +312,11 @@ FactoryBot.define do
   factory :trustee, class: "Decidim::Elections::Trustee" do
     transient do
       election { nil }
-      organization { election&.component&.participatory_space&.organization || create(:organization) }
     end
 
     public_key { nil }
     user { build(:user, organization: organization) }
+    organization { create(:organization) }
 
     trait :considered do
       after(:build) do |trustee, evaluator|
@@ -272,7 +332,7 @@ FactoryBot.define do
 
     trait :with_public_key do
       considered
-      name { Faker::Name.name }
+      name { Faker::Name.unique.name }
       public_key { generate(:private_key).export.to_json }
     end
   end
@@ -298,5 +358,10 @@ FactoryBot.define do
     status { "pending" }
     message_id { "decidim-test-authority.2.vote.cast+v.5826de088371d1b15b38f00c8203871caec07041ed0c8fb0c6fb875f0df763b6" }
     user { build(:user) }
+    email { "an_email@example.org" }
+
+    trait :accepted do
+      status { "accepted" }
+    end
   end
 end

data/lib/decidim/elections/trustee_zone_engine.rb

@@ -24,10 +24,11 @@ module Decidim
 
       initializer "decidim_elections.trustee_zone.menu" do
         Decidim.menu :user_menu do |menu|
-          menu.item I18n.t("menu.trustee_zone", scope: "decidim.elections.trustee_zone"),
-                    decidim.decidim_elections_trustee_zone_path,
-                    active: :inclusive,
-                    if: Decidim::Elections::Trustee.trustee?(current_user)
+          menu.add_item :decidim_elections_trustee_zone,
+                        I18n.t("menu.trustee_zone", scope: "decidim.elections.trustee_zone"),
+                        decidim.decidim_elections_trustee_zone_path,
+                        active: :inclusive,
+                        if: Decidim::Elections::Trustee.trustee?(current_user)
         end
       end
     end

data/lib/decidim/elections/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.24.3"
+      "0.25.0.rc1"
     end
   end
 end