decidim-budgets 0.26.10 → 0.27.0.rc1

data/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -8,8 +8,9 @@ module Decidim
         include Decidim::ApplicationHelper
         include Decidim::Proposals::Admin::Picker if Decidim::Budgets.enable_proposal_linking
         include Decidim::Budgets::Admin::Filterable
+        helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
 
-        helper_method :projects, :finished_orders, :pending_orders, :present
+        helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
         def collection
           @collection ||= budget.projects.page(params[:page]).per(15)
@@ -74,6 +75,93 @@ module Decidim
           end
         end
 
+        def update_category
+          enforce_permission_to :update, :project_category
+
+          ::Decidim::Budgets::Admin::UpdateProjectCategory.call(params[:category][:id], project_ids) do
+            on(:invalid_category) do
+              flash.now[:error] = I18n.t(
+                "projects.update_category.select_a_category",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = I18n.t(
+                "projects.update_category.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_category) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :category)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :category)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
+          end
+        end
+
+        def update_scope
+          enforce_permission_to :update, :project_scope
+
+          ::Decidim::Budgets::Admin::UpdateProjectScope.call(params[:scope_id], project_ids) do
+            on(:invalid_scope) do
+              flash.now[:error] = t(
+                "projects.update_scope.select_a_scope",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_scope.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_scope) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :scope)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :scope)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
+          end
+        end
+
+        def update_selected
+          enforce_permission_to :update, :project_selected
+
+          ::Decidim::Budgets::Admin::UpdateProjectSelection.call(params.dig(:selected, "value"), project_ids) do
+            on(:invalid_selection) do
+              flash.now[:error] = t(
+                "projects.update_selected.select_a_selection",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_selected.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_selection) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :selected)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :selected)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-change-selected-projects", attribute_selector: "#selected_value" } }
+          end
+        end
+
         private
 
         def projects
@@ -84,6 +172,10 @@ module Decidim
           @orders ||= Order.where(budget: budget)
         end
 
+        def project_ids
+          @project_ids ||= params[:project_ids]
+        end
+
         def pending_orders
           orders.pending
         end
@@ -95,6 +187,62 @@ module Decidim
         def project
           @project ||= projects.find(params[:id])
         end
+
+        def update_projects_bulk_response_successful(response, subject)
+          return if response[:successful].blank?
+
+          case subject
+          when :category
+            t(
+              "projects.update_category.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :scope
+            t(
+              "projects.update_scope.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :selected
+            t(
+              "projects.update_selected.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          end
+        end
+
+        def update_projects_bulk_response_errored(response, subject)
+          return if response[:errored].blank?
+
+          case subject
+          when :category
+            t(
+              "projects.update_category.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :scope
+            t(
+              "projects.update_scope.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :selected
+            t(
+              "projects.update_selected.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          end
+        end
       end
     end
   end

data/app/controllers/decidim/budgets/line_items_controller.rb

@@ -44,11 +44,11 @@ module Decidim
       private
 
       def project
-        @project ||= budget&.projects&.find_by(id: params[:project_id])
+        @project ||= Project.includes(:budget).find_by(id: params[:project_id], decidim_budgets_budget_id: params[:budget_id])
       end
 
       def budget
-        @budget ||= Budget.find_by(id: params[:budget_id], component: current_component)
+        @budget ||= project.budget
       end
     end
   end

data/app/controllers/decidim/budgets/orders_controller.rb

@@ -39,7 +39,7 @@ module Decidim
       private
 
       def budget
-        @budget ||= Budget.find_by(id: params[:budget_id], component: current_component)
+        @budget ||= Budget.find_by(id: params[:budget_id])
       end
 
       def redirect_path

data/app/controllers/decidim/budgets/projects_controller.rb

@@ -8,7 +8,7 @@ module Decidim
       include NeedsCurrentOrder
       include Decidim::Budgets::Orderable
 
-      helper_method :projects, :project, :budget
+      helper_method :projects, :project, :budget, :all_geocoded_projects
 
       def index
         raise ActionController::RoutingError, "Not Found" unless budget
@@ -28,37 +28,33 @@ module Decidim
       def projects
         return @projects if @projects
 
-        @projects = reorder(search.results)
-        @projects = @projects.page(params[:page]).per(current_component.settings.projects_per_page)
+        @projects = search.result.page(params[:page]).per(current_component.settings.projects_per_page)
+        @projects = reorder(@projects)
+      end
+
+      def all_geocoded_projects
+        @all_geocoded_projects ||= projects.geocoded
       end
 
       def project
-        @project ||= budget&.projects&.find_by(id: params[:id])
+        @project ||= Project.find_by(id: params[:id])
       end
 
-      def search_klass
-        ProjectSearch
+      def search_collection
+        Project.where(budget: budget).includes([:scope, :component, :attachments, :category])
       end
 
       def default_filter_params
         {
-          search_text: "",
-          status: default_filter_status_params,
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params
+          search_text_cont: "",
+          with_any_status: default_filter_status_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params
         }
       end
 
       def default_filter_status_params
-        show_selected_budgets? ? %w(selected) : %w(all)
-      end
-
-      def show_selected_budgets?
-        voting_finished? && budget.projects.selected.any?
-      end
-
-      def context_params
-        { budget: budget, component: current_component, organization: current_organization }
+        voting_finished? ? %w(selected) : %w(all)
       end
     end
   end

data/app/forms/decidim/budgets/admin/budget_form.rb

@@ -16,8 +16,7 @@ module Decidim
         attribute :decidim_scope_id, Integer
 
         validates :title, translatable_presence: true
-        validates :weight, numericality: { greater_than_or_equal_to: 0 }
-        validates :total_budget, numericality: { greater_than: 0 }
+        validates :weight, :total_budget, numericality: { greater_than_or_equal_to: 0 }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
 
@@ -25,14 +24,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
       end
     end

data/app/forms/decidim/budgets/admin/order_reminder_form.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class OrderReminderForm < Decidim::Form
+        def reminder_amount
+          @reminder_amount ||= if !voting_enabled? || voting_ends_soon?
+                                 0
+                               else
+                                 user_ids = []
+                                 unfinished_orders.each do |order|
+                                   reminder = Decidim::Reminder.find_by(component: current_component, user: order.user)
+                                   if !reminder || (reminder.deliveries.present? && reminder.deliveries.last.created_at < minimum_interval_between_reminders.ago)
+                                     user_ids << order.user.id
+                                   end
+                                 end
+                                 user_ids.uniq.count
+                               end
+        end
+
+        def voting_enabled?
+          current_component.current_settings.votes == "enabled"
+        end
+
+        def voting_ends_soon?
+          return false unless participatory_space.respond_to? :active_step
+          return false if participatory_space.active_step.blank?
+
+          time_zone = current_organization.time_zone
+          return false if time_zone.blank?
+
+          end_time = current_component.participatory_space.active_step[:end_date].in_time_zone(time_zone).end_of_day
+
+          6.hours.from_now >= end_time
+        end
+
+        def minimum_interval_between_reminders
+          24.hours
+        end
+
+        private
+
+        def minimum_time_before_first_reminder
+          @minimum_time_before_first_reminder ||= begin
+            reminder_manifest = Decidim.reminders_registry.for(:orders)
+            if reminder_manifest.blank?
+              minimum_interval_between_reminders
+            else
+              Array(reminder_manifest.settings.attributes[:reminder_times].default).first
+            end
+          end
+        end
+
+        def participatory_space
+          @participatory_space ||= current_component.participatory_space
+        end
+
+        def unfinished_orders
+          @unfinished_orders ||= Decidim::Budgets::Order.where(
+            budget: budgets,
+            checked_out_at: nil,
+            created_at: Time.zone.at(0)..minimum_time_before_first_reminder.ago
+          ).select do |order|
+            order.user.email.present?
+          end
+        end
+
+        def budgets
+          @budgets ||= Decidim::Budgets::Budget.where(component: current_component)
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -13,6 +13,9 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :description, String
 
+        attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
         attribute :budget_amount, Integer
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
@@ -25,7 +28,7 @@ module Decidim
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :budget_amount, presence: true, numericality: { greater_than: 0 }
-
+        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
@@ -33,6 +36,7 @@ module Decidim
         validate :notify_missing_attachment_if_errored
 
         delegate :categories, to: :current_component
+        alias component current_component
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
@@ -49,6 +53,18 @@ module Decidim
                          &.order(title: :asc)
         end
 
+        def geocoding_enabled?
+          Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
+        end
+
+        def has_address?
+          geocoding_enabled? && address.present?
+        end
+
+        def geocoded?
+          latitude.present? && longitude.present?
+        end
+
         # Finds the Budget from the decidim_budgets_budget_id.
         #
         # Returns a Decidim::Budgets:Budget
@@ -67,14 +83,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the project
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         private

data/app/helpers/decidim/budgets/admin/project_bulk_actions_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      module ProjectBulkActionsHelper
+        def bulk_selections
+          select(
+            :selected,
+            :value,
+            [
+              [t("projects.index.select_for_implementation", scope: "decidim.budgets.admin"), true],
+              [t("projects.index.deselect_implementation", scope: "decidim.budgets.admin"), false]
+            ]
+          )
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/budgets/projects_helper.rb

@@ -4,6 +4,9 @@ module Decidim
   module Budgets
     # A helper to render order and budgets actions
     module ProjectsHelper
+      include Decidim::ApplicationHelper
+      include Decidim::MapHelper
+
       # Render a budget as a currency
       #
       # budget - A integer to represent a budget
@@ -80,6 +83,32 @@ module Decidim
           t(".vote_threshold_percent_rule.description", minimum_budget: budget_to_currency(current_order.minimum_budget))
         end
       end
+
+      # Serialize a collection of geocoded projects to be used by the dynamic map component
+      #
+      # geocoded_projects - A collection of geocoded projects
+      def projects_data_for_map(geocoded_projects)
+        geocoded_projects.map do |project|
+          project_data_for_map(project)
+        end
+      end
+
+      def project_data_for_map(project)
+        project
+          .slice(:latitude, :longitude, :address)
+          .merge(
+            title: decidim_html_escape(translated_attribute(project.title)),
+            description: html_truncate(decidim_sanitize_editor(translated_attribute(project.description)), length: 100),
+            icon: icon("project", width: 40, height: 70, remove_icon_class: true),
+            link: ::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path
+          )
+      end
+
+      def has_position?(project)
+        return if project.address.blank?
+
+        project.latitude.present? && project.longitude.present?
+      end
     end
   end
 end

data/app/jobs/decidim/budgets/send_vote_reminder_job.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class SendVoteReminderJob < ApplicationJob
+      queue_as :vote_reminder
+
+      def perform(reminder)
+        return if reminder.records.active.blank?
+
+        ::Decidim::ReminderDelivery.create(reminder: reminder)
+        ::Decidim::Budgets::VoteReminderMailer.vote_reminder(reminder).deliver_now
+      end
+    end
+  end
+end

data/app/mailers/decidim/budgets/vote_reminder_mailer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class VoteReminderMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+
+      helper Decidim::TranslationsHelper
+
+      helper_method :routes
+
+      # Send the user an email reminder to finish voting
+      #
+      # reminder - the reminder to send.
+      def vote_reminder(reminder)
+        @reminder = reminder
+        @user = reminder.user
+        with_user(@user) do
+          @orders = reminder.records.active.map(&:remindable)
+          @organization = @user.organization
+
+          subject = I18n.t(
+            "decidim.budgets.vote_reminder_mailer.vote_reminder.email_subject",
+            count: @orders.count
+          )
+
+          mail(to: @user.email, subject: subject)
+        end
+      end
+
+      private
+
+      def routes
+        @routes ||= Decidim::EngineRouter.main_proxy(@reminder.component)
+      end
+    end
+  end
+end

data/app/models/decidim/budgets/order.rb

@@ -5,7 +5,7 @@ module Decidim
     # The data store for a Order in the Decidim::Budgets component. It is unique for each
     # user and component and contains a collection of projects
     class Order < Budgets::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id"
@@ -15,7 +15,6 @@ module Decidim
       has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
       validates :user, uniqueness: { scope: :budget }
-      validates :budget, presence: true
       validate :user_belongs_to_organization
 
       # Rules active for the budget threshold and minimum budgets rules.
@@ -109,7 +108,6 @@ module Decidim
       # enabled
       def budget_percent
         return (total_projects.to_f / maximum_projects) * 100 if projects_rule?
-        return 0 if budget.total_budget.zero?
 
         (total_budget.to_f / budget.total_budget) * 100
       end
@@ -172,7 +170,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Budgets::DataPortabilityBudgetsOrderSerializer
+        Decidim::Budgets::DownloadYourDataBudgetsOrderSerializer
       end
 
       def self.newsletter_participant_ids(component)

data/app/models/decidim/budgets/project.rb

@@ -18,6 +18,7 @@ module Decidim
       include Decidim::Randomable
       include Decidim::Searchable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       translatable_fields :title, :description
 
@@ -33,6 +34,10 @@ module Decidim
       scope :selected, -> { where.not(selected_at: nil) }
       scope :not_selected, -> { where(selected_at: nil) }
 
+      geocoded_by :address
+
+      scope_search_multi :with_any_status, [:selected, :not_selected]
+
       searchable_fields(
         scope_id: :decidim_scope_id,
         participatory_space: { component: :participatory_space },
@@ -54,16 +59,12 @@ module Decidim
         Decidim::Budgets::AdminLog::ProjectPresenter
       end
 
-      def resource_locator
-        ::Decidim::ResourceLocatorPresenter.new([budget, self])
-      end
-
       def polymorphic_resource_path(url_params)
-        resource_locator.path(url_params)
+        ::Decidim::ResourceLocatorPresenter.new([budget, self]).path(url_params)
       end
 
       def polymorphic_resource_url(url_params)
-        resource_locator.url(url_params)
+        ::Decidim::ResourceLocatorPresenter.new([budget, self]).url(url_params)
       end
 
       # Public: Overrides the `comments_have_votes?` Commentable concern method.
@@ -102,10 +103,9 @@ module Decidim
         Arel.sql(%{cast("decidim_budgets_projects"."id" as text)})
       end
 
-      # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       ransacker :selected do
         Arel.sql(%{("decidim_budgets_projects"."selected_at")::text})
@@ -123,6 +123,10 @@ module Decidim
         SQL
         Arel.sql(query)
       end
+
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_status, :with_any_scope, :with_any_category]
+      end
     end
   end
 end

data/app/packs/entrypoints/decidim_budgets_admin.js

@@ -0,0 +1 @@
+import "src/decidim/budgets/admin/projects"