WIP Functionality to request wines for next lottery #24

Merged
Adrianht merged 23 commits from feat/request-wine into master 2020-09-07 14:28:31 +00:00
5 changed files with 112 additions and 0 deletions
Showing only changes of commit 09f0436f98 - Show all commits

0
api/vinmonopolet.js Normal file
View File

View File

@@ -9,6 +9,52 @@ router.use((req, res, next) => {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
next();
});
const convertToOurWineObject = wine => {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
console.log("traff her", wine)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
return {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
name: wine.basic.productShortName,
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
image: `https://bilder.vinmonopolet.no/cache/300x300-0/${wine.basic.productId}-1.jpg`,
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
rating: undefined,
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
price: wine.prices[0].salesPrice,
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
country: wine.origins.origin.country,
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
vivinoLink: undefined
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
}
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
}
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
router.route("/wineinfo/search").get(async (req, res) => {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
console.log("h")
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
console.log(req)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
const {query} = req.query
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
let url = new URL(`https://apis.vinmonopolet.no/products/v0/details-normal?productShortNameContains=test&maxResults=5`)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
url.searchParams.set('productShortNameContains', query)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
const vinmonopoletResponse = await fetch(url, {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
headers: {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
"Ocp-Apim-Subscription-Key": ""
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
}
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
})
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
.then(resp => resp.json())
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
const winesConverted = vinmonopoletResponse.map(convertToOurWineObject)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
console.log(winesConverted)
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
if (vinmonopoletResponse.errors != null) {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
return vinmonopoletResponse.errors.map(error => {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
if (error.type == "UnknownProductError") {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
return res.status(404).json({
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
message: error.message
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
})
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
} else {
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
return next()
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
}
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
})
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
}
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
res.send(winesConverted);
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
});
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
router.route("/wineinfo/:ean").get(async (req, res) => {
const vinmonopoletResponse = await fetch("https://app.vinmonopolet.no/vmpws/v2/vmp/products/barCodeSearch/" + req.params.ean)
.then(resp => resp.json())
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
KevinMidboe commented 2020-09-07 14:00:35 +00:00 (Migrated from github.com)
Review

Is this used?

Is this used?
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed
Adrianht commented 2020-09-07 14:23:56 +00:00 (Migrated from github.com)
Review

fixed

fixed

View File

@@ -160,6 +160,21 @@ const barcodeToVinmonopolet = id => {
});
};
const searchForWine = searchString => {
const url = new URL("/api/wineinfo/search?query=" + searchString, BASE_URL);
return fetch(url.href).then(async resp => {
if (!resp.ok) {
if (resp.status == 404) {
throw await resp.json();
}
} else {
return resp.json();
}
});
};
const handleErrors = async resp => {
if ([400, 409].includes(resp.status)) {
throw await resp.json();
@@ -269,6 +284,7 @@ export {
logWines,
wineSchema,
barcodeToVinmonopolet,
searchForWine,
login,
register,
addAttendee,

View File

@@ -0,0 +1,44 @@
<template>
<main>
<h1>
Anbefal en vin!
</h1>
<section>
<input type="text" v-model="searchString" >
<button @click=(fetchWineFromVin())>knapp</button>
<div v-for="(wine, index) in this.wines" :key="index">
<Wine :wine=wine >
<button>Pick</button>
</Wine>
</div>
</section>
</main>
</template>
<script>
import { searchForWine } from "@/api";
import Wine from "@/ui/Wine";
export default {
components: {
Wine
},
data() {
return {
searchString: undefined,
res: undefined,
wines: undefined,
}
},
methods: {
fetchWineFromVin(){
searchForWine(this.searchString)
.then(res => this.wines = res)
},
},
}
</script>
<style>
</style>

View File

@@ -12,6 +12,8 @@ import WinnerPage from "@/components/WinnerPage";
import LotteryPage from "@/components/LotteryPage";
import HistoryPage from "@/components/HistoryPage";
import RequestWine from "@/components/RequestWine";
const routes = [
{
path: "*",
@@ -52,6 +54,10 @@ const routes = [
{
path: "/history",
component: HistoryPage
},
{
path: "/request",
component: RequestWine
}
];