allow multiple user ids in (not_)found_by search; fixes #356

Author: following5

okapi/services/caches/search/all.xml

@@ -125,12 +125,12 @@
         </ul>
     </opt>
     <opt name='found_by'>
-        <p>User UUID. If given, the response will only include geocaches found by
-        the given user.</p>
+        <p>Pipe-separated list of user IDs. If given, the response will only include
+        geocaches found by one or more of the given users.</p>
     </opt>
     <opt name='not_found_by'>
-        <p>User UUID. If given, the response will only include geocaches not found by
-        the given user.</p>
+        <p>Pipe-separated list of user IDs. If given, the response will only include
+        geocaches not found by one or more of the given users.</p>
     </opt>
     <opt name='watched_only' default='false'>
         <p><b>Notice:</b> This parameter may be used only for requests signed with an Access Token

okapi/services/caches/search/searching.inc.php

@@ -380,7 +380,7 @@ public function prepare_common_search_params()
                 throw new InvalidParam('found_status', "'$tmp'");
             if ($tmp != 'either')
             {
-                $found_cache_ids = self::get_found_cache_ids($this->request->token->user_id);
+                $found_cache_ids = self::get_found_cache_ids(array($this->request->token->user_id));
                 $operator = ($tmp == 'found_only') ? "in" : "not in";
                 $where_conds[] = "caches.cache_id $operator ('".implode("','", array_map('mysql_real_escape_string', $found_cache_ids))."')";
             }
@@ -393,12 +393,13 @@ public function prepare_common_search_params()
         if ($tmp = $this->request->get_parameter('found_by'))
         {
             try {
-                $user = OkapiServiceRunner::call("services/users/user", new OkapiInternalRequest(
-                    $this->request->consumer, null, array('user_uuid' => $tmp, 'fields' => 'internal_id')));
+                $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
+                    $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
             } catch (InvalidParam $e) { # invalid uuid
                 throw new InvalidParam('found_by', $e->whats_wrong_about_it);
             }
-            $found_cache_ids = self::get_found_cache_ids($user['internal_id']);
+            $internal_user_ids = array_map(create_function('$internalid', 'return $internalid["internal_id"];'), $users);
+            $found_cache_ids = self::get_found_cache_ids($internal_user_ids);
             $where_conds[] = "caches.cache_id in ('".implode("','", array_map('mysql_real_escape_string', $found_cache_ids))."')";
         }
 
@@ -409,12 +410,13 @@ public function prepare_common_search_params()
         if ($tmp = $this->request->get_parameter('not_found_by'))
         {
             try {
-                $user = OkapiServiceRunner::call("services/users/user", new OkapiInternalRequest(
-                    $this->request->consumer, null, array('user_uuid' => $tmp, 'fields' => 'internal_id')));
+                $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
+                    $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
             } catch (InvalidParam $e) { # invalid uuid
                 throw new InvalidParam('not_found_by', $e->whats_wrong_about_it);
             }
-            $found_cache_ids = self::get_found_cache_ids($user['internal_id']);
+            $internal_user_ids = array_map(create_function('$internalid', 'return $internalid["internal_id"];'), $users);
+            $found_cache_ids = self::get_found_cache_ids($internal_user_ids);
             $where_conds[] = "caches.cache_id not in ('".implode("','", array_map('mysql_real_escape_string', $found_cache_ids))."')";
         }
 
@@ -846,13 +848,13 @@ public function get_latitude_expr()
      * Get the list of cache IDs which were found by given user.
      * Parameter needs to be *internal* user id, not uuid.
      */
-    private static function get_found_cache_ids($internal_user_id)
+    private static function get_found_cache_ids($internal_user_ids)
     {
         return Db::select_column("
             select cache_id
             from cache_logs
             where
-                user_id = '".mysql_real_escape_string($internal_user_id)."'
+                user_id in ('".implode("','", array_map('mysql_real_escape_string', $internal_user_ids))."')
                 and type in (
                     '".mysql_real_escape_string(Okapi::logtypename2id("Found it"))."',
                     '".mysql_real_escape_string(Okapi::logtypename2id("Attended"))."'