verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#6276 createNewWarehouse methods migrated from silex to salix #1850

Merged
jorgep merged 158 commits from 6276-createNewWarehouse into dev 2024-03-06 11:32:11 +00:00
Conversation 4 Commits 158 Files Changed 59 +68 -76
5 changed files with 68 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f862ed7d8a - Show all commits

63
back/methods/machine-worker/updateInTime.js Normal file
View File

@ -0,0 +1,63 @@
module.exports = Self => {
Self.remoteMethodCtx('updateInTime', {
description: '',
accessType: 'WRITE',
accepts: [
{
arg: 'plate',
type: 'string',
}
],
http: {
path: `/updateInTime`,
verb: 'POST'
}
});
Self.updateInTime = async(ctx, plate, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
let tx;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
const machine = await models.Machine.findOne({
fields: ['id', 'plate'],
where: {plate}
}, myOptions);
if (!machine) throw new Error(`plate ${plate} does not exist`);
const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
const machineWorker = await models.MachineWorker.findOne({
where: {
workerFk: userId,
inTime: {gte: new Date(Date.now() - maxHours * 60 * 60 * 1000)},
outTimed: null,
machineFk: machine.id,
}
});
if (machineWorker) {
await machineWorker.updateAttributes({
inTime: new Date(Date.now())
jorgep marked this conversation as resolved Outdated
jgallego commented 2024-02-17 06:53:56 +00:00
Outdated
Review
Copy Link

isHimself

isHimself
}, myOptions);
}
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
};

71
back/methods/machine-worker/updateMachine.js
View File

@ -1,71 +0,0 @@
module.exports = Self => {
Self.remoteMethodCtx('updateMachine', {
description: '',
accessType: 'WRITE',
accepts: [
{
arg: 'plate',
type: 'string',
}
],
returns: {
type: 'object',
root: true
},
http: {
path: `/update-machine`,
verb: 'POST'
}
});
Self.updateMachine = async(ctx, plate, options) => {
const models = Self.app.models;
const userId = ctx.req.accessToken.userId;
let tx;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
let insertState = false;
const machine = await models.Machine.findOne({
fields: ['id', 'plate'],
where: {plate}
}, myOptions);
if (machine) {
const {maxHours} = await models.MachineWorkerConfig.findOne({fields: ['maxHours']}, myOptions);
const machineWorker = await models.MachineWorker.findOne({
where: {
workerFk: userId,
inTime: {gte: new Date(Date.now() - maxHours * 60 * 60 * 1000)},
outTimed: null,
machineFk: machine.id,
}
});
if (machineWorker) {
await machineWorker.updateAttributes({
inTime: new Date(Date.now())
}, myOptions);
}
insertState = true;
}
if (tx) await tx.commit();
return insertState;
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
};
};

2
back/models/machine-worker.js
View File

@ -1,3 +1,3 @@
module.exports = Self => {
require('../methods/machine-worker/updateMachine')(Self);
require('../methods/machine-worker/updateInTime')(Self);
};

5
db/changes/234801/00-newWareHouse.sql → db/changes/235001/00-newWareHouse.sql
View File

@ -2,7 +2,4 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
VALUES
('Collection', 'assignCollection', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
('ExpeditionPallet', 'getPallet', 'READ', 'ALLOW', 'ROLE', 'employee'),
('MachineWorker','updateMachine','WRITE','ALLOW','ROLE','employee');
INSERT INTO `vn`.`machineWorkerConfig` (id, maxHours)
VALUES (1, 12)
('MachineWorker','updateInTime','WRITE','ALLOW','ROLE','employee');

3
db/dump/fixtures.sql
View File

@ -3671,3 +3671,6 @@ CALL itemShelvingSale_reserveByCollection(10101010);
UPDATE vn.collection
SET workerFk=9
WHERE id=10101010;
INSERT INTO `vn`.`machineWorkerConfig` (id, maxHours)
VALUES (1, 12)