This repository has been archived by the owner on Feb 8, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 12
Modularity #28
Open
newbazz
wants to merge
10
commits into
felicity-iiith:master
Choose a base branch
from
newbazz:modularity
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Modularity #28
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c3cb092
relationship implemented in comment
b805b97
Merge https://github.com/felicity-iiith/contest-portal-backend
253f258
modularity added with getAll
ac614bb
getall removed
418b41f
name changed to camel case
a15df75
variable score implemented
a81f59a
mend
4748a24
mend
c8554c9
Fix #33 UserAnswer => Submission (#34)
sayak119 bf5d240
mend
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import Question from '../models/Question' | ||
import Comment from '../models/Comment' | ||
|
||
export async function addComment(ctx) { | ||
const { qno } = ctx.params | ||
const { user } = ctx.state | ||
const question = await Question.findOne({ | ||
where: { qno }, | ||
}) | ||
const questionid = question.id | ||
const userid = user.id | ||
await Comment.create({ questionId: questionid, userId: userid, comment: ctx.request.body.comment}) | ||
ctx.body = { response: ctx.request.body.comment } | ||
} | ||
export async function getAll(ctx) { | ||
const { qno } = ctx.params | ||
const question = await Question.findOne({ | ||
where: { qno }, | ||
}) | ||
const qid = question.id | ||
const comment = await Comment.findAll({ | ||
where: { | ||
questionId: qid | ||
}, | ||
}) | ||
ctx.body = { response: comment } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import koaRouter from 'koa-joi-router'; | ||
|
||
import * as ctrlc from '../controllers/comment'; | ||
|
||
import { isAuthenticated } from '../middleware/auth' | ||
|
||
const Joi = koaRouter.Joi; | ||
const router = koaRouter(); | ||
router.prefix('/api/comments') | ||
|
||
const routes = [ | ||
{ | ||
method: 'post', | ||
path: '/:qno', | ||
handler: [ isAuthenticated, ctrlc.addComment ], | ||
validate: { | ||
params: { | ||
qno: Joi.number() | ||
}, | ||
type: 'form', | ||
body: { | ||
comment: Joi.string(), | ||
} | ||
} | ||
}, | ||
{ | ||
method: 'get', | ||
path: '/:qno', | ||
handler: [ isAuthenticated, ctrlc.getAll ], | ||
validate: { | ||
params: { | ||
qno: Joi.number() | ||
}, | ||
} | ||
}, | ||
]; | ||
|
||
router.route(routes); | ||
export default router |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not put this second condition
&& (ctx.body.answer in answers)
, as we would like to send the response as Already attempted irrespective of whether the current answer is right or wrong