Skip to content

Commit

Permalink
Improve user deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
m-mohr committed Jul 13, 2024
1 parent 0c4f15a commit a7fff59
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/models/userstore.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ export default class UserStore {
if (user !== null) {
user_id = user._id;
if (!onlyData) {
await this.db.removeAsync({ _id: user_id});
console.log('- Removed user from database');
const count = await this.db.removeAsync({ _id: user_id});
console.log(`- Removed ${count} user from database`);
}
}
else {
Expand All @@ -131,8 +131,8 @@ export default class UserStore {

try {
const pgDb = this.serverContext.storedProcessGraphs().database();
await pgDb.removeAsync({user_id});
console.log('- Removed process graphs from database');
const pgCount = await pgDb.removeAsync({user_id});
console.log(`- Removed ${pgCount} process graphs from database`);
} catch (err) {
console.error('- Error removing process graphs:', err);
}
Expand All @@ -141,8 +141,8 @@ export default class UserStore {
const serviceModel = this.serverContext.webServices();
const serviceDb = serviceModel.database();
const services = await serviceDb.findAsync({user_id});
await serviceDb.removeAsync({user_id});
console.log('- Removed web services from database');
const serviceCount = await serviceDb.removeAsync({user_id});
console.log(`- Removed ${serviceCount} web services from database`);

await Promise.all(services.map(service => serviceModel.removeLogsById(service._id)));
console.log('- Removed web services logs from file system');
Expand All @@ -154,8 +154,8 @@ export default class UserStore {
const jobModel = this.serverContext.jobs();
const jobDb = jobModel.database();
const jobs = await jobDb.findAsync({user_id});
await jobDb.removeAsync({user_id});
console.log('- Removed batch jobs from database');
const jobCount = await jobDb.removeAsync({user_id});
console.log(`- Removed ${jobCount} batch jobs from database`);

await Promise.all(jobs.map(job => jobModel.removeResults(job._id)));
console.log('- Removed batch job results and logs from file system');
Expand Down

0 comments on commit a7fff59

Please sign in to comment.