Moved db init and migration to seperate files and experimented with h…

…ooks

.gitignore

@@ -11,4 +11,4 @@ vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 
 docker-compose.y*
-*.db
+*.db

Dockerfile

@@ -11,6 +11,7 @@ FROM node:20-alpine
 WORKDIR /app
 COPY --from=builder /app/build build/
 COPY --from=builder /app/node_modules node_modules/
+COPY --from=builder /app/migrations migrations
 COPY package.json .
 EXPOSE 3000
 ENV NODE_ENV=production

package.json

@@ -14,8 +14,8 @@
     "format": "prettier --write .",
     "prepare": "husky",
     "remove-databases": "rm -f ./data/sqlite.db ./data/sqlite.dev.db",
-    "migrate": "npm exec drizzle-kit generate:sqlite",
-    "migrate:clean": "npm run remove-databases && rm -rf ./migrations && npm run migrate",
+    "generate:migration": "npm exec drizzle-kit generate:sqlite",
+    "generate:migration:clean": "npm run remove-databases && rm -rf ./migrations && npm run migrate",
     "docker:dev": "docker compose -f docker-compose.dev.yml up --build"
   },
   "devDependencies": {

src/components/TodoList.svelte

@@ -10,7 +10,7 @@
   let editMode: boolean = false;
 
   computedTodo.subscribe((value) => {
-    todo = Todo.fromObject(value);
+    if (value) todo = Todo.fromObject(value);
   });
 
   const handleCheck = (event: Event, touchedTodo: Record<string, any>) => {

src/db/init.server.ts

@@ -0,0 +1,8 @@
+import path from 'path';
+import { drizzle } from 'drizzle-orm/better-sqlite3';
+import Database from 'better-sqlite3';
+
+const sqlite = new Database(
+  path.resolve(process.env.NODE_ENV === 'production' ? '/data/sqlite.db' : 'data/sqlite.dev.db')
+);
+export const db = drizzle(sqlite);

src/db/migrate.server.ts

@@ -0,0 +1,4 @@
+import { migrate } from 'drizzle-orm/better-sqlite3/migrator';
+import { db } from './init.server';
+
+migrate(db, { migrationsFolder: 'migrations' });

src/hooks.server.ts

@@ -0,0 +1 @@
+import './db/migrate.server';

src/utils/database-utils.server.ts

@@ -1,18 +1,8 @@
-import path from 'path';
-import { drizzle } from 'drizzle-orm/better-sqlite3';
-import { migrate } from 'drizzle-orm/better-sqlite3/migrator';
-import Database from 'better-sqlite3';
 import { eq, desc, inArray } from 'drizzle-orm';
-import { pick, once } from 'lodash-es';
+import { pick } from 'lodash-es';
 import { Todo } from '../interfaces/Todo';
 import { todoTable } from '../db/schema.server';
-
-const sqlite = new Database(
-  path.resolve(process.env.NODE_ENV === 'production' ? '/data/sqlite.db' : 'data/sqlite.dev.db')
-);
-const db = drizzle(sqlite);
-
-once(() => migrate(db, { migrationsFolder: 'migrations' }));
+import { db } from '../db/init.server';
 
 export const getTodoById = async (id: string) => {
   const todoEntry: Record<string, any> = (