decidim-consultations 0.23.6 → 0.24.0.rc1

data/lib/decidim/consultations/query_extensions.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This module's job is to extend the API with custom fields related to
+    # decidim-assemblies.
+    module QueryExtensions
+      # Public: Extends a type with `decidim-assemblies`'s fields.
+      #
+      # type - A GraphQL::BaseType to extend.
+      #
+      # Returns nothing.
+      def self.included(type)
+        type.field :consultations,
+                   [Decidim::Consultations::ConsultationType],
+                   null: true,
+                   description: "Lists all consultations" do
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument let's you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument let's you order the results", required: false
+        end
+
+        type.field :consultation,
+                   Decidim::Consultations::ConsultationType,
+                   null: true,
+                   description: "Finds a consultation" do
+          argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
+        end
+      end
+
+      def consultations(filter: {}, order: {})
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :consultations }.first
+
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      end
+
+      def consultation(id: nil)
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :consultations }.first
+
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+      end
+    end
+  end
+end

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

@@ -5,11 +5,11 @@ require "decidim/dev"
 
 FactoryBot.define do
   sequence(:consultation_slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
   end
 
   sequence(:question_slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
   end
 
   factory :consultation, class: "Decidim::Consultation" do

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.23.6"
+      "0.24.0.rc1"
     end
   end
 end

data/lib/decidim/consultations.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/consultations/admin"
+require "decidim/consultations/api"
 require "decidim/consultations/engine"
 require "decidim/consultations/admin_engine"
 require "decidim/consultations/participatory_space"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -165,6 +165,7 @@ files:
 - app/forms/decidim/consultations/admin/response_group_form.rb
 - app/forms/decidim/consultations/multi_vote_form.rb
 - app/forms/decidim/consultations/vote_form.rb
+- app/helpers/decidim/consultations/admin/consultation_menu_helper.rb
 - app/helpers/decidim/consultations/admin/consultations_helper.rb
 - app/helpers/decidim/consultations/admin/questions_helper.rb
 - app/helpers/decidim/consultations/consultations_helper.rb
@@ -185,8 +186,6 @@ files:
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
 - app/services/decidim/consultations/consultation_search.rb
-- app/types/decidim/consultations/consultation_question_type.rb
-- app/types/decidim/consultations/consultation_type.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -353,11 +352,15 @@ files:
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
+- lib/decidim/api/consultation_question_type.rb
+- lib/decidim/api/consultation_type.rb
 - lib/decidim/consultations.rb
 - lib/decidim/consultations/admin.rb
 - lib/decidim/consultations/admin_engine.rb
+- lib/decidim/consultations/api.rb
 - lib/decidim/consultations/engine.rb
 - lib/decidim/consultations/participatory_space.rb
+- lib/decidim/consultations/query_extensions.rb
 - lib/decidim/consultations/test/factories.rb
 - lib/decidim/consultations/version.rb
 homepage: https://github.com/decidim/decidim
@@ -372,14 +375,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim consultations module

data/app/types/decidim/consultations/consultation_question_type.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Consultations
-    # This type represents a consultation.
-    ConsultationQuestionType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Comments::CommentableInterface }
-      ]
-
-      name "ConsultationQuestion"
-      description "A consultation question"
-
-      field :id, !types.ID, "Internal ID of the question"
-      field :title, Decidim::Core::TranslatedFieldType, "Title of the question"
-      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this question"
-      field :slug, !types.String, "Slug of the question"
-      field :createdAt, !Decidim::Core::DateTimeType, "The time this question was created", property: :created_at
-      field :updatedAt, !Decidim::Core::DateTimeType, "The time this question was updated", property: :updated_at
-      field :publishedAt, !Decidim::Core::DateTimeType, "The time this question was published", property: :published_at
-
-      field :components, types[Decidim::Core::ComponentInterface] do
-        description "Lists the components this space contains."
-
-        resolve ->(participatory_space, _args, _ctx) {
-                  Decidim::Component.where(
-                    participatory_space: participatory_space
-                  ).published
-                }
-      end
-
-      field :bannerImage, types.String, "The banner image for this question", property: :banner_image
-      field :heroImage, types.String, "The hero image for this question", property: :hero_image
-
-      field :whatIsDecided, Decidim::Core::TranslatedFieldType, "What is decided in this question", property: :what_is_decided
-      field :promoterGroup, Decidim::Core::TranslatedFieldType, "The promoter group of this question", property: :promoter_group
-      field :participatoryScope, Decidim::Core::TranslatedFieldType, "The participatory scope of this question", property: :participatory_scope
-      field :questionContext, Decidim::Core::TranslatedFieldType, "The context for this question", property: :question_context
-      field :reference, types.String, "The reference for this question", property: :reference
-      field :hashtag, types.String, "The hashtag of this question", property: :hashtag
-      field :votesCount, types.Int, "The number of votes in this question", property: :votes_count
-      field :originScope, Decidim::Core::TranslatedFieldType, "The origin scope of this question", property: :origin_scope
-      field :originTitle, Decidim::Core::TranslatedFieldType, "The origin title of this question", property: :origin_title
-      field :originUrl, types.String, "The origin URL for this question", property: :origin_url
-      field :iFrameUrl, types.String, "The iframe URL for this question", property: :i_frame_url
-      field :externalVoting, types.Boolean, "If the question has external voting", property: :external_voting
-      field :responsesCount, types.Int, "The number of responses for this question", property: :responses_count
-      field :order, types.Int, "The order in which the question should be represented", property: :order
-      field :maxVotes, types.Int, "The maximum number of votes in this question", property: :max_votes
-      field :minVotes, types.Int, "The minimum number of votes in this question", property: :min_votes
-      field :responseGroupsCount, types.Int, "The number of group responses for this question", property: :response_groups_count
-      field :instructions, Decidim::Core::TranslatedFieldType, "Instructions for this question", property: :instructions
-    end
-  end
-end

data/app/types/decidim/consultations/consultation_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Consultations
-    # This type represents a consultation.
-    ConsultationType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ParticipatorySpaceInterface }
-      ]
-
-      name "Consultation"
-      description "A consultation"
-
-      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this consultation"
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this consultation"
-      field :slug, !types.String, "Slug of this consultation"
-      field :createdAt, !Decidim::Core::DateTimeType, "The time this consultation was created", property: :created_at
-      field :updatedAt, !Decidim::Core::DateTimeType, "The time this consultation was updated", property: :updated_at
-      field :publishedAt, !Decidim::Core::DateTimeType, "The time this consultation was published", property: :published_at
-
-      field :introductoryVideoUrl, types.String, "The introductory video url for this consultation", property: :introductory_video_url
-      field :introductoryImage, types.String, "The introductory image for this consultation", property: :introductory_image
-      field :bannerImage, types.String, "The banner image for this consultation", property: :banner_image
-      field :highlightedScope, Decidim::Core::ScopeApiType, "This is the highlighted scope of this consultation", property: :highlighted_scope
-      field :startVotingDate, Decidim::Core::DateType, "Start date of the voting for this consultation", property: :start_voting_date
-      field :endVotingDate, Decidim::Core::DateType, "End date of the voting for this consultation", property: :end_voting_date
-      field :resultsPublishedAt, Decidim::Core::DateType, "Date when the results have been published", property: :results_published_at
-
-      field :questions, types[Decidim::Consultations::ConsultationQuestionType], ""
-    end
-  end
-end