From 2dde6c381b022477e14e047adfea47d4866892fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Sun, 8 Dec 2024 22:46:02 -0500 Subject: [PATCH] refactor(dbconfig): misc changes - resolve .env file through `import.meta.url` - fix url format - general code cleanup --- lib/dbconfig.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/dbconfig.ts b/lib/dbconfig.ts index bcd8ae3..7dd4a38 100644 --- a/lib/dbconfig.ts +++ b/lib/dbconfig.ts @@ -1,14 +1,16 @@ import mongoose from "mongoose"; -const FUCKYOU = "/rockfic/abc-rockfic-v3"; -// dotenv.config({ path: resolve("/home/rockfic/rockfic-staging/.env") }); -export const hasMigrated = true; +import { dirname, resolve } from "path"; +import * as dotenv from "dotenv"; +import { fileURLToPath } from "url"; + +dotenv.config({ path: resolve(dirname(fileURLToPath(new URL(import.meta.url))), "../.env") }); +export const hasMigrated = false; export const uri = process.env.NODE_ENV === "production" && !process.env.TEST - ? `mongodb://${process.env.DBUSER}:${process.env.DBPASS}@${process.env.DB}?authSource=admin` - : `mongodb://127.0.0.1/${process.env.DBNAME}`; + ? `mongodb://${process.env.DBUSER}:${process.env.DBPASS}@127.0.0.1:27017/${process.env.DB_NAME}?authSource=admin` + : `mongodb://127.0.0.1/${process.env.DB_NAME}`; export const olduri = process.env.NODE_ENV === "production" && !process.env.TEST ? `mongodb://${process.env.DBUSER}:${process.env.DBPASS}@127.0.0.1:27017/rockfic_old?authSource=admin` : `mongodb://127.0.0.1/rockfic_old?authSource=admin`; - -!mongoose.connection.modelNames().length && !hasMigrated && mongoose.connect(uri); +!mongoose.connection.modelNames().length && mongoose.connect(uri);