decidim-budgets 0.23.2 → 0.24.0

data/config/locales/uk.yml

@@ -72,10 +72,10 @@ uk:
           description: Ось проекти, які ви обрали складовими бюджету.
           title: Підтвердьте голос
         budget_excess:
+          budget_excess:
+            title: Перевищено граничний бюджет
           close: Закрити
-          description: Додавання цього проекту перевищить максимальний бюджет, і тому його не можна зараз додати. За бажанням ви можете видалити якийсь з тих проектів, що ви раніше вибрали для додавання, або проголосувати згідно ваших уподобань.
           ok: Гаразд
-          title: Перевищено граничний бюджет
         budget_summary:
           are_you_sure: Ви дійсно бажаєте скасувати ваш голос?
           assigned: 'Надано:'
@@ -83,7 +83,6 @@ uk:
           checked_out:
             description: Ви вже проголосували за бюджет. Якщо ви змінили свою думку, ви можете %{cancel_link}.
             title: Голосування щодо бюджету завершено
-          description: На які проекти, на вашу думку, ми маємо виділити кошти? Надавайте принаймні %{minimum_budget} бажаним для вас проектам та голосуйте згідно своїх уподобань, щоб визначити бюджет.
           title: Ви визначаєте бюджет
         count:
           projects_count:
@@ -125,7 +124,6 @@ uk:
             announcement: Оголошення
             comments_enabled: Коментарі увімкнено
             projects_per_page: Проектів на сторінку
-            resources_permissions_enabled: Для кожної зустрічі можна встановити ті чи інші дозволи на дії
             total_budget: Загальний бюджет
             vote_threshold_percent: Мінімальний відсоток бюджету для голосування
           step:
@@ -146,4 +144,3 @@ uk:
         project_proposal: 'Пропозиції, включені до цього проекту:'
   index:
     confirmed_orders_count: Кількість голосів
-  total_budget: Загальний бюджет

data/config/locales/zh-CN.yml

@@ -133,10 +133,10 @@ zh-CN:
           description: 这些是你选择作为预算一部分的项目。
           title: 确认投票
         budget_excess:
+          budget_excess:
+            title: 超出最大预算
           close: 关闭
-          description: 此项目超出了最大预算，无法添加。 如果你想要，你可以删除一个你已经选择添加的项目，或者选择你的首选项投票。
           ok: 好的
-          title: 超出最大预算
         budget_summary:
           are_you_sure: 您确定要取消您的投票吗？
           assigned: '已指派：'
@@ -144,8 +144,6 @@ zh-CN:
           checked_out:
             description: 您已经投票给了预算。如果您改变了主意，您可以 %{cancel_link}。
             title: 预算投票完成
-          description: 你认为我们应该为哪些项目分配预算？ 给您想要的项目分配至少 %{minimum_budget} ，并且以您的首选项投票来定义预算。
-          description_minimum_projects_rule: 你认为我们应该为哪些项目分配预算？ 选择至少 %{minimum_number} 个项目，您想要并以您的首选项投票来定义预算。
           title: 您决定预算
         count:
           projects_count:
@@ -185,7 +183,6 @@ zh-CN:
           view: 查看
           votes:
             other: 投票
-          you_voted: 您投票了
         project_budget_button:
           add: 添加到您的投票
           add_descriptive: 将项目 %{resource_name} 添加到您的投票
@@ -212,7 +209,6 @@ zh-CN:
             landing_page_content: 预算登陆页
             more_information_modal: 更多信息模式
             projects_per_page: 每页项目数
-            resources_permissions_enabled: 每次会议都可以设置动作权限
             scope_id: 范围
             scopes_enabled: 范围已启用
             title: 标题
@@ -257,4 +253,3 @@ zh-CN:
         project_proposal: '本项目中的建议：'
   index:
     confirmed_orders_count: 所得票数
-  total_budget: 预算总额

data/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb

@@ -7,12 +7,12 @@ class VotesEnabledToVotesChoices < ActiveRecord::Migration[5.2]
 
   def up
     budget_components.each do |component|
-      steps = component["settings"] && component["settings"].dig("steps")
-      default_step = component["settings"] && component["settings"].dig("default_step")
+      steps = component["settings"] && component["settings"]["steps"]
+      default_step = component["settings"] && component["settings"]["default_step"]
 
       if steps.present?
         new_steps_settings = component["settings"]["steps"].each_with_object({}) do |(step, config), new_config|
-          votes_value = config.dig("votes_enabled") ? "enabled" : "disabled"
+          votes_value = config["votes_enabled"] ? "enabled" : "disabled"
 
           new_config[step] = config.merge("votes": votes_value).except("votes_enabled")
           new_config
@@ -20,7 +20,7 @@ class VotesEnabledToVotesChoices < ActiveRecord::Migration[5.2]
         component["settings"]["steps"] = new_steps_settings
         component.save!
       elsif default_step.present?
-        votes_value = component["settings"]["default_step"].dig("votes_enabled") ? "enabled" : "disabled"
+        votes_value = component["settings"]["default_step"]["votes_enabled"] ? "enabled" : "disabled"
 
         new_default_step_settings = component["settings"]["default_step"].merge("votes": votes_value).except("votes_enabled")
         component["settings"]["default_step"] = new_default_step_settings

data/db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToBudgets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_budgets_projects, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Budgets::Project.reset_column_information
+        Decidim::Budgets::Project.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/api/budget_type.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class BudgetType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::TraceableInterface
+
+      description "A budget"
+
+      field :id, GraphQL::Types::ID, "The internal ID of this budget", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this budget", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this budget", null: false
+      field :total_budget, GraphQL::Types::Int, "The total budget", null: false, camelize: false
+      field :created_at, Decidim::Core::DateTimeType, "When this budget was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this budget was updated", null: true
+
+      field :projects, [Decidim::Budgets::ProjectType, { null: true }], "The projects for this budget", null: false
+    end
+  end
+end

data/lib/decidim/api/budgets_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class BudgetsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Budgets"
+      description "A budget component of a participatory space."
+
+      field :budgets, Decidim::Budgets::BudgetType.connection_type, null: true, connection: true
+
+      def budgets
+        Budget.where(component: object).includes(:component)
+      end
+
+      field :budget, Decidim::Budgets::BudgetType, null: true do
+        argument :id, GraphQL::Types::ID, required: true
+      end
+
+      def budget(**args)
+        Budget.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

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