Merge e52e57a into f09d866

loopbackio · Dec 13, 2018 · 0d2c0d1 · 0d2c0d1
2 parents f09d866 + e52e57a
commit 0d2c0d1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/packages/cli/generators/openapi/schema-helper.js b/packages/cli/generators/openapi/schema-helper.js
@@ -160,7 +160,13 @@ function mapObjectType(schema, options) {
       );
       // The property name might have chars such as `-`
       const propName = escapePropertyOrMethodName(p);
+
       let propDecoration = `@property({name: '${p}'})`;
+
+      if (required.includes(p)) {
+        propDecoration = `@property({name: '${p}', required: true})`;
+      }
+
       if (propertyType.itemType && propertyType.itemType.kind === 'class') {
         // Use `@property.array` for array types
         propDecoration = `@property.array(${

diff --git a/packages/cli/test/integration/generators/openapi-petstore.integration.js b/packages/cli/test/integration/generators/openapi-petstore.integration.js
@@ -71,7 +71,10 @@ describe('openapi-generator specific files', function() {
     assert.file(newPetModel);
     assert.fileContent(newPetModel, `export class NewPet {`);
     assert.fileContent(newPetModel, `@model({name: 'NewPet'})`);
-    assert.fileContent(newPetModel, `@property({name: 'name'})`);
+    assert.fileContent(
+      newPetModel,
+      `@property({name: 'name', required: true})`,
+    );
     assert.fileContent(newPetModel, `name: string;`);
     assert.fileContent(newPetModel, `@property({name: 'tag'})`);
     assert.fileContent(newPetModel, `tag?: string`);

diff --git a/packages/cli/test/integration/generators/swagger-petstore.integration.js b/packages/cli/test/integration/generators/swagger-petstore.integration.js
@@ -69,7 +69,10 @@ describe('openapi-generator specific files', () => {
     assert.fileContent(newPetModel, `export class NewPet {`);
     assert.fileContent(newPetModel, `constructor(data?: Partial<NewPet>) {`);
     assert.fileContent(newPetModel, `@model({name: 'NewPet'})`);
-    assert.fileContent(newPetModel, `@property({name: 'name'})`);
+    assert.fileContent(
+      newPetModel,
+      `@property({name: 'name', required: true})`,
+    );
     assert.fileContent(newPetModel, `name: string;`);
     assert.fileContent(newPetModel, `@property({name: 'tag'})`);
     assert.fileContent(newPetModel, `tag?: string`);

diff --git a/packages/cli/test/unit/openapi/schema-model.unit.js b/packages/cli/test/unit/openapi/schema-model.unit.js
@@ -109,7 +109,7 @@ describe('schema to model', () => {
           {
             name: 'criteria',
             signature: "criteria: string = '*:*';",
-            decoration: "@property({name: 'criteria'})",
+            decoration: "@property({name: 'criteria', required: true})",
             description:
               'Uses Lucene Query Syntax in the format of propertyName:value, ' +
               'propertyName:[num1 TO num2] and date range format: ' +
@@ -188,7 +188,7 @@ describe('schema to model', () => {
               {
                 name: 'name',
                 signature: 'name: string;',
-                decoration: "@property({name: 'name'})",
+                decoration: "@property({name: 'name', required: true})",
               },
               {
                 name: 'tag',
@@ -208,7 +208,7 @@ describe('schema to model', () => {
               {
                 name: 'id',
                 signature: 'id: number;',
-                decoration: "@property({name: 'id'})",
+                decoration: "@property({name: 'id', required: true})",
               },
             ],
             signature: '{\n  id: number;\n}',
@@ -228,7 +228,7 @@ describe('schema to model', () => {
           {
             name: 'name',
             signature: 'name: string;',
-            decoration: "@property({name: 'name'})",
+            decoration: "@property({name: 'name', required: true})",
           },
           {
             name: 'tag',
@@ -251,12 +251,12 @@ describe('schema to model', () => {
           {
             name: 'code',
             signature: 'code: number;',
-            decoration: "@property({name: 'code'})",
+            decoration: "@property({name: 'code', required: true})",
           },
           {
             name: 'message',
             signature: 'message: string;',
-            decoration: "@property({name: 'message'})",
+            decoration: "@property({name: 'message', required: true})",
           },
         ],
         imports: [],
@@ -326,7 +326,7 @@ describe('schema to model', () => {
           {
             name: 'id',
             signature: 'id: number;',
-            decoration: "@property({name: 'id'})",
+            decoration: "@property({name: 'id', required: true})",
           },
           {
             name: 'first-name',