8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
4 changed files with 47 additions and 9 deletions
Showing only changes of commit f1f10d1367 - Show all commits

View File

@ -0,0 +1,3 @@
-- Place your SQL code here
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES ('WorkerTimeControlMail', 'getWeeklyMail', 'READ', 'ALLOW', 'ROLE', '$owner');

View File

@ -0,0 +1,34 @@
module.exports = Self => {
Self.remoteMethod('getWeeklyMail', {
description: 'Check an email inbox and process it',
accessType: 'READ',
accepts: [{
arg: 'id',
type: 'number',
description: 'workerFk',
required: true,
http: {source: 'path'}
}, {
arg: 'week',
type: 'number',
required: true
}, {
arg: 'year',
type: 'number',
required: true
}],
returns:
{
type: 'Object',
root: true
},
http: {
path: `/:id/getWeeklyMail`,
verb: 'GET'
}
});
Self.getWeeklyMail = async(workerFk, week, year) => {
return Self.findOne({where: {workerFk, week, year}});
};
};

View File

@ -1,3 +1,4 @@
module.exports = Self => {
require('../methods/worker-time-control-mail/checkInbox')(Self);
require('../methods/worker-time-control-mail/getWeeklyMail')(Self);
};

View File

@ -33,12 +33,12 @@
"type": "number"
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "employee",
"permission": "ALLOW"
"relations": {
"user": {
"type": "belongsTo",
"model": "VnUser",
"foreignKey": "workerFk"
}
]
},
"acls": []
}