diff --git a/backend/api/highscores.js b/backend/api/highscores.js index eead9ba6ed59a45d21050eb7136af151a0eebbc4..c037a10c106065c9331fa1223d1614d7a48ef435 100644 --- a/backend/api/highscores.js +++ b/backend/api/highscores.js @@ -37,19 +37,11 @@ router.get("/gamescore/:userid/:gameid", (req, res) => { ); }); -<<<<<<< HEAD router.post("/highscore", (req, res) => { MongoClient.connect( connectionUrl, { useNewUrlParser: true, useUnifiedTopology: true }, (err, client) => { -======= -router.post("/highscore/:userid/:gameid/:score", (req, res) => { - MongoClient.connect( - connectionUrl, - { useNewUrlParser: true, useUnifiedTopology: true }, - async (err, client) => { ->>>>>>> 4e2462fe51615bf8aa1aed7144654cf98a918327 // Unable to connect to database if (err) { res.sendStatus(500); // Internal server error @@ -59,7 +51,6 @@ router.post("/highscore/:userid/:gameid/:score", (req, res) => { const db = client.db("gameWare"); const collection = "highscores"; -<<<<<<< HEAD db.collection(collection).updateOne( { gameid: req.body.gameid, @@ -75,44 +66,6 @@ router.post("/highscore/:userid/:gameid/:score", (req, res) => { res.json(result); } ); -======= - const queryresult = await db.collection(collection).findOne({ - gameid: req.params.gameid, - userid: req.params.userid - }); - - if (queryresult) { - db.collection(collection).updateOne( - { - gameid: req.params.gameid, - userid: req.params.userid - }, - { $set: { value: parseInt(req.params.score) } }, - (err, result) => { - if (err) { - res.sendStatus(500); // Internal server error - return; - } - res.json(result); - } - ); - } else { - db.collection(collection).insertOne( - { - gameid: req.params.gameid, - userid: req.params.userid, - value: parseInt(req.params.score) - }, - (err, result) => { - if (err) { - res.sendStatus(500); // Internal server error - return; - } - res.json(result); - } - ); - } ->>>>>>> 4e2462fe51615bf8aa1aed7144654cf98a918327 } ); });