decidim-proposals 0.20.1 → 0.23.1

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,8 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization)
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn.not_hidden
           @query = @query.group("decidim_categorizations.decidim_category_id",

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -22,10 +19,8 @@ module Decidim
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -36,11 +31,10 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn.not_hidden
+          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces.pluck(:id))).except_withdrawn.not_hidden.pluck(:id)
           @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
                                                    .left_outer_joins(proposal: :category)
-                                                   .where(proposal: proposals)
+                                                   .where(proposal: proposal_ids)
           @query = @query.where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.id",
                                 :participatory_space_type,

data/app/queries/decidim/proposals/similar_proposals.rb

@@ -30,8 +30,8 @@ module Decidim
           .published
           .where(
             "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
-            @proposal.title,
-            @proposal.body,
+            translated_attribute(@proposal.title),
+            translated_attribute(@proposal.body),
             Decidim::Proposals.similarity_threshold
           )
           .limit(Decidim::Proposals.similarity_limit)
@@ -40,11 +40,11 @@ module Decidim
       private
 
       def title_similarity
-        "similarity(title, ?)"
+        "similarity(title::text, ?)"
       end
 
       def body_similarity
-        "similarity(body, ?)"
+        "similarity(body::text, ?)"
       end
     end
   end

data/app/services/decidim/proposals/collaborative_draft_search.rb

@@ -5,6 +5,8 @@ module Decidim
     # A service to encapsualte all the logic when searching and filtering
     # collaborative drafts in a participatory process.
     class CollaborativeDraftSearch < ResourceSearch
+      text_search_fields :title, :body
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the drafts from.
       # page        - The page number to paginate the results.
@@ -14,6 +16,9 @@ module Decidim
       end
 
       # Handle the search_text filter
+      #
+      # We can't use the search from `ResourceFilter` since these fields aren't
+      # translated.
       def search_search_text
         query
           .where("title ILIKE ?", "%#{search_text}%")
@@ -22,16 +27,9 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        case state
-        when "open"
-          query.open
-        when "withdrawn"
-          query.withdrawn
-        when "published"
-          query.published
-        else
-          query
-        end
+        return query if state.member?("all")
+
+        apply_scopes(%w(open withdrawn published), state)
       end
 
       # Filters drafts by the name of the classes they are linked to. By default,

data/app/services/decidim/proposals/diff_renderer.rb

@@ -8,8 +8,8 @@ module Decidim
       # Lists which attributes will be diffable and how they should be rendered.
       def attribute_types
         {
-          title: :string,
-          body: :string,
+          title: :i18n,
+          body: :i18n,
           decidim_category_id: :category,
           decidim_scope_id: :scope,
           address: :string,
@@ -21,14 +21,18 @@ module Decidim
 
       # Parses the values before parsing the changeset.
       def parse_changeset(attribute, values, type, diff)
+        return parse_scope_changeset(attribute, values, type, diff) if type == :scope
+
         values = parse_values(attribute, values)
+        old_value = values[0]
+        new_value = values[1]
 
         diff.update(
           attribute => {
             type: type,
             label: I18n.t(attribute, scope: i18n_scope),
-            old_value: values[0],
-            new_value: values[1]
+            old_value: old_value,
+            new_value: new_value
           }
         )
       end
@@ -38,7 +42,15 @@ module Decidim
       # Returns and Array of two Strings.
       def parse_values(attribute, values)
         values = [amended_previous_value(attribute), values[1]] if proposal&.emendation?
-        values = values.map { |value| normalize_line_endings(value) } if attribute == :body
+        if attribute == :body
+          values = values.map do |value|
+            if value.is_a?(Hash)
+              value.values.map { |subvalue| normalize_line_endings(subvalue) }
+            else
+              normalize_line_endings(value)
+            end
+          end
+        end
         values
       end
 

data/app/services/decidim/proposals/proposal_builder.rb

@@ -68,7 +68,7 @@ module Decidim
           "decidim_component_id",
           "reference",
           "proposal_votes_count",
-          "proposal_endorsements_count",
+          "endorsements_count",
           "proposal_notes_count"
         ).merge(
           "category" => original_proposal.category
@@ -102,8 +102,14 @@ module Decidim
 
       def copy_attachments(original_proposal, proposal)
         original_proposal.attachments.each do |attachment|
-          new_attachment = Decidim::Attachment.new(attachment.attributes.slice("content_type", "description", "file", "file_size", "title", "weight"))
-          new_attachment.attached_to = proposal
+          new_attachment = Decidim::Attachment.new(
+            {
+              # Attached to needs to be always defined before the file is set
+              attached_to: proposal
+            }.merge(
+              attachment.attributes.slice("content_type", "description", "file", "file_size", "title", "weight")
+            )
+          )
 
           if File.exist?(attachment.file.file.path)
             new_attachment.file = File.open(attachment.file.file.path)

data/app/services/decidim/proposals/proposal_search.rb

@@ -5,50 +5,15 @@ module Decidim
     # A service to encapsualte all the logic when searching and filtering
     # proposals in a participatory process.
     class ProposalSearch < ResourceSearch
+      text_search_fields :title, :body
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the proposals from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})
-        @component = options[:component]
-        @current_user = options[:current_user]
-        super(Proposal.all, options)
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where("title ILIKE ?", "%#{search_text}%")
-          .or(query.where("body ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the origin filter
-      def search_origin
-        case origin
-        when "official"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-        when "citizens"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-        when "user_group"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
-        when "meeting"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
-        else # Assume 'all'
-          query
-        end
+        base = options[:state]&.member?("withdrawn") ? Proposal.withdrawn : Proposal.except_withdrawn
+        super(base, options)
       end
 
       # Handle the activity filter
@@ -57,13 +22,13 @@ module Decidim
         when "voted"
           query
             .includes(:votes)
-            .where(decidim_proposals_proposal_votes: { decidim_author_id: @current_user })
+            .where(decidim_proposals_proposal_votes: { decidim_author_id: user })
         when "my_proposals"
           query
             .where.not(coauthorships_count: 0)
             .joins(:coauthorships)
             .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where(decidim_coauthorships: { decidim_author_id: @current_user })
+            .where(decidim_coauthorships: { decidim_author_id: user })
         else # Assume 'all'
           query
         end
@@ -71,20 +36,9 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        case state
-        when "accepted"
-          query.accepted
-        when "rejected"
-          query.rejected
-        when "evaluating"
-          query.evaluating
-        when "withdrawn"
-          query.withdrawn
-        when "except_rejected"
-          query.except_rejected.except_withdrawn
-        else # Assume 'not_withdrawn'
-          query.except_withdrawn
-        end
+        return query if state.member? "withdrawn"
+
+        apply_scopes(%w(accepted rejected evaluating state_not_published), state)
       end
 
       # Handle the amendment type filter
@@ -93,9 +47,9 @@ module Decidim
         when "proposals"
           query.only_amendables
         when "amendments"
-          query.only_visible_emendations_for(@current_user, @component)
+          query.only_visible_emendations_for(user, component)
         else # Assume 'all'
-          query.amendables_and_visible_emendations_for(@current_user, @component)
+          query.amendables_and_visible_emendations_for(user, component)
         end
       end
 
@@ -121,18 +75,6 @@ module Decidim
 
         query.where(id: from).or(query.where(id: to))
       end
-
-      # We overwrite the `results` method to ensure we only return unique
-      # results. We can't use `#uniq` because it returns an Array and we're
-      # adding scopes in the controller, and `#distinct` doesn't work here
-      # because in the later scopes we're ordering by `RANDOM()` in a DB level,
-      # and `SELECT DISTINCT` doesn't work with `RANDOM()` sorting, so we need
-      # to perform two queries.
-      #
-      # The correct behaviour is backed by tests.
-      def results
-        Proposal.where(id: super.pluck(:id))
-      end
     end
   end
 end

data/app/types/decidim/proposals/proposal_input_filter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalInputFilter < Decidim::Core::BaseInputFilter
+      include Decidim::Core::HasPublishableInputFilter
+
+      graphql_name "ProposalFilter"
+      description "A type used for filtering proposals inside a participatory space.
+
+A typical query would look like:
+
+```
+  {
+    participatoryProcesses {
+      components {
+        ...on Proposals {
+          proposals(filter:{ publishedBefore: \"2020-01-01\" }) {
+            id
+          }
+        }
+      }
+    }
+  }
+```
+"
+    end
+  end
+end

data/app/types/decidim/proposals/proposal_input_sort.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalInputSort < Decidim::Core::BaseInputSort
+      include Decidim::Core::HasPublishableInputSort
+      include Decidim::Core::HasEndorsableInputSort
+
+      graphql_name "ProposalSort"
+      description "A type used for sorting proposals"
+
+      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+      argument :vote_count,
+               type: String,
+               description: "Sort by number of votes, valid values are ASC or DESC. Will be ignored if votes are hidden",
+               required: false,
+               prepare: ->(value, _ctx) do
+                          { proposal_votes_count: value }
+                        end
+    end
+  end
+end

data/app/types/decidim/proposals/proposal_type.rb

@@ -8,33 +8,54 @@ module Decidim
 
       interfaces [
         -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::AuthorableInterface },
+        -> { Decidim::Core::CoauthorableInterface },
         -> { Decidim::Core::CategorizableInterface },
         -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface }
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::FingerprintInterface },
+        -> { Decidim::Core::AmendableInterface },
+        -> { Decidim::Core::AmendableEntityInterface },
+        -> { Decidim::Core::TraceableInterface },
+        -> { Decidim::Core::EndorsableInterface },
+        -> { Decidim::Core::TimestampsInterface }
       ]
 
       field :id, !types.ID
-      field :title, !types.String, "This proposal's title"
-      field :body, types.String, "This proposal's body"
-      field :state, types.String, "The state in which proposal is in"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this title"
+      field :body, Decidim::Core::TranslatedFieldType, "The description for this body"
       field :address, types.String, "The physical address (location) of this proposal"
-      field :reference, types.String, "This proposa'ls unique reference"
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal" do
+        resolve ->(proposal, _args, _ctx) {
+          [proposal.latitude, proposal.longitude]
+        }
+      end
+      field :reference, types.String, "This proposal's unique reference"
+      field :state, types.String, "The answer status in which proposal is in"
+      field :answer, Decidim::Core::TranslatedFieldType, "The answer feedback for the status for this proposal"
+
+      field :answeredAt, Decidim::Core::DateTimeType do
+        description "The date and time this proposal was answered"
+        property :answered_at
+      end
 
       field :publishedAt, Decidim::Core::DateTimeType do
         description "The date and time this proposal was published"
         property :published_at
       end
 
-      field :endorsements, !types[Decidim::Core::AuthorInterface], "The endorsements of this proposal." do
-        resolve ->(proposal, _, _) {
-          proposal.endorsements.map(&:normalized_author)
-        }
+      field :participatoryTextLevel, types.String do
+        description "If it is a participatory text, the level indicates the type of paragraph"
+        property :participatory_text_level
       end
+      field :position, types.Int, "Position of this proposal in the participatory text"
 
-      field :endorsementsCount, types.Int do
-        description "The total amount of endorsements the proposal has received"
-        property :proposal_endorsements_count
+      field :official, types.Boolean, "Whether this proposal is official or not", property: :official?
+      field :createdInMeeting, types.Boolean, "Whether this proposal comes from a meeting or not", property: :official_meeting?
+      field :meeting, Decidim::Meetings::MeetingType do
+        description "If the proposal comes from a meeting, the related meeting"
+        resolve ->(proposal, _, _) {
+          proposal.authors.first if proposal.official_meeting?
+        }
       end
 
       field :voteCount, types.Int do