View | Details | Raw Unified | Return to bug 12609
Collapse All | Expand All

(-)a/C4/Ratings.pm (-1 / +1 lines)
Lines 178-187 sub GetRating { Link Here
178
                borrowernumber => $borrowernumber,
178
                borrowernumber => $borrowernumber,
179
            }
179
            }
180
        );
180
        );
181
        return unless $rating;
181
        $rating_hash{'rating_value'} = $rating->rating_value();
182
        $rating_hash{'rating_value'} = $rating->rating_value();
182
    }
183
    }
183
    else {
184
    else {
184
        $rating_hash{rating_borrowernumber} = undef;
185
        $rating_hash{rating_value}          = undef;
185
        $rating_hash{rating_value}          = undef;
186
    }
186
    }
187
187
(-)a/t/db_dependent/Ratings.t (-60 / +87 lines)
Lines 1-63 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
2
3
use strict;
3
use Modern::Perl;
4
use warnings;
4
use Test::More tests => 14;
5
use Test::More tests => 12;
6
use C4::Members;
5
use C4::Members;
7
6
8
BEGIN {
7
use C4::Context;
9
8
use C4::Category;
10
    use FindBin;
9
11
    use C4::Ratings;
10
use_ok('C4::Ratings');
12
    use_ok('C4::Ratings');
11
13
12
my $dbh = C4::Context->dbh;
14
    DelRating( 1, 901 );
13
$dbh->{RaiseError} = 1;
15
    DelRating( 1, 902 );
14
$dbh->{AutoCommit} = 0;
16
15
17
    my $rating5 = GetRating( 1, undef );
16
my @categories   = C4::Category->all;
18
    ok( defined $rating5, 'get a rating, without borrowernumber' );
17
my $categorycode = $categories[0]->categorycode;
19
18
my $branchcode   = 'CPL';
20
    my $borrower102 = GetMember( borrowernumber => 102);
19
21
    my $borrower103 = GetMember( borrowernumber => 103);
20
my %john_doe = (
22
    SKIP: {
21
    cardnumber   => '123456',
23
        skip 'Missing test borrowers, skipping specific tests', 10 unless ( defined $borrower102 && defined $borrower103 );
22
    firstname    => 'John',
24
        my $rating1 = AddRating( 1, 102, 3 );
23
    surname      => 'Doe',
25
        my $rating2 = AddRating( 1, 103, 4 );
24
    categorycode => $categorycode,
26
        my $rating3 = ModRating( 1, 102, 5 );
25
    branchcode   => $branchcode,
27
        my $rating4 = GetRating( 1, 103 );
26
    dateofbirth  => '',
28
        my $rating6 = DelRating( 1, 102 );
27
    dateexpiry   => '9999-12-31',
29
        my $rating7 = DelRating( 1, 103 );
28
    userid       => 'john.doe'
30
29
);
31
        ok( defined $rating1, 'add a rating' );
30
32
        ok( defined $rating2, 'add another rating' );
31
my %jane_doe = (
33
        ok( defined $rating3, 'update a rating' );
32
    cardnumber   => '345678',
34
        ok( defined $rating4, 'get a rating, with borrowernumber' );
33
    firstname    => 'Jane',
35
        ok( defined $rating6,                'delete a rating' );
34
    surname      => 'Doe',
36
        ok( defined $rating7,                'delete another rating' );
35
    categorycode => $categorycode,
37
36
    branchcode   => $branchcode,
38
        ok( $rating3->{'rating_avg'} == '4', "get a bib's average(float) rating" );
37
    dateofbirth  => '',
39
        ok( $rating3->{'rating_avg_int'} == 4.5, "get a bib's average(int) rating" );
38
    dateexpiry   => '9999-12-31',
40
        ok( $rating3->{'rating_total'} == 2, "get a bib's total number of ratings" );
39
    userid       => 'jane.doe'
41
        ok( $rating3->{'rating_value'} == 5, "verify user's bib rating" );
40
);
42
    }
41
43
42
my $borrowernumber1 = AddMember(%john_doe);
44
}
43
my $borrowernumber2 = AddMember(%jane_doe);
45
44
46
=c
45
my $rating1 = AddRating( 1, $borrowernumber1, 3 );
47
46
my $rating2 = AddRating( 1, $borrowernumber2, 4 );
48
mason@xen1:~/g/head$ perl t/db_dependent/Ratings.t
47
my $rating3 = ModRating( 1, $borrowernumber1, 5 );
49
1..12
48
my $rating4 = GetRating( 1, $borrowernumber2 );
50
ok 1 - use C4::Ratings;
49
my $rating5 = GetRating(1);
51
ok 2 - add a rating
50
52
ok 3 - add another rating
51
ok( defined $rating1, 'add a rating' );
53
ok 4 - update a rating
52
ok( defined $rating2, 'add another rating' );
54
ok 5 - get a rating, with borrowernumber
53
ok( defined $rating3, 'update a rating' );
55
ok 6 - get a rating, without borrowernumber
54
ok( defined $rating4, 'get a rating, with borrowernumber' );
56
ok 7 - get a bib's average(float) rating
55
57
ok 8 - get a bib's average(int) rating
56
ok( $rating3->{'rating_avg'} == '4',     "get a bib's average(float) rating" );
58
ok 9 - get a bib's total number of ratings
57
ok( $rating3->{'rating_avg_int'} == 4.5, "get a bib's average(int) rating" );
59
ok 10 - verify user's bib rating
58
ok( $rating3->{'rating_total'} == 2, "get a bib's total number of ratings" );
60
ok 11 - delete a rating
59
ok( $rating3->{'rating_value'} == 5, "verify user's bib rating" );
61
ok 12 - delete another rating
60
62
61
my $rating_1 = GetRating(1);
63
=cut
62
my $rating_1_1 = GetRating( 1, $borrowernumber1 );
63
is_deeply(
64
    $rating_1,
65
    {
66
        rating_avg_int => 4.5,
67
        rating_total   => 2,
68
        rating_avg     => 4,
69
        rating_value   => undef,
70
    },
71
    'GetRating should return total, avg_int and avg if  biblionumber is given'
72
);
73
is_deeply(
74
    $rating_1_1,
75
    {
76
        rating_avg_int => 4.5,
77
        rating_total   => 2,
78
        rating_avg     => 4,
79
        rating_value   => 5,
80
    },
81
'GetRating should return total, avg_int, avg and value if biblionumber is given'
82
);
83
84
my $rating6 = DelRating( 1, $borrowernumber1 );
85
my $rating7 = DelRating( 1, $borrowernumber2 );
86
87
ok( defined $rating6, 'delete a rating' );
88
ok( defined $rating7, 'delete another rating' );
89
90
is( GetRating( 1, $borrowernumber1 ),
91
    undef, 'GetRating should return undef if no rating exist' );
64
- 

Return to bug 12609