Attachment 41228 Details for Bug 12748 – Bug12748 - Fixes duplicate serials with an "expected" status bug

[patch] Bug12748 - Fixes duplicate serials with an "expected" status bug

Bug12748---Fixes-duplicate-serials-with-an-expecte.patch (text/plain), 3.58 KB, created by Rémi Mayrand-Provencher on 2015-07-29 16:01:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rémi Mayrand-Provencher

Created: 2015-07-29 16:01:51 UTC

Size: 3.58 KB

patch

obsolete

>From e5572949842fff46970be644d69ff918689848af Mon Sep 17 00:00:00 2001
>From: remi <remi.mayrand-provencher@inLibro.com>
>Date: Wed, 29 Jul 2015 11:54:53 -0400
>Subject: [PATCH] Bug12748 - Fixes duplicate serials with an "expected" status
> bug
>
>    Added a new sub to Serials.pm to be able to get serials with their statuses.
>    Now the sub ModSerialStatus checks for other serials with an "expected" status before doing anything.
>
>    Also modified Serials.t to be able to test those changes.
>
>    Test Plan
>    1) Apply patch
>    2) Run ./t/db_dependent/Serials.t
>    3) Validate that there are no errors
>    4) Go on "Serial collection information" page for a serial of your choice
>    5) Click on "Generate next"
>    6) Change the status of the original serial from "late" to "expected"
>    7) Change the newly generated serial from "expected" to "delete"
>    8) Validate that there are no new serials created by instruction 7 and that the serial was deleted
>---
> C4/Serials.pm            |   24 ++++++++++++++++++++++--
> t/db_dependent/Serials.t |    4 +++-
> 2 files changed, 25 insertions(+), 3 deletions(-)
> mode change 100644 => 100755 t/db_dependent/Serials.t
>
>diff --git a/C4/Serials.pm b/C4/Serials.pm
>index 3fcc4a3..b958241 100644
>--- a/C4/Serials.pm
>+++ b/C4/Serials.pm
>@@ -1125,8 +1125,10 @@ sub ModSerialStatus {
>         }
>     }
> 
>-    # create new waited entry if needed (ie : was a "waited" and has changed)
>-    if ( $oldstatus == EXPECTED && $status != EXPECTED ) {
>+    # create new expected entry if needed (ie : was "expected" and has changed)
>+    # BUG 12748: Check if there are no other expected issues.
>+    my $otherIssueExpected = scalar findSerialByStatus(1, $subscriptionid);
>+    if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {
>         my $subscription = GetSubscription($subscriptionid);
>         my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
> 
>@@ -2731,6 +2733,24 @@ sub _can_do_on_subscription {
>     return 0;
> }
> 
>+=head2 findSerialByStatus
>+
>+    @serials = findSerialByStatus($status, $subscriptionid);
>+
>+    Returns an array of serials matching a given status and subscription id.
>+
>+=cut
>+sub findSerialByStatus{
>+    my($status, $subscriptionid) = @_;
>+    my $dbh = C4::Context->dbh;
>+    my $query = qq| SELECT * from serial
>+                    WHERE status = ?
>+                    AND subscriptionid = ?
>+                |;
>+    my $sth = $dbh->prepare($query);
>+    $sth->execute($status, $subscriptionid);
>+    return @{$sth->fetchall_arrayref({})};
>+}
> 1;
> __END__
> 
>diff --git a/t/db_dependent/Serials.t b/t/db_dependent/Serials.t
>old mode 100644
>new mode 100755
>index 4086700..99eb827
>--- a/t/db_dependent/Serials.t
>+++ b/t/db_dependent/Serials.t
>@@ -15,7 +15,7 @@ use C4::Bookseller;
> use C4::Biblio;
> use C4::Budgets;
> use Koha::DateUtils;
>-use Test::More tests => 46;
>+use Test::More tests => 48;
> 
> BEGIN {
>     use_ok('C4::Serials');
>@@ -190,6 +190,7 @@ is(C4::Serials::check_routing(), undef, 'test checking route');
> 
> is(C4::Serials::addroutingmember(),undef, 'test adding route member');
> 
>+is( C4::Serials::findSerialByStatus() ,0, "test finding a serial by its status");
> 
> # Unit tests for statuses management (Bug 11689)
> $subscriptionid = NewSubscription(
>@@ -246,4 +247,5 @@ for my $am ( @arrived_missing ) {
> }
> is( $subscription->{missinglist}, join('; ', @serialseqs), "subscription missinglist is updated after ModSerialStatus" );
> 
>+is( C4::Serials::findSerialByStatus(2,$subscriptionid) ,2, "findSerialByStatus returns array of serials if status and subscriptionid is given");
> $dbh->rollback;
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 12748: 41228 | 41230 | 41371 | 41451 | 44533 | 46091 | 47770 | 47771 | 47773 | 47774 | 47775 | 47776 | 52356 | 52357 | 52358 | 52359 | 52360