-
+
-
+
-
+
);
diff --git a/gradesa/src/app/page.js b/gradesa/src/app/page.js
index b8545e8..7993036 100644
--- a/gradesa/src/app/page.js
+++ b/gradesa/src/app/page.js
@@ -1,12 +1,12 @@
-'use client';
+"use client";
import Image from "next/image";
import styles from "./page.module.css";
import useQuery from "@/shared/hooks/useQuery";
import { useState } from "react";
export default function Home() {
- const [mode, setMode] = useState('normal');
+ const [mode, setMode] = useState("normal");
- const { data, error, isLoading } = useQuery('/hello', { mode });
+ const { data, error, isLoading } = useQuery("/hello", { mode });
return (
@@ -28,8 +28,8 @@ export default function Home() {
{data &&
{data.message}
}
DB TIME: {isLoading ?
Loading...
: data &&
{data.now}
}
ERROR: {error ?
{error}
:
No error
}
-
-
+
+
{
switch (environment) {
- case 'test':
- case 'development':
- case 'production':
+ case "test":
+ case "development":
+ case "production":
config({ path: `${process.cwd()}/.env`, override: true });
config({ path: `${process.cwd()}/.env.${environment}`, override: true });
break;
default:
- throw new Error('Unsupported environment: ' + env);
+ throw new Error("Unsupported environment: " + env);
}
};
-
// The following is an environment variable helper.
// It's used to read environment variables from .env and .env.NODE_ENV
// So instead of using process.env.DB_HOST, you can use getConfig().db.host
@@ -39,7 +38,6 @@ export const getConfig = () => {
return cachedConfig;
};
-
function getFromEnv(key) {
const val = process.env[key];
if (val === undefined) {
@@ -53,15 +51,15 @@ function create() {
function readString(key) {
const val = getFromEnv(key);
- if (val === undefined || val.trim() === '') {
+ if (val === undefined || val.trim() === "") {
errors.push(key);
}
- return val ?? '';
- }
-
- function readStringOptional(key, defaultValue) {
- return (getFromEnv(key)) ?? defaultValue;
+ return val ?? "";
}
+ // Unused-vars
+ // function readStringOptional(key, defaultValue) {
+ // return getFromEnv(key) ?? defaultValue;
+ // }
function readInt(key) {
const val = getFromEnv(key);
@@ -71,7 +69,7 @@ function create() {
}
return parseInt(val);
}
-
+ // Unused-vars
function readIntOptional(key, defaultValue) {
const value = getFromEnv(key);
return value === undefined ? defaultValue : parseInt(value);
@@ -79,16 +77,18 @@ function create() {
const config = {
db: {
- host: readString('DB_HOST'),
- port: readInt('DB_PORT'),
- user: readString('DB_USER'),
- password: readString('DB_PASSWORD'),
- database: readString('DB_NAME'),
+ host: readString("DB_HOST"),
+ port: readInt("DB_PORT"),
+ user: readString("DB_USER"),
+ password: readString("DB_PASSWORD"),
+ database: readString("DB_NAME"),
},
};
if (errors.length > 0) {
- throw new Error(`Missing or invalid environment variables: ${errors.join(', ')}`);
+ throw new Error(
+ `Missing or invalid environment variables: ${errors.join(", ")}`
+ );
}
return config;
diff --git a/gradesa/src/backend/db.js b/gradesa/src/backend/db.js
index 16f2ac6..0b005ef 100644
--- a/gradesa/src/backend/db.js
+++ b/gradesa/src/backend/db.js
@@ -1,26 +1,30 @@
-import { Pool } from 'pg';
-import { getConfig } from './config';
-import { isTest } from './config';
+import { Pool } from "pg";
+import { getConfig } from "./config";
+import { isTest } from "./config";
export function dbURL(config) {
return `postgres://${config.user}:${config.password}@${config.host}:${config.port}/${config.database}`;
}
-import { logger } from './logging';
+import { logger } from "./logging";
let _pool;
async function connect(pool) {
- let client
+ let client;
try {
if (!pool) {
- throw new Error('Pool not initialized');
+ throw new Error("Pool not initialized");
}
- client = await pool.connect()
+ client = await pool.connect();
if (!isTest) {
- const row = await client.query('SELECT current_database() as database_name, now()');
- logger.info(`Connected to database ${row.rows[0].database_name} at ${row.rows[0].now.toISOString()}`);
+ const row = await client.query(
+ "SELECT current_database() as database_name, now()"
+ );
+ logger.info(
+ `Connected to database ${row.rows[0].database_name} at ${row.rows[0].now.toISOString()}`
+ );
}
} catch (err) {
- logger.error('Failed to connect to database', err);
+ logger.error("Failed to connect to database", err);
} finally {
if (client) {
await client.release();
@@ -38,19 +42,19 @@ async function get() {
}
/**
-* Executes a database query using the connection pool.
-*
-* @param {string} text - The SQL query text to be executed.
-* @param {Array} [params] - An optional array of parameters to be used in the query.
-* @returns {Promise