Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 0ad7b14

Browse files
committed
code refactoring and optimization
1 parent 51cf7d4 commit 0ad7b14

File tree

22 files changed

+85
-86
lines changed

22 files changed

+85
-86
lines changed

‎src/controllers/Events/deleteEvent.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@
1313
*/
1414

1515

16+
17+
1618
module.exports.deleteEvent = async (req, res) => {
1719
if (!req.user) return res.status(403).send({ msg: 'Not Logged in.' });
1820
if (!req.params.id) return res.status(400).send({ msg: 'Not All Parameters Provided.' });
1921

2022
try {
21-
23+
2224
const event = await Events.findOne({
2325
where: {
2426
id: req.params.id,
2527
},
2628
})
2729

2830
if (!event) {
29-
return res.status(400).send({ msg: 'Event does not exist' });
31+
return res.status(400).send({ msg: 'Event not found.' });
3032
}
3133

3234
if (event.ownerId !== req.user.id) {
@@ -35,16 +37,16 @@ module.exports.deleteEvent = async (req, res) => {
3537

3638

3739

38-
const users = await User.findAll({
39-
where: {
40-
events: event,
41-
},
42-
})
40+
const users = await event.getUsers();
41+
42+
users.forEach(user => {
43+
user.removeEvents(event);
44+
});
45+
46+
event.destroy();
47+
48+
return res.status(200).send({ msg: 'Event deleted.' });
4349

44-
Promise.allSettled([
45-
await users.removeEvents(event),
46-
await event.destroy()
47-
])
4850

4951
} catch (err) {
5052
return res.status(500).send({ msg: 'Error deleting event' });

‎src/controllers/Events/editEvent.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module.exports.editEvent = async (req, res) => {
2424
if (missingParameters(req)) return res.status(400).send({ msg: 'Not All Parameters Provided.' });
2525

2626
try {
27+
2728
const event = await Events.findOne({
2829
where: {
2930
id: req.params.id,

‎src/controllers/Events/listEvents.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ module.exports.listEvents = async (req, res) => {
1717
try {
1818
const events = await Events.findAll({});
1919

20-
if (!events.length) return res.status(404).send({ msg: 'No events for now.' });
20+
if (!events?.length) return res.status(404).send({ msg: 'No events for now.' });
2121

22-
return res.json(events);
22+
return res.status(200).json(events);
2323

2424
} catch (err) {
25+
console.log(err.message);
2526
return res.status(500).send({ msg: 'Error on searching for all events.' });
2627
}
2728
};

‎src/controllers/Events/queryEvent.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,22 @@
1515

1616

1717
module.exports.queryEvent = async (req, res) => {
18-
if (!req.params.id) return res.status(400).send({ msg: 'Not All Parameters Provided.' });
18+
if (!req.params.id) {
19+
return res.status(400).send({ msg: 'Not All Parameters Provided.' });
20+
}
1921

2022
try {
2123
const event = await Events.findOne({
2224
where: {
2325
id: req.params.id,
2426
},
2527
})
28+
2629
if (!event) {
2730
return res.status(404).send({ msg: 'Event Not Found.' });
2831
}
2932

30-
return res.json(event);
33+
return res.status(200).json(event);
3134

3235
} catch (err) {
3336
console.log(err.message);

‎src/controllers/Events/rsvpEvent.js‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515

1616

1717
module.exports.rsvpEvent = async (req, res) => {
18+
1819
if (!req.user) return res.status(403).send({ msg: 'Not Logged In.' });
1920
if (!req.params.id) return res.status(400).send({ msg: 'Not All Parameters Provided.' });
2021

2122
try {
2223

23-
const [event, user] = Promise.allSettled([
24+
const [event, user] = Promise.all([
2425

2526
await Events.findOne({
2627
where: {
@@ -39,20 +40,12 @@ module.exports.rsvpEvent = async (req, res) => {
3940
return res.status(404).send({ msg: 'Event not found.' });
4041
}
4142
if (!user) {
42-
return res.status(400).send({ msg: 'Current user profil not saved' });
43+
return res.status(400).send({ msg: 'Current user not found' });
4344
}
4445

4546
user.addEvents(event);
4647

47-
res.json({
48-
name: event.name,
49-
location: event.location,
50-
description: event.description,
51-
host: event.host,
52-
eventImage: event.eventImage,
53-
status: event.status,
54-
date: event.date,
55-
});
48+
res.status(200).json(event);
5649

5750
} catch (err) {
5851
console.log(err.message);

‎src/controllers/Events/unrsvpEvent.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports.unrsvpEvent = async (req, res) => {
2121

2222
try {
2323

24-
const [event, user] = Promise.allSettled([
24+
const [event, user] = Promise.all([
2525
await Events.findOne({
2626
where: {
2727
id: req.params.id,
@@ -42,18 +42,13 @@ module.exports.unrsvpEvent = async (req, res) => {
4242
if (!user) {
4343
return res.status(400).send({ msg: 'Current user profil not saved' });
4444
}
45-
45+
if (!user.hasEvent(event)) {
46+
return res.status(401).send({ msg: 'You are not subscribed to this event.' });
47+
}
48+
4649
user.removeEvents(event);
4750

48-
res.json({
49-
name: event.name,
50-
location: event.location,
51-
description: event.description,
52-
host: event.host,
53-
eventImage: event.eventImage,
54-
status: event.status,
55-
date: event.date,
56-
});
51+
res.status(200).json(event);
5752

5853
} catch (err) {
5954
console.log(err.message);

‎src/controllers/User/Account/deleteAccount.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports.deleteAccount = async (req, res) => {
2626

2727
const user = await User.findOne({
2828
where: {
29-
id: req.params.id,
29+
id: req.user.id,
3030
},
3131
})
3232

‎src/controllers/User/Account/getStatus.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module.exports.getStatus = async (req, res) => {
3030

3131
} catch (err) {
3232
console.log(err.message);
33-
return res.status(500).send({ msg: 'IError on getting account status.' });
33+
return res.status(500).send({ msg: 'Error on getting account status.' });
3434
}
3535

3636
};

‎src/controllers/User/Account/login.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports.login = async (req, res) => {
5151

5252
} catch (err) {
5353
console.log(err.message);
54-
return res.status(500).send({ msg: 'Error on login in.' })
54+
return res.status(500).send({ msg: 'Error on login.' })
5555
}
5656

5757
}

‎src/controllers/User/Account/setPass.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ module.exports.setPass = async (req, res) => {
4444
return res.status(500).send({ msg: 'Error on updating password.' });
4545
}
4646

47-
const updatedUser = await user.update({ password: hashString })
48-
updatedUser.save();
47+
user.update({ password: hashString })
4948

5049
return res.send(200).send({ msg: "Password Set." })
5150
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /