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

When selecting prize, add winner to wine.

Browse Source 
Changed the way we register a prize for winner.
Now we have a new prize_selected boolean field on a winner. This is
used to filter on when finding what winners have not selected a prize
yet. This also replaces the previous method of removing virtualWinners
after they selected a prize.

PrelotteryWine also get's a winner reference. This is used to filter on
when finding what prizes are left, and also makes it easier to
archive/register a lottery when the wine has a winner attached.
This commit is contained in:
Kevin
2021-02-18 20:50:30 +01:00
parent 4bd3b688e9
commit a28a8ccacb
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/prizeDistribution.js
View File

@@ -24,10 +24,11 @@ const verifyWinnerNextInLine = async id => {
}
let allWinners = await VirtualWinner.find().sort({ timestamp_drawn: 1 });
if (
allWinners[0].id != foundWinner.id ||
foundWinner.timestamp_limit == undefined ||
foundWinner.timestamp_sent == undefined
foundWinner.timestamp_sent == undefined ||
foundWinner.prize_selected == true
) {
throw new WineSelectionWinnerNotNextInLine();
}
@@ -47,8 +48,8 @@ const claimPrize = (winner, wine) => {
const notifyNextWinner = async () => {
let nextWinner = undefined;
const winnersLeft = await VirtualWinner.find().sort({ timestamp_drawn: 1 });
const winesLeft = await PreLotteryWine.find();
const winnersLeft = await VirtualWinner.find({ prize_selected: false }).sort({ timestamp_drawn: 1 });
const winesLeft = await PreLotteryWine.find({ winner: { $exists: false } });
if (winnersLeft.length > 1) {
console.log("multiple winners left, choose next in line");
@@ -60,7 +61,7 @@ const notifyNextWinner = async () => {
console.log("one winner and one wine left, choose for user");
nextWinner = winnersLeft[0]; // one winner and one wine left, choose for user
wine = winesLeft[0];
return claimPrize(nextWinner, wine);
return claimPrize(wine, nextWinner);
}
if (nextWinner) {
@@ -82,7 +83,7 @@ function startTimeout(id) {
console.log(`Starting timeout for user ${id}.`);
console.log(`Timeout duration: ${minutesForTimeout * minute}`);
setTimeout(async () => {
let virtualWinner = await VirtualWinner.findOne({ id: id });
let virtualWinner = await VirtualWinner.findOne({ id: id, prize_selected: false });
if (!virtualWinner) {
console.log(`Timeout done for user ${id}, but user has already sent data.`);
return;
@@ -96,7 +97,7 @@ function startTimeout(id) {
virtualWinner.timestamp_sent = null;
await virtualWinner.save();
findAndNotifyNextWinner();
notifyNextWinner();
}, minutesForTimeout * minute);
return Promise.resolve();