diff --git a/gulpfile.babel.js b/gulpfile.babel.js deleted file mode 100644 index 10a79259259599fffb7209ce6c131286a3c17d80..0000000000000000000000000000000000000000 --- a/gulpfile.babel.js +++ /dev/null @@ -1,111 +0,0 @@ -require('babel-core/register'); - -const gulp = require('gulp'); - -const babel = require('gulp-babel'); - -const eslint = require('gulp-eslint'); - -const mocha = require('gulp-mocha'); - -const istanbul = require('gulp-istanbul'); - -const nodemon = require('gulp-nodemon'); - -const Cache = require('gulp-file-cache'); - -const docco = require('gulp-docco'); - -const mkdirp = require('mkdirp'); - -const cache = new Cache(); - -function createLogDir() { - const logDirPath = 'build/logs'; - mkdirp(logDirPath, (err) => { - if(err) console.error(err); - }); -} - -gulp.task('lint', () => { - // run ESLint - gulp.src('src/**/*.js') - .pipe(eslint()) - .pipe(eslint.format()); -}) - -/** -* Compile source files -*/ -gulp.task('compile', ['lint'], () => { - - // compile source to ES5 - gulp.src('src/**/*.js') - .pipe(cache.filter()) // cache source files - .pipe(babel()) // compile only modified files - .pipe(cache.cache()) // cache compiled files - .pipe(gulp.dest('build')); // move compiled files to build directory -}); - -gulp.task('build', ['compile'], () => { - var filesToCopy = [ 'config.json', 'package.json', '.eslintignore', '.eslintrc.json' ]; - // copy configuration file to build directory - gulp.src(filesToCopy) - .pipe(gulp.dest('build')); - - createLogDir(); -}); - -gulp.task('docco', () => { - gulp.src('./src/**/*.js') - .pipe(docco()) - .pipe(gulp.dest('./docs')); -}); - -gulp.task('doc', ['docco']); - -gulp.task('pre-test', () => { - return gulp.src(['build/**/*.js', '!build/{test,test/**}']) - .pipe(istanbul()) - .pipe(istanbul.hookRequire()); -}); - -gulp.task('test', ['pre-test'], () => { - process.chdir('build'); - gulp.src(['test/**/*.js'], {read: false}) - .pipe(mocha({timeout: 60000})) - .pipe(istanbul.writeReports()) - .pipe(istanbul.enforceThresholds({ - thresholds: { - global: { - statements: 80, - branches: 70, - lines: 80, - functions: 80 - } - } - })) - .on('error', () => { - process.exit(1); - }) - .on('end', () => { - process.exit(); - }); -}); - -gulp.task('watch', () => { - console.log('Watching source directory for changes'); - return gulp.watch('src/**/*.js').on('change', () => { - console.log('Recompiling source'); - gulp.start('compile'); - console.log('Source recompilation done'); - }); -}); - -gulp.task('default', () => { - console.log("Não execuatar apenas gulp, execute da forma:"); - console.log("\t\tgulp <task>"); -}); - -gulp.task('default', ['run']); - diff --git a/src/libs/routes_v1/superiorEducationConclusionTax.js b/src/libs/routes_v1/superiorEducationConclusionTax.js index d345b2309c3ac627dcac6bc6742e001de287e169..3b038a922c98558579acfabe16759b17abf42d45 100644 --- a/src/libs/routes_v1/superiorEducationConclusionTax.js +++ b/src/libs/routes_v1/superiorEducationConclusionTax.js @@ -111,7 +111,7 @@ superiorEducationConclusionTaxApp.get('/region', (req, res, next) => { next(); }, response('region')); -superiorEducationConclusionTaxApp.get('/cap_code_pnad', (req, res, next) => { +superiorEducationConclusionTaxApp.get('/cap_code', (req, res, next) => { req.result = [] for (let i = 11; i < 54; i++) { if (id2str.capitalCode(i) !== 'Não informado') { @@ -121,7 +121,7 @@ superiorEducationConclusionTaxApp.get('/cap_code_pnad', (req, res, next) => { } } next(); -}, response('cap_code_pnad')); +}, response('cap_code')); superiorEducationConclusionTaxApp.get('/metro_code', (req, res, next) => { req.result = [] @@ -443,10 +443,10 @@ rqf.addField({ field: 'sexo' } }).addValue({ - name: 'cap_code_pnad', + name: 'cap_code', table: 'pnad_novo', tableField: 'cod_cap', - resultField: 'cap_code_pnad_id', + resultField: 'cap_code_id', where: { relation: '=', type: 'integer', @@ -579,7 +579,7 @@ function whereCondition(req) { let filterId; //const filters = req.query.filter.split(","); const dims = req.query.dims; - if (dims && dims.includes("cap_code_pnad")){ + if (dims && dims.includes("cap_code")){ where += `pnad_novo.cod_cap <> 99`; } if (dims && dims.includes("income_range")){