From df4ebbd775f2bcc001b44841759a5fb85d5fb54b Mon Sep 17 00:00:00 2001 From: carlosjr Date: Wed, 2 Jun 2021 10:31:26 +0200 Subject: [PATCH] minor refactor to use better semantics --- back/methods/starred-module/setPosition.js | 12 ++++++------ .../methods/starred-module/specs/setPosition.spec.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/back/methods/starred-module/setPosition.js b/back/methods/starred-module/setPosition.js index adfd87feb7..c72de10834 100644 --- a/back/methods/starred-module/setPosition.js +++ b/back/methods/starred-module/setPosition.js @@ -14,10 +14,10 @@ module.exports = function(Self) { description: 'The module name' }, { - arg: 'action', + arg: 'direction', type: 'string', required: true, - description: 'Whether to increases or decreases the module position, last if undefined' + description: 'Whether to move left or right the module position' } ], http: { @@ -26,7 +26,7 @@ module.exports = function(Self) { } }); - Self.setPosition = async(ctx, moduleName, action, options) => { + Self.setPosition = async(ctx, moduleName, direction, options) => { const models = Self.app.models; const userId = ctx.req.accessToken.userId; @@ -55,12 +55,12 @@ module.exports = function(Self) { let operator; let order; - switch (action) { - case 'increase': + switch (direction) { + case 'left': operator = {lt: movingModule.position}; order = 'position DESC'; break; - case 'decrease': + case 'right': operator = {gt: movingModule.position}; order = 'position ASC'; break; diff --git a/back/methods/starred-module/specs/setPosition.spec.js b/back/methods/starred-module/specs/setPosition.spec.js index c1b566aae6..6ac9cab169 100644 --- a/back/methods/starred-module/specs/setPosition.spec.js +++ b/back/methods/starred-module/specs/setPosition.spec.js @@ -43,7 +43,7 @@ describe('setPosition()', () => { expect(orders.position).toEqual(1); expect(clients.position).toEqual(2); - await app.models.StarredModule.setPosition(ctx, 'Clients', 'increase', options); + await app.models.StarredModule.setPosition(ctx, 'Clients', 'left', options); filter.where.moduleFk = 'Clients'; clients = await app.models.StarredModule.findOne(filter, options); @@ -84,7 +84,7 @@ describe('setPosition()', () => { expect(orders.position).toEqual(1); expect(clients.position).toEqual(2); - await app.models.StarredModule.setPosition(ctx, 'Orders', 'decrease', options); + await app.models.StarredModule.setPosition(ctx, 'Orders', 'right', options); filter.where.moduleFk = 'Orders'; orders = await app.models.StarredModule.findOne(filter, options); @@ -145,7 +145,7 @@ describe('setPosition()', () => { expect(orders.position).toEqual(4); expect(zones.position).toEqual(5); - await app.models.StarredModule.setPosition(ctx, 'Clients', 'decrease', options); + await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options); filter.where.moduleFk = 'Orders'; orders = await app.models.StarredModule.findOne(filter, options); @@ -203,7 +203,7 @@ describe('setPosition()', () => { expect(zones.position).toEqual(5); await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options); - await app.models.StarredModule.setPosition(ctx, 'Clients', 'decrease', options); + await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options); filter.where.moduleFk = 'Clients'; clients = await app.models.StarredModule.findOne(filter, options);