Attachment 135594 Details for Bug 24857 – Bug 24857: Add Object Methods

[patch] Bug 24857: Add Object Methods

Bug-24857-Add-Object-Methods.patch (text/plain), 5.72 KB, created by Kyle M Hall (khall) on 2022-06-02 16:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2022-06-02 16:21:39 UTC

Size: 5.72 KB

patch

obsolete

>From 4ba13c2e3d474e2b56e10c3ee525ed351a3a782e Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 8 Mar 2022 12:00:23 +0000
>Subject: [PATCH] Bug 24857: Add Object Methods
>
>To test:
>1 - prove t/db_dependent/Koha/Biblio.t
>2 - prove t/db_dependent/Koha/Item.t
>---
> Koha/Biblio.pm               | 16 ++++++++++++++++
> Koha/Item.pm                 | 30 ++++++++++++++++++++++++++----
> t/db_dependent/Koha/Biblio.t | 29 ++++++++++++++++++++++++++++-
> t/db_dependent/Koha/Item.t   | 26 +++++++++++++++++++++++++-
> 4 files changed, 95 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm
>index 087efc78a6..362f1469e2 100644
>--- a/Koha/Biblio.pm
>+++ b/Koha/Biblio.pm
>@@ -34,6 +34,7 @@ use base qw(Koha::Object);
> use Koha::Acquisition::Orders;
> use Koha::ArticleRequests;
> use Koha::Biblio::Metadatas;
>+use Koha::Biblio::ItemGroups;
> use Koha::Biblioitems;
> use Koha::Checkouts;
> use Koha::CirculationRules;
>@@ -118,6 +119,21 @@ sub active_orders {
>     return $self->orders->search({ datecancellationprinted => undef });
> }
> 
>+=head3 item_groups
>+
>+my $item_groups = $biblio->item_groups();
>+
>+Returns a Koha::Biblio::ItemGroups object
>+
>+=cut
>+
>+sub item_groups {
>+    my ( $self ) = @_;
>+
>+    my $item_groups = $self->_result->item_groups;
>+    return Koha::Biblio::ItemGroups->_new_from_dbic($item_groups);
>+}
>+
> =head3 can_article_request
> 
> my $bool = $biblio->can_article_request( $borrower );
>diff --git a/Koha/Item.pm b/Koha/Item.pm
>index 2cefac59be..4e79c39eff 100644
>--- a/Koha/Item.pm
>+++ b/Koha/Item.pm
>@@ -31,22 +31,23 @@ use C4::ClassSource qw( GetClassSort );
> use C4::Log qw( logaction );
> 
> use Koha::BackgroundJob::BatchUpdateBiblioHoldsQueue;
>+use Koha::Biblio::ItemGroups;
> use Koha::Checkouts;
> use Koha::CirculationRules;
> use Koha::CoverImages;
>-use Koha::SearchEngine::Indexer;
> use Koha::Exceptions::Item::Transfer;
>+use Koha::Item::Attributes;
> use Koha::Item::Transfer::Limits;
> use Koha::Item::Transfers;
>-use Koha::Item::Attributes;
> use Koha::ItemTypes;
>+use Koha::Libraries;
> use Koha::Patrons;
> use Koha::Plugins;
>-use Koha::Libraries;
>+use Koha::Result::Boolean;
>+use Koha::SearchEngine::Indexer;
> use Koha::StockRotationItem;
> use Koha::StockRotationRotas;
> use Koha::TrackedLinks;
>-use Koha::Result::Boolean;
> 
> use base qw(Koha::Object);
> 
>@@ -416,6 +417,27 @@ sub checkout {
>     return Koha::Checkout->_new_from_dbic( $checkout_rs );
> }
> 
>+=head3 item_group
>+
>+my $item_group = $item->item_group;
>+
>+Return the item group for this item
>+
>+=cut
>+
>+sub item_group {
>+    my ( $self ) = @_;
>+
>+    my $item_group_item = $self->_result->item_group_item;
>+    return unless $item_group_item;
>+
>+    my $item_group_rs = $item_group_item->item_group;
>+    return unless $item_group_rs;
>+
>+    my $item_group = Koha::Biblio::ItemGroup->_new_from_dbic( $item_group_rs );
>+    return $item_group;
>+}
>+
> =head3 holds
> 
> my $holds = $item->holds();
>diff --git a/t/db_dependent/Koha/Biblio.t b/t/db_dependent/Koha/Biblio.t
>index 3065eae646..d599c792d8 100755
>--- a/t/db_dependent/Koha/Biblio.t
>+++ b/t/db_dependent/Koha/Biblio.t
>@@ -17,7 +17,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 21; # +1
>+use Test::More tests => 22; # +1
> use Test::Warn;
> 
> use C4::Biblio qw( AddBiblio ModBiblio ModBiblioMarc );
>@@ -1001,6 +1001,33 @@ subtest 'Recalls tests' => sub {
>     $schema->storage->txn_rollback;
> };
> 
>+subtest 'item_groups() tests' => sub {
>+
>+    plan tests => 6;
>+
>+    $schema->storage->txn_begin;
>+
>+    my $biblio = $builder->build_sample_biblio();
>+
>+    my @item_groups = $biblio->item_groups->as_list;
>+    is( scalar(@item_groups), 0, 'Got zero item groups');
>+
>+    my $item_group_1 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id } )->store();
>+
>+    @item_groups = $biblio->item_groups->as_list;
>+    is( scalar(@item_groups), 1, 'Got one item group');
>+    is( $item_groups[0]->id, $item_group_1->id, 'Got correct item group');
>+
>+    my $item_group_2 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id } )->store();
>+
>+    @item_groups = $biblio->item_groups->as_list;
>+    is( scalar(@item_groups), 2, 'Got two item groups');
>+    is( $item_groups[0]->id, $item_group_1->id, 'Got correct item group 1');
>+    is( $item_groups[1]->id, $item_group_2->id, 'Got correct item group 2');
>+
>+    $schema->storage->txn_rollback;
>+};
>+
> sub component_record1 {
>     my $marc = MARC::Record->new;
>     $marc->append_fields(
>diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t
>index 8be4d4525c..a7c33b208b 100755
>--- a/t/db_dependent/Koha/Item.t
>+++ b/t/db_dependent/Koha/Item.t
>@@ -20,7 +20,7 @@
> use Modern::Perl;
> use utf8;
> 
>-use Test::More tests => 15;
>+use Test::More tests => 16;
> use Test::Exception;
> use Test::MockModule;
> 
>@@ -1454,3 +1454,27 @@ subtest 'Recalls tests' => sub {
>     $schema->storage->txn_rollback;
> };
> 
>+subtest 'item_group() tests' => sub {
>+
>+    plan tests => 4;
>+
>+    $schema->storage->txn_begin;
>+
>+    my $biblio = $builder->build_sample_biblio();
>+    my $item_1 = $builder->build_sample_item({ biblionumber => $biblio->biblionumber });
>+    my $item_2 = $builder->build_sample_item({ biblionumber => $biblio->biblionumber });
>+
>+    is( $item_1->item_group, undef, 'Item 1 has no item group');
>+    is( $item_2->item_group, undef, 'Item 2 has no item group');
>+
>+    my $item_group_1 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id } )->store();
>+    my $item_group_2 = Koha::Biblio::ItemGroup->new( { biblio_id => $biblio->id } )->store();
>+
>+    $item_group_1->add_item({ item_id => $item_1->id });
>+    $item_group_2->add_item({ item_id => $item_2->id });
>+
>+    is( $item_1->item_group->id, $item_group_1->id, 'Got item group 1 correctly' );
>+    is( $item_2->item_group->id, $item_group_2->id, 'Got item group 2 correctly' );
>+
>+    $schema->storage->txn_rollback;
>+};
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 24857: 100652 | 100653 | 100654 | 100655 | 100656 | 100657 | 100658 | 100659 | 100660 | 100661 | 100662 | 101637 | 101638 | 101639 | 101640 | 101641 | 101642 | 101643 | 101644 | 101645 | 101646 | 101647 | 101648 | 101650 | 101651 | 101652 | 101653 | 101654 | 101655 | 101656 | 101657 | 101658 | 101659 | 101660 | 101661 | 101670 | 101671 | 101672 | 101673 | 101674 | 101675 | 101676 | 101677 | 101678 | 101679 | 101680 | 101681 | 101730 | 101731 | 101732 | 101733 | 101734 | 101735 | 101736 | 101737 | 101738 | 101739 | 101740 | 101741 | 101752 | 101753 | 101754 | 101755 | 101756 | 101757 | 101758 | 101759 | 101760 | 101761 | 101762 | 101763 | 104952 | 104953 | 104954 | 104955 | 104956 | 104957 | 104958 | 104959 | 104960 | 104961 | 104962 | 104963 | 104964 | 104966 | 106728 | 106729 | 106730 | 106731 | 106732 | 106733 | 106734 | 106735 | 106736 | 106737 | 106738 | 106739 | 106740 | 106741 | 108443 | 108444 | 108445 | 108446 | 108447 | 108448 | 108449 | 108450 | 108451 | 108452 | 108453 | 108454 | 108455 | 108456 | 108666 | 108667 | 108668 | 108669 | 108670 | 108671 | 108672 | 108673 | 108674 | 108675 | 108676 | 108677 | 108678 | 108679 | 108680 | 108681 | 108682 | 108683 | 108684 | 108685 | 108686 | 109074 | 109075 | 109076 | 109077 | 109078 | 109079 | 109080 | 109081 | 109082 | 109083 | 109084 | 109085 | 109086 | 109087 | 109088 | 109089 | 109090 | 109091 | 109092 | 109093 | 109094 | 109795 | 109796 | 109797 | 109798 | 109799 | 109800 | 109801 | 109802 | 109803 | 109804 | 109805 | 109806 | 109807 | 109808 | 109809 | 109810 | 109811 | 109812 | 109813 | 109814 | 109815 | 109894 | 109901 | 109902 | 109903 | 109904 | 109905 | 109906 | 109907 | 109908 | 109909 | 109910 | 109911 | 109912 | 109913 | 109914 | 109915 | 109916 | 109917 | 109918 | 109919 | 109920 | 109921 | 109922 | 109923 | 113136 | 113137 | 113138 | 113139 | 113140 | 113141 | 113142 | 113143 | 113144 | 113145 | 113146 | 113147 | 113148 | 113149 | 113150 | 113151 | 113152 | 113153 | 113154 | 113155 | 113156 | 113157 | 113158 | 113159 | 113160 | 113168 | 113169 | 113170 | 113171 | 113172 | 113173 | 113174 | 113175 | 113176 | 113177 | 113178 | 113179 | 113180 | 113181 | 113182 | 113183 | 113184 | 113185 | 113186 | 113187 | 113188 | 113189 | 113190 | 113191 | 120495 | 120496 | 120497 | 120498 | 120499 | 120500 | 120501 | 120502 | 120503 | 120504 | 120505 | 120506 | 120507 | 120508 | 120509 | 120510 | 120511 | 120512 | 120513 | 120514 | 120515 | 120516 | 120517 | 120518 | 122808 | 122809 | 122810 | 122811 | 122812 | 122813 | 122814 | 122815 | 122816 | 122817 | 122818 | 122819 | 122820 | 122821 | 122822 | 122823 | 122824 | 122825 | 122826 | 122827 | 122828 | 122829 | 122830 | 122831 | 123882 | 123883 | 123884 | 123885 | 123886 | 123887 | 123888 | 123889 | 123890 | 123891 | 123892 | 123893 | 123894 | 123895 | 123896 | 123897 | 123898 | 123899 | 123900 | 123901 | 123902 | 123903 | 123904 | 123905 | 123906 | 123907 | 123908 | 123909 | 123910 | 123912 | 124021 | 124022 | 124023 | 124024 | 124025 | 124026 | 124027 | 124028 | 124029 | 124030 | 124031 | 124032 | 124033 | 124034 | 124035 | 124036 | 124037 | 124038 | 124039 | 124040 | 124041 | 124042 | 124043 | 124044 | 124045 | 124046 | 124047 | 124048 | 124049 | 124050 | 124051 | 124052 | 124053 | 124331 | 124332 | 124333 | 124334 | 124335 | 124336 | 124337 | 124338 | 124339 | 124340 | 124341 | 124342 | 124343 | 124344 | 124345 | 124346 | 124347 | 124348 | 124349 | 124351 | 124352 | 124353 | 124354 | 124355 | 124356 | 124357 | 124358 | 124359 | 124360 | 124361 | 124362 | 124363 | 124421 | 124463 | 124583 | 124584 | 124585 | 124586 | 124587 | 124588 | 124589 | 124590 | 124591 | 124592 | 124593 | 124594 | 124595 | 124596 | 124597 | 124598 | 124599 | 124600 | 124601 | 124602 | 124603 | 124604 | 124605 | 124606 | 124607 | 124608 | 124609 | 124610 | 124611 | 124612 | 124613 | 124614 | 124615 | 131449 | 131450 | 131451 | 131452 | 131453 | 131454 | 131455 | 131456 | 134288 | 134289 | 134290 | 134291 | 134292 | 134293 | 134294 | 134295 | 134296 | 135590 | 135591 | 135592 | 135593 | 135594 | 135595 | 135596 | 135597 | 135598 | 135599 | 135600 | 135601 | 135602 | 135603 | 135604 | 135605 | 135606 | 135607 | 135608 | 135609 | 135610 | 135614 | 135615 | 135616 | 135617 | 135618 | 135619 | 135620 | 135621 | 135622 | 135623 | 135624 | 135625 | 135626 | 135627 | 135628 | 135629 | 137259 | 137260 | 137261 | 137262 | 137263 | 137264 | 137265 | 137266 | 137267 | 137268 | 137311 | 137314 | 137315 | 137316 | 137317 | 137318 | 137319 | 137320 | 137321 | 137322 | 137323 | 137441 | 137442 | 137443 | 137608 | 138933