Merge branch 'master' into production

app/views/admin/LevelSessionsView.coffee

@@ -4,7 +4,7 @@ LevelSession = require 'models/LevelSession'
 CocoCollection = require 'collections/CocoCollection'
 
 class LevelSessionCollection extends CocoCollection
-  url: '/db/level_session/x/active?project=screenshot,levelName,creatorName'
+  url: '/db/level.session/x/active?project=screenshot,levelName,creatorName'
   model: LevelSession
 
 module.exports = class LevelSessionsView extends RootView

app/views/editor/campaign/CampaignLevelView.coffee

@@ -464,7 +464,7 @@ module.exports = class CampaignLevelView extends CocoView
       @analytics.recentSessions.data = data
       doneCallback()
     request = @supermodel.addRequestResource 'level_sessions_recent', {
-      url: "/db/level_session/-/recent"
+      url: "/db/level.session/-/recent"
       data: {slug: @levelSlug, limit: limit}
       method: 'POST'
       success: success

app/views/editor/level/systems/AddLevelSystemModal.coffee

@@ -5,7 +5,7 @@ LevelSystem = require 'models/LevelSystem'
 CocoCollection = require 'collections/CocoCollection'
 
 class LevelSystemSearchCollection extends CocoCollection
-  url: '/db/level_system'
+  url: '/db/level.system'
   model: LevelSystem
 
 module.exports = class AddLevelSystemModal extends ModalView

server/commons/mapping.coffee

@@ -33,9 +33,7 @@ module.exports.handlers =
   'user_polls_record': 'polls/user_polls_record_handler'
 
 module.exports.handlerUrlOverrides =
-  'analytics_log_event': 'analytics_log_event'
+  'analytics_log_event': 'analytics.log.event'
-  'analytics_perday': 'analytics_perday'
-  'analytics_string': 'analytics.string'
   'analytics_stripe_invoice': 'analytics.stripe.invoice'
   'level_component': 'level.component'
   'level_feedback': 'level.feedback'
@@ -43,7 +41,6 @@ module.exports.handlerUrlOverrides =
   'level_system': 'level.system'
   'thang_type': 'thang.type'
   'thang_component': 'thang.component'
-  'user_code_problem': 'user.code.problem'
   'user_remark': 'user.remark'
   'mail_sent': 'mail.sent'
   'user_polls_record': 'user.polls.record'

test/server/functional/prepaid.spec.coffee

@@ -50,8 +50,9 @@ describe '/db/prepaid', ->
             url = getURL("/db/prepaid/#{prepaid.id}/redeemers")
             redeemer = { userID: otherUser.id }
             request.post {uri: url, json: redeemer }, (err, res, body) ->
-              expect(body.redeemers.length).toBe(1)
+              expect(body.redeemers?.length).toBe(1)
               expect(res.statusCode).toBe(200)
+              return done() unless res.statusCode is 200
               prepaid = Prepaid.findById body._id, (err, prepaid) ->
                 expect(err).toBeNull()
                 expect(prepaid.get('redeemers').length).toBe(1)