Browse Source

Fix code to pass code review

pull/341/head
Hironsan 5 years ago
parent
commit
231cc5facd
6 changed files with 29 additions and 29 deletions
  1. 26
      frontend/api/routes/docs.js
  2. 8
      frontend/api/routes/labels.js
  3. 10
      frontend/api/routes/members.js
  4. 10
      frontend/api/routes/projects.js
  5. 2
      frontend/api/routes/stats.js
  6. 2
      frontend/api/routes/users.js

26
frontend/api/routes/docs.js

@ -42,7 +42,7 @@ router.get('/download', (req, res) => {
// Update a document partially.
router.patch('/:docId', (req, res) => {
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId))
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId, 10))
if (docIndex !== -1) {
Object.assign(db.results[docIndex], req.body)
res.json(db.results[docIndex])
@ -53,7 +53,7 @@ router.patch('/:docId', (req, res) => {
// Get a doc.
router.get('/:docId', (req, res) => {
const doc = db.results.find(item => item.id === parseInt(req.params.docId))
const doc = db.results.find(item => item.id === parseInt(req.params.docId, 10))
if (doc) {
res.json(doc)
} else {
@ -63,7 +63,7 @@ router.get('/:docId', (req, res) => {
// Update a doc.
router.put('/:docId', (req, res) => {
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId))
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId, 10))
if (docIndex !== -1) {
db.results[docIndex] = req.body
res.json(db.results[docIndex])
@ -74,9 +74,9 @@ router.put('/:docId', (req, res) => {
// Delete a doc.
router.delete('/:docId', (req, res, next) => {
const doc = db.results.find(item => item.id === parseInt(req.params.docId))
const doc = db.results.find(item => item.id === parseInt(req.params.docId, 10))
if (doc) {
db.results = db.results.filter(item => item.id !== parseInt(req.params.docId))
db.results = db.results.filter(item => item.id !== parseInt(req.params.docId, 10))
res.json(doc)
} else {
res.status(404).json({ detail: 'Not found.' })
@ -85,7 +85,7 @@ router.delete('/:docId', (req, res, next) => {
// Add an annotation.
router.post('/:docId/annotations', (req, res, next) => {
const doc = db.results.find(item => item.id === parseInt(req.params.docId))
const doc = db.results.find(item => item.id === parseInt(req.params.docId, 10))
if (doc) {
const annotation = {
id: Math.floor(Math.random() * 10000),
@ -93,7 +93,7 @@ router.post('/:docId/annotations', (req, res, next) => {
start_offset: req.body.start_offset,
end_offset: req.body.end_offset,
user: 1,
document: parseInt(req.params.docId),
document: parseInt(req.params.docId, 10),
text: req.body.text
}
doc.annotations.push(annotation)
@ -105,11 +105,11 @@ router.post('/:docId/annotations', (req, res, next) => {
// Delete an annotation.
router.delete('/:docId/annotations/:annotationId', (req, res, next) => {
const doc = db.results.find(item => item.id === parseInt(req.params.docId))
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId))
const doc = db.results.find(item => item.id === parseInt(req.params.docId, 10))
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId, 10))
if (doc) {
const annotation = doc.annotations.find(item => item.id === parseInt(req.params.annotationId))
doc.annotations = doc.annotations.filter(item => item.id !== parseInt(req.params.annotationId))
const annotation = doc.annotations.find(item => item.id === parseInt(req.params.annotationId, 10))
doc.annotations = doc.annotations.filter(item => item.id !== parseInt(req.params.annotationId, 10))
db.results[docIndex] = doc
res.json(annotation)
} else {
@ -119,10 +119,10 @@ router.delete('/:docId/annotations/:annotationId', (req, res, next) => {
// Update an annotation.
router.patch('/:docId/annotations/:annotationId', (req, res, next) => {
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId))
const docIndex = db.results.findIndex(item => item.id === parseInt(req.params.docId, 10))
if (docIndex !== -1) {
const doc = db.results[docIndex]
const annotationIndex = doc.annotations.findIndex(item => item.id === parseInt(req.params.annotationId))
const annotationIndex = doc.annotations.findIndex(item => item.id === parseInt(req.params.annotationId, 10))
Object.assign(db.results[docIndex].annotations[annotationIndex], req.body)
res.json(db.results[docIndex].annotations[annotationIndex])
} else {

8
frontend/api/routes/labels.js

@ -29,7 +29,7 @@ router.post('/', (req, res) => {
// Get a label.
router.get('/:labelId', (req, res) => {
const label = db.find(item => item.id === parseInt(req.params.labelId))
const label = db.find(item => item.id === parseInt(req.params.labelId, 10))
if (label) {
res.json(label)
} else {
@ -39,7 +39,7 @@ router.get('/:labelId', (req, res) => {
// Update a label.
router.patch('/:labelId', (req, res) => {
const labelIndex = db.findIndex(item => item.id === parseInt(req.params.labelId))
const labelIndex = db.findIndex(item => item.id === parseInt(req.params.labelId, 10))
if (labelIndex !== -1) {
// db[labelIndex] = req.body
Object.assign(db[labelIndex], req.body)
@ -51,9 +51,9 @@ router.patch('/:labelId', (req, res) => {
// Delete a label.
router.delete('/:labelId', (req, res, next) => {
const label = db.find(item => item.id === parseInt(req.params.labelId))
const label = db.find(item => item.id === parseInt(req.params.labelId, 10))
if (label) {
db = db.filter(item => item.id !== parseInt(req.params.labelId))
db = db.filter(item => item.id !== parseInt(req.params.labelId, 10))
res.json(label)
} else {
res.status(404).json({ detail: 'Not found.' })

10
frontend/api/routes/members.js

@ -19,7 +19,7 @@ router.get('/', (req, res) => {
// Add a project user.
router.post('/', (req, res) => {
const user = users.find(item => item.id === parseInt(req.body.id))
const user = users.find(item => item.id === parseInt(req.body.id, 10))
const member = {
...user,
role: req.body.role
@ -30,7 +30,7 @@ router.post('/', (req, res) => {
// Update a project user.
router.put('/:userId', (req, res) => {
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.userId))
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.userId, 10))
if (projectIndex !== -1) {
db[projectIndex] = req.body
res.json(db[projectIndex])
@ -41,7 +41,7 @@ router.put('/:userId', (req, res) => {
// Partially update a project user.
router.patch('/:userId', (req, res) => {
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.userId))
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.userId, 10))
if (projectIndex !== -1) {
db[projectIndex].role = req.body.role
res.json(db[projectIndex])
@ -52,9 +52,9 @@ router.patch('/:userId', (req, res) => {
// Delete a project user.
router.delete('/:userId', (req, res, next) => {
const project = db.find(item => item.id === parseInt(req.params.userId))
const project = db.find(item => item.id === parseInt(req.params.userId, 10))
if (project) {
db = db.filter(item => item.id !== parseInt(req.params.userId))
db = db.filter(item => item.id !== parseInt(req.params.userId, 10))
res.json(project)
} else {
res.status(404).json({ detail: 'Not found.' })

10
frontend/api/routes/projects.js

@ -35,7 +35,7 @@ router.post('/', (req, res) => {
// Get a project.
router.get('/:projectId', (req, res) => {
const project = db.find(item => item.id === parseInt(req.params.projectId))
const project = db.find(item => item.id === parseInt(req.params.projectId, 10))
if (project) {
res.json(project)
} else {
@ -45,7 +45,7 @@ router.get('/:projectId', (req, res) => {
// Update a project.
router.put('/:projectId', (req, res) => {
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.projectId))
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.projectId, 10))
if (projectIndex !== -1) {
db[projectIndex] = req.body
res.json(db[projectIndex])
@ -56,7 +56,7 @@ router.put('/:projectId', (req, res) => {
// Partially update a project user.
router.patch('/:projectId', (req, res) => {
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.projectId))
const projectIndex = db.findIndex(item => item.id === parseInt(req.params.projectId, 10))
if (projectIndex !== -1) {
Object.assign(db[projectIndex], req.body)
res.json(db[projectIndex])
@ -67,9 +67,9 @@ router.patch('/:projectId', (req, res) => {
// Delete a project.
router.delete('/:projectId', (req, res, next) => {
const project = db.find(item => item.id === parseInt(req.params.projectId))
const project = db.find(item => item.id === parseInt(req.params.projectId, 10))
if (project) {
db = db.filter(item => item.id !== parseInt(req.params.projectId))
db = db.filter(item => item.id !== parseInt(req.params.projectId, 10))
res.json(project)
} else {
res.status(404).json({ detail: 'Not found.' })

2
frontend/api/routes/stats.js

@ -1,7 +1,7 @@
const fs = require('fs')
const express = require('express')
const router = express.Router()
let db = JSON.parse(fs.readFileSync('./api/db/stats.json', 'utf8'))
const db = JSON.parse(fs.readFileSync('./api/db/stats.json', 'utf8'))
// Get statistics.
router.get('/', (req, res) => {

2
frontend/api/routes/users.js

@ -15,7 +15,7 @@ router.get('/', (req, res) => {
// Get a user.
router.get('/:userId', (req, res) => {
const user = db.find(item => item.id === parseInt(req.params.userId))
const user = db.find(item => item.id === parseInt(req.params.userId, 10))
if (user) {
res.json(user)
} else {

Loading…
Cancel
Save