use Modern::Perl;
-use Test::More tests => 55;
+use Test::More tests => 74;
+use Test::MockModule;
use Data::Dumper;
use C4::Context;
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";
-my $INDEPENDENT_BRANCHES_PREF = 'IndependentBranches';
-
# XXX make a non-commit transaction and rollback rather than insert/delete
#my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter)= @_;
my $BRANCH_IDX = 5;
C4::Context->_new_userenv ('DUMMY_SESSION_ID');
-C4::Context::set_userenv ( @USERENV );
+C4::Context->set_userenv ( @USERENV );
my $userenv = C4::Context->userenv
or BAIL_OUT("No userenv");
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");
$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( $INDEPENDENT_BRANCHES_PREF, '0' );
-C4::Context->clear_syspref_cache();
-
-my $results = Search($CARDNUMBER);
-ok (@$results == 1, "Search cardnumber returned only one result")
- or diag("Multiple members with Card $CARDNUMBER: ".Dumper($results));
-ok (_find_member($results), "Search cardnumber")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-my @searchstring=($SURNAME);
-$results = Search(\@searchstring);
-ok (_find_member($results), "Search (arrayref)")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-$results = Search(\@searchstring,undef,undef,undef,["surname"]);
-ok (_find_member($results), "Surname Search (arrayref)")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-$results = Search("$CHANGED_FIRSTNAME $SURNAME", "surname");
-ok (_find_member($results), "Full name Search (string)")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-@searchstring=($PHONE);
-$results = Search(\@searchstring,undef,undef,undef,["phone"]);
-ok (_find_member($results), "Phone Search (arrayref)")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-$results = Search($PHONE,undef,undef,undef,["phone"]);
-ok (_find_member($results), "Phone Search (string)")
- or diag("Card $CARDNUMBER not found in the resultset: ".Dumper($results));
-
-C4::Context->set_preference( $INDEPENDENT_BRANCHES_PREF, '1' );
-C4::Context->clear_syspref_cache();
-
-$results = Search("$CHANGED_FIRSTNAME $SURNAME", "surname");
-ok (!_find_member($results), "Full name Search (string) for independent branches, different branch")
- or diag("Card $CARDNUMBER found in the resultset for independent branches: ".Dumper(C4::Context->preference($INDEPENDENT_BRANCHES_PREF), $results));
-
-@searchstring=($SURNAME);
-$results = Search(\@searchstring);
-ok (!_find_member($results), "Search (arrayref) for independent branches, different branch")
- or diag("Card $CARDNUMBER found in the resultset for independent branches: ".Dumper(C4::Context->preference($INDEPENDENT_BRANCHES_PREF), $results));
-
-$USERENV[$BRANCH_IDX] = $BRANCHCODE;
-C4::Context::set_userenv ( @USERENV );
-
-$results = Search("$CHANGED_FIRSTNAME $SURNAME", "surname");
-ok (_find_member($results), "Full name Search (string) for independent branches, same branch")
- or diag("Card $CARDNUMBER not found in the resultset for independent branches: ".Dumper(C4::Context->preference($INDEPENDENT_BRANCHES_PREF), $results));
-
-@searchstring=($SURNAME);
-$results = Search(\@searchstring);
-ok (_find_member($results), "Search (arrayref) for independent branches, same branch")
- or diag("Card $CARDNUMBER not found in the resultset for independent branches: ".Dumper(C4::Context->preference($INDEPENDENT_BRANCHES_PREF), $results));
-
C4::Context->set_preference( 'CardnumberLength', '' );
C4::Context->clear_syspref_cache();
$checkcardnum=C4::Members::checkcardnumber($IMPOSSIBLE_CARDNUMBER, "");
is ($checkcardnum, "2", "Card number is too long");
-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");
C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
C4::Context->clear_syspref_cache();
# clean up
DelMember($member->{borrowernumber});
-$results = Search($CARDNUMBER,undef,undef,undef,["cardnumber"]);
-ok (!_find_member($results), "Delete member")
- or diag("Card $CARDNUMBER found for the deleted member in the resultset: ".Dumper($results));
+my $borrower = GetMember( cardnumber => $CARDNUMBER );
+is( $borrower, undef, 'DelMember should remove the patron' );
# Check_Userid tests
%data = (
categorycode => "S",
branchcode => "MPL",
dateofbirth => '',
- dateexpiry => '9999-12-31',
- userid => 'tomasito'
+ debarred => '',
+ dateexpiry => '',
+ dateenrolled => '',
);
# Add a new borrower
my $borrowernumber = AddMember( %data );
-is( Check_Userid( 'tomasito', $borrowernumber ), 1,
+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', '' ), 0,
+is( Check_Userid( 'tomasito.none', '' ), 0,
'userid exists (blank borrowernumber)' );
is( Check_Userid( 'tomasitoxxx', '' ), 1,
'non-existent userid -> unique (blank borrowernumber)' );
+$borrower = GetMember( borrowernumber => $borrowernumber );
+is( $borrower->{dateofbirth}, undef, 'AddMember should undef dateofbirth if empty string is given');
+is( $borrower->{debarred}, undef, 'AddMember should undef debarred if empty string is given');
+isnt( $borrower->{dateexpiry}, '0000-00-00', 'AddMember should not set dateexpiry to 0000-00-00 if empty string is given');
+isnt( $borrower->{dateenrolled}, '0000-00-00', 'AddMember should not set dateenrolled to 0000-00-00 if empty string is given');
+
+ModMember( borrowernumber => $borrowernumber, dateofbirth => '', debarred => '', dateexpiry => '', dateenrolled => '' );
+$borrower = GetMember( borrowernumber => $borrowernumber );
+is( $borrower->{dateofbirth}, undef, 'ModMember should undef dateofbirth if empty string is given');
+is( $borrower->{debarred}, undef, 'ModMember should undef debarred if empty string is given');
+isnt( $borrower->{dateexpiry}, '0000-00-00', 'ModMember should not set dateexpiry to 0000-00-00 if empty string is given');
+isnt( $borrower->{dateenrolled}, '0000-00-00', 'ModMember should not set dateenrolled to 0000-00-00 if empty string is given');
+
+ModMember( borrowernumber => $borrowernumber, dateofbirth => '1970-01-01', debarred => '2042-01-01', dateexpiry => '9999-12-31', dateenrolled => '2015-09-06' );
+$borrower = GetMember( borrowernumber => $borrowernumber );
+is( $borrower->{dateofbirth}, '1970-01-01', 'ModMember should correctly set dateofbirth if a valid date is given');
+is( $borrower->{debarred}, '2042-01-01', 'ModMember should correctly set debarred if a valid date is given');
+is( $borrower->{dateexpiry}, '9999-12-31', 'ModMember should correctly set dateexpiry if a valid date is given');
+is( $borrower->{dateenrolled}, '2015-09-06', 'ModMember should correctly set dateenrolled if a valid date is given');
+
# Add a new borrower with the same userid but different cardnumber
$data{ cardnumber } = "987654321";
my $new_borrowernumber = AddMember( %data );
-is( Check_Userid( 'tomasito', '' ), 0,
+is( Check_Userid( 'tomasito.none', '' ), 0,
'userid not unique (blank borrowernumber)' );
-is( Check_Userid( 'tomasito', $borrowernumber ), 0,
- 'userid not unique (first borrowernumber passed)' );
-is( Check_Userid( 'tomasito', $new_borrowernumber ), 0,
+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();
+};
+
+subtest 'purgeSelfRegistration' => sub {
+ plan tests => 2;
+
+ #purge unverified
+ my $d=360;
+ C4::Members::DeleteUnverifiedOpacRegistrations($d);
+ foreach(1..3) {
+ $dbh->do("INSERT INTO borrower_modifications (timestamp, borrowernumber, verification_token) VALUES ('2014-01-01 01:02:03',0,?)", undef, (scalar localtime)."_$_");
+ }
+ is( C4::Members::DeleteUnverifiedOpacRegistrations($d), 3, 'Test for DeleteUnverifiedOpacRegistrations' );
+
+ #purge members in temporary category
+ my $c= 'XYZ';
+ $dbh->do("INSERT IGNORE INTO categories (categorycode) VALUES ('$c')");
+ C4::Context->set_preference('PatronSelfRegistrationDefaultCategory', $c );
+ C4::Context->set_preference('PatronSelfRegistrationExpireTemporaryAccountsDelay', 360);
+ C4::Members::DeleteExpiredOpacRegistrations();
+ $dbh->do("INSERT INTO borrowers (surname, address, city, branchcode, categorycode, dateenrolled) VALUES ('Testaabbcc', 'Street 1', 'CITY', 'CPL', '$c', '2014-01-01 01:02:03')");
+ is( C4::Members::DeleteExpiredOpacRegistrations(), 1, 'Test for DeleteExpiredOpacRegistrations');
+ $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;
projects / srvgit / blobdiff