Bug 18403: Patron reviews

This patch adds a new method Koha::Reviews->search_limited to return the
reviews
a logged in user is allowed to see depending his permissions.

Test plan:
Create some reviews at the OPAC and make sure a staff user is limited
(or not) to approve
or decline it.
The number of reviews displayed on the mainpage should be correct as
well.

Signed-off-by: Signed-off-by: Jon McGowan <jon.mcgowan@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Koha/Reviews.pm b/Koha/Reviews.pm
index 13b0314..a5fcae3 100644 (file)
--- a/Koha/Reviews.pm
+++ b/Koha/Reviews.pm
@@ -35,6 +35,29 @@ Koha::Reviews - Koha Review Object set class
 
 =cut
 
+=head2 search_limited
+
+my $reviews = Koha::Reviews->search_limited( $params, $attributes );
+
+Search for reviews according to logged in patron restrictions
+
+=cut
+
+sub search_limited {
+    my ( $self, $params, $attributes ) = @_;
+
+    my $userenv = C4::Context->userenv;
+    my @restricted_branchcodes;
+    if ( $userenv ) {
+        my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
+        @restricted_branchcodes = $logged_in_user->libraries_where_can_see_patrons;
+    }
+    # TODO This 'borrowernumber' relation name is confusing and needs to be renamed
+    $params->{'borrowernumber.branchcode'} = { -in => \@restricted_branchcodes } if @restricted_branchcodes;
+    $attributes->{join} = 'borrowernumber';
+    return $self->search( $params, $attributes );
+}
+
 =head3 type
 
 =cut

diff --git a/mainpage.pl b/mainpage.pl
index c1df82b..f4105be 100755 (executable)
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -63,7 +63,7 @@ my $branch =
   ? C4::Context->userenv()->{'branch'}
   : undef;
 
-my $pendingcomments    = Koha::Reviews->search({ approved => 0 })->count;
+my $pendingcomments    = Koha::Reviews->search_limited({ approved => 0 })->count;
 my $pendingtags        = get_count_by_tag_status(0);
 my $pendingsuggestions = CountSuggestion("ASKED");
 my $pending_borrower_modifications = Koha::Patron::Modifications->pending_count( $branch );

diff --git a/reviews/reviewswaiting.pl b/reviews/reviewswaiting.pl
index 82b1234..783748a 100755 (executable)
--- a/reviews/reviewswaiting.pl
+++ b/reviews/reviewswaiting.pl
@@ -43,7 +43,7 @@ my $status   = $query->param('status') || 0;
 my $reviewid = $query->param('reviewid');
 my $page     = $query->param('page') || 1;
 my $count    = C4::Context->preference('numSearchResults') || 20;
-my $total    = Koha::Reviews->search({ approved => $status })->count;
+my $total    = Koha::Reviews->search_limited({ approved => $status })->count;
 
 if ( $op eq 'approve' ) {
     my $review = Koha::Reviews->find( $reviewid );
@@ -58,7 +58,7 @@ elsif ( $op eq 'delete' ) {
     $review->delete if $review;
 }
 
-my $reviews = Koha::Reviews->search(
+my $reviews = Koha::Reviews->search_limited(
     { approved => $status },
     {
         rows => $count,

diff --git a/t/db_dependent/Koha/Reviews.t b/t/db_dependent/Koha/Reviews.t
index 91f86fe..8688789 100644 (file)
--- a/t/db_dependent/Koha/Reviews.t
+++ b/t/db_dependent/Koha/Reviews.t
@@ -19,9 +19,9 @@
 
 use Modern::Perl;
 
-use Test::More tests => 7;
+use Test::More tests => 8;
 
-use Koha::Review;
+use Koha::Patrons;
 use Koha::Reviews;
 use Koha::Database;
 
@@ -31,24 +31,26 @@ my $schema = Koha::Database->new->schema;
 $schema->storage->txn_begin;
 
 my $builder = t::lib::TestBuilder->new;
-my $patron_1 = $builder->build({ source => 'Borrower' });
+my $patron_1 = $builder->build({ source => 'Borrower', value => { flags => undef } });
 my $patron_2 = $builder->build({ source => 'Borrower' });
+$patron_1 = Koha::Patrons->find( $patron_1->{borrowernumber} );
+$patron_2 = Koha::Patrons->find( $patron_2->{borrowernumber} );
 my $biblio_1 = $builder->build({ source => 'Biblio' });
 my $biblio_2 = $builder->build({ source => 'Biblio' });
 my $nb_of_reviews = Koha::Reviews->search->count;
 my $nb_of_approved_reviews = Koha::Reviews->search({ approved => 1 })->count;
 my $new_review_1_1 = Koha::Review->new({
-    borrowernumber => $patron_1->{borrowernumber},
+    borrowernumber => $patron_1->borrowernumber,
     biblionumber => $biblio_1->{biblionumber},
     review => 'a kind review',
 })->store;
 my $new_review_1_2 = Koha::Review->new({
-    borrowernumber => $patron_1->{borrowernumber},
+    borrowernumber => $patron_1->borrowernumber,
     biblionumber => $biblio_2->{biblionumber},
     review => 'anoter kind review',
 })->store;
 my $new_review_2_1 = Koha::Review->new({
-    borrowernumber => $patron_2->{borrowernumber},
+    borrowernumber => $patron_2->borrowernumber,
     biblionumber => $biblio_1->{biblionumber},
     review => 'just anoter review',
 })->store;
@@ -65,8 +67,30 @@ is( Koha::Reviews->search({approved => 1})->count, $nb_of_approved_reviews, 'The
 my $retrieved_review_1_1 = Koha::Reviews->find( $new_review_1_1->reviewid );
 is( $retrieved_review_1_1->review, $new_review_1_1->review, 'Find a review by id should return the correct review' );
 
+subtest 'search_limited' => sub {
+    plan tests => 2;
+    C4::Context->_new_userenv('xxx');
+    my $group_1 = Koha::Library::Group->new( { title => 'TEST Group 1' } )->store;
+    my $group_2 = Koha::Library::Group->new( { title => 'TEST Group 2' } )->store;
+    Koha::Library::Group->new({ parent_id => $group_1->id,  branchcode => $patron_1->branchcode })->store();
+    Koha::Library::Group->new({ parent_id => $group_2->id,  branchcode => $patron_2->branchcode })->store();
+    set_logged_in_user( $patron_1 );
+    is( Koha::Reviews->search->count, $nb_of_approved_reviews + 3, 'Koha::Reviews->search should return all reviews' );
+    is( Koha::Reviews->search_limited->count, $nb_of_approved_reviews + 2, 'Koha::Reviews->search_limited should return reviews depending on patron permissions' );
+};
+
 $retrieved_review_1_1->delete;
 is( Koha::Reviews->search->count, $nb_of_reviews + 2, 'Delete should have deleted the review' );
 
 $schema->storage->txn_rollback;
 
+sub set_logged_in_user {
+    my ($patron) = @_;
+    C4::Context->set_userenv(
+        $patron->borrowernumber, $patron->userid,
+        $patron->cardnumber,     'firstname',
+        'surname',               $patron->library->branchcode,
+        'Midway Public Library', $patron->flags,
+        '',                      ''
+    );
+}

diff --git a/tools/tools-home.pl b/tools/tools-home.pl
index 86cfb03..99fde63 100755 (executable)
--- a/tools/tools-home.pl
+++ b/tools/tools-home.pl
@@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $pendingcomments = Koha::Reviews->search({ approved => 0 })->count;
+my $pendingcomments = Koha::Reviews->search_limited({ approved => 0 })->count;
 my $pendingtags = get_count_by_tag_status(0);
 
 $template->param(