Skip to content

Make sure old data is deleted when creating new export fo app_users data. #5654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2024
Merged

Make sure old data is deleted when creating new export fo app_users data. #5654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1930bef
Make sure old data is deleted when creating new export fo app_users d…
Cookiezaurs Oct 9, 2024
33ff589
Merge branch 'master' into anna/master
Cookiezaurs Oct 9, 2024
e0733fc
Merge branch 'master' into anna/master
Cookiezaurs Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 62 additions & 46 deletions api/parts/mgmt/app_users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ usersApi.merge = function(app_id, newAppUser, new_id, old_id, new_device_id, old
var deleteMyExport = function(exportID) { //tries to delete packed file, exported folder and saved export in gridfs
//normally there should be only export in gridfs. Cleaning all to be sure.
//rejects only if there stays any saved data for export
log.d("deleteMyExport:" + exportID);
return new Promise(function(resolve, reject) {
//remove archive
var errors = [];
Expand All @@ -775,7 +776,6 @@ var deleteMyExport = function(exportID) { //tries to delete packed file, exporte
errors.push(err);
}
}

countlyFs.gridfs.deleteFile("appUsers", path.resolve(__dirname, './../../../export/AppUser/' + exportID + '.tar.gz'), {id: exportID + '.tar.gz'}, function(error) {
if (error && error.message && error.message.substring(0, 12) !== "FileNotFound" && error.message.substring(0, 14) !== 'File not found') {
log.e(error.message.substring(0, 14));
Expand Down Expand Up @@ -806,6 +806,18 @@ var deleteMyExport = function(exportID) { //tries to delete packed file, exporte
}
});


}).then(function() {
return new Promise(function(resolve, reject) {
common.db.collection("exports").remove({"_eid": exportID}, function(err0) {
if (err0) {
reject(err0);
}
else {
resolve();
}
});
});
});
};

Expand All @@ -822,46 +834,42 @@ usersApi.deleteExport = function(filename, params, callback) {
//remove archive
deleteMyExport(base_name[0]).then(
function() {
common.db.collection("exports").remove({"_eid": base_name[0]}, function(err0) {
if (err0) {
log.e(err0);
}
if (name_parts.length === 3 && name_parts[2] !== 'HASH') {
//update user info
common.db.collection('app_users' + name_parts[1]).update({"uid": name_parts[2]}, {$unset: {"appUserExport": ""}}, {upsert: false, multi: true}, function(err) {
if (err) {
callback(err, "");
}
else {
plugins.dispatch("/systemlogs", {
params: params,
action: "export_app_user_deleted",
data: {
result: "ok",
uids: name_parts[2],
id: base_name[0],
app_id: name_parts[1],
info: "Exported data deleted"
}
});
callback(null, "Export deleted");
}
});
}
else {
plugins.dispatch("/systemlogs", {
params: params,
action: "export_app_user_deleted",
data: {
result: "ok",
id: base_name[0],
app_id: name_parts[1],
info: "Exported data deleted"
}
});
callback(null, "Export deleted");
}
});
if (name_parts.length === 3 && name_parts[2] !== 'HASH') {
//update user info
common.db.collection('app_users' + name_parts[1]).update({"uid": name_parts[2]}, {$unset: {"appUserExport": ""}}, {upsert: false, multi: true}, function(err) {
if (err) {
callback(err, "");
}
else {
plugins.dispatch("/systemlogs", {
params: params,
action: "export_app_user_deleted",
data: {
result: "ok",
uids: name_parts[2],
id: base_name[0],
app_id: name_parts[1],
info: "Exported data deleted"
}
});
callback(null, "Export deleted");
}
});
}
else {
plugins.dispatch("/systemlogs", {
params: params,
action: "export_app_user_deleted",
data: {
result: "ok",
id: base_name[0],
app_id: name_parts[1],
info: "Exported data deleted"
}
});
callback(null, "Export deleted");
}

},
function(err) {
console.log(err);
Expand Down Expand Up @@ -1073,12 +1081,20 @@ usersApi.export = function(app_id, query, params, callback) {
// else {
// resolve();
// }
new Promise(function(resolve) {
log.d("collection marked");
//export data from metric_changes

export_safely({projection: {"appUserExport": 0}, export_id: export_id, app_id: app_id, args: [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]}).finally(function() {
resolve();
//try deleting old export
deleteMyExport(export_id).then(function(err) {
if (err) {
log.e(err);
}
log.d("old export deleted");
return new Promise(function(resolve) {
log.d("collection marked");
//export data from metric_changes

export_safely({projection: {"appUserExport": 0}, export_id: export_id, app_id: app_id, args: [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]}).finally(function() {
resolve();
});
});
}).then(function() {
log.d("metric_changes exported");
Expand Down
14 changes: 10 additions & 4 deletions api/utils/countlyFs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,13 +601,19 @@ countlyFs.gridfs = {};
* console.log("Finished", err);
* });
*/
ob.deleteFileById = function(category, id, callback) {
ob.deleteFileById = async function(category, id, callback) {
var bucket = new GridFSBucket(db, { bucketName: category });
bucket.delete(id, function(error) {
try {
await bucket.delete(id);
if (callback) {
callback(error);
callback(null);
}
});
}
catch (ee) {
if (callback) {
callback(ee);
}
}
};

/**
Expand Down
Loading