Merge branch 'master' of https://github.com/codecombat/codecombat

app/lib/simulator/Simulator.coffee

@@ -108,17 +108,22 @@ module.exports = class Simulator
     taskResults =
       taskID: @task.getTaskID()
       receiptHandle: @task.getReceiptHandle()
+      originalSessionID: @task.getFirstSessionID()
+      originalSessionRank: -1
       calculationTime: 500
       sessions: []
 
     for session in @task.getSessions()
+      
       sessionResult =
         sessionID: session.sessionID
         submitDate: session.submitDate
         creator: session.creator
         metrics:
           rank: @calculateSessionRank session.sessionID, simulationResults.goalStates, @task.generateTeamToSessionMap()
-
+      if session.sessionID is taskResults.originalSessionID
+        taskResults.originalSessionRank = sessionResult.metrics.rank
+        taskResults.originalSessionTeam = session.team
       taskResults.sessions.push sessionResult
 
     return taskResults
@@ -178,7 +183,6 @@ module.exports = class Simulator
   generateSpellKeyToSourceMapPropertiesFromThang: (thang) =>
     for component in thang.components
       continue unless @componentHasProgrammableMethods component
-
       for methodName, method of component.config.programmableMethods
         spellKey = @generateSpellKeyFromThangIDAndMethodName thang.id, methodName
 
@@ -187,9 +191,11 @@ module.exports = class Simulator
         @transpileSpell thang, spellKey, methodName
 
   generateSpellKeyFromThangIDAndMethodName: (thang, methodName) ->
-    spellKeyComponents = [thang.id, methodName]
+    spellKeyComponents = [thang, methodName]
     spellKeyComponents[0] = _.string.slugify spellKeyComponents[0]
-    spellKeyComponents.join '/'
+    spellKey = spellKeyComponents.join '/'
+    spellKey
+    
 
   createSpellAndAssignName: (spellKey, spellName) ->
     @spells[spellKey] ?= {}
@@ -202,7 +208,7 @@ module.exports = class Simulator
 
   transpileSpell: (thang, spellKey, methodName) ->
     slugifiedThangID = _.string.slugify thang.id
-    source = @currentUserCodeMap[slugifiedThangID]?[methodName] ? ""
+    source = @currentUserCodeMap[[slugifiedThangID,methodName].join '/'] ? ""
     @spells[spellKey].thangs[thang.id].aether.transpile source
 
   createAether: (methodName, method) ->
@@ -253,12 +259,18 @@ class SimulationTask
 
   generateSpellKeyToSourceMap: ->
     spellKeyToSourceMap = {}
-
     for session in @rawData.sessions
       teamSpells = session.teamSpells[session.team]
-      _.merge spellKeyToSourceMap, _.pick(session.code, teamSpells)
-
+      teamCode = {}
+      for thangName, thangSpells of session.code
+        for spellName, spell of thangSpells
+          fullSpellName = [thangName,spellName].join '/'
+          if _.contains(teamSpells, fullSpellName)
+            teamCode[fullSpellName]=spell
+            
+      _.merge spellKeyToSourceMap, teamCode
       commonSpells = session.teamSpells["common"]
       _.merge spellKeyToSourceMap, _.pick(session.code, commonSpells) if commonSpells?
 
+    
     spellKeyToSourceMap

app/templates/admin.jade

@@ -2,6 +2,18 @@ extends /templates/base
 
 block content
   
+  h3 Espionage mode
+    h5 Please enter the email/username of the person you want to spy on
+    .form
+      .form-group
+        label.control-label Email 
+        input#user-email
+      .form-group
+        label.control-label Username 
+        input#user-username
+      
+    button.btn.btn-primary.btn-large#enter-espionage-mode 007
+  
   h3(data-i18n="admin.av_title") Admin Views
 
   h4(data-i18n="admin.av_entities_sub_title") Entities

app/views/admin_view.coffee

@@ -1,6 +1,35 @@
+{backboneFailure, genericFailure} = require 'lib/errors'
 View = require 'views/kinds/RootView'
 template = require 'templates/admin'
+storage = require 'lib/storage'
 
 module.exports = class AdminView extends View
   id: "admin-view"
   template: template
+  
+  events:
+    'click #enter-espionage-mode': 'enterEspionageMode'
+    
+  enterEspionageMode: ->
+    userEmail = $("#user-email").val().toLowerCase()
+    username = $("#user-username").val().toLowerCase()
+    
+    userIdentifier = userEmail || username
+    postData =
+      usernameLower: username
+      emailLower: userEmail
+      
+    $.ajax
+      type: "POST",
+      url: "/auth/spy"
+      data: postData
+      success: @espionageSuccess
+      error: @espionageFailure
+    
+  espionageSuccess: (model) ->
+    storage.save('whoami',model)
+    window.location.reload()
+  espionageFailure: (jqxhr, status,error)->
+    console.log "There was an error entering espionage mode: #{error}"
+    
+    

server/queues/scoring.coffee

@@ -24,24 +24,27 @@ connectToScoringQueue = ->
       scoringTaskQueue = data
       log.info "Connected to scoring task queue!"
       
-module.exports.addPairwiseTaskToQueue = (req, res) ->
+module.exports.addPairwiseTaskToQueueFromRequest = (req, res) ->
   taskPair = req.body.sessions
-  #unless isUserAdmin req then return errors.forbidden res, "You do not have the permissions to submit that game to the leaderboard"
-  #fetch both sessions
+  addPairwiseTaskToQueue req.body.sessions (err, success) ->
+    if err? then return errors.serverError res, "There was an error adding pairwise tasks: #{err}"
+    sendResponseObject req, res, {"message":"All task pairs were succesfully sent to the queue"}
+    
+
+addPairwiseTaskToQueue = (taskPair, cb) ->
   LevelSession.findOne(_id:taskPair[0]).lean().exec (err, firstSession) =>
-    if err? then return errors.serverError res, "There was an error fetching the first session in the pair"
+    if err? then return cb err, false
     LevelSession.find(_id:taskPair[1]).exec (err, secondSession) =>
-      if err? then return errors.serverError res, "There was an error fetching the second session"
+      if err? then return cb err, false
       try
         taskPairs = generateTaskPairs(secondSession, firstSession)
       catch e
-        if e then return errors.serverError res, "There was an error generating the task pairs"
-      
-      sendEachTaskPairToTheQueue taskPairs, (taskPairError) ->
-        if taskPairError? then return errors.serverError res, "There was an error sending the task pairs to the queue"
+        if e then return cb e, false
 
-        sendResponseObject req, res, {"message":"All task pairs were succesfully sent to the queue"}
-  
+      sendEachTaskPairToTheQueue taskPairs, (taskPairError) ->
+        if taskPairError? then return cb taskPairError,false 
+        cb null, true
+        
 
 module.exports.createNewTask = (req, res) ->
   requestSessionID = req.body.session
@@ -56,8 +59,8 @@ module.exports.createNewTask = (req, res) ->
 
       updateSessionToSubmit sessionToSubmit, (err, data) ->
         if err? then return errors.serverError res, "There was an error updating the session"
-
-        fetchSessionsToRankAgainst (err, sessionsToRankAgainst) ->
+        opposingTeam = calculateOpposingTeam(sessionToSubmit.team)
+        fetchInitialSessionsToRankAgainst opposingTeam, (err, sessionsToRankAgainst) ->
           if err? then return errors.serverError res, "There was an error fetching the sessions to rank against"
 
           taskPairs = generateTaskPairs(sessionsToRankAgainst, sessionToSubmit)
@@ -114,9 +117,64 @@ module.exports.processTaskResult = (req, res) ->
 
           addMatchToSessions clientResponseObject, newScoresObject, (err, data) ->
             if err? then return errors.serverError res, "There was an error updating the sessions with the match! #{JSON.stringify err}"
-            console.log "Sending response object"
-            sendResponseObject req, res, {"message":"The scores were updated successfully!"}
+            originalSessionID = clientResponseObject.originalSessionID
+            originalSessionTeam = clientResponseObject.originalSessionTeam
+            originalSessionRank = parseInt clientResponseObject.originalSessionRank
+            console.log "The player #{originalSessionID} just achieved rank #{clientResponseObject.originalSessionRank}"
+            if originalSessionRank is 0
+              console.log "Should submit another session into the queue!"
+              #fetch next session
+              opposingTeam = calculateOpposingTeam(originalSessionTeam)
+              opponentID = _.pull(_.keys(newScoresObject), originalSessionID)
+              sessionNewScore = newScoresObject[originalSessionID].totalScore
+              opponentNewScore = newScoresObject[opponentID].totalScore
+              findNearestBetterSessionID sessionNewScore, opponentNewScore ,opposingTeam, (err, opponentSessionID) ->
+                if err? then return errors.serverError res, "There was an error finding the nearest sessionID!"
+                unless opponentSessionID then return sendResponseObject req, res, {"message":"There were no more games to rank(game is at top!"}
+                  
+                addPairwiseTaskToQueue [originalSessionID, opponentSessionID], (err, success) ->
+                  if err? then return errors.serverError res, "There was an error sending the pairwise tasks to the queue!"
+                  sendResponseObject req, res, {"message":"The scores were updated successfully and more games were sent to the queue!"}
+            else
+              console.log "Player lost, achieved rank #{originalSessionRank}"
+              sendResponseObject req, res, {"message":"The scores were updated successfully, person lost so no more games are being inserted!"}
 
+findNearestBetterSessionID = (sessionTotalScore, opponentSessionTotalScore, opposingTeam, cb) ->
+  queryParameters =
+    totalScore: 
+      $gt:Math.max(10,opponentSessionTotalScore)
+    levelID: "project-dota"
+    submitted: true
+    submittedCode:
+      $exists: true
+    team: opposingTeam
+    
+  limitNumber = 1
+
+  sortParameters =
+    totalScore: 1
+    
+  selectString = '_id totalScore'
+    
+  query = LevelSession.findOne(queryParameters)
+    .sort(sortParameters)
+    .limit(limitNumber)
+    .select(selectString)
+    .lean()
+  
+  console.log "Finding session with score near #{sessionTotalScore}"
+  query.exec (err, session) ->
+    if err? then return cb err, session
+    unless session then return cb err, null
+    console.log "Found session with score #{session.totalScore}"
+    cb err, session._id
+
+calculateOpposingTeam = (sessionTeam) ->
+  teams = ['ogres','humans']
+  opposingTeams = _.pull teams, sessionTeam
+  return opposingTeams[0]
+  
+  
 validatePermissions = (req, sessionID, callback) ->
   if isUserAnonymous req then return callback null, false
   if isUserAdmin req then return callback null, true
@@ -179,13 +237,26 @@ updateSessionToSubmit = (sessionToUpdate, callback) ->
     totalScore: 10
   LevelSession.update {_id: sessionToUpdate._id}, sessionUpdateObject, callback
 
-fetchSessionsToRankAgainst = (callback) ->
-  submittedSessionsQuery =
+fetchInitialSessionsToRankAgainst = (opposingTeam, callback) ->
+  console.log "Fetching sessions to rank against for opposing team #{opposingTeam}"
+  findParameters =
     levelID: "project-dota"
     submitted: true
     submittedCode:
       $exists: true
-  LevelSession.find submittedSessionsQuery, callback
+    team: opposingTeam
+  
+  sortParameters = 
+    totalScore: 1
+  
+  limitNumber = 1
+  
+  query = LevelSession.find(findParameters)
+    .sort(sortParameters)
+    .limit(limitNumber)
+  
+  
+  query.exec callback
 
 generateTaskPairs = (submittedSessions, sessionToScore) ->
   taskPairs = []

server/routes/auth.coffee

@@ -28,7 +28,30 @@ module.exports.setup = (app) ->
         return done(null, user)
       )
   ))
-
+  app.post '/auth/spy', (req, res, next) ->
+    if req?.user?.isAdmin()
+      
+      username = req.body.usernameLower
+      emailLower = req.body.emailLower
+      if emailLower
+        query = {"emailLower":emailLower}
+      else if username
+        query = {"nameLower":username}
+      else
+        return errors.badInput res, "You need to supply one of emailLower or username"
+        
+      User.findOne query, (err, user) ->
+        if err? then return errors.serverError res, "There was an error finding the specified user"
+        
+        unless user then return errors.badInput res, "The specified user couldn't be found"
+          
+        req.logIn user, (err) ->
+          if err? then return errors.serverError res, "There was an error logging in with the specified"
+          res.send(UserHandler.formatEntity(req, user))
+          return res.end()
+    else
+      return errors.unauthorized res, "You must be an admin to enter espionage mode"
+      
   app.post('/auth/login', (req, res, next) ->
     authentication.authenticate('local', (err, user, info) ->
       return next(err) if err