feat: implementation of multiple upload fields

lukeautry · Jan 23, 2024 · 5545ecb · 5545ecb
1 parent 5869115
commit 5545ecb
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/packages/cli/src/routeGeneration/routeGenerator.ts b/packages/cli/src/routeGeneration/routeGenerator.ts
@@ -94,16 +94,18 @@ export abstract class AbstractRouteGenerator<Config extends ExtendedRoutesConfig
 
             const normalisedFullPath = normalisePath(`${normalisedBasePath}${normalisedControllerPath}${normalisedMethodPath}`, '/', '', false);
 
-            const uploadFileParameter = method.parameters.find(parameter => parameter.type.dataType === 'file');
+            const uploadFilesWithDifferentFieldParameter = method.parameters.filter(parameter => parameter.type.dataType === 'file');
             const uploadFilesParameter = method.parameters.find(parameter => parameter.type.dataType === 'array' && parameter.type.elementType.dataType === 'file');
             return {
               fullPath: normalisedFullPath,
               method: method.method.toLowerCase(),
               name: method.name,
               parameters: parameterObjs,
               path: normalisedMethodPath,
-              uploadFile: !!uploadFileParameter,
-              uploadFileName: uploadFileParameter?.name,
+              uploadFile: uploadFilesWithDifferentFieldParameter.length > 0,
+              uploadFileName: uploadFilesWithDifferentFieldParameter.map((parameter) => ({
+                  'name': parameter.name,
+              })),
               uploadFiles: !!uploadFilesParameter,
               uploadFilesName: uploadFilesParameter?.name,
               security: method.security,

diff --git a/packages/cli/src/routeGeneration/templates/express/express.hbs b/packages/cli/src/routeGeneration/templates/express/express.hbs
@@ -67,7 +67,7 @@ export function RegisterRoutes(app: Router) {
             authenticateMiddleware({{json security}}),
             {{/if}}
             {{#if uploadFile}}
-            upload.single('{{uploadFileName}}'),
+            upload.fields({{json uploadFileName}}),
             {{/if}}
             {{#if uploadFiles}}
             upload.array('{{uploadFilesName}}'),

diff --git a/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts b/packages/cli/src/routeGeneration/templates/express/expressTemplateService.ts
@@ -73,8 +73,11 @@ export class ExpressTemplateService implements TemplateService<ExRequest, ExResp
             case 'body-prop':
                 return this.validationService.ValidateParam(args[key], request.body[name], name, fieldErrors, 'body.', this.minimalSwaggerConfig);
             case 'formData':
-                if (args[key].dataType === 'file') {
-                    return this.validationService.ValidateParam(args[key], request.file, name, fieldErrors, undefined, this.minimalSwaggerConfig);
+              const files = Object.keys(args).filter((argKey) => args[argKey].dataType === 'file');
+                if (files.length > 0) {
+                  const requestFiles = request.files as {[fileName: string]: Express.Multer.File[]};
+                  const fileArgs = this.validationService.ValidateParam(args[key], requestFiles[name], name, fieldErrors, undefined, this.minimalSwaggerConfig);
+                  return fileArgs.length === 1 ? fileArgs[0] : fileArgs;
                 } else if (args[key].dataType === 'array' && args[key].array.dataType === 'file') {
                     return this.validationService.ValidateParam(args[key], request.files, name, fieldErrors, undefined, this.minimalSwaggerConfig);
                 } else {

diff --git a/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs b/packages/cli/src/routeGeneration/templates/hapi/hapi.hbs
@@ -66,9 +66,11 @@ export function RegisterRoutes(server: any) {
                     },
                     {{/if}}
                     {{#if uploadFile}}
+                      {{#each uploadFileName}}
                     {
-                      method: fileUploadMiddleware('{{uploadFileName}}', false)
+                      method: fileUploadMiddleware('{{name}}', false)
                     },
+                      {{/each}}
                     {{/if}}
                     {{#if uploadFiles}}
                     {

diff --git a/packages/cli/src/routeGeneration/templates/koa/koa.hbs b/packages/cli/src/routeGeneration/templates/koa/koa.hbs
@@ -68,7 +68,7 @@ export function RegisterRoutes(router: KoaRouter) {
             authenticateMiddleware({{json security}}),
             {{/if}}
             {{#if uploadFile}}
-            upload.single('{{uploadFileName}}'),
+            upload.fields({{json uploadFileName}}),
             {{/if}}
             {{#if uploadFiles}}
             upload.array('{{uploadFilesName}}'),

diff --git a/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts b/packages/cli/src/routeGeneration/templates/koa/koaTemplateService.ts
@@ -75,12 +75,15 @@ export class KoaTemplateService implements TemplateService<any, Context> {
         case 'body-prop':
             return this.validationService.ValidateParam(args[key], (context.request as any).body[name], name, errorFields, 'body.', this.minimalSwaggerConfig);
         case 'formData':
-            if (args[key].dataType === 'file') {
-              return this.validationService.ValidateParam(args[key], (context.request as any).file, name, errorFields, undefined, this.minimalSwaggerConfig);
+          const files = Object.keys(args).filter((argKey) => args[argKey].dataType === 'file');
+          const contextRequest = context.request as any;
+            if (files.length > 0) {
+              const fileArgs = this.validationService.ValidateParam(args[key], contextRequest.files[name], name, errorFields, undefined, this.minimalSwaggerConfig);
+              return fileArgs.length === 1 ? fileArgs[0] : fileArgs;
             } else if (args[key].dataType === 'array' && args[key].array.dataType === 'file') {
-              return this.validationService.ValidateParam(args[key], (context.request as any).files, name, errorFields, undefined, this.minimalSwaggerConfig);
+              return this.validationService.ValidateParam(args[key], contextRequest.files, name, errorFields, undefined, this.minimalSwaggerConfig);
             } else {
-              return this.validationService.ValidateParam(args[key], (context.request as any).body[name], name, errorFields, undefined, this.minimalSwaggerConfig);
+              return this.validationService.ValidateParam(args[key], contextRequest.body[name], name, errorFields, undefined, this.minimalSwaggerConfig);
             }
         case 'res':
             return this.responder(context, next);