decidim-budgets 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e8b92dcd82e7086bd370d09954fb7de19b44ffdbbca24e6958688bcff13ad0
-  data.tar.gz: c44ff83b6a3f6b20669e5a0730c8243f9a3e9cd24fbe8e6eea31aa53ecf8ac9a
+  metadata.gz: 00de9aa46460c920a2476d4761d17d778ba872784cb2eb6744304b3e1b10b23a
+  data.tar.gz: 4f259a19d9d66cc25fedd9f2aed221d8319f52f00acb754e62b9a9bb51effcb8
 SHA512:
-  metadata.gz: 4f7a8dc78b3b8610a46ddca92f86978c1763c774c6592d24df0173060daad307a5b5ec34aa1c5c60fefb3bb04c9deeecd132d4b43858b27eae7a894179d13a25
-  data.tar.gz: 447a5a5cf13f8724ba90ff0690c9eee59c6fb50822ed62f133cc6e23af280a06235963f8465bcea7f217f194897fe77c4fade6964301e44a724106698df6bd82
+  metadata.gz: fe5b0befabb56026973938d3f4166139d653faafeaf1a810f2f4116ac8acd5fb3e1fad7c41831c491f448b5b1cf1562b6e130b2f37d4a879f0e49348307849ad
+  data.tar.gz: 0fb999a66d45c60f456abc622ffb71f3ac271df4b3074b07d07a4f35e446b9349f94b23e9988e16c76af02de15018457553e17004a7b87651b28b6adccfa38ea

data/app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Metrics
+      # Searches for unique Users following the next objects
+      #  - Budgets
+      class BudgetFollowersMetricMeasure < Decidim::MetricMeasure
+        def valid?
+          super && @resource.is_a?(Decidim::Component)
+        end
+
+        def calculate
+          budgets = Decidim::Budgets::Project.where(component: @resource)
+
+          budgets_followers = Decidim::Follow.where(followable: budgets).joins(:user)
+                                             .where("decidim_follows.created_at <= ?", end_time)
+          cumulative_users = budgets_followers.pluck(:decidim_user_id)
+
+          budgets_followers = budgets_followers.where("decidim_follows.created_at >= ?", start_time)
+          quantity_users = budgets_followers.pluck(:decidim_user_id)
+
+          {
+            cumulative_users: cumulative_users.uniq,
+            quantity_users: quantity_users.uniq
+          }
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Metrics
+      # Searches for Participants in the following actions
+      #  - Vote a participatory budgeting project (Budgets)
+      class BudgetParticipantsMetricMeasure < Decidim::MetricMeasure
+        def valid?
+          super && @resource.is_a?(Decidim::Component)
+        end
+
+        def calculate
+          budgets = Decidim::Budgets::Order.where(component: @resource).joins(:component)
+                                           .finished
+                                           .where("decidim_budgets_orders.checked_out_at <= ?", end_time)
+
+          {
+            cumulative_users: budgets.pluck(:decidim_user_id),
+            quantity_users: budgets.where("decidim_budgets_orders.checked_out_at >= ?", start_time).pluck(:decidim_user_id)
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -39,7 +39,7 @@ edit_link(
         <div id="project-<%= project.id %>-budget-button">
           <%= render partial: "project_budget_button", locals: { project: project } %>
         </div>
-        <%= render partial: "decidim/shared/follow_button", locals: { followable: project } %>
+        <%= render partial: "decidim/shared/follow_button", locals: { followable: project, large: false  } %>
       </div>
     </div>
     <%= resource_reference(project) %>

data/db/migrate/20181205141115_use_big_ints_for_budgets.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UseBigIntsForBudgets < ActiveRecord::Migration[5.2]
+  def change
+    change_column :decidim_budgets_projects, :budget, :bigint
+  end
+end

data/lib/decidim/budgets/engine.rb

@@ -31,6 +31,16 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Budgets::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Budgets::Engine.root}/app/views") # for partials
       end
+
+      initializer "decidim_budgets.register_metrics" do
+        Decidim.metrics_operation.register(:participants, :budgets) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Budgets::Metrics::BudgetParticipantsMetricMeasure"
+        end
+
+        Decidim.metrics_operation.register(:followers, :budgets) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Budgets::Metrics::BudgetFollowersMetricMeasure"
+        end
+      end
     end
   end
 end

data/lib/decidim/budgets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 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.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -163,6 +163,8 @@ files:
 - app/permissions/decidim/budgets/permissions.rb
 - app/presenters/decidim/budgets/admin_log/project_presenter.rb
 - app/queries/decidim/budgets/filtered_projects.rb
+- app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb
+- 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/views/decidim/budgets/admin/projects/_form.html.erb
@@ -216,6 +218,7 @@ files:
 - db/migrate/20170410074214_remove_not_null_reference_budgets.rb
 - db/migrate/20170612101846_migrate_projects_category.rb
 - db/migrate/20180305133340_rename_features_to_components_at_budgets.rb
+- db/migrate/20181205141115_use_big_ints_for_budgets.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb
@@ -245,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim budgets module