svn commit: r688176 - in /incubator/shindig/trunk: javascript/sampledata/canonicaldb.json php/src/social-api/canonical/JsonDbOpensocialService.php

[chabotc]

Author: chabotc
Date: Fri Aug 22 12:22:04 2008
New Revision: 688176

URL: http://svn.apache.org/viewvc?rev=688176&view=rev
Log:
SHINDIG-526 by Ruchi Kothari : HAS_APP filter is not working with new canonical 
json db structure

Modified:
    incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
    
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php

Modified: incubator/shindig/trunk/javascript/sampledata/canonicaldb.json
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/sampledata/canonicaldb.json?rev=688176&r1=688175&r2=688176&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/sampledata/canonicaldb.json (original)
+++ incubator/shindig/trunk/javascript/sampledata/canonicaldb.json Fri Aug 22 
12:22:04 2008
@@ -363,5 +363,15 @@
 "jane.doe" : ["john.doe"],
 "george.doe" : ["john.doe"],
 "maija.m" : []
+},
+//
+//---------------------------- Data For User Applications 
--------------------------------------------
+//
+"userApplications" : {
+"canonical" : ["9158", "9703", "9143", "8877"],
+"john.doe" : ["8877", "9143", "9158"],
+"jane.doe" : ["9158", "9703"],
+"george.doe" : ["9143"],
+"maija.m" : []
+}
 }
-}
\ No newline at end of file

Modified: 
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php?rev=688176&r1=688175&r2=688176&view=diff
==============================================================================
--- 
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
 (original)
+++ 
incubator/shindig/trunk/php/src/social-api/canonical/JsonDbOpensocialService.php
 Fri Aug 22 12:22:04 2008
@@ -48,6 +48,11 @@
         */
        private static $FRIEND_LINK_TABLE = "friendLinks";
        
+       /**
+        * db["userApplications"] -> Map<Person.Id, Array<Application Ids>>
+        */
+       private static $USER_APPLICATIONS_TABLE = "userApplications";
+       
        private $allPeople = null;
        
        private $allData = null;
@@ -162,10 +167,12 @@
        private function getPeopleWithApp($appId)
        {
                $peopleWithApp = array();
-               $allPeople = $this->getAllPeople();
-               foreach ($allPeople as $people) {
-                       if ($people['hasApp'] == 1) {
-                               $peopleWithApp = $people['id'];
+               $db = $this->getDb();
+               $userApplicationsTable = $db[self::$USER_APPLICATIONS_TABLE];
+               
+               foreach ($userApplicationsTable as $key => $value) {
+                       if (in_array($appId, $userApplicationsTable[$key])) {
+                               $peopleWithApp[] = $key;
                        }
                }
                return $peopleWithApp;