Set up db connection as Nitro plugin

ConservationMetrics · Oct 14, 2024 · 6c030f7 · 6c030f7
1 parent 383782e
commit 6c030f7
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 338 deletions.
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -22,6 +22,10 @@ export default defineNuxtConfig({
 
   devtools: { enabled: true },
 
+  nitro: {
+    plugins: ["@/server/index.ts"],
+  },
+
   modules: [
     "gc-shared-resources",
     "nuxt-auth-utils",

diff --git a/server/api/[table]/alerts.ts b/server/api/[table]/alerts.ts
@@ -1,5 +1,5 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../database/dbConnection";
+import { configDb, db } from "@/server/index";
 import { fetchConfig, fetchData } from "../../database/dbOperations";
 import {
   prepareAlertData,
@@ -23,59 +23,13 @@ export default defineEventHandler(async (event: H3Event) => {
 
   const {
     public: { allowedFileExtensions },
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
     public: { allowedFileExtensions: AllowedFileExtensions };
-    configDatabase: string;
     isSqlite: boolean;
-    sqliteDbPath: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
-  const db = await setupDatabaseConnection(
-    /* isConfigDb */ false,
-    isSqlite,
-    sqliteDbPath,
-    database,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
   try {
     const viewsConfig = await fetchConfig(configDb, isSqlite);
     const { mainData, metadata } = (await fetchData(db, table, isSqlite)) as {

diff --git a/server/api/[table]/data.ts b/server/api/[table]/data.ts
@@ -1,63 +1,17 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../database/dbConnection";
+import { db } from "@/server/index";
 import { fetchData } from "../../database/dbOperations";
 
 export default defineEventHandler(async (event: H3Event) => {
   const { table } = event.context.params as { table: string };
 
   const {
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
-    configDatabase: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
     isSqlite: boolean;
-    sqliteDbPath: string;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
-  const db = await setupDatabaseConnection(
-    /* isConfigDb */ false,
-    isSqlite,
-    sqliteDbPath,
-    database,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
   try {
     const { mainData, columnsData } = await fetchData(db, table, isSqlite);
     return { data: mainData, columns: columnsData };

diff --git a/server/api/[table]/gallery.ts b/server/api/[table]/gallery.ts
@@ -1,5 +1,5 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../database/dbConnection";
+import { configDb, db } from "@/server/index";
 import { fetchConfig, fetchData } from "../../database/dbOperations";
 import { transformSurveyData } from "../../dataProcessing/transformData";
 import {
@@ -18,59 +18,13 @@ export default defineEventHandler(async (event: H3Event) => {
 
   const {
     public: { allowedFileExtensions },
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
     public: { allowedFileExtensions: AllowedFileExtensions };
-    configDatabase: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
     isSqlite: boolean;
-    sqliteDbPath: string;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
-  const db = await setupDatabaseConnection(
-    /* isConfigDb */ false,
-    isSqlite,
-    sqliteDbPath,
-    database,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
   try {
     const viewsConfig = await fetchConfig(configDb, isSqlite);
     const { mainData, columnsData } = await fetchData(db, table, isSqlite);

diff --git a/server/api/[table]/map.ts b/server/api/[table]/map.ts
@@ -1,5 +1,5 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../database/dbConnection";
+import { configDb, db } from "@/server/index";
 import { fetchConfig, fetchData } from "../../database/dbOperations";
 import {
   prepareMapData,
@@ -21,59 +21,13 @@ export default defineEventHandler(async (event: H3Event) => {
 
   const {
     public: { allowedFileExtensions },
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
     public: { allowedFileExtensions: AllowedFileExtensions };
-    configDatabase: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
     isSqlite: boolean;
-    sqliteDbPath: string;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
-  const db = await setupDatabaseConnection(
-    /* isConfigDb */ false,
-    isSqlite,
-    sqliteDbPath,
-    database,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
   try {
     const viewsConfig = await fetchConfig(configDb, isSqlite);
     const { mainData, columnsData } = await fetchData(db, table, isSqlite);

diff --git a/server/api/config/delete_table/[table].post.ts b/server/api/config/delete_table/[table].post.ts
@@ -1,48 +1,15 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../../database/dbConnection";
+import { configDb } from "@/server/index";
 import { removeTableFromConfig } from "../../../database/dbOperations";
 
 export default defineEventHandler(async (event: H3Event) => {
   const {
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
-    configDatabase: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
     isSqlite: boolean;
-    sqliteDbPath: string;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
   const table = event.context?.params?.table as string;
 
   try {

diff --git a/server/api/config/index.get.ts b/server/api/config/index.get.ts
@@ -1,62 +1,16 @@
 import { defineEventHandler, sendError, H3Event } from "h3";
-import { setupDatabaseConnection } from "../../database/dbConnection";
-import { fetchConfig } from "../../database/dbOperations";
+import { configDb, db } from "@/server/index";
+import { fetchConfig } from "@/server/database/dbOperations";
 import { getFilteredTableNames } from "./utils";
 
 export default defineEventHandler(async (event: H3Event) => {
   const {
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
     isSqlite,
-    sqliteDbPath,
     // eslint-disable-next-line no-undef
   } = useRuntimeConfig() as unknown as {
-    configDatabase: string;
-    database: string;
-    dbHost: string;
-    dbUser: string;
-    dbPassword: string;
-    dbPort: string;
-    dbSsl: boolean;
     isSqlite: boolean;
-    sqliteDbPath: string;
   };
 
-  const configDb = await setupDatabaseConnection(
-    /* isConfigDb */ true,
-    isSqlite,
-    sqliteDbPath,
-    configDatabase,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
-  if (!configDb) {
-    throw new Error("Failed to connect to configDb");
-  }
-
-  const db = await setupDatabaseConnection(
-    /* isConfigDb */ false,
-    isSqlite,
-    sqliteDbPath,
-    database,
-    database,
-    dbHost,
-    dbUser,
-    dbPassword,
-    dbPort,
-    dbSsl,
-  );
-
   try {
     const viewsConfig = await fetchConfig(configDb, isSqlite);
     const tableNames = await getFilteredTableNames(db, isSqlite);