Merge pull request #630 from AyuntamientoMadrid/fix-erase

Fix erase

app/models/user.rb

@@ -147,8 +147,8 @@ class User < ActiveRecord::Base
   end
 
   def erase(erase_reason = nil)
-    self.hide
     self.update(
+      erased_at: Time.now,
       erase_reason: erase_reason,
       username: nil,
       email: nil,
@@ -162,6 +162,10 @@ class User < ActiveRecord::Base
     )
   end
 
+  def erased?
+    erased_at.present?
+  end
+
   def email_provided?
     !!(email && email !~ OMNIAUTH_EMAIL_REGEX) ||
       !!(unconfirmed_email && unconfirmed_email !~ OMNIAUTH_EMAIL_REGEX)
@@ -189,11 +193,11 @@ class User < ActiveRecord::Base
   end
 
   def username_required?
-    !organization? && !hidden?
+    !organization? && !erased?
   end
 
   def email_required?
-    !hidden?
+    !erased?
   end
 
   private

app/views/comments/_comment.html.erb

@@ -19,7 +19,7 @@
           <% else %>
             <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
           <% end %>
-          <% if comment.user.hidden? %>
+          <% if comment.user.hidden? || comment.user.erased? %>
             <i class="icon-deleted user-deleted"></i>
           <% end %>
         <% end %>
@@ -33,7 +33,7 @@
               <span class="user-name"><%= t("comments.comment.moderator") %> #<%= comment.moderator_id%></span>
             <% else %>
 
-              <% if comment.user.hidden? %>
+              <% if comment.user.hidden? || comment.user.erased? %>
                 <span class="user-name"><%= t("comments.comment.user_deleted") %></span>
               <% else %>
                 <span class="user-name"><%= comment.user.name %></span>

app/views/debates/_debate.html.erb

@@ -14,7 +14,7 @@
               <span class="bullet">&nbsp;&bull;&nbsp;</span>
               <%= l debate.created_at.to_date %>
 
-              <% if debate.author.hidden? %>
+              <% if debate.author.hidden? || debate.author.erased? %>
                 <span class="bullet">&nbsp;&bull;&nbsp;</span>
                 <span class="author">
                   <%= t("debates.show.author_deleted") %>

app/views/debates/show.html.erb

@@ -21,31 +21,7 @@
         <% end %>
 
         <div class="debate-info">
-          <%= avatar_image(@debate.author, seed: @debate.author_id, size: 32, class: 'author-photo') %>
-
-          <% if @debate.author.hidden? %>
-            <i class="icon-deleted author-deleted"></i>
-            <span class="author">
-                <%= t("debates.show.author_deleted") %>
-            </span>
-          <% else %>
-            <span class="author">
-                <%= @debate.author.name %>
-            </span>
-            <% if @debate.author.official? %>
-              &nbsp;&bull;&nbsp;
-              <span class="label round level-<%= @debate.author.official_level %>">
-                <%= @debate.author.official_position %>
-              </span>
-            <% end %>
-          <% end %>
-
-          <% if @debate.author.verified_organization? %>
-            &nbsp;&bull;&nbsp;
-            <span class="label round is-association">
-              <%= t("shared.collective") %>
-            </span>
-          <% end %>
+          <%= render '/shared/author_info', resource: @debate %>
 
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= l @debate.created_at.to_date %>

app/views/proposals/_proposal.html.erb

@@ -13,7 +13,7 @@
             <span class="bullet">&nbsp;&bull;&nbsp;</span>
             <%= l proposal.created_at.to_date %>
 
-            <% if proposal.author.hidden? %>
+            <% if proposal.author.hidden? || proposal.author.erased? %>
               <span class="bullet">&nbsp;&bull;&nbsp;</span>
               <span class="author">
                 <%= t("proposals.show.author_deleted") %>

app/views/proposals/show.html.erb

@@ -27,31 +27,7 @@
         <% end %>
 
         <div class="proposal-info">
-          <%= avatar_image(@proposal.author, seed: @proposal.author_id, size: 32, class: 'author-photo') %>
-
-          <% if @proposal.author.hidden? %>
-            <i class="icon-deleted author-deleted"></i>
-            <span class="author">
-                <%= t("proposals.show.author_deleted") %>
-            </span>
-          <% else %>
-            <span class="author">
-                <%= @proposal.author.name %>
-            </span>
-            <% if @proposal.author.official? %>
-              &nbsp;&bull;&nbsp;
-              <span class="label round level-<%= @proposal.author.official_level %>">
-                <%= @proposal.author.official_position %>
-              </span>
-            <% end %>
-          <% end %>
-
-          <% if @proposal.author.verified_organization? %>
-            &nbsp;&bull;&nbsp;
-            <span class="label round is-association">
-              <%= t("shared.collective") %>
-            </span>
-          <% end %>
+          <%= render '/shared/author_info', resource: @proposal %>
 
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= l @proposal.created_at.to_date %>

app/views/shared/_author_info.html.erb

@@ -0,0 +1,25 @@
+<%= avatar_image(resource.author, seed: resource.author_id, size: 32, class: 'author-photo') %>
+
+<% if resource.author.hidden? || resource.author.erased? %>
+  <i class="icon-deleted author-deleted"></i>
+  <span class="author">
+      <%= t("shared.author_info.author_deleted") %>
+  </span>
+<% else %>
+  <span class="author">
+      <%= resource.author.name %>
+  </span>
+  <% if resource.author.official? %>
+    &nbsp;&bull;&nbsp;
+    <span class="label round level-<%= resource.author.official_level %>">
+      <%= resource.author.official_position %>
+    </span>
+  <% end %>
+<% end %>
+
+<% if resource.author.verified_organization? %>
+  &nbsp;&bull;&nbsp;
+  <span class="label round is-association">
+    <%= t("shared.collective") %>
+  </span>
+<% end %>

config/locales/en.yml

@@ -310,6 +310,8 @@ en:
       debate: "secret code did not match with the image"
       proposal: "secret code did not match with the image"
   shared:
+    author_info:
+      author_deleted: Deleted user
     tags_cloud:
       tags: Trend
     print:

config/locales/es.yml

@@ -310,6 +310,8 @@ es:
       debate: "el código secreto no coincide con la imagen"
       proposal: "el código secreto no coincide con la imagen"
   shared:
+    author_info:
+      author_deleted: Usuario eliminado
     tags_cloud:
       tags: Tendencias
     print:

db/migrate/20151021113348_add_erased_at_to_users.rb

@@ -0,0 +1,5 @@
+class AddErasedAtToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :erased_at, :datetime
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151020112354) do
+ActiveRecord::Schema.define(version: 20151021113348) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -294,6 +294,7 @@ ActiveRecord::Schema.define(version: 20151020112354) do
     t.integer  "failed_census_calls_count",            default: 0
     t.datetime "level_two_verified_at"
     t.string   "erase_reason"
+    t.datetime "erased_at"
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree

spec/features/comments/debates_spec.rb

@@ -193,6 +193,18 @@ feature 'Commenting debates' do
     end
   end
 
+  scenario "Erasing a comment's author" do
+    debate = create(:debate)
+    comment = create(:comment, commentable: debate, body: 'this should be visible')
+    comment.user.erase
+
+    visit debate_path(debate)
+    within "#comment_#{comment.id}" do
+      expect(page).to have_content('Deleted user')
+      expect(page).to have_content('this should be visible')
+    end
+  end
+
   feature "Moderators" do
     scenario "can create comment as a moderator", :js do
       moderator = create(:moderator)

spec/features/comments/proposals_spec.rb

@@ -193,6 +193,18 @@ feature 'Commenting proposals' do
     end
   end
 
+  scenario "Erasing a comment's author" do
+    proposal = create(:proposal)
+    comment = create(:comment, commentable: proposal, body: "this should be visible")
+    comment.user.erase
+
+    visit proposal_path(proposal)
+    within "#comment_#{comment.id}" do
+      expect(page).to have_content('Deleted user')
+      expect(page).to have_content('this should be visible')
+    end
+  end
+
   feature "Moderators" do
     scenario "can create comment as a moderator", :js do
       moderator = create(:moderator)

spec/features/debates_spec.rb

@@ -523,4 +523,16 @@ feature 'Debates' do
     visit debate_path(good_debate)
     expect(page).to_not have_content "This debate has been flag as innapropiate for some users."
   end
+
+  scenario 'Erased author' do
+    user = create(:user)
+    debate = create(:debate, author: user)
+    user.erase
+
+    visit debates_path
+    expect(page).to have_content('Deleted user')
+
+    visit debate_path(debate)
+    expect(page).to have_content('Deleted user')
+  end
 end

spec/features/proposals_spec.rb

@@ -605,4 +605,16 @@ feature 'Proposals' do
 
     expect(Flag.flagged?(user, proposal)).to_not be
   end
+
+  scenario 'Erased author' do
+    user = create(:user)
+    proposal = create(:proposal, author: user)
+    user.erase
+
+    visit proposals_path
+    expect(page).to have_content('Deleted user')
+
+    visit proposal_path(proposal)
+    expect(page).to have_content('Deleted user')
+  end
 end

spec/models/comment_spec.rb

@@ -57,6 +57,11 @@ describe Comment do
       .to change { [comment.reload.updated_at, comment.author.updated_at] }
     end
 
+    it "expires cache when the author is erased" do
+      expect { comment.user.erase }
+      .to change { [comment.reload.updated_at, comment.author.updated_at] }
+    end
+
     it "expires cache when the author changes" do
       expect { comment.user.update(username: "Isabel") }
       .to change { [comment.reload.updated_at, comment.author.updated_at] }

spec/models/debate_spec.rb

@@ -380,6 +380,11 @@ describe Debate do
       .to change { [debate.reload.updated_at, debate.author.updated_at] }
     end
 
+    it "should expire cache when the author is erased" do
+      expect { debate.author.erase }
+      .to change { [debate.reload.updated_at, debate.author.updated_at] }
+    end
+
     it "should expire cache when its author changes" do
       expect { debate.author.update(username: "Eva") }
       .to change { [debate.reload.updated_at, debate.author.updated_at] }

spec/models/proposal_spec.rb

@@ -304,4 +304,55 @@ describe Proposal do
     end
 
   end
+
+  describe "cache" do
+    let(:proposal) { create(:proposal) }
+
+    it "should expire cache when it has a new comment" do
+      expect { create(:comment, commentable: proposal) }
+      .to change { proposal.updated_at }
+    end
+
+    it "should expire cache when it has a new vote" do
+      expect { create(:vote, votable: proposal) }
+      .to change { proposal.updated_at }
+    end
+
+    it "should expire cache when it has a new flag" do
+      expect { create(:flag, flaggable: proposal) }
+      .to change { proposal.reload.updated_at }
+    end
+
+    it "should expire cache when it has a new tag" do
+      expect { proposal.update(tag_list: "new tag") }
+      .to change { proposal.updated_at }
+    end
+
+    it "should expire cache when hidden" do
+      expect { proposal.hide }
+      .to change { proposal.updated_at }
+    end
+
+    it "should expire cache when the author is hidden" do
+      expect { proposal.author.hide }
+      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+    end
+
+    it "should expire cache when the author is erased" do
+      expect { proposal.author.erase }
+      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+    end
+
+    it "should expire cache when its author changes" do
+      expect { proposal.author.update(username: "Eva") }
+      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+    end
+
+    it "should expire cache when the author's organization get verified" do
+      create(:organization, user: proposal.author)
+      expect { proposal.author.organization.verify }
+      .to change { [proposal.reload.updated_at, proposal.author.updated_at] }
+    end
+  end
+
 end

spec/models/user_spec.rb

@@ -317,7 +317,7 @@ describe User do
       user.reload
 
       expect(user.erase_reason).to eq('a test')
-      expect(user.hidden_at).to be
+      expect(user.erased_at).to be
 
       expect(user.username).to be_nil