Bug 5670: [Followup] Return Koha::Patron objects.

* Koha/Patron/HouseboundVisit.pm (chooser, deliverer): Use
  `_new_from_dbic` to return Koha::Patron objects.
* t/db_dependent/Patron/HouseboundVisits.t: Remove TODO section for this.

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha/Patron/HouseboundVisit.pm b/Koha/Patron/HouseboundVisit.pm
index a7dc0c6..b57effe 100644 (file)
--- a/Koha/Patron/HouseboundVisit.pm
+++ b/Koha/Patron/HouseboundVisit.pm
@@ -18,6 +18,7 @@ package Koha::Patron::HouseboundVisit;
 use Modern::Perl;
 
 use Koha::Database;
+use Koha::Patron;
 
 use base qw(Koha::Object);
 
@@ -49,7 +50,8 @@ Returns the prefetched chooser for this visit.
 
 sub chooser {
     my ( $self ) = @_;
-    return $self->_result->chooser_brwnumber;
+    my $rs = $self->_result->chooser_brwnumber;
+    return Koha::Patron->_new_from_dbic( $rs );
 }
 
 =head3 deliverer
@@ -62,7 +64,8 @@ Returns the prefetched deliverer for this visit.
 
 sub deliverer {
     my ( $self ) = @_;
-    return $self->_result->deliverer_brwnumber;
+    my $rs = $self->_result->deliverer_brwnumber;
+    return Koha::Patron->_new_from_dbic( $rs );
 
 }
 

diff --git a/t/db_dependent/Patron/HouseboundVisits.t b/t/db_dependent/Patron/HouseboundVisits.t
index bec556c..e6f8245 100644 (file)
--- a/t/db_dependent/Patron/HouseboundVisits.t
+++ b/t/db_dependent/Patron/HouseboundVisits.t
@@ -81,11 +81,8 @@ is( $result->deliverer->borrowernumber, $visit->{deliverer_brwnumber} );
 
 is( $result->chooser->borrowernumber, $visit->{chooser_brwnumber} );
 
-TODO: {
-    local $TODO = "We want our results here to be Koha::Patron objects, but they by default return DBIC Schema objects.  The currently accepted solution to this (use the _from_dbic method), is defined for Koha::Objects, but not for Koha::Object.  We do not resolve this issue here";
-    isa_ok( $result->deliverer, "Koha::Patron");
-    isa_ok( $result->chooser, "Koha::Patron");
-}
+isa_ok( $result->deliverer, "Koha::Patron");
+isa_ok( $result->chooser, "Koha::Patron");
 
 $schema->storage->txn_rollback;