Bug 15656 [QA Followup] - Return without searching if patron has no guarantor

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index 4464731..684f274 100644 (file)
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -45,6 +45,8 @@ Returns a Koha::Patron object for this patron's guarantor
 sub guarantor {
     my ( $self ) = @_;
 
+    return undef unless $self->guarantorid();
+
     return Koha::Patrons->find( $self->guarantorid() );
 }
 
@@ -76,13 +78,14 @@ sub siblings {
     my ( $self ) = @_;
 
     my $guarantor = $self->guarantor;
-    my $guarantorid = $guarantor ? $guarantor->borrowernumber : undef;
+
+    return undef unless $guarantor;
 
     return Koha::Patrons->search(
         {
             guarantorid => {
                 '!=' => undef,
-                '=' => $guarantorid,
+                '=' => $guarantor->id,
             },
             borrowernumber => {
                 '!=' => $self->borrowernumber,

diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t
index 46eed31..fafd829 100644 (file)
--- a/t/db_dependent/Koha/Patrons.t
+++ b/t/db_dependent/Koha/Patrons.t
@@ -80,7 +80,7 @@ subtest 'guarantees' => sub {
 subtest 'siblings' => sub {
     plan tests => 7;
     my $siblings = $new_patron_1->siblings;
-    is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should not crashed if the patron has not guarantor' );
+    is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
     my $guarantee_1 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );
     my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
     $siblings = $retrieved_guarantee_1->siblings;