diff --git a/api/retrieve.js b/api/retrieve.js index c7577b8..9cbd64a 100644 --- a/api/retrieve.js +++ b/api/retrieve.js @@ -9,6 +9,7 @@ mongoose.connect("mongodb://localhost:27017/vinlottis", { const Purchase = require(path.join(__dirname + "/../schemas/Purchase")); const Wine = require(path.join(__dirname + "/../schemas/Wine")); const Highscore = require(path.join(__dirname + "/../schemas/Highscore")); +const RequestedWine = require(path.join(__dirname + "/../schemas/RequestedWine")); const PreLotteryWine = require(path.join( __dirname + "/../schemas/PreLotteryWine" )); @@ -103,6 +104,13 @@ router.route("/highscore/statistics").get(async (req, res) => { res.json(highscore); }); +router.route("/wines/all-requested-wines").get(async (req, res) => { + const allWines = await RequestedWine.find({}).populate("wine"); + + res.json(allWines); +}); + + router.route("/wines/statistics").get(async (req, res) => { const wines = await Wine.find(); diff --git a/api/vinmonopolet.js b/api/vinmonopolet.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/api.js b/src/api.js index 395de2d..b549d22 100644 --- a/src/api.js +++ b/src/api.js @@ -24,6 +24,12 @@ const overallWineStatistics = () => { return fetch(url.href).then(resp => resp.json()); }; +const allRequestedWines = () => { + const url = new URL("/api/wines/all-requested-wines", BASE_URL); + + return fetch(url.href).then(resp => resp.json()); +}; + const chartWinsByColor = () => { const url = new URL("/api/purchase/statistics/color", BASE_URL); @@ -285,6 +291,7 @@ export { wineSchema, barcodeToVinmonopolet, searchForWine, + allRequestedWines, login, register, addAttendee, diff --git a/src/components/AllRequestedWines.vue b/src/components/AllRequestedWines.vue index baa8bc8..8b84f61 100644 --- a/src/components/AllRequestedWines.vue +++ b/src/components/AllRequestedWines.vue @@ -1,14 +1,27 @@