KevinMidboe/vinlottis
1
0
Fork 0
Code Issues 8 Pull Requests 14 Packages Projects Releases Wiki Activity

isAdmin default value = false.

Browse Source
This commit is contained in:
Kevin
2021-01-24 15:36:03 +01:00
parent b5b61784cc
commit f5d3b16f27
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/controllers/lotteryWinnerController.js
View File

@@ -78,9 +78,10 @@ const allWinners = (req, res) => {
const winnerById = (req, res) => { const winnerById = (req, res) => {
const { id } = req.params; const { id } = req.params;
const isAdmin = req.isAuthenticated();
return lotteryRepository return lotteryRepository
.winnerById(id) .winnerById(id, isAdmin)
.then(winner => .then(winner =>
res.send({ res.send({
winner, winner,
@@ -98,7 +99,7 @@ const winnerById = (req, res) => {
}; };
const deleteWinnerById = (req, res) => { const deleteWinnerById = (req, res) => {
const isAdmin = req.isAuthenticated() || true; const isAdmin = req.isAuthenticated();
const { id } = req.params; const { id } = req.params;
return lotteryRepository return lotteryRepository

8
api/lottery.js
View File

@@ -71,7 +71,7 @@ const redactWinnerInfoMapper = winner => {
}; };
}; };
const allAttendees = isAdmin => { const allAttendees = (isAdmin = false) => {
if (!isAdmin) { if (!isAdmin) {
return Attendee.find().then(attendees => attendees.map(redactAttendeeInfoMapper)); return Attendee.find().then(attendees => attendees.map(redactAttendeeInfoMapper));
} else { } else {
@@ -101,8 +101,6 @@ const updateAttendeeById = (id, updateModel) => {
throw new UserNotFound(); throw new UserNotFound();
} }
console.log(updateModel);
const updatedAttendee = { const updatedAttendee = {
name: updateModel.name != null ? updateModel.name : attendee.name, name: updateModel.name != null ? updateModel.name : attendee.name,
green: updateModel.green != null ? updateModel.green : attendee.green, green: updateModel.green != null ? updateModel.green : attendee.green,
@@ -113,8 +111,6 @@ const updateAttendeeById = (id, updateModel) => {
winner: updateModel.winner != null ? updateModel.winner : attendee.winner winner: updateModel.winner != null ? updateModel.winner : attendee.winner
}; };
console.log(updatedAttendee);
return Attendee.updateOne({ _id: id }, updatedAttendee).then(_ => updatedAttendee); return Attendee.updateOne({ _id: id }, updatedAttendee).then(_ => updatedAttendee);
}); });
}; };
@@ -211,7 +207,7 @@ const allWinners = (isAdmin = false) => {
} }
}; };
const winnerById = (id, isAdmin) => { const winnerById = (id, isAdmin = false) => {
return VirtualWinner.findOne({ _id: id }).then(winner => { return VirtualWinner.findOne({ _id: id }).then(winner => {
if (winner == null) { if (winner == null) {
throw new WinnerNotFound(); throw new WinnerNotFound();