From e4efc6ae9b63e9f99fc82e4bfe03f00bb39b6758 Mon Sep 17 00:00:00 2001 From: David Golodetsky Date: Mon, 4 May 2020 22:35:36 +0300 Subject: [PATCH] remote mongo --- .env | 3 ++- routes/games.js | 15 ++++----------- server.js | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.env b/.env index 9bf0a06..ebad162 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ -DATABASE_URL = mongodb://localhost/characters \ No newline at end of file +DATABASE_URL = mongodb+srv://davidGo1995:secret123D@cluster0-kzfo9.mongodb.net/test?retryWrites=true&w=majority +DATABASE_LOCAL = mongodb://localhost/characters \ No newline at end of file diff --git a/routes/games.js b/routes/games.js index 0b066b2..d2c87db 100644 --- a/routes/games.js +++ b/routes/games.js @@ -2,20 +2,13 @@ const express = require('express') const Game = require('../models/game'); const router = express.Router(); -const mongodb = require('mongodb') - -async function getGames() { - const client = await mongodb.MongoClient.connect('mongodb+srv://davidGo1995:secret123#D@cluster0-kzfo9.mongodb.net/test?retryWrites=true&w=majority', - { useNewUrlParser: true }) - return client.db('Cluster0').collection('games') -} router.get('/', async (req, res) => { - // user = req.query.user + user = req.query.user try { - const games = await getGames(); - // const userGames = games.filter(game => game.user === user) - res.send(await games.find({}).toArray()) + const games = await Game.find(); + const userGames = games.filter(game => game.user === user) + res.json(userGames); } catch (err) { res.status(500).json({ message: err.message }); } diff --git a/server.js b/server.js index 00aa1d8..66c0d3b 100644 --- a/server.js +++ b/server.js @@ -10,10 +10,10 @@ const users = require('./routes/users'); const PORT = process.env.PORT || 3000 mongoose.connect(process.env.DATABASE_URL, { useNewUrlParser: true, useFindAndModify: false, useUnifiedTopology: true }); -const db = mongoose.connection; +const db = mongoose.connection; db.on('error', (error) => console.error(error)); -db.once('open', () => console.log('Connected to database!')); +db.on('connected', () => console.log('Connected to database!')); app.use(express.json()); app.use(cors());