decidim-budgets 0.23.3 → 0.24.0.rc1

data/lib/decidim/api/project_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class ProjectType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::CategorizableInterface
+
+      description "A project"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this project", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this project", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this project", null: true
+      field :budget_amount, GraphQL::Types::Int, "The budget amount for this project", null: true, camelize: false
+      field :selected, GraphQL::Types::Boolean, "Whether this proposal is selected or not", method: :selected?, null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this project was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this project was updated", null: true
+      field :reference, GraphQL::Types::String, "The reference for this project", null: true
+    end
+  end
+end

data/lib/decidim/budgets.rb

@@ -2,6 +2,7 @@
 
 require "decidim/budgets/workflows"
 require "decidim/budgets/admin"
+require "decidim/budgets/api"
 require "decidim/budgets/engine"
 require "decidim/budgets/admin_engine"
 require "decidim/budgets/component"
@@ -9,5 +10,6 @@ require "decidim/budgets/component"
 module Decidim
   # Base module for this engine.
   module Budgets
+    autoload :ProjectSerializer, "decidim/budgets/project_serializer"
   end
 end

data/lib/decidim/budgets/api.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    autoload :ProjectType, "decidim/api/project_type"
+    autoload :BudgetType, "decidim/api/budget_type"
+    autoload :BudgetsType, "decidim/api/budgets_type"
+  end
+end

data/lib/decidim/budgets/component.rb

@@ -62,6 +62,19 @@ Decidim.register_component(:budgets) do |component|
     Decidim::Follow.where(decidim_followable_type: "Decidim::Budgets::Project", decidim_followable_id: projects_ids).count
   end
 
+  component.exports :projects do |exports|
+    exports.collection do |component_instance, _user, resource_id|
+      budgets = resource_id ? Decidim::Budgets::Budget.find(resource_id) : Decidim::Budgets::Budget.where(decidim_component_id: component_instance)
+      Decidim::Budgets::Project
+        .where(decidim_budgets_budget_id: budgets)
+        .includes(:category, :component)
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Budgets::ProjectSerializer
+  end
+
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
@@ -69,8 +82,12 @@ Decidim.register_component(:budgets) do |component|
     settings.attribute :projects_per_page, type: :integer, default: 12
     settings.attribute :vote_rule_threshold_percent_enabled, type: :boolean, default: true
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
+    settings.attribute :vote_threshold_percent, type: :integer, default: 70
     settings.attribute :vote_rule_minimum_budget_projects_enabled, type: :boolean, default: false
     settings.attribute :vote_minimum_budget_projects_number, type: :integer, default: 1
+    settings.attribute :vote_rule_selected_projects_enabled, type: :boolean, default: false
+    settings.attribute :vote_selected_projects_minimum, type: :integer, default: 0
+    settings.attribute :vote_selected_projects_maximum, type: :integer, default: 1
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
@@ -105,7 +122,7 @@ Decidim.register_component(:budgets) do |component|
       participatory_space: participatory_space,
       settings: {
         landing_page_content: landing_page_content,
-        more_information_modal: Decidim::Faker::Localized.paragraph(4),
+        more_information_modal: Decidim::Faker::Localized.paragraph(sentence_count: 4),
         workflow: %w(one random all).sample
       }
     )
@@ -113,11 +130,11 @@ Decidim.register_component(:budgets) do |component|
     rand(1...3).times do
       Decidim::Budgets::Budget.create!(
         component: component,
-        title: Decidim::Faker::Localized.sentence(2),
+        title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(3)
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
-        total_budget: Faker::Number.number(8)
+        total_budget: Faker::Number.number(digits: 8)
       )
     end
 
@@ -127,35 +144,35 @@ Decidim.register_component(:budgets) do |component|
           budget: budget,
           scope: participatory_space.organization.scopes.sample,
           category: participatory_space.categories.sample,
-          title: Decidim::Faker::Localized.sentence(2),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
-          budget_amount: Faker::Number.number(8)
+          budget_amount: Faker::Number.number(digits: 8)
         )
 
         attachment_collection = Decidim::AttachmentCollection.create!(
           name: Decidim::Faker::Localized.word,
-          description: Decidim::Faker::Localized.sentence(5),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           collection_for: project
         )
 
         Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           attachment_collection: attachment_collection,
           attached_to: project,
           file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf"))
         )
         Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           file: File.new(File.join(__dir__, "seeds", "city.jpeg"))
         )
         Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: project,
           file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf"))
         )

data/lib/decidim/budgets/project_serializer.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class ProjectSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+      include Decidim::TranslationsHelper
+
+      # Public: Initializes the serializer with a project.
+      def initialize(project)
+        @project = project
+      end
+
+      # Public: Exports a hash with the serialized data for this project.
+      def serialize
+        {
+          id: project.id,
+          category: {
+            id: project.category.try(:id),
+            name: project.category.try(:name) || empty_translatable
+          },
+          scope: {
+            id: project.scope.try(:id),
+            name: project.scope.try(:name) || empty_translatable
+          },
+          participatory_space: {
+            id: project.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(project.participatory_space).url
+          },
+          component: { id: component.id },
+          title: project.title,
+          description: project.description,
+          budget: { id: project.budget.id },
+          budget_amount: project.budget_amount,
+          confirmed_votes: project.confirmed_orders_count,
+          comments: project.comments.count,
+          created_at: project.created_at,
+          url: project.polymorphic_resource_url({}),
+          related_proposals: related_proposals,
+          related_proposal_titles: related_proposal_titles,
+          related_proposal_urls: related_proposal_urls
+        }
+      end
+
+      private
+
+      attr_reader :project
+
+      def component
+        project.component
+      end
+
+      def related_proposals
+        project.linked_resources(:proposals, "included_proposals").map(&:id)
+      end
+
+      def related_proposal_titles
+        project.linked_resources(:proposals, "included_proposals").map do |proposal|
+          Decidim::Proposals::ProposalPresenter.new(proposal).title
+        end
+      end
+
+      def related_proposal_urls
+        project.linked_resources(:proposals, "included_proposals").map do |proposal|
+          Decidim::ResourceLocatorPresenter.new(proposal).url
+        end
+      end
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(project).url
+      end
+
+      def empty_translatable(locales = Decidim.available_locales)
+        locales.each_with_object({}) do |locale, result|
+          result[locale.to_s] = ""
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,7 @@ FactoryBot.define do
       transient do
         vote_rule_threshold_percent_enabled { true }
         vote_rule_minimum_budget_projects_enabled { false }
+        vote_rule_projects_enabled { false }
         vote_threshold_percent { 70 }
       end
 
@@ -23,6 +24,7 @@ FactoryBot.define do
         {
           vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
           vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
           vote_threshold_percent: vote_threshold_percent
         }
       end
@@ -32,6 +34,7 @@ FactoryBot.define do
       transient do
         vote_rule_threshold_percent_enabled { false }
         vote_rule_minimum_budget_projects_enabled { true }
+        vote_rule_projects_enabled { false }
         vote_minimum_budget_projects_number { 3 }
       end
 
@@ -39,11 +42,32 @@ FactoryBot.define do
         {
           vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
           vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
           vote_minimum_budget_projects_number: vote_minimum_budget_projects_number
         }
       end
     end
 
+    trait :with_budget_projects_range do
+      transient do
+        vote_rule_threshold_percent_enabled { false }
+        vote_rule_minimum_budget_projects_enabled { false }
+        vote_rule_projects_enabled { true }
+        vote_minimum_budget_projects_number { 3 }
+        vote_maximum_budget_projects_number { 6 }
+      end
+
+      settings do
+        {
+          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
+          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
+          vote_selected_projects_minimum: vote_minimum_budget_projects_number,
+          vote_selected_projects_maximum: vote_maximum_budget_projects_number
+        }
+      end
+    end
+
     trait :with_votes_disabled do
       step_settings do
         {
@@ -96,12 +120,22 @@ FactoryBot.define do
   factory :project, class: "Decidim::Budgets::Project" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    budget_amount { Faker::Number.number(8) }
+    budget_amount { Faker::Number.number(digits: 8) }
     budget { create(:budget) }
 
     trait :selected do
       selected_at { Time.current }
     end
+
+    trait :with_photos do
+      transient do
+        photos_number { 2 }
+      end
+
+      after :create do |project, evaluator|
+        project.attachments = create_list(:attachment, evaluator.photos_number, :with_image, attached_to: project)
+      end
+    end
   end
 
   factory :order, class: "Decidim::Budgets::Order" do

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.23.3"
+      "0.24.0.rc1"
     end
   end
 end

data/lib/decidim/budgets/workflows/all.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         # Users can vote in all budgets with this workflow.
-        def vote_allowed?(resource, _consider_progress = true)
+        def vote_allowed?(resource, _consider_progress: true)
           !voted?(resource)
         end
       end

data/lib/decidim/budgets/workflows/base.rb

@@ -40,7 +40,7 @@ module Decidim
         #                      Using `false` allow UI to offer users to discard votes in progress to start voting in another resource.
         #
         # Returns Boolean.
-        def vote_allowed?(_resource, _consider_progress = true)
+        def vote_allowed?(_resource, _consider_progress: true)
           raise StandardError, "Not implemented"
         end
 
@@ -64,14 +64,14 @@ module Decidim
         #
         # Returns Array.
         def voted
-          @voted ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :voted } .compact
+          @voted ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :voted }.compact
         end
 
         # Public: Return the list of budget resources where the user has orders in progress.
         #
         # Returns Array.
         def progress
-          @progress ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :progress } .compact
+          @progress ||= orders.values.map { |order_info| order_info[:order].budget if order_info[:status] == :progress }.compact
         end
 
         # Public: Return the list of budget resources where the user could discard their order to vote in other components.

data/lib/decidim/budgets/workflows/one.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         # Users can vote in any budget with this workflow, but only in one.
-        def vote_allowed?(resource, consider_progress = true)
+        def vote_allowed?(resource, consider_progress: true)
           return false if voted.any?
 
           if consider_progress

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        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.3
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -80,42 +80,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        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.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -214,9 +214,6 @@ files:
 - app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb
 - app/serializers/decidim/budgets/data_portability_budgets_order_serializer.rb
 - app/services/decidim/budgets/project_search.rb
-- app/types/decidim/budgets/budget_type.rb
-- app/types/decidim/budgets/budgets_type.rb
-- app/types/decidim/budgets/project_type.rb
 - app/views/decidim/budgets/admin/budgets/_form.html.erb
 - app/views/decidim/budgets/admin/budgets/edit.html.erb
 - app/views/decidim/budgets/admin/budgets/index.html.erb
@@ -332,11 +329,16 @@ files:
 - db/migrate/20200728075039_add_selected_at_to_project.rb
 - db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
 - db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb
+- lib/decidim/api/budget_type.rb
+- lib/decidim/api/budgets_type.rb
+- lib/decidim/api/project_type.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb
+- lib/decidim/budgets/api.rb
 - lib/decidim/budgets/component.rb
 - lib/decidim/budgets/engine.rb
+- lib/decidim/budgets/project_serializer.rb
 - lib/decidim/budgets/seeds/Exampledocument.pdf
 - lib/decidim/budgets/seeds/city.jpeg
 - lib/decidim/budgets/test/factories.rb
@@ -357,14 +359,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 budgets module