back/methods/notification/send.js

@@ -1,7 +1,7 @@
 module.exports = Self => {
     Self.remoteMethod('send', {
         description: 'Send notifications from queue',
-        accessType: 'WRITE',
+        accessType: 'READ',
         returns: {
             type: 'object',
             root: true
@@ -13,6 +13,23 @@ module.exports = Self => {
     });
 
     Self.send = async() => {
+        const status = 'pending';
 
+        const myOptions = {};
+        let tx;
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        const notificationQueue = await Self.app.models.NotificationQueue.find({
+            where: {code: status},
+            include: [{
+                relation: 'notificationSubscription'
+            }]
+        }, myOptions);
+
+        console.log(notificationQueue);
     };
 };

back/model-config.json

@@ -77,6 +77,21 @@
     "Module": {
         "dataSource": "vn"
     },
+    "Notification": {
+        "dataSource": "vn"
+    },
+    "NotificationAcl": {
+        "dataSource": "vn"
+    },
+    "NotificationConfig": {
+        "dataSource": "vn"
+    },
+    "NotificationQueue": {
+        "dataSource": "vn"
+    },
+    "NotificationSubscription": {
+        "dataSource": "vn"
+    },
     "Province": {
         "dataSource": "vn"
     },

back/models/notification.js

@@ -1,4 +1,3 @@
 module.exports = Self => {
     require('../methods/notification/send')(Self);
-    require('../methods/notification/clear')(Self);
 };

back/models/notification.json

@@ -1,9 +1,9 @@
 {
-	"name": "Notificacion",
+	"name": "Notification",
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "notificacion"
+			"table": "util.notification"
 		}
 	},
 	"properties": {

back/models/notificationAcl.json

@@ -1,16 +1,16 @@
 {
-	"name": "NotificacionAcl",
+	"name": "NotificationAcl",
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "notificacionAcl"
+			"table": "util.notificationAcl"
 		}
 	},
 	"relations": {
-        "notificacion": {
+        "notification": {
             "type": "belongsTo",
-            "model": "Notificacion",
-            "foreignKey": "notificacionFk"
+            "model": "Notification",
+            "foreignKey": "notificationFk"
         },
         "role": {
             "type": "belongsTo",

back/models/notificationConfig.json

@@ -3,7 +3,7 @@
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "notificationConfig"
+			"table": "util.notificationConfig"
 		}
 	},
 	"properties": {

back/models/notificationQueue.json

@@ -1,9 +1,9 @@
 {
-	"name": "NotificacionQueue",
+	"name": "NotificationQueue",
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "notificacionQueue"
+			"table": "util.notificationQueue"
 		}
 	},
 	"properties": {
@@ -23,10 +23,10 @@
         }
     },
     "relations": {
-        "notificacion": {
+        "notification": {
             "type": "belongsTo",
-            "model": "Notificacion",
-            "foreignKey": "notificacionFk"
+            "model": "Notification",
+            "foreignKey": "notificationFk"
         },
         "author": {
             "type": "belongsTo",

back/models/notificationSubscription.json

@@ -3,14 +3,14 @@
 	"base": "VnModel",
 	"options": {
 		"mysql": {
-			"table": "notificationSubscription"
+			"table": "util.notificationSubscription"
 		}
 	},
 	"relations": {
-        "notificacion": {
+        "notification": {
             "type": "belongsTo",
-            "model": "Notificacion",
-            "foreignKey": "notificacionFk"
+            "model": "Notification",
+            "foreignKey": "notificationFk"
         },
         "user": {
             "type": "belongsTo",

db/changes/10490-goldenSummer/00-aclNotification.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Notification', '*', 'READ', 'ALLOW', 'ROLE', 'developer');

db/dump/fixtures.sql

@@ -2613,4 +2613,20 @@ INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`,
         (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13);
 
 INSERT INTO `util`.`notificationConfig`
-	SET `cleanDays` = 90;
+	SET `cleanDays` = 90;
+
+INSERT INTO `util`.`notification` (`id`, `name`, `description`)
+    VALUES
+        (1, 'notification one', 'notification fixture one');
+
+INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
+    VALUES
+        (1, 9);
+
+INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
+    VALUES
+        (1, 'notification one', 'randomParams', 9, 'pending', util.VN_CURDATE());
+
+INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
+    VALUES
+        (1, 1110);