From 0713bad8711bb248e227681e152b7e6b8aea529a Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 1 Aug 2019 17:10:50 +0300 Subject: [PATCH] connect fn update --- pages/api/albums/[album].js | 3 +-- pages/api/albums/index.js | 3 +-- pages/api/articles/[article].js | 3 +-- pages/api/articles/index.js | 3 +-- pages/api/files/[document].js | 3 +-- pages/api/files/index.js | 3 +-- pages/api/image.js | 3 +-- pages/api/page.js | 3 +-- pages/api/persons/[person].js | 3 +-- pages/api/persons/index.js | 3 +-- pages/api/schedule.js | 3 +-- src/config.js | 1 - src/core/db.js | 6 ++++-- src/server.js | 2 +- 14 files changed, 16 insertions(+), 26 deletions(-) diff --git a/pages/api/albums/[album].js b/pages/api/albums/[album].js index a88f69e9..3431567b 100644 --- a/pages/api/albums/[album].js +++ b/pages/api/albums/[album].js @@ -1,9 +1,8 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Album from '../../../src/core/Album' export default async (req, res) => { - await connect(dbUri) + await connect() const id = req.query.album const album = await Album.findById(id) diff --git a/pages/api/albums/index.js b/pages/api/albums/index.js index de1cf601..d610f214 100644 --- a/pages/api/albums/index.js +++ b/pages/api/albums/index.js @@ -1,9 +1,8 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Album from '../../../src/core/Album' export default async (req, res) => { - await connect(dbUri) + await connect() const data = await Album.find({}, { sort: { date: -1 } }) if (data) { diff --git a/pages/api/articles/[article].js b/pages/api/articles/[article].js index 3a35e4af..3eadc160 100644 --- a/pages/api/articles/[article].js +++ b/pages/api/articles/[article].js @@ -1,9 +1,8 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Article from '../../../src/core/Article' export default async (req, res) => { - await connect(dbUri) + await connect() const { query: { article: id } diff --git a/pages/api/articles/index.js b/pages/api/articles/index.js index fd977d01..01650097 100644 --- a/pages/api/articles/index.js +++ b/pages/api/articles/index.js @@ -1,9 +1,8 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import { findArticles } from '../../../src/api/articles' export default async (req, res) => { - await connect(dbUri) + await connect() const { query } = req const page = parseInt(query.page) diff --git a/pages/api/files/[document].js b/pages/api/files/[document].js index 60758a54..67542634 100644 --- a/pages/api/files/[document].js +++ b/pages/api/files/[document].js @@ -1,10 +1,9 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Document from '../../../src/core/Document' import { encodeFile } from '../../../src/api/files' export default async (req, res) => { - await connect(dbUri) + await connect() const id = req.query.document const document = await Document.findById(id) diff --git a/pages/api/files/index.js b/pages/api/files/index.js index 44728a8a..9fcd4798 100644 --- a/pages/api/files/index.js +++ b/pages/api/files/index.js @@ -1,10 +1,9 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Document from '../../../src/core/Document' import { encodeFile } from '../../../src/api/files' export default async (req, res) => { - await connect(dbUri) + await connect() const documents = await Document.find({hidden: false}) if (documents) { diff --git a/pages/api/image.js b/pages/api/image.js index a4465dbd..b5e63252 100644 --- a/pages/api/image.js +++ b/pages/api/image.js @@ -1,10 +1,9 @@ -import { dbUri } from '../../src/config' import { connect } from '../../src/core/db' import Image from '../../src/core/Image' import ImageArtifactType from '../../src/core/ImageArtifactType' export default async (req, res) => { - await connect(dbUri) + await connect() const file = req.query.file const image = await Image.findByFile(file) diff --git a/pages/api/page.js b/pages/api/page.js index 7012f719..ee803994 100644 --- a/pages/api/page.js +++ b/pages/api/page.js @@ -1,10 +1,9 @@ -import { dbUri } from '../../src/config' import { connect } from '../../src/core/db' import Page from '../../src/core/Page' import { getPathWithNoTrailingSlash } from '../../src/lib/url' export default async (req, res) => { - await connect(dbUri) + await connect() const page = getPathWithNoTrailingSlash(req.query.page) const resource = await Page.findByUrl(page) diff --git a/pages/api/persons/[person].js b/pages/api/persons/[person].js index 08ba331c..f4536766 100644 --- a/pages/api/persons/[person].js +++ b/pages/api/persons/[person].js @@ -1,10 +1,9 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Teacher from '../../../src/core/Teacher' import { encodePerson } from '../../../src/api/persons' export default async (req, res) => { - await connect(dbUri) + await connect() const id = req.query.person const person = await Teacher.findById(id) diff --git a/pages/api/persons/index.js b/pages/api/persons/index.js index aa4b8355..0bfcbc00 100644 --- a/pages/api/persons/index.js +++ b/pages/api/persons/index.js @@ -1,11 +1,10 @@ -import { dbUri } from '../../../src/config' import { connect } from '../../../src/core/db' import Teacher from '../../../src/core/Teacher' import { prioritySort } from '../../../src/lib/sort' import { encodePerson } from '../../../src/api/persons' export default async (req, res) => { - await connect(dbUri) + await connect() const order = [ 'mg-timasheva', diff --git a/pages/api/schedule.js b/pages/api/schedule.js index ef596840..3186007e 100644 --- a/pages/api/schedule.js +++ b/pages/api/schedule.js @@ -1,9 +1,8 @@ -import { dbUri } from '../../src/config' import { connect } from '../../src/core/db' import { findSchedule } from '../../src/core/schedule' export default async (req, res) => { - await connect(dbUri) + await connect() const period = req.query.period const semester = req.query.semester diff --git a/src/config.js b/src/config.js index 45886d6f..f897878b 100644 --- a/src/config.js +++ b/src/config.js @@ -1,7 +1,6 @@ import path from 'path' export const port = process.env['PORT'] || 3000 -export const dbUri = process.env['DB_URI'] || 'mongodb://mongo/hudozka' export const name = 'Hudozka' export const host = 'art.shlisselburg.org' diff --git a/src/core/db.js b/src/core/db.js index e0022efb..3cc4d3e7 100644 --- a/src/core/db.js +++ b/src/core/db.js @@ -6,13 +6,15 @@ const Teacher = require('./Teacher') const Document = require('./Document') const Image = require('./Image') const Settings = require('./Config') +const getConfig = require('next/config').default const { MongoClient, ObjectId } = require('mongodb') var db -async function connect(uri) { - const connection = await MongoClient.connect(uri) +async function connect() { + const mongoUri = getConfig().serverRuntimeConfig.dbUri + const connection = await MongoClient.connect(mongoUri) db = init(connection) return db } diff --git a/src/server.js b/src/server.js index 52aae47c..890b1e4c 100644 --- a/src/server.js +++ b/src/server.js @@ -11,7 +11,7 @@ const port = parseInt(process.env.PORT, 10) || 3000 app.prepare().then(async () => { try { - await connect(process.env.DB_URI) + await connect() } catch (e) { console.error(e.message)