chore: Refactor file storage (#5711)

server/models/helpers/DocumentHelper.tsx

@@ -19,9 +19,9 @@ import { trace } from "@server/logging/tracing";
 import type Document from "@server/models/Document";
 import type Revision from "@server/models/Revision";
 import User from "@server/models/User";
+import FileStorage from "@server/storage/files";
 import diff from "@server/utils/diff";
 import parseAttachmentIds from "@server/utils/parseAttachmentIds";
-import { getSignedUrl } from "@server/utils/s3";
 import Attachment from "../Attachment";
 import ProsemirrorHelper from "./ProsemirrorHelper";
 
@@ -324,7 +324,10 @@ export default class DocumentHelper {
         });
 
         if (attachment) {
-          const signedUrl = await getSignedUrl(attachment.key, expiresIn);
+          const signedUrl = await FileStorage.getSignedUrl(
+            attachment.key,
+            expiresIn
+          );
           text = text.replace(
             new RegExp(escapeRegExp(attachment.redirectUrl), "g"),
             signedUrl

server/models/helpers/SearchHelper.ts

@@ -5,12 +5,12 @@ import map from "lodash/map";
 import queryParser from "pg-tsquery";
 import { Op, QueryTypes, WhereOptions } from "sequelize";
 import { DateFilter } from "@shared/types";
-import { sequelize } from "@server/database/sequelize";
 import Collection from "@server/models/Collection";
 import Document from "@server/models/Document";
 import Share from "@server/models/Share";
 import Team from "@server/models/Team";
 import User from "@server/models/User";
+import { sequelize } from "@server/storage/database";
 
 type SearchResponse = {
   results: {