fix: demo page inlanding

fix: org project and apikey creating
feat: stored under org/project path
2025-10-05 19:41:04 +07:00 · 2025-10-05 18:45:15 +07:00 · 2025-10-05 17:36:01 +07:00 · 2025-10-05 16:50:09 +07:00
29 changed files with 1166 additions and 541 deletions
--- a/.claude/commands/dev-api.md
+++ b/.claude/commands/dev-api.md
@ -0,0 +1,31 @@
+---
+description: Start API dev server with automatic error monitoring and cleanup
+---
+
+You need to launch the API development server. Follow these steps carefully:
+
+1. **Kill any existing server on port 3000**:
+   - First check if there's a background shell running the dev server in Claude Code and kill it using the KillShell tool
+   - Then check for any process using port 3000 with `lsof -ti:3000` and kill it with `kill -9 $(lsof -ti:3000)` if found
+   - This ensures a clean restart regardless of where the server was started
+
+2. **Start the dev server in background**:
+   - Navigate to the API service directory and start the server: `cd /projects/my-projects/banatie-service/apps/api-service && pnpm dev`
+   - Run this command in the background using the Bash tool with `run_in_background: true`
+   - Save the shell ID for monitoring
+
+3. **Monitor the logs**:
+   - Wait 3-5 seconds for the server to start
+   - Use BashOutput tool to check the background process output for errors
+   - Read the api-dev.log file to verify the server started successfully
+   - Look for:
+     - Server startup message (should show "Server running on port 3000")
+     - Any error messages or stack traces
+     - Database/MinIO connection status
+
+4. **Report status**:
+   - Inform the user if the server started successfully
+   - Show any errors found in the logs
+   - Provide the shell ID so the user can monitor it later if needed
+
+CRITICAL: Always kill existing servers before starting a new one to avoid port conflicts.
--- a/.env.docker
+++ b/.env.docker
@ -1,49 +0,0 @@
-# Application Configuration
-NODE_ENV=development
-PORT=3000
-LOG_LEVEL=info
-API_BASE_URL=http://localhost:3000
-
-# CORS Configuration  
-CORS_ORIGIN=*
-
-# Database Configuration
-DB_HOST=postgres
-DB_PORT=5432
-DB_NAME=banatie_db
-DB_USER=banatie_user
-DB_PASSWORD=banatie_secure_password
-DATABASE_URL=postgresql://banatie_user:banatie_secure_password@postgres:5432/banatie_db
-
-# MinIO Storage Configuration (SNMD)
-MINIO_ROOT_USER=banatie_admin
-MINIO_ROOT_PASSWORD=banatie_storage_secure_key_2024
-STORAGE_TYPE=minio
-MINIO_ENDPOINT=minio:9000
-MINIO_ACCESS_KEY=banatie_service
-MINIO_SECRET_KEY=banatie_service_key_2024
-MINIO_USE_SSL=false
-MINIO_BUCKET_NAME=banatie
-MINIO_PUBLIC_URL=http://localhost:9000
-
-# AI Service Configuration
-GEMINI_API_KEY=AIzaSyBaOt9JMPGKA3811FL-ssf1n5Hh9Jauly8
-
-# File Upload Configuration
-MAX_FILE_SIZE=5242880
-MAX_FILES=3
-
-# Multi-tenancy Configuration (Production-Ready Names)
-DEFAULT_ORG_ID=default
-DEFAULT_PROJECT_ID=main  
-DEFAULT_USER_ID=system
-
-# Presigned URL Configuration
-PRESIGNED_URL_EXPIRY=86400  # 24 hours
-
-# Directory Configuration
-RESULTS_DIR=/app/results
-UPLOADS_DIR=/app/uploads/temp
-
-# Logging Configuration
-LOG_LEVEL=info
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -122,25 +122,36 @@ Key table: `api_keys`

 ## Environment Configuration

-### Root Environment (`.env.docker`)
+**Important**: We use TWO `.env` files with different purposes:

- `DATABASE_URL` - PostgreSQL connection string (for Docker: `postgresql://banatie_user:banatie_secure_password@postgres:5432/banatie_db`)
- `MINIO_ROOT_USER` - MinIO admin username
- `MINIO_ROOT_PASSWORD` - MinIO admin password
+### Root `.env` (Docker Compose Infrastructure)

-### API Service Environment (`apps/api-service/.env`)
+Used by Docker Compose services (MinIO, Postgres, API container). Key differences from local:
+- `DATABASE_URL=postgresql://banatie_user:banatie_secure_password@postgres:5432/banatie_db` (Docker network hostname)
+- `MINIO_ENDPOINT=minio:9000` (Docker network hostname)
+- `MINIO_ROOT_USER` and `MINIO_ROOT_PASSWORD` - MinIO admin credentials
+- All variables are passed to the app container via docker-compose.yml environment section

-Required environment variables:
+### API Service `.env` (Local Development Only)

- `DATABASE_URL` - PostgreSQL connection string (for local dev: `postgresql://banatie_user:banatie_secure_password@localhost:5434/banatie_db`)
+Located at `apps/api-service/.env` - used ONLY when running `pnpm dev:api` locally:
+- `DATABASE_URL=postgresql://banatie_user:banatie_secure_password@localhost:5434/banatie_db` (port-forwarded)
+- `MINIO_ENDPOINT=localhost:9000` (port-forwarded)
+- **NOTE**: This file is excluded from Docker builds (see Dockerfile.mono)
+
+### Required Environment Variables
+
+- `DATABASE_URL` - PostgreSQL connection string
 - `GEMINI_API_KEY` - Google Gemini API key (required)
- `MINIO_ENDPOINT` - MinIO endpoint (`localhost:9000` for local dev, `minio:9000` for Docker)
- `MINIO_ACCESS_KEY` - MinIO service account key
- `MINIO_SECRET_KEY` - MinIO service account secret
+- `MINIO_ENDPOINT` - MinIO endpoint
+- `MINIO_ACCESS_KEY` - MinIO service account key (`banatie_service`)
+- `MINIO_SECRET_KEY` - MinIO service account secret (`banatie_service_key_2024`)
 - `MINIO_BUCKET_NAME` - Storage bucket name (default: `banatie`)
+- `MINIO_ROOT_USER` - MinIO admin user (`banatie_admin`)
+- `MINIO_ROOT_PASSWORD` - MinIO admin password
 - `PORT` - Server port (default: 3000)
 - `NODE_ENV` - Environment mode
- `CORS_ORIGIN` - CORS origin setting (default: multiple localhost URLs for frontend apps)
+- `CORS_ORIGIN` - CORS origin setting

 ## Key Dependencies

--- a/apps/api-service/Dockerfile.mono
+++ b/apps/api-service/Dockerfile.mono
@ -11,7 +11,11 @@ COPY pnpm-workspace.yaml package.json pnpm-lock.yaml ./

 # Copy all workspace packages
 COPY packages/ ./packages/
-COPY apps/api-service/ ./apps/api-service/
+
+# Copy API service (exclude .env file - it's for local dev only)
+COPY apps/api-service/package.json ./apps/api-service/
+COPY apps/api-service/tsconfig.json ./apps/api-service/
+COPY apps/api-service/src/ ./apps/api-service/src/

 # Install all dependencies (workspace-aware)
 RUN pnpm install --frozen-lockfile
--- a/apps/api-service/package.json
+++ b/apps/api-service/package.json
@ -4,7 +4,8 @@
  "description": "Nano Banana Image Generation Service - REST API for AI-powered image generation using Gemini Flash Image model",
  "main": "dist/server.js",
  "scripts": {
-    "dev": "tsx --watch src/server.ts",
+    "infra:up": "cd ../.. && docker compose up -d postgres minio storage-init",
+    "dev": "npm run infra:up && echo 'Logs will be saved to api-dev.log' && tsx --watch src/server.ts 2>&1 | tee api-dev.log",
    "start": "node dist/server.js",
    "build": "tsc",
    "typecheck": "tsc --noEmit",
--- a/apps/api-service/src/app.ts
+++ b/apps/api-service/src/app.ts
@ -89,35 +89,14 @@ export const createApp = (): Application => {
        const apiKey = await apiKeyService.validateKey(providedKey);

        if (apiKey) {
-          // Query org and project names
-          let organizationName = apiKey.organizationId;
-          let projectName = apiKey.projectId;
-
-          try {
-            const { db } = await import('./db');
-            const { organizations, projects } = await import('@banatie/database');
-            const { eq } = await import('drizzle-orm');
-
-            if (apiKey.organizationId) {
-              const org = await db.select().from(organizations).where(eq(organizations.id, apiKey.organizationId)).limit(1);
-              if (org.length > 0) organizationName = org[0].name;
-            }
-
-            if (apiKey.projectId) {
-              const proj = await db.select().from(projects).where(eq(projects.id, apiKey.projectId)).limit(1);
-              if (proj.length > 0) projectName = proj[0].name;
-            }
-          } catch (dbError) {
-            // Fallback to IDs if DB query fails
-          }
-
+          // Use slugs from validated API key (already fetched via LEFT JOIN)
          info.authenticated = true;
          info.keyInfo = {
            type: apiKey.keyType,
            organizationId: apiKey.organizationId,
-            organizationName,
+            organizationSlug: apiKey.organizationSlug,
            projectId: apiKey.projectId,
-            projectName,
+            projectSlug: apiKey.projectSlug,
            expiresAt: apiKey.expiresAt
          };
        }
--- a/apps/api-service/src/middleware/auth/requireProjectKey.ts
+++ b/apps/api-service/src/middleware/auth/requireProjectKey.ts
@ -0,0 +1,42 @@
+import { Request, Response, NextFunction } from 'express';
+
+/**
+ * Middleware to ensure only project keys can access generation endpoints
+ * Master keys are for admin purposes only
+ */
+export function requireProjectKey(
+  req: Request,
+  res: Response,
+  next: NextFunction
+): void {
+  // This middleware assumes validateApiKey has already run and attached req.apiKey
+  if (!req.apiKey) {
+    res.status(401).json({
+      error: 'Authentication required',
+      message: 'API key validation must be performed first',
+    });
+    return;
+  }
+
+  // Block master keys from generation endpoints
+  if (req.apiKey.keyType === 'master') {
+    res.status(403).json({
+      error: 'Forbidden',
+      message: 'Master keys cannot be used for image generation. Please use a project-specific API key.',
+    });
+    return;
+  }
+
+  // Ensure project key has required IDs
+  if (!req.apiKey.projectId) {
+    res.status(400).json({
+      error: 'Invalid API key',
+      message: 'Project key must be associated with a project',
+    });
+    return;
+  }
+
+  console.log(`[${new Date().toISOString()}] Project key validated for generation: ${req.apiKey.id}`);
+
+  next();
+}
--- a/apps/api-service/src/middleware/auth/validateApiKey.ts
+++ b/apps/api-service/src/middleware/auth/validateApiKey.ts
@ -1,12 +1,11 @@
 import { Request, Response, NextFunction } from 'express';
-import { ApiKeyService } from '../../services/ApiKeyService';
-import type { ApiKey } from '@banatie/database';
+import { ApiKeyService, type ApiKeyWithSlugs } from '../../services/ApiKeyService';

-// Extend Express Request type to include apiKey
+// Extend Express Request type to include apiKey with slugs
 declare global {
  namespace Express {
    interface Request {
-      apiKey?: ApiKey;
+      apiKey?: ApiKeyWithSlugs;
    }
  }
 }
--- a/apps/api-service/src/routes/admin/keys.ts
+++ b/apps/api-service/src/routes/admin/keys.ts
@ -16,7 +16,17 @@ router.use(requireMasterKey);
 */
 router.post('/', async (req, res) => {
  try {
-    const { type, projectId, organizationId, name, expiresInDays } = req.body;
+    const {
+      type,
+      projectId,
+      organizationId,
+      organizationSlug,
+      projectSlug,
+      organizationName,
+      projectName,
+      name,
+      expiresInDays
+    } = req.body;

    // Validation
    if (!type || !['master', 'project'].includes(type)) {
@ -26,23 +36,46 @@ router.post('/', async (req, res) => {
      });
    }

-    if (type === 'project' && !projectId) {
+    if (type === 'project' && !projectSlug) {
      return res.status(400).json({
-        error: 'Missing projectId',
-        message: 'Project keys require a projectId',
+        error: 'Missing projectSlug',
+        message: 'Project keys require a projectSlug',
+      });
+    }
+
+    if (type === 'project' && !organizationSlug) {
+      return res.status(400).json({
+        error: 'Missing organizationSlug',
+        message: 'Project keys require an organizationSlug',
      });
    }

    // Create key
-    const result = type === 'master'
-      ? await apiKeyService.createMasterKey(name, req.apiKey!.id)
-      : await apiKeyService.createProjectKey(
-        projectId,
-        organizationId,
+    let result;
+
+    if (type === 'master') {
+      result = await apiKeyService.createMasterKey(name, req.apiKey!.id);
+    } else {
+      // Get or create organization and project
+      const finalOrgId = await apiKeyService.getOrCreateOrganization(
+        organizationSlug,
+        organizationName,
+      );
+
+      const finalProjectId = await apiKeyService.getOrCreateProject(
+        finalOrgId,
+        projectSlug,
+        projectName,
+      );
+
+      result = await apiKeyService.createProjectKey(
+        finalProjectId,
+        finalOrgId,
        name,
        req.apiKey!.id,
        expiresInDays || 90
      );
+    }

    console.log(`[${new Date().toISOString()}] New API key created by admin: ${result.metadata.id} (${result.metadata.keyType}) - by: ${req.apiKey!.id}`);

@ -52,6 +85,7 @@ router.post('/', async (req, res) => {
        id: result.metadata.id,
        type: result.metadata.keyType,
        projectId: result.metadata.projectId,
+        organizationId: result.metadata.organizationId,
        name: result.metadata.name,
        expiresAt: result.metadata.expiresAt,
        scopes: result.metadata.scopes,
--- a/apps/api-service/src/routes/bootstrap.ts
+++ b/apps/api-service/src/routes/bootstrap.ts
@ -1,5 +1,5 @@
-import express from 'express';
-import { ApiKeyService } from '../services/ApiKeyService';
+import express from "express";
+import { ApiKeyService } from "../services/ApiKeyService";

 const router = express.Router();
 const apiKeyService = new ApiKeyService();
@ -10,38 +10,44 @@ const apiKeyService = new ApiKeyService();
 *
 * POST /api/bootstrap/initial-key
 */
-router.post('/initial-key', async (req, res) => {
+router.post("/initial-key", async (req, res) => {
  try {
    // Check if any keys already exist
    const hasKeys = await apiKeyService.hasAnyKeys();

    if (hasKeys) {
-      console.warn(`[${new Date().toISOString()}] Bootstrap attempt when keys already exist`);
+      console.warn(
+        `[${new Date().toISOString()}] Bootstrap attempt when keys already exist`,
+      );
      return res.status(403).json({
-        error: 'Bootstrap not allowed',
-        message: 'API keys already exist. Use /api/admin/keys to create new keys.',
+        error: "Bootstrap not allowed",
+        message:
+          "API keys already exist. Use /api/admin/keys to create new keys.",
      });
    }

    // Create first master key
-    const { key, metadata } = await apiKeyService.createMasterKey('Initial Master Key');
+    const { key, metadata } =
+      await apiKeyService.createMasterKey("Initial Master Key");

-    console.log(`[${new Date().toISOString()}] Initial master key created via bootstrap: ${metadata.id}`);
+    console.log(
+      `[${new Date().toISOString()}] Initial master key created via bootstrap: ${metadata.id}`,
+    );

    res.status(201).json({
      apiKey: key,
      type: metadata.keyType,
      name: metadata.name,
      expiresAt: metadata.expiresAt,
-      message: 'IMPORTANT: Save this key securely. You will not see it again!',
+      message: "IMPORTANT: Save this key securely. You will not see it again!",
    });
  } catch (error) {
    console.error(`[${new Date().toISOString()}] Bootstrap error:`, error);
    res.status(500).json({
-      error: 'Bootstrap failed',
-      message: 'Failed to create initial API key',
+      error: "Bootstrap failed",
+      message: "Failed to create initial API key",
    });
  }
 });

-export default router;
+export default router;
--- a/apps/api-service/src/routes/generate.ts
+++ b/apps/api-service/src/routes/generate.ts
@ -15,6 +15,7 @@ import {
 } from "../middleware/promptEnhancement";
 import { asyncHandler } from "../middleware/errorHandler";
 import { validateApiKey } from "../middleware/auth/validateApiKey";
+import { requireProjectKey } from "../middleware/auth/requireProjectKey";
 import { rateLimitByApiKey } from "../middleware/auth/rateLimiter";
 import { GenerateImageResponse } from "../types/api";
 // Create router
@ -30,6 +31,7 @@ generateRouter.post(
  "/generate",
  // Authentication middleware
  validateApiKey,
+  requireProjectKey,
  rateLimitByApiKey,

  // File upload middleware
@ -64,8 +66,12 @@ generateRouter.post(
    const { prompt, filename } = req.body;
    const files = (req.files as Express.Multer.File[]) || [];

+    // Extract org/project slugs from validated API key
+    const orgId = req.apiKey?.organizationSlug || undefined;
+    const projectId = req.apiKey?.projectSlug!; // Guaranteed by requireProjectKey middleware
+
    console.log(
-      `[${timestamp}] [${requestId}] Starting image generation process`,
+      `[${timestamp}] [${requestId}] Starting image generation process for org:${orgId}, project:${projectId}`,
    );

    try {
@ -102,6 +108,8 @@ generateRouter.post(
      const result = await imageGenService.generateImage({
        prompt,
        filename,
+        orgId,
+        projectId,
        ...(referenceImages && { referenceImages }),
      });

--- a/apps/api-service/src/routes/images.ts
+++ b/apps/api-service/src/routes/images.ts
@ -1,6 +1,6 @@
-import { Router, Request, Response } from 'express';
-import { StorageFactory } from '../services/StorageFactory';
-import { asyncHandler } from '../middleware/errorHandler';
+import { Router, Request, Response } from "express";
+import { StorageFactory } from "../services/StorageFactory";
+import { asyncHandler } from "../middleware/errorHandler";

 export const imagesRouter = Router();

@ -9,54 +9,55 @@ export const imagesRouter = Router();
 * Serves images via presigned URLs (redirect approach)
 */
 imagesRouter.get(
-  '/images/:orgId/:projectId/:category/:filename',
+  "/images/:orgId/:projectId/:category/:filename",
  asyncHandler(async (req: Request, res: Response) => {
    const { orgId, projectId, category, filename } = req.params;
-    
+
    // Validate category
-    if (!['uploads', 'generated', 'references'].includes(category)) {
+    if (!["uploads", "generated", "references"].includes(category)) {
      return res.status(400).json({
        success: false,
-        message: 'Invalid category'
+        message: "Invalid category",
      });
    }

-    const storageService = StorageFactory.getInstance();
+    const storageService = await StorageFactory.getInstance();

    try {
      // Check if file exists first (fast check)
      const exists = await storageService.fileExists(
        orgId,
        projectId,
-        category as 'uploads' | 'generated' | 'references',
-        filename
+        category as "uploads" | "generated" | "references",
+        filename,
      );

      if (!exists) {
        return res.status(404).json({
          success: false,
-          message: 'File not found'
+          message: "File not found",
        });
      }

      // Determine content type from filename
-      const ext = filename.toLowerCase().split('.').pop();
-      const contentType = {
-        'png': 'image/png',
-        'jpg': 'image/jpeg',
-        'jpeg': 'image/jpeg',
-        'gif': 'image/gif',
-        'webp': 'image/webp',
-        'svg': 'image/svg+xml'
-      }[ext || ''] || 'application/octet-stream';
+      const ext = filename.toLowerCase().split(".").pop();
+      const contentType =
+        {
+          png: "image/png",
+          jpg: "image/jpeg",
+          jpeg: "image/jpeg",
+          gif: "image/gif",
+          webp: "image/webp",
+          svg: "image/svg+xml",
+        }[ext || ""] || "application/octet-stream";

      // Set headers for optimal caching and performance
-      res.setHeader('Content-Type', contentType);
-      res.setHeader('Cache-Control', 'public, max-age=86400, immutable'); // 24 hours + immutable
-      res.setHeader('ETag', `"${orgId}-${projectId}-${filename}"`); // Simple ETag
+      res.setHeader("Content-Type", contentType);
+      res.setHeader("Cache-Control", "public, max-age=86400, immutable"); // 24 hours + immutable
+      res.setHeader("ETag", `"${orgId}-${projectId}-${filename}"`); // Simple ETag

      // Handle conditional requests (304 Not Modified)
-      const ifNoneMatch = req.headers['if-none-match'];
+      const ifNoneMatch = req.headers["if-none-match"];
      if (ifNoneMatch === `"${orgId}-${projectId}-${filename}"`) {
        return res.status(304).end(); // Not Modified
      }
@ -65,32 +66,31 @@ imagesRouter.get(
      const fileStream = await storageService.streamFile(
        orgId,
        projectId,
-        category as 'uploads' | 'generated' | 'references',
-        filename
+        category as "uploads" | "generated" | "references",
+        filename,
      );

      // Handle stream errors
-      fileStream.on('error', (streamError) => {
-        console.error('Stream error:', streamError);
+      fileStream.on("error", (streamError) => {
+        console.error("Stream error:", streamError);
        if (!res.headersSent) {
          res.status(500).json({
            success: false,
-            message: 'Error streaming file'
+            message: "Error streaming file",
          });
        }
      });

      // Stream the file without loading into memory
      fileStream.pipe(res);
-
    } catch (error) {
-      console.error('Failed to stream file:', error);
+      console.error("Failed to stream file:", error);
      return res.status(404).json({
        success: false,
-        message: 'File not found'
+        message: "File not found",
      });
    }
-  })
+  }),
 );

 /**
@ -98,41 +98,40 @@ imagesRouter.get(
 * Returns a presigned URL instead of redirecting
 */
 imagesRouter.get(
-  '/images/url/:orgId/:projectId/:category/:filename',
+  "/images/url/:orgId/:projectId/:category/:filename",
  asyncHandler(async (req: Request, res: Response) => {
    const { orgId, projectId, category, filename } = req.params;
-    const { expiry = '3600' } = req.query; // Default 1 hour
-    
-    if (!['uploads', 'generated', 'references'].includes(category)) {
+    const { expiry = "3600" } = req.query; // Default 1 hour
+
+    if (!["uploads", "generated", "references"].includes(category)) {
      return res.status(400).json({
        success: false,
-        message: 'Invalid category'
+        message: "Invalid category",
      });
    }

-    const storageService = StorageFactory.getInstance();
+    const storageService = await StorageFactory.getInstance();

    try {
      const presignedUrl = await storageService.getPresignedDownloadUrl(
        orgId,
        projectId,
-        category as 'uploads' | 'generated' | 'references',
+        category as "uploads" | "generated" | "references",
        filename,
-        parseInt(expiry as string, 10)
+        parseInt(expiry as string, 10),
      );

      return res.json({
        success: true,
        url: presignedUrl,
-        expiresIn: parseInt(expiry as string, 10)
+        expiresIn: parseInt(expiry as string, 10),
      });
-
    } catch (error) {
-      console.error('Failed to generate presigned URL:', error);
+      console.error("Failed to generate presigned URL:", error);
      return res.status(404).json({
        success: false,
-        message: 'File not found or access denied'
+        message: "File not found or access denied",
      });
    }
-  })
-);
+  }),
+);
--- a/apps/api-service/src/routes/textToImage.ts
+++ b/apps/api-service/src/routes/textToImage.ts
@ -11,6 +11,7 @@ import {
 } from "../middleware/promptEnhancement";
 import { asyncHandler } from "../middleware/errorHandler";
 import { validateApiKey } from "../middleware/auth/validateApiKey";
+import { requireProjectKey } from "../middleware/auth/requireProjectKey";
 import { rateLimitByApiKey } from "../middleware/auth/rateLimiter";
 import { GenerateImageResponse } from "../types/api";

@ -25,6 +26,7 @@ textToImageRouter.post(
  "/text-to-image",
  // Authentication middleware
  validateApiKey,
+  requireProjectKey,
  rateLimitByApiKey,

  // JSON validation middleware
@ -54,8 +56,12 @@ textToImageRouter.post(
    const requestId = req.requestId;
    const { prompt, filename } = req.body;

+    // Extract org/project slugs from validated API key
+    const orgId = req.apiKey?.organizationSlug || undefined;
+    const projectId = req.apiKey?.projectSlug!; // Guaranteed by requireProjectKey middleware
+
    console.log(
-      `[${timestamp}] [${requestId}] Starting text-to-image generation process`,
+      `[${timestamp}] [${requestId}] Starting text-to-image generation process for org:${orgId}, project:${projectId}`,
    );

    try {
@ -67,6 +73,8 @@ textToImageRouter.post(
      const result = await imageGenService.generateImage({
        prompt,
        filename,
+        orgId,
+        projectId,
      });

      // Log the result
--- a/apps/api-service/src/services/ApiKeyService.ts
+++ b/apps/api-service/src/services/ApiKeyService.ts
@ -1,23 +1,30 @@
-import crypto from 'crypto';
-import { db } from '../db';
-import { apiKeys, type ApiKey, type NewApiKey } from '@banatie/database';
-import { eq, and, desc } from 'drizzle-orm';
+import crypto from "crypto";
+import { db } from "../db";
+import { apiKeys, organizations, projects, type ApiKey, type NewApiKey } from "@banatie/database";
+import { eq, and, desc } from "drizzle-orm";
+
+// Extended API key type with slugs for storage paths
+export interface ApiKeyWithSlugs extends ApiKey {
+  organizationSlug?: string;
+  projectSlug?: string;
+}

 export class ApiKeyService {
  /**
   * Generate a new API key
   * Format: bnt_{64_hex_chars}
   */
-  private generateKey(): { fullKey: string; keyHash: string; keyPrefix: string } {
-    const secret = crypto.randomBytes(32).toString('hex'); // 64 chars
-    const keyPrefix = 'bnt_';
+  private generateKey(): {
+    fullKey: string;
+    keyHash: string;
+    keyPrefix: string;
+  } {
+    const secret = crypto.randomBytes(32).toString("hex"); // 64 chars
+    const keyPrefix = "bnt_";
    const fullKey = keyPrefix + secret;

    // Hash for storage (SHA-256)
-    const keyHash = crypto
-      .createHash('sha256')
-      .update(fullKey)
-      .digest('hex');
+    const keyHash = crypto.createHash("sha256").update(fullKey).digest("hex");

    return { fullKey, keyHash, keyPrefix };
  }
@ -25,21 +32,29 @@ export class ApiKeyService {
  /**
   * Create a master key (admin access, never expires)
   */
-  async createMasterKey(name?: string, createdBy?: string): Promise<{ key: string; metadata: ApiKey }> {
+  async createMasterKey(
+    name?: string,
+    createdBy?: string,
+  ): Promise<{ key: string; metadata: ApiKey }> {
    const { fullKey, keyHash, keyPrefix } = this.generateKey();

-    const [newKey] = await db.insert(apiKeys).values({
-      keyHash,
-      keyPrefix,
-      keyType: 'master',
-      projectId: null,
-      scopes: ['*'], // Full access
-      name: name || 'Master Key',
-      expiresAt: null, // Never expires
-      createdBy: createdBy || null,
-    }).returning();
+    const [newKey] = await db
+      .insert(apiKeys)
+      .values({
+        keyHash,
+        keyPrefix,
+        keyType: "master",
+        projectId: null,
+        scopes: ["*"], // Full access
+        name: name || "Master Key",
+        expiresAt: null, // Never expires
+        createdBy: createdBy || null,
+      })
+      .returning();

-    console.log(`[${new Date().toISOString()}] Master key created: ${newKey?.id} - ${newKey?.name}`);
+    console.log(
+      `[${new Date().toISOString()}] Master key created: ${newKey?.id} - ${newKey?.name}`,
+    );

    return { key: fullKey, metadata: newKey! };
  }
@ -52,26 +67,31 @@ export class ApiKeyService {
    organizationId?: string,
    name?: string,
    createdBy?: string,
-    expiresInDays: number = 90
+    expiresInDays: number = 90,
  ): Promise<{ key: string; metadata: ApiKey }> {
    const { fullKey, keyHash, keyPrefix } = this.generateKey();

    const expiresAt = new Date();
    expiresAt.setDate(expiresAt.getDate() + expiresInDays);

-    const [newKey] = await db.insert(apiKeys).values({
-      keyHash,
-      keyPrefix,
-      keyType: 'project',
-      projectId,
-      organizationId: organizationId || null,
-      scopes: ['generate', 'read'],
-      name: name || `Project Key - ${projectId}`,
-      expiresAt,
-      createdBy: createdBy || null,
-    }).returning();
+    const [newKey] = await db
+      .insert(apiKeys)
+      .values({
+        keyHash,
+        keyPrefix,
+        keyType: "project",
+        projectId,
+        organizationId: organizationId || null,
+        scopes: ["generate", "read"],
+        name: name || `Project Key - ${projectId}`,
+        expiresAt,
+        createdBy: createdBy || null,
+      })
+      .returning();

-    console.log(`[${new Date().toISOString()}] Project key created: ${newKey?.id} - ${projectId} - expires: ${expiresAt.toISOString()}`);
+    console.log(
+      `[${new Date().toISOString()}] Project key created: ${newKey?.id} - ${projectId} - expires: ${expiresAt.toISOString()}`,
+    );

    return { key: fullKey, metadata: newKey! };
  }
@ -79,49 +99,74 @@ export class ApiKeyService {
  /**
   * Validate an API key
   * Returns null if invalid/expired/revoked
+   * Returns API key with organization and project slugs for storage paths
   */
-  async validateKey(providedKey: string): Promise<ApiKey | null> {
-    if (!providedKey || !providedKey.startsWith('bnt_')) {
+  async validateKey(providedKey: string): Promise<ApiKeyWithSlugs | null> {
+    if (!providedKey || !providedKey.startsWith("bnt_")) {
      return null;
    }

    // Hash the provided key
    const keyHash = crypto
-      .createHash('sha256')
+      .createHash("sha256")
      .update(providedKey)
-      .digest('hex');
+      .digest("hex");

-    // Find in database
-    const [key] = await db
-      .select()
+    // Find in database with left joins to get slugs
+    const [result] = await db
+      .select({
+        // API key fields
+        id: apiKeys.id,
+        keyHash: apiKeys.keyHash,
+        keyPrefix: apiKeys.keyPrefix,
+        keyType: apiKeys.keyType,
+        organizationId: apiKeys.organizationId,
+        projectId: apiKeys.projectId,
+        scopes: apiKeys.scopes,
+        createdAt: apiKeys.createdAt,
+        expiresAt: apiKeys.expiresAt,
+        lastUsedAt: apiKeys.lastUsedAt,
+        isActive: apiKeys.isActive,
+        name: apiKeys.name,
+        createdBy: apiKeys.createdBy,
+        // Slug fields
+        organizationSlug: organizations.slug,
+        projectSlug: projects.slug,
+      })
      .from(apiKeys)
-      .where(
-        and(
-          eq(apiKeys.keyHash, keyHash),
-          eq(apiKeys.isActive, true)
-        )
-      )
+      .leftJoin(organizations, eq(apiKeys.organizationId, organizations.id))
+      .leftJoin(projects, eq(apiKeys.projectId, projects.id))
+      .where(and(eq(apiKeys.keyHash, keyHash), eq(apiKeys.isActive, true)))
      .limit(1);

-    if (!key) {
-      console.warn(`[${new Date().toISOString()}] Invalid API key attempt: ${providedKey.substring(0, 10)}...`);
+    if (!result) {
+      console.warn(
+        `[${new Date().toISOString()}] Invalid API key attempt: ${providedKey.substring(0, 10)}...`,
+      );
      return null;
    }

    // Check expiration
-    if (key.expiresAt && key.expiresAt < new Date()) {
-      console.warn(`[${new Date().toISOString()}] Expired API key used: ${key.id} - expired: ${key.expiresAt.toISOString()}`);
+    if (result.expiresAt && result.expiresAt < new Date()) {
+      console.warn(
+        `[${new Date().toISOString()}] Expired API key used: ${result.id} - expired: ${result.expiresAt.toISOString()}`,
+      );
      return null;
    }

    // Update last used timestamp (async, don't wait)
    db.update(apiKeys)
      .set({ lastUsedAt: new Date() })
-      .where(eq(apiKeys.id, key.id))
+      .where(eq(apiKeys.id, result.id))
      .execute()
-      .catch(err => console.error(`[${new Date().toISOString()}] Failed to update lastUsedAt:`, err));
+      .catch((err) =>
+        console.error(
+          `[${new Date().toISOString()}] Failed to update lastUsedAt:`,
+          err,
+        ),
+      );

-    return key;
+    return result as ApiKeyWithSlugs;
  }

  /**
@ -146,21 +191,94 @@ export class ApiKeyService {
   * List all keys (for admin)
   */
  async listKeys(): Promise<ApiKey[]> {
-    return db
-      .select()
-      .from(apiKeys)
-      .orderBy(desc(apiKeys.createdAt));
+    return db.select().from(apiKeys).orderBy(desc(apiKeys.createdAt));
  }

  /**
   * Check if any keys exist (for bootstrap)
   */
  async hasAnyKeys(): Promise<boolean> {
-    const keys = await db
-      .select({ id: apiKeys.id })
-      .from(apiKeys)
-      .limit(1);
+    const keys = await db.select({ id: apiKeys.id }).from(apiKeys).limit(1);

    return keys.length > 0;
  }
-}
+
+  /**
+   * Get or create organization by slug
+   * If organization doesn't exist, create it with provided name (or use slug as name)
+   */
+  async getOrCreateOrganization(
+    slug: string,
+    name?: string,
+    email?: string,
+  ): Promise<string> {
+    // Try to find existing organization
+    const [existing] = await db
+      .select({ id: organizations.id })
+      .from(organizations)
+      .where(eq(organizations.slug, slug))
+      .limit(1);
+
+    if (existing) {
+      return existing.id;
+    }
+
+    // Create new organization
+    const [newOrg] = await db
+      .insert(organizations)
+      .values({
+        slug,
+        name: name || slug,
+        email: email || `${slug}@placeholder.local`,
+      })
+      .returning({ id: organizations.id });
+
+    console.log(
+      `[${new Date().toISOString()}] Organization created: ${newOrg?.id} - ${slug}`,
+    );
+
+    return newOrg!.id;
+  }
+
+  /**
+   * Get or create project by slug within an organization
+   * If project doesn't exist, create it with provided name (or use slug as name)
+   */
+  async getOrCreateProject(
+    organizationId: string,
+    slug: string,
+    name?: string,
+  ): Promise<string> {
+    // Try to find existing project
+    const [existing] = await db
+      .select({ id: projects.id })
+      .from(projects)
+      .where(
+        and(
+          eq(projects.organizationId, organizationId),
+          eq(projects.slug, slug),
+        ),
+      )
+      .limit(1);
+
+    if (existing) {
+      return existing.id;
+    }
+
+    // Create new project
+    const [newProject] = await db
+      .insert(projects)
+      .values({
+        organizationId,
+        slug,
+        name: name || slug,
+      })
+      .returning({ id: projects.id });
+
+    console.log(
+      `[${new Date().toISOString()}] Project created: ${newProject?.id} - ${slug} (org: ${organizationId})`,
+    );
+
+    return newProject!.id;
+  }
+}
--- a/apps/api-service/src/services/ImageGenService.ts
+++ b/apps/api-service/src/services/ImageGenService.ts
@ -1,19 +1,17 @@
 import { GoogleGenAI } from "@google/genai";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const mime = require("mime") as any;
-import path from "path";
 import {
  ImageGenerationOptions,
  ImageGenerationResult,
  ReferenceImage,
+  GeneratedImageData,
 } from "../types/api";
 import { StorageFactory } from "./StorageFactory";
-import { UploadResult } from "./StorageService";

 export class ImageGenService {
  private ai: GoogleGenAI;
  private primaryModel = "gemini-2.5-flash-image-preview";
-  private fallbackModel = "imagen-4.0-generate-001";

  constructor(apiKey: string) {
    if (!apiKey) {
@ -24,182 +22,168 @@ export class ImageGenService {

  /**
   * Generate an image from text prompt with optional reference images
+   * This method separates image generation from storage for clear error handling
   */
  async generateImage(
    options: ImageGenerationOptions,
  ): Promise<ImageGenerationResult> {
-    const { prompt, filename, referenceImages, orgId, projectId, userId } =
-      options;
-    const timestamp = new Date().toISOString();
+    const { prompt, filename, referenceImages, orgId, projectId } = options;

    // Use default values if not provided
    const finalOrgId = orgId || process.env["DEFAULT_ORG_ID"] || "default";
    const finalProjectId =
      projectId || process.env["DEFAULT_PROJECT_ID"] || "main";
-    const finalUserId = userId || process.env["DEFAULT_USER_ID"] || "system";
-

+    // Step 1: Generate image from Gemini AI
+    let generatedData: GeneratedImageData;
    try {
-      const result = await this.tryGeneration({
-        model: this.primaryModel,
-        config: { responseModalities: ["IMAGE", "TEXT"] },
-        prompt,
-        filename,
-        orgId: finalOrgId,
-        projectId: finalProjectId,
-        userId: finalUserId,
-        ...(referenceImages && { referenceImages }),
-        modelName: "Primary Model",
-      });
-
-      if (result.success) {
-        return result;
-      }
-
-
-      return await this.tryGeneration({
-        model: this.fallbackModel,
-        config: { responseModalities: ["IMAGE"] },
-        prompt,
-        filename: `${filename}_fallback`,
-        orgId: finalOrgId,
-        projectId: finalProjectId,
-        userId: finalUserId,
-        ...(referenceImages && { referenceImages }),
-        modelName: "Fallback Model",
-      });
+      generatedData = await this.generateImageWithAI(prompt, referenceImages);
    } catch (error) {
+      // Generation failed - return explicit error
      return {
        success: false,
-        model: "none",
+        model: this.primaryModel,
        error:
-          error instanceof Error ? error.message : "Unknown error occurred",
+          error instanceof Error ? error.message : "Image generation failed",
+        errorType: "generation",
+      };
+    }
+
+    // Step 2: Save generated image to storage
+    try {
+      const finalFilename = `${filename}.${generatedData.fileExtension}`;
+      const storageService = await StorageFactory.getInstance();
+      const uploadResult = await storageService.uploadFile(
+        finalOrgId,
+        finalProjectId,
+        "generated",
+        finalFilename,
+        generatedData.buffer,
+        generatedData.mimeType,
+      );
+
+      if (uploadResult.success) {
+        return {
+          success: true,
+          filename: uploadResult.filename,
+          filepath: uploadResult.path,
+          url: uploadResult.url,
+          model: this.primaryModel,
+          ...(generatedData.description && {
+            description: generatedData.description,
+          }),
+        };
+      } else {
+        // Storage failed but image was generated
+        return {
+          success: false,
+          model: this.primaryModel,
+          error: `Image generated successfully but storage failed: ${uploadResult.error || "Unknown storage error"}`,
+          errorType: "storage",
+          generatedImageData: generatedData,
+          ...(generatedData.description && {
+            description: generatedData.description,
+          }),
+        };
+      }
+    } catch (error) {
+      // Storage exception - image was generated but couldn't be saved
+      return {
+        success: false,
+        model: this.primaryModel,
+        error: `Image generated successfully but storage failed: ${error instanceof Error ? error.message : "Unknown storage error"}`,
+        errorType: "storage",
+        generatedImageData: generatedData,
+        ...(generatedData.description && {
+          description: generatedData.description,
+        }),
      };
    }
  }

-  private async tryGeneration(params: {
-    model: string;
-    config: { responseModalities: string[] };
-    prompt: string;
-    filename: string;
-    orgId: string;
-    projectId: string;
-    userId: string;
-    referenceImages?: ReferenceImage[];
-    modelName: string;
-  }): Promise<ImageGenerationResult> {
-    const {
-      model,
-      config,
-      prompt,
-      filename,
-      orgId,
-      projectId,
-      userId,
-      referenceImages,
-      modelName,
-    } = params;
+  /**
+   * Generate image using Gemini AI - isolated from storage logic
+   * @throws Error if generation fails
+   */
+  private async generateImageWithAI(
+    prompt: string,
+    referenceImages?: ReferenceImage[],
+  ): Promise<GeneratedImageData> {
+    const contentParts: any[] = [];
+
+    // Add reference images if provided
+    if (referenceImages && referenceImages.length > 0) {
+      for (const refImage of referenceImages) {
+        contentParts.push({
+          inlineData: {
+            mimeType: refImage.mimetype,
+            data: refImage.buffer.toString("base64"),
+          },
+        });
+      }
+    }
+
+    // Add text prompt
+    contentParts.push({
+      text: prompt,
+    });
+
+    const contents = [
+      {
+        role: "user" as const,
+        parts: contentParts,
+      },
+    ];

    try {
-      const contentParts: any[] = [];
-
-      if (referenceImages && referenceImages.length > 0) {
-
-        for (const refImage of referenceImages) {
-          contentParts.push({
-            inlineData: {
-              mimeType: refImage.mimetype,
-              data: refImage.buffer.toString("base64"),
-            },
-          });
-        }
-      }
-
-      contentParts.push({
-        text: prompt,
-      });
-
-      const contents = [
-        {
-          role: "user" as const,
-          parts: contentParts,
-        },
-      ];
-
-
      const response = await this.ai.models.generateContent({
-        model,
-        config,
+        model: this.primaryModel,
+        config: { responseModalities: ["IMAGE", "TEXT"] },
        contents,
      });

-
+      // Parse response
      if (
-        response.candidates &&
-        response.candidates[0] &&
-        response.candidates[0].content
+        !response.candidates ||
+        !response.candidates[0] ||
+        !response.candidates[0].content
      ) {
-        const content = response.candidates[0].content;
-        let generatedDescription = "";
-        let uploadResult: UploadResult | null = null;
+        throw new Error("No response received from Gemini AI");
+      }

-        for (let index = 0; index < (content.parts?.length || 0); index++) {
-          const part = content.parts?.[index];
-          if (!part) continue;
+      const content = response.candidates[0].content;
+      let generatedDescription: string | undefined;
+      let imageData: { buffer: Buffer; mimeType: string } | null = null;

-          if (part.inlineData) {
-            const fileExtension = mime.getExtension(
-              part.inlineData.mimeType || "",
-            );
-            const finalFilename = `${filename}.${fileExtension}`;
-            const contentType =
-              part.inlineData.mimeType || `image/${fileExtension}`;
-
-
-            const buffer = Buffer.from(part.inlineData.data || "", "base64");
-
-            const storageService = StorageFactory.getInstance();
-            const result = (await storageService).uploadFile(
-              orgId,
-              projectId,
-              "generated",
-              finalFilename,
-              buffer,
-              contentType,
-            );
-
-            uploadResult = await result;
-
-          } else if (part.text) {
-            generatedDescription = part.text;
-          }
-        }
-
-
-        if (uploadResult && uploadResult.success) {
-          return {
-            success: true,
-            filename: uploadResult.filename,
-            filepath: uploadResult.path,
-            url: uploadResult.url,
-            description: generatedDescription,
-            model: modelName,
-          };
+      // Extract image data and description from response
+      for (const part of content.parts || []) {
+        if (part.inlineData) {
+          const buffer = Buffer.from(part.inlineData.data || "", "base64");
+          const mimeType = part.inlineData.mimeType || "image/png";
+          imageData = { buffer, mimeType };
+        } else if (part.text) {
+          generatedDescription = part.text;
        }
      }

+      if (!imageData) {
+        throw new Error("No image data received from Gemini AI");
+      }
+
+      const fileExtension = mime.getExtension(imageData.mimeType) || "png";
+
      return {
-        success: false,
-        model: modelName,
-        error: "No image data received from API",
+        buffer: imageData.buffer,
+        mimeType: imageData.mimeType,
+        fileExtension,
+        ...(generatedDescription && { description: generatedDescription }),
      };
    } catch (error) {
-      return {
-        success: false,
-        model: modelName,
-        error: error instanceof Error ? error.message : "Generation failed",
-      };
+      // Re-throw with clear error message
+      if (error instanceof Error) {
+        throw new Error(`Gemini AI generation failed: ${error.message}`);
+      }
+      throw new Error("Gemini AI generation failed: Unknown error");
    }
  }

--- a/apps/api-service/src/services/MinioStorageService.ts
+++ b/apps/api-service/src/services/MinioStorageService.ts
@ -1,5 +1,5 @@
-import { Client as MinioClient } from 'minio';
-import { StorageService, FileMetadata, UploadResult } from './StorageService';
+import { Client as MinioClient } from "minio";
+import { StorageService, FileMetadata, UploadResult } from "./StorageService";

 export class MinioStorageService implements StorageService {
  private client: MinioClient;
@ -11,13 +11,13 @@ export class MinioStorageService implements StorageService {
    accessKey: string,
    secretKey: string,
    useSSL: boolean = false,
-    bucketName: string = 'banatie',
-    publicUrl?: string
+    bucketName: string = "banatie",
+    publicUrl?: string,
  ) {
    // Parse endpoint to separate hostname and port
-    const cleanEndpoint = endpoint.replace(/^https?:\/\//, '');
-    const [hostname, portStr] = cleanEndpoint.split(':');
-    const port = portStr ? parseInt(portStr, 10) : (useSSL ? 443 : 9000);
+    const cleanEndpoint = endpoint.replace(/^https?:\/\//, "");
+    const [hostname, portStr] = cleanEndpoint.split(":");
+    const port = portStr ? parseInt(portStr, 10) : useSSL ? 443 : 9000;

    if (!hostname) {
      throw new Error(`Invalid MinIO endpoint: ${endpoint}`);
@ -25,20 +25,20 @@ export class MinioStorageService implements StorageService {

    this.client = new MinioClient({
      endPoint: hostname,
-      port: port,
+      port,
      useSSL,
      accessKey,
-      secretKey
+      secretKey,
    });
    this.bucketName = bucketName;
-    this.publicUrl = publicUrl || `${useSSL ? 'https' : 'http'}://${endpoint}`;
+    this.publicUrl = publicUrl || `${useSSL ? "https" : "http"}://${endpoint}`;
  }

  private getFilePath(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
+    category: "uploads" | "generated" | "references",
+    filename: string,
  ): string {
    // Simplified path without date folder for now
    return `${orgId}/${projectId}/${category}/${filename}`;
@ -50,11 +50,11 @@ export class MinioStorageService implements StorageService {

    const timestamp = Date.now();
    const random = Math.random().toString(36).substring(2, 8);
-    const ext = sanitized.includes('.')
-      ? sanitized.substring(sanitized.lastIndexOf('.'))
-      : '';
-    const name = sanitized.includes('.')
-      ? sanitized.substring(0, sanitized.lastIndexOf('.'))
+    const ext = sanitized.includes(".")
+      ? sanitized.substring(sanitized.lastIndexOf("."))
+      : "";
+    const name = sanitized.includes(".")
+      ? sanitized.substring(0, sanitized.lastIndexOf("."))
      : sanitized;

    return `${name}-${timestamp}-${random}${ext}`;
@ -63,49 +63,70 @@ export class MinioStorageService implements StorageService {
  private sanitizeFilename(filename: string): string {
    // Remove dangerous characters and path traversal attempts
    return filename
-      .replace(/[<>:"/\\|?*\x00-\x1f]/g, '') // Remove dangerous chars
-      .replace(/\.\./g, '') // Remove path traversal
-      .replace(/^\.+/, '') // Remove leading dots
+      .replace(/[<>:"/\\|?*\x00-\x1f]/g, "") // Remove dangerous chars
+      .replace(/\.\./g, "") // Remove path traversal
+      .replace(/^\.+/, "") // Remove leading dots
      .trim()
      .substring(0, 255); // Limit length
  }

-  private validateFilePath(orgId: string, projectId: string, category: string, filename: string): void {
+  private validateFilePath(
+    orgId: string,
+    projectId: string,
+    category: string,
+    filename: string,
+  ): void {
    // Validate orgId
    if (!orgId || !/^[a-zA-Z0-9_-]+$/.test(orgId) || orgId.length > 50) {
-      throw new Error('Invalid organization ID: must be alphanumeric with dashes/underscores, max 50 chars');
+      throw new Error(
+        "Invalid organization ID: must be alphanumeric with dashes/underscores, max 50 chars",
+      );
    }

    // Validate projectId
-    if (!projectId || !/^[a-zA-Z0-9_-]+$/.test(projectId) || projectId.length > 50) {
-      throw new Error('Invalid project ID: must be alphanumeric with dashes/underscores, max 50 chars');
+    if (
+      !projectId ||
+      !/^[a-zA-Z0-9_-]+$/.test(projectId) ||
+      projectId.length > 50
+    ) {
+      throw new Error(
+        "Invalid project ID: must be alphanumeric with dashes/underscores, max 50 chars",
+      );
    }

    // Validate category
-    if (!['uploads', 'generated', 'references'].includes(category)) {
-      throw new Error('Invalid category: must be uploads, generated, or references');
+    if (!["uploads", "generated", "references"].includes(category)) {
+      throw new Error(
+        "Invalid category: must be uploads, generated, or references",
+      );
    }

    // Validate filename
    if (!filename || filename.length === 0 || filename.length > 255) {
-      throw new Error('Invalid filename: must be 1-255 characters');
+      throw new Error("Invalid filename: must be 1-255 characters");
    }

    // Check for path traversal and dangerous patterns
-    if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
-      throw new Error('Invalid characters in filename: path traversal not allowed');
+    if (
+      filename.includes("..") ||
+      filename.includes("/") ||
+      filename.includes("\\")
+    ) {
+      throw new Error(
+        "Invalid characters in filename: path traversal not allowed",
+      );
    }

    // Prevent null bytes and control characters
    if (/[\x00-\x1f]/.test(filename)) {
-      throw new Error('Invalid filename: control characters not allowed');
+      throw new Error("Invalid filename: control characters not allowed");
    }
  }

  async createBucket(): Promise<void> {
    const exists = await this.client.bucketExists(this.bucketName);
    if (!exists) {
-      await this.client.makeBucket(this.bucketName, 'us-east-1');
+      await this.client.makeBucket(this.bucketName, "us-east-1");
      console.log(`Created bucket: ${this.bucketName}`);
    }

@ -120,20 +141,20 @@ export class MinioStorageService implements StorageService {
  async uploadFile(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
+    category: "uploads" | "generated" | "references",
    filename: string,
    buffer: Buffer,
-    contentType: string
+    contentType: string,
  ): Promise<UploadResult> {
    // Validate inputs first
    this.validateFilePath(orgId, projectId, category, filename);

    if (!buffer || buffer.length === 0) {
-      throw new Error('Buffer cannot be empty');
+      throw new Error("Buffer cannot be empty");
    }

    if (!contentType || contentType.trim().length === 0) {
-      throw new Error('Content type is required');
+      throw new Error("Content type is required");
    }

    // Ensure bucket exists
@ -141,15 +162,20 @@ export class MinioStorageService implements StorageService {

    // Generate unique filename to avoid conflicts
    const uniqueFilename = this.generateUniqueFilename(filename);
-    const filePath = this.getFilePath(orgId, projectId, category, uniqueFilename);
+    const filePath = this.getFilePath(
+      orgId,
+      projectId,
+      category,
+      uniqueFilename,
+    );

    const metadata = {
-      'Content-Type': contentType,
-      'X-Amz-Meta-Original-Name': filename,
-      'X-Amz-Meta-Category': category,
-      'X-Amz-Meta-Project': projectId,
-      'X-Amz-Meta-Organization': orgId,
-      'X-Amz-Meta-Upload-Time': new Date().toISOString()
+      "Content-Type": contentType,
+      "X-Amz-Meta-Original-Name": filename,
+      "X-Amz-Meta-Category": category,
+      "X-Amz-Meta-Project": projectId,
+      "X-Amz-Meta-Organization": orgId,
+      "X-Amz-Meta-Upload-Time": new Date().toISOString(),
    };

    console.log(`Uploading file to: ${this.bucketName}/${filePath}`);
@ -159,7 +185,7 @@ export class MinioStorageService implements StorageService {
      filePath,
      buffer,
      buffer.length,
-      metadata
+      metadata,
    );

    const url = this.getPublicUrl(orgId, projectId, category, uniqueFilename);
@ -172,15 +198,15 @@ export class MinioStorageService implements StorageService {
      path: filePath,
      url,
      size: buffer.length,
-      contentType
+      contentType,
    };
  }

  async downloadFile(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
+    category: "uploads" | "generated" | "references",
+    filename: string,
  ): Promise<Buffer> {
    this.validateFilePath(orgId, projectId, category, filename);
    const filePath = this.getFilePath(orgId, projectId, category, filename);
@ -189,18 +215,18 @@ export class MinioStorageService implements StorageService {

    return new Promise((resolve, reject) => {
      const chunks: Buffer[] = [];
-      stream.on('data', (chunk) => chunks.push(chunk));
-      stream.on('end', () => resolve(Buffer.concat(chunks)));
-      stream.on('error', reject);
+      stream.on("data", (chunk) => chunks.push(chunk));
+      stream.on("end", () => resolve(Buffer.concat(chunks)));
+      stream.on("error", reject);
    });
  }

  async streamFile(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
-  ): Promise<import('stream').Readable> {
+    category: "uploads" | "generated" | "references",
+    filename: string,
+  ): Promise<import("stream").Readable> {
    this.validateFilePath(orgId, projectId, category, filename);
    const filePath = this.getFilePath(orgId, projectId, category, filename);

@ -211,8 +237,8 @@ export class MinioStorageService implements StorageService {
  async deleteFile(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
+    category: "uploads" | "generated" | "references",
+    filename: string,
  ): Promise<void> {
    this.validateFilePath(orgId, projectId, category, filename);
    const filePath = this.getFilePath(orgId, projectId, category, filename);
@ -222,52 +248,61 @@ export class MinioStorageService implements StorageService {
  getPublicUrl(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
+    category: "uploads" | "generated" | "references",
+    filename: string,
  ): string {
    this.validateFilePath(orgId, projectId, category, filename);
    // Production-ready: Return API URL for presigned URL access
-    const apiBaseUrl = process.env['API_BASE_URL'] || 'http://localhost:3000';
+    const apiBaseUrl = process.env["API_BASE_URL"] || "http://localhost:3000";
    return `${apiBaseUrl}/api/images/${orgId}/${projectId}/${category}/${filename}`;
  }

  async getPresignedUploadUrl(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
+    category: "uploads" | "generated" | "references",
    filename: string,
    expirySeconds: number,
-    contentType: string
+    contentType: string,
  ): Promise<string> {
    this.validateFilePath(orgId, projectId, category, filename);

    if (!contentType || contentType.trim().length === 0) {
-      throw new Error('Content type is required for presigned upload URL');
+      throw new Error("Content type is required for presigned upload URL");
    }

    const filePath = this.getFilePath(orgId, projectId, category, filename);
-    return await this.client.presignedPutObject(this.bucketName, filePath, expirySeconds);
+    return await this.client.presignedPutObject(
+      this.bucketName,
+      filePath,
+      expirySeconds,
+    );
  }

  async getPresignedDownloadUrl(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
+    category: "uploads" | "generated" | "references",
    filename: string,
-    expirySeconds: number = 86400 // 24 hours default
+    expirySeconds: number = 86400, // 24 hours default
  ): Promise<string> {
    this.validateFilePath(orgId, projectId, category, filename);
    const filePath = this.getFilePath(orgId, projectId, category, filename);
-    const presignedUrl = await this.client.presignedGetObject(this.bucketName, filePath, expirySeconds);
+    const presignedUrl = await this.client.presignedGetObject(
+      this.bucketName,
+      filePath,
+      expirySeconds,
+    );

    // Replace internal Docker hostname with public URL if configured
    if (this.publicUrl) {
-      const clientEndpoint = this.client.host + (this.client.port ? `:${this.client.port}` : '');
-      const publicEndpoint = this.publicUrl.replace(/^https?:\/\//, '');
+      const clientEndpoint =
+        this.client.host + (this.client.port ? `:${this.client.port}` : "");
+      const publicEndpoint = this.publicUrl.replace(/^https?:\/\//, "");

      return presignedUrl.replace(
        `${this.client.protocol}//${clientEndpoint}`,
-        this.publicUrl
+        this.publicUrl,
      );
    }

@ -277,24 +312,32 @@ export class MinioStorageService implements StorageService {
  async listProjectFiles(
    orgId: string,
    projectId: string,
-    category?: 'uploads' | 'generated' | 'references'
+    category?: "uploads" | "generated" | "references",
  ): Promise<FileMetadata[]> {
-    const prefix = category ? `${orgId}/${projectId}/${category}/` : `${orgId}/${projectId}/`;
+    const prefix = category
+      ? `${orgId}/${projectId}/${category}/`
+      : `${orgId}/${projectId}/`;

    const files: FileMetadata[] = [];

    return new Promise((resolve, reject) => {
      const stream = this.client.listObjects(this.bucketName, prefix, true);

-      stream.on('data', async (obj) => {
+      stream.on("data", async (obj) => {
        try {
          if (!obj.name) return;

-          const metadata = await this.client.statObject(this.bucketName, obj.name);
+          const metadata = await this.client.statObject(
+            this.bucketName,
+            obj.name,
+          );

-          const pathParts = obj.name.split('/');
+          const pathParts = obj.name.split("/");
          const filename = pathParts[pathParts.length - 1];
-          const categoryFromPath = pathParts[2] as 'uploads' | 'generated' | 'references';
+          const categoryFromPath = pathParts[2] as
+            | "uploads"
+            | "generated"
+            | "references";

          if (!filename || !categoryFromPath) {
            return;
@ -303,28 +346,35 @@ export class MinioStorageService implements StorageService {
          files.push({
            key: `${this.bucketName}/${obj.name}`,
            filename,
-            contentType: metadata.metaData?.['content-type'] || 'application/octet-stream',
+            contentType:
+              metadata.metaData?.["content-type"] || "application/octet-stream",
            size: obj.size || 0,
-            url: this.getPublicUrl(orgId, projectId, categoryFromPath, filename),
-            createdAt: obj.lastModified || new Date()
+            url: this.getPublicUrl(
+              orgId,
+              projectId,
+              categoryFromPath,
+              filename,
+            ),
+            createdAt: obj.lastModified || new Date(),
          });
-        } catch (error) {
-        }
+        } catch (error) {}
      });

-      stream.on('end', () => resolve(files));
-      stream.on('error', reject);
+      stream.on("end", () => resolve(files));
+      stream.on("error", reject);
    });
  }

  parseKey(key: string): {
    orgId: string;
    projectId: string;
-    category: 'uploads' | 'generated' | 'references';
+    category: "uploads" | "generated" | "references";
    filename: string;
  } | null {
    try {
-      const match = key.match(/^banatie\/([^/]+)\/([^/]+)\/(uploads|generated|references)\/[^/]+\/(.+)$/);
+      const match = key.match(
+        /^banatie\/([^/]+)\/([^/]+)\/(uploads|generated|references)\/[^/]+\/(.+)$/,
+      );

      if (!match) {
        return null;
@ -339,20 +389,19 @@ export class MinioStorageService implements StorageService {
      return {
        orgId,
        projectId,
-        category: category as 'uploads' | 'generated' | 'references',
-        filename
+        category: category as "uploads" | "generated" | "references",
+        filename,
      };
    } catch {
      return null;
    }
  }

-
  async fileExists(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    filename: string
+    category: "uploads" | "generated" | "references",
+    filename: string,
  ): Promise<boolean> {
    try {
      this.validateFilePath(orgId, projectId, category, filename);
@ -367,10 +416,10 @@ export class MinioStorageService implements StorageService {
  async listFiles(
    orgId: string,
    projectId: string,
-    category: 'uploads' | 'generated' | 'references',
-    prefix?: string
+    category: "uploads" | "generated" | "references",
+    prefix?: string,
  ): Promise<FileMetadata[]> {
-    this.validateFilePath(orgId, projectId, category, 'dummy.txt');
+    this.validateFilePath(orgId, projectId, category, "dummy.txt");

    const basePath = `${orgId}/${projectId}/${category}/`;
    const searchPrefix = prefix ? `${basePath}${prefix}` : basePath;
@ -378,33 +427,40 @@ export class MinioStorageService implements StorageService {
    const files: FileMetadata[] = [];

    return new Promise((resolve, reject) => {
-      const stream = this.client.listObjects(this.bucketName, searchPrefix, true);
+      const stream = this.client.listObjects(
+        this.bucketName,
+        searchPrefix,
+        true,
+      );

-      stream.on('data', async (obj) => {
+      stream.on("data", async (obj) => {
        if (!obj.name || !obj.size) return;

        try {
-          const pathParts = obj.name.split('/');
+          const pathParts = obj.name.split("/");
          const filename = pathParts[pathParts.length - 1];

          if (!filename) return;

-          const metadata = await this.client.statObject(this.bucketName, obj.name);
+          const metadata = await this.client.statObject(
+            this.bucketName,
+            obj.name,
+          );

          files.push({
            filename,
            size: obj.size,
-            contentType: metadata.metaData?.['content-type'] || 'application/octet-stream',
+            contentType:
+              metadata.metaData?.["content-type"] || "application/octet-stream",
            lastModified: obj.lastModified || new Date(),
            etag: metadata.etag,
-            path: obj.name
+            path: obj.name,
          });
-        } catch (error) {
-        }
+        } catch (error) {}
      });

-      stream.on('end', () => resolve(files));
-      stream.on('error', reject);
+      stream.on("end", () => resolve(files));
+      stream.on("error", reject);
    });
  }
-}
+}
--- a/apps/api-service/src/services/StorageFactory.ts
+++ b/apps/api-service/src/services/StorageFactory.ts
@ -1,5 +1,5 @@
-import { StorageService } from './StorageService';
-import { MinioStorageService } from './MinioStorageService';
+import { StorageService } from "./StorageService";
+import { MinioStorageService } from "./MinioStorageService";

 export class StorageFactory {
  private static instance: StorageService | null = null;
@ -30,32 +30,30 @@ export class StorageFactory {
      try {
        this.instance = this.createStorageService();
      } catch (error) {
-        throw new Error('Storage service unavailable. Please check MinIO configuration.');
+        throw new Error(
+          "Storage service unavailable. Please check MinIO configuration.",
+        );
      }
    }
    return this.instance;
  }

-
  private static async createStorageServiceWithRetry(): Promise<StorageService> {
    const maxRetries = 3;
    const baseDelay = 1000; // 1 second

    for (let attempt = 1; attempt <= maxRetries; attempt++) {
      try {
-
        const service = this.createStorageService();

        await service.bucketExists();

        return service;
-
      } catch (error) {
-
        if (attempt === maxRetries) {
          throw new Error(
            `Failed to initialize storage service after ${maxRetries} attempts. ` +
-            `Last error: ${error instanceof Error ? error.message : 'Unknown error'}`
+              `Last error: ${error instanceof Error ? error.message : "Unknown error"}`,
          );
        }

@ -64,40 +62,39 @@ export class StorageFactory {
      }
    }

-    throw new Error('Unexpected error in storage service creation');
+    throw new Error("Unexpected error in storage service creation");
  }

  private static sleep(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
  }

  private static createStorageService(): StorageService {
-    const storageType = process.env['STORAGE_TYPE'] || 'minio';
+    const storageType = process.env["STORAGE_TYPE"] || "minio";

    try {
      switch (storageType.toLowerCase()) {
-        case 'minio': {
-          const endpoint = process.env['MINIO_ENDPOINT'];
-          const accessKey = process.env['MINIO_ACCESS_KEY'];
-          const secretKey = process.env['MINIO_SECRET_KEY'];
-          const useSSL = process.env['MINIO_USE_SSL'] === 'true';
-          const bucketName = process.env['MINIO_BUCKET_NAME'] || 'banatie';
-          const publicUrl = process.env['MINIO_PUBLIC_URL'];
+        case "minio": {
+          const endpoint = process.env["MINIO_ENDPOINT"];
+          const accessKey = process.env["MINIO_ACCESS_KEY"];
+          const secretKey = process.env["MINIO_SECRET_KEY"];
+          const useSSL = process.env["MINIO_USE_SSL"] === "true";
+          const bucketName = process.env["MINIO_BUCKET_NAME"] || "banatie";
+          const publicUrl = process.env["MINIO_PUBLIC_URL"];

          if (!endpoint || !accessKey || !secretKey) {
            throw new Error(
-              'MinIO configuration missing. Required: MINIO_ENDPOINT, MINIO_ACCESS_KEY, MINIO_SECRET_KEY'
+              "MinIO configuration missing. Required: MINIO_ENDPOINT, MINIO_ACCESS_KEY, MINIO_SECRET_KEY",
            );
          }

-
          return new MinioStorageService(
            endpoint,
            accessKey,
            secretKey,
            useSSL,
            bucketName,
-            publicUrl
+            publicUrl,
          );
        }

@ -113,4 +110,4 @@ export class StorageFactory {
    this.instance = null;
    this.initializationPromise = null;
  }
-}
+}
--- a/apps/api-service/src/types/api.ts
+++ b/apps/api-service/src/types/api.ts
@ -77,6 +77,16 @@ export interface ImageGenerationResult {
  description?: string;
  model: string;
  error?: string;
+  errorType?: "generation" | "storage"; // Distinguish between generation and storage errors
+  generatedImageData?: GeneratedImageData; // Available when generation succeeds but storage fails
+}
+
+// Intermediate result after image generation, before storage
+export interface GeneratedImageData {
+  buffer: Buffer;
+  mimeType: string;
+  fileExtension: string;
+  description?: string;
 }

 // Logging types
--- a/apps/landing/src/app/admin/apikeys/page.tsx
+++ b/apps/landing/src/app/admin/apikeys/page.tsx
@ -13,9 +13,8 @@ const STORAGE_KEY = 'banatie_master_key';
 export default function ApiKeysPage() {
  const router = useRouter();
  const [masterKey, setMasterKey] = useState('');
-  const [email, setEmail] = useState('');
-  const [orgName, setOrgName] = useState('');
-  const [projectName, setProjectName] = useState('');
+  const [orgSlug, setOrgSlug] = useState('');
+  const [projectSlug, setProjectSlug] = useState('');
  const [generatedKey, setGeneratedKey] = useState('');
  const [apiKeys, setApiKeys] = useState<any[]>([]);
  const [loading, setLoading] = useState(false);
@ -45,15 +44,14 @@ export default function ApiKeysPage() {
    setSuccess('');
    setGeneratedKey('');

-    const result = await createProjectApiKey(masterKey, email, orgName, projectName);
+    const result = await createProjectApiKey(masterKey, orgSlug, projectSlug);

    if (result.success && result.apiKey) {
      setGeneratedKey(result.apiKey);
      setSuccess('API key created successfully!');
      // Clear form
-      setEmail('');
-      setOrgName('');
-      setProjectName('');
+      setOrgSlug('');
+      setProjectSlug('');
      // Reload keys list
      await loadApiKeys();
    } else {
@ -121,25 +119,17 @@ export default function ApiKeysPage() {
        <h2 className="text-2xl font-semibold text-white mb-6">Create New API Key</h2>
        <form onSubmit={handleSubmit} className="space-y-4">
          <AdminFormInput
-            label="Email"
-            type="email"
-            value={email}
-            onChange={setEmail}
-            placeholder="admin@example.com"
+            label="Organization Slug"
+            value={orgSlug}
+            onChange={setOrgSlug}
+            placeholder="my-org"
            required
          />
          <AdminFormInput
-            label="Organization Name"
-            value={orgName}
-            onChange={setOrgName}
-            placeholder="My Organization"
-            required
-          />
-          <AdminFormInput
-            label="Project Name"
-            value={projectName}
-            onChange={setProjectName}
-            placeholder="My Project"
+            label="Project Slug"
+            value={projectSlug}
+            onChange={setProjectSlug}
+            placeholder="my-project"
            required
          />
          <AdminButton type="submit" disabled={loading}>
--- a/apps/landing/src/app/demo/tti/page.tsx
+++ b/apps/landing/src/app/demo/tti/page.tsx
@ -24,8 +24,8 @@ interface GenerationResult {
 }

 interface ApiKeyInfo {
-  organizationName?: string;
-  projectName?: string;
+  organizationSlug?: string;
+  projectSlug?: string;
 }

 export default function DemoTTIPage() {
@ -74,13 +74,13 @@ export default function DemoTTIPage() {
        // Extract org/project info from API response
        if (data.keyInfo) {
          setApiKeyInfo({
-            organizationName: data.keyInfo.organizationName || data.keyInfo.organizationId,
-            projectName: data.keyInfo.projectName || data.keyInfo.projectId,
+            organizationSlug: data.keyInfo.organizationSlug || data.keyInfo.organizationId,
+            projectSlug: data.keyInfo.projectSlug || data.keyInfo.projectId,
          });
        } else {
          setApiKeyInfo({
-            organizationName: 'Unknown',
-            projectName: 'Unknown',
+            organizationSlug: 'Unknown',
+            projectSlug: 'Unknown',
          });
        }
      } else{
@ -264,7 +264,7 @@ export default function DemoTTIPage() {

        {apiKeyValidated && apiKeyInfo && (
          <div className="mt-3 text-sm text-green-400">
-            ✓ Validated • {apiKeyInfo.organizationName} / {apiKeyInfo.projectName}
+            ✓ Validated • {apiKeyInfo.organizationSlug} / {apiKeyInfo.projectSlug}
          </div>
        )}
      </div>
--- a/apps/landing/src/lib/actions/apiKeyActions.ts
+++ b/apps/landing/src/lib/actions/apiKeyActions.ts
@ -1,6 +1,5 @@
 'use server';

-import { getOrCreateOrgAndProject } from './orgProjectActions';
 import { listApiKeys as listApiKeysQuery } from '../db/queries/apiKeys';

 const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:3000';
@ -51,15 +50,11 @@ export async function bootstrapMasterKey(): Promise<{ success: boolean; apiKey?:

 export async function createProjectApiKey(
  masterKey: string,
-  email: string,
-  orgName: string,
-  projectName: string
+  orgSlug: string,
+  projectSlug: string
 ): Promise<{ success: boolean; apiKey?: string; error?: string }> {
  try {
-    // First, ensure organization and project exist in DB
-    const { organization, project } = await getOrCreateOrgAndProject(email, orgName, projectName);
-
-    // Then call API service to create the project key
+    // Call API service to create the project key (API auto-creates org/project)
    const response = await fetch(`${API_BASE_URL}/api/admin/keys`, {
      method: 'POST',
      headers: {
@ -68,9 +63,9 @@ export async function createProjectApiKey(
      },
      body: JSON.stringify({
        type: 'project',
-        projectId: project.id,
-        organizationId: organization.id,
-        name: `${orgName} - ${projectName}`,
+        organizationSlug: orgSlug,
+        projectSlug: projectSlug,
+        name: `${orgSlug} - ${projectSlug}`,
      }),
    });

--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -21,8 +21,27 @@ services:
        condition: service_healthy
    environment:
      - NODE_ENV=development
-    env_file:
-      - .env.docker
+      - DATABASE_URL=${DATABASE_URL}
+      - GEMINI_API_KEY=${GEMINI_API_KEY}
+      - STORAGE_TYPE=${STORAGE_TYPE}
+      - MINIO_ENDPOINT=${MINIO_ENDPOINT}
+      - MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}
+      - MINIO_SECRET_KEY=${MINIO_SECRET_KEY}
+      - MINIO_USE_SSL=${MINIO_USE_SSL}
+      - MINIO_BUCKET_NAME=${MINIO_BUCKET_NAME}
+      - MINIO_PUBLIC_URL=${MINIO_PUBLIC_URL}
+      - API_BASE_URL=${API_BASE_URL}
+      - DEFAULT_ORG_ID=${DEFAULT_ORG_ID}
+      - DEFAULT_PROJECT_ID=${DEFAULT_PROJECT_ID}
+      - DEFAULT_USER_ID=${DEFAULT_USER_ID}
+      - PRESIGNED_URL_EXPIRY=${PRESIGNED_URL_EXPIRY}
+      - MAX_FILE_SIZE=${MAX_FILE_SIZE}
+      - MAX_FILES=${MAX_FILES}
+      - RESULTS_DIR=${RESULTS_DIR}
+      - UPLOADS_DIR=${UPLOADS_DIR}
+      - LOG_LEVEL=${LOG_LEVEL}
+      - PORT=${PORT}
+      - CORS_ORIGIN=${CORS_ORIGIN}
    restart: unless-stopped

  postgres:
--- a/package.json
+++ b/package.json
@ -50,6 +50,7 @@
  "author": "",
  "license": "MIT",
  "devDependencies": {
+    "kill-port": "^2.0.1",
    "typescript": "^5.9.2"
  }
 }
--- a/packages/database/migrations/0000_curious_wolfsbane.sql
+++ b/packages/database/migrations/0000_curious_wolfsbane.sql
@ -0,0 +1,55 @@
+CREATE TABLE IF NOT EXISTS "organizations" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text NOT NULL,
+	"slug" text NOT NULL,
+	"email" text NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "organizations_slug_unique" UNIQUE("slug"),
+	CONSTRAINT "organizations_email_unique" UNIQUE("email")
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "projects" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text NOT NULL,
+	"slug" text NOT NULL,
+	"organization_id" uuid NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "projects_organization_id_slug_unique" UNIQUE("organization_id","slug")
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "api_keys" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"key_hash" text NOT NULL,
+	"key_prefix" text DEFAULT 'bnt_' NOT NULL,
+	"key_type" text NOT NULL,
+	"organization_id" uuid,
+	"project_id" uuid,
+	"scopes" jsonb DEFAULT '["generate"]'::jsonb NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"expires_at" timestamp,
+	"last_used_at" timestamp,
+	"is_active" boolean DEFAULT true NOT NULL,
+	"name" text,
+	"created_by" uuid,
+	CONSTRAINT "api_keys_key_hash_unique" UNIQUE("key_hash")
+);
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "projects" ADD CONSTRAINT "projects_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "api_keys" ADD CONSTRAINT "api_keys_organization_id_organizations_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organizations"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "api_keys" ADD CONSTRAINT "api_keys_project_id_projects_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."projects"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
--- a/packages/database/migrations/meta/0000_snapshot.json
+++ b/packages/database/migrations/meta/0000_snapshot.json
@ -0,0 +1,292 @@
+{
+  "id": "8ec6e31f-1daa-4930-8bf8-2b4996e17270",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.organizations": {
+      "name": "organizations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        },
+        "organizations_email_unique": {
+          "name": "organizations_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.projects": {
+      "name": "projects",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "projects_organization_id_organizations_id_fk": {
+          "name": "projects_organization_id_organizations_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "projects_organization_id_slug_unique": {
+          "name": "projects_organization_id_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_keys": {
+      "name": "api_keys",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_prefix": {
+          "name": "key_prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'bnt_'"
+        },
+        "key_type": {
+          "name": "key_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[\"generate\"]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_used_at": {
+          "name": "last_used_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_keys_organization_id_organizations_id_fk": {
+          "name": "api_keys_organization_id_organizations_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "organizations",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_keys_project_id_projects_id_fk": {
+          "name": "api_keys_project_id_projects_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_keys_key_hash_unique": {
+          "name": "api_keys_key_hash_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key_hash"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@ -1,5 +1,13 @@
 {
  "version": "7",
  "dialect": "postgresql",
-  "entries": []
+  "entries": [
+    {
+      "idx": 0,
+      "version": "7",
+      "when": 1759661399219,
+      "tag": "0000_curious_wolfsbane",
+      "breakpoints": true
+    }
+  ]
 }
--- a/packages/database/src/schema/organizations.ts
+++ b/packages/database/src/schema/organizations.ts
@ -5,6 +5,7 @@ export const organizations = pgTable('organizations', {

  // Organization details
  name: text('name').notNull(),
+  slug: text('slug').notNull().unique(), // URL-friendly identifier for storage paths
  email: text('email').notNull().unique(),

  // Timestamps
--- a/packages/database/src/schema/projects.ts
+++ b/packages/database/src/schema/projects.ts
@ -6,14 +6,15 @@ export const projects = pgTable('projects', {

  // Project details
  name: text('name').notNull(),
+  slug: text('slug').notNull(), // URL-friendly identifier for storage paths
  organizationId: uuid('organization_id').notNull().references(() => organizations.id, { onDelete: 'cascade' }),

  // Timestamps
  createdAt: timestamp('created_at').notNull().defaultNow(),
  updatedAt: timestamp('updated_at').notNull().defaultNow().$onUpdate(() => new Date()),
 }, (table) => ({
-  // Unique constraint: one project name per organization
-  uniqueOrgProject: unique().on(table.organizationId, table.name),
+  // Unique constraint: one project slug per organization
+  uniqueOrgProjectSlug: unique().on(table.organizationId, table.slug),
 }));

 export type Project = typeof projects.$inferSelect;
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -8,6 +8,9 @@ importers:

  .:
    devDependencies:
+      kill-port:
+        specifier: ^2.0.1
+        version: 2.0.1
      typescript:
        specifier: ^5.9.2
        version: 5.9.2
@ -163,6 +166,9 @@ importers:

  apps/landing:
    dependencies:
+      '@banatie/database':
+        specifier: workspace:*
+        version: link:../../packages/database
      next:
        specifier: 15.5.4
        version: 15.5.4(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
@ -2997,6 +3003,9 @@ packages:
    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
    engines: {node: '>= 0.4'}

+  get-them-args@1.3.2:
+    resolution: {integrity: sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==}
+
  get-tsconfig@4.10.1:
    resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==}

@ -3535,6 +3544,10 @@ packages:
  keyv@4.5.4:
    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}

+  kill-port@2.0.1:
+    resolution: {integrity: sha512-e0SVOV5jFo0mx8r7bS29maVWp17qGqLBZ5ricNSajON6//kmb7qqqNnml4twNE8Dtj97UQD+gNFOaipS/q1zzQ==}
+    hasBin: true
+
  kleur@3.0.3:
    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
    engines: {node: '>=6'}
@ -4312,6 +4325,9 @@ packages:
    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
    engines: {node: '>=8'}

+  shell-exec@1.0.2:
+    resolution: {integrity: sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==}
+
  side-channel-list@1.0.0:
    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
    engines: {node: '>= 0.4'}
@ -7263,7 +7279,7 @@ snapshots:
      eslint: 8.57.1
      eslint-import-resolver-node: 0.3.9
      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
      eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
      eslint-plugin-react: 7.37.5(eslint@8.57.1)
      eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1)
@ -7297,7 +7313,7 @@ snapshots:
      tinyglobby: 0.2.15
      unrs-resolver: 1.11.1
    optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1)
    transitivePeerDependencies:
      - supports-color

@ -7312,7 +7328,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.44.0(eslint@8.57.1)(typescript@5.9.2))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1):
    dependencies:
      '@rtsao/scc': 1.1.0
      array-includes: 3.1.9
@ -7778,6 +7794,8 @@ snapshots:
      es-errors: 1.3.0
      get-intrinsic: 1.3.0

+  get-them-args@1.3.2: {}
+
  get-tsconfig@4.10.1:
    dependencies:
      resolve-pkg-maps: 1.0.0
@ -8551,6 +8569,11 @@ snapshots:
    dependencies:
      json-buffer: 3.0.1

+  kill-port@2.0.1:
+    dependencies:
+      get-them-args: 1.3.2
+      shell-exec: 1.0.2
+
  kleur@3.0.3: {}

  kuler@2.0.0: {}
@ -9355,6 +9378,8 @@ snapshots:

  shebang-regex@3.0.0: {}

+  shell-exec@1.0.2: {}
+
  side-channel-list@1.0.0:
    dependencies:
      es-errors: 1.3.0
Author	SHA1	Message	Date
Oleg Proskurin	97502ddae1	fix: demo page inlanding	2025-10-05 19:41:04 +07:00
Oleg Proskurin	bfff9b49ec	fix: org project and apikey creating	2025-10-05 18:45:15 +07:00
Oleg Proskurin	bdf2c80782	feat: stored under org/project path	2025-10-05 17:36:01 +07:00
Oleg Proskurin	e2cfd6e27f	fix: service config	2025-10-05 16:50:09 +07:00