Skip to content

Commit 01fb743

Browse files
championswimmerchampionswimmer
committed
fix seeding
Signed-off-by: Arnav Gupta <arnav@codingblocks.com>
1 parent c026325 commit 01fb743

File tree

16 files changed

+67
-39
lines changed

16 files changed

+67
-39
lines changed

‎build_docker.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ VERSION=$(node -p -e "require('./package.json').version")
55
npm install -D
66
npm run build
77

8-
docker build -t codingblocks/judge-api:$VERSION .
8+
docker build -t codingblocks/judge-api:$VERSION -t codingblocks/judge-api .
99
docker system prune -f
1010

1111
read -p "Push to Docker? [Press Enter to continue]"
12-
docker push codingblocks/judge-api:$VERSION
12+
docker push codingblocks/judge-api:$VERSION
13+
docker push codingblocks/judge-api

‎dist/db/models.js

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/db/models.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/db/scripts/seed-defaultlangs.js

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/db/scripts/seed-defaultlangs.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/routes/api/run.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/routes/api/run.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/run.js

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/run.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/validators/SubmissionValidators.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/validators/SubmissionValidators.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/db/models.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ const ApiKeys = db.define('apikeys', {
6666

6767
Submissions.belongsTo(ApiKeys)
6868

69-
db.sync({})
70-
.then(() => debug('Database Synced'))
71-
.catch((err) => console.error(err))
72-
7369
export {
7470
Langs, Submissions, ApiKeys, db
7571
}

‎src/db/scripts/seed-defaultlangs.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
import {db, Langs, LangsAttributes} from '../models'
22

3-
Langs.bulkCreate(<LangsAttributes[]>[
4-
{ lang_slug: 'py2', lang_name: 'Python', lang_version: '2.7' },
5-
{ lang_slug: 'java8', lang_name: 'Java', lang_version: '1.8' },
6-
{ lang_slug: 'nodejs6', lang_name: 'NodeJS', lang_version: '6' },
7-
{ lang_slug: 'cpp', lang_name: 'C++', lang_version: '11' },
8-
{ lang_slug: 'c', lang_name: 'C', lang_version: '6' }
9-
]).then(() => {
10-
db.close()
11-
})
3+
db.sync()
4+
.then(() => Langs.sync({force:true}))
5+
.then(() =>
6+
Langs.bulkCreate(<LangsAttributes[]>[
7+
{ lang_slug: 'py2', lang_name: 'Python', lang_version: '2.7' },
8+
{ lang_slug: 'java8', lang_name: 'Java', lang_version: '1.8' },
9+
{ lang_slug: 'nodejs6', lang_name: 'NodeJS', lang_version: '6' },
10+
{ lang_slug: 'cpp', lang_name: 'C++', lang_version: '11' },
11+
{ lang_slug: 'c', lang_name: 'C', lang_version: '6' }
12+
]))
13+
.finally(() => {
14+
try {
15+
db.close()
16+
} catch (e) {
17+
18+
}
19+
})
1220

‎src/routes/api/run.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ route.post('/', (req, res, next) => {
5555
if (invalidRequest) {
5656
return res.status(501).json({
5757
code: 501,
58-
message: 'Invalid run request',
59-
err: invalidRequest
58+
message: (<Error>invalidRequest).message,
59+
err: (<Error>invalidRequest).stack
6060
})
6161
}
6262
Submissions.create(<SubmissionAttributes>{

‎src/run.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import app, {config} from './server'
22
import * as debug from 'debug'
3+
import {db} from './db/models'
4+
5+
const log = debug('judge:api')
6+
7+
db.sync({})
8+
.then(() => {
9+
log('Database Synced')
10+
app.listen(config.PORT, () => {
11+
log(`Server started on http://localhost:${config.PORT}`)
12+
})
13+
})
14+
.catch((err) => console.error(err))
315

4-
app.listen(config.PORT, () => {
5-
debug('server:run')(`Server started on http://localhost:${config.PORT}`)
6-
})

‎src/validators/SubmissionValidators.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {Request} from 'express'
22

3-
export function isInvalidRunRequest(req: Request): Error | void {
3+
export function isInvalidRunRequest(req: Request): Error | boolean {
44
// TODO: Validate parameters of submission request (like source should be url)
55

6-
if (!req.body.lang || (typeof req.body.lang === 'string')) {
6+
if (!req.body.lang || (typeof req.body.lang !== 'string')) {
77
return new Error('Invalid Language')
88
}
99
if (!req.body.source) {
@@ -12,4 +12,6 @@ export function isInvalidRunRequest(req: Request): Error | void {
1212
if (!req.body.stdin) {
1313
req.body.stdin = ''
1414
}
15+
16+
return false
1517
}

0 commit comments

Comments
 (0)