Added an acceptor field to patches.
This commit is contained in:
parent
f1a9848366
commit
8233df514e
3 changed files with 5 additions and 2 deletions
app/schemas/models
server/patches
test/server/functional
|
@ -6,6 +6,7 @@ PatchSchema = c.object({title: 'Patch', required: ['target', 'delta', 'commitMes
|
||||||
delta: {title: 'Delta', type: ['array', 'object']}
|
delta: {title: 'Delta', type: ['array', 'object']}
|
||||||
commitMessage: c.shortString({maxLength: 500, minLength: 1})
|
commitMessage: c.shortString({maxLength: 500, minLength: 1})
|
||||||
creator: c.objectId(links: [{rel: 'extra', href: '/db/user/{($)}'}])
|
creator: c.objectId(links: [{rel: 'extra', href: '/db/user/{($)}'}])
|
||||||
|
acceptor: c.objectId(links: [{rel: 'extra', href: '/db/user/{($)}'}])
|
||||||
created: c.date({title: 'Created', readOnly: true})
|
created: c.date({title: 'Created', readOnly: true})
|
||||||
status: {enum: ['pending', 'accepted', 'rejected', 'withdrawn']}
|
status: {enum: ['pending', 'accepted', 'rejected', 'withdrawn']}
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,10 @@ PatchHandler = class PatchHandler extends Handler
|
||||||
|
|
||||||
# Only increment statistics upon very first accept
|
# Only increment statistics upon very first accept
|
||||||
if patch.isNewlyAccepted()
|
if patch.isNewlyAccepted()
|
||||||
accepter = req.user.get 'id'
|
patch.set 'acceptor', req.user.get('id')
|
||||||
|
acceptor = req.user.get 'id'
|
||||||
submitter = patch.get 'creator'
|
submitter = patch.get 'creator'
|
||||||
User.incrementStat accepter, 'stats.patchesAccepted'
|
User.incrementStat acceptor, 'stats.patchesAccepted'
|
||||||
# TODO maybe merge these increments together
|
# TODO maybe merge these increments together
|
||||||
if patch.isTranslationPatch()
|
if patch.isTranslationPatch()
|
||||||
User.incrementStat submitter, 'stats.totalTranslationPatches'
|
User.incrementStat submitter, 'stats.totalTranslationPatches'
|
||||||
|
|
|
@ -111,6 +111,7 @@ describe '/db/patch', ->
|
||||||
expect(res.statusCode).toBe(200)
|
expect(res.statusCode).toBe(200)
|
||||||
Patch.findOne({}).exec (err, article) ->
|
Patch.findOne({}).exec (err, article) ->
|
||||||
expect(article.get('status')).toBe 'accepted'
|
expect(article.get('status')).toBe 'accepted'
|
||||||
|
expect(article.get('acceptor')).toBeDefined()
|
||||||
done()
|
done()
|
||||||
|
|
||||||
it 'keeps track of amount of submitted and accepted patches', (done) ->
|
it 'keeps track of amount of submitted and accepted patches', (done) ->
|
||||||
|
|
Reference in a new issue