refactor: reduce duplication of getUploadHandler

2anki · Nov 24, 2023 · ea426da · ea426da
1 parent bf377df
commit ea426da
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/src/controllers/SimpleUploadController.ts b/src/controllers/SimpleUploadController.ts
@@ -2,23 +2,16 @@ import fs from 'fs';
 import path from 'path';
 
 import express from 'express';
-import multer from 'multer';
 
 import { sendError } from '../lib/error/sendError';
 import { getLimitMessage } from '../lib/misc/getLimitMessage';
-import { getUploadLimits } from '../lib/misc/getUploadLimits';
 import Settings from '../lib/parser/Settings';
 import Workspace from '../lib/parser/WorkSpace';
 import { UploadedFile } from '../lib/storage/types';
 import GeneratePackagesUseCase from '../usecases/uploads/GeneratePackagesUseCase';
 
-const getUploadHandler = (res: express.Response) => {
-  const maxUploadCount = 21;
-  return multer({
-    limits: getUploadLimits(res.locals.patreon),
-    dest: process.env.UPLOAD_BASE,
-  }).array('pakker', maxUploadCount);
-};
+import { getUploadHandler } from '../lib/misc/GetUploadHandler';
+
 class SimpleUploadController {
   async handleUpload(req: express.Request, res: express.Response) {
     try {

diff --git a/src/controllers/UploadController.ts b/src/controllers/UploadController.ts
@@ -3,9 +3,9 @@ import express from 'express';
 import { getOwner } from '../lib/User/getOwner';
 import { sendError } from '../lib/error/sendError';
 import { getLimitMessage } from '../lib/misc/getLimitMessage';
-import StorageHandler from '../lib/storage/StorageHandler';
 import NotionService from '../services/NotionService';
 import UploadService from '../services/UploadService';
+import { getUploadHandler } from '../lib/misc/GetUploadHandler';
 
 class UploadController {
   constructor(
@@ -46,7 +46,7 @@ class UploadController {
   file(req: express.Request, res: express.Response) {
     try {
       console.info('uploading file');
-      const handleUploadEndpoint = this.service.getUploadHandler(res);
+      const handleUploadEndpoint = getUploadHandler(res);
 
       handleUploadEndpoint(req, res, async (error) => {
         if (error) {

diff --git a/src/lib/misc/GetUploadHandler.ts b/src/lib/misc/GetUploadHandler.ts
@@ -0,0 +1,12 @@
+import express from 'express';
+import multer from 'multer';
+import { getUploadLimits } from './getUploadLimits';
+
+export const getUploadHandler = (res: express.Response) => {
+  const maxUploadCount = 21;
+
+  return multer({
+    limits: getUploadLimits(res.locals.patreon),
+    dest: process.env.UPLOAD_BASE,
+  }).array('pakker', maxUploadCount);
+};
diff --git a/src/services/UploadService.ts b/src/services/UploadService.ts
@@ -28,14 +28,6 @@ class UploadService {
     await s.delete(key);
   }
 
-  getUploadHandler(res: express.Response) {
-    const maxUploadCount = 21;
-    return multer({
-      limits: getUploadLimits(res.locals.patreon),
-      dest: process.env.UPLOAD_BASE,
-    }).array('pakker', maxUploadCount);
-  }
-
   async handleUpload(req: express.Request, res: express.Response) {
     try {
       let payload;