[IMPROVE] User data export (#15294)

RocketChat · Sep 19, 2019 · 968fbd9 · 968fbd9
1 parent e0d5153
commit 968fbd9
Show file tree

Hide file tree

Showing 7 changed files with 248 additions and 110 deletions.
diff --git a/app/file-upload/server/config/GridFS.js b/app/file-upload/server/config/GridFS.js
@@ -198,4 +198,8 @@ new FileUploadClass({
 
 		return readFromGridFS(file.store, file._id, file, req, res);
 	},
+
+	copy(file, out) {
+		copyFromGridFS(file.store, file._id, file, out);
+	},
 });
diff --git a/app/models/server/models/ExportOperations.js b/app/models/server/models/ExportOperations.js
@@ -46,6 +46,14 @@ export class ExportOperations extends Base {
 		return this.find(query, options);
 	}
 
+	findOnePending(options) {
+		const query = {
+			status: { $nin: ['completed'] },
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findAllPendingBeforeMyRequest(requestDay, options) {
 		const query = {
 			status: { $nin: ['completed'] },
@@ -63,6 +71,13 @@ export class ExportOperations extends Base {
 				status: data.status,
 				fileList: data.fileList,
 				generatedFile: data.generatedFile,
+				fileId: data.fileId,
+				userNameTable: data.userNameTable,
+				userData: data.userData,
+				generatedUserFile: data.generatedUserFile,
+				generatedAvatar: data.generatedAvatar,
+				exportPath: data.exportPath,
+				assetsPath: data.assetsPath,
 			},
 		};
 
@@ -78,7 +93,9 @@ export class ExportOperations extends Base {
 
 		_.extend(exportOperation, data);
 
-		return this.insert(exportOperation);
+		this.insert(exportOperation);
+
+		return exportOperation._id;
 	}