From ff941912c433f2c426da5ab9981464c0d978cd73 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 14 Mar 2022 14:47:36 -0300 Subject: [PATCH] Bug 30294: Rename Koha::Recall->* used relationship names This patch renames the underlaying relationship names used in the 'patron' and 'library' subs so they are more clearly prefetchable and also enabling them to be embeddable and searchable through an eventual API route for recalls. To test: 1. Apply the patch 2. Run: $ kshell k$ prove t/db_dependent/Koha/Recall* => SUCCESS: Tests pass, nothing really changes 3. Sign off :-D Signed-off-by: Tomas Cohen Arazi --- Koha/Recall.pm | 4 ++-- Koha/Schema/Result/Recall.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Koha/Recall.pm b/Koha/Recall.pm index c39e9b946a..b5d0c2c5c4 100644 --- a/Koha/Recall.pm +++ b/Koha/Recall.pm @@ -78,7 +78,7 @@ Returns the related Koha::Patron object for this recall. sub patron { my ( $self ) = @_; - my $patron_rs = $self->_result->borrower; + my $patron_rs = $self->_result->patron; return unless $patron_rs; return Koha::Patron->_new_from_dbic( $patron_rs ); } @@ -93,7 +93,7 @@ Returns the related Koha::Library object for this recall. sub library { my ( $self ) = @_; - my $library_rs = $self->_result->branch; + my $library_rs = $self->_result->library; return unless $library_rs; return Koha::Library->_new_from_dbic( $library_rs ); } diff --git a/Koha/Schema/Result/Recall.pm b/Koha/Schema/Result/Recall.pm index 3918157da2..c3c63d9f9e 100644 --- a/Koha/Schema/Result/Recall.pm +++ b/Koha/Schema/Result/Recall.pm @@ -293,14 +293,14 @@ __PACKAGE__->belongs_to( ); __PACKAGE__->belongs_to( - "borrower", + "patron", "Koha::Schema::Result::Borrower", { borrowernumber => "borrowernumber" }, { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); __PACKAGE__->belongs_to( - "branch", + "library", "Koha::Schema::Result::Branch", { branchcode => "branchcode" }, { -- 2.32.0