Merge lp:~cheers/cheers/getawardedtrophies-gettrophybyapp-gettrophybyset into lp:cheers

[Manish Sinha (मनीष सिन्हा)]

Implemented

* GetAwardedTrophies
* GetTrophiesByApp
* GetTrophiesBySet

Implemented

* GetAwardedTrophies
* GetTrophiesByApp
* GetTrophiesBySet

[Seif Lotfy (seif)]

looks good to me. missing the DB part but all in all very good

review: Approve (code implementation)

=== modified file 'cheers/datastore.py'
--- cheers/datastore.py	2010-11-06 19:29:15 +0000
+++ cheers/datastore.py	2010-11-14 21:36:26 +0000
@@ -113,4 +113,3 @@
             if trophy.has_key("trophyset") and trophy["trophyset"] == setname:
                 yield trophy
 
-dcs = DesktopCouchStore()
 
=== modified file 'cheers/logic.py'
--- cheers/logic.py	2010-11-07 14:48:06 +0000
+++ cheers/logic.py	2010-11-14 21:36:26 +0000
@@ -122,7 +122,8 @@
 
     def get_awarded_trophies(self):
         """ Fetch all the trophies which have been awarded """
-        pass
+        trophy_list = self.__store.get_awarded_trophies()
+        return [datamodel.TrophyDBus(trophy) for trophy in trophy_list]
 
     def get_sets(self, ids):
         """ Get all the trophy sets in cheers """
@@ -142,9 +143,11 @@
 
     def get_trophies_by_app(self, appname):
         """ Get all the trophies associated with a particular application """
-        pass
+        trophy_list = self.__store.get_trophies_by_app(appname)
+        return [datamodel.TrophyDBus(trophy) for trophy in trophy_list]
 
     def get_trophies_by_set(self, setname):
         """ Get all the trophies associated with a parciular trophy set """
-        pass
+        trophy_list = self.__store.get_trophies_by_set(setname)
+        return [datamodel.TrophyDBus(trophy) for trophy in trophy_list]
 
 
=== modified file 'cheers/server.py'
--- cheers/server.py	2010-11-07 14:48:06 +0000
+++ cheers/server.py	2010-11-14 21:36:26 +0000
@@ -66,7 +66,7 @@
 
         return self.logic.get_sets(setid_list)
         
-    @dbus.service.method(config.CHEERS_BUS_NAME)
+    @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='a(saasaasssssb)')
     def GetAwardedTrophies(self):
         """ Get the list of all the awarded trophies in cheers """
 
@@ -96,11 +96,13 @@
 
         res = self.logic.unaward_trophy(id)
 
+    @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='a(saasaasssssb)')
     def GetTrophiesByApp(self, appname):
         """ Get all the trophies registered for a specific application """
 
         return self.logic.get_trophies_by_app(appname)
 
+    @dbus.service.method(config.CHEERS_BUS_NAME, out_signature='a(saasaasssssb)')
     def GetTrophyBySet(self, setname):
         """ Get all the trophies registsred for a specific set """