Attachment 164839 Details for Bug 35717 – Bug 35717: Remove GetSuggestionFromBiblionumber

[patch] Bug 35717: Remove GetSuggestionFromBiblionumber

Bug-35717-Remove-GetSuggestionFromBiblionumber.patch (text/plain), 4.09 KB, created by Nick Clemens (kidclamp) on 2024-04-12 12:09:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2024-04-12 12:09:06 UTC

Size: 4.09 KB

patch

obsolete

>From 2a67333fe75d232ba42a5208d036b05d8b596891 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 10 May 2023 15:21:35 +0200
>Subject: [PATCH] Bug 35717: Remove GetSuggestionFromBiblionumber
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> C4/Acquisition.pm            |  6 ++++--
> C4/Suggestions.pm            | 26 --------------------------
> t/db_dependent/Suggestions.t |  9 ++-------
> 3 files changed, 6 insertions(+), 35 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 08f606da4a7..e72f2f5ff5a 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -1387,10 +1387,12 @@ sub ModReceiveOrder {
>     $order->{invoice_unitprice} ||= $order->{unitprice};
>     $order->{invoice_currency}  ||= Koha::Acquisition::Currencies->get_active->currency;
> 
>-    if ( $order->{suggestionid} ) {
>+    my $order_object = Koha::Acquistions::Orders->find( $order->{ordernumber} );
>+    my $suggestions = $order_object->suggestions;
>+    while ( my $suggestion = $suggestions->next ) {
>         ModSuggestion(
>             {
>-                suggestionid => $order->{suggestionid},
>+                suggestionid => $suggestion->id,
>                 STATUS       => 'AVAILABLE',
>                 biblionumber => $biblionumber
>             }
>diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
>index 29c092426cc..f76cca60b88 100644
>--- a/C4/Suggestions.pm
>+++ b/C4/Suggestions.pm
>@@ -35,7 +35,6 @@ our @EXPORT  = qw(
>   DelSuggestion
>   GetSuggestion
>   GetSuggestionByStatus
>-  GetSuggestionFromBiblionumber
>   GetSuggestionInfo
>   ModStatus
>   ModSuggestion
>@@ -93,31 +92,6 @@ sub GetSuggestion {
>     return ( $sth->fetchrow_hashref );
> }
> 
>-=head2 GetSuggestionFromBiblionumber
>-
>-$ordernumber = &GetSuggestionFromBiblionumber($biblionumber)
>-
>-Get a suggestion from it's biblionumber.
>-
>-return :
>-the id of the suggestion which is related to the biblionumber given on input args.
>-
>-=cut
>-
>-sub GetSuggestionFromBiblionumber {
>-    my ($biblionumber) = @_;
>-    my $query = q{
>-        SELECT suggestionid
>-        FROM   suggestions
>-        WHERE  biblionumber=? LIMIT 1
>-    };
>-    my $dbh = C4::Context->dbh;
>-    my $sth = $dbh->prepare($query);
>-    $sth->execute($biblionumber);
>-    my ($suggestionid) = $sth->fetchrow;
>-    return $suggestionid;
>-}
>-
> =head2 GetSuggestionInfo
> 
> Get a suggestion and borrower's informations from it's suggestionid
>diff --git a/t/db_dependent/Suggestions.t b/t/db_dependent/Suggestions.t
>index 1987d9896a0..091bd33ddb1 100755
>--- a/t/db_dependent/Suggestions.t
>+++ b/t/db_dependent/Suggestions.t
>@@ -18,7 +18,7 @@
> use Modern::Perl;
> 
> use DateTime::Duration;
>-use Test::More tests => 80;
>+use Test::More tests => 77;
> use Test::Warn;
> 
> use t::lib::Mocks;
>@@ -35,7 +35,7 @@ use Koha::Patrons;
> use Koha::Suggestions;
> 
> BEGIN {
>-    use_ok('C4::Suggestions', qw( GetSuggestion ModSuggestion GetSuggestionInfo GetSuggestionFromBiblionumber GetSuggestionByStatus ConnectSuggestionAndBiblio DelSuggestion MarcRecordFromNewSuggestion GetUnprocessedSuggestions DelSuggestionsOlderThan ));
>+    use_ok('C4::Suggestions', qw( GetSuggestion ModSuggestion GetSuggestionInfo GetSuggestionByStatus ConnectSuggestionAndBiblio DelSuggestion MarcRecordFromNewSuggestion GetUnprocessedSuggestions DelSuggestionsOlderThan ));
> }
> 
> my $schema  = Koha::Database->new->schema;
>@@ -294,11 +294,6 @@ is( $suggestion->{firstnamesuggestedby}, $member->{firstname}, 'GetSuggestionInf
> is( $suggestion->{borrnumsuggestedby}, $my_suggestion->{suggestedby}, 'GetSuggestionInfo returns the borrower number correctly' );
> 
> 
>-is( GetSuggestionFromBiblionumber(), undef, 'GetSuggestionFromBiblionumber without the biblio number returns undef' );
>-is( GetSuggestionFromBiblionumber(2), undef, 'GetSuggestionFromBiblionumber with an invalid biblio number returns undef' );
>-is( GetSuggestionFromBiblionumber($biblio_1->biblionumber), $my_suggestionid, 'GetSuggestionFromBiblionumber functions correctly' );
>-
>-
> my $suggestions = GetSuggestionByStatus();
> is( @$suggestions, 0, 'GetSuggestionByStatus without the status returns an empty array' );
> $suggestions = GetSuggestionByStatus('CHECKED');
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 35717: 160576 | 160577 | 160578 | 160579 | 160580 | 160581 | 160582 | 160583 | 164834 | 164835 | 164836 | 164837 | 164838 | 164839 | 164840 | 172871 | 172872 | 172873 | 172874 | 172875 | 172876 | 172877 | 172878 | 172899 | 172900 | 172901