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

4797-lilium-worker-notifications #1229

Merged
pau merged 37 commits from 4797-lilium-worker-notifications into dev 2023-02-02 08:53:29 +00:00
Conversation 0 Commits 37 Files Changed 8 +8 -10
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc806cc08f - Show all commits

13
back/models/notificationSubscription.js
View File

@ -7,9 +7,7 @@ module.exports = Self => {
const user = await ctx.instance.userFk; const user = await ctx.instance.userFk;
const modifiedUser = await getUserToModify(null, user, models); const modifiedUser = await getUserToModify(null, user, models);
if (userId == modifiedUser.id || userId == modifiedUser.bossFk) if (userId != modifiedUser.id && userId != modifiedUser.bossFk)
return;
else
throw new UserError('You dont have permission to modify this user'); throw new UserError('You dont have permission to modify this user');
pau marked this conversation as resolved
alexm commented 2023-01-09 08:36:35 +00:00
Review
Copy Link

Te ahorres fer if else, fent:

        if (userId != modifiedUser.id && userId != modifiedUser.bossFk)
            throw new UserError('You dont have permission to modify this user');

I ns si faria falta ficar return al final o no

Te ahorres fer if else, fent: ``` if (userId != modifiedUser.id && userId != modifiedUser.bossFk) throw new UserError('You dont have permission to modify this user'); ``` *I ns si faria falta ficar return al final o no*
}); });
@ -42,14 +40,13 @@ module.exports = Self => {
const user = ctx.req.accessToken.userId; const user = ctx.req.accessToken.userId;
const modifiedUser = await getUserToModify(notificationId, null, models); const modifiedUser = await getUserToModify(notificationId, null, models);
if (user == modifiedUser.id || modifiedUser.bossFk == user) { if (user != modifiedUser.id && user != modifiedUser.bossFk)
await models.NotificationSubscription.destroyById(notificationId);
return;
} else
throw new UserError('You dont have permission to modify this user'); throw new UserError('You dont have permission to modify this user');
await models.NotificationSubscription.destroyById(notificationId);
}; };
pau marked this conversation as resolved
alexm commented 2023-01-02 07:08:03 +00:00
Review
Copy Link

Self.deleteNotification = async function(ctx, userId, notificationId)

Y asi te ahorras poner

const notificationId = await ctx.args.notificationId;
const userId = await ctx.args.userId;
`Self.deleteNotification = async function(ctx, userId, notificationId)` Y asi te ahorras poner ``` const notificationId = await ctx.args.notificationId; const userId = await ctx.args.userId; ```
async function getUserToModify(notificationId = null, userFk = null, models) { async function getUserToModify(notificationId, userFk, models) {
if (notificationId != null) { if (notificationId != null) {
const subscription = await models.NotificationSubscription.findById(notificationId); const subscription = await models.NotificationSubscription.findById(notificationId);
const user = await subscription.userFk; const user = await subscription.userFk;
pau marked this conversation as resolved
alexm commented 2023-01-09 08:40:07 +00:00
Review
Copy Link

Pq per defecte els dos parametres son null?

Pq per defecte els dos parametres son null?

5
db/dump/structure.sql
View File

@ -19726,10 +19726,11 @@ DROP TABLE IF EXISTS `notificationSubscription`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `notificationSubscription` ( CREATE TABLE `notificationSubscription` (
`Id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`notificationFk` int(11) NOT NULL, `notificationFk` int(11) NOT NULL,
`userFk` int(10) unsigned NOT NULL, `userFk` int(10) unsigned NOT NULL,
PRIMARY KEY (`Id`), PRIMARY KEY (`id`),
KEY `notificationSubscription_ibfk_1` (`notificationFk`),
KEY `notificationSubscription_ibfk_2` (`userFk`), KEY `notificationSubscription_ibfk_2` (`userFk`),
CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE