FOLIO: Support delivery fulfillment preference for requests

config/vufind/Folio.ini

@@ -123,6 +123,14 @@ extraHoldFields = requiredByDate:pickUpLocation
 ; requested item's effective location. Only applicable to item-level requests.
 ;limitPickupLocations = itemEffectiveLocation
 
+; When the extra hold field requestGroup is used, the request group Delivery is offered
+; whenever the FOLIO user's Request Preferences have delivery enabled.  This setting
+; overrides every user's FOLIO setting if it's necessary to globally disable delivery
+; for backwards compatibility.
+; Deprecation: In VuFind 11, this example config will be commented out so that the
+; code default (true), allowing delivery, will have effect.
+allowDelivery = false
+
 ; By default, a "Hold" type request is placed when an item is unavailable and a Page
 ; when an item is available. This setting overrides the default behavior for
 ; unavailable items and for all title-level requests. Legal values: "Page", "Hold" or

module/VuFind/src/VuFind/ILS/Driver/Folio.php

@@ -1277,6 +1277,10 @@ public function patronLogin($username, $password)
             'firstname' => $profile->personal->firstName ?? null,
             'lastname' => $profile->personal->lastName ?? null,
             'email' => $profile->personal->email ?? null,
+            'addressTypeIds' => array_map(
+                fn ($address) => $address->addressTypeId,
+                $profile->personal->addresses ?? []
+            ),
         ];
     }
 
@@ -1508,6 +1512,22 @@ public function renewMyItems($renewDetails)
      */
     public function getPickupLocations($patron, $holdInfo = null)
     {
+        if ('Delivery' == ($holdInfo['requestGroupId'] ?? null)) {
+            $addressTypes = $this->getAddressTypes();
+            $limitDeliveryAddressTypes = $this->config['Holds']['limitDeliveryAddressTypes'] ?? [];
+            $deliveryPickupLocations = [];
+            foreach ($patron['addressTypeIds'] as $addressTypeId) {
+                $addressType = $addressTypes[$addressTypeId];
+                if (empty($limitDeliveryAddressTypes) || in_array($addressType, $limitDeliveryAddressTypes)) {
+                    $deliveryPickupLocations[] = [
+                        'locationID' => $addressTypeId,
+                        'locationDisplay' => $addressType,
+                    ];
+                }
+            }
+            return $deliveryPickupLocations;
+        }
+
         $limitedServicePoints = null;
         if (
             str_contains($this->config['Holds']['limitPickupLocations'] ?? '', 'itemEffectiveLocation')
@@ -1541,6 +1561,107 @@ public function getPickupLocations($patron, $holdInfo = null)
         return $locations;
     }
 
+    /**
+     * Get Default Pick Up Location
+     *
+     * Returns the default pick up location set in HorizonXMLAPI.ini
+     *
+     * @param array $patron      Patron information returned by the patronLogin
+     * method.
+     * @param array $holdDetails Optional array, only passed in when getting a list
+     * in the context of placing a hold; contains most of the same values passed to
+     * placeHold, minus the patron data. May be used to limit the pickup options
+     * or may be ignored.
+     *
+     * @return false|string      The default pickup location for the patron or false
+     * if the user has to choose.
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getDefaultPickUpLocation($patron = false, $holdDetails = null)
+    {
+        if ('Delivery' == ($holdDetails['requestGroupId'] ?? null)) {
+            $deliveryPickupLocations = $this->getPickupLocations($patron, $holdDetails);
+            if (count($deliveryPickupLocations) == 1) {
+                return $deliveryPickupLocations[0]['locationDisplay'];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get request groups
+     *
+     * @param int   $bibId       BIB ID
+     * @param array $patron      Patron information returned by the patronLogin
+     * method.
+     * @param array $holdDetails Optional array, only passed in when getting a list
+     * in the context of placing a hold; contains most of the same values passed to
+     * placeHold, minus the patron data. May be used to limit the request group
+     * options or may be ignored.
+     *
+     * @return array  False if request groups not in use or an array of
+     * associative arrays with id and name keys
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getRequestGroups(
+        $bibId = null,
+        $patron = null,
+        $holdDetails = null
+    ) {
+        // circulation-storage.request-preferences.collection.get
+        $response = $this->makeRequest(
+            'GET',
+            '/request-preference-storage/request-preference?query=userId==' . $patron['id']
+        );
+        $requestPreferencesResponse = json_decode($response->getBody());
+        $requestPreferences = $requestPreferencesResponse->requestPreferences[0];
+        $allowHoldShelf = $requestPreferences->holdShelf;
+        $allowDelivery = $requestPreferences->delivery && ($this->config['Holds']['allowDelivery'] ?? true);
+        $locationsLabels = $this->config['Holds']['locationsLabelByRequestGroup'] ?? [];
+        if ($allowHoldShelf && $allowDelivery) {
+            return [
+                [
+                    'id' => 'Hold Shelf',
+                    'name' => 'fulfillment_method_hold_shelf',
+                    'locationsLabel' => $locationsLabels['Hold Shelf'] ?? null,
+                ],
+                [
+                    'id' => 'Delivery',
+                    'name' => 'fulfillment_method_delivery',
+                    'locationsLabel' => $locationsLabels['Delivery'] ?? null,
+                ],
+            ];
+        }
+        return false;
+    }
+
+    /**
+     * Get list of address types from FOLIO.  Cache as needed.
+     *
+     * @return array An array mapping an address type id to its name.
+     */
+    protected function getAddressTypes()
+    {
+        $cacheKey = 'addressTypes';
+        $addressTypes = $this->getCachedData($cacheKey);
+        if (null == $addressTypes) {
+            $addressTypes = [];
+            // addresstypes.collection.get
+            foreach (
+                $this->getPagedResults(
+                    'addressTypes',
+                    '/addresstypes'
+                ) as $addressType
+            ) {
+                $addressTypes[$addressType->id] = $addressType->addressType;
+            }
+            $this->putCachedData($cacheKey, $addressTypes);
+        }
+        return $addressTypes;
+    }
+
     /**
      * This method queries the ILS for a patron's current holds
      *
@@ -1789,12 +1910,17 @@ public function placeHold($holdDetails)
         // Account for an API spelling change introduced in mod-circulation v24:
         $fulfillmentKey = $this->getModuleMajorVersion('mod-circulation') >= 24
             ? 'fulfillmentPreference' : 'fulfilmentPreference';
+        $fulfillmentValue = $holdDetails['requestGroupId'] ?? 'Hold Shelf';
+        $fulfillmentLocationKey = match ($fulfillmentValue) {
+            'Hold Shelf' => 'pickupServicePointId',
+            'Delivery' => 'deliveryAddressTypeId',
+        };
         $requestBody = $baseParams + [
             'requesterId' => $holdDetails['patron']['id'],
             'requestDate' => date('c'),
-            $fulfillmentKey => 'Hold Shelf',
+            $fulfillmentKey => $fulfillmentValue,
             'requestExpirationDate' => $requiredBy,
-            'pickupServicePointId' => $holdDetails['pickUpLocation'],
+            $fulfillmentLocationKey => $holdDetails['pickUpLocation'],
         ];
         if (!empty($holdDetails['proxiedUser'])) {
             $requestBody['requesterId'] = $holdDetails['proxiedUser'];

module/VuFind/tests/fixtures/folio/responses/successful-patron-login-with-okapi-legacy.json

@@ -14,6 +14,6 @@
         "expectedParams": {
             "query": "username == foo"
         },
-        "body": "{ \"users\": [ { \"id\": \"fake-id\", \"personal\": { \"firstName\": \"first\", \"lastName\": \"last\", \"email\": \"fake@fake.com\" } } ] }"
+        "body": "{ \"users\": [ { \"id\": \"fake-id\", \"personal\": { \"firstName\": \"first\", \"lastName\": \"last\", \"email\": \"fake@fake.com\", \"addresses\": [] } } ] }"
     }
 ]

module/VuFind/tests/fixtures/folio/responses/successful-patron-login-with-okapi.json

@@ -14,6 +14,6 @@
         "expectedParams": {
             "query": "username == foo"
         },
-        "body": "{ \"users\": [ { \"id\": \"fake-id\", \"personal\": { \"firstName\": \"first\", \"lastName\": \"last\", \"email\": \"fake@fake.com\" } } ] }"
+        "body": "{ \"users\": [ { \"id\": \"fake-id\", \"personal\": { \"firstName\": \"first\", \"lastName\": \"last\", \"email\": \"fake@fake.com\", \"addresses\": [] } } ] }"
     }
 ]

module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/FolioTest.php

@@ -332,6 +332,7 @@ public function testSuccessfulPatronLoginWithOkapi(): void
             'firstname' => 'first',
             'lastname' => 'last',
             'email' => 'fake@fake.com',
+            'addressTypeIds' => [],
         ];
         $this->assertEquals($expected, $result);
     }
@@ -361,6 +362,7 @@ public function testSuccessfulPatronLoginWithOkapiLegacyAuth(): void
             'firstname' => 'first',
             'lastname' => 'last',
             'email' => 'fake@fake.com',
+            'addressTypeIds' => [],
         ];
         $this->assertEquals($expected, $result);
     }

themes/bootstrap3/js/hold.js

@@ -49,6 +49,7 @@ function setUpHoldRequestForm(recordId) {
             $emptyOption.removeAttr('hidden');
           }
           $select.show();
+          $('#pickUpLocationLabel').text($self.find(':selected').data('locations-label'));
         } else {
           $select.hide();
           $noResults.show();

themes/bootstrap3/templates/record/hold.phtml

@@ -56,7 +56,11 @@
           </option>
         <?php endif; ?>
         <?php foreach ($this->requestGroups as $group): ?>
-          <option value="<?=$this->escapeHtmlAttr($group['id'])?>"<?=($selected == $group['id']) ? ' selected="selected"' : ''?>>
+          <option
+            value="<?=$this->escapeHtmlAttr($group['id'])?>"
+            data-locations-label="<?=$this->transEsc($group['locationsLabel'] ?? 'pick_up_location')?>"
+            <?=($selected == $group['id']) ? ' selected="selected"' : ''?>
+          >
             <?=$this->transEsc('request_group_' . $group['name'], null, $group['name'])?>
           </option>
         <?php endforeach; ?>

themes/bootstrap5/js/hold.js

@@ -49,6 +49,7 @@ function setUpHoldRequestForm(recordId) {
             $emptyOption.removeAttr('hidden');
           }
           $select.show();
+          $('#pickUpLocationLabel').text($self.find(':selected').data('locations-label'));
         } else {
           $select.hide();
           $noResults.show();

themes/bootstrap5/templates/record/hold.phtml

@@ -56,7 +56,11 @@
           </option>
         <?php endif; ?>
         <?php foreach ($this->requestGroups as $group): ?>
-          <option value="<?=$this->escapeHtmlAttr($group['id'])?>"<?=($selected == $group['id']) ? ' selected="selected"' : ''?>>
+          <option
+            value="<?=$this->escapeHtmlAttr($group['id'])?>"
+            data-locations-label="<?=$this->transEsc($group['locationsLabel'] ?? 'pick_up_location')?>"
+            <?=($selected == $group['id']) ? ' selected="selected"' : ''?>
+          >
             <?=$this->transEsc('request_group_' . $group['name'], null, $group['name'])?>
           </option>
         <?php endforeach; ?>