Commit 77bd62c

authored

Merge pull request #133 from MassiGy/block-eventSub-if-notEligible

Block event sub if not eligible

2 parents 56408b3 + da16d89 commit 77bd62cCopy full SHA for 77bd62c

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ module.exports.createEvent = async (req, res) => {`
`35`	`35`	`description: req.body.description,`
`36`	`36`	`host: req.body.host,`
`37`	`37`	`status: req.body.status,`
	`38`	`+ eligibleProfiles: req.body.eligibleProfiles,`
`38`	`39`	`date: req.body.date,`
`39`	`40`	`ownerId: req.user.id,`
`40`	`41`	`}`
`@@ -55,6 +56,7 @@ module.exports.createEvent = async (req, res) => {`
`55`	`56`	`host: event.host,`
`56`	`57`	`eventImage: event.eventImage,`
`57`	`58`	`status: event.status,`
	`59`	`+ eligibleProfiles: event.eligibleProfiles,`
`58`	`60`	`date: event.date,`
`59`	`61`	`});`
`60`	`62`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,13 @@ module.exports.rsvpEvent = async (req, res) => {`
`45`	`45`	`return res.status(400).send({ msg: 'Current user not found' });`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ const eligible = event.eligibleProfiles.includes(user.status) \|\| user.id === event.ownerId;`
	`49`	`+`
	`50`	`+`
	`51`	`+ if (!eligible) {`
	`52`	`+ return res.status(400).send({ msg: 'You are not eligilbe to subscribe to this event.' });`
	`53`	`+ }`
	`54`	`+`
`48`	`55`	`const alreadySub = await user.hasEvent(event);`
`49`	`56`
`50`	`57`	`if (alreadySub) return res.status(400).send({ msg: 'You are already subscribed.' });`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ module.exports.signup = async (req, res) => {`
`91`	`91`	`profilePicture: "https://fairfield-programming.herokuapp.com/duck/10001000005000043/",`
`92`	`92`	`biography: "This user hasn't set a biography yet...",`
`93`	`93`	`confirmed_email: false,`
`94`		`- status: "",`
	`94`	`+ status: req.body.userStatus,`
`95`	`95`	`})`
`96`	`96`
`97`	`97`	`// generate token`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ module.exports = (sequelize, DataTypes) => {`
`6`	`6`	`host: DataTypes.STRING,`
`7`	`7`	`eventImage: DataTypes.TEXT,`
`8`	`8`	`status: DataTypes.STRING,`
	`9`	`+ eligibleProfiles: [DataTypes.STRING],`
`9`	`10`	`date: DataTypes.DATE,`
`10`	`11`	`ownerId: DataTypes.INTEGER,`
`11`	`12`	`});`

Comments

(0)