Commit b8c1749

committed

Block System fixed

1 parent d90c2cd commit b8c1749Copy full SHA for b8c1749

File tree

+21

-13

lines changed

+21

-13

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`
`2`	`2`	`/**`
`3`	`3`	`* @module Block User Controller`
`4`		`- *`
	`4`	`+ *`
`5`	`5`	`* @param {Request} req - HTTP Request from the client`
`6`	`6`	`* @param {Response} res - HTTP Response for the client`
`7`		`- *`
	`7`	`+ *`
`8`	`8`	`* @description`
`9`	`9`	`* This controller will allow the user to block a specific user, if all parameters are correct.`
`10`		`- *`
	`10`	`+ *`
`11`	`11`	`* @todo`
`12`	`12`	`* Nothing for now.`
`13`	`13`	`*/`
`@@ -40,11 +40,14 @@ module.exports.blockUser = async (req, res) => {`
`40`	`40`	`if (!user) {`
`41`	`41`	`return res.status(404).send({ msg: 'Current account not found.' })`
`42`	`42`	`}`
`43`		`- if (user.hasBlocked(userToBlock)) {`
	`43`	`+`
	`44`	`+ const alreadyBlocked = await user.hasBlockedUser(userToBlock);`
	`45`	`+`
	`46`	`+ if (alreadyBlocked) {`
`44`	`47`	`return res.status(400).send({ msg: 'You have already blocked this person.' });`
`45`	`48`	`}`
`46`	`49`
`47`		`- user.addBlocked(userToBlock);`
	`50`	`+ user.addBlockedUser(userToBlock);`
`48`	`51`
`49`	`52`	`return res.status(200).send({ msg: 'User blocked.' });`
`50`	`53`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,19 @@ module.exports.listBlocked = async (req, res) => {`
`19`	`19`
`20`	`20`	`try {`
`21`	`21`
`22`		`- const user = await User.findOne({`
	`22`	`+ const userBlockedList = await User.findOne({`
`23`	`23`	`where: {`
`24`	`24`	`id: req.user.id,`
`25`	`25`	`},`
`26`		`- })`
	`26`	`+ include: 'BlockedUser',`
	`27`	`+ });`
`27`	`28`
`28`	`29`	`if (!user) {`
`29`	`30`	`return res.status(404).send({ msg: 'User not found.' });`
`30`	`31`	`}`
`31`	`32`
`32`		`-constblockedUsers=awaituser.getBlocked();`
`33`		`- return res.status(200).json(blockedUsers);`
	`33`	`+`
	`34`	`+ return res.status(200).json(userBlockedList.BlockedUser);`
`34`	`35`
`35`	`36`	`} catch (err) {`
`36`	`37`	`console.log(err.message);`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ module.exports.queryBlock = async (req, res) => {`
`23`	`23`	`const [blockedUser, user] = await Promise.all([`
`24`	`24`	`User.findOne({`
`25`	`25`	`where: {`
`26`		`- id: req.params.blockId,`
	`26`	`+ id: req.params.blockedId,`
`27`	`27`	`},`
`28`	`28`	`})`
`29`	`29`	`,`
`@@ -41,7 +41,9 @@ module.exports.queryBlock = async (req, res) => {`
`41`	`41`	`return res.status(404).send({ msg: 'Current account not found. Try loggin in.' })`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!user.hasBlocked(blockedUser)) {`
	`44`	`+ const alreadyBlocked = await user.hasBlockedUser(blockedUser);`
	`45`	`+`
	`46`	`+ if (!alreadyBlocked) {`
`45`	`47`	`return res.status(401).send({ msg: "You have not blocked this person." });`
`46`	`48`	`}`
`47`	`49`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,13 @@ module.exports.unblockUser = async (req, res) => {`
`43`	`43`	`return res.status(404).send({ msg: 'Current account not found.' });`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (!user.hasBlocked(blockedUser)) {`
	`46`	`+ const alreadyBlocked = await user.hasBlockedUser(blockedUser);`
	`47`	`+`
	`48`	`+ if (!alreadyBlocked) {`
`47`	`49`	`return res.status(401).send({ msg: "You have not blocked this person." });`
`48`	`50`	`}`
`49`	`51`
`50`		`- user.removeBlocked(blockedUser);`
	`52`	`+ user.removeBlockedUser(blockedUser);`
`51`	`53`
`52`	`54`	`return res.status(200).send({ msg: 'User unblocked.' });`
`53`	`55`

Comments

(0)