Changed folder structure to reflect application functionallity. Renamed files using hyphens instead of underscore to have a more consistent naming across the whole project

Makefile

@@ -11,7 +11,7 @@ check:
 
 jshint:
 	@echo "***jshint***"
-	@./node_modules/.bin/jshint app/ batch/ test/ app.js
+	@./node_modules/.bin/jshint lib/ test/ app.js
 
 TEST_SUITE := $(shell find test/{unit,integration,acceptance} -name "*.js")
 TEST_SUITE_UNIT := $(shell find test/unit -name "*.js")

app.js

@@ -77,7 +77,8 @@ if (!global.settings.routes) {
 
 const version = require("./package").version;
 
-const StatsClient = require('./app/stats/client');
+const StatsClient = require('./lib/stats/client');
+
 if (global.settings.statsd) {
     // Perform keyword substitution in statsd
     if (global.settings.statsd.prefix) {
@@ -86,7 +87,7 @@ if (global.settings.statsd) {
 }
 const statsClient = StatsClient.getInstance(global.settings.statsd);
 
-const createServer = require('./app/server');
+const createServer = require('./lib/server');
 
 const server = createServer(statsClient);
 const listener = server.listen(global.settings.node_port, global.settings.node_host);

lib/api/api-router.js

@@ -2,19 +2,19 @@
 
 const { Router: router } = require('express');
 
-const SqlRouter = require('./sql-router');
+const SqlRouter = require('./sql/sql-router');
 
-const HealthCheckController = require('./health_check_controller');
+const HealthCheckController = require('./health-check-controller');
-const VersionController = require('./version_controller');
+const VersionController = require('./version-controller');
-const JobsWipController = require('./jobs_wip_controller');
+const JobsWipController = require('./jobs-wip-controller');
 
-const BatchLogger = require('../../batch/batch-logger');
+const BatchLogger = require('../batch/batch-logger');
 
-const JobPublisher = require('../../batch/pubsub/job-publisher');
+const JobPublisher = require('../batch/pubsub/job-publisher');
-const JobQueue = require('../../batch/job_queue');
+const JobQueue = require('../batch/job-queue');
-const JobBackend = require('../../batch/job_backend');
+const JobBackend = require('../batch/job-backend');
-const JobCanceller = require('../../batch/job_canceller');
+const JobCanceller = require('../batch/job-canceller');
-const JobService = require('../../batch/job_service');
+const JobService = require('../batch/job-service');
 
 module.exports = class ApiRouter {
     constructor ({ redisPool, metadataBackend, statsClient, dataIngestionLogger }) {

lib/api/health-check-controller.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const HealthCheckBackend = require('../monitoring/health_check');
+const HealthCheckBackend = require('../monitoring/health-check');
 
 module.exports = class HealthCheckController {
     constructor () {

lib/api/jobs-wip-controller.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const bodyParserMiddleware = require('../middlewares/body-parser');
+const bodyParserMiddleware = require('./middlewares/body-parser');
-const errorMiddleware = require('../middlewares/error');
+const errorMiddleware = require('./middlewares/error');
 
 module.exports = class JobsWipController {
     constructor ({ jobService }) {

lib/api/middlewares/access-validator.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const pgEntitiesAccessValidator = require('../services/pg-entities-access-validator');
+const pgEntitiesAccessValidator = require('../../services/pg-entities-access-validator');
 
 module.exports = function accessValidator () {
     return function accessValidatorMiddleware (req, res, next) {

lib/api/middlewares/authorization.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const AuthApi = require('../auth/auth_api');
+const AuthApi = require('../../auth/auth-api');
 const basicAuth = require('basic-auth');
 
 module.exports = function authorization (metadataBackend, forceToBeMaster = false) {

lib/api/middlewares/content.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const getContentDisposition = require('../utils/content_disposition');
+const getContentDisposition = require('../../utils/content-disposition');
 
 module.exports = function content () {
     return function contentMiddleware (req, res, next) {

lib/api/middlewares/error.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const errorHandlerFactory = require('../services/error_handler_factory');
+const errorHandlerFactory = require('../../services/error-handler-factory');
-const { stringifyForLogs } = require('../utils/logs');
+const { stringifyForLogs } = require('../../utils/logs');
 const MAX_ERROR_STRING_LENGTH = 1024;
 
 module.exports = function error() {

lib/api/middlewares/formatter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const formats = require('../models/formats');
+const formats = require('../../models/formats');
 
 module.exports =  function formatter () {
     return function formatterMiddleware (req, res, next) {

lib/api/middlewares/log.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { stringifyForLogs } = require('../utils/logs');
+const { stringifyForLogs } = require('../../utils/logs');
 
 const MAX_SQL_LENGTH = (global.settings.logQueries && global.settings.maxQueriesLogLength) || 1024;
 

lib/api/middlewares/params.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const sanitizeFilename = require('../utils/filename_sanitizer');
+const sanitizeFilename = require('../../utils/filename-sanitizer');
-const formats = require('../models/formats');
+const formats = require('../../models/formats');
 
 module.exports = function params ({ strategy = 'query' } = {}) {
     const getParams = getParamsFromStrategy(strategy);

lib/api/middlewares/profiler.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Profiler = require('../stats/profiler-proxy');
+const Profiler = require('../../stats/profiler-proxy');
 
 module.exports = function profiler ({ statsClient }) {
     return function profilerMiddleware (req, res, next) {

lib/api/middlewares/query-may-write.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const queryMayWrite = require('../utils/query_may_write');
+const queryMayWrite = require('../../utils/query-may-write');
 
 module.exports = function mayWrite () {
     return function mayWriteMiddleware (req, res, next) {

lib/api/middlewares/user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const CdbRequest = require('../models/cartodb_request');
+const CdbRequest = require('../../models/cartodb-request');
 
 module.exports = function user(metadataBackend) {
     const cdbRequest = new CdbRequest();

lib/api/sql/copy-controller.js

@@ -8,10 +8,10 @@ const { initializeProfilerMiddleware } = require('../middlewares/profiler');
 const rateLimitsMiddleware = require('../middlewares/rate-limit');
 const dbQuotaMiddleware = require('../middlewares/db-quota');
 const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitsMiddleware;
-const errorHandlerFactory = require('../services/error_handler_factory');
+const errorHandlerFactory = require('../../services/error-handler-factory');
-const StreamCopy = require('../services/stream_copy');
+const StreamCopy = require('../../services/stream-copy');
-const StreamCopyMetrics = require('../services/stream_copy_metrics');
+const StreamCopyMetrics = require('../../services/stream-copy-metrics');
-const Throttler = require('../services/throttler-stream');
+const Throttler = require('../../services/throttler-stream');
 const zlib = require('zlib');
 const { PassThrough } = require('stream');
 const params = require('../middlewares/params');

lib/api/sql/sql-router.js

@@ -2,8 +2,8 @@
 
 const { Router: router } = require('express');
 
-const UserDatabaseService = require('../services/user_database_service');
+const UserDatabaseService = require('../../services/user-database-service');
-const UserLimitsService = require('../services/user_limits');
+const UserLimitsService = require('../../services/user-limits');
 
 const socketTimeout = require('../middlewares/socket-timeout');
 const logger = require('../middlewares/logger');
@@ -11,9 +11,9 @@ const profiler = require('../middlewares/profiler');
 const cors = require('../middlewares/cors');
 const servedByHostHeader = require('../middlewares/served-by-host-header');
 
-const QueryController = require('./query_controller');
+const QueryController = require('./query-controller');
-const CopyController = require('./copy_controller');
+const CopyController = require('./copy-controller');
-const JobController = require('./job_controller');
+const JobController = require('./job-controller');
 
 module.exports = class SqlRouter {
     constructor ({ routes, metadataBackend, statsClient, dataIngestionLogger, jobService }) {

lib/auth/oauth.js

@@ -4,7 +4,7 @@
 var _ = require('underscore');
 var OAuthUtil = require('oauth-client');
 var step = require('step');
-var CdbRequest = require('../models/cartodb_request');
+var CdbRequest = require('../models/cartodb-request');
 var cdbReq = new CdbRequest();
 
 var oAuth = (function(){

lib/batch/batch-logger.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Logger = require('../app/services/logger');
+const Logger = require('../services/logger');
 
 class BatchLogger extends Logger {
     constructor (path, name) {
@@ -10,7 +10,6 @@ class BatchLogger extends Logger {
     log (job) {
         return job.log(this.logger);
     }
-
 }
 
 module.exports = BatchLogger;

lib/batch/index.js

@@ -1,14 +1,14 @@
 'use strict';
 
-var JobRunner = require('./job_runner');
+var JobRunner = require('./job-runner');
-var QueryRunner = require('./query_runner');
+var QueryRunner = require('./query-runner');
-var JobCanceller = require('./job_canceller');
+var JobCanceller = require('./job-canceller');
 var JobSubscriber = require('./pubsub/job-subscriber');
-var UserDatabaseMetadataService = require('./user_database_metadata_service');
+var UserDatabaseMetadataService = require('./user-database-metadata-service');
 var JobPublisher = require('./pubsub/job-publisher');
-var JobQueue = require('./job_queue');
+var JobQueue = require('./job-queue');
-var JobBackend = require('./job_backend');
+var JobBackend = require('./job-backend');
-var JobService = require('./job_service');
+var JobService = require('./job-service');
 var BatchLogger = require('./batch-logger');
 var Batch = require('./batch');
 

lib/batch/job-backend.js

@@ -2,7 +2,7 @@
 
 var REDIS_PREFIX = 'batch:jobs:';
 var REDIS_DB = 5;
-var JobStatus = require('./job_status');
+var JobStatus = require('./job-status');
 var queue = require('queue-async');
 
 function JobBackend(metadataBackend, jobQueue, logger) {

lib/batch/job-runner.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var errorCodes = require('../app/postgresql/error_codes').codeToCondition;
+var errorCodes = require('../postgresql/error-codes').codeToCondition;
-var jobStatus = require('./job_status');
+var jobStatus = require('./job-status');
 var Profiler = require('step-profiler');
 var _ = require('underscore');
 

lib/batch/job-service.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var JobFactory = require('./models/job_factory');
+var JobFactory = require('./models/job-factory');
-var jobStatus = require('./job_status');
+var jobStatus = require('./job-status');
 
 function JobService(jobBackend, jobCanceller, logger) {
     this.jobBackend = jobBackend;

lib/batch/models/job-base.js

@@ -2,8 +2,8 @@
 
 var util = require('util');
 var uuid = require('node-uuid');
-var JobStateMachine = require('./job_state_machine');
+var JobStateMachine = require('./job-state-machine');
-var jobStatus = require('../job_status');
+var jobStatus = require('../job-status');
 var mandatoryProperties = [
     'job_id',
     'status',

lib/batch/models/job-factory.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var JobSimple = require('./job_simple');
+var JobSimple = require('./job-simple');
-var JobMultiple = require('./job_multiple');
+var JobMultiple = require('./job-multiple');
-var JobFallback = require('./job_fallback');
+var JobFallback = require('./job-fallback');
 
 var Models = [ JobSimple, JobMultiple, JobFallback ];
 

lib/batch/models/job-fallback.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var util = require('util');
-var JobBase = require('./job_base');
+var JobBase = require('./job-base');
-var JobStatus = require('../job_status');
+var JobStatus = require('../job-status');
-var QueryFallback = require('./query/query_fallback');
+var QueryFallback = require('./query/query-fallback');
-var MainFallback = require('./query/main_fallback');
+var MainFallback = require('./query/main-fallback');
-var QueryFactory = require('./query/query_factory');
+var QueryFactory = require('./query/query-factory');
 
 function JobFallback(jobDefinition) {
     JobBase.call(this, jobDefinition);

lib/batch/models/job-multiple.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var util = require('util');
-var JobBase = require('./job_base');
+var JobBase = require('./job-base');
-var jobStatus = require('../job_status');
+var jobStatus = require('../job-status');
 
 function JobMultiple(jobDefinition) {
     JobBase.call(this, jobDefinition);

lib/batch/models/job-simple.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var util = require('util');
-var JobBase = require('./job_base');
+var JobBase = require('./job-base');
-var jobStatus = require('../job_status');
+var jobStatus = require('../job-status');
 
 function JobSimple(jobDefinition) {
     JobBase.call(this, jobDefinition);

lib/batch/models/job-state-machine.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var JobStatus = require('../job_status');
+var JobStatus = require('../job-status');
 var validStatusTransitions = [
     [JobStatus.PENDING, JobStatus.RUNNING],
     [JobStatus.PENDING, JobStatus.CANCELLED],

lib/batch/models/query/fallback.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var util = require('util');
-var QueryBase = require('./query_base');
+var QueryBase = require('./query-base');
-var jobStatus = require('../../job_status');
+var jobStatus = require('../../job-status');
 
 function Fallback(index) {
     QueryBase.call(this, index);

lib/batch/models/query/main-fallback.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var util = require('util');
-var QueryBase = require('./query_base');
+var QueryBase = require('./query-base');
-var jobStatus = require('../../job_status');
+var jobStatus = require('../../job-status');
 
 function MainFallback() {
     QueryBase.call(this);

lib/batch/models/query/query-base.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var util = require('util');
-var JobStateMachine = require('../job_state_machine');
+var JobStateMachine = require('../job-state-machine');
 
 function QueryBase(index) {
     JobStateMachine.call(this);

lib/batch/models/query/query-factory.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var QueryFallback = require('./query_fallback');
+var QueryFallback = require('./query-fallback');
 
 function QueryFactory() {
 }

lib/batch/models/query/query-fallback.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var util = require('util');
-var QueryBase = require('./query_base');
+var QueryBase = require('./query-base');
 var Query = require('./query');
 var Fallback = require('./fallback');
-var jobStatus = require('../../job_status');
+var jobStatus = require('../../job-status');
 
 function QueryFallback(job, index) {
     QueryBase.call(this, index);

lib/batch/models/query/query.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var util = require('util');
-var QueryBase = require('./query_base');
+var QueryBase = require('./query-base');
-var jobStatus = require('../../job_status');
+var jobStatus = require('../../job-status');
 
 function Query(index) {
     QueryBase.call(this, index);

lib/models/formats/pg/arraybuffer.js

@@ -3,7 +3,7 @@
 var _ = require('underscore');
 
 var Pg  = require('./../pg');
-var ArrayBufferSer = require("../../bin_encoder");
+var ArrayBufferSer = require("../../bin-encoder");
 
 function BinaryFormat() {}
 

lib/models/formats/pg/geojson.js

@@ -3,7 +3,7 @@
 var _ = require('underscore');
 
 var Pg = require('./../pg');
-const errorHandlerFactory = require('../../../services/error_handler_factory');
+const errorHandlerFactory = require('../../../services/error-handler-factory');
 
 function GeoJsonFormat() {
     this.buffer = '';

lib/models/formats/pg/json.js

@@ -3,7 +3,7 @@
 var _ = require('underscore');
 
 var Pg  = require('./../pg');
-const errorHandlerFactory = require('../../../services/error_handler_factory');
+const errorHandlerFactory = require('../../../services/error-handler-factory');
 
 function JsonFormat() {
     this.buffer = '';

lib/models/formats/pg/topojson.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// jshint ignore:start
+
 var Pg  = require('./../pg');
 var _ = require('underscore');
 var geojson = require('./geojson');
@@ -133,6 +135,6 @@ TopoJsonFormat.prototype.cancel = function() {
     }
 };
 
-
-
 module.exports = TopoJsonFormat;
+
+// jshint ignore:end

lib/server.js

@@ -6,14 +6,14 @@ const mkdirp = require('mkdirp');
 const RedisPool = require('redis-mpool');
 const cartodbRedis = require('cartodb-redis');
 const Logger = require('./services/logger');
-const ApiRouter = require('./controllers/api-router');
+const ApiRouter = require('./api/api-router');
-const batchFactory = require('../batch');
+const batchFactory = require('./batch');
 const getServerOptions = require('./server-options');
 
 process.env.PGAPPNAME = process.env.PGAPPNAME || 'cartodb_sqlapi';
 
 // override Date.toJSON
-require('./utils/date_to_json');
+require('./utils/date-to-json');
 
 // jshint maxcomplexity:9
 module.exports = function createServer (statsClient) {

lib/services/error-handler-factory.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const ErrorHandler = require('./error_handler');
+const ErrorHandler = require('./error-handler');
-const { codeToCondition } = require('../postgresql/error_codes');
+const { codeToCondition } = require('../postgresql/error-codes');
 
 module.exports = function ErrorHandlerFactory (err) {
     if (isTimeoutError(err)) {