commit - prior to filtering branch

scottharman · Feb 8, 2016 · 7cd3b62 · 7cd3b62
1 parent 7bd6ec6
commit 7cd3b62
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/ConferenceCentral_Complete/app.yaml b/ConferenceCentral_Complete/app.yaml
@@ -36,6 +36,10 @@ handlers:       # static then dynamic
 - url: /tasks/send_session_email
   script: main.app
 
+- url: /tasks/set_featuredspeaker
+  script: main.app
+
+
 - url: /crons/set_announcement
   script: main.app
 

diff --git a/ConferenceCentral_Complete/conference.py b/ConferenceCentral_Complete/conference.py
@@ -449,7 +449,7 @@ def _createSessionObject(self, request):
                       )
 
         # Add featured speaker - generate code and add here.
-        if Sessions.query(Session.speakerUserId == \
+        if Session.query(Session.speakerUserId == \
                           data['speakerUserId']).count() > 1:
             taskqueue.add(params={'speakerUserId': data['speakerUserId']},
                           url='/tasks/set_featuredspeaker')
@@ -525,22 +525,22 @@ def _copySessionWishlisttoForm(self, wishlist):
         swl.check_initialized()
         return swl
 
-    @endpoints.method(WISHLIST_REQUEST, WishlistForm,
-                      path='wishlist',
+    @endpoints.method(WISHLIST_REQUEST, SessionWishlistForms,
+                      path='wishlist/add',
                       http_method='POST',
                       name='addSessionToWishlist')
     def addSessionToWishlist(self, request):
         return
 
     @endpoints.method(WISHLIST_REQUEST, SessionForms,
-                      path='wishlist',
+                      path='sessions/wishlist',
                       http_method='GET',
                       name='getSessionsInWishlist')
     def getSessionsInWishlist(self, request):
         return
 
-    @endpoints.method(WISHLIST_REQUEST, SessionForms,
-                      path='wishlist',
+    @endpoints.method(WISHLIST_REQUEST, SessionWishlistForms,
+                      path='wishlist/delete',
                       http_method='GET',
                       name='deleteSessionInWishlist')
     def deleteSessionInWishlist(self, request):
@@ -659,14 +659,14 @@ def _cacheFeaturedSpeaker(speakerUserId):
         """Create Speaker Announcement & assign to memcache
         """
         speaker = speakerUserId
-        announce_speaker = SPEAKER_TPL % (speaker)
-        memcache.set(MEMCACHE_SPEAKER_KEY, announce_speaker)
+        # announce_speaker = SPEAKER_TPL % (speaker)
+        memcache.set(MEMCACHE_SPEAKER_KEY, speaker)
 
         return speaker
 
     @endpoints.method(message_types.VoidMessage, StringMessage,
-                      path='conference/announcement/get',
-                      http_method='GET', name='getAnnouncement')
+                      path='session/featured/get',
+                      http_method='GET', name='getFeaturedSpeaker')
     def getFeaturedSpeaker(self, request):
         """Return Speaker from memcache."""
         return StringMessage(data=memcache.get(MEMCACHE_SPEAKER_KEY) or "")

diff --git a/ConferenceCentral_Complete/main.py b/ConferenceCentral_Complete/main.py
@@ -51,16 +51,17 @@ def post(self):
         )
 
 class SetSpeakerHandler(webapp2.RequestHandler):
-    def get(self):
-        """Set Speaker Announcement in Memcache."""
+    def post(self):
+        """Set Speaker Announcement in Memcache.
+        Switch from get to post when copying the announcment handler"""
         speakerUserId = self.request.get('speakerUserId')
         ConferenceApi._cacheFeaturedSpeaker(speakerUserId)
         self.response.set_status(204)
 
 
 app = webapp2.WSGIApplication([
     ('/crons/set_announcement', SetAnnouncementHandler),
-    ('/crons/set_featuredspeaker', SetSpeakerHandler),
+    ('/tasks/set_featuredspeaker', SetSpeakerHandler),
     ('/tasks/send_confirmation_email', SendConfirmationEmailHandler),
     ('/tasks/send_session_email', SendSessionEmailHandler),
 ], debug=True)