41 verwendung validation framework

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "cSpell.language": "en,de-DE"
+    "cSpell.language": "en,de-DE",
+    "cSpell.words": [
+        "repotted"
+    ]
 }

backend/dao/plantsDao.js

@@ -2,6 +2,11 @@
 const helper = require('../helper.js');
 const daoHelper = require('./daoHelper.js');
 
+// TODO Add JSDoc comments to all methods
+// TODO Make date handling consistent (either use strings or DateTime objects throughout the DAO)
+// Post uses DateTime objects, Put uses strings
+// Strings is probably better because the validation middleware uses strings
+// TODO change var to const/let
 
 /**
  * Data Access Object for plants

backend/helper.js

@@ -202,6 +202,18 @@ module.exports.compareDateTimes = function(leftdatetime, rightdatetime) {
 		return 0;
 }
 
+/**
+ * Probably not correctly implemented, see issue #39
+ * Calculates the number of days between two datetime objects
+ * @param {*} leftdatetime The left datetime object
+ * @param {*} rightdatetime The right datetime object
+ * @returns The number of days between the two datetime objects
+ */
+module.exports.calculateDaysBetween = function(leftdatetime, rightdatetime) {
+	const timeDifference = Math.abs(leftdatetime - rightdatetime);
+    return Math.floor(timeDifference / (1000 * 60 * 60 * 24));
+}
+
 // modifies a given datetime object
 // adds or subs values to years, months, days, hours, minutes, seconds
 // positive values are added, negative ones subbed. 0 values are ignored

backend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plant_manager_backend",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"description": "Backend for PlantManager with file upload and sqlite",
 	"main": "server.js",
 	"scripts": {
@@ -16,6 +16,7 @@
 		"cors": "^2.8.5",
 		"express": "^4.19.2",
 		"express-fileupload": "^1.5.0",
+		"express-validator": "^7.3.0",
 		"luxon": "^3.4.4",
 		"morgan": "^1.10.0"
 	},

backend/server.js

@@ -24,7 +24,11 @@ try
 	// connect database
 	console.log('Connect database...');
 	const Database = require('better-sqlite3');
-	const dbOptions = { verbose: console.log };
+	let dbOptions = {}
+	if (process.env.LOG_SQLITE_QUERIES === 'true') {
+		console.log('Database debugging enabled');
+		dbOptions = { verbose: console.log };
+	}
 	const dbFile = './db/plantmanagerDB.sqlite';
 	const dbConnection = new Database(dbFile, dbOptions);
 
@@ -67,7 +71,11 @@ try
 		response.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
 		next();
 	});
-	app.use(morgan('dev'));	
+
+	// log all requests to the console
+	if (process.env.LOG_HTTP_QUERIES === 'true') {
+		app.use(morgan('dev'));
+	}
 
 	// ====== BINDING ENDPOINTS ======
 	const TOPLEVELPATH = '/api';
@@ -85,8 +93,8 @@ try
 
 	// send default error message if no matching endpoint found
 	app.use(function (request, response) {
-		console.log('Error occured, 404, resource not found');
-		response.status(404).json({'fehler': true, 'nachricht': 'Resource nicht gefunden'});
+		console.log('Error occurred, 404, resource not found');
+		response.status(404).json({ errors: [{ 'msg': "API Endpoint not found"}] });
 	});
 	// ===============================
 
@@ -97,9 +105,9 @@ try
 		console.log('Listening at localhost, port ' + HTTP_PORT);
 		console.log('\nUsage: http://localhost:' + HTTP_PORT + TOPLEVELPATH + "/SERVICENAME/SERVICEMETHOD/....");
 		console.log('\nPlant Manager Backend \nDeveloped by: QuadcoreDevelopment');
-		console.log('\n\n-----------------------------------------');
-		console.log('exit / stop Server by pressing 2 x CTRL-C');
-		console.log('-----------------------------------------\n\n');
+		console.log('\n\n-------------------------------------');
+		console.log('exit / stop Server by pressing CTRL-C');
+		console.log('-------------------------------------\n\n');
 	});
 } 
 catch (ex)