[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0f8ec1475311b8fa3a4027e2d29ec26b36b59daf

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  0f8ec1475311b8fa3a4027e2d29ec26b36b59daf (commit)
       via  13da6b8cf47ec16284e3fe680a1fd0fbf8105b5c (commit)
      from  6177e5d12cd9833c6e51133f3a2bab80022b723a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f8ec1475311b8fa3a4027e2d29ec26b36b59daf
Author: Bill Ott <bott at grpl.org>
Date:   Tue Jul 28 16:05:31 2015 -0400

    LP#1394989: Do not include deleted users when retrieving for Collections
    
    As a side effect of discovering that users with no cards were being retrieved
    as part of the Collections API calls, those users ended up being mostly
    made up of deleted users (merged with an actual lead record, etc.)
    
    This patch contribued by Bill Ott changes the retrieval so that it skips
    over those deleted users.
    
    Signed-off-by: Bill Ott <bott at grpl.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/money.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/money.pm
index 6b314bd..6507db9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/money.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/money.pm
@@ -186,6 +186,8 @@ select
           group by 1,2
         ) full_list
         left join money.payment p on (full_list.id = p.xact)
+        left join actor.usr au on (au.id = usr)
+        where au.deleted is false
   group by 1
   having SUM(total_billing) - SUM(COALESCE(p.amount,0)) > ?
 ;

commit 13da6b8cf47ec16284e3fe680a1fd0fbf8105b5c
Author: Michael Peters <mpeters at emeralddata.net>
Date:   Thu Nov 20 17:41:44 2014 -0500

    LP#1394989: Make users_of_interest test for defined actor.usr.card values
    
    If the open-ils.collections.users_of_interest API encounters a patron that
    has a null "card" value in actor.usr the API will crash with an error like:
    
    Received Exception:
    Name: osrfMethodException
    Status:  *** Call to [open-ils.collections.users_of_interest.retrieve] failed for session [1416515351.333446.1416515351406], thread trace [1]:
    Can't call method "barcode" on an undefined value at /usr/local/share/perl/5.14.2/OpenILS/Application/Collections.pm line 299.
    
    This patches users_of_interest to provide "undef" in the event that there is
    not a proper barcode associated with the user when retrieving results for the
    API call.
    
    Signed-off-by: Michael Peters <mpeters at emeralddata.net>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
index e3fb511..a377029 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
@@ -295,7 +295,7 @@ sub process_users_of_interest_results {
             id            => $u->id,
             dob        => $u->dob,
             profile    => $u->profile->name,
-            barcode    => $u->card->barcode,
+            barcode    => $u->card ? $u->card->barcode : undef ,
             groups    => [ map { $_->name } @{$u->groups} ],
         };
 

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Collections.pm         |    2 +-
 .../OpenILS/Application/Storage/Publisher/money.pm |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS