From 521c7324eaa1208c63c08710ba25ee3dd1a62f3b Mon Sep 17 00:00:00 2001 From: Yesha Mavani Date: Fri, 12 Jan 2024 18:20:15 +0530 Subject: [PATCH] fix(sequelize): add support for extended operators fix #10272 Signed-off-by: Yesha Mavani --- .../fixtures/controllers/roles.controller.ts | 19 ++----------------- .../integration/repository.integration.ts | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/extensions/sequelize/src/__tests__/fixtures/controllers/roles.controller.ts b/extensions/sequelize/src/__tests__/fixtures/controllers/roles.controller.ts index 35753dacb13c..bcff592d57ac 100644 --- a/extensions/sequelize/src/__tests__/fixtures/controllers/roles.controller.ts +++ b/extensions/sequelize/src/__tests__/fixtures/controllers/roles.controller.ts @@ -40,7 +40,7 @@ export class RolesController extends TestControllerBase { return this.roleRepository.create(role); } - @get('/roles-desc') + @get('/roles') @response(200, { description: 'Role model instance', content: { @@ -49,22 +49,7 @@ export class RolesController extends TestControllerBase { }, }, }) - async getRolesByDesc( - @param.filter(Roles) filter?: Filter, - ): Promise { - return this.roleRepository.find(filter); - } - - @get('/roles-perm') - @response(200, { - description: 'Role model instance', - content: { - 'application/json': { - schema: getModelSchemaRef(Roles, {includeRelations: true}), - }, - }, - }) - async getRolesByPermission( + async getRoles( @param.filter(Roles) filter?: Filter, ): Promise { return this.roleRepository.find(filter); diff --git a/extensions/sequelize/src/__tests__/integration/repository.integration.ts b/extensions/sequelize/src/__tests__/integration/repository.integration.ts index 4db3fb6d0503..215da6f5bea8 100644 --- a/extensions/sequelize/src/__tests__/integration/repository.integration.ts +++ b/extensions/sequelize/src/__tests__/integration/repository.integration.ts @@ -1089,7 +1089,7 @@ describe('Sequelize CRUD Repository (integration)', () => { } as AnyObject, }; const roleByDesc = await client.get( - `/roles-desc?filter=${encodeURIComponent(JSON.stringify(filter))}`, + `/roles?filter=${encodeURIComponent(JSON.stringify(filter))}`, ); expect(roleByDesc.body).to.have.properties( @@ -1124,7 +1124,7 @@ describe('Sequelize CRUD Repository (integration)', () => { }, } as AnyObject; const roleByDesc = await client.get( - `/roles-perm?filter=${encodeURIComponent(JSON.stringify(filter))}`, + `/roles?filter=${encodeURIComponent(JSON.stringify(filter))}`, ); expect(roleByDesc.body).to.have.properties(