From 0c4327f3a1703a08ea51279562f16f01853d285f Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Wed, 10 Jan 2024 09:31:06 -0500 Subject: [PATCH] LG-11882: Drop disposable_domains table changelog: Internal, Database, Rename disposable_domains table to disposable_email_domains --- app/models/disposable_domain.rb | 9 ------ ...110142935_drop_disposable_domains_table.rb | 5 +++ db/schema.rb | 7 +---- spec/models/disposable_domain_spec.rb | 31 ------------------- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 app/models/disposable_domain.rb create mode 100644 db/primary_migrate/20240110142935_drop_disposable_domains_table.rb delete mode 100644 spec/models/disposable_domain_spec.rb diff --git a/app/models/disposable_domain.rb b/app/models/disposable_domain.rb deleted file mode 100644 index 082199f0970..00000000000 --- a/app/models/disposable_domain.rb +++ /dev/null @@ -1,9 +0,0 @@ -class DisposableDomain < ApplicationRecord - class << self - def disposable?(domain) - return false if !domain.is_a?(String) || domain.empty? - - exists?(name: domain) - end - end -end diff --git a/db/primary_migrate/20240110142935_drop_disposable_domains_table.rb b/db/primary_migrate/20240110142935_drop_disposable_domains_table.rb new file mode 100644 index 00000000000..5e0a0a33dea --- /dev/null +++ b/db/primary_migrate/20240110142935_drop_disposable_domains_table.rb @@ -0,0 +1,5 @@ +class DropDisposableDomainsTable < ActiveRecord::Migration[7.1] + def change + drop_table :disposable_domains + end +end diff --git a/db/schema.rb b/db/schema.rb index 669b7801e88..8cdcaf3f109 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_01_10_141229) do +ActiveRecord::Schema[7.1].define(version: 2024_01_10_142935) do # These are extensions that must be enabled in order to support this database enable_extension "citext" enable_extension "pg_stat_statements" @@ -95,11 +95,6 @@ t.index ["user_id", "last_used_at"], name: "index_device_user_id_last_used_at" end - create_table "disposable_domains", force: :cascade do |t| - t.citext "name", null: false - t.index ["name"], name: "index_disposable_domains_on_name", unique: true - end - create_table "disposable_email_domains", force: :cascade do |t| t.citext "name", null: false t.index ["name"], name: "index_disposable_email_domains_on_name", unique: true diff --git a/spec/models/disposable_domain_spec.rb b/spec/models/disposable_domain_spec.rb deleted file mode 100644 index 3572d1b0859..00000000000 --- a/spec/models/disposable_domain_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'rails_helper' - -RSpec.describe DisposableDomain do - let(:domain) { 'temporary.com' } - - describe '.disposable?' do - before do - DisposableDomain.create(name: domain) - end - - context 'when the domain exists' do - it 'returns true' do - expect(DisposableDomain.disposable?(domain)).to eq true - end - end - - context 'when the domain does not exist' do - it 'returns false' do - expect(DisposableDomain.disposable?('example.com')).to eq false - end - end - - context 'with bad data' do - it 'returns false' do - expect(DisposableDomain.disposable?('')).to eq false - expect(DisposableDomain.disposable?(nil)).to eq false - expect(DisposableDomain.disposable?({})).to eq false - end - end - end -end