changes needed for the worker Notification manager to work

@@ -0,0 +37,4 @@
+
+            myOptions.transaction = tx;
+        }
+

@@ -9,7 +9,6 @@
     "properties": {
         "notificationFk": {
             "type": "number",
-            "id": true,

@@ -0,0 +7,4 @@
+        let modifiedUser = await models.Worker.findOne({
+            fields: ['id', 'bossFk'],
+            where: {
+                id: ctx.instance.userFk

@@ -0,0 +14,4 @@
+    });
+
+    Self.remoteMethod('deleteNotification', {
+        description: 'Gets the current user data',

@@ -0,0 +44,4 @@
+        }
+    });
+
+    Self.deleteNotification = async function(ctx) {

@@ -0,0 +46,4 @@
+
+    Self.deleteNotification = async function(ctx) {
+        const models = Self.app.models;
+        const user = await ctx.args.authorId;

@@ -0,0 +22,4 @@
+                http: {source: 'context'}
+            },
+            {
+                arg: 'userId',

@@ -0,0 +30,4 @@
+                type: 'number'
+            },
+            {
+                arg: 'authorId',

@@ -0,0 +48,4 @@
+        const models = Self.app.models;
+        const user = await ctx.args.authorId;
+        const notificationId = await ctx.args.notificationId;
+        const userId = await ctx.args.userId;

@@ -0,0 +8,4 @@
+        const modifiedUser = await getUserToModify(null, user, models);
+
+        if (userId == modifiedUser.id || userId == modifiedUser.bossFk)
+            return;

@@ -19726,9 +19726,10 @@ DROP TABLE IF EXISTS `notificationSubscription`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `notificationSubscription` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,

@@ -19729,3 +19730,3 @@
   `notificationFk` int(11) NOT NULL,
   `userFk` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`notificationFk`,`userFk`),
+  PRIMARY KEY (`Id`),

@@ -19730,3 +19731,3 @@
   `userFk` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`notificationFk`,`userFk`),
+  PRIMARY KEY (`Id`),
   KEY `notificationSubscription_ibfk_2` (`userFk`),

@@ -0,0 +49,4 @@
+            throw new UserError('You dont have permission to modify this user');
+    };
+
+    async function getUserToModify(notificationId = null, userFk = null, models) {

@@ -0,0 +42,4 @@
+        const user = ctx.req.accessToken.userId;
+        const modifiedUser = await getUserToModify(notificationId, null, models);
+
+        if (user == modifiedUser.id || modifiedUser.bossFk == user) {

@@ -0,0 +40,4 @@
+    Self.deleteNotification = async function(ctx, notificationId) {
+        const models = Self.app.models;
+        const user = ctx.req.accessToken.userId;
+        const modifiedUser = await getUserToModify(notificationId, null, models);

@@ -0,0 +47,4 @@
+    };
+
+    async function getUserToModify(notificationId, userFk, models) {
+        if (notificationId != null) {

@@ -0,0 +1,22 @@
+const app = require('vn-loopback/server/server');

@@ -0,0 +1,22 @@
+const app = require('vn-loopback/server/server');
+
+describe('loopback model NotificationSubscription', () => {
+    it('Should fail to delete a notification if the user is not editing itself or a subordinate', async() => {

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)

@@ -19726,9 +19726,11 @@ DROP TABLE IF EXISTS `notificationSubscription`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `notificationSubscription` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)
+	VALUES ('NotificationSubscription','*','*','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,principalId)

@@ -0,0 +1,10 @@
+CREATE OR REPLACE TABLE `util`.`notificationSubscription` (

@@ -0,0 +2,4 @@
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `notificationFk` int(11) NOT NULL,
+  `userFk` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),

@@ -0,0 +1,4 @@
+ALTER TABLE

@@ -0,0 +1,4 @@
+ALTER TABLE util.notificationSubscription 
+ADD Id int(11) auto_increment NULL, 

@@ -0,0 +1,4 @@
+ALTER TABLE util.notificationSubscription 
+ADD Id int(11) auto_increment NULL, 
+DROP PRIMARY KEY, 
+ADD CONSTRAINT PRIMARY KEY (Id);