8062-testToMaster_2 #3059

Merged
alexm merged 293 commits from 8062-testToMaster_2 into master 2024-10-03 05:43:41 +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 => { module.exports = Self => {
require('../methods/worker-time-control-mail/checkInbox')(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" "type": "number"
} }
}, },
"acls": [ "relations": {
{ "user": {
"accessType": "READ", "type": "belongsTo",
"principalType": "ROLE", "model": "VnUser",
"principalId": "employee", "foreignKey": "workerFk"
"permission": "ALLOW" }
} },
] "acls": []
} }