Use SendWithUs versioning

scripts/mail.coffee

@@ -91,7 +91,8 @@ emailUserInitialRecruiting = (user, callback) ->
   team = user.session.levelInfo.team
   team = team.substr(0, team.length - 1)
   context =
-    email_id: sendwithus.templates.recruiting_email
+    email_id: sendwithus.templates.recruiting_email.id
+    version_name: sendwithus.templates.recruiting_email.version
     recipient:
       address: if DEBUGGING then 'nick@codecombat.com' else user.email
       name: name
@@ -134,7 +135,8 @@ emailUserTournamentResults = (winner, callback) ->
   name = winner.name
   team = winner.team.substr(0, winner.team.length - 1)
   context =
-    email_id: sendwithus.templates.greed_tournament_rank
+    email_id: sendwithus.templates.greed_tournament_rank.id
+    version_name: sendwithus.templates.greed_tournament_rank.version
     recipient:
       address: if DEBUGGING then 'nick@codecombat.com' else winner.email
       name: name

server/commons/Handler.coffee

@@ -468,7 +468,8 @@ module.exports = class Handler
 
   notifyWatcherOfChange: (editor, watcher, changedDocument, editPath) ->
     context =
-      email_id: sendwithus.templates.change_made_notify_watcher
+      email_id: sendwithus.templates.change_made_notify_watcher.id
+      version_name: sendwithus.templates.change_made_notify_watcher.version
       recipient:
         address: watcher.get('email')
         name: watcher.get('name')

server/handlers/course_instance_handler.coffee

@@ -187,7 +187,8 @@ CourseInstanceHandler = class CourseInstanceHandler extends Handler
           return @sendForbiddenError(res) unless prepaid.get('maxRedeemers') > prepaid.get('redeemers').length
           for email in req.body.emails
             context =
-              email_id: sendwithus.templates.course_invite_email
+              email_id: sendwithus.templates.course_invite_email.id
+              version: sendwithus.templates.course_invite_email.version
               recipient:
                 address: email
               subject: course.get('name')

server/handlers/patch_handler.coffee

@@ -100,7 +100,8 @@ PatchHandler = class PatchHandler extends Handler
   sendPatchCreatedEmail: (patchCreator, watcher, patch, target, docLink) ->
 #    return if watcher._id is patchCreator._id
     context =
-      email_id: sendwithus.templates.patch_created
+      email_id: sendwithus.templates.patch_created.id
+      version_name: sendwithus.templates.patch_created.version
       recipient:
         address: watcher.get('email')
         name: watcher.get('name')

server/middleware/auth.coffee

@@ -52,7 +52,7 @@ module.exports =
       yield req.logInAsync(user)
       
     if req.query.callback
-      res.jsonp(req.user.toObject({req, publicOnly: true})) 
+      res.jsonp(req.user.toObject({req, publicOnly: true}))
     else
       res.send(req.user.toObject({req, publicOnly: false}))
     res.end()
@@ -132,7 +132,8 @@ module.exports =
     user.set('passwordReset', utils.getCodeCamel())
     yield user.save()
     context =
-      email_id: sendwithus.templates.password_reset
+      email_id: sendwithus.templates.password_reset.id
+      version_name: sendwithus.templates.password_reset.version
       recipient:
         address: req.body.email
       email_data:

server/middleware/classrooms.coffee

@@ -235,7 +235,8 @@ module.exports =
     for email in req.body.emails
       joinCode = (classroom.get('codeCamel') or classroom.get('code'))
       context =
-        email_id: sendwithus.templates.course_invite_email
+        email_id: sendwithus.templates.course_invite_email.id
+        version_name: sendwithus.templates.course_invite_email.version
         recipient:
           address: email
         email_data:

server/middleware/users.coffee

@@ -85,7 +85,8 @@ module.exports =
     if not user
       throw new errors.NotFound('User not found')
     context =
-      email_id: sendwithus.templates.verify_email
+      email_id: sendwithus.templates.verify_email.id
+      version_name: sendwithus.templates.verify_email.version
       recipient:
         address: user.get('email')
         name: user.broadName()

server/middleware/versions.coffee

@@ -107,7 +107,8 @@ module.exports =
       User.find({_id:{$in:watchers}}).select({email:1, name:1}).exec (err, watchers) ->
         for watcher in watchers
           context =
-            email_id: sendwithus.templates.change_made_notify_watcher
+            email_id: sendwithus.templates.change_made_notify_watcher.id
+            version_name: sendwithus.templates.change_made_notify_watcher.version
             recipient:
               address: watcher.get('email')
               name: watcher.get('name')
@@ -127,7 +128,7 @@ module.exports =
     original = req.params.handle
     version = req.params.version
     if not database.isID(original)
-      throw new errors.UnprocessableEntity('Invalid MongoDB id: '+original) 
+      throw new errors.UnprocessableEntity('Invalid MongoDB id: '+original)
 
     query = { 'original': mongoose.Types.ObjectId(original) }
     if version?

server/routes/contact.coffee

@@ -17,7 +17,7 @@ module.exports.setup = (app) ->
         req.user.update({$set: { enrollmentRequestSent: true }}).exec(_.noop) if req.body.recipientID is 'schools@codecombat.com'
         closeIO.sendMail fromAddress, subject, content, (err) ->
           log.error "Error sending contact form email via Close.io: #{err.message or err}" if err
-      else 
+      else
         createSendWithUsContext req, fromAddress, subject, content, (context) ->
           sendwithus.api.send context, (err, result) ->
             log.error "Error sending contact form email via sendwithus: #{err.message or err}" if err
@@ -61,7 +61,8 @@ createSendWithUsContext = (req, fromAddress, subject, content, done) ->
     else config.mail.supportPrimary
 
   context =
-    email_id: sendwithus.templates.plain_text_email
+    email_id: sendwithus.templates.plain_text_email.id
+    version_name: sendwithus.templates.plain_text_email.version
     recipient:
       address: toAddress
     sender:

server/routes/mail.coffee

@@ -592,7 +592,8 @@ sendLadderUpdateEmail = (session, now, daysAgo) ->
     sendEmail = (defeatContext, victoryContext, levelVersionsContext) ->
       # TODO: do something with the preferredLanguage?
       context =
-        email_id: sendwithus.templates.ladder_update_email
+        email_id: sendwithus.templates.ladder_update_email.id
+        version_name: sendwithus.templates.ladder_update_email.version
         recipient:
           address: if DEBUGGING then 'nick@codecombat.com' else user.get('email')
           name: name
@@ -721,7 +722,8 @@ sendNextStepsEmail = (user, now, daysAgo) ->
       # Used to use these categories to customize the email; not doing it right now. TODO: customize it again in Sendwithus.
       # TODO: do something with the preferredLanguage?
       context =
-        email_id: sendwithus.templates.next_steps_email
+        email_id: sendwithus.templates.next_steps_email.id
+        version_name: sendwithus.templates.next_steps_email.version
         recipient:
           address: if DEBUGGING then 'nick@codecombat.com' else user.get('email')
           name: name

server/sendwithus.coffee

@@ -11,26 +11,30 @@ module.exports.api =
   send: (context, cb) ->
     log.debug('Tried to send email with context: ', JSON.stringify(context, null, '  '))
     setTimeout(cb, 10)
-    
+
 if swuAPIKey
   module.exports.api = new sendwithusAPI swuAPIKey, debug
-  
+
+# Version name can be supplied to tie a specific version to a deploy.
+# That is most useful for testing templates with new data fields on staging.
+# If it doesn't need to be synchronized to a deploy, you can just "publish"
+#   the new template version on SendWithUs (and leave this version blank)
 module.exports.templates =
-  parent_subscribe_email: 'tem_2APERafogvwKhmcnouigud'
-  share_progress_email: 'tem_VHE3ihhGmVa3727qds9zY8'
-  welcome_email_user: 'tem_z7Xvj3mtWYk6ec6aW7RwFk'
-  welcome_email_student: 'tem_4WYPZNLzs5wawMF9qUJXUH'
-  verify_email: 'tem_zJee6uRsRmzqzktzneCkCn'
-  ladder_update_email: 'JzaZxf39A4cKMxpPZUfWy4'
-  patch_created: 'tem_xhxuNosLALsizTNojBjNcL'
-  change_made_notify_watcher: 'tem_7KVkfmv9SZETb25dtHbUtG'
-  recruiting_email: 'tem_mdFMgtcczHKYu94Jmq68j8'
-  greed_tournament_rank: 'tem_c4KYnk2TriEkkZx5NqqGLG'
-  generic_email: 'tem_JhRnQ4pvTS4KdQjYoZdbei'
-  plain_text_email: 'tem_85UvKDCCNPXsFckERTig6Y'
-  next_steps_email: 'tem_RDHhTG5inXQi8pthyqWr5D'
-  course_invite_email: 'tem_ic2ZhPkpj8GBADFuyAp4bj'
-  teacher_free_trial: 'tem_R7d9Hpoba9SceQNiYSXBak'
-  teacher_free_trial_hoc: 'tem_4ZSY9wsA9Qwn4wBFmZgPdc'
-  teacher_request_demo: 'tem_cwG3HZjEyb6QE493hZuUra'
-  password_reset: 'tem_wbQUMRtLY9xhec8BSCykLA'
+  parent_subscribe_email: { id: 'tem_2APERafogvwKhmcnouigud' }
+  share_progress_email: { id: 'tem_VHE3ihhGmVa3727qds9zY8' }
+  welcome_email_user: { id: 'tem_z7Xvj3mtWYk6ec6aW7RwFk' }
+  welcome_email_student: { id: 'tem_4WYPZNLzs5wawMF9qUJXUH' }
+  verify_email: { id: 'tem_zJee6uRsRmzqzktzneCkCn' }
+  ladder_update_email: { id: 'JzaZxf39A4cKMxpPZUfWy4' }
+  patch_created: { id: 'tem_xhxuNosLALsizTNojBjNcL' }
+  change_made_notify_watcher: { id: 'tem_7KVkfmv9SZETb25dtHbUtG' }
+  recruiting_email: { id: 'tem_mdFMgtcczHKYu94Jmq68j8' }
+  greed_tournament_rank: { id: 'tem_c4KYnk2TriEkkZx5NqqGLG' }
+  generic_email: { id: 'tem_JhRnQ4pvTS4KdQjYoZdbei' }
+  plain_text_email: { id: 'tem_85UvKDCCNPXsFckERTig6Y' }
+  next_steps_email: { id: 'tem_RDHhTG5inXQi8pthyqWr5D' }
+  course_invite_email: { id: 'tem_u6D2EFWYC5Ptk38bSykjsU', version: 'v3' }
+  teacher_free_trial: { id: 'tem_R7d9Hpoba9SceQNiYSXBak' }
+  teacher_free_trial_hoc: { id: 'tem_4ZSY9wsA9Qwn4wBFmZgPdc' }
+  teacher_request_demo: { id: 'tem_cwG3HZjEyb6QE493hZuUra' }
+  password_reset: { id: 'tem_wbQUMRtLY9xhec8BSCykLA' }