Merge branch 'feature-routes' into development

Conflicts:
	libs/routes/api.js

libs/app.js

@@ -13,6 +13,9 @@ var config = require('./config')
 var log = require('./log')(module)
 
 var api = require('./routes/api')
+var states = require('./routes/states')
+var regions = require('./routes/regions')
+var cities = require('./routes/cities')
 
 var app = express()
 
@@ -23,6 +26,9 @@ app.use(cors())
 app.use(methodOverride())
 
 app.use('/api/v1/', api)
+app.use('/api/v1/states', states)
+app.use('/api/v1/regions', regions)
+app.use('/api/v1/cities', cities)
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next){

libs/routes/api.js

 var express = require('express')
 var router = express.Router()
-var xml = require('xml')
+
 var libs = process.cwd() + '/libs/'
 
 var log = require(libs + 'log')(module)
@@ -29,9 +29,9 @@ router.get('/year_range', function(req, res) {
 })
 
 router.get('/data', function(req, res) {
-    log.debug(req.query)
-    log.debug(req.query.met)
-    log.debug(req.query.dim)
+    console.log(req.query)
+    console.log(req.query.met)
+    console.log(req.query.dim)
     conn.query(
         'SELECT * FROM turmas'
     ).then(function(result) {

libs/routes/cities.js

+var express = require('express')
+var router = express.Router()
+
+var libs = process.cwd() + '/libs/'
+
+var log = require(libs + 'log')(module)
+var config = require(libs + 'config')
+
+var conn = require(libs + 'db/monet')
+
+router.get('/', function(req, res) {
+  conn.query(
+    'SELECT * FROM municipios', true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+
+})
+
+router.get('/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM regioes WHERE pk_municipio_id='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+router.get('/ibge/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM regioes WHERE codigo_ibge='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+router.get('/state/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM regioes WHERE fk_estado_id='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+module.exports = router

libs/routes/regions.js

+var express = require('express')
+var router = express.Router()
+
+var libs = process.cwd() + '/libs/'
+
+var log = require(libs + 'log')(module)
+var config = require(libs + 'config')
+
+var conn = require(libs + 'db/monet')
+
+router.get('/', function(req, res) {
+  conn.query(
+    'SELECT * FROM regioes', true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+
+})
+
+router.get('/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM regioes WHERE pk_regiao_id='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+module.exports = router

libs/routes/states.js

+var express = require('express')
+var router = express.Router()
+
+var libs = process.cwd() + '/libs/'
+
+var log = require(libs + 'log')(module)
+var config = require(libs + 'config')
+
+var conn = require(libs + 'db/monet')
+
+router.get('/', function(req, res) {
+  conn.query(
+    'SELECT * FROM estados', true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+
+})
+
+router.get('/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM estados WHERE pk_estado_id='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+router.get('/region/:id', function(req, res) {
+  conn.query(
+    'SELECT * FROM estados WHERE fk_regiao_id='+req.params.id, true
+  ).then(function(result) {
+    log.debug(result)
+    res.json({
+      result: result.data
+    })
+  })
+})
+
+module.exports = router