e196f19e2d
This is the only places where SQLHelper is still called. The C4::Members::Search is not used anymore, but ModMember and AddMember. This patch replaced the calls to SQLHelper to use DBIX::Class. TODO: Move them to Koha::Borrower. Test plan: 1/ Make sure the patron search still works (no changes expected since the code was not in used). 2/ Add a patron with all fields filled 3/ Add another patron with some fields filled 4/ Update them with other values 5/ Delete them You should not get any errors. Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
399 lines
16 KiB
Perl
Executable file
399 lines
16 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 61;
|
|
use Test::MockModule;
|
|
use Data::Dumper;
|
|
use C4::Context;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Members');
|
|
}
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
# Start transaction
|
|
$dbh->{AutoCommit} = 0;
|
|
$dbh->{RaiseError} = 1;
|
|
|
|
my $CARDNUMBER = 'TESTCARD01';
|
|
my $FIRSTNAME = 'Marie';
|
|
my $SURNAME = 'Mcknight';
|
|
my $CATEGORYCODE = 'S';
|
|
my $BRANCHCODE = 'CPL';
|
|
|
|
my $CHANGED_FIRSTNAME = "Marry Ann";
|
|
my $EMAIL = "Marie\@email.com";
|
|
my $EMAILPRO = "Marie\@work.com";
|
|
my $ETHNICITY = "German";
|
|
my $PHONE = "555-12123";
|
|
|
|
# XXX should be randomised and checked against the database
|
|
my $IMPOSSIBLE_CARDNUMBER = "XYZZZ999";
|
|
|
|
# XXX make a non-commit transaction and rollback rather than insert/delete
|
|
|
|
#my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter)= @_;
|
|
my @USERENV = (
|
|
1,
|
|
'test',
|
|
'MASTERTEST',
|
|
'Test',
|
|
'Test',
|
|
't',
|
|
'Test',
|
|
0,
|
|
);
|
|
my $BRANCH_IDX = 5;
|
|
|
|
C4::Context->_new_userenv ('DUMMY_SESSION_ID');
|
|
C4::Context->set_userenv ( @USERENV );
|
|
|
|
my $userenv = C4::Context->userenv
|
|
or BAIL_OUT("No userenv");
|
|
|
|
# Make a borrower for testing
|
|
my %data = (
|
|
cardnumber => $CARDNUMBER,
|
|
firstname => $FIRSTNAME,
|
|
surname => $SURNAME,
|
|
categorycode => $CATEGORYCODE,
|
|
branchcode => $BRANCHCODE,
|
|
dateofbirth => '',
|
|
dateexpiry => '9999-12-31',
|
|
userid => 'tomasito'
|
|
);
|
|
|
|
testAgeAccessors(\%data); #Age accessor tests don't touch the db so it is safe to run them with just the object.
|
|
|
|
my $addmem=AddMember(%data);
|
|
ok($addmem, "AddMember()");
|
|
|
|
# It's not really a Move, it's a Copy.
|
|
my $result = MoveMemberToDeleted($addmem);
|
|
ok($result,"MoveMemberToDeleted()");
|
|
|
|
my $sth = $dbh->prepare("SELECT * from borrowers WHERE borrowernumber=?");
|
|
$sth->execute($addmem);
|
|
my $MemberAdded = $sth->fetchrow_hashref;
|
|
|
|
$sth = $dbh->prepare("SELECT * from deletedborrowers WHERE borrowernumber=?");
|
|
$sth->execute($addmem);
|
|
my $MemberMoved = $sth->fetchrow_hashref;
|
|
|
|
is_deeply($MemberMoved,$MemberAdded,"Confirm MoveMemberToDeleted.");
|
|
|
|
my $member=GetMemberDetails("",$CARDNUMBER)
|
|
or BAIL_OUT("Cannot read member with card $CARDNUMBER");
|
|
|
|
ok ( $member->{firstname} eq $FIRSTNAME &&
|
|
$member->{surname} eq $SURNAME &&
|
|
$member->{categorycode} eq $CATEGORYCODE &&
|
|
$member->{branchcode} eq $BRANCHCODE
|
|
, "Got member")
|
|
or diag("Mismatching member details: ".Dumper(\%data, $member));
|
|
|
|
is($member->{dateofbirth}, undef, "Empty dates handled correctly");
|
|
|
|
$member->{firstname} = $CHANGED_FIRSTNAME;
|
|
$member->{email} = $EMAIL;
|
|
$member->{ethnicity} = $ETHNICITY;
|
|
$member->{phone} = $PHONE;
|
|
$member->{emailpro} = $EMAILPRO;
|
|
ModMember(%$member);
|
|
my $changedmember=GetMemberDetails("",$CARDNUMBER);
|
|
ok ( $changedmember->{firstname} eq $CHANGED_FIRSTNAME &&
|
|
$changedmember->{email} eq $EMAIL &&
|
|
$changedmember->{ethnicity} eq $ETHNICITY &&
|
|
$changedmember->{phone} eq $PHONE &&
|
|
$changedmember->{emailpro} eq $EMAILPRO
|
|
, "Member Changed")
|
|
or diag("Mismatching member details: ".Dumper($member, $changedmember));
|
|
|
|
C4::Context->set_preference( 'CardnumberLength', '' );
|
|
C4::Context->clear_syspref_cache();
|
|
|
|
my $checkcardnum=C4::Members::checkcardnumber($CARDNUMBER, "");
|
|
is ($checkcardnum, "1", "Card No. in use");
|
|
|
|
$checkcardnum=C4::Members::checkcardnumber($IMPOSSIBLE_CARDNUMBER, "");
|
|
is ($checkcardnum, "0", "Card No. not used");
|
|
|
|
C4::Context->set_preference( 'CardnumberLength', '4' );
|
|
C4::Context->clear_syspref_cache();
|
|
|
|
$checkcardnum=C4::Members::checkcardnumber($IMPOSSIBLE_CARDNUMBER, "");
|
|
is ($checkcardnum, "2", "Card number is too long");
|
|
|
|
|
|
|
|
C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
|
|
C4::Context->clear_syspref_cache();
|
|
|
|
my $notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
|
|
is ($notice_email, $EMAIL, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is off");
|
|
|
|
C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'emailpro' );
|
|
C4::Context->clear_syspref_cache();
|
|
|
|
$notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
|
|
is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is emailpro");
|
|
|
|
ok(!$member->{is_expired}, "GetMemberDetails() indicates that patron is not expired");
|
|
ModMember(borrowernumber => $member->{'borrowernumber'}, dateexpiry => '2001-01-1');
|
|
$member = GetMemberDetails($member->{'borrowernumber'});
|
|
ok($member->{is_expired}, "GetMemberDetails() indicates that patron is expired");
|
|
|
|
|
|
my $message_type = 'B';
|
|
my $message = 'my message';
|
|
my $messages_count = GetMessagesCount($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( $messages_count, 0, 'GetMessagesCount returns the number of messages correclty' );
|
|
|
|
is( AddMessage(), undef, 'AddMessage without argument returns undef' );
|
|
is( AddMessage(undef, $message_type, $message, $BRANCHCODE), undef, 'AddMessage without the borrower number returns undef' );
|
|
is( AddMessage($member->{borrowernumber}, undef, $message, $BRANCHCODE), undef, 'AddMessage without the message type returns undef' );
|
|
is( AddMessage($member->{borrowernumber}, $message_type, undef, $BRANCHCODE), undef, 'AddMessage without the message returns undef' );
|
|
is( AddMessage($member->{borrowernumber}, $message_type, $message, undef), undef, 'AddMessage without the branch code returns undef' );
|
|
is( AddMessage($member->{borrowernumber}, $message_type, $message, $BRANCHCODE), 1, 'AddMessage functions correctly' );
|
|
|
|
$messages_count = GetMessagesCount();
|
|
is( $messages_count, 0, 'GetMessagesCount without argument returns 0' );
|
|
$messages_count = GetMessagesCount(undef, $message_type, $BRANCHCODE);
|
|
is( $messages_count, '0', 'GetMessagesCount without the borrower number returns the number of messages' );
|
|
$messages_count = GetMessagesCount($member->{borrowernumber}, undef, $BRANCHCODE);
|
|
is( $messages_count, '1', 'GetMessagesCount without the message type returns the total number of messages' );
|
|
$messages_count = GetMessagesCount($member->{borrowernumber}, $message_type, undef);
|
|
is( $messages_count, '1', 'GetMessagesCount without the branchcode returns the total number of messages' );
|
|
$messages_count = GetMessagesCount($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( $messages_count, '1', 'GetMessagesCount returns the number of messages correctly' );
|
|
|
|
my $messages = GetMessages();
|
|
is( @$messages, 0, 'GetMessages without argument returns 0' );
|
|
$messages = GetMessages($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( @$messages, 1, 'GetMessages returns the correct number of messages' );
|
|
is( $messages->[0]->{borrowernumber}, $member->{borrowernumber}, 'GetMessages returns the borrower number correctly' );
|
|
is( $messages->[0]->{message_type}, $message_type, 'GetMessages returns the message type correclty' );
|
|
is( $messages->[0]->{message}, $message, 'GetMessages returns the message correctly' );
|
|
is( $messages->[0]->{branchcode}, $BRANCHCODE, 'GetMessages returns the branch code correctly' );
|
|
|
|
$messages_count = GetMessagesCount($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( $messages_count, 1, 'GetMessagesCount returns the number of messages correclty' );
|
|
|
|
DeleteMessage();
|
|
$messages = GetMessages($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( @$messages, 1, 'DeleteMessage without message id does not delete messages' );
|
|
DeleteMessage($messages->[0]->{message_id});
|
|
$messages = GetMessages($member->{borrowernumber}, $message_type, $BRANCHCODE);
|
|
is( @$messages, 0, 'DeleteMessage deletes a message correctly' );
|
|
|
|
|
|
# clean up
|
|
DelMember($member->{borrowernumber});
|
|
my $borrower = GetMember( cardnumber => $CARDNUMBER );
|
|
is( $borrower, undef, 'DelMember should remove the patron' );
|
|
|
|
# Check_Userid tests
|
|
%data = (
|
|
cardnumber => "123456789",
|
|
firstname => "Tomasito",
|
|
surname => "None",
|
|
categorycode => "S",
|
|
branchcode => "MPL",
|
|
dateofbirth => '',
|
|
dateexpiry => '9999-12-31',
|
|
);
|
|
# Add a new borrower
|
|
my $borrowernumber = AddMember( %data );
|
|
is( Check_Userid( 'tomasito.non', $borrowernumber ), 1,
|
|
'recently created userid -> unique (borrowernumber passed)' );
|
|
is( Check_Userid( 'tomasitoxxx', $borrowernumber ), 1,
|
|
'non-existent userid -> unique (borrowernumber passed)' );
|
|
is( Check_Userid( 'tomasito.none', '' ), 0,
|
|
'userid exists (blank borrowernumber)' );
|
|
is( Check_Userid( 'tomasitoxxx', '' ), 1,
|
|
'non-existent userid -> unique (blank borrowernumber)' );
|
|
|
|
# Add a new borrower with the same userid but different cardnumber
|
|
$data{ cardnumber } = "987654321";
|
|
my $new_borrowernumber = AddMember( %data );
|
|
is( Check_Userid( 'tomasito.none', '' ), 0,
|
|
'userid not unique (blank borrowernumber)' );
|
|
is( Check_Userid( 'tomasito.none', $new_borrowernumber ), 0,
|
|
'userid not unique (second borrowernumber passed)' );
|
|
$borrower = GetMember( borrowernumber => $new_borrowernumber );
|
|
ok( $borrower->{userid} ne 'tomasito', "Borrower with duplicate userid has new userid generated" );
|
|
|
|
$data{ cardnumber } = "234567890";
|
|
$data{userid} = 'a_user_id';
|
|
$borrowernumber = AddMember( %data );
|
|
$borrower = GetMember( borrowernumber => $borrowernumber );
|
|
is( $borrower->{userid}, $data{userid}, 'AddMember should insert the given userid' );
|
|
|
|
# Regression tests for BZ13502
|
|
## Remove all entries with userid='' (should be only 1 max)
|
|
$dbh->do(q|DELETE FROM borrowers WHERE userid = ''|);
|
|
## And create a patron with a userid=''
|
|
$borrowernumber = AddMember( categorycode => 'S', branchcode => 'MPL' );
|
|
$dbh->do(q|UPDATE borrowers SET userid = '' WHERE borrowernumber = ?|, undef, $borrowernumber);
|
|
# Create another patron and verify the userid has been generated
|
|
$borrowernumber = AddMember( categorycode => 'S', branchcode => 'MPL' );
|
|
ok( $borrowernumber > 0, 'AddMember should have inserted the patron even if no userid is given' );
|
|
$borrower = GetMember( borrowernumber => $borrowernumber );
|
|
ok( $borrower->{userid}, 'A userid should have been generated correctly' );
|
|
|
|
# Regression tests for BZ12226
|
|
is( Check_Userid( C4::Context->config('user'), '' ), 0,
|
|
'Check_Userid should return 0 for the DB user (Bug 12226)');
|
|
|
|
subtest 'GetMemberAccountBalance' => sub {
|
|
|
|
plan tests => 10;
|
|
|
|
my $members_mock = new Test::MockModule('C4::Members');
|
|
$members_mock->mock( 'GetMemberAccountRecords', sub {
|
|
my ($borrowernumber) = @_;
|
|
if ($borrowernumber) {
|
|
my @accountlines = (
|
|
{ amountoutstanding => '7', accounttype => 'Rent' },
|
|
{ amountoutstanding => '5', accounttype => 'Res' },
|
|
{ amountoutstanding => '3', accounttype => 'Pay' } );
|
|
return ( 15, \@accountlines );
|
|
}
|
|
else {
|
|
my @accountlines;
|
|
return ( 0, \@accountlines );
|
|
}
|
|
});
|
|
|
|
my $person = GetMemberDetails(undef,undef);
|
|
ok( !$person , 'Expected no member details from undef,undef' );
|
|
$person = GetMemberDetails(undef,'987654321');
|
|
is( $person->{amountoutstanding}, 15,
|
|
'Expected 15 outstanding for cardnumber.');
|
|
$borrowernumber = $person->{borrowernumber};
|
|
$person = GetMemberDetails($borrowernumber,undef);
|
|
is( $person->{amountoutstanding}, 15,
|
|
'Expected 15 outstanding for borrowernumber.');
|
|
$person = GetMemberDetails($borrowernumber,'987654321');
|
|
is( $person->{amountoutstanding}, 15,
|
|
'Expected 15 outstanding for both borrowernumber and cardnumber.');
|
|
|
|
# do not count holds charges
|
|
C4::Context->set_preference( 'HoldsInNoissuesCharge', '1' );
|
|
C4::Context->set_preference( 'ManInvInNoissuesCharge', '0' );
|
|
my ($total, $total_minus_charges,
|
|
$other_charges) = C4::Members::GetMemberAccountBalance(123);
|
|
is( $total, 15 , "Total calculated correctly");
|
|
is( $total_minus_charges, 15, "Holds charges are not count if HoldsInNoissuesCharge=1");
|
|
is( $other_charges, 0, "Holds charges are not considered if HoldsInNoissuesCharge=1");
|
|
|
|
C4::Context->set_preference( 'HoldsInNoissuesCharge', '0' );
|
|
($total, $total_minus_charges,
|
|
$other_charges) = C4::Members::GetMemberAccountBalance(123);
|
|
is( $total, 15 , "Total calculated correctly");
|
|
is( $total_minus_charges, 10, "Holds charges are count if HoldsInNoissuesCharge=0");
|
|
is( $other_charges, 5, "Holds charges are considered if HoldsInNoissuesCharge=1");
|
|
|
|
$dbh->rollback();
|
|
};
|
|
|
|
sub _find_member {
|
|
my ($resultset) = @_;
|
|
my $found = $resultset && grep( { $_->{cardnumber} && $_->{cardnumber} eq $CARDNUMBER } @$resultset );
|
|
return $found;
|
|
}
|
|
|
|
### ------------------------------------- ###
|
|
### Testing GetAge() / SetAge() functions ###
|
|
### ------------------------------------- ###
|
|
#USES the package $member-variable to mock a koha.borrowers-object
|
|
sub testAgeAccessors {
|
|
my ($member) = @_;
|
|
my $original_dateofbirth = $member->{dateofbirth};
|
|
|
|
##Testing GetAge()
|
|
my $age=GetAge("1992-08-14", "2011-01-19");
|
|
is ($age, "18", "Age correct");
|
|
|
|
$age=GetAge("2011-01-19", "1992-01-19");
|
|
is ($age, "-19", "Birthday In the Future");
|
|
|
|
##Testing SetAge() for now()
|
|
my $dt_now = DateTime->now();
|
|
$age = DateTime::Duration->new(years => 12, months => 6, days => 1);
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '12', "SetAge 12 years");
|
|
|
|
$age = DateTime::Duration->new(years => 18, months => 12, days => 31);
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '19', "SetAge 18+1 years"); #This is a special case, where months=>12 and days=>31 constitute one full year, hence we get age 19 instead of 18.
|
|
|
|
$age = DateTime::Duration->new(years => 18, months => 12, days => 30);
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '19', "SetAge 18 years");
|
|
|
|
$age = DateTime::Duration->new(years => 0, months => 1, days => 1);
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '0', "SetAge 0 years");
|
|
|
|
$age = '0018-12-31';
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '19', "SetAge ISO_Date 18+1 years"); #This is a special case, where months=>12 and days=>31 constitute one full year, hence we get age 19 instead of 18.
|
|
|
|
$age = '0018-12-30';
|
|
C4::Members::SetAge( $member, $age );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth} );
|
|
is ($age, '19', "SetAge ISO_Date 18 years");
|
|
|
|
$age = '18-1-1';
|
|
eval { C4::Members::SetAge( $member, $age ); };
|
|
is ((length $@ > 1), '1', "SetAge ISO_Date $age years FAILS");
|
|
|
|
$age = '0018-01-01';
|
|
eval { C4::Members::SetAge( $member, $age ); };
|
|
is ((length $@ == 0), '1', "SetAge ISO_Date $age years succeeds");
|
|
|
|
##Testing SetAge() for relative_date
|
|
my $relative_date = DateTime->new(year => 3010, month => 3, day => 15);
|
|
|
|
$age = DateTime::Duration->new(years => 10, months => 3);
|
|
C4::Members::SetAge( $member, $age, $relative_date );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth}, $relative_date->ymd() );
|
|
is ($age, '10', "SetAge, 10 years and 3 months old person was born on ".$member->{dateofbirth}." if todays is ".$relative_date->ymd());
|
|
|
|
$age = DateTime::Duration->new(years => 112, months => 1, days => 1);
|
|
C4::Members::SetAge( $member, $age, $relative_date );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth}, $relative_date->ymd() );
|
|
is ($age, '112', "SetAge, 112 years, 1 months and 1 days old person was born on ".$member->{dateofbirth}." if today is ".$relative_date->ymd());
|
|
|
|
$age = '0112-01-01';
|
|
C4::Members::SetAge( $member, $age, $relative_date );
|
|
$age = C4::Members::GetAge( $member->{dateofbirth}, $relative_date->ymd() );
|
|
is ($age, '112', "SetAge ISO_Date, 112 years, 1 months and 1 days old person was born on ".$member->{dateofbirth}." if today is ".$relative_date->ymd());
|
|
|
|
$member->{dateofbirth} = $original_dateofbirth; #It is polite to revert made changes in the unit tests.
|
|
} #sub testAgeAccessors
|
|
|
|
1;
|