fix: Exports show as 0 bytes

This commit is contained in:
Tom Moor
2022-05-15 07:10:35 +01:00
parent 06d966ad0c
commit bca66f7415
3 changed files with 30 additions and 36 deletions

View File

@@ -6,6 +6,7 @@ import ExportSuccessEmail from "@server/emails/templates/ExportSuccessEmail";
import Logger from "@server/logging/logger";
import { Collection, Event, FileOperation, Team, User } from "@server/models";
import { FileOperationState } from "@server/models/FileOperation";
import fileOperationPresenter from "@server/presenters/fileOperation";
import { uploadToS3FromBuffer } from "@server/utils/s3";
import { archiveCollections } from "@server/utils/zip";
import BaseTask, { TaskPriority } from "./BaseTask";
@@ -44,21 +45,20 @@ export default class ExportMarkdownZipTask extends BaseTask<Props> {
try {
Logger.info("task", `ExportTask processing data for ${fileOperationId}`);
await this.updateFileOperation(
fileOperation,
FileOperationState.Creating
);
await this.updateFileOperation(fileOperation, {
state: FileOperationState.Creating,
});
const filePath = await archiveCollections(collections);
Logger.info("task", `ExportTask uploading data for ${fileOperationId}`);
await this.updateFileOperation(
fileOperation,
FileOperationState.Uploading
);
await this.updateFileOperation(fileOperation, {
state: FileOperationState.Uploading,
});
const fileBuffer = await fs.promises.readFile(filePath);
const stat = await fs.promises.stat(filePath);
const url = await uploadToS3FromBuffer(
fileBuffer,
"application/zip",
@@ -66,12 +66,11 @@ export default class ExportMarkdownZipTask extends BaseTask<Props> {
"private"
);
await this.updateFileOperation(
fileOperation,
FileOperationState.Complete,
undefined,
url
);
await this.updateFileOperation(fileOperation, {
size: stat.size,
state: FileOperationState.Complete,
url,
});
await ExportSuccessEmail.schedule({
to: user.email,
@@ -79,11 +78,10 @@ export default class ExportMarkdownZipTask extends BaseTask<Props> {
teamUrl: team.url,
});
} catch (error) {
await this.updateFileOperation(
fileOperation,
FileOperationState.Error,
error
);
await this.updateFileOperation(fileOperation, {
state: FileOperationState.Error,
error,
});
await ExportFailureEmail.schedule({
to: user.email,
teamUrl: team.url,
@@ -100,20 +98,21 @@ export default class ExportMarkdownZipTask extends BaseTask<Props> {
*/
private async updateFileOperation(
fileOperation: FileOperation,
state: FileOperationState,
error?: Error,
url?: string
options: Partial<FileOperation> & { error?: Error }
) {
await fileOperation.update({
state,
url,
error: error ? truncate(error.message, { length: 255 }) : undefined,
...options,
error: options.error
? truncate(options.error.message, { length: 255 })
: undefined,
});
await Event.schedule({
name: "fileOperations.update",
modelId: fileOperation.id,
teamId: fileOperation.teamId,
actorId: fileOperation.userId,
data: fileOperationPresenter(fileOperation),
});
}