eslint errors fixed

Author: tsmx

.eslintignore

@@ -0,0 +1,2 @@
+scripts/
+snippets/

.eslintrc.json

@@ -21,10 +21,6 @@
                 "SwitchCase": 1
             }
         ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
         "quotes": [
             "error",
             "single"

app.js

@@ -1,5 +1,4 @@
 const express = require('express');
-const logger = require('./utils/logging').logger;
 const routes = require('./routes/routes');
 
 var app = express();

controllers/masterDataController.js

@@ -3,24 +3,24 @@ var requestinfostring = require('../utils/logging').requestinfostring;
 var masterDataModel = require('../models/masterDataModel.js');
 
 exports.listAll = function (req, res) {
-	logger.info('masterData.listAll called ' + requestinfostring(req));
-	masterDataModel.find({})
-		.then(data => { res.json(data); })
-		.catch(err => { res.send(err); });
+    logger.info('masterData.listAll called ' + requestinfostring(req));
+    masterDataModel.find({})
+        .then(data => { res.json(data); })
+        .catch(err => { res.send(err); });
 };
 
 exports.getObjectById = function (req, res) {
-	logger.info('masterData.getObjectById called ' + requestinfostring(req));
-	masterDataModel.findById(req.params.id)
-		.then(data => { res.json(data); })
-		.catch(err => { res.send(err); });
+    logger.info('masterData.getObjectById called ' + requestinfostring(req));
+    masterDataModel.findById(req.params.id)
+        .then(data => { res.json(data); })
+        .catch(err => { res.send(err); });
 };
 
 exports.getChildrenById = function (req, res) {
-	logger.info('masterData.getChildrenById called ' + requestinfostring(req));
-	masterDataModel.findById(req.params.id, 'children')
-		.populate('children')
-		.exec()
-		.then(data => { res.json(data); })
-		.catch(err => { res.send(err); });
+    logger.info('masterData.getChildrenById called ' + requestinfostring(req));
+    masterDataModel.findById(req.params.id, 'children')
+        .populate('children')
+        .exec()
+        .then(data => { res.json(data); })
+        .catch(err => { res.send(err); });
 };

controllers/testDataController.js

@@ -2,18 +2,18 @@ var logger = require('../utils/logging').logger;
 var requestinfostring = require('../utils/logging').requestinfostring;
 
 exports.listAll = function (req, res) {
-	logger.info('testData.listAll called ' + requestinfostring(req));
-	res.json({ request: 'list all' });
+    logger.info('testData.listAll called ' + requestinfostring(req));
+    res.json({ request: 'list all' });
 };
 
 exports.getObjectById = function (req, res) {
-	logger.info('testData.getObjectById called ' + requestinfostring(req));
-	var id = req.params.id;
-	res.json({ request: 'get by ID ' + id });
+    logger.info('testData.getObjectById called ' + requestinfostring(req));
+    var id = req.params.id;
+    res.json({ request: 'get by ID ' + id });
 };
 
 exports.getObjectChildrenById = function (req, res) {
-	logger.info('testData.getObjectChildrenById called ' + requestinfostring(req));
-	var id = req.params.id;
-	res.json({ request: 'getChildren by ID ' + id });
+    logger.info('testData.getObjectChildrenById called ' + requestinfostring(req));
+    var id = req.params.id;
+    res.json({ request: 'getChildren by ID ' + id });
 };

models/masterDataModel.js

@@ -3,10 +3,10 @@ var mongoose = require('../utils/db.js').mongoose;
 // schema for master data objects
 var masterDataSchema = mongoose.Schema({
     _id: String,
-	name: String,
-	description: String,
-	parent: {type: String, ref: 'masterdata'},
-	children: [{type: String, ref: 'masterdata'}]
+    name: String,
+    description: String,
+    parent: { type: String, ref: 'masterdata' },
+    children: [{ type: String, ref: 'masterdata' }]
 });
 
 // compile & export the master data model

routes/routes.js

@@ -1,15 +1,15 @@
-module.exports = function(app) {
-  const testData = require('../controllers/testDataController');
-  const masterData = require('../controllers/masterDataController');
+module.exports = function (app) {
+    const testData = require('../controllers/testDataController');
+    const masterData = require('../controllers/masterDataController');
 
-  // some test routes
-  app.get('/test', testData.listAll);
-  app.get('/test/:id', testData.getObjectById);
-  app.get('/test/:id/children', testData.getObjectChildrenById);
-  
-  // master data routes
-  app.get('/masterdata', masterData.listAll);
-  app.get('/masterdata/:id', masterData.getObjectById);
-  app.get('/masterdata/:id/children', masterData.getChildrenById);
+    // some test routes
+    app.get('/test', testData.listAll);
+    app.get('/test/:id', testData.getObjectById);
+    app.get('/test/:id/children', testData.getObjectChildrenById);
+
+    // master data routes
+    app.get('/masterdata', masterData.listAll);
+    app.get('/masterdata/:id', masterData.getObjectById);
+    app.get('/masterdata/:id/children', masterData.getChildrenById);
 
 };

tests/masterdata.test.js

@@ -39,7 +39,7 @@ describe('masterdata test suite', () => {
         expect(response.status).toBe(200);
         expect(response.body).toBeDefined();
         expect(response.body.name).toBe('Contract 1');
-        expect(response.body.description).toBe("Test-Contract Nr. 1");
+        expect(response.body.description).toBe('Test-Contract Nr. 1');
     });
 
     it('tests a successful query of a non existing contract', async () => {

tests/testutils.js

@@ -2,12 +2,12 @@ const masterDataModel = require('../models/masterDataModel');
 const testData = require('./testdata');
 
 module.exports.beforeEach = async function () {
-    await masterDataModel.insertMany(testData)
+    await masterDataModel.insertMany(testData);
 };
 
 module.exports.afterEach = async function () {
     await masterDataModel.deleteMany();
-}
+};
 
 module.exports.beforeAll = async function (server, dbname, mongoose) {
     return new Promise((resolve) => {

utils/logging.js

@@ -4,7 +4,7 @@ var winston = require('winston');
 var format = winston.format;
 
 const myFormat = format.printf((info) => {
-	return `${info.timestamp} ${info.level.toUpperCase()} ${info.message}`;
+    return `${info.timestamp} ${info.level.toUpperCase()} ${info.message}`;
 });
 
 var transporters = [new winston.transports.Console()];
@@ -13,18 +13,18 @@ if (process.env.NODE_ENV == 'test') {
 }
 
 var logger = winston.createLogger({
-	format: format.combine(format.timestamp(), myFormat),
-	transports: transporters
+    format: format.combine(format.timestamp(), myFormat),
+    transports: transporters
 });
 
 // export a basic logger object
 module.exports.logger = logger;
 // export a helper-function for creating a info-string for a http request
-module.exports.requestinfostring = function(req) {
-	var result = '(' + req.ip + ' ' + req.originalUrl;
-	if (req.params.id) {
-		result = result + ' ID: ' + req.params.id;
-	}
-	result = result + ')';
-	return result;
+module.exports.requestinfostring = function (req) {
+    var result = '(' + req.ip + ' ' + req.originalUrl;
+    if (req.params.id) {
+        result = result + ' ID: ' + req.params.id;
+    }
+    result = result + ')';
+    return result;
 };