Skip to content

Commit

Permalink
Minor code style cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
differentmatt committed Jun 4, 2018
1 parent 6fd1dde commit 1487794
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
21 changes: 9 additions & 12 deletions server/middleware/api.coffee
Expand Up @@ -97,7 +97,7 @@ getUser = wrap (req, res) ->
.exec()
obj.stats ?= {}
obj.stats.playTime = result[0].playTime

res.send(obj)


Expand Down Expand Up @@ -220,23 +220,20 @@ putUserLicense = wrap (req, res) ->

postClassroom = wrap (req, res) ->
owner = yield User.findBySlugOrId(req.body.ownerID)
if not owner
unless owner
throw new errors.NotFound('User not found.')
unless req.client.hasControlOfUser(owner)
throw new errors.Forbidden('Must have created the user to perform this action.')
unless owner?.isTeacher()
throw new errors.Forbidden("Can't create classroom if user (#{owner?.id}) isn't a teacher.")

if not req.body.aceConfig?.language
unless req.body.aceConfig?.language
throw new errors.UnprocessableEntity('aceConfig.language is required in the request body')

try
classroom = yield Classroom.create(owner, req)
res.status(201).send(classroom.toObject({req: req}))
catch err
console.log("postClassroom api error: ", err)
throw new errors.InternalServerError('Error creating the classroom')


putClassroomMember = wrap (req, res) ->
classroom = yield database.getDocFromHandle(req, Classroom)
Expand Down Expand Up @@ -337,12 +334,12 @@ getClassroomMemberSessions = wrap (req, res, next) ->
memberStrings = classroom.get('members').map((memberId) => memberId + '')
unless member and member.id in memberStrings
throw new errors.NotFound('Member id not found in classroom.')

unless req.client.hasControlOfUser(member)
throw new errors.Forbidden('Must have created the member to perform this action.')

sessions = yield classroom.fetchSessionsForMembers([member._id])

# Return member sessions for assigned courses
res.status(200).send(sessions)

Expand Down Expand Up @@ -387,9 +384,9 @@ getPlayTimeStats = wrap (req, res) ->
}
if req.query.country
query.country = req.query.country

user = yield User.find(query,{_id: 1}).exec()

ids = _.map user, (x) -> x._id.toString()

result = yield LevelSession.aggregate()
Expand All @@ -399,8 +396,8 @@ getPlayTimeStats = wrap (req, res) ->

output = result[0]
if not output
return res.send { playTime: 0, gamesPlayed: 0 }
return res.send { playTime: 0, gamesPlayed: 0 }

delete output._id

res.send output
Expand Down
2 changes: 1 addition & 1 deletion server/models/Classroom.coffee
Expand Up @@ -49,7 +49,7 @@ ClassroomSchema.statics.create = co.wrap (owner, req) ->
database.validateDoc(classroom)
classroom = yield classroom.save()
yield delighted.checkTriggerClassroomCreated(owner)
return classroom
classroom

ClassroomSchema.pre('save', (next) ->
return next() if @get('code')
Expand Down

0 comments on commit 1487794

Please sign in to comment.