diff --git a/package.json b/package.json index 7247d99..f1dc6aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "volp", "version": "1.0.0", - "description": "Visual Online Language Processor", + "description": "Open Travel Mapper", "main": "server.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "git@git.helcel.net:sora/volp.git" + "url": "git@git.helcel.net:sora/otm.git" }, "author": "", "license": "ISC", diff --git a/router/api.js b/router/api.js index fd3927b..5dd6277 100644 --- a/router/api.js +++ b/router/api.js @@ -1,7 +1,5 @@ -const crypto = require('crypto'); const axios = require('axios'); - module.exports = (fastify, opts, done) => { fastify.get('/flight/:id', async (req,reply) => { const ENDPOINT = 'https://www.flightradar24.com/v1/search/web/find'; @@ -20,50 +18,50 @@ module.exports = (fastify, opts, done) => { } }); - fastify.get('/:id', (req, reply) => { + fastify.get('/:id', async (req, reply) => { if(req.params.id == undefined){ - reply.code(400).send({error:"No ID query parameter"}); - } else { - fastify.level.get(req.params.id, (err, val) => { - if(err){ - console.warn(err); - reply.send({name:"New Journey", main:[]}); - } else { - reply.send(JSON.parse(val)); - } - }); + return reply.code(400).send({error:"No ID query parameter"}); } + + return fastify.level.db.get(req.params.id, (err, val) => { + if(err){ + console.warn(err); + reply.send({name:"New Journey", main:[]}); + } else { + reply.send(JSON.parse(val)); + } + }); }); - fastify.post('/:id', (req, reply) => { + fastify.post('/:id', async (req, reply) => { if(req.params.id == undefined){ - reply.code(400).send({error:"No ID query parameter"}); - } else { - fastify.level.put(req.params.id, JSON.stringify(req.body), (err) => { - if(err){ - console.warn(err); - reply.code(500).send({error:"Error with DB"}); - } else { - reply.send({content:"ok"}); - } - }); + return reply.code(400).send({error:"No ID query parameter"}); } + + return fastify.level.db.put(req.params.id, JSON.stringify(req.body), (err) => { + if(err){ + console.warn(err); + reply.code(500).send({error:"Error with DB"}); + } else { + reply.send({content:"ok"}); + } + }); }); - fastify.delete('/:id',(req, reply) => { - if(req.params.id == undefined){ - reply.code(400).send({error:"No ID query parameter"}); - } else { - fastify.level.delete(req.params.id,(err) => { - if(err){ - console.warn(err); - reply.code(500).send({error:"Error with DB"}); - } else { - reply.send({content:"ok"}); - } - }); - } - }); + // fastify.delete('/:id',(req, reply) => { + // if(req.params.id == undefined){ + // reply.code(400).send({error:"No ID query parameter"}); + // } else { + // fastify.level.delete(req.params.id,(err) => { + // if(err){ + // console.warn(err); + // reply.code(500).send({error:"Error with DB"}); + // } else { + // reply.send({content:"ok"}); + // } + // }); + // } + // }); diff --git a/server.js b/server.js index 1aa2775..e462860 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,5 @@ const fastify = require('fastify')();//{ logger: true }); const path = require('path'); -const crypto = require('crypto'); const csass = require("./compile_sass").compileSassMain();