Merge pull request #1914 from brave-intl/staging

Release 2019-05-28

app/controllers/admin/publishers_controller.rb

@@ -22,6 +22,7 @@ def index
     if params[:two_factor_authentication_removal].present?
       @publishers = @publishers.joins(:two_factor_authentication_removal).distinct
     end
+    @publishers = @publishers.where.not(email: nil).or(@publishers.where.not(pending_email: nil)) # Don't include deleted users
     @publishers = @publishers.group(:id).paginate(page: params[:page])
   end
 
@@ -43,6 +44,12 @@ def update
     redirect_to admin_publisher_path(@publisher)
   end
 
+  def destroy
+    PublisherRemovalJob.perform_later(publisher_id: @publisher.id)
+    flash[:alert] = "Deletion job enqueued. This usually takes a few seconds to complete"
+    redirect_to admin_publisher_path(@publisher)
+  end
+
   def statement
     statement_period = params[:statement_period]
     @transactions = PublisherStatementGetter.new(publisher: @publisher, statement_period: statement_period).perform

app/jobs/publisher_removal_job.rb

@@ -0,0 +1,26 @@
+class PublisherRemovalJob < ApplicationJob
+  queue_as :default
+
+  def perform(publisher_id:)
+    publisher = Publisher.find_by(id: publisher_id)
+    return if publisher.suspended?
+    publisher.status_updates.create(status: PublisherStatusUpdate::DELETED)
+    ActiveRecord::Base.transaction do
+      publisher.update(email: nil)
+      publisher.update(pending_email: nil)
+      publisher.update(name: PublisherStatusUpdate::DELETED)
+      publisher.update(phone: nil)
+      publisher.update(phone_normalized: nil)
+      # If they're signed in, they should not longer be signed in
+      publisher.user_authentication_token.update(authentication_token_expires_at: Time.now) if publisher.user_authentication_token.present?
+      publisher.update(current_sign_in_ip: nil)
+      publisher.update(last_sign_in_ip: nil)
+    end
+    publisher.channels.pluck(:id).each do |channel_id|
+      DeletePublisherChannelJob.perform_now(channel_id: channel_id)
+    end
+
+    # Paper trail retains all records: we destroy all historical PII and non-PII
+    publisher.versions.destroy_all
+  end
+end

app/models/channel.rb

@@ -138,6 +138,10 @@ def self.statistical_totals
       twitch: Channel.verified.twitch_channels.count,
       youtube:  Channel.verified.youtube_channels.count,
       site:  Channel.verified.site_channels.count,
+      twitter:  Channel.verified.twitter_channels.count,
+      reddit: 0,
+      github: 0,
+      vimeo: Channel.verified.vimeo_channels.count,
     }
   end
 

app/models/publisher.rb

@@ -44,12 +44,12 @@ class Publisher < ApplicationRecord
   # Normalizes attribute before validation and saves into other attribute
   phony_normalize :phone, as: :phone_normalized, default_country_code: "US"
 
-  validates :email, email: { strict_mode: true }, presence: true, unless: -> { pending_email.present? }
-  validates :email, uniqueness: { case_sensitive: false }, allow_nil: true
-  validates :pending_email, email: { strict_mode: true }, presence: true, if: -> { email.blank? }
+  validates :email, email: { strict_mode: true }, presence: true, unless: -> { pending_email.present? || deleted? }
+  validates :email, uniqueness: { case_sensitive: false }, allow_nil: true, unless: -> { deleted? }
+  validates :pending_email, email: { strict_mode: true }, presence: true, if: -> { email.blank? && !deleted? }
   validates :promo_registrations, length: { maximum: MAX_PROMO_REGISTRATIONS }
-  validate :pending_email_must_be_a_change
-  validate :pending_email_can_not_be_in_use
+  validate :pending_email_must_be_a_change, unless: -> { deleted? }
+  validate :pending_email_can_not_be_in_use, unless: -> { deleted? }
 
   validates :name, presence: true, allow_blank: true
   validates :phone_normalized, phony_plausible: true
@@ -179,16 +179,20 @@ def history
     combined.map { |c| c.values.first }
   end
 
+  def deleted?
+    last_status_update&.status == PublisherStatusUpdate::DELETED
+  end
+
   def suspended?
-    last_status_update.present? && last_status_update.status == PublisherStatusUpdate::SUSPENDED
+    last_status_update&.status == PublisherStatusUpdate::SUSPENDED
   end
 
   def no_grants?
     last_status_update.present? && last_status_update.status == PublisherStatusUpdate::NO_GRANTS
   end
 
   def locked?
-    last_status_update.present? && last_status_update.status == PublisherStatusUpdate::LOCKED
+    last_status_update&.status == PublisherStatusUpdate::LOCKED
   end
 
   def verified?

app/models/publisher_status_update.rb

@@ -4,9 +4,10 @@ class PublisherStatusUpdate < ApplicationRecord
   ACTIVE = 'active'.freeze
   SUSPENDED = 'suspended'.freeze
   LOCKED = 'locked'.freeze
+  DELETED = 'deleted'.freeze
   NO_GRANTS = 'no_grants'.freeze
 
-  ALL_STATUSES = [CREATED, ONBOARDING, ACTIVE, SUSPENDED, LOCKED, NO_GRANTS].freeze
+  ALL_STATUSES = [CREATED, ONBOARDING, ACTIVE, SUSPENDED, LOCKED, NO_GRANTS, DELETED].freeze
 
   belongs_to :publisher
 

app/views/admin/publishers/edit.html.slim

@@ -16,3 +16,5 @@
           = " Uphold widget disabled"
       .form-group
         = f.submit class: "btn btn-primary"
+    = form_tag admin_publisher_path, method: :delete
+      = submit_tag "Delete account", class: 'btn btn-danger', data: { confirm: "Are you sure you want to delete this account?" }

test/jobs/publisher_removal_job_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class PublisherRemovalJobTest < ActiveJob::TestCase
+
+  test "deletes a publisher and his or her channels" do
+    publisher = publishers(:google_verified)
+    assert_not_equal 0, publisher.channels.count
+    PublisherRemovalJob.perform_now(publisher_id: publisher.id)
+    publisher.reload
+    assert_nil publisher.email
+    assert_nil publisher.pending_email
+    assert_equal PublisherStatusUpdate::DELETED, publisher.name
+    assert_nil publisher.last_sign_in_ip
+    assert_nil publisher.current_sign_in_ip
+    assert_equal 0, publisher.channels.count
+    assert_equal 0, publisher.versions.count
+  end
+end

test/models/publisher_status_update_test.rb

@@ -20,6 +20,7 @@ class PublisherStatusUpdateTest < ActiveSupport::TestCase
     status_update = PublisherStatusUpdate.new(status: "created", publisher: publisher)
     status_update.save!
 
+    publisher.reload
     assert_equal publisher, status_update.publisher
     assert_equal publisher.status_updates.first, status_update
   end
@@ -33,4 +34,4 @@ class PublisherStatusUpdateTest < ActiveSupport::TestCase
       status_update.save!
     end
   end
-end
+end

test/models/publisher_test.rb

@@ -224,43 +224,6 @@ class PublisherTest < ActiveSupport::TestCase
     end
   end
 
-  describe "#history" do
-    describe "when the publisher has notes" do
-      it 'shows just the notes' do
-        histories = publishers(:just_notes).history
-        histories.each do |history|
-          assert_equal history.class, PublisherNote
-        end
-      end
-    end
-
-    describe "when the publisher has notes and statuses" do
-      it 'interweaves the objects' do
-        histories = publishers(:notes).history
-
-        assert histories.any? { |h| h.is_a? PublisherNote }
-        assert histories.any? { |h| h.is_a? PublisherStatusUpdate }
-      end
-
-      it 'sorts the object by created_at time' do
-        histories = publishers(:notes).history
-        histories.each_with_index do |history, index|
-          next if index == 0
-          assert history.created_at < histories[index-1].created_at
-        end
-      end
-    end
-
-    describe 'when the publisher just has statuses' do
-      it 'just shows the statuses' do
-        histories = publishers(:default).history
-        histories.each do |history|
-          assert_equal history.class, PublisherStatusUpdate
-        end
-      end
-    end
-  end
-
   test "test `has_stale_uphold_code` scopes to correct publishers" do
     ActiveRecord::Base.record_timestamps = false
     publisher = publishers(:default)
@@ -351,6 +314,7 @@ class PublisherTest < ActiveSupport::TestCase
     publisher.save!
 
     assert publisher.status_updates.count
+    publisher.reload
     assert publisher.last_status_update
   end
 
@@ -529,4 +493,41 @@ class PublisherTest < ActiveSupport::TestCase
     publisher = publishers(:completed)
     assert publisher.most_recent_potential_referral_payment.blank?
   end
+
+  describe "#history" do
+    describe "when the publisher has notes" do
+      it 'shows just the notes' do
+        histories = publishers(:just_notes).history
+        histories.each do |history|
+          assert_equal history.class, PublisherNote
+        end
+      end
+    end
+
+    describe "when the publisher has notes and statuses" do
+      it 'interweaves the objects' do
+        histories = publishers(:notes).history
+
+        assert histories.any? { |h| h.is_a? PublisherNote }
+        assert histories.any? { |h| h.is_a? PublisherStatusUpdate }
+      end
+
+      it 'sorts the object by created_at time' do
+        histories = publishers(:notes).history
+        histories.each_with_index do |history, index|
+          next if index == 0
+          assert history.created_at < histories[index-1].created_at
+        end
+      end
+    end
+
+    describe 'when the publisher just has statuses' do
+      it 'just shows the statuses' do
+        histories = publishers(:default).history
+        histories.each do |history|
+          assert_equal history.class, PublisherStatusUpdate
+        end
+      end
+    end
+  end
 end