decidim-budgets 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05956f5a4f497c595855001a0e9db2bad912c16b6f90b1833ddda013b968e369'
-  data.tar.gz: bcd6faf05f2b6829d3d2c64a52e1bafa49c94019fdba30e547ff7de314856c7c
+  metadata.gz: f6d8d13e020844efb51e9fbf69025c2f50e8e4ce55e6126ec10a38dc4ea25cc6
+  data.tar.gz: fb963e40341a1881b465fba889de2d33fc292854433e0712ee4753ba5f11e969
 SHA512:
-  metadata.gz: 8f59f6d0f77f55d80fd5fd335e254a68adeb14bc775ecfc2e48fa3c7c3b4d4d023bb065f93e173c453129a07b1db239d9405a7a34815fe57bb54997652107a92
-  data.tar.gz: 0af13ef35e89494ed91889c16382f3cb479df3bf33d321993a8acf672635b9a38607d75671d51ad226811f98ee600c75934152e96b55b8db09f2c06dc6857f89
+  metadata.gz: ba9214e3e9470af3e1844b8f5df22a1de1a3c23641d2c3eef49ccafaf3f8f3f3ce91197892634afce3555e02cfbd1fb0695ec2f853adc5c9adb2f26f084f1c34
+  data.tar.gz: dd8b4e38291f91988dd706640717851b89a1ccd2c43bb57eab93abbae327fd5af6c0ceb277de0227f5e3e56e9f84c179cd7226c11743fbd2177035e036f97950

data/app/commands/decidim/budgets/add_line_item.rb

@@ -24,6 +24,7 @@ module Decidim
       def call
         transaction do
           return broadcast(:invalid) if votes_disabled? || order.checked_out?
+
           add_line_item
           broadcast(:ok, order)
         end

data/app/commands/decidim/budgets/cancel_order.rb

@@ -19,6 +19,7 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if invalid_order?
+
         cancel_order!
         broadcast(:ok, @order)
       end

data/app/commands/decidim/budgets/checkout.rb

@@ -21,6 +21,7 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid, @order) unless checkout!
+
         broadcast(:ok, @order)
       end
 

data/app/commands/decidim/budgets/remove_line_item.rb

@@ -21,6 +21,7 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if @order.checked_out?
+
         remove_line_item
         broadcast(:ok, @order)
       end

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

@@ -20,7 +20,7 @@ module Decidim
             end
 
             on(:invalid) do
-              render nothing: true, status: 422
+              render nothing: true, status: :unprocessable_entity
             end
           end
         end
@@ -35,7 +35,7 @@ module Decidim
             end
 
             on(:invalid) do
-              render nothing: true, status: 422
+              render nothing: true, status: :unprocessable_entity
             end
           end
         end

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

@@ -6,21 +6,18 @@ module Decidim
     class ProjectsController < Decidim::Budgets::ApplicationController
       include FilterResource
       include NeedsCurrentOrder
+      include Orderable
 
-      helper_method :projects, :random_seed, :project
+      helper_method :projects, :project
 
       private
 
       def projects
-        @projects ||= search.results.page(params[:page]).per(current_component.settings.projects_per_page)
-      end
-
-      def random_seed
-        @random_seed ||= search.random_seed
+        @projects ||= search.results.order_randomly(random_seed).page(params[:page]).per(current_component.settings.projects_per_page)
       end
 
       def project
-        @project ||= projects.find(params[:id])
+        @project ||= search.results.find(params[:id])
       end
 
       def search_klass
@@ -31,8 +28,7 @@ module Decidim
         {
           search_text: "",
           scope_id: "",
-          category_id: "",
-          random_seed: params[:random_seed]
+          category_id: ""
         }
       end
 

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

@@ -13,6 +13,7 @@ module Decidim
 
       def same_component
         return unless order && project
+
         errors.add(:order, :invalid) unless order.component == project.component
       end
     end

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

@@ -53,12 +53,14 @@ module Decidim
       # Public: Returns the required minimum budget to checkout
       def minimum_budget
         return 0 unless component
+
         component.settings.total_budget.to_f * (component.settings.vote_threshold_percent.to_f / 100)
       end
 
       # Public: Returns the required maximum budget to checkout
       def maximum_budget
         return 0 unless component
+
         component.settings.total_budget.to_f
       end
 
@@ -82,6 +84,7 @@ module Decidim
         organization = component&.organization
 
         return if !user || !organization
+
         errors.add(:user, :invalid) unless user.organization == organization
       end
     end

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

@@ -16,6 +16,7 @@ module Decidim
       include Decidim::Comments::Commentable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::Randomable
 
       component_manifest_name "budgets"
       has_many :line_items, class_name: "Decidim::Budgets::LineItem", foreign_key: "decidim_project_id", dependent: :destroy

data/app/services/decidim/budgets/project_search.rb

@@ -10,7 +10,6 @@ module Decidim
       # component     - A Decidim::Component to get the projects from.
       def initialize(options = {})
         super(Project.all, options)
-        @random_seed = options[:random_seed].to_f
       end
 
       # Handle the search_text filter
@@ -22,16 +21,7 @@ module Decidim
 
       # Returns the random projects for the current page.
       def results
-        @results ||= Project.transaction do
-          Project.connection.execute("SELECT setseed(#{Project.connection.quote(random_seed)})")
-          super.reorder(Arel.sql("RANDOM()")).load
-        end
-      end
-
-      # Returns the random seed used to randomize the proposals.
-      def random_seed
-        @random_seed = (rand * 2 - 1) if @random_seed == 0.0 || @random_seed > 1 || @random_seed < -1
-        @random_seed
+        Project.where(id: super.pluck(:id))
       end
 
       private

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -21,7 +21,7 @@
           <% projects.each do |project| %>
             <tr data-id="<%= project.id %>">
               <td>
-                <%= translated_attribute(project.title) %><br />
+                <%= translated_attribute(project.title) %><br>
               </td>
               <td class='center'>
                <%= project.confirmed_orders_count %>

data/app/views/decidim/budgets/projects/_filters.html.erb

@@ -19,6 +19,4 @@
   <% if current_component.categories.any? %>
     <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
   <% end %>
-
-  <%= form.hidden_field :random_seed %>
 <% end %>

data/app/views/decidim/budgets/projects/_projects.html.erb

@@ -3,4 +3,4 @@
     <%= render partial: "project", locals: { project: project } %>
   <% end %>
 </div>
-<%= decidim_paginate projects, random_seed: random_seed %>
+<%= decidim_paginate projects %>

data/lib/decidim/budgets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com