Merge main into fix/render-deploy-lockfile; keep src/ layout and env-based config

Author: frckbrice

.gitignore

@@ -1,7 +1,56 @@
-node_modules
-dist
+# Dependencies
+node_modules/
+.pnp
+.pnp.js
 
+# Testing
+coverage/
+.nyc_output
+
+# Production
+dist/
+build/
+
+# Environment variables
 .env
-server/reset-db
-middleware/logger
-/logs
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+logs/
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# OS
+.DS_Store
+Thumbs.db
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# TypeScript
+*.tsbuildinfo
+
+# Database
+*.db
+*.sqlite
+*.sqlite3
+
+# Temporary files
+tmp/
+temp/
+*.tmp
+
+# Misc
+.cache/
+.parcel-cache/

config/bucket-storage/cloudinary.ts

@@ -38,7 +38,7 @@ class CloudinaryService {
 
         try {
             const result = await cloudinary.uploader.upload(file as any, {
-                folder: options.folder || 'museum-platform',
+                folder: options.folder || 'library-platform',
                 public_id: options.public_id,
                 transformation: options.transformation,
                 tags: options.tags,

direct-story-api.js

@@ -15,8 +15,8 @@
           "notNull": true,
           "default": "gen_random_uuid()"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -57,12 +57,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "analytics_museum_id_museums_id_fk": {
-          "name": "analytics_museum_id_museums_id_fk",
+        "analytics_library_id_libraries_id_fk": {
+          "name": "analytics_library_id_libraries_id_fk",
           "tableFrom": "analytics",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"
@@ -101,8 +101,8 @@
           "notNull": true,
           "default": "gen_random_uuid()"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -148,12 +148,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "contact_messages_museum_id_museums_id_fk": {
-          "name": "contact_messages_museum_id_museums_id_fk",
+        "contact_messages_library_id_libraries_id_fk": {
+          "name": "contact_messages_library_id_libraries_id_fk",
           "tableFrom": "contact_messages",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"
@@ -179,8 +179,8 @@
           "notNull": true,
           "default": "gen_random_uuid()"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -245,12 +245,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "events_museum_id_museums_id_fk": {
-          "name": "events_museum_id_museums_id_fk",
+        "events_library_id_libraries_id_fk": {
+          "name": "events_library_id_libraries_id_fk",
           "tableFrom": "events",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"
@@ -276,8 +276,8 @@
           "notNull": true,
           "default": "gen_random_uuid()"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -335,12 +335,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "media_items_museum_id_museums_id_fk": {
-          "name": "media_items_museum_id_museums_id_fk",
+        "media_items_library_id_libraries_id_fk": {
+          "name": "media_items_library_id_libraries_id_fk",
           "tableFrom": "media_items",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"
@@ -355,8 +355,8 @@
       "checkConstraints": {},
       "isRLSEnabled": false
     },
-    "public.museums": {
-      "name": "museums",
+    "public.libraries": {
+      "name": "libraries",
       "schema": "",
       "columns": {
         "id": {
@@ -435,8 +435,8 @@
           "notNull": false,
           "default": false
         },
-        "museum_type": {
-          "name": "museum_type",
+        "library_type": {
+          "name": "library_type",
           "type": "text",
           "primaryKey": false,
           "notNull": true
@@ -474,8 +474,8 @@
           "notNull": true,
           "default": "gen_random_uuid()"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -555,12 +555,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "stories_museum_id_museums_id_fk": {
-          "name": "stories_museum_id_museums_id_fk",
+        "stories_library_id_libraries_id_fk": {
+          "name": "stories_library_id_libraries_id_fk",
           "tableFrom": "stories",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"
@@ -687,10 +687,10 @@
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "default": "'museum_admin'"
+          "default": "'library_admin'"
         },
-        "museum_id": {
-          "name": "museum_id",
+        "library_id": {
+          "name": "library_id",
           "type": "uuid",
           "primaryKey": false,
           "notNull": true
@@ -712,12 +712,12 @@
       },
       "indexes": {},
       "foreignKeys": {
-        "users_museum_id_museums_id_fk": {
-          "name": "users_museum_id_museums_id_fk",
+        "users_library_id_libraries_id_fk": {
+          "name": "users_library_id_libraries_id_fk",
           "tableFrom": "users",
-          "tableTo": "museums",
+          "tableTo": "libraries",
           "columnsFrom": [
-            "museum_id"
+            "library_id"
           ],
           "columnsTo": [
             "id"

drizzle/meta/0000_snapshot.json

@@ -8,7 +8,7 @@
  * @module index
  */
 
-import express, { type Request, Response, NextFunction } from "express";
+import express from "express";
 import session from "express-session";
 import MemoryStore from "memorystore";
 import connectPgSimple from "connect-pg-simple";
@@ -19,8 +19,7 @@ import { Pool } from "pg";
 import errorHandler from "./src/middlewares/error-handler";
 import helmet from "helmet";
 import cors from "cors";
-import { MemStorage } from "./config/database/storage";
-
+import { env } from "./src/config/env";
 import corsOptions from "./config/cors/cors-options";
 import swaggerUi from "swagger-ui-express";
 import { openApiDocument } from "./config/swagger";
@@ -39,8 +38,6 @@ declare module "express-session" {
   }
 }
 
-const PORT = process.env.PORT || 5500;
-
 // Setup session stores
 const MemoryStoreSession = MemoryStore(session);
 const PgStore = connectPgSimple(session);
@@ -73,7 +70,7 @@ app.use(cors(corsOptions));
 
 /** Session middleware: persistent in production (PgStore), in-memory otherwise */
 app.use(session({
-  store: process.env.DATAAPI_URL
+  store: env.DATAAPI_URL
     ? new PgStore({
       pool,
       tableName: 'session',
@@ -82,11 +79,11 @@ app.use(session({
     : new MemoryStoreSession({
       checkPeriod: 86400000 // every 24h
     }),
-  secret: process.env.SESSION_SECRET || 'library_connect_secret',
+  secret: env.SESSION_SECRET,
   resave: false,
   saveUninitialized: false,
   cookie: {
-    secure: process.env.NODE_ENV === 'production',
+    secure: env.NODE_ENV === 'production',
     maxAge: 1000 * 60 * 60 * 24 // 24 hours
   }
 }));
@@ -126,9 +123,10 @@ app.use((req, res, next) => {
   const server = await registerRoutes("/api/v1", app);
   app.use(errorHandler);
 
-  server.listen(PORT, () => {
-    console.log(`Server running at http://localhost:${PORT}`);
-  }).on("error", () => {
-    console.error("Error starting server");
+  server.listen(env.PORT, () => {
+    console.log(`Server running at http://localhost:${env.PORT} in ${env.NODE_ENV} mode`);
+  }).on("error", (error) => {
+    console.error("Error starting server:", error);
+    process.exit(1);
   });
 })();

index.ts

@@ -50,6 +50,7 @@
 		"pg": "^8.16.0",
 		"ts-jest": "^29.4.0",
 		"uuid": "^11.1.0",
+		"winston": "^3.19.0",
 		"ws": "^8.18.0",
 		"zod": "^3.24.2",
 		"zod-validation-error": "^3.4.0",