connect fn update

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)

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) {

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 }

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)

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)

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) {

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)

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)

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)

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',

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

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'

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) {
+async function connect() {
-    const connection = await MongoClient.connect(uri)
+    const mongoUri = getConfig().serverRuntimeConfig.dbUri
+    const connection = await MongoClient.connect(mongoUri)
     db = init(connection)
     return db
 }

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)