decidim-elections 0.24.3 → 0.25.0.rc1

data/app/cells/decidim/votings/polling_station_closure_recount/show.erb

@@ -0,0 +1,74 @@
+<p>
+  <%= content_tag :strong, t("recount_summary", scope: "decidim.votings.polling_station_closure_recount") %>
+</p>
+
+<div class="card--secondary">
+  <div class="card__content">
+    <div>
+      <span>
+        <%= content_tag :strong, t("total_ballots", scope: "decidim.votings.polling_station_closure_recount") %>
+        <%= model.results.total_ballots&.first&.value %>
+      </span>
+      <div class="ml-s">
+        <span>
+          <%= content_tag :strong, t("total_valid_ballots", scope: "decidim.votings.polling_station_closure_recount") %>
+          <%= model.results.valid_ballots&.first&.value %>
+        </span>
+        <br>
+        <span>
+          <%= content_tag :strong, t("total_blank_ballots", scope: "decidim.votings.polling_station_closure_recount") %>
+          <%= model.results.blank_ballots&.first&.value %>
+        </span>
+        <br>
+        <span>
+          <%= content_tag :strong, t("total_null_ballots", scope: "decidim.votings.polling_station_closure_recount") %>
+          <%= model.results.null_ballots&.first&.value %>
+        </span>
+      </div>
+    </div>
+
+    <% model.election.questions.each do |question| %>
+      <div class="mt-s">
+        <span>
+          <%= content_tag :strong, translated_attribute(question.title) %>
+        </span>
+
+        <div class="ml-s">
+          <% question.answers.each.with_index(1) do |answer, index| %>
+            <span>
+              <%= content_tag :strong, translated_attribute(answer.title) %>:
+
+              <%= content_tag :span, answer.results&.valid_answers&.first&.value %>
+            </span>
+            <% unless index == question.answers.count %>
+              <br>
+            <% end %>
+          <% end %>
+
+          <% if question.nota_option? %>
+            <br>
+            <%= content_tag :strong, t("nota_option", scope: "decidim.votings.polling_station_closure_recount") %>
+
+            <%= content_tag :span, question.results.blank_answers&.first&.value %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<p class="mt-sm">
+  <%= content_tag :strong, t("polling_officer_notes", scope: "decidim.votings.polling_station_closure_recount") %>
+  <br>
+  <% if model.polling_officer_notes.present? %>
+    <%= model.polling_officer_notes %>
+  <% else %>
+    <%= content_tag :span, t("polling_officer_notes_blank", scope: "decidim.votings.polling_station_closure_recount"), class: "text-muted" %>
+  <% end %>
+</p>
+
+<% if model.signed? %>
+  <p>
+    <%= content_tag :strong, t("signed", scope: "decidim.votings.polling_station_closure_recount"), class: "text-success" %>
+  </p>
+<% end %>

data/app/cells/decidim/votings/polling_station_closure_recount_cell.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This cell renders the vote recount of a Polling Station Closure
+    class PollingStationClosureRecountCell < Decidim::ViewModel
+    end
+  end
+end

data/app/cells/decidim/votings/voting_m_cell.rb

@@ -50,11 +50,11 @@ module Decidim
       end
 
       def resource_image_path
-        model.banner_image.url
+        model.attached_uploader(:banner_image).path
       end
 
       def has_image?
-        model.banner_image.url.present?
+        model.banner_image.attached?
       end
 
       def start_time

data/app/commands/decidim/elections/admin/add_user_as_trustee.rb

@@ -38,7 +38,8 @@ module Decidim
           @trustee = Decidim.traceability.create!(
             Trustee,
             form.current_user,
-            user: form.user
+            user: form.user,
+            organization: form.user.organization
           )
         end
 

data/app/commands/decidim/elections/admin/create_election.rb

@@ -43,7 +43,8 @@ module Decidim
             start_time: form.start_time,
             end_time: form.end_time,
             component: form.current_component,
-            questionnaire: Decidim::Forms::Questionnaire.new
+            questionnaire: Decidim::Forms::Questionnaire.new,
+            salt: Tokenizer.random_salt
           }
 
           @election = Decidim.traceability.create!(

data/app/commands/decidim/elections/admin/publish_results.rb

@@ -20,7 +20,6 @@ module Decidim
 
           transaction do
             log_action
-            update_election
             publish_results
           end
 
@@ -45,13 +44,18 @@ module Decidim
         end
 
         def publish_results
-          bb_election = bulletin_board.publish_results(election.id)
-
-          raise StandardError, "Wrong status for the election with published results" if bb_election.status != "results_published"
+          bulletin_board.publish_results(election.id) do |message_id|
+            create_election_action(message_id)
+          end
         end
 
-        def update_election
-          election.bb_results_published!
+        def create_election_action(message_id)
+          Decidim::Elections::Action.create!(
+            election: election,
+            action: :publish_results,
+            message_id: message_id,
+            status: :pending
+          )
         end
       end
     end

data/app/commands/decidim/elections/admin/setup_election.rb

@@ -57,75 +57,65 @@ module Decidim
         end
 
         def election_data
+          @election_data ||= begin
+            ret = base_election_data
+            election.participatory_space.try(:complete_election_data, election, ret)
+            ret
+          end
+        end
+
+        def base_election_data
           {
-            iat: Time.current.to_i,
-            scheme: bulletin_board.scheme,
-            authority: {
-              name: bulletin_board.authority_name,
-              public_key: bulletin_board.public_key
-            },
-            trustees:
-              trustees.collect do |trustee|
-                {
-                  name: trustee.name,
-                  public_key: trustee.public_key
-                }
-              end,
-            description: {
-              name: {
-                text: [{
-                  value: election.title[current_organization.default_locale.to_s],
-                  language: current_organization.default_locale.to_s
-                }]
-              },
-              start_date: election.start_time,
-              end_date: election.end_time,
-              candidates:
-                  answers.collect do |answer|
-                    {
-                      object_id: answer.id.to_s,
-                      ballot_name: {
-                        text: [{
-                          value: answer.title[current_organization.default_locale.to_s],
-                          language: current_organization.default_locale.to_s
-                        }]
-                      }
-                    }
-                  end,
-              contests:
-                questions.collect do |question|
-                  {
-                    "@type": "CandidateContest",
-                    object_id: question.id.to_s,
-                    sequence_order: question.weight,
-                    vote_variation: question.vote_variation,
-                    name: question.title[current_organization.default_locale.to_s],
-                    number_elected: question.answers.count,
-                    votes_allowed: 1,
-                    ballot_title: {
-                      text: [{
-                        value: question.title[current_organization.default_locale.to_s],
-                        language: current_organization.default_locale.to_s
-                      }]
-                    },
-                    ballot_subtitle: {
-                      text: [{
-                        value: question.description[current_organization.default_locale.to_s],
-                        language: current_organization.default_locale.to_s
-                      }]
-                    },
-                    ballot_selections:
-                      question.answers.collect do |answer|
-                        {
-                          object_id: answer.id.to_s,
-                          sequence_order: answer.weight,
-                          candidate_id: answer.id.to_s
-                        }
-                      end
-                  }
-                end
+            trustees: trustees_data,
+            default_locale: current_organization.default_locale,
+            title: flatten_translations(election.title),
+            start_date: election.start_time,
+            end_date: election.end_time,
+            questions: questions_data,
+            answers: answers_data,
+            ballot_styles: {}
+          }
+        end
+
+        def trustees_data
+          trustees.map do |trustee|
+            {
+              name: trustee.name,
+              slug: trustee.bulletin_board_slug,
+              public_key: JSON.parse(trustee.public_key)
             }
-          }.to_h
+          end
+        end
+
+        def questions_data
+          questions.map do |question|
+            {
+              slug: question.slug,
+              weight: question.weight,
+              max_selections: question.max_selections,
+              title: flatten_translations(question.title),
+              description: flatten_translations(question.description),
+              answers: question_answers_data(question)
+            }
+          end
+        end
+
+        def question_answers_data(question)
+          question.answers.map do |answer|
+            {
+              slug: answer.slug,
+              weight: answer.weight
+            }
+          end
+        end
+
+        def answers_data
+          answers.map do |answer|
+            {
+              slug: answer.slug,
+              title: flatten_translations(answer.title)
+            }
+          end
         end
 
         def setup_election
@@ -154,6 +144,22 @@ module Decidim
 
           Decidim::EventsManager.publish(data)
         end
+
+        # Since machine_translations return a nested hash but Electionguard and other
+        # schemes expect the translations to be returned in a "simple" hash, we need to
+        # flatten the translations.
+        #   {
+        #     "language": "en",
+        #      "value": "Jubilee Alliance"
+        #   }
+        # You can read more about the Civics Common Standard Data Specification here:
+        # https://developers.google.com/civics-data/reference/internationalized-text
+        def flatten_translations(translated_attribute)
+          translated_attribute.deep_symbolize_keys!
+          machine_translations = translated_attribute.delete(:machine_translations) || {}
+
+          machine_translations.merge(translated_attribute).reject { |_k, v| v.empty? }
+        end
       end
     end
   end

data/app/commands/decidim/elections/admin/update_answer_selection.rb

@@ -27,7 +27,7 @@ module Decidim
         attr_reader :answer, :selected
 
         def invalid?
-          !answer.question.total_votes.positive?
+          !answer.question.results_total.positive?
         end
 
         def update_answer_selection!

data/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb

@@ -17,9 +17,17 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          return broadcast(:ok, election) unless election.bb_status.to_sym == required_status.to_sym
+          return broadcast(:ok, election) if election.bb_status.to_sym != required_status.to_sym
 
-          update_election_status!
+          transaction do
+            election.create_bb_closure!
+            update_election_status!
+
+            if election.bb_tally_ended?
+              fetch_election_results
+              store_verifiable_results
+            end
+          end
 
           broadcast(:ok, election)
         end
@@ -28,6 +36,57 @@ module Decidim
 
         attr_reader :election, :required_status
 
+        def results
+          @results ||= Decidim::Elections.bulletin_board.get_election_results(election.id)
+        end
+
+        def election_results
+          results[:election_results]
+        end
+
+        def verifiable_results
+          results[:verifiable_results]
+        end
+
+        def fetch_election_results
+          answers = []
+          election_results.values.map do |values|
+            values.each do |key, value|
+              result_key = get_answer_id_from_result(key)
+              answers = Decidim::Elections::Answer.where(id: result_key)
+              answers.each do |answer|
+                create_answer_result_for!(answer, value)
+              end
+            end
+          end
+        end
+
+        def create_answer_result_for!(answer, value)
+          params = {
+            value: value,
+            question: answer.question,
+            answer: answer,
+            result_type: :valid_answers
+          }
+
+          election.bb_closure.results.create!(params)
+        end
+
+        def get_answer_id_from_result(result_key)
+          result_key.match(/question-\d+_answer-(\d+)/).captures
+        end
+
+        def store_verifiable_results
+          election.update!(
+            verifiable_results_file_url: verifiable_results_file_url,
+            verifiable_results_file_hash: verifiable_results[:hash]
+          )
+        end
+
+        def verifiable_results_file_url
+          URI.join(Decidim::Elections.bulletin_board.bulletin_board_server, verifiable_results[:url])
+        end
+
         def update_election_status!
           status = Decidim::Elections.bulletin_board.get_election_status(election.id)
           election.bb_status = status

data/app/commands/decidim/elections/trustee_zone/update_trustee.rb

@@ -21,6 +21,9 @@ module Decidim
           update_trustee!
 
           broadcast(:ok, trustee)
+        rescue ActiveRecord::RecordNotUnique
+          form.errors.add(:name, :taken)
+          broadcast(:invalid)
         end
 
         private

data/app/commands/decidim/elections/voter/cast_vote.rb

@@ -34,23 +34,20 @@ module Decidim
         delegate :bulletin_board, to: :form
 
         def cast_vote
-          bulletin_board.cast_vote(form.election_id, form.voter_id, form.encrypted_vote) do |message_id|
+          bulletin_board.cast_vote(form.election_id, form.voter_id, form.encrypted_data) do |message_id|
             create_vote(message_id)
           end
         end
 
-        def user
-          @user ||= form.current_organization.users.find_by(id: form.current_user)
-        end
-
         def create_vote(message_id)
           @vote = Vote.create!(
             message_id: message_id,
             election: form.election,
             voter_id: form.voter_id,
-            encrypted_vote_hash: form.encrypted_vote_hash,
+            encrypted_vote_hash: form.encrypted_data_hash,
             status: :pending,
-            user: user
+            user: form.user,
+            email: form.email
           )
         end
       end

data/app/commands/decidim/elections/voter/update_vote_status.rb

@@ -7,7 +7,7 @@ module Decidim
       class UpdateVoteStatus < Rectify::Command
         # Public: Initializes the command.
         #
-        # message_id - the message_id to find a pending_message that is related to a vote.
+        # vote        - the vote that has been updated
         def initialize(vote)
           @vote = vote
         end
@@ -20,7 +20,7 @@ module Decidim
 
           transaction do
             update_vote_status
-            send_vote_notification
+            notify_voter
           end
 
           broadcast(:ok)
@@ -30,7 +30,11 @@ module Decidim
 
         private
 
-        attr_reader :vote
+        attr_reader :vote, :locale
+
+        def verify_url
+          @verify_url ||= Decidim::EngineRouter.main_proxy(vote.election.component).election_vote_verify_url(vote.election, vote_id: vote.encrypted_vote_hash)
+        end
 
         def status_changed?
           vote.status != vote_status
@@ -45,25 +49,37 @@ module Decidim
         end
 
         def update_vote_status
-          vote.status = vote_status
-          vote.save!
+          vote.update!(status: vote_status)
         end
 
-        def send_vote_notification
+        def notify_voter
           return unless vote.accepted?
 
+          if vote.user
+            send_vote_notification
+          elsif vote.email
+            send_vote_email
+          end
+        end
+
+        def send_vote_notification
           data = {
             event: "decidim.events.elections.votes.accepted_votes",
             event_class: Decidim::Elections::Votes::VoteAcceptedEvent,
             resource: vote.election,
             affected_users: [vote.user],
             extra: {
-              vote: vote
+              vote: vote,
+              verify_url: verify_url
             }
           }
 
           Decidim::EventsManager.publish(data)
         end
+
+        def send_vote_email
+          Decidim::Elections::VoteAcceptedMailer.notification(vote, verify_url, I18n.locale.to_s).deliver_later
+        end
       end
     end
   end