Merge pull request #810 from nartc/bugfix/fix-array-enum-on-model

fix(lib): fix enum array on model properties
nestjs · Jun 18, 2020 · 7a208fd · 7a208fd
2 parents 67f9c2f + e417a7a
commit 7a208fd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/services/schema-object-factory.ts b/lib/services/schema-object-factory.ts
@@ -317,8 +317,13 @@ export class SchemaObjectFactory {
 
     const refHost = metadata.isArray ? { items: { $ref } } : { $ref };
     const paramObject = { ..._schemaObject, ...refHost };
+    const pathsToOmit = ['enum', 'enumName'];
 
-    return omit(paramObject, ['enum', 'type']);
+    if (!metadata.isArray) {
+      pathsToOmit.push('type');
+    }
+
+    return omit(paramObject, pathsToOmit);
   }
 
   createNotBuiltInTypeReference(

diff --git a/test/services/schema-object-factory.spec.ts b/test/services/schema-object-factory.spec.ts
@@ -34,6 +34,8 @@ describe('SchemaObjectFactory', () => {
     class Person {
       @ApiProperty({ enum: Role, enumName: 'Role' })
       role: Role;
+      @ApiProperty({ enum: Role, enumName: 'Role', isArray: true })
+      roles: Role[];
     }
 
     it('should explore enum', () => {
@@ -53,9 +55,15 @@ describe('SchemaObjectFactory', () => {
         properties: {
           role: {
             $ref: '#/components/schemas/Role'
+          },
+          roles: {
+            type: 'array',
+            items: {
+              $ref: '#/components/schemas/Role'
+            }
           }
         },
-        required: ['role']
+        required: ['role', 'roles']
       });
 
       schemaObjectFactory.exploreModelSchema(CreatePersonDto, schemas, [