From b6aa77ac4901e8ad00e941247d7a35c8c47f75bd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 21 Jan 2016 12:33:25 +0000 Subject: [PATCH] Bug 15635: Koha::Patron::Images - Add new classes There are 3 subroutines in C4::Members to get, add and delete patron images: - GetPatronImage - PutPatronImage - RmPatronImage By creating these 2 Koha::Patron::Image[s] classes, we could remove them easily. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall --- Koha/Patron/Image.pm | 44 +++++++++++++++++++++++ Koha/Patron/Images.pm | 50 ++++++++++++++++++++++++++ t/db_dependent/Koha/Patron/Images.t | 54 +++++++++++++++++++++++++++++ tools/picture-upload.pl | 3 ++ 4 files changed, 151 insertions(+) create mode 100644 Koha/Patron/Image.pm create mode 100644 Koha/Patron/Images.pm create mode 100644 t/db_dependent/Koha/Patron/Images.t diff --git a/Koha/Patron/Image.pm b/Koha/Patron/Image.pm new file mode 100644 index 0000000000..d7a3f6da0a --- /dev/null +++ b/Koha/Patron/Image.pm @@ -0,0 +1,44 @@ +package Koha::Patron::Image; + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 3 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Carp; + +use Koha::Database; + +use base qw(Koha::Object); + +=head1 NAME + +Koha::Patron;;Image - Koha Patron;;Image Object class + +=head1 API + +=head2 Class Methods + +=cut + +=head3 type + +=cut + +sub type { + return 'Patronimage'; +} + +1; diff --git a/Koha/Patron/Images.pm b/Koha/Patron/Images.pm new file mode 100644 index 0000000000..ddbe3fab4b --- /dev/null +++ b/Koha/Patron/Images.pm @@ -0,0 +1,50 @@ +package Koha::Patron::Images; + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 3 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Carp; + +use Koha::Database; + +use Koha::Patron::Image; + +use base qw(Koha::Objects); + +=head1 NAME + +Koha::Patron::Images - Koha Patron Image Object set class + +=head1 API + +=head2 Class Methods + +=cut + +=head3 type + +=cut + +sub type { + return 'Patronimage'; +} + +sub object_class { + return 'Koha::Patron::Image'; +} + +1; diff --git a/t/db_dependent/Koha/Patron/Images.t b/t/db_dependent/Koha/Patron/Images.t new file mode 100644 index 0000000000..aa5266ca36 --- /dev/null +++ b/t/db_dependent/Koha/Patron/Images.t @@ -0,0 +1,54 @@ +#!/usr/bin/perl + +# Copyright 2015 Koha Development team +# +# This file is part of Koha +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use Test::More tests => 3; + +use Koha::Database; +use Koha::Patrons; +use Koha::Patron::Image; +use Koha::Patron::Images; +use t::lib::TestBuilder; + +my $schema = Koha::Database->new->schema; +$schema->storage->txn_begin; + +my $builder = t::lib::TestBuilder->new; +my $patron = $builder->build({ source => 'Borrower', }); +$patron = Koha::Patrons->find($patron->{borrowernumber}); +my $nb_of_images = Koha::Patron::Images->search->count; +my $new_image = Koha::Patron::Image->new({ + borrowernumber => $patron->borrowernumber, + mimetype => 'image/png', + imagefile => 'lot of binary content', +})->store; + +is( Koha::Patron::Images->search->count, $nb_of_images + 1, 'The patron image should have been added' ); + +my $retrieved_image = Koha::Patron::Images->find( $new_image->borrowernumber ); +is( $retrieved_image->imagefile, $new_image->imagefile, 'Find a patron image by borrowernumber should return the correct image' ); +is( ref($patron->image), 'Koha::Patron::Image', 'Koha::Patron should have a image method which returns a Koha::Patron::Image' ); + +$retrieved_image->delete; +is( Koha::Patron::Images->search->count, $nb_of_images, 'Delete should have deleted the patron image' ); + +$schema->storage->txn_rollback; + +1; diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl index 0d753d80b8..8afccf6dbf 100755 --- a/tools/picture-upload.pl +++ b/tools/picture-upload.pl @@ -31,6 +31,9 @@ use C4::Output; use C4::Members; use C4::Debug; +use Koha::Patrons; +use Koha::Patron::Image; + my $input = new CGI; my ($template, $loggedinuser, $cookie) -- 2.39.5