libraries: allow multiple pickup locations

* Closes rero#1341

Co-Authored-by: Aly Badr <aly.badr@rero.ch>

rero_ils/modules/documents/views.py

@@ -303,20 +303,22 @@ def item_library_pickup_locations(item):
     if 'restrict_pickup_to' in location:
         # Get all pickup locations as Location objects and append it to the
         # location item (removing possible None values)
-        pickup_locations = list(filter(None, [
+        pickup_locations = [
             Location.get_record_by_pid(loc_pid)
             for loc_pid in location.restrict_pickup_to
-        ]))
+        ]
     else:
         org = Organisation.get_record_by_pid(location.organisation_pid)
         # Get the pickup location from each library of the item organisation
         # (removing possible None value)
-        pickup_locations = list(filter(None, [
-            Location.get_record_by_pid(library.get_pickup_location_pid())
-            for library in org.get_libraries()
-        ]))
+        pickup_locations = []
+        for library in org.get_libraries():
+            for location_pid in list(library.get_pickup_locations_pids()):
+                pickup_locations.append(
+                    Location.get_record_by_pid(location_pid))
+
     return sorted(
-        pickup_locations,
+        list(filter(None, pickup_locations)),
         key=lambda location: location.get('pickup_name', location.get('code'))
     )
 

rero_ils/modules/libraries/api.py

@@ -94,13 +94,21 @@ def get_organisation(self):
         from ..organisations.api import Organisation
         return Organisation.get_record_by_pid(self.organisation_pid)
 
-    def get_pickup_location_pid(self):
-        """Returns libraries first pickup location."""
-        results = LocationsSearch().filter(
+    def pickup_location_query(self):
+        """Search the location index for pickup locations."""
+        return LocationsSearch().filter(
             'term', library__pid=self.pid).filter(
                 'term', is_pickup=True).source(['pid']).scan()
+
+    def get_pickup_locations_pids(self):
+        """Returns libraries all pickup locations pids."""
+        for location in self.pickup_location_query():
+            yield location.pid
+
+    def get_pickup_location_pid(self):
+        """Returns libraries first pickup location pid."""
         try:
-            return next(results).pid
+            return next(self.pickup_location_query()).pid
         except StopIteration:
             return None
 

rero_ils/modules/locations/jsonschemas/locations/location-v0.0.1.json

@@ -63,22 +63,7 @@
       "title": "Is pickup location",
       "type": "boolean",
       "default": false,
-      "description": "Qualify this location as a pickup location.",
-      "form": {
-        "validation": {
-          "validators": {
-            "valueAlreadyExists": {
-              "limitToValues": [
-                true
-              ],
-              "filter": "'library.pid:' + model.library.pid"
-            }
-          },
-          "messages": {
-            "alreadyTakenMessage": "There is already one pickup location in this library."
-          }
-        }
-      }
+      "description": "Qualify this location as a pickup location."
     },
     "is_online": {
       "title": "Is online location",