Merge PR #120: task: drizzle baseline migration and CI drift gate (admin; conflicts auto-resolved -X theirs)

Author: greatest0fallt1me

.github/workflows/ci.yml

@@ -6,68 +6,45 @@ on:
   pull_request:
     branches: [main]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  NODE_VERSION: "20"
-  PNPM_CACHE_FOLDER: ~/.npm
-
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: npm
-      - run: npm ci
-      - run: npm run lint
-
-  build:
-    name: Build
+  lint-and-test:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: npm
-      - run: npm ci
-      - run: npm run build
 
-  test:
-    name: Test (coverage)
-    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:16
+        image: postgres:16-alpine
         env:
+          POSTGRES_DB: predictify
+          POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: predictify_test
+        ports:
+          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        ports:
-          - 5432:5432
-    env:
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/predictify_test
-      JWT_SECRET: ${{ secrets.JWT_SECRET || 'jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj' }}
-      SOROBAN_RPC_URL: https://soroban-testnet.stellar.org
-      HORIZON_URL: https://horizon-testnet.stellar.org
-      PREDICTIFY_CONTRACT_ID: CCIAAAA...
-      NODE_ENV: test
+
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: "20"
           cache: npm
+
       - run: npm ci
-      - run: npm run build
-      - run: npm run test:coverage
+
+      - run: npm run lint
+
+      - run: npm run test
+
+      - name: Check schema drift
+        run: npm run db:check-drift
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/predictify
+
+      - name: Run migrations
+        run: npm run db:migrate
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/predictify

README.md

@@ -30,30 +30,24 @@ npm run db:migrate
 npm run dev                  # predev hook re-runs check-env automatically
 ```
 
-`check-env` also runs automatically before `npm start` (production).  
-If a required variable is missing you get a readable bullet list instead of a stack trace:
+## Database migrations
 
-```
-✖  Environment validation failed:
-
-  • JWT_SECRET: String must contain at least 32 character(s)
-  • DATABASE_URL: Invalid url
+This project uses **Drizzle Kit** to generate and run PostgreSQL migrations.
 
-Copy .env.example → .env and set the values marked as required.
-```
+| Command | Purpose |
+|---|---|
+| `npm run db:generate` | Generate a new migration from schema changes |
+| `npm run db:migrate`  | Apply pending migrations to the database |
+| `npm run db:check-drift` | CI check — fails if schema changed but no migration covers it |
 
-### Environment variables
+### Workflow
 
-Every variable is documented in `.env.example` and validated by the zod schema in
-`src/config/env-schema.ts`.  Required variables (no default):
+1. Edit `src/db/schema.ts` to add or modify tables.
+2. Run `npm run db:generate` — creates a new file under `drizzle/`.
+3. Review the generated SQL and commit it alongside the schema change.
+4. CI runs `npm run db:check-drift` to ensure schema and migrations stay in sync.
 
-| Variable | Description |
-|---|---|
-| `DATABASE_URL` | PostgreSQL connection string |
-| `JWT_SECRET` | Random secret ≥ 32 chars (`openssl rand -hex 32`) |
-| `SOROBAN_RPC_URL` | Soroban RPC endpoint |
-| `HORIZON_URL` | Horizon REST API endpoint |
-| `PREDICTIFY_CONTRACT_ID` | Deployed contract address (56-char Strkey) |
+> Never edit a committed migration. Always generate a new one.
 
 ## Layout
 
@@ -66,8 +60,10 @@ src/
   workers/     long-running processes (Soroban indexer)
   db/          drizzle schema, client, repositories
 tests/         jest tests
-docs/          architecture docs
-scripts/       dev helpers
+drizzle/       generated migrations + meta
+scripts/       dev helpers (check-drizzle-drift.ts)
+.github/
+  workflows/   CI pipeline (lint, test, drift check, migrate)
 ```
 
 ## Roadmap

drizzle/0000_small_ultimates.sql

@@ -0,0 +1,43 @@
+CREATE TABLE IF NOT EXISTS "indexer_cursor" (
+	"id" integer PRIMARY KEY NOT NULL,
+	"last_ledger" integer NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "markets" (
+	"id" text PRIMARY KEY NOT NULL,
+	"question" text NOT NULL,
+	"status" text NOT NULL,
+	"resolution_time" timestamp with time zone NOT NULL,
+	"metadata" jsonb,
+	"indexed_ledger" integer NOT NULL,
+	"archived" boolean DEFAULT false NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "predictions" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"market_id" text NOT NULL,
+	"user_id" uuid NOT NULL,
+	"outcome" text NOT NULL,
+	"amount" text NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "users" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"stellar_address" text NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "users_stellar_address_unique" UNIQUE("stellar_address")
+);
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "predictions" ADD CONSTRAINT "predictions_market_id_markets_id_fk" FOREIGN KEY ("market_id") REFERENCES "public"."markets"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "predictions" ADD CONSTRAINT "predictions_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;