fix: unify data directory for dev and prod environments (#116)

Add DATA_DIR env var support to configure the data directory path.
All hardcoded resolve(cwd, 'data') paths now use a central getDataDir()
function from db-utils.ts that checks DATA_DIR first, falling back to
resolve(cwd, 'data').

This prevents local dev (cd backend && npm run dev) from creating a
separate backend/data/ directory instead of using the root data/ folder.

Changes:
- Add getDataDir() to db-utils.ts as single source of truth
- Update all 8 source files that reference the data directory
- Add dotenv fallback to ../.env for local dev from backend/
- Add DATA_DIR documentation to .env.example
- Add 7 new tests for getDataDir and getDbPaths with DATA_DIR
- 493 tests pass, TypeScript clean
This commit is contained in:
Daniel Volz
2026-02-08 11:20:55 +01:00
committed by GitHub
parent 99bb9c3931
commit 2a84a43654
13 changed files with 102 additions and 16 deletions
+7 -2
View File
@@ -1,4 +1,5 @@
import { statSync } from "node:fs";
import { existsSync, statSync } from "node:fs";
import { resolve } from "node:path";
import { type Client, createClient } from "@libsql/client";
import dotenv from "dotenv";
import { drizzle } from "drizzle-orm/libsql";
@@ -7,6 +8,7 @@ import { drizzle } from "drizzle-orm/libsql";
import {
ensureDataDirectory,
ensureDefaultUser,
getDataDir,
getDbPaths,
repairOrphanedDoseIds,
repairTrailingHyphenDoseIds,
@@ -19,6 +21,7 @@ export {
buildDbUrl,
ensureDataDirectory,
ensureDefaultUser,
getDataDir,
getDbPaths,
repairOrphanedDoseIds,
repairTrailingHyphenDoseIds,
@@ -26,7 +29,9 @@ export {
runDrizzleMigrations,
} from "./db-utils.js";
dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
// Load .env: try cwd first, then parent dir (for local dev running from backend/)
const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
dotenv.config({ path: envPath });
// =============================================================================
// Database initialization (runs on import)
+11 -1
View File
@@ -21,6 +21,16 @@ const migrationsFolder = resolve(__dirname, "../../drizzle");
// Path & Directory utilities
// =============================================================================
/**
* Get the data directory path.
* Checks DATA_DIR env var first, then falls back to resolve(cwd, "data").
* This ensures local dev (`cd backend && npm run dev`) and Docker both
* use the same directory when DATA_DIR is set.
*/
export function getDataDir(cwd: string = process.cwd()): string {
return process.env.DATA_DIR ? resolve(process.env.DATA_DIR) : resolve(cwd, "data");
}
/** Build the database URL from a path */
export function buildDbUrl(dbPath: string): string {
return `file:${dbPath}`;
@@ -28,7 +38,7 @@ export function buildDbUrl(dbPath: string): string {
/** Get data directory and database path */
export function getDbPaths(cwd: string = process.cwd()): { dataDir: string; dbPath: string; url: string } {
const dataDir = resolve(cwd, "data");
const dataDir = getDataDir(cwd);
const dbPath = resolve(dataDir, "medassist-ng.db");
const url = buildDbUrl(dbPath);
return { dataDir, dbPath, url };
+4 -1
View File
@@ -1,3 +1,4 @@
import { existsSync } from "node:fs";
import { dirname, resolve } from "node:path";
import { fileURLToPath } from "node:url";
import { type Client, createClient } from "@libsql/client";
@@ -5,7 +6,9 @@ import dotenv from "dotenv";
import { drizzle } from "drizzle-orm/libsql";
import { migrate } from "drizzle-orm/libsql/migrator";
dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
// Load .env: try cwd first, then parent dir (for local dev running from backend/)
const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
dotenv.config({ path: envPath });
// Get migrations folder path (relative to this file's location)
const __filename = fileURLToPath(import.meta.url);