From f0ddd050eccd9c6d1f514a8003d4bb7222c765b1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 24 Aug 2022 16:20:05 +0100 Subject: [PATCH] Bug 31095: Remove keyed_on_code We no longer require keyed_on_code from Koha::Patron::Restrictoin::Types as we have relation accessors for the relevent use cases and no longer reference the method anywhere in the codebase! --- Koha/Patron/Restriction/Types.pm | 18 ------ .../Koha/Patron/Restriction/Types.t | 63 ------------------- 2 files changed, 81 deletions(-) delete mode 100755 t/db_dependent/Koha/Patron/Restriction/Types.t diff --git a/Koha/Patron/Restriction/Types.pm b/Koha/Patron/Restriction/Types.pm index 7f7911cdd2..2c1b37e518 100644 --- a/Koha/Patron/Restriction/Types.pm +++ b/Koha/Patron/Restriction/Types.pm @@ -32,24 +32,6 @@ Koha::Patron::Restriction::Types - Koha Restriction Types Object set class =cut -=head3 keyed_on_code - -Return all restriction types as a hashref keyed on the code - -=cut - -sub keyed_on_code { - my ( $self ) = @_; - - my @all = $self->_resultset()->search(); - my $out = {}; - for my $r( @all ) { - my %col = $r->get_columns; - $out->{$r->code} = \%col; - } - return $out; -} - =head3 _type =cut diff --git a/t/db_dependent/Koha/Patron/Restriction/Types.t b/t/db_dependent/Koha/Patron/Restriction/Types.t deleted file mode 100755 index fb11089656..0000000000 --- a/t/db_dependent/Koha/Patron/Restriction/Types.t +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/perl - -use Modern::Perl; - -use C4::Context; -use Koha::Database; -use t::lib::TestBuilder; - -use Test::More tests => 2; - -my $schema = Koha::Database->new->schema; -$schema->storage->txn_begin; -my $dbh = C4::Context->dbh; -my $builder = t::lib::TestBuilder->new; - -use_ok('Koha::Patron::Restriction::Types'); - -$dbh->do(q|DELETE FROM borrower_debarments|); -$dbh->do(q|DELETE FROM restriction_types|); - -$builder->build( - { - source => 'RestrictionType', - value => { - code => 'ONE', - display_text => 'One', - is_system => 1, - is_default => 0 - } - } -); -$builder->build( - { - source => 'RestrictionType', - value => { - code => 'TWO', - display_text => 'Two', - is_system => 1, - is_default => 1 - } - } -); - -# keyed_on_code -my $keyed = Koha::Patron::Restriction::Types->keyed_on_code; -my $expecting = { - ONE => { - code => 'ONE', - display_text => 'One', - is_system => 1, - is_default => 0 - }, - TWO => { - code => 'TWO', - display_text => 'Two', - is_system => 1, - is_default => 1 - } -}; - -is_deeply( $keyed, $expecting, 'keyed_on_code returns correctly' ); - -$schema->storage->txn_rollback; -- 2.20.1