Skip to content

Commit e5a847a

Browse files
Use exists? to check domain
1 parent 81f8ad5 commit e5a847a

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

app/models/school.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ def import_in_progress?
117117
.exists?(description: id)
118118
end
119119

120-
def email_domain_is_valid?(domain)
121-
email_domains.include?(domain)
120+
def valid_domain?(candidate_domain)
121+
school_email_domains.exists?(domain: candidate_domain)
122122
end
123123

124124
private
@@ -179,8 +179,4 @@ def do_salesforce_sync(is_create:)
179179
Salesforce::SchoolSyncJob.perform_later(school_id: id, is_create:)
180180
Salesforce::ContactSyncJob.perform_later(school_id: id)
181181
end
182-
183-
def email_domains
184-
@email_domains ||= school_email_domains.pluck(:domain)
185-
end
186182
end

spec/models/school_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@
683683
end
684684
end
685685

686-
describe '#email_domain_is_valid?' do
686+
describe '#valid_domain?' do
687687
let(:valid_domain) { 'valid.edu' }
688688
let(:invalid_domain) { 'invalid.edu' }
689689

@@ -692,11 +692,11 @@
692692
end
693693

694694
it 'returns true when school has registered the email domain' do
695-
expect(school.email_domain_is_valid?(valid_domain)).to be(true)
695+
expect(school.valid_domain?(valid_domain)).to be(true)
696696
end
697697

698698
it 'returns false when school has not registered the email domain' do
699-
expect(school.email_domain_is_valid?(invalid_domain)).to be(false)
699+
expect(school.valid_domain?(invalid_domain)).to be(false)
700700
end
701701
end
702702
end

0 commit comments

Comments
 (0)