From de3be45445664a4a100b7d17f453dac26a108623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Tue, 17 Sep 2019 09:19:35 +0200 Subject: [PATCH] fix(cli): fix schema title for POST operation in relation controllers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- .../templates/controller-relation-template-has-many.ts.ejs | 2 +- .../integration/generators/relation.has-many.integration.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/cli/generators/relation/templates/controller-relation-template-has-many.ts.ejs b/packages/cli/generators/relation/templates/controller-relation-template-has-many.ts.ejs index 4ca12b7e748b..4ae5dc50ff2e 100644 --- a/packages/cli/generators/relation/templates/controller-relation-template-has-many.ts.ejs +++ b/packages/cli/generators/relation/templates/controller-relation-template-has-many.ts.ejs @@ -59,7 +59,7 @@ export class <%= controllerClassName %> { content: { 'application/json': { schema: getModelSchemaRef(<%= targetModelClassName %>, { - title: 'New <%= targetModelClassName %>In<%= sourceModelClassName %>', + title: 'New<%= targetModelClassName %>In<%= sourceModelClassName %>', exclude: ['<%= targetModelPrimaryKey %>'], optional: ['<%= foreignKeyName %>'] }), diff --git a/packages/cli/test/integration/generators/relation.has-many.integration.js b/packages/cli/test/integration/generators/relation.has-many.integration.js index c81d94c9001a..11bf0762f679 100644 --- a/packages/cli/test/integration/generators/relation.has-many.integration.js +++ b/packages/cli/test/integration/generators/relation.has-many.integration.js @@ -438,7 +438,7 @@ describe('lb4 relation HasMany', function() { assert.file(expectedControllerFile); }); - it('controller with hasMany class and constractor', async () => { + it('controller with hasMany class and constructor', async () => { const expectedControllerFile = path.join( SANDBOX_PATH, CONTROLLER_PATH, @@ -525,6 +525,7 @@ describe('lb4 relation HasMany', function() { /},\n . {2}},\n .}\)\n {2}async create\(\n/, /\@param\.path\.number\('id'\) id: typeof Customer\.prototype\.id,\n/, /\@requestBody\(\{\s+content: {\s+'application\/json': {\s+schema: getModelSchemaRef\(Order, {\n/, + /title: 'NewOrderInCustomer',\n/, /exclude: \['id'\],\n/, /optional: \['customerId'\]\n/, /}\),\s+},\s+},\s+}\) order: Omit,\n/, @@ -538,6 +539,7 @@ describe('lb4 relation HasMany', function() { /},\n . {2}},\n .}\)\n {2}async create\(\n/, /\@param\.path\.number\('id'\) id: typeof CustomerClass\.prototype\.custNumber,\n/, /\@requestBody\(\{\s+content: {\s+'application\/json': {\s+schema: getModelSchemaRef\(OrderClass, {\n/, + /title: 'NewOrderClassInCustomerClass',\n/, /exclude: \['orderNumber'\],\n/, /optional: \['customerClassCustNumber'\]\n/, /}\),\s+},\s+},\s+}\) orderClass: Omit,\n/, @@ -551,6 +553,7 @@ describe('lb4 relation HasMany', function() { /},\n . {2}},\n .}\)\n {2}async create\(\n/, /\@param\.path\.number\('id'\) id: typeof CustomerClassType\.prototype\.custNumber,\n/, /\@requestBody\(\{\s+content: {\s+'application\/json': {\s+schema: getModelSchemaRef\(OrderClassType, {\n/, + /title: 'NewOrderClassTypeInCustomerClassType',\n/, /exclude: \['orderString'\],\n/, /optional: \['customerClassTypeCustNumber'\]\n/, /}\),\s+},\s+},\s+}\) orderClassType: Omit,\n/,