diff --git a/modules/claim/back/methods/claim/specs/updateClaim.spec.js b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
index 0222164ecb..b6ae232819 100644
--- a/modules/claim/back/methods/claim/specs/updateClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/updateClaim.spec.js
@@ -29,18 +29,18 @@ describe('Update Claim', () => {
it(`should throw an error as the user doesn't have rights`, async() => {
const forbiddenState = 3;
const salesPersonId = 18;
- let data = {
- claimStateFk: forbiddenState,
- observation: 'valid observation'
- };
let ctx = {
req: {
accessToken: {
userId: salesPersonId
}
+ },
+ args: {
+ claimStateFk: forbiddenState,
+ observation: 'valid observation'
}
};
- await app.models.Claim.updateClaim(ctx, newInstance.id, data)
+ await app.models.Claim.updateClaim(ctx, newInstance.id)
.catch(e => {
error = e;
});
@@ -51,23 +51,23 @@ describe('Update Claim', () => {
it(`should success to update the claim within privileges `, async() => {
const correctState = 4;
const salesPersonId = 18;
- let data = {
- observation: 'valid observation',
- claimStateFk: correctState,
- hasToPickUp: false
- };
let ctx = {
req: {
accessToken: {
userId: salesPersonId
}
+ },
+ args: {
+ observation: 'valid observation',
+ claimStateFk: correctState,
+ hasToPickUp: false
}
};
- await app.models.Claim.updateClaim(ctx, newInstance.id, data);
+ await app.models.Claim.updateClaim(ctx, newInstance.id);
let claimUpdated = await app.models.Claim.findById(newInstance.id);
- expect(claimUpdated.observation).toEqual(data.observation);
+ expect(claimUpdated.observation).toEqual(ctx.args.observation);
});
it('should change some sensible fields as salesAssistant', async() => {
@@ -75,28 +75,28 @@ describe('Update Claim', () => {
spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
const salesAssistantId = 21;
- let data = {
- claimStateFk: 3,
- workerFk: 5,
- observation: 'another valid observation',
- hasToPickUp: true
- };
const ctx = {
req: {
accessToken: {userId: salesAssistantId},
headers: {origin: 'http://localhost'}
+ },
+ args: {
+ claimStateFk: 3,
+ workerFk: 5,
+ observation: 'another valid observation',
+ hasToPickUp: true
}
};
ctx.req.__ = (value, params) => {
return params.nickname;
};
- await app.models.Claim.updateClaim(ctx, newInstance.id, data);
+ await app.models.Claim.updateClaim(ctx, newInstance.id);
let claimUpdated = await app.models.Claim.findById(newInstance.id);
- expect(claimUpdated.observation).toEqual(data.observation);
- expect(claimUpdated.claimStateFk).toEqual(data.claimStateFk);
- expect(claimUpdated.workerFk).toEqual(data.workerFk);
+ expect(claimUpdated.observation).toEqual(ctx.args.observation);
+ expect(claimUpdated.claimStateFk).toEqual(ctx.args.claimStateFk);
+ expect(claimUpdated.workerFk).toEqual(ctx.args.workerFk);
expect(chatModel.sendCheckingPresence).toHaveBeenCalled();
});
});
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index b7156feef0..c2c97d9254 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -1,35 +1,47 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethodCtx('updateClaim', {
+ Self.remoteMethod('updateClaim', {
description: 'Update a claim with privileges',
- accessType: 'WRITE',
accepts: [{
+ arg: 'ctx',
+ type: 'Object',
+ http: {source: 'context'}
+ }, {
arg: 'id',
- type: 'number',
- required: true,
+ type: 'Number',
description: 'Claim id',
http: {source: 'path'}
- }, {
- arg: 'data',
- type: 'object',
- required: true,
- description: 'Data to update on the model',
- http: {source: 'body'}
+ },
+ {
+ arg: 'workerFk',
+ type: 'Number'
+ },
+ {
+ arg: 'claimStateFk',
+ type: 'Number'
+ },
+ {
+ arg: 'observation',
+ type: 'String'
+ },
+ {
+ arg: 'hasToPickUp',
+ type: 'boolean'
}],
returns: {
type: 'object',
root: true
},
http: {
- path: `/:id/updateClaim`,
- verb: 'post'
+ verb: 'patch',
+ path: `/updateClaim/:id`
}
});
- Self.updateClaim = async(ctx, id, data) => {
+ Self.updateClaim = async(ctx, id) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
-
+ const args = ctx.args;
const $t = ctx.req.__; // $translate
const claim = await models.Claim.findById(id, {
include: {
@@ -41,17 +53,20 @@ module.exports = Self => {
}
}
});
+ let changedHasToPickUp = false;
+ if (args.hasToPickUp)
+ changedHasToPickUp = true;
- const canUpdate = await canChangeState(ctx, claim.claimStateFk);
- const hasRights = await canChangeState(ctx, data.claimStateFk);
- const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant');
- const changedHasToPickUp = claim.hasToPickUp != data.hasToPickUp;
-
- if (!canUpdate || !hasRights || changedHasToPickUp && !isSalesAssistant)
- throw new UserError(`You don't have enough privileges to change that field`);
-
- const updatedClaim = await claim.updateAttributes(data);
+ if (args.claimStateFk) {
+ const canUpdate = await canChangeState(ctx, claim.claimStateFk);
+ const hasRights = await canChangeState(ctx, args.claimStateFk);
+ const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant');
+ if (!canUpdate || !hasRights || changedHasToPickUp && !isSalesAssistant)
+ throw new UserError(`You don't have enough privileges to change that field`);
+ }
+ delete args.ctx;
+ const updatedClaim = await claim.updateAttributes(args);
// Get sales person from claim client
const salesPerson = claim.client().salesPersonUser();
if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp) {
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index c73e04b241..2267949039 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -1,8 +1,7 @@
+ form="form"
+ save="patch">