LP#1954937: Provide both global and relative hold queue position

Generate the full, global (approximate) hold queue position for open
(not yet canceled or fulfilled) holds based on the rhrr table.  Then,
provide just the in-result order among the peer-bib holds.  This allows
users to choose which of the two is more appropriate for each use case
in their environment.

This uses a strategically place correlated LEFT JOIN LATERAL in the FROM
clause of the main query, rather than a CTE, in order to avoid
materialization of the full peer-hold map, and instead only gathering
the positional information for holds that are involved in the actual
result set.

The label for the existing relative_queue_position field is now
"Relative Queue Position", and the label for the new
global_queue_postion field is "Global Queue Postion".

Release-note: Provide both global and result-set-relative hold queue
position information, allowing staff to choose which is best for their
purposes in each hold-listing interface.

Signed-off-by: Mike Rylander <[email protected]>
Signed-off-by: blake <[email protected]>
Signed-off-by: Michele Morgan <[email protected]>

Author: spaceisntsyntax

Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html

@@ -286,8 +286,10 @@ <h4 *ngIf="!hideHoldsCount" i18n>Holds Count: {{holdsCount}}</h4>
       <eg-grid-column i18n-label label="Hold Status" [cellTemplate]="statusTemplate" name="status_string"
         [sortable]="false" [multiSortable]="false">
       </eg-grid-column>
-      <eg-grid-column i18n-label label="Queue Position"
+      <eg-grid-column i18n-label label="Relative Queue Position"
           path='relative_queue_position' [hidden]="true" datatype="int"></eg-grid-column>
+      <eg-grid-column i18n-label label="Global Queue Position"
+          path='global_queue_position' [hidden]="true" datatype="int"></eg-grid-column>
       <eg-grid-column path='usr_id' i18n-label label="User ID" [hidden]="true"></eg-grid-column>
       <eg-grid-column path='usr_usrname' i18n-label label="Username" [hidden]="true"></eg-grid-column>
 

Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm

@@ -2364,10 +2364,12 @@ SELECT  h.id, h.request_time, h.capture_time, h.fulfillment_time, h.checkin_time
 
         COALESCE(acplo.position, acpl_ordered.fallback_position) AS copy_location_order_position,
 
+        pos.global_queue_position, -- position among same-bib holds globally
+
         ROW_NUMBER() OVER (
             PARTITION BY r.bib_record
-            ORDER BY h.cut_in_line DESC NULLS LAST, h.request_time ASC
-        ) AS relative_queue_position,
+            ORDER BY pos.global_queue_position
+        ) AS relative_queue_position, -- position among same-bib holds that are actually in the result set
 
         EXTRACT(EPOCH FROM COALESCE(
             NULLIF(BTRIM(default_estimated_wait_interval.value,'"'),''),
@@ -2422,6 +2424,13 @@ SELECT  h.id, h.request_time, h.capture_time, h.fulfillment_time, h.checkin_time
         LEFT JOIN actor.org_unit ol ON (cn.owning_lib = ol.id)
         LEFT JOIN LATERAL (SELECT * FROM action.hold_transit_copy WHERE h.id = hold ORDER BY id DESC LIMIT 1) tr ON TRUE
         LEFT JOIN actor.org_unit tl ON (tr.source = tl.id)
+        LEFT JOIN LATERAL ( -- correlated subquery finding the aprox ordering of open peer holds per bib, but ONLY for holds we'll eventually return!
+            SELECT  sr.id,
+                    ROW_NUMBER() OVER (ORDER BY sh.cut_in_line DESC NULLS LAST, sh.request_time) AS global_queue_position
+              FROM  action.hold_request sh
+                    JOIN reporter.hold_request_record sr ON (sh.id = sr.id AND sh.cancel_time IS NULL AND sh.fulfillment_time IS NULL)
+              WHERE sr.bib_record = r.bib_record
+        ) pos ON (pos.id=h.id)
         LEFT JOIN LATERAL (SELECT COUNT(*) FROM action.hold_request_note WHERE h.id = hold AND (pub = TRUE OR staff = $is_staff_request)) notes ON TRUE
         LEFT JOIN LATERAL (SELECT COUNT(*), MAX(notify_time) FROM action.hold_notification WHERE h.id = hold) n ON TRUE
         LEFT JOIN LATERAL (SELECT FIRST(value) AS value FROM metabib.display_entry WHERE source = r.bib_record AND field = t_field.field) t ON TRUE

Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2

@@ -84,7 +84,8 @@
   <eg-grid-field label="[% l('Potential Items') %]" path='hold.potentials' name='potentials'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string' name='hold_status'></eg-grid-field>
 
-  <eg-grid-field label="[% l('Queue Position') %]" path='hold.relative_queue_position' name='relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Relative Queue Position') %]" path='hold.relative_queue_position' name='relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Global Queue Position') %]" path='hold.global_queue_position' name='global_queue_position' hidden></eg-grid-field>
 
     <eg-grid-field path='hold.usr_id' label="[% l('User ID') %]" name='usr_id' hidden></eg-grid-field>
     <eg-grid-field path='hold.usr_usrname' label="[% l('Username') %]" name='usr_usrname' hidden></eg-grid-field>

Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2

@@ -73,7 +73,8 @@
   <eg-grid-field label="[% l('Potential Items') %]" path='hold.potentials'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
-  <eg-grid-field label="[% l('Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Relative Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Global Queue Position') %]" path='hold.global_queue_position' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Item Status') %]" path="hold.cs_name" hidden></eg-grid-field>
 
   <eg-grid-field label="[% l('Fulfillment Date/Time') %]" path='hold.fulfillment_time' datatype="timestamp" hidden></eg-grid-field>

Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2

@@ -73,7 +73,8 @@
   <eg-grid-field label="[% l('Potential Items') %]" path='hold.potentials'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
-  <eg-grid-field label="[% l('Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Relative Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Global Queue Position') %]" path='hold.global_queue_position' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Item Status') %]" path="hold.cs_name" hidden></eg-grid-field>
 
   <eg-grid-field label="[% l('Fulfillment Date/Time') %]" path='hold.fulfillment_time' datatype="timestamp" hidden></eg-grid-field>

Open-ILS/web/js/ui/default/staff/circ/holds/app.js

@@ -105,6 +105,7 @@ function($scope , $q , $routeParams , $window , $location , egCore , egHolds , e
             // A list of fields we can't sort on the server side.  That's ok, because
             // the grid is marked clientsort, so it always re-sorts in the browser.
             var cannot_sort = [
+                'global_queue_position',
                 'relative_queue_position',
                 'default_estimated_wait',
                 'min_estimated_wait',

Open-ILS/web/js/ui/default/staff/circ/patron/holds.js

@@ -152,6 +152,7 @@ function($scope,  $q,  $routeParams,  egCore,  egUser,  patronSvc,
             // A list of fields we can't sort on the server side.  That's ok, because
             // the grid is marked clientsort, so it always re-sorts in the browser.
             var cannot_sort = [
+                'global_queue_position',
                 'relative_queue_position',
                 'default_estimated_wait',
                 'min_estimated_wait',