fix: fix migrations and added setup script

.gitignore

@@ -36,3 +36,5 @@ yarn-error.log*
 # Misc
 .DS_Store
 *.pem
+
+db-data/

README.md

@@ -268,6 +268,25 @@ bookmarket/
 
 ### Quick Start
 
+#### Option 1: Automated Setup (Recommended)
+
+```bash
+git clone https://github.com/yourusername/bookmarket.git
+cd bookmarket
+./setup.sh
+```
+
+The setup script will:
+
+- ✅ Check prerequisites (Node.js 18+, pnpm, Docker)
+- ✅ Install dependencies
+- ✅ Create environment files from examples
+- ✅ Start PostgreSQL database
+- ✅ Run database migrations
+- ✅ Provide next steps
+
+#### Option 2: Manual Setup
+
 1. **Clone the repository**
 
    ```bash

apps/server/.env.example

@@ -0,0 +1,14 @@
+POSTGRES_HOST=
+POSTGRES_PORT=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+POSTGRES_NAME=
+
+JWT_SECRET=
+JWT_TOKEN_AUDIENCE=
+JWT_TOKEN_ISSUER=
+JWT_ACCESS_TOKEN_TTL=
+JWT_REFRESH_TOKEN_TTL=
+
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=

apps/server/package.json

@@ -19,8 +19,10 @@
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js",
+    "db:setup": "node scripts/db-setup.js",
+    "db:start": "cd ../.. && docker-compose up -d db",
     "migration:generate": "npm run typeorm -- migration:generate -d src/data-source.ts -p",
-    "migration:run": "npm run typeorm -- migration:run -d src/data-source.ts",
+    "migration:run": "npm run db:setup && npm run typeorm -- migration:run -d src/data-source-dev.ts",
     "migration:revert": "npm run typeorm -- migration:revert -d src/data-source.ts"
   },
   "dependencies": {

apps/server/scripts/db-setup.js

@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+const { config } = require('dotenv');
+
+// Load environment variables
+config();
+
+const DB_USER = process.env.POSTGRES_USER;
+const DB_NAME = process.env.POSTGRES_NAME;
+const DB_HOST = process.env.POSTGRES_HOST || 'localhost';
+const DB_PORT = process.env.POSTGRES_PORT || '5432';
+
+console.log('🔄 Setting up database...');
+
+// Function to check if Docker container is running and start it if needed
+function ensureDockerContainer() {
+  try {
+    // Check if any PostgreSQL container is running on port 5432
+    const result = execSync(`docker ps --format "table {{.Names}}\t{{.Ports}}" | grep :5432`, { 
+      stdio: 'pipe',
+      encoding: 'utf8'
+    });
+
+    if (result.trim()) {
+      console.log('✅ PostgreSQL container is already running on port 5432');
+      return;
+    }
+  } catch (error) {
+    // No container running on port 5432
+  }
+
+  console.log('🐳 Starting PostgreSQL container...');
+  try {
+    execSync('cd ../.. && docker-compose up -d db', { stdio: 'inherit' });
+    console.log('✅ PostgreSQL container started');
+    // Give it a moment to initialize
+    require('child_process').execSync('sleep 3');
+  } catch (error) {
+    // If it fails due to port conflict, the container might already be running
+    if (error.message.includes('port is already allocated')) {
+      console.log('⚠️  Port 5432 is already in use - checking if PostgreSQL is accessible...');
+      return; // Continue with connection check
+    }
+    console.error('❌ Failed to start PostgreSQL container:', error.message);
+    console.log('💡 Make sure Docker is running and docker-compose.yml exists');
+    process.exit(1);
+  }
+}
+
+async function setupDatabase() {
+  try {
+    // Ensure Docker container is running
+    ensureDockerContainer();
+
+    // Check if PostgreSQL server is responding (connect to default postgres db first)
+    console.log('⏳ Waiting for PostgreSQL server to be ready...');
+
+    let retries = 30;
+    while (retries > 0) {
+      try {
+        execSync(`pg_isready -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER}`, { 
+          stdio: 'pipe' 
+        });
+        console.log('✅ PostgreSQL server is ready!');
+        break;
+      } catch (error) {
+        retries--;
+        if (retries === 0) {
+          console.error('❌ PostgreSQL server is not responding. Make sure Docker container is running.');
+          console.log('💡 Try running: docker-compose up -d db');
+          process.exit(1);
+        }
+        console.log(`⏳ Waiting for server... (${retries} retries left)`);
+        await sleep(2000);
+      }
+    }
+
+    // Drop and recreate database to ensure clean state
+    console.log(`🔍 Checking if database '${DB_NAME}' exists...`);
+    try {
+      const result = execSync(`docker exec bookmarket-db-1 psql -U ${DB_USER} -d postgres -tc "SELECT 1 FROM pg_database WHERE datname = '${DB_NAME}'"`, {
+        stdio: 'pipe',
+        encoding: 'utf8'
+      });
+
+      if (result.trim() === '1') {
+        console.log(`🗑️  Dropping existing database '${DB_NAME}' for clean setup...`);
+        execSync(`docker exec bookmarket-db-1 dropdb -U ${DB_USER} ${DB_NAME}`, {
+          stdio: 'pipe'
+        });
+        console.log(`✅ Database '${DB_NAME}' dropped`);
+      }
+    } catch (error) {
+      // Database doesn't exist, which is fine
+    }
+
+    console.log(`🔧 Creating database '${DB_NAME}'...`);
+    try {
+      execSync(`docker exec bookmarket-db-1 createdb -U ${DB_USER} ${DB_NAME}`, {
+        stdio: 'pipe'
+      });
+      console.log(`✅ Database '${DB_NAME}' created successfully`);
+    } catch (createError) {
+      console.error(`❌ Failed to create database '${DB_NAME}':`, createError.message);
+      process.exit(1);
+    }
+
+    // Final check that we can connect to the target database
+    try {
+      execSync(`pg_isready -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME}`, { 
+        stdio: 'pipe' 
+      });
+      console.log(`✅ Database '${DB_NAME}' is ready for connections!`);
+    } catch (error) {
+      console.error(`❌ Cannot connect to database '${DB_NAME}':`, error.message);
+      process.exit(1);
+    }
+
+    console.log('✅ Database setup complete!');
+  } catch (error) {
+    console.error('❌ Database setup failed:', error.message);
+    console.log('💡 Make sure Docker is running and try: docker-compose up -d db');
+    process.exit(1);
+  }
+}
+
+setupDatabase();
+
+// Helper function for async/await in older Node versions
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}

apps/server/src/bookmarks/entities/bookmark.entity.ts

@@ -1,9 +1,10 @@
-import { Category } from 'src/categories/entities/category.entity';
-import { User } from 'src/users/entities/user.entity';
 import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { Category } from '../../categories/entities/category.entity';
+import { BaseEntity } from '../../common/entities/base.entity';
+import { User } from '../../users/entities/user.entity';
 
 @Entity()
-export class Bookmark {
+export class Bookmark extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
@@ -19,19 +20,6 @@ export class Bookmark {
   @Column({ nullable: true })
   faviconUrl?: string;
 
-  @Column({
-    type: 'timestamp',
-    default: () => 'CURRENT_TIMESTAMP',
-  })
-  createdAt: Date;
-
-  @Column({
-    type: 'timestamp',
-    default: () => 'CURRENT_TIMESTAMP',
-    onUpdate: 'CURRENT_TIMESTAMP',
-  })
-  updatedAt: Date;
-
   @ManyToOne(() => User, user => user.bookmarks, { eager: true })
   user: User;
 

apps/server/src/categories/entities/category.entity.ts

@@ -1,7 +1,7 @@
-import { Bookmark } from 'src/bookmarks/entities/bookmark.entity';
-import { BaseEntity } from 'src/common/entities/base.entity';
-import { User } from 'src/users/entities/user.entity';
 import { Column, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import { Bookmark } from '../../bookmarks/entities/bookmark.entity';
+import { BaseEntity } from '../../common/entities/base.entity';
+import { User } from '../../users/entities/user.entity';
 
 @Entity()
 export class Category extends BaseEntity {

apps/server/src/data-source-dev.ts

@@ -0,0 +1,20 @@
+import { config } from 'dotenv';
+import { DataSource } from 'typeorm';
+
+// Load environment variables from .env file
+config();
+export const AppDataSource = new DataSource({
+  type: 'postgres',
+  port: parseInt(process.env.POSTGRES_PORT ?? '5432', 10),
+  host: process.env.POSTGRES_HOST,
+  username: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+  database: process.env.POSTGRES_NAME,
+
+  entities: [`${__dirname}/**/*.entity.ts`],
+  // FIXME: Should be set to false on prod
+  synchronize: false,
+  migrations: [`${__dirname}/migrations/**/*.ts`],
+  migrationsTableName: 'migrations',
+  migrationsRun: true,
+});

apps/server/src/migrations/1740000000000-InitialUserTable.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class InitialUserTable1740000000000 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE "user" (
+        "id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        "email" character varying NOT NULL,
+        "password" character varying,
+        "auth_provider" character varying NOT NULL,
+        "google_id" character varying,
+        "github_id" character varying,
+        "picture" character varying,
+        "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+        "updatedAt" TIMESTAMP NOT NULL DEFAULT now()
+      )
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TABLE "user"');
+  }
+}

apps/server/src/migrations/1740000000001-InitialBookmarkTable.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class InitialBookmarkTable1740000000001 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE "bookmark" (
+        "id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        "url" character varying NOT NULL,
+        "title" character varying NOT NULL,
+        "description" character varying NOT NULL,
+        "faviconUrl" character varying NOT NULL,
+        "userId" uuid NOT NULL,
+        "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+        "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+        CONSTRAINT "FK_bookmark_user" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE
+      )
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TABLE "bookmark"');
+  }
+}

apps/server/src/migrations/1741515061023-BookmarkCategory.ts

@@ -5,7 +5,7 @@ export class BookmarkCategory1741515061023 implements MigrationInterface {
     // Create Category table
     await queryRunner.query(`
       CREATE TABLE "category" (
-        "id" uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+        "id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
         "name" character varying NOT NULL,
         "userId" uuid,
         "createdAt" TIMESTAMP NOT NULL DEFAULT now(),

apps/server/src/users/entities/user.entity.ts

@@ -1,11 +1,12 @@
-import { Bookmark } from 'src/bookmarks/entities/bookmark.entity';
-import { Category } from 'src/categories/entities/category.entity';
-import { USERNAME_MAX_LENGTH } from 'src/iam/constants/username';
 import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+import { Bookmark } from '../../bookmarks/entities/bookmark.entity';
+import { Category } from '../../categories/entities/category.entity';
+import { BaseEntity } from '../../common/entities/base.entity';
+import { USERNAME_MAX_LENGTH } from '../../iam/constants/username';
 import { AuthProvider } from '../enums/auth-provider.enum';
 
 @Entity()
-export class User {
+export class User extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 

apps/web/.env.example

@@ -1,20 +1,8 @@
-# Since the ".env" file is gitignored, you can use the ".env.example" file to
-# build a new ".env" file when you clone the repo. Keep this file up-to-date
-# when you add new variables to `.env`.
+NEXT_PUBLIC_BASE_URL=
 
-# This file will be committed to version control, so make sure not to have any
-# secrets in it. If you are cloning this repo, create a copy of this file named
-# ".env" and populate it with your secrets.
+NEXT_PUBLIC_GOOGLE_CLIENT_ID=
 
-# When adding additional environment variables, the schema in "/src/env.js"
-# should be updated accordingly.
-
-# Drizzle
-DATABASE_URL=
-
-# Example:
-# SERVERVAR="foo"
-# NEXT_PUBLIC_CLIENTVAR="bar"
-
-NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=
-CLERK_SECRET_KEY=
+NEXT_PUBLIC_GITHUB_CLIENT_ID=
+GITHUB_CLIENT_SECRET=
+NEXT_PUBLIC_GITHUB_REDIRECT_URI=
+NEXT_PUBLIC_DOMAIN=

docker-compose.yml

@@ -4,11 +4,19 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - ../bookmarket-db-data:/var/lib/postgresql/data
+      - ./db-data:/var/lib/postgresql/data
     env_file:
       - ./apps/server/.env
     healthcheck:
-      test: ['CMD', 'pg_isready', '-U', 'bokdol', '-d', 'bookmarket']
+      test:
+        [
+          'CMD',
+          'pg_isready',
+          '-U',
+          '${POSTGRES_USER}',
+          '-d',
+          '${POSTGRES_NAME}',
+        ]
       interval: 10s
       timeout: 5s
       retries: 5