decidim-bulletin_board 0.8.2 → 0.9.0

data/lib/decidim/bulletin_board/client.rb

@@ -21,9 +21,7 @@ module Decidim
       delegate :authority_slug, to: Decidim::BulletinBoard::Command
 
       def quorum
-        return 0 if @scheme.dig(:parameters, :quorum).blank?
-
-        @scheme.dig(:parameters, :quorum)
+        @scheme.dig(:parameters, :quorum) || number_of_trustees
       end
 
       def public_key
@@ -36,31 +34,31 @@ module Decidim
 
       def create_election(election_id, election_data)
         create_election = Decidim::BulletinBoard::Authority::CreateElection.new(election_id, election_data)
+        yield create_election.message_id if block_given?
         create_election.on(:ok) { |election| return election }
         create_election.on(:error) { |error_message| raise StandardError, error_message }
         create_election.call
       end
 
-      def open_ballot_box(election_id)
-        open_ballot_box = Decidim::BulletinBoard::Authority::OpenBallotBox.new(election_id)
-        open_ballot_box.on(:ok) { |election| return election }
-        open_ballot_box.on(:error) { |error_message| raise StandardError, error_message }
-        open_ballot_box.call
-      end
-
-      def close_ballot_box(election_id)
-        close_ballot_box = Decidim::BulletinBoard::Authority::CloseBallotBox.new(election_id)
-        close_ballot_box.on(:ok) { |election| return election }
-        close_ballot_box.on(:error) { |error_message| raise StandardError, error_message }
-        close_ballot_box.call
+      def start_key_ceremony(election_id)
+        start_key_ceremony = Decidim::BulletinBoard::Authority::StartKeyCeremony.new(election_id)
+        yield start_key_ceremony.message_id if block_given?
+        start_key_ceremony.on(:ok) { |pending_message| return pending_message }
+        start_key_ceremony.on(:error) { |error_message| raise StandardError, error_message }
+        start_key_ceremony.call
       end
 
-      def cast_vote_message_id(election_id, voter_id)
-        Decidim::BulletinBoard::Voter::CastVote.cast_vote_message_id(election_id, voter_id)
+      def start_vote(election_id)
+        start_vote = Decidim::BulletinBoard::Authority::StartVote.new(election_id)
+        yield start_vote.message_id if block_given?
+        start_vote.on(:ok) { |pending_message| return pending_message }
+        start_vote.on(:error) { |error_message| raise StandardError, error_message }
+        start_vote.call
       end
 
       def cast_vote(election_id, voter_id, encrypted_vote)
         cast_vote = Decidim::BulletinBoard::Voter::CastVote.new(election_id, voter_id, encrypted_vote)
+        yield cast_vote.message_id if block_given?
         cast_vote.on(:ok) { |pending_message| return pending_message }
         cast_vote.on(:error) { |error_message| raise StandardError, error_message }
         cast_vote.call
@@ -73,6 +71,14 @@ module Decidim
         get_pending_message_status.call
       end
 
+      def end_vote(election_id)
+        end_vote = Decidim::BulletinBoard::Authority::EndVote.new(election_id)
+        yield end_vote.message_id if block_given?
+        end_vote.on(:ok) { |pending_message| return pending_message }
+        end_vote.on(:error) { |error_message| raise StandardError, error_message }
+        end_vote.call
+      end
+
       def get_election_status(election_id)
         get_election_status = Decidim::BulletinBoard::Authority::GetElectionStatus.new(election_id)
         get_election_status.on(:ok) { |status| return status }
@@ -82,6 +88,7 @@ module Decidim
 
       def start_tally(election_id)
         start_tally = Decidim::BulletinBoard::Authority::StartTally.new(election_id)
+        yield start_tally.message_id if block_given?
         start_tally.on(:ok) { |pending_message| return pending_message }
         start_tally.on(:error) { |error_message| raise StandardError, error_message }
         start_tally.call
@@ -89,6 +96,7 @@ module Decidim
 
       def publish_results(election_id)
         publish_results = Decidim::BulletinBoard::Authority::PublishResults.new(election_id)
+        yield publish_results.message_id if block_given?
         publish_results.on(:ok) { |status| return status }
         publish_results.on(:error) { |error_message| raise StandardError, error_message }
         publish_results.call

data/lib/decidim/bulletin_board/command.rb

@@ -8,7 +8,7 @@ module Decidim
     class Command
       include Wisper::Publisher
 
-      delegate :authority_slug, :private_key, :unique_election_id, :message_id, to: :class
+      delegate :authority_slug, :private_key, :unique_election_id, :build_message_id, to: :class
 
       def sign_message(message_id, message)
         JWT.encode(complete_message(message_id, message), private_key.keypair, "RS256")
@@ -42,7 +42,7 @@ module Decidim
           Decidim::BulletinBoard::MessageIdentifier.unique_election_id(authority_slug, election_id)
         end
 
-        def message_id(unique_election_id, type_subtype, voter_id = nil)
+        def build_message_id(unique_election_id, type_subtype, voter_id = nil)
           Decidim::BulletinBoard::MessageIdentifier.format(unique_election_id, type_subtype, voter_id ? :voter : :authority, voter_id || authority_slug)
         end
       end

data/lib/decidim/bulletin_board/graphql/bb_schema.json

@@ -114,47 +114,6 @@
           "enumValues": null,
           "possibleTypes": null
         },
-        {
-          "kind": "OBJECT",
-          "name": "CloseBallotBoxMutationPayload",
-          "description": "Autogenerated return type of CloseBallotBoxMutation",
-          "fields": [
-            {
-              "name": "election",
-              "description": null,
-              "args": [
-
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Election",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
-            {
-              "name": "error",
-              "description": null,
-              "args": [
-
-              ],
-              "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
         {
           "kind": "OBJECT",
           "name": "CreateElectionMutationPayload",
@@ -342,6 +301,47 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "EndVoteMutationPayload",
+          "description": "Autogenerated return type of EndVoteMutation",
+          "fields": [
+            {
+              "name": "error",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pendingMessage",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PendingMessage",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "SCALAR",
           "name": "ID",
@@ -611,7 +611,7 @@
           "description": null,
           "fields": [
             {
-              "name": "closeBallotBox",
+              "name": "createElection",
               "description": null,
               "args": [
                 {
@@ -645,14 +645,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "CloseBallotBoxMutationPayload",
+                "name": "CreateElectionMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "createElection",
+              "name": "endVote",
               "description": null,
               "args": [
                 {
@@ -686,14 +686,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "CreateElectionMutationPayload",
+                "name": "EndVoteMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "openBallotBox",
+              "name": "processKeyCeremonyStep",
               "description": null,
               "args": [
                 {
@@ -727,14 +727,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "OpenBallotBoxMutationPayload",
+                "name": "ProcessKeyCeremonyStepMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "processKeyCeremonyStep",
+              "name": "processTallyStep",
               "description": null,
               "args": [
                 {
@@ -768,14 +768,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ProcessKeyCeremonyStepMutationPayload",
+                "name": "ProcessTallyStepMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "processTallyStep",
+              "name": "publishResults",
               "description": null,
               "args": [
                 {
@@ -809,14 +809,14 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "ProcessTallyStepMutationPayload",
+                "name": "PublishResultsMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "publishResults",
+              "name": "startKeyCeremony",
               "description": null,
               "args": [
                 {
@@ -850,7 +850,7 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "PublishResultsMutationPayload",
+                "name": "StartKeyCeremonyMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -898,7 +898,7 @@
               "deprecationReason": null
             },
             {
-              "name": "vote",
+              "name": "startVote",
               "description": null,
               "args": [
                 {
@@ -932,48 +932,48 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "VoteMutationPayload",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [
-
-          ],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "OpenBallotBoxMutationPayload",
-          "description": "Autogenerated return type of OpenBallotBoxMutation",
-          "fields": [
-            {
-              "name": "election",
-              "description": null,
-              "args": [
-
-              ],
-              "type": {
-                "kind": "OBJECT",
-                "name": "Election",
+                "name": "StartVoteMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
             },
             {
-              "name": "error",
+              "name": "vote",
               "description": null,
               "args": [
-
+                {
+                  "name": "messageId",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "signedData",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
               ],
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "OBJECT",
+                "name": "VoteMutationPayload",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -1415,6 +1415,47 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "StartKeyCeremonyMutationPayload",
+          "description": "Autogenerated return type of StartKeyCeremonyMutation",
+          "fields": [
+            {
+              "name": "error",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pendingMessage",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PendingMessage",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "StartTallyMutationPayload",
@@ -1456,6 +1497,47 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "StartVoteMutationPayload",
+          "description": "Autogenerated return type of StartVoteMutation",
+          "fields": [
+            {
+              "name": "error",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pendingMessage",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "PendingMessage",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "SCALAR",
           "name": "String",