Conservancy/supporters
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

_lookupEmailAddress: replace _lookupEmailAddressId

Browse source 
Actually, I will ultimately need the whole record for my purposes, so
rework this function to return everything.
This commit is contained in:
Bradley M. Kuhn 2015-12-30 05:41:10 -08:00
parent 4d2fc22de1
commit 736f022005
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Supporters/lib/Supporters.pm
View file

@ -977,7 +977,7 @@ sub _lookupRequestTypeById($$) {
} }
###################################################################### ######################################################################
=item _lookupEmailAddressId() =item _lookupEmailAddress()
Parameters: Parameters:
@ -990,21 +990,36 @@ Parameters:
=back =back
Returns: scalar, which is the email_address.id found iff. the C<$emailAddress> is valid and Returns: undef if the email address is not found, otherwise a hash with the following values:
already in the supporter database's email_address table.
=over
=item emailAddress: The email address as given
=item id: The email_adress.id
=item type: The email_adress type
=item dateEncountered: The date_encountered of this email address.
=back
=cut =cut
sub _lookupEmailAddressId($$) { sub _lookupEmailAddress($$) {
my($self, $emailAddress) = @_; my($self, $emailAddress) = @_;
die "_lookupEmailAddressId() called with undef" unless defined $emailAddress; die "_lookupEmailAddressId() called with undef" unless defined $emailAddress;
my $val = $self->dbh()->selectall_hashref("SELECT id, email_address FROM email_address WHERE email_address = " . my $val = $self->dbh()->selectall_hashref("SELECT ea.id, ea.email_address, at.name, ea.date_encountered " .
$self->dbh->quote($emailAddress), 'email_address'); "FROM email_address ea, address_type at " .
"WHERE ea.type_id = at.id AND " .
"email_address = " . $self->dbh->quote($emailAddress),
'email_address');
if (defined $val and defined $val->{$emailAddress}) { if (defined $val and defined $val->{$emailAddress}) {
return $val->{$emailAddress}{id}; return { id => $val->{$emailAddress}{id}, emailAddress => $val->{$emailAddress}{email_address},
type => $val->{$emailAddress}{name}, dateEncountered => $val->{$emailAddress}{date_encountered}};
} else { } else {
return undef; return undef;
} }

9
Supporters/t/Supporters.t
View file

@ -538,16 +538,17 @@ dies_ok { $sp->_verifyId("String") } "_verifyId: dies for non-numeric id";
# This is a hacky way to test this; but should work # This is a hacky way to test this; but should work
ok(not ($sp->_verifyId($drapperId + 10)), "_verifyId: non-existent id is not found"); ok(not ($sp->_verifyId($drapperId + 10)), "_verifyId: non-existent id is not found");
=item _lookupEmailAddressId =item _lookupEmailAddress
=cut =cut
dies_ok { $sp->_lookupEmailAddressId(undef); } "_lookupEmailAddressId: dies for undefined email_address"; dies_ok { $sp->_lookupEmailAddress(undef); } "_lookupEmailAddressId: dies for undefined email_address";
is($sp->_lookupEmailAddressId('drapper@example.org'), $drapperEmailId, is_deeply($sp->_lookupEmailAddress('drapper@example.org'),
{ emailAddress => 'drapper@example.org', id => $drapperEmailId, type => 'work', dateEncountered => $today },
"_lookupEmailAddressId: returns email Id for known item"); "_lookupEmailAddressId: returns email Id for known item");
is($sp->_lookupEmailAddressId('drapper@example.com'), undef, is($sp->_lookupEmailAddress('drapper@example.com'), undef,
"_lookupEmailAddressId: returns undef for unknown item."); "_lookupEmailAddressId: returns undef for unknown item.");
$sp = undef; $sp = undef;