From f456400218a800e083de024003055f2bdd6efba5 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:17:05 +0200
Subject: [PATCH 1/8] Removes duplicated relationship between budget and
 investment

---
 app/models/budget.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/budget.rb b/app/models/budget.rb
index b8fd34da9..022ce8f2a 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -13,7 +13,6 @@ class Budget < ActiveRecord::Base
   has_many :ballots, dependent: :destroy
   has_many :groups, dependent: :destroy
   has_many :headings, through: :groups
-  has_many :investments, through: :headings
 
   scope :open,     -> { where.not(phase: "finished") }
   scope :finished, -> { where(phase: "finished") }

From cb7ea79aafc6f382b208e43ddd562b4f2089a660 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:19:38 +0200
Subject: [PATCH 2/8] Replaces spending proposals by budget investments in
 user/show

---
 app/controllers/users_controller.rb          | 22 +++---
 app/views/users/_activity_page.html.erb      |  3 +-
 app/views/users/_budget_investments.html.erb | 11 +++
 app/views/users/_spending_proposals.html.erb | 20 -----
 app/views/users/show.html.erb                | 20 +++--
 spec/features/users_spec.rb                  | 82 +++++---------------
 6 files changed, 49 insertions(+), 109 deletions(-)
 create mode 100644 app/views/users/_budget_investments.html.erb
 delete mode 100644 app/views/users/_spending_proposals.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fbd77f184..01663ec77 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,8 +1,7 @@
 class UsersController < ApplicationController
-  has_filters %w{proposals debates comments spending_proposals}, only: :show
+  has_filters %w{proposals debates budget_investments comments}, only: :show
 
   load_and_authorize_resource
-  helper_method :authorized_for_filter?
   helper_method :author?
   helper_method :author_or_admin?
 
@@ -15,8 +14,8 @@ class UsersController < ApplicationController
       @activity_counts = HashWithIndifferentAccess.new(
                           proposals: Proposal.where(author_id: @user.id).count,
                           debates: Debate.where(author_id: @user.id).count,
-                          comments: Comment.not_as_admin_or_moderator.where(user_id: @user.id).count,
-                          spending_proposals: SpendingProposal.where(author_id: @user.id).count)
+                          budget_investments: Budget::Investment.where(author_id: @user.id).count,
+                          comments: Comment.not_as_admin_or_moderator.where(user_id: @user.id).count)
     end
 
     def load_filtered_activity
@@ -24,8 +23,8 @@ class UsersController < ApplicationController
       case params[:filter]
       when "proposals" then load_proposals
       when "debates"   then load_debates
+      when "budget_investments" then load_budget_investments
       when "comments"  then load_comments
-      when "spending_proposals"  then load_spending_proposals if author_or_admin?
       else load_available_activity
       end
     end
@@ -37,12 +36,12 @@ class UsersController < ApplicationController
       elsif  @activity_counts[:debates] > 0
         load_debates
         @current_filter = "debates"
+      elsif  @activity_counts[:budget_investments] > 0
+        load_budget_investments
+        @current_filter = "budget_investments"
       elsif  @activity_counts[:comments] > 0
         load_comments
         @current_filter = "comments"
-      elsif  @activity_counts[:spending_proposals] > 0 && author_or_admin?
-        load_spending_proposals
-        @current_filter = "spending_proposals"
       end
     end
 
@@ -58,8 +57,8 @@ class UsersController < ApplicationController
       @comments = Comment.not_as_admin_or_moderator.where(user_id: @user.id).includes(:commentable).order(created_at: :desc).page(params[:page])
     end
 
-    def load_spending_proposals
-      @spending_proposals = SpendingProposal.where(author_id: @user.id).order(created_at: :desc).page(params[:page])
+    def load_budget_investments
+      @budget_investments = Budget::Investment.where(author_id: @user.id).order(created_at: :desc).page(params[:page])
     end
 
     def valid_access?
@@ -78,7 +77,4 @@ class UsersController < ApplicationController
       @authorized_current_user ||= current_user && (current_user == @user || current_user.moderator? || current_user.administrator?)
     end
 
-    def authorized_for_filter?(filter)
-      filter == "spending_proposals" ? author_or_admin? : true
-    end
 end
diff --git a/app/views/users/_activity_page.html.erb b/app/views/users/_activity_page.html.erb
index dbda1da39..c8a3ed34b 100644
--- a/app/views/users/_activity_page.html.erb
+++ b/app/views/users/_activity_page.html.erb
@@ -1,4 +1,5 @@
 <%= render "proposals" if @proposals.present? %>
 <%= render "debates" if @debates.present? && feature?(:debates) %>
+<%= render "investments" if @investments.present? %>
+<%= render "budget_investments" if @budget_investments.present? %>
 <%= render "comments" if @comments.present? %>
-<%= render "spending_proposals" if @spending_proposals.present? %>
diff --git a/app/views/users/_budget_investments.html.erb b/app/views/users/_budget_investments.html.erb
new file mode 100644
index 000000000..4532ede47
--- /dev/null
+++ b/app/views/users/_budget_investments.html.erb
@@ -0,0 +1,11 @@
+<table id="budget_investments_list" class="clear activity-investment-projects">
+  <% @budget_investments.each do |budget_investment| %>
+    <tr id="budget_investment_<%= budget_investment.id %>">
+      <td>
+        <%= link_to budget_investment.title, budget_investment_path(budget_investment.budget, budget_investment) %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= paginate @budget_investments %>
diff --git a/app/views/users/_spending_proposals.html.erb b/app/views/users/_spending_proposals.html.erb
deleted file mode 100644
index 40fd8d70d..000000000
--- a/app/views/users/_spending_proposals.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<table id="spending_proposals_list" class="clear activity-investment-projects">
-  <% @spending_proposals.each do |spending_proposal| %>
-    <tr id="spending_proposal_<%= spending_proposal.id %>">
-      <td>
-        <%= link_to spending_proposal.title, spending_proposal %>
-      </td>
-      <td>
-        <% if can?(:destroy, spending_proposal) %>
-          <%= link_to t("users.show.delete_spending_proposal"),
-                      spending_proposal,
-                      method: :delete,
-                      data: { confirm: t("users.show.confirm_deletion_spending_proposal") },
-                      class: 'delete' %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-</table>
-
-<%= paginate @spending_proposals %>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c264d336f..c00769216 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -26,17 +26,15 @@
         <ul class="menu simple margin-top">
           <% @valid_filters.each do |filter| %>
             <% if @activity_counts[filter] > 0 %>
-              <% if authorized_for_filter?(filter) %>
-                <% if @current_filter == filter %>
-                  <li class="active">
-                    <%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %>
-                  </li>
-                <% else %>
-                  <li>
-                    <%= link_to t("users.show.filters.#{filter}", count: @activity_counts[filter]),
-                                current_path_with_query_params(filter: filter, page: 1) %>
-                  </li>
-                <% end %>
+              <% if @current_filter == filter %>
+                <li class="active">
+                  <%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %>
+                </li>
+              <% else %>
+                <li>
+                  <%= link_to t("users.show.filters.#{filter}", count: @activity_counts[filter]),
+                              current_path_with_query_params(filter: filter, page: 1) %>
+                </li>
               <% end %>
             <% end %>
           <% end %>
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 93369a2c9..5e36d5bf3 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -8,7 +8,8 @@ feature 'Users' do
       @user = create(:user)
       1.times {create(:debate, author: @user)}
       2.times {create(:proposal, author: @user)}
-      3.times {create(:comment, user: @user)}
+      3.times {create(:budget_investment, author: @user)}
+      4.times {create(:comment, user: @user)}
 
       visit user_path(@user)
     end
@@ -16,7 +17,8 @@ feature 'Users' do
     scenario 'shows user public activity' do
       expect(page).to have_content('1 Debate')
       expect(page).to have_content('2 Proposals')
-      expect(page).to have_content('3 Comments')
+      expect(page).to have_content('3 Investments')
+      expect(page).to have_content('4 Comments')
     end
 
     scenario 'shows only items where user has activity' do
@@ -24,7 +26,8 @@ feature 'Users' do
 
       expect(page).to_not have_content('0 Proposals')
       expect(page).to have_content('1 Debate')
-      expect(page).to have_content('3 Comments')
+      expect(page).to have_content('3 Investments')
+      expect(page).to have_content('4 Comments')
     end
 
     scenario 'default filter is proposals' do
@@ -48,11 +51,20 @@ feature 'Users' do
       expect(page).to have_content(@user.debates.first.title)
     end
 
-    scenario 'shows comments by default if user has no proposals nor debates' do
+    scenario 'shows investments by default if user has no proposals nor debates' do
       @user.proposals.destroy_all
       @user.debates.destroy_all
       visit user_path(@user)
 
+      expect(page).to have_content(@user.budget_investments.first.title)
+    end
+
+    scenario 'shows comments by default if user has no proposals nor debates nor investments' do
+      @user.proposals.destroy_all
+      @user.debates.destroy_all
+      @user.budget_investments.destroy_all
+      visit user_path(@user)
+
       @user.comments.each do |comment|
         expect(page).to have_content(comment.body)
       end
@@ -73,7 +85,7 @@ feature 'Users' do
         expect(page).to_not have_content(comment.body)
       end
 
-      click_link '3 Comments'
+      click_link '4 Comments'
 
       @user.comments.each do |comment|
         expect(page).to have_content(comment.body)
@@ -199,64 +211,6 @@ feature 'Users' do
 
     end
 
-    feature 'Spending proposals' do
-
-      background do
-        @author = create(:user, :level_two)
-        @spending_proposal = create(:spending_proposal, author: @author, title: 'Build a school')
-      end
-
-      scenario 'is not shown if no user logged in' do
-        visit user_path(@author)
-        expect(page).to_not have_content('Build a school')
-      end
-
-      scenario 'is not shown if no user logged in (filtered url)' do
-        visit user_path(@author, filter: 'spending_proposals')
-        expect(page).to_not have_content('Build a school')
-      end
-
-      scenario 'is not shown if logged in user is a regular user' do
-        login_as(create(:user))
-        visit user_path(@author)
-        expect(page).to_not have_content('Build a school')
-      end
-
-      scenario 'is not shown if logged in user is moderator' do
-        login_as(create(:moderator).user)
-        visit user_path(@author)
-        expect(page).to_not have_content('Build a school')
-      end
-
-      scenario 'is shown if logged in user is admin' do
-        login_as(create(:administrator).user)
-        visit user_path(@author)
-        expect(page).to have_content('Build a school')
-      end
-
-      scenario 'is shown if logged in user is author' do
-        login_as(@author)
-        visit user_path(@author)
-        expect(page).to have_content('Build a school')
-      end
-
-      scenario 'delete button is not shown if logged in user is author' do
-        login_as(@author)
-        visit user_path(@author)
-        within("#spending_proposal_#{@spending_proposal.id}") do
-          expect(page).to_not have_content('Delete')
-        end
-      end
-
-      scenario 'delete button is shown if logged in user is admin' do
-        login_as(create(:administrator).user)
-        visit user_path(@author)
-        within("#spending_proposal_#{@spending_proposal.id}") do
-          expect(page).to have_content('Delete')
-        end
-      end
-
-    end
   end
 
   feature 'Special comments' do
@@ -283,4 +237,4 @@ feature 'Users' do
     end
   end
 
-end
\ No newline at end of file
+end

From b7278c5ec4125a1e25277225d4bf8bad9dfba21c Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:20:09 +0200
Subject: [PATCH 3/8] Updates (deactivated) budget investment test to include
 user/show info

---
 spec/features/budgets/investments_spec.rb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index cdf8694bc..3b4b84486 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -170,25 +170,29 @@ feature 'Budget Investments' do
   end
 
   xscenario 'Create notice' do
+    budget.update(phase: "accepting")
     login_as(author)
 
     visit new_budget_investment_path(budget_id: budget.id)
-    fill_in 'investment_title', with: 'Build a skyscraper'
-    fill_in 'investment_description', with: 'I want to live in a high tower over the clouds'
-    fill_in 'investment_external_url', with: 'http://http://skyscraperpage.com/'
+    save_and_open_page
+    fill_in 'budget_investment_title', with: 'Build a skyscraper'
+    fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds'
+    fill_in 'budget_investment_external_url', with: 'http://http://skyscraperpage.com/'
     select  'All city', from: 'investment_heading_id'
     check 'investment_terms_of_service'
 
     click_button 'Create'
 
-    expect(page).to_not have_content 'Investment project created successfully'
-    expect(page).to have_content '1 error'
+    expect(page).to have_content 'Investment created successfully'
+    expect(page).to have_content 'You can access it from My activity'
 
     within "#notice" do
       click_link 'My activity'
     end
 
-    expect(page).to have_content 'Investment project created successfully'
+    expect(current_url).to eq(user_url(author, filter: :budget_investments))
+    expect(page).to have_content "1 Investment"
+    expect(page).to have_content "Build a skyscraper"
   end
 
   xscenario 'Errors on create' do

From 4f9ac1ae19c7309b11610006985d23bb84ab4d36 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:20:37 +0200
Subject: [PATCH 4/8] Removes part of spending proposal spec which was made
 false when replacing sps by investments

---
 spec/features/spending_proposals_spec.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb
index 01220ab27..969193814 100644
--- a/spec/features/spending_proposals_spec.rb
+++ b/spec/features/spending_proposals_spec.rb
@@ -159,14 +159,6 @@ feature 'Spending proposals' do
 
     expect(page).to have_content 'Spending proposal created successfully'
     expect(page).to have_content 'You can access it from My activity'
-
-    within "#notice" do
-      click_link 'My activity'
-    end
-
-    expect(current_url).to eq(user_url(author, filter: :spending_proposals))
-    expect(page).to have_content "1 Spending proposal"
-    expect(page).to have_content "Build a skyscraper"
   end
 
   scenario 'Errors on create' do

From 50f82211a90f6ae83223ebdda19ff420b8e2a957 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:20:58 +0200
Subject: [PATCH 5/8] Add User has_many budget_investments

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 195328273..5c69b25b1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,6 +19,7 @@ class User < ActiveRecord::Base
   has_many :identities, dependent: :destroy
   has_many :debates, -> { with_hidden }, foreign_key: :author_id
   has_many :proposals, -> { with_hidden }, foreign_key: :author_id
+  has_many :budget_investments, -> { with_hidden }, foreign_key: :author_id, class_name: 'Budget::Investment'
   has_many :comments, -> { with_hidden }
   has_many :spending_proposals, foreign_key: :author_id
   has_many :failed_census_calls

From 15509da4b40a524045ed6cc96af1f419cee6e361 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 12:39:15 +0200
Subject: [PATCH 6/8] removes deprecated spending_proposal test

---
 spec/features/spending_proposals_spec.rb | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/spec/features/spending_proposals_spec.rb b/spec/features/spending_proposals_spec.rb
index 969193814..99dff84d8 100644
--- a/spec/features/spending_proposals_spec.rb
+++ b/spec/features/spending_proposals_spec.rb
@@ -186,26 +186,4 @@ feature 'Spending proposals' do
     end
   end
 
-  context "Destroy" do
-
-    scenario "Admin can destroy owned spending proposals" do
-      admin = create(:administrator)
-      user = create(:user, :level_two)
-      spending_proposal = create(:spending_proposal, author: user)
-
-      login_as(admin.user)
-
-      visit user_path(user)
-      within("#spending_proposal_#{spending_proposal.id}") do
-        click_link "Delete"
-      end
-
-      expect(page).to have_content("Spending proposal deleted succesfully.")
-
-      visit user_path(user)
-      expect(page).not_to have_css("spending_proposal_list")
-    end
-
-  end
-
 end

From fd5dd5984def6128d31a0e6c7e882b2fb676e4d0 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 13:07:01 +0200
Subject: [PATCH 7/8] fixes i18n issues

---
 config/locales/en.yml | 8 +++-----
 config/locales/es.yml | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 58d4c9492..52cdbc99d 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -525,8 +525,6 @@ en:
       deleted: Deleted
       deleted_debate: This debate has been deleted
       deleted_proposal: This proposal has been deleted
-      delete_spending_proposal: Delete
-      confirm_deletion_spending_proposal: Are you sure? This action can not be undone
       filters:
         comments:
           one: 1 Comment
@@ -537,9 +535,9 @@ en:
         proposals:
           one: 1 Proposal
           other: "%{count} Proposals"
-        spending_proposals:
-          one: 1 Spending proposal
-          other: "%{count} Spending proposals"
+        budget_investments:
+          one: 1 Investment
+          other: "%{count} Investments"
       no_activity: User has no public activity
       no_private_messages: "This user doesn't accept private messages."
       private_activity: This user decided to keep the activity list private
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5e3f28507..0346fabb0 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -525,8 +525,6 @@ es:
       deleted: Eliminado
       deleted_debate: Este debate ha sido eliminado
       deleted_proposal: Este propuesta ha sido eliminada
-      delete_spending_proposal: Eliminar
-      confirm_deletion_spending_proposal: "¿Seguro que desea eliminar esta propuesta?"
       filters:
         comments:
           one: 1 Comentario
@@ -537,7 +535,7 @@ es:
         proposals:
           one: 1 Propuesta
           other: "%{count} Propuestas"
-        spending_proposals:
+        budget_investments:
           one: 1 Propuesta de inversión
           other: "%{count} Propuestas de inversión"
       no_activity: Usuario sin actividad pública

From 250e5de08182b412f886a8a3516a12236aaf17c1 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 9 Sep 2016 13:31:54 +0200
Subject: [PATCH 8/8] removes garbage line from view

---
 app/views/users/_activity_page.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/users/_activity_page.html.erb b/app/views/users/_activity_page.html.erb
index c8a3ed34b..cb785a438 100644
--- a/app/views/users/_activity_page.html.erb
+++ b/app/views/users/_activity_page.html.erb
@@ -1,5 +1,4 @@
 <%= render "proposals" if @proposals.present? %>
 <%= render "debates" if @debates.present? && feature?(:debates) %>
-<%= render "investments" if @investments.present? %>
 <%= render "budget_investments" if @budget_investments.present? %>
 <%= render "comments" if @comments.present? %>