codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-24 13:34:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust POST /db/classroom/:id/members to not need an actual id

Browse source 
Since students need to be able to join with just the code.
This commit is contained in:
Scott Erickson 2015-11-04 15:33:19 -08:00
parent 9a2bfee5a7
commit 222b0b28e1
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/classrooms/classroom_handler.coffee
View file

@ -39,10 +39,9 @@ ClassroomHandler = class ClassroomHandler extends Handler
joinClassroomAPI: (req, res, classroomID) -> joinClassroomAPI: (req, res, classroomID) ->
return @sendBadInputError(res, 'Need an object with a code') unless req.body?.code return @sendBadInputError(res, 'Need an object with a code') unless req.body?.code
Classroom.findById classroomID, (err, classroom) => Classroom.findOne {code: req.body.code}, (err, classroom) =>
return @sendDatabaseError(res, err) if err return @sendDatabaseError(res, err) if err
return @sendNotFoundError(res) if not classroom return @sendNotFoundError(res) if not classroom
return @sendBadInputError(res, 'Bad code') unless req.body.code is classroom.get('code')
members = _.clone(classroom.get('members')) members = _.clone(classroom.get('members'))
if _.any(members, (memberID) -> memberID.equals(req.user.get('_id'))) if _.any(members, (memberID) -> memberID.equals(req.user.get('_id')))
return @sendSuccess(res, @formatEntity(req, classroom)) return @sendSuccess(res, @formatEntity(req, classroom))

23
test/server/functional/classrooms.spec.coffee
View file

@ -5,7 +5,7 @@ mongoose = require 'mongoose'
classroomsURL = getURL('/db/classroom') classroomsURL = getURL('/db/classroom')
describe 'GET /db/classrooms?ownerID=:id', -> describe 'GET /db/classroom?ownerID=:id', ->
it 'clears database users and classrooms', (done) -> it 'clears database users and classrooms', (done) ->
clearModels [User, Classroom], (err) -> clearModels [User, Classroom], (err) ->
throw err if err throw err if err
@ -34,7 +34,7 @@ describe 'GET /db/classrooms?ownerID=:id', ->
done() done()
describe 'GET /db/classrooms/:id', -> describe 'GET /db/classroom/:id', ->
it 'clears database users and classrooms', (done) -> it 'clears database users and classrooms', (done) ->
clearModels [User, Classroom], (err) -> clearModels [User, Classroom], (err) ->
throw err if err throw err if err
@ -51,7 +51,7 @@ describe 'GET /db/classrooms/:id', ->
expect(body._id).toBe(classroomID = body._id) expect(body._id).toBe(classroomID = body._id)
done() done()
describe 'POST /db/classrooms', -> describe 'POST /db/classroom', ->
it 'clears database users and classrooms', (done) -> it 'clears database users and classrooms', (done) ->
clearModels [User, Classroom], (err) -> clearModels [User, Classroom], (err) ->
@ -76,7 +76,7 @@ describe 'POST /db/classrooms', ->
done() done()
describe 'PUT /db/classrooms', -> describe 'PUT /db/classroom', ->
it 'clears database users and classrooms', (done) -> it 'clears database users and classrooms', (done) ->
clearModels [User, Classroom], (err) -> clearModels [User, Classroom], (err) ->
@ -102,7 +102,7 @@ describe 'PUT /db/classrooms', ->
expect(res.statusCode).toBe(200) expect(res.statusCode).toBe(200)
classroomCode = body.code classroomCode = body.code
loginNewUser (user2) -> loginNewUser (user2) ->
url = classroomsURL + '/' + body._id + '/members' url = getURL("/db/classroom/~/members")
data = { code: classroomCode } data = { code: classroomCode }
request.post { uri: url, json: data }, (err, res, body) -> request.post { uri: url, json: data }, (err, res, body) ->
expect(res.statusCode).toBe(200) expect(res.statusCode).toBe(200)
@ -111,8 +111,13 @@ describe 'PUT /db/classrooms', ->
expect(res.statusCode).toBe(403) expect(res.statusCode).toBe(403)
done() done()
describe 'POST /db/classrooms/:id/members', -> describe 'POST /db/classroom/:id/members', ->
it 'clears database users and classrooms', (done) ->
clearModels [User, Classroom], (err) ->
throw err if err
done()
it 'adds the signed in user to the list of members in the classroom', (done) -> it 'adds the signed in user to the list of members in the classroom', (done) ->
loginNewUser (user1) -> loginNewUser (user1) ->
data = { name: 'Classroom 5' } data = { name: 'Classroom 5' }
@ -120,14 +125,14 @@ describe 'POST /db/classrooms/:id/members', ->
classroomCode = body.code classroomCode = body.code
expect(res.statusCode).toBe(200) expect(res.statusCode).toBe(200)
loginNewUser (user2) -> loginNewUser (user2) ->
url = classroomsURL + '/' + body._id + '/members' url = getURL("/db/classroom/~/members")
data = { code: classroomCode } data = { code: classroomCode }
request.post { uri: url, json: data }, (err, res, body) -> request.post { uri: url, json: data }, (err, res, body) ->
expect(res.statusCode).toBe(200) expect(res.statusCode).toBe(200)
done() done()
describe 'POST /db/classrooms/:id/invite-members', -> describe 'POST /db/classroom/:id/invite-members', ->
it 'takes a list of emails and sends invites', (done) -> it 'takes a list of emails and sends invites', (done) ->
loginNewUser (user1) -> loginNewUser (user1) ->