mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-12-02 11:58:10 -05:00
Merge pull request #1040 from codecombat/master
Made both game selections random
This commit is contained in:
commit
e5e1631363
1 changed files with 42 additions and 36 deletions
|
@ -112,6 +112,13 @@ module.exports.getTwoGames = (req, res) ->
|
|||
"team":"humans"
|
||||
selection = "team totalScore transpiledCode teamSpells levelID creatorName creator"
|
||||
LevelSession.count queryParams, (err, numberOfHumans) =>
|
||||
if err? then return errors.serverError(res, "Couldn't get the number of human games")
|
||||
ogreCountParams =
|
||||
"levelID": "greed"
|
||||
"submitted":true
|
||||
"team":"ogres"
|
||||
LevelSession.count ogreCountParams, (err, numberOfOgres) =>
|
||||
if err? then return errors.serverError(res, "Couldnt' get the number of ogre games")
|
||||
query = LevelSession
|
||||
.find(queryParams)
|
||||
.limit(1)
|
||||
|
@ -119,22 +126,21 @@ module.exports.getTwoGames = (req, res) ->
|
|||
.skip(Math.floor(Math.random()*numberOfHumans))
|
||||
.lean()
|
||||
query.exec (err, randomSession) =>
|
||||
if err? then return errors.serverError(res, "Couldn't select a top 15 random session!")
|
||||
if err? then return errors.serverError(res, "Couldn't select a random session!")
|
||||
randomSession = randomSession[0]
|
||||
queryParams =
|
||||
"levelID":"greed"
|
||||
"submitted":true
|
||||
"totalScore":
|
||||
$lte: randomSession.totalScore
|
||||
"team": "ogres"
|
||||
query = LevelSession
|
||||
.find(queryParams)
|
||||
.select(selection)
|
||||
.sort(totalScore: -1)
|
||||
.limit(1)
|
||||
.select(selection)
|
||||
.skip(Math.floor(Math.random()*numberOfOgres))
|
||||
.lean()
|
||||
|
||||
query.exec (err, otherSession) =>
|
||||
if err? then return errors.serverError(res, "Couldnt' select the other top 15 random session!")
|
||||
if err? then return errors.serverError(res, "Couldnt' select the other random session!")
|
||||
otherSession = otherSession[0]
|
||||
taskObject =
|
||||
"messageGenerated": Date.now()
|
||||
|
|
Loading…
Reference in a new issue