From 70c80849df7a3145685d701ba1bf364897d4a2be Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Thu, 18 Feb 2021 20:54:15 +0100 Subject: [PATCH] No longer delete winner as part of selecting prize. Winners are rather marked with prize_selected and have it's own endpoint to remove all winners. --- api/prizeDistribution.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/prizeDistribution.js b/api/prizeDistribution.js index 4aafb4f..e04eb89 100644 --- a/api/prizeDistribution.js +++ b/api/prizeDistribution.js @@ -5,9 +5,10 @@ const PreLotteryWine = require(path.join(__dirname, "/schemas/PreLotteryWine")); const VirtualWinner = require(path.join(__dirname, "/schemas/VirtualWinner")); const message = require(path.join(__dirname, "/message")); -const highscoreRepository = require(path.join(__dirname, "/winner")); +const historyRepository = require(path.join(__dirname, "/history")); +const winnerRepository = require(path.join(__dirname, "/winner")); const wineRepository = require(path.join(__dirname, "/wine")); -const lottery = require(path.join(__dirname, "/lottery")); +const prelotteryWineRepository = require(path.join(__dirname, "/prelotteryWine")); const { WinnerNotFound, WineSelectionWinnerNotNextInLine, WinnersTimelimitExpired } = require(path.join( __dirname, @@ -36,12 +37,11 @@ const verifyWinnerNextInLine = async id => { return Promise.resolve(foundWinner); }; -const claimPrize = (winner, wine) => { +const claimPrize = (wine, winner) => { return wineRepository .addWine(wine) - .then(_ => lottery.deleteWineById(wine.id)) // prelotteryWine.deleteById - .then(_ => highscoreRepository.addWinnerWithWine(winner, wine)) // wines.js : addWine - .then(_ => lottery.addWinnerWithWine(winner, wine)) + .then(_ => prelotteryWineRepository.addWinnerToWine(wine, winner)) // prelotteryWine.deleteById + .then(_ => historyRepository.addWinnerWithWine(winner, wine)) // wines.js : addWine .then(_ => message.sendWineConfirmation(winner, wine)); };