use Modern::Perl;
-use Test::More tests => 41;
+use Test::More tests => 44;
use Test::Warn;
use Test::Exception;
use Test::MockModule;
use Time::Fake;
use DateTime;
use JSON;
-use Data::Dumper;
use utf8;
-use C4::Circulation;
+use C4::Circulation qw( AddIssue AddReturn );
use C4::Biblio;
-use C4::Auth qw(checkpw_hash);
+use C4::Auth qw( checkpw checkpw_hash );
use Koha::ActionLogs;
use Koha::Holds;
use Koha::Patron::Categories;
use Koha::Patron::Relationship;
use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Virtualshelf;
use Koha::Virtualshelves;
+use Koha::Notice::Messages;
use t::lib::TestBuilder;
use t::lib::Mocks;
};
subtest 'guarantees' => sub {
- plan tests => 13;
+
+ plan tests => 9;
t::lib::Mocks::mock_preference( 'borrowerRelationship', 'test|test2' );
my $guarantees = $new_patron_1->guarantee_relationships;
is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );
is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee relationships' );
- my @guarantees = $new_patron_1->guarantee_relationships;
- is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
- is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );
my $guarantee_1 = $builder->build({ source => 'Borrower' });
my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_1->{borrowernumber}, relationship => 'test' } )->store();
$guarantees = $new_patron_1->guarantee_relationships;
is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantee_relationships should return a Koha::Patrons result set in a scalar context' );
is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );
- @guarantees = $new_patron_1->guarantee_relationships;
- is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
- is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );
- $_->delete for @guarantees;
+
+ $guarantees->delete;
#Test return order of guarantees BZ 18635
my $categorycode = $builder->build({ source => 'Category' })->{categorycode};
};
subtest 'siblings' => sub {
- plan tests => 7;
+
+ plan tests => 6;
+
my $siblings = $new_patron_1->siblings;
is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
my $guarantee_1 = $builder->build( { source => 'Borrower' } );
my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
$siblings = $retrieved_guarantee_1->siblings;
is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );
- my @siblings = $retrieved_guarantee_1->siblings;
- is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );
is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );
my $guarantee_2 = $builder->build( { source => 'Borrower' } );
my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_2->{borrowernumber}, relationship => 'test' } )->store();
};
subtest "delete" => sub {
- plan tests => 7;
+ plan tests => 13;
t::lib::Mocks::mock_preference( 'BorrowersLog', 1 );
- my $patron = $builder->build( { source => 'Borrower' } );
- my $retrieved_patron = Koha::Patrons->find( $patron->{borrowernumber} );
- my $hold = $builder->build(
- { source => 'Reserve',
- value => { borrowernumber => $patron->{borrowernumber} }
- }
- );
- my $list = $builder->build(
- { source => 'Virtualshelve',
- value => { owner => $patron->{borrowernumber} }
- }
- );
- my $modification = $builder->build_object({ class => 'Koha::Patron::Modifications', value => { borrowernumber => $patron->{borrowernumber} } });
+ t::lib::Mocks::mock_preference( 'ListOwnershipUponPatronDeletion', 'transfer' );
+ Koha::Virtualshelves->delete;
- my $deleted = $retrieved_patron->delete;
+ my $patron = $builder->build_object({ class => 'Koha::Patrons' });
+ my $patron_for_sharing = $builder->build_object({ class => 'Koha::Patrons' });
+ my $staff_patron = $builder->build_object({ class => 'Koha::Patrons' });
+ t::lib::Mocks::mock_userenv({ patron => $staff_patron });
+
+ my $hold = $builder->build_object({ class => 'Koha::Holds', value => { borrowernumber => $patron->borrowernumber } });
+ my $modification = $builder->build_object({ class => 'Koha::Patron::Modifications', value => { borrowernumber => $patron->borrowernumber } });
+ my $private_list = Koha::Virtualshelf->new({
+ shelfname => "private",
+ owner => $patron->borrowernumber,
+ public => 0,
+ })->store;
+ my $public_list = Koha::Virtualshelf->new({
+ shelfname => "public",
+ owner => $patron->borrowernumber,
+ public => 1,
+ })->store;
+ my $list_to_share = Koha::Virtualshelf->new({
+ shelfname => "shared",
+ owner => $patron->borrowernumber,
+ public => 0,
+ })->store;
+
+ $list_to_share->share("valid key")->accept( "valid key", $patron_for_sharing->borrowernumber );
+ $list_to_share->share("valid key")->accept( "valid key", $staff_patron->borrowernumber ); # this share should be removed at deletion too
+ my $deleted = $patron->delete;
is( ref($deleted), 'Koha::Patron', 'Koha::Patron->delete should return the deleted patron object if the patron has been correctly deleted' );
+ ok( $patron->borrowernumber, 'Still have the deleted borrowernumber' );
- is( Koha::Patrons->find( $patron->{borrowernumber} ), undef, 'Koha::Patron->delete should have deleted the patron' );
+ is( Koha::Patrons->find( $patron->borrowernumber ), undef, 'Koha::Patron->delete should have deleted the patron' );
- is (Koha::Old::Holds->search( { reserve_id => $hold->{ reserve_id } } )->count, 1, q|Koha::Patron->delete should have cancelled patron's holds| );
+ is (Koha::Old::Holds->search({ reserve_id => $hold->reserve_id })->count, 1, q|Koha::Patron->delete should have cancelled patron's holds| );
- is( Koha::Holds->search( { borrowernumber => $patron->{borrowernumber} } )->count, 0, q|Koha::Patron->delete should have cancelled patron's holds 2| );
+ is( Koha::Holds->search( { borrowernumber => $patron->borrowernumber } )->count, 0, q|Koha::Patron->delete should have cancelled patron's holds 2| );
- is( Koha::Virtualshelves->search( { owner => $patron->{borrowernumber} } )->count, 0, q|Koha::Patron->delete should have deleted patron's lists| );
+ my $transferred_lists = Koha::Virtualshelves->search({ owner => $staff_patron->borrowernumber })->count;
+ is( $transferred_lists, 2, 'Public and shared lists should stay in database under a different owner with a unique name, while private lists delete, with ListOwnershipPatronDeletion set to Transfer');
+ is( Koha::Virtualshelfshares->search({ borrowernumber => $staff_patron->borrowernumber })->count, 0, "New owner of list should have shares removed" );
+ is( Koha::Virtualshelfshares->search({ borrowernumber => $patron_for_sharing->borrowernumber })->count, 1, "But the other share is still there" );
+ is( Koha::Virtualshelves->search({ owner => $patron->borrowernumber })->count, 0, q|Koha::Patron->delete should have deleted patron's lists/removed their ownership| );
- is( Koha::Patron::Modifications->search( { borrowernumber => $patron->{borrowernumber} } )->count, 0, q|Koha::Patron->delete should have deleted patron's modifications| );
+ is( Koha::Patron::Modifications->search( { borrowernumber => $patron->borrowernumber } )->count, 0, q|Koha::Patron->delete should have deleted patron's modifications| );
- my $number_of_logs = $schema->resultset('ActionLog')->search( { module => 'MEMBERS', action => 'DELETE', object => $retrieved_patron->borrowernumber } )->count;
+ my $number_of_logs = $schema->resultset('ActionLog')->search( { module => 'MEMBERS', action => 'DELETE', object => $patron->borrowernumber } )->count;
is( $number_of_logs, 1, 'With BorrowerLogs, Koha::Patron->delete should have logged' );
+
+ t::lib::Mocks::mock_preference( 'ListOwnershipUponPatronDeletion', 'delete' );
+ Koha::Virtualshelves->delete;
+ my $patron2 = $builder->build_object({ class => 'Koha::Patrons' });
+ my $private_list2 = Koha::Virtualshelf->new({
+ shelfname => "private",
+ owner => $patron2->borrowernumber,
+ public => 0,
+ })->store;
+ my $public_list2 = Koha::Virtualshelf->new({
+ shelfname => "public",
+ owner => $patron2->borrowernumber,
+ public => 1,
+ })->store;
+ my $list_to_share2 = Koha::Virtualshelf->new({
+ shelfname => "shared",
+ owner => $patron2->borrowernumber,
+ public => 0,
+ })->store;
+ $list_to_share2->share("valid key")->accept( "valid key", $patron_for_sharing->borrowernumber );
+
+ # Delete patron2, check if shelves and shares are now empty
+ $patron2->delete;
+ is( Koha::Virtualshelves->count, 0, 'All lists should be gone now' );
+ is( Koha::Virtualshelfshares->count, 0, 'All shares should be gone too' );
};
subtest 'Koha::Patrons->delete' => sub {
$patron->delete;
};
-subtest 'checkouts + pending_checkouts + get_overdues + old_checkouts' => sub {
+subtest 'checkouts + pending_checkouts + overdues + old_checkouts' => sub {
plan tests => 17;
my $library = $builder->build( { source => 'Branch' } );
my $first_checkout = $pending_checkouts->next;
is( $first_checkout->unblessed_all_relateds->{biblionumber}, $item_3->biblionumber, 'pending_checkouts should prefetch values from other tables (here biblio)' );
- my $overdues = $patron->get_overdues;
+ my $overdues = $patron->overdues;
is( $overdues->count, 2, 'Patron should have 2 overdues');
- is( ref($overdues), 'Koha::Checkouts', 'Koha::Patron->get_overdues should return Koha::Checkouts' );
+ is( ref($overdues), 'Koha::Checkouts', 'Koha::Patron->overdues should return Koha::Checkouts' );
is( $overdues->next->itemnumber, $item_1->itemnumber, 'The issue should be returned in the same order as they have been done, first is correct' );
is( $overdues->next->itemnumber, $item_2->itemnumber, 'The issue should be returned in the same order as they have been done, second is correct' );
my $patron = $builder->build({
source => 'Borrower',
value => {
- categorycode => 'AGE_5_10'
+ categorycode => $category->categorycode
}
});
$patron = Koha::Patrons->find( $patron->{borrowernumber} );
add_m3_m6_m1 =>
{ date => '2016-08-27', expected_age => 3, valid => 0 },
add_m7_m6_m1 =>
- { date => '2015-02-28', expected_age => 7, valid => 1 },
+ { date => '2013-02-28', expected_age => 7, valid => 1 },
add_m5_0_0 =>
{ date => '2015-02-28', expected_age => 5, valid => 1 },
add_m5_0_p1 =>
- { date => '2015-03-01', expected_age => 5, valid => 0 },
+ { date => '2015-03-01', expected_age => 4, valid => 0 },
add_m5_0_m1 =>
{ date => '2015-02-27', expected_age => 5, valid => 1 },
add_m11_0_0 =>
{ date => '2009-02-28', expected_age => 11, valid => 0 },
add_m11_0_p1 =>
- { date => '2009-03-01', expected_age => 11, valid => 1 },
+ { date => '2009-03-01', expected_age => 10, valid => 1 },
add_m11_0_m1 =>
{ date => '2009-02-27', expected_age => 11, valid => 0 },
},
Time::Fake->offset( $dt->epoch );
- for my $k ( keys %$date ) {
+ for my $k ( sort keys %$date ) {
next if $k eq 'today';
my $dob = $date->{$k};
$patron->is_valid_age,
$dob->{valid},
sprintf(
- "Today=%s, dob=%s, is %s, should be valid=%s",
- $date->{today}, $dob->{date}, $dob->{expected_age}, $dob->{valid}
+ "Today=%s, dob=%s, is %s, should be valid=%s in category %s",
+ $date->{today}, $dob->{date}, $dob->{expected_age}, $dob->{valid}, $category->categorycode
)
);
}
$patron->delete;
};
-subtest 'search_patrons_to_anonymise & anonymise_issue_history' => sub {
+subtest 'search_patrons_to_anonymise' => sub {
+
plan tests => 5;
# TODO create a subroutine in t::lib::Mocks
my $patrons_to_anonymise = Koha::Patrons->search_patrons_to_anonymise( { before => '2010-10-11' } )->search( { 'me.borrowernumber' => $patron->{borrowernumber} } );
is( ref($patrons_to_anonymise), 'Koha::Patrons', 'search_patrons_to_anonymise should return Koha::Patrons' );
- my $rows_affected = Koha::Patrons->search_patrons_to_anonymise( { before => '2011-11-12' } )->anonymise_issue_history( { before => '2010-10-11' } );
+ my $rows_affected = Koha::Old::Checkouts->search(
+ {
+ borrowernumber => [
+ Koha::Patrons->search_patrons_to_anonymise(
+ { before => '2011-11-12' }
+ )->get_column('borrowernumber')
+ ],
+ returndate => { '<' => '2011-10-11', }
+ }
+ )->anonymize;
ok( $rows_affected > 0, 'AnonymiseIssueHistory should affect at least 1 row' );
$patrons_to_anonymise = Koha::Patrons->search_patrons_to_anonymise( { before => '2010-10-11' } );
($borrowernumber_used_to_anonymised) = $sth->fetchrow_array;
is( $borrowernumber_used_to_anonymised, $patron->{borrowernumber}, 'The issue should not have been anonymised, the returned date is later' );
- $rows_affected = Koha::Patrons->search_patrons_to_anonymise( { before => '2011-11-12' } )->anonymise_issue_history;
+ $rows_affected = Koha::Old::Checkouts->search(
+ {
+ borrowernumber => [
+ Koha::Patrons->search_patrons_to_anonymise(
+ { before => '2011-11-12' }
+ )->get_column('borrowernumber')
+ ],
+ returndate => { '<' => '2011-11-12', }
+ }
+ )->anonymize;
$sth->execute($item_2->itemnumber);
($borrowernumber_used_to_anonymised) = $sth->fetchrow_array;
is( $borrowernumber_used_to_anonymised, $anonymous->{borrowernumber}, 'The issue should have been anonymised, the returned date is before' );
my $sth_reset = $dbh->prepare(q|UPDATE old_issues SET borrowernumber = ? WHERE itemnumber = ?|);
$sth_reset->execute( $patron->{borrowernumber}, $item_1->itemnumber );
$sth_reset->execute( $patron->{borrowernumber}, $item_2->itemnumber );
- $rows_affected = Koha::Patrons->search_patrons_to_anonymise->anonymise_issue_history;
+ $rows_affected = Koha::Old::Checkouts->search(
+ {
+ borrowernumber => [
+ Koha::Patrons->search_patrons_to_anonymise->get_column(
+ 'borrowernumber')
+ ]
+ }
+ )->anonymize;
$sth->execute($item_1->itemnumber);
($borrowernumber_used_to_anonymised) = $sth->fetchrow_array;
is( $borrowernumber_used_to_anonymised, $anonymous->{borrowernumber}, 'The issue 1 should have been anonymised, before parameter was not passed' );
t::lib::Mocks::mock_preference( 'AnonymousPatron', '' );
subtest 'AnonymousPatron is not defined' => sub {
- plan tests => 3;
+
+ plan tests => 2;
t::lib::Mocks::mock_preference('IndependentBranches', 0);
my $patron = $builder->build(
my ( $returned, undef, undef ) = C4::Circulation::AddReturn( $item->barcode, undef, undef, dt_from_string('2010-10-10') );
is( $returned, 1, 'The item should have been returned' );
- my $rows_affected = Koha::Patrons->search_patrons_to_anonymise( { before => '2010-10-11' } )->anonymise_issue_history( { before => '2010-10-11' } );
- ok( $rows_affected > 0, 'AnonymiseIssueHistory should affect at least 1 row' );
+ my $patrons_to_anonymize = Koha::Patrons->search_patrons_to_anonymise( { before => '2010-10-11' } );
+ ok( $patrons_to_anonymize->count > 0, 'search_patrons_to_anonymize' );
- my $dbh = C4::Context->dbh;
- my ($borrowernumber_used_to_anonymised) = $dbh->selectrow_array(q|
- SELECT borrowernumber FROM old_issues where itemnumber = ?
- |, undef, $item->itemnumber);
- is( $borrowernumber_used_to_anonymised, undef, 'With AnonymousPatron is not defined, the issue should have been anonymised anyway' );
Koha::Patrons->find( $patron->{borrowernumber})->delete;
};
$patron_other->delete;
};
-subtest 'get_overdues' => sub {
+subtest 'overdues' => sub {
plan tests => 7;
my $library = $builder->build( { source => 'Branch' } );
AddIssue( $patron, $item_3->barcode );
$patron = Koha::Patrons->find( $patron->{borrowernumber} );
- my $overdues = $patron->get_overdues;
+ my $overdues = $patron->overdues;
is( $overdues->count, 2, 'Patron should have 2 overdues');
is( $overdues->next->itemnumber, $item_1->itemnumber, 'The issue should be returned in the same order as they have been done, first is correct' );
is( $overdues->next->itemnumber, $item_2->itemnumber, 'The issue should be returned in the same order as they have been done, second is correct' );
$schema->storage->txn_rollback;
subtest 'Test Koha::Patrons::merge' => sub {
- plan tests => 113;
+ plan tests => 110;
my $schema = Koha::Database->new()->schema();
is( $results, undef, "Anonymous patron cannot have other patrons merged into it" );
is( Koha::Patrons->search( { borrowernumber => $keeper->id } )->count, 1, "Patron from attempted merge with AnonymousPatron still exists" );
+ subtest 'extended attributes' => sub {
+ plan tests => 8;
+
+ my $keep_patron =
+ $builder->build_object( { class => 'Koha::Patrons' } );
+ my $merge_patron =
+ $builder->build_object( { class => 'Koha::Patrons' } );
+
+ my $attribute_type_normal_1 = $builder->build_object(
+ {
+ class => 'Koha::Patron::Attribute::Types',
+ value => { repeatable => 0, unique_id => 0 }
+ }
+ );
+ my $attribute_type_normal_2 = $builder->build_object(
+ {
+ class => 'Koha::Patron::Attribute::Types',
+ value => { repeatable => 0, unique_id => 0 }
+ }
+ );
+
+ my $attribute_type_repeatable = $builder->build_object(
+ {
+ class => 'Koha::Patron::Attribute::Types',
+ value => { repeatable => 1, unique_id => 0 }
+ }
+ );
+
+ my $attr_keep = [
+ {
+ code => $attribute_type_normal_1->code,
+ attribute => 'from attr 1'
+ },
+ {
+ code => $attribute_type_repeatable->code,
+ attribute => 'from attr repeatable'
+ }
+ ];
+
+ my $attr_merge = [
+ {
+ code => $attribute_type_normal_2->code,
+ attribute => 'to attr 2'
+ },
+ {
+ code => $attribute_type_repeatable->code,
+ attribute => 'to attr repeatable'
+ },
+ ];
+
+ $keep_patron->extended_attributes($attr_keep);
+ $merge_patron->extended_attributes($attr_merge);
+
+ $keep_patron->merge_with( [ $merge_patron->borrowernumber ] );
+ my $merged_attributes = $keep_patron->extended_attributes;
+ is( $merged_attributes->count, 4 );
+
+ sub compare_attributes {
+ my ( $got, $expected, $code ) = @_;
+
+ is_deeply(
+ [
+ sort $got->search( { code => $code } )
+ ->get_column('attribute')
+ ],
+ $expected
+ );
+ }
+ compare_attributes(
+ $merged_attributes,
+ ['from attr 1'],
+ $attribute_type_normal_1->code
+ );
+ compare_attributes(
+ $merged_attributes,
+ ['to attr 2'],
+ $attribute_type_normal_2->code
+ );
+ compare_attributes(
+ $merged_attributes,
+ [ 'from attr repeatable', 'to attr repeatable' ],
+ $attribute_type_repeatable->code
+ );
+
+ # Cleanup
+ $keep_patron->delete;
+ $merge_patron->delete;
+
+ # Recreate but don't expect an exception if 2 non-repeatable attributes exist, pick the one from the patron we keep
+ $keep_patron =
+ $builder->build_object( { class => 'Koha::Patrons' } );
+ $merge_patron =
+ $builder->build_object( { class => 'Koha::Patrons' } );
+
+ $keep_patron->extended_attributes($attr_keep);
+ $merge_patron->extended_attributes(
+ [
+ @$attr_merge,
+ {
+ code => $attribute_type_normal_1->code,
+ attribute => 'yet another attribute for non-repeatable'
+ }
+ ]
+ );
+
+ $keep_patron->merge_with( [ $merge_patron->borrowernumber ] );
+ $merged_attributes = $keep_patron->extended_attributes;
+ is( $merged_attributes->count, 4 );
+ compare_attributes(
+ $merged_attributes,
+ ['from attr 1'],
+ $attribute_type_normal_1->code
+ );
+ compare_attributes(
+ $merged_attributes,
+ ['to attr 2'],
+ $attribute_type_normal_2->code
+ );
+ compare_attributes(
+ $merged_attributes,
+ [ 'from attr repeatable', 'to attr repeatable' ],
+ $attribute_type_repeatable->code
+ );
+
+ };
+
t::lib::Mocks::mock_preference( 'AnonymousPatron', '' );
$schema->storage->txn_rollback;
};
};
$schema->storage->txn_begin;
+subtest 'filter_by_expiration_date' => sub {
+ plan tests => 3;
+ my $count1 = Koha::Patrons->filter_by_expiration_date({ days => 28 })->count;
+ my $patron1 = $builder->build_object({ class => 'Koha::Patrons' });
+ $patron1->dateexpiry( dt_from_string->subtract(days => 27) )->store;
+ is( Koha::Patrons->filter_by_expiration_date({ days => 28 })->count, $count1, 'No more expired' );
+ $patron1->dateexpiry( dt_from_string->subtract(days => 28) )->store;
+ is( Koha::Patrons->filter_by_expiration_date({ days => 28 })->count, $count1 + 1, 'One more expired' );
+ $patron1->dateexpiry( dt_from_string->subtract(days => 29) )->store;
+ is( Koha::Patrons->filter_by_expiration_date({ days => 28 })->count, $count1 + 1, 'Same number again' );
+};
+
subtest 'search_unsubscribed' => sub {
plan tests => 4;
$patron2->discard_changes; # refresh
is( $patron2->firstname, undef, 'First name patron2 cleared' );
};
-$schema->storage->txn_rollback;
-subtest 'extended_attributes' => sub {
- plan tests => 14;
- my $schema = Koha::Database->new->schema;
- $schema->storage->txn_begin;
+subtest 'queue_notice' => sub {
+ plan tests => 11;
- my $patron_1 = $builder->build_object({class=> 'Koha::Patrons'});
- my $patron_2 = $builder->build_object({class=> 'Koha::Patrons'});
+ my $dbh = C4::Context->dbh;
+ t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'email' );
+ my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
+ my $branch = $builder->build_object( { class => 'Koha::Libraries' } );
+ my $letter_e = $builder->build_object( {
+ class => 'Koha::Notice::Templates',
+ value => {
+ branchcode => $branch->branchcode,
+ message_transport_type => 'email',
+ lang => 'default'
+ }
+ });
+ my $letter_p = $builder->build_object( {
+ class => 'Koha::Notice::Templates',
+ value => {
+ code => $letter_e->code,
+ module => $letter_e->module,
+ branchcode => $branch->branchcode,
+ message_transport_type => 'print',
+ lang => 'default'
+ }
+ });
+ my $letter_s = $builder->build_object( {
+ class => 'Koha::Notice::Templates',
+ value => {
+ code => $letter_e->code,
+ module => $letter_e->module,
+ branchcode => $branch->branchcode,
+ message_transport_type => 'sms',
+ lang => 'default'
+ }
+ });
+
+ my $letter_params = {
+ letter_code => $letter_e->code,
+ branchcode => $letter_e->branchcode,
+ module => $letter_e->module,
+ borrowernumber => $patron->borrowernumber,
+ tables => {
+ borrowers => $patron->borrowernumber,
+ }
+ };
+ my @mtts = ('email');
+
+ is( $patron->queue_notice(), undef, "Nothing is done if no params passed");
+ is( $patron->queue_notice({ letter_params => $letter_params }),undef, "Nothing done if only letter");
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_transports => \@mtts }),
+ {sent => ['email'] }, "Email sent"
+ );
+ $patron->email("")->store;
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_transports => \@mtts }),
+ {sent => ['print'],fallback => ['email']}, "Email fallsback to print if no email"
+ );
+ push @mtts, 'sms';
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_transports => \@mtts }),
+ {sent => ['print','sms'],fallback => ['email']}, "Email fallsback to print if no email, sms sent"
+ );
+ $patron->smsalertnumber("")->store;
+ my $counter = Koha::Notice::Messages->search({borrowernumber => $patron->borrowernumber })->count;
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_transports => \@mtts }),
+ {sent => ['print'],fallback => ['email','sms']}, "Email fallsback to print if no emai, sms fallsback to print if no sms, only one print sent"
+ );
+ is( Koha::Notice::Messages->search({borrowernumber => $patron->borrowernumber })->count, $counter+1,"Count of queued notices went up by one");
+
+ # Enable notification for Hold_Filled - Things are hardcoded here but should work with default data
+ $dbh->do(q|INSERT INTO borrower_message_preferences( borrowernumber, message_attribute_id ) VALUES ( ?, ?)|, undef, $patron->borrowernumber, 4 );
+ my $borrower_message_preference_id = $dbh->last_insert_id(undef, undef, "borrower_message_preferences", undef);
+ $dbh->do(q|INSERT INTO borrower_message_transport_preferences( borrower_message_preference_id, message_transport_type) VALUES ( ?, ? )|, undef, $borrower_message_preference_id, 'email' );
- t::lib::Mocks::mock_userenv({ patron => $patron_1 });
+ is( $patron->queue_notice({ letter_params => $letter_params, message_transports => \@mtts, message_name => 'Hold_Filled' }),undef, "Nothing done if transports and name sent");
- my $attribute_type1 = Koha::Patron::Attribute::Type->new(
+ $patron->email(q|awesome@ismymiddle.name|)->store;
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_name => 'Hold_Filled' }),
+ {sent => ['email'] }, "Email sent when using borrower preferences"
+ );
+ $counter = Koha::Notice::Messages->search({borrowernumber => $patron->borrowernumber })->count;
+ is_deeply(
+ $patron->queue_notice({ letter_params => $letter_params, message_name => 'Hold_Filled', test_mode => 1 }),
+ {sent => ['email'] }, "Report that email sent when using borrower preferences in test_mode"
+ );
+ is( Koha::Notice::Messages->search({borrowernumber => $patron->borrowernumber })->count, $counter,"Count of queued notices not increased in test mode");
+};
+
+subtest 'filter_by_amount_owed' => sub {
+ plan tests => 6;
+
+ my $library = $builder->build({source => 'Branch' });
+ my $category = $builder->build({source => 'Category' });
+
+ my $new_patron_cf_1 = Koha::Patron->new(
{
- code => 'my code1',
- description => 'my description1',
- unique_id => 1
+ cardnumber => 'test_cn_cf_1',
+ branchcode => $library->{branchcode},
+ categorycode => $category->{categorycode},
+ surname => 'surname for patron1',
+ firstname => 'firstname for patron1',
+ userid => 'a_nonexistent_userid_cf_1',
}
)->store;
- my $attribute_type2 = Koha::Patron::Attribute::Type->new(
+ my $new_patron_cf_2 = Koha::Patron->new(
{
- code => 'my code2',
- description => 'my description2',
- opac_display => 1,
- staff_searchable => 1
+ cardnumber => 'test_cn_cf_2',
+ branchcode => $library->{branchcode},
+ categorycode => $category->{categorycode},
+ surname => 'surname for patron2',
+ firstname => 'firstname for patron2',
+ userid => 'a_nonexistent_userid_cf_2',
}
)->store;
-
- my $attribute_type3 = $builder->build_object({ class => 'Koha::Patron::Attribute::Types' });
-
- my $deleted_attribute_type = $builder->build_object({ class => 'Koha::Patron::Attribute::Types' });
- my $deleted_attribute_type_code = $deleted_attribute_type->code;
- $deleted_attribute_type->delete;
-
- my $new_library = $builder->build( { source => 'Branch' } );
- my $attribute_type_limited = Koha::Patron::Attribute::Type->new(
- { code => 'my code3', description => 'my description3' } )->store;
- $attribute_type_limited->library_limits( [ $new_library->{branchcode} ] );
-
- my $attributes_for_1 = [
+ my $new_patron_cf_3 = Koha::Patron->new(
{
- attribute => 'my attribute1',
- code => $attribute_type1->code(),
- },
- {
- attribute => 'my attribute2',
- code => $attribute_type2->code(),
- },
+ cardnumber => 'test_cn_cf_3',
+ branchcode => $library->{branchcode},
+ categorycode => $category->{categorycode},
+ surname => 'surname for patron3',
+ firstname => 'firstname for patron3',
+ userid => 'a_nonexistent_userid_cf_3',
+ }
+ )->store;
+
+ my $results = Koha::Patrons->search(
{
- attribute => 'my attribute limited',
- code => $attribute_type_limited->code(),
+ 'me.borrowernumber' => [
+ $new_patron_cf_1->borrowernumber,
+ $new_patron_cf_2->borrowernumber,
+ $new_patron_cf_3->borrowernumber
+ ]
}
- ];
+ );
- my $attributes_for_2 = [
+ my $fine1 = $builder->build(
{
- attribute => 'my attribute12',
- code => $attribute_type1->code(),
- },
+ source => 'Accountline',
+ value => {
+ borrowernumber => $new_patron_cf_1->borrowernumber,
+ amountoutstanding => 12.00,
+ amount => 12.00,
+ debit_type_code => 'OVERDUE',
+ branchcode => $library->{branchcode}
+ },
+ }
+ );
+ my $fine2 = $builder->build(
{
- attribute => 'my attribute limited 2',
- code => $attribute_type_limited->code(),
- },
+ source => 'Accountline',
+ value => {
+ borrowernumber => $new_patron_cf_2->borrowernumber,
+ amountoutstanding => 8.00,
+ amount => 8.00,
+ debit_type_code => 'OVERDUE',
+ branchcode => $library->{branchcode}
+
+ },
+ }
+ );
+ my $fine3 = $builder->build(
{
- attribute => 'my nonexistent attribute 2',
- code => $deleted_attribute_type_code,
+ source => 'Accountline',
+ value => {
+ borrowernumber => $new_patron_cf_2->borrowernumber,
+ amountoutstanding => 10.00,
+ amount => 10.00,
+ debit_type_code => 'OVERDUE',
+ branchcode => $library->{branchcode}
+ },
}
- ];
+ );
- my $extended_attributes = $patron_1->extended_attributes;
- is( ref($extended_attributes), 'Koha::Patron::Attributes', 'Koha::Patron->extended_attributes must return a Koha::Patron::Attribute set' );
- is( $extended_attributes->count, 0, 'There should not be attribute yet');
+ my $filtered = $results->filter_by_amount_owed();
+ is( ref($filtered), 'Koha::Patrons',
+'Koha::Patrons->filter_by_amount_owed should return a Koha::Patrons result set in a scalar context'
+ );
- $patron_1->extended_attributes->filter_by_branch_limitations->delete;
- $patron_2->extended_attributes->filter_by_branch_limitations->delete;
- $patron_1->extended_attributes($attributes_for_1);
+ my $lower_limit = 12.00;
+ my $upper_limit = 16.00;
- warning_like {
- $patron_2->extended_attributes($attributes_for_2);
- } [ qr/a foreign key constraint fails/ ], 'nonexistent attribute should have not exploded but print a warning';
+ # Catch user with 1 x 12.00 fine and user with no fines.
+ $filtered =
+ $results->filter_by_amount_owed( { less_than => $upper_limit } );
+ is( $filtered->_resultset->as_subselect_rs->count, 2,
+"filter_by_amount_owed({ less_than => $upper_limit }) found two patrons"
+ );
- my $extended_attributes_for_1 = $patron_1->extended_attributes;
- is( $extended_attributes_for_1->count, 3, 'There should be 3 attributes now for patron 1');
+ # Catch user with 1 x 8.00 and 1 x 10.00 fine
+ $filtered =
+ $results->filter_by_amount_owed( { more_than => $lower_limit } );
+ is( $filtered->_resultset->as_subselect_rs->count, 1,
+"filter_by_amount_owed({ more_than => $lower_limit }) found two patrons"
+ );
- my $extended_attributes_for_2 = $patron_2->extended_attributes;
- is( $extended_attributes_for_2->count, 2, 'There should be 2 attributes now for patron 2');
+ # User with 2 fines falls above upper limit - Excluded,
+ # user with 1 fine falls below lower limit - Excluded
+ # and user with no fines falls below lower limit - Excluded.
+ $filtered = $results->filter_by_amount_owed(
+ { more_than => $lower_limit, less_than => $upper_limit } );
+ is( $filtered->_resultset->as_subselect_rs->count, 0,
+"filter_by_amount_owed({ more_than => $lower_limit, less_than => $upper_limit }) found zero patrons"
+ );
- my $attribute_12 = $extended_attributes_for_2->search({ code => $attribute_type1->code });
- is( $attribute_12->next->attribute, 'my attribute12', 'search by code should return the correct attribute' );
+ my $library2 = $builder->build({source => 'Branch' });
+ my $fine4 = $builder->build(
+ {
+ source => 'Accountline',
+ value => {
+ borrowernumber => $new_patron_cf_2->borrowernumber,
+ amountoutstanding => 10.00,
+ amount => 10.00,
+ debit_type_code => 'HOLD',
+ branchcode => $library2->{branchcode}
+ },
+ }
+ );
- $attribute_12 = $patron_2->get_extended_attribute( $attribute_type1->code );
- is( $attribute_12->attribute, 'my attribute12', 'Koha::Patron->get_extended_attribute should return the correct attribute value' );
+ # Catch only the user with a HOLD fee over 6.00
+ $filtered = $results->filter_by_amount_owed( { more_than => 6.00, debit_type => 'HOLD' } );
+ is( $filtered->_resultset->as_subselect_rs->count, 1,
+"filter_by_amount_owed({ more_than => 6.00, debit_type => 'HOLD' }) found one patron"
+ );
- warning_is {
- $extended_attributes_for_2 = $patron_2->extended_attributes->merge_with(
- [
- {
- attribute => 'my attribute12 XXX',
- code => $attribute_type1->code(),
- },
- {
- attribute => 'my nonexistent attribute 2',
- code => $deleted_attribute_type_code,
- },
- {
- attribute => 'my attribute 3', # Adding a new attribute using merge_with
- code => $attribute_type3->code,
- },
- ]
- );
- }
- "Cannot merge element: unrecognized code = '$deleted_attribute_type_code'",
- "Trying to merge_with using a nonexistent attribute code should display a warning";
+ # Catch only the user with a fee over 6.00 at the specified library
+ $filtered = $results->filter_by_amount_owed( { more_than => 6.00, library => $library2->{branchcode} } );
+ is( $filtered->_resultset->as_subselect_rs->count, 1,
+"filter_by_amount_owed({ more_than => 6.00, library => $library2->{branchcode} }) found one patron"
+ );
+
+};
- is( @$extended_attributes_for_2, 3, 'There should be 3 attributes now for patron 3');
- my $expected_attributes_for_2 = [
+subtest 'filter_by_have_subpermission' => sub {
+ plan tests => 4;
+
+ $schema->storage->txn_begin;
+
+ my $library = $builder->build_object( { class => 'Koha::Libraries' } );
+ my $patron_1 = $builder->build_object(
{
- code => $attribute_type1->code(),
- attribute => 'my attribute12 XXX',
- },
+ class => 'Koha::Patrons',
+ value => { flags => 1, branchcode => $library->branchcode }
+ }
+ );
+
+ my $patron_2 = $builder->build_object( # 4096 = 1 << 12 for suggestions
{
- code => $attribute_type_limited->code(),
- attribute => 'my attribute limited 2',
- },
+ class => 'Koha::Patrons',
+ value => { flags => 4096, branchcode => $library->branchcode }
+ }
+ );
+
+ my $patron_3 = $builder->build_object(
{
- attribute => 'my attribute 3',
- code => $attribute_type3->code,
- },
- ];
- # Sorting them by code
- $expected_attributes_for_2 = [ sort { $a->{code} cmp $b->{code} } @$expected_attributes_for_2 ];
+ class => 'Koha::Patrons',
+ value => { flags => 0, branchcode => $library->branchcode }
+ }
+ );
+ $builder->build(
+ {
+ source => 'UserPermission',
+ value => {
+ borrowernumber => $patron_3->borrowernumber,
+ module_bit => 11,
+ code => 'order_manage',
+ },
+ }
+ );
is_deeply(
[
- {
- code => $extended_attributes_for_2->[0]->{code},
- attribute => $extended_attributes_for_2->[0]->{attribute}
- },
- {
- code => $extended_attributes_for_2->[1]->{code},
- attribute => $extended_attributes_for_2->[1]->{attribute}
- },
- {
- code => $extended_attributes_for_2->[2]->{code},
- attribute => $extended_attributes_for_2->[2]->{attribute}
- },
+ Koha::Patrons->search( { branchcode => $library->branchcode } )
+ ->filter_by_have_subpermission('suggestions.suggestions_manage')
+ ->get_column('borrowernumber')
],
- $expected_attributes_for_2
+ [ $patron_1->borrowernumber, $patron_2->borrowernumber ],
+ 'Superlibrarian and patron with suggestions.suggestions_manage'
);
- # TODO - What about multiple? POD explains the problem
- my $non_existent = $patron_2->get_extended_attribute( 'not_exist' );
- is( $non_existent, undef, 'Koha::Patron->get_extended_attribute must return undef if the attribute does not exist' );
-
- # Test branch limitations
- t::lib::Mocks::mock_userenv({ patron => $patron_2 });
- # Return all
- $extended_attributes_for_1 = $patron_1->extended_attributes;
- is( $extended_attributes_for_1->count, 3, 'There should be 2 attributes for patron 1, the limited one should be returned');
+ is_deeply(
+ [
+ Koha::Patrons->search( { branchcode => $library->branchcode } )
+ ->filter_by_have_subpermission('acquisition.order_manage')
+ ->get_column('borrowernumber')
+ ],
+ [ $patron_1->borrowernumber, $patron_3->borrowernumber ],
+ 'Superlibrarian and patron with acquisition.order_manage'
+ );
- # Return filtered
- $extended_attributes_for_1 = $patron_1->extended_attributes->filter_by_branch_limitations;
- is( $extended_attributes_for_1->count, 2, 'There should be 2 attributes for patron 1, the limited one should be returned');
+ is_deeply(
+ [
+ Koha::Patrons->search( { branchcode => $library->branchcode } )
+ ->filter_by_have_subpermission('parameters.manage_cities')
+ ->get_column('borrowernumber')
+ ],
+ [ $patron_1->borrowernumber ],
+ 'Only Superlibrarian is returned'
+ );
- # Not filtered
- my $limited_value = $patron_1->get_extended_attribute( $attribute_type_limited->code );
- is( $limited_value->attribute, 'my attribute limited', );
+ throws_ok {
+ Koha::Patrons->search( { branchcode => $library->branchcode } )
+ ->filter_by_have_subpermission('dont_exist.subperm');
+ } 'Koha::Exceptions::ObjectNotFound';
- ## Do we need a filtered?
- #$limited_value = $patron_1->get_extended_attribute( $attribute_type_limited->code );
- #is( $limited_value, undef, );
$schema->storage->txn_rollback;
};
+
+$schema->storage->txn_rollback;
projects / srvgit / blobdiff