Improve user deletion

src/deluser.js

@@ -16,13 +16,32 @@ const stop = (code) => {
 
 const username = await rl.question('Enter a username: ');
 const exists = await users.exists(username);
-if (!exists) {
+
+let onlyData = false;
+if (exists) {
+	const keepAccount = await rl.question('Keep account (y/n): ');
+	const onlyDataMap = {
+		y: true,
+		n: false
+	};
+	if (!(keepAccount in onlyDataMap)) {
+		console.error('Invalid input, must be y or n');
+		stop(1);
+	}
+	onlyData = onlyDataMap[keepAccount];
+}
+else {
 	console.warn('User might be a Google User, trying to delete the corresponding data');
 }
 
 try {
-	await users.remove(username);
-	console.log('User (data) deleted!');
+	await users.remove(username, onlyData);
+	if (onlyData) {
+		console.log('Workspace cleared!');
+	}
+	else {
+		console.log('User deleted and workspace cleared!');
+	}
 	stop(0);
 } catch (err) {
 	console.error(err);

src/models/userstore.js

@@ -115,13 +115,15 @@ export default class UserStore {
 		return await this.db.findAsync({}).sort({ name: 1 });
 	}
 
-	async remove(name) {
+	async remove(name, onlyData = false) {
 		let user = await this.get(name);
 		let user_id;
 		if (user !== null) {
 			user_id = user._id;
-			await this.db.removeAsync({ _id: user_id});
-			console.log('- Removed user from database');
+			if (!onlyData) {
+				await this.db.removeAsync({ _id: user_id});
+				console.log('- Removed user from database');
+			}
 		}
 		else {
 			user_id = name;
@@ -155,7 +157,7 @@ export default class UserStore {
 			await jobDb.removeAsync({user_id});
 			console.log('- Removed batch jobs from database');
 
-			await Promise.all(jobs.map(job => job.removeResults(job._id)));
+			await Promise.all(jobs.map(job => jobModel.removeResults(job._id)));
 			console.log('- Removed batch job results and logs from file system');
 		} catch (err) {
 			console.error('- Error removing jobs:', err);