Bugzilla – Attachment 128264 Details for
Bug 15516
Allow to place a hold on first available item from a group of titles
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15516: (follow-up) Count group holds always
Bug-15516-follow-up-Count-group-holds-always.patch (text/plain), 5.21 KB, created by
Aleisha Amohia
on 2021-12-06 03:31:44 UTC
(
hide
)
Description:
Bug 15516: (follow-up) Count group holds always
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2021-12-06 03:31:44 UTC
Size:
5.21 KB
patch
obsolete
>From 151d27a75cc502ec920aeefc532f648bfe92647e Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Fri, 4 Jun 2021 16:08:45 +1200 >Subject: [PATCH] Bug 15516: (follow-up) Count group holds always > >--- > C4/Reserves.pm | 8 ++++---- > Koha/Holds.pm | 25 ++++++++++++++++++------- > opac/opac-reserve.pl | 2 +- > reserve/request.pl | 2 +- > t/db_dependent/Koha/Holds.t | 8 ++++---- > 5 files changed, 28 insertions(+), 17 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index d3db9a360e..d1954c938c 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -461,23 +461,23 @@ sub CanItemBeReserved { > }; > $search_params->{found} = undef if $params->{ignore_found_holds}; > >- my $holds = Koha::Holds->search($search_params); >+ my $holds_count = Koha::Holds->count_holds($search_params); > if ( defined $holds_per_record && $holds_per_record ne '' ){ > if ( $holds_per_record == 0 ) { > return { status => "noReservesAllowed" }; > } >- if ( !$params->{ignore_hold_counts} && $holds->count() >= $holds_per_record ) { >+ if ( !$params->{ignore_hold_counts} && $holds_count >= $holds_per_record ) { > return { status => "tooManyHoldsForThisRecord", limit => $holds_per_record }; > } > } > >- my $today_holds = Koha::Holds->search({ >+ my $today_holds_count = Koha::Holds->count_holds({ > borrowernumber => $borrowernumber, > reservedate => dt_from_string->date > }); > > if (!$params->{ignore_hold_counts} && defined $holds_per_day && $holds_per_day ne '' >- && $today_holds->count() >= $holds_per_day ) >+ && $today_holds_count >= $holds_per_day ) > { > return { status => 'tooManyReservesToday', limit => $holds_per_day }; > } >diff --git a/Koha/Holds.pm b/Koha/Holds.pm >index ede1726f5f..f4a059acc1 100644 >--- a/Koha/Holds.pm >+++ b/Koha/Holds.pm >@@ -139,18 +139,29 @@ sub get_items_that_can_fill { > )->filter_by_for_hold(); > } > >-=head3 count_grouped >+=head3 count_holds > >- $holds->count_grouped(); >+ $holds->count_holds( $search_params ); > >-Return number of hold, where hold group is counted as one hold >+This overwrites the default count(). >+ >+Return the number of holds, where a hold group is counted as one hold. > > =cut > >-sub count_grouped { >- my ($self) = @_; >- my $holds_without_group_count = $self->search({ hold_group_id => undef })->count(); >- my $hold_groups_count = $self->search({ hold_group_id => { '!=' => undef }}, { group_by => 'me.hold_group_id' })->count(); >+sub count_holds { >+ my ( $self, $search_params ) = @_; >+ >+ $search_params = { >+ hold_group_id => undef, >+ }; >+ my $holds_without_group_count = $self->search( $search_params )->count(); >+ >+ $search_params = { >+ hold_group_id => { '!=', undef }, >+ }; >+ my $hold_groups_count = $self->search( $search_params, { group_by => 'me.hold_group_id' })->count(); >+ > return $holds_without_group_count + $hold_groups_count; > } > >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 42a9089fa1..5e18b05988 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -193,7 +193,7 @@ foreach my $biblioNumber (@biblionumbers) { > if ( $query->param('place_reserve') ) { > my $reserve_cnt = 0; > if ($maxreserves) { >- $reserve_cnt = $patron->holds->count_grouped; >+ $reserve_cnt = $patron->holds->count_holds; > } > > # List is composed of alternating biblio/item/branch >diff --git a/reserve/request.pl b/reserve/request.pl >index 6e33bc84e2..f6bc47c08c 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -202,7 +202,7 @@ if ($borrowernumber_hold && !$action) { > # we check the reserves of the user, and if they can reserve a document > # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ... > >- my $reserves_count = $patron->holds->count; >+ my $reserves_count = $patron->holds->count_holds; > > my $new_reserves_count = scalar( @biblionumbers ); > >diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t >index 1a7015fe20..fd55c24b71 100755 >--- a/t/db_dependent/Koha/Holds.t >+++ b/t/db_dependent/Koha/Holds.t >@@ -500,7 +500,7 @@ subtest 'get_items_that_can_fill' => sub { > > }; > >-subtest 'count_grouped' => sub { >+subtest 'count_holds' => sub { > plan tests => 3; > $schema->storage->txn_begin; > >@@ -517,7 +517,7 @@ subtest 'count_grouped' => sub { > }, > }); > >- is($patron->holds->count_grouped, 1, 'Test patron has 1 hold.'); >+ is($patron->holds->count_holds, 1, 'Test patron has 1 hold.'); > > my $hold_group = $builder->build_object({ > class => 'Koha::HoldGroups', >@@ -538,7 +538,7 @@ subtest 'count_grouped' => sub { > } > }); > >- is($patron->holds->count_grouped, 2, 'Test patron has 2 holds.'); >+ is($patron->holds->count_holds, 2, 'Test patron has 2 holds.'); > > my $hold_group2 = $builder->build_object({ > class => 'Koha::HoldGroups', >@@ -566,7 +566,7 @@ subtest 'count_grouped' => sub { > } > }); > >- is($patron->holds->count_grouped, 3, 'Test patron has 3 holds.'); >+ is($patron->holds->count_holds, 3, 'Test patron has 3 holds.'); > > $schema->storage->txn_rollback; > }; >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15516
:
46392
|
47498
|
47570
|
47961
|
47962
|
47963
|
48097
|
48098
|
48448
|
48449
|
50094
|
50095
|
50096
|
53742
|
53743
|
53744
|
53770
|
53771
|
53772
|
53774
|
53775
|
53776
|
54977
|
55300
|
55304
|
55305
|
55306
|
55307
|
55308
|
55768
|
55769
|
55770
|
55771
|
55772
|
58799
|
58800
|
58801
|
58802
|
58803
|
59314
|
59315
|
59316
|
59317
|
59318
|
69902
|
69903
|
69904
|
69905
|
69906
|
72485
|
72486
|
72487
|
72488
|
72489
|
72491
|
79077
|
79078
|
79080
|
79081
|
79082
|
79083
|
79213
|
79214
|
79215
|
79216
|
79217
|
79218
|
79219
|
79220
|
79221
|
79222
|
81453
|
81454
|
81455
|
81456
|
81457
|
81458
|
81459
|
81460
|
81461
|
81462
|
81463
|
84554
|
84555
|
84556
|
84557
|
84558
|
84559
|
84560
|
84561
|
84562
|
84563
|
84564
|
87828
|
87829
|
87830
|
87831
|
87832
|
87833
|
87834
|
87835
|
87836
|
87837
|
87838
|
88038
|
88039
|
88125
|
88173
|
88174
|
88175
|
88176
|
88177
|
88178
|
88179
|
88180
|
88181
|
88182
|
88183
|
88184
|
88185
|
88186
|
90289
|
90290
|
90291
|
90292
|
90293
|
90294
|
90295
|
90296
|
90297
|
90298
|
90299
|
90300
|
90301
|
90302
|
90303
|
90829
|
90830
|
90831
|
90832
|
90833
|
90834
|
90835
|
90836
|
90837
|
90838
|
90839
|
90840
|
90841
|
90842
|
90843
|
90844
|
92783
|
92784
|
92785
|
92786
|
92787
|
92788
|
92789
|
92790
|
92791
|
92792
|
92793
|
92794
|
92795
|
92796
|
92797
|
92798
|
114513
|
114514
|
114515
|
114516
|
114517
|
114518
|
114585
|
114586
|
114603
|
114624
|
114625
|
114626
|
114627
|
114628
|
114629
|
114630
|
114631
|
114632
|
114633
|
114634
|
114635
|
114636
|
114637
|
114638
|
114639
|
114640
|
114641
|
114642
|
114643
|
114644
|
114645
|
114647
|
114648
|
114649
|
114650
|
114651
|
114652
|
114653
|
114654
|
114655
|
114656
|
114657
|
114658
|
114659
|
117423
|
117424
|
117425
|
117426
|
118281
|
118282
|
118283
|
118284
|
118285
|
118286
|
118350
|
118351
|
118352
|
118353
|
118354
|
118355
|
120368
|
120369
|
120370
|
120371
|
120372
|
120373
|
120574
|
120643
|
120644
|
120645
|
120646
|
120647
|
120648
|
120649
|
120650
|
120651
|
121523
|
121623
|
122097
|
122102
|
122627
|
128189
|
128190
|
128191
|
128192
|
128193
|
128194
|
128195
|
128196
|
128197
|
128198
|
128199
|
128200
|
128201
|
128202
|
128255
|
128256
|
128257
|
128258
|
128259
|
128260
|
128261
|
128262
|
128263
|
128264
|
128265
|
128266
|
128267
|
128268
|
128269
|
128285
|
128286
|
128287
|
128288
|
128289
|
128290
|
128291
|
128292
|
128293
|
128294
|
128295
|
128296
|
128297
|
128298
|
128299
|
138576
|
138577
|
138578
|
138579
|
138580
|
138581
|
138582
|
138583
|
138584
|
138585
|
138586
|
138587
|
138588
|
138589
|
138593
|
138594
|
138595
|
138596
|
138597
|
138738
|
138739
|
138740
|
138741
|
138742
|
138772
|
138868
|
138869
|
162076
|
162077
|
162078
|
162079
|
162080
|
162081
|
162082
|
162083
|
162084