coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf: Move exports to worker service (#2514)

Browse Source 
* first pass

* fixes

* fix: Move export related emails to queue

* i18n
This commit is contained in:
Tom Moor
2021-08-31 17:41:57 -07:00
committed by GitHub
parent 23a6459ae8
commit 476b5e03f9
9 changed files with 179 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
server/routes/api/collections.js
View File

@ -1,8 +1,8 @@
// @flow
import fractionalIndex from "fractional-index";
import Router from "koa-router";
import collectionExporter from "../../commands/collectionExporter";
import { ValidationError } from "../../errors";
import { exportCollections } from "../../exporter";
import auth from "../../middlewares/authentication";
import {
Collection,
@ -13,7 +13,6 @@ import {
User,
Group,
Attachment,
FileOperation,
} from "../../models";
import policy from "../../policies";
import {
@ -29,7 +28,6 @@ import { Op, sequelize } from "../../sequelize";
import collectionIndexing from "../../utils/collectionIndexing";
import removeIndexCollision from "../../utils/removeIndexCollision";
import { getAWSKeyForFileOp } from "../../utils/s3";
import pagination from "./middlewares/pagination";
const { authorize } = policy;
@ -465,28 +463,16 @@ router.post("collections.export", auth(), async (ctx) => {
ctx.assertPresent(collection, "Collection should be present");
authorize(user, "read", collection);
const key = getAWSKeyForFileOp(team.id, collection.name);
let exportData;
exportData = await FileOperation.create({
type: "export",
state: "creating",
key,
url: null,
size: 0,
collectionId: id,
userId: user.id,
teamId: team.id,
const fileOperation = await collectionExporter({
collection,
user,
team,
ip: ctx.request.ip,
});
exportCollections(user.teamId, user.id, user.email, exportData.id, id);
exportData.user = user;
exportData.collection = collection;
ctx.body = {
success: true,
data: { fileOperation: presentFileOperation(exportData) },
data: { fileOperation: presentFileOperation(fileOperation) },
};
});
@ -495,29 +481,15 @@ router.post("collections.export_all", auth(), async (ctx) => {
const team = await Team.findByPk(user.teamId);
authorize(user, "export", team);
const key = getAWSKeyForFileOp(team.id, team.name);
let exportData;
exportData = await FileOperation.create({
type: "export",
state: "creating",
key,
url: null,
size: 0,
collectionId: null,
userId: user.id,
teamId: team.id,
const fileOperation = await collectionExporter({
user,
team,
ip: ctx.request.ip,
});
// async operation to upload zip archive to cloud and email user with link
exportCollections(user.teamId, user.id, user.email, exportData.id);
exportData.user = user;
exportData.collection = null;
ctx.body = {
success: true,
data: { fileOperation: presentFileOperation(exportData) },
data: { fileOperation: presentFileOperation(fileOperation) },
};
});