Compare commits
8 Commits
feat/db-sc
...
5b0e1aaa46
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b0e1aaa46 | ||
|
|
02b7f2f508 | ||
|
|
ae642d78b8 | ||
|
|
8545fd27a2 | ||
|
|
8940ab6ce9 | ||
|
|
8e550b54a9 | ||
|
|
019bf875ff | ||
|
|
9ffd59eb3e |
307
AGENT_TASKS.md
307
AGENT_TASKS.md
@@ -1,307 +0,0 @@
|
|||||||
# Распределение задач по агентам (MVP 0)
|
|
||||||
|
|
||||||
Документ для параллельной работы нескольких агентов. Каждый агент работает в **отдельной сессии Cursor** (отдельное окно чата). После выполнения **каждой задачи** — отдельный коммит по conventional commits.
|
|
||||||
|
|
||||||
## Как запустить агента
|
|
||||||
|
|
||||||
1. Открыть **новую сессию чата** (новое окно Composer/Chat в Cursor)
|
|
||||||
2. Скопировать промпт для нужного агента из раздела ниже
|
|
||||||
3. Агент выполнит свои задачи и сделает коммиты
|
|
||||||
4. Повторить для следующего агента
|
|
||||||
|
|
||||||
### Промпты для запуска агентов
|
|
||||||
|
|
||||||
**Agent A (Infrastructure):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent A tasks from AGENT_TASKS.md. Work in branch feat/infra-core.
|
|
||||||
Do tasks A1–A9 in order. After EACH task, run: git add -A && git commit -m "<message from table>".
|
|
||||||
Use conventional commits. Do not touch schema or auth/tests/profile/llm/admin code.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent B (DB Schema):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent B tasks from AGENT_TASKS.md. Work in branch feat/db-schema.
|
|
||||||
Do tasks B1–B7. After EACH task, commit with the message from the table.
|
|
||||||
Assume Agent A has created plugins. Generate migrations with npm run db:generate.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent C (Auth):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent C tasks from AGENT_TASKS.md. Work in branch feat/auth.
|
|
||||||
Merge or rebase from dev first. Do tasks C1–C7, commit after each.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent D (Profile):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent D tasks from AGENT_TASKS.md. Work in branch feat/profile-subscription.
|
|
||||||
Merge dev first. Do tasks D1–D5, commit after each.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent E (Tests & Questions):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent E tasks from AGENT_TASKS.md. Work in branch feat/tests-questions.
|
|
||||||
Requires Auth, Profile, LLM done. Do E1–E5, commit after each.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent F (LLM):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent F tasks from AGENT_TASKS.md. Work in branch feat/llm-service.
|
|
||||||
Do F1–F5, commit after each. Export LlmService interface for QuestionService.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent G (Admin):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent G tasks from AGENT_TASKS.md. Work in branch feat/admin-qa.
|
|
||||||
Do G1–G4, commit after each.
|
|
||||||
```
|
|
||||||
|
|
||||||
**Agent H (Testing):**
|
|
||||||
|
|
||||||
```text
|
|
||||||
Implement Agent H tasks from AGENT_TASKS.md. Work in branch feat/testing.
|
|
||||||
Do H1–H7, commit after each. Target ≥70% coverage on services.
|
|
||||||
```
|
|
||||||
|
|
||||||
## Текущее состояние репозитория
|
|
||||||
|
|
||||||
Часть работы уже выполнена одним агентом:
|
|
||||||
|
|
||||||
- **Infra (A):** package.json, config, plugins (database, redis, security, rateLimit), app.ts, server.ts, utils/errors, utils/uuid, docker-compose, .env.example
|
|
||||||
- **Schema (B):** все схемы в src/db/schema, drizzle.config, migrate.ts. Миграции ещё не сгенерированы (нужен `npm run db:generate`)
|
|
||||||
|
|
||||||
Агентам B–H при старте: проверить, что уже есть, и дописать недостающее. Не дублировать сделанное. Коммитить только свои изменения.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Формат коммитов
|
|
||||||
|
|
||||||
Использовать [conventional commits](samreshu_docs/principles/git-workflow.md):
|
|
||||||
|
|
||||||
- `feat:` — новый функционал
|
|
||||||
- `fix:` — исправление бага
|
|
||||||
- `refactor:` — рефакторинг
|
|
||||||
- `chore:` — инфраструктура, зависимости, конфиг
|
|
||||||
- `test:` — тесты
|
|
||||||
|
|
||||||
Примеры: `feat: add auth register endpoint`, `chore: add database plugin`, `test: add auth service unit tests`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Волны запуска и зависимости
|
|
||||||
|
|
||||||
```text
|
|
||||||
Волна 1 (старт сразу, параллельно):
|
|
||||||
Agent A ────────────────────────────►
|
|
||||||
Agent B ────────────────────────────►
|
|
||||||
|
|
||||||
Волна 2 (после завершения A + B):
|
|
||||||
Agent C ────────────────────────────►
|
|
||||||
Agent D ────────────────────────────►
|
|
||||||
Agent F ────────────────────────────►
|
|
||||||
|
|
||||||
Волна 3 (после C, D, F):
|
|
||||||
Agent E ────────────────────────────►
|
|
||||||
Agent G ────────────────────────────►
|
|
||||||
Agent H ────────────────────────────► (может стартовать частично после C)
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent A: Infrastructure & Core Backend
|
|
||||||
|
|
||||||
**Зависимости:** нет (запускать первым)
|
|
||||||
|
|
||||||
**Ветка:** `feat/infra-core` (создать от `main`/`dev`)
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| A1 | package.json, tsconfig, .nvmrc, .gitignore | `chore: init project with Fastify and TypeScript` |
|
|
||||||
| A2 | src/config/env.ts с Zod-валидацией | `chore: add env config with validation` |
|
|
||||||
| A3 | src/plugins/redis.ts | `feat: add Redis plugin` |
|
|
||||||
| A4 | src/plugins/database.ts | `feat: add database plugin with Drizzle` |
|
|
||||||
| A5 | src/plugins/security.ts (helmet + cors) | `feat: add security plugin` |
|
|
||||||
| A6 | src/plugins/rateLimit.ts | `feat: add rate limit plugin with Redis` |
|
|
||||||
| A7 | src/utils/errors.ts, src/utils/uuid.ts | `chore: add error utils and uuid7 helper` |
|
|
||||||
| A8 | src/app.ts — error handler, логирование | `feat: add Fastify app with error handler` |
|
|
||||||
| A9 | src/server.ts, docker-compose.dev.yml, .env.example | `chore: add server entry and dev docker compose` |
|
|
||||||
|
|
||||||
**Итого:** 9 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent B: Data Model & Drizzle Schema
|
|
||||||
|
|
||||||
**Зависимости:** Agent A (нужен database plugin). Может стартовать после A4.
|
|
||||||
|
|
||||||
**Ветка:** `feat/db-schema`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| B1 | src/db/schema/enums.ts | `feat: add Drizzle enums for schema` |
|
|
||||||
| B2 | src/db/schema/users.ts, sessions.ts, subscriptions.ts | `feat: add users and auth tables schema` |
|
|
||||||
| B3 | src/db/schema/tests.ts, testQuestions.ts | `feat: add tests and test_questions schema` |
|
|
||||||
| B4 | src/db/schema/questionBank.ts, questionCacheMeta.ts, questionReports.ts | `feat: add question bank schema` |
|
|
||||||
| B5 | src/db/schema/userStats.ts, auditLogs.ts, userQuestionLog.ts, verificationTokens.ts | `feat: add user_stats, audit_logs and verification tokens schema` |
|
|
||||||
| B6 | src/db/schema/index.ts, drizzle.config.ts, migrate.ts | `chore: wire schema and migrations` |
|
|
||||||
| B7 | Генерация миграций (npm run db:generate), seed скрипт | `chore: add initial migration and seed script` |
|
|
||||||
|
|
||||||
**Итого:** 7 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent C: Auth & Sessions Service
|
|
||||||
|
|
||||||
**Зависимости:** A, B завершены.
|
|
||||||
|
|
||||||
**Ветка:** `feat/auth`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| C1 | src/utils/password.ts (argon2id), src/utils/jwt.ts | `feat: add password hashing and JWT utils` |
|
|
||||||
| C2 | src/services/auth/auth.service.ts | `feat: add AuthService` |
|
|
||||||
| C3 | src/plugins/auth.ts (JWT verify, request.user) | `feat: add auth plugin` |
|
|
||||||
| C4 | src/routes/auth.ts — register, login, logout, refresh | `feat: add auth routes` |
|
|
||||||
| C5 | verify-email, forgot-password, reset-password | `feat: add email verification and password reset` |
|
|
||||||
| C6 | Rate limiting на auth-роуты | `feat: add rate limiting to auth endpoints` |
|
|
||||||
| C7 | Регистрация auth routes в app | `feat: register auth routes in app` |
|
|
||||||
|
|
||||||
**Итого:** 7 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent D: Profile & Subscription Middleware
|
|
||||||
|
|
||||||
**Зависимости:** A, B, C.
|
|
||||||
|
|
||||||
**Ветка:** `feat/profile-subscription`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| D1 | src/plugins/subscription.ts | `feat: add subscription middleware` |
|
|
||||||
| D2 | src/services/user/user.service.ts | `feat: add UserService` |
|
|
||||||
| D3 | src/routes/profile.ts — GET, PATCH, GET :username | `feat: add profile routes` |
|
|
||||||
| D4 | Интеграция user_stats в профиль | `feat: add stats to profile response` |
|
|
||||||
| D5 | Регистрация profile routes в app | `feat: register profile routes` |
|
|
||||||
|
|
||||||
**Итого:** 5 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent E: Question Bank & Tests Service
|
|
||||||
|
|
||||||
**Зависимости:** A, B, C, D, F (контракт LlmService).
|
|
||||||
|
|
||||||
**Ветка:** `feat/tests-questions`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| E1 | src/services/questions/question.service.ts | `feat: add QuestionService` |
|
|
||||||
| E2 | src/services/tests/tests.service.ts — создание теста, снепшот | `feat: add TestsService create flow` |
|
|
||||||
| E3 | tests.service — answer, finish, history | `feat: add test answer and finish flow` |
|
|
||||||
| E4 | src/routes/tests.ts | `feat: add tests routes` |
|
|
||||||
| E5 | Регистрация tests routes | `feat: register tests routes` |
|
|
||||||
|
|
||||||
**Итого:** 5 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent F: LLM Service & Fallback Logic
|
|
||||||
|
|
||||||
**Зависимости:** A, B.
|
|
||||||
|
|
||||||
**Ветка:** `feat/llm-service`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| F1 | src/services/llm/llm.service.ts — конфиг, HTTP client | `feat: add LlmService base` |
|
|
||||||
| F2 | generateQuestions с JSON Schema валидацией | `feat: add LLM question generation` |
|
|
||||||
| F3 | Retry и fallback логика | `feat: add LLM retry and fallback` |
|
|
||||||
| F4 | Интеграция question_cache_meta | `feat: log LLM metadata to question_cache_meta` |
|
|
||||||
| F5 | Экспорт интерфейса для QuestionService | `feat: export LlmService interface` |
|
|
||||||
|
|
||||||
**Итого:** 5 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent G: Admin QA for Questions
|
|
||||||
|
|
||||||
**Зависимости:** A, B, C, E (модель question_bank).
|
|
||||||
|
|
||||||
**Ветка:** `feat/admin-qa`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| G1 | src/services/admin/admin-question.service.ts | `feat: add AdminQuestionService` |
|
|
||||||
| G2 | src/routes/admin/questions.ts | `feat: add admin questions routes` |
|
|
||||||
| G3 | audit_logs при approve/reject/edit | `feat: add audit logging to admin actions` |
|
|
||||||
| G4 | Регистрация admin routes | `feat: register admin routes` |
|
|
||||||
|
|
||||||
**Итого:** 4 коммита. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Agent H: Tests & Quality
|
|
||||||
|
|
||||||
**Зависимости:** Может стартовать после C (auth), наращивать по мере готовности других агентов.
|
|
||||||
|
|
||||||
**Ветка:** `feat/testing`
|
|
||||||
|
|
||||||
**Задачи и коммиты:**
|
|
||||||
|
|
||||||
| # | Задача | Коммит |
|
|
||||||
| - | - | - |
|
|
||||||
| H1 | Vitest config, test-utils | `test: add Vitest config and test utils` |
|
|
||||||
| H2 | AuthService unit tests | `test: add auth service tests` |
|
|
||||||
| H3 | Auth routes integration tests | `test: add auth routes integration tests` |
|
|
||||||
| H4 | TestsService и QuestionService tests | `test: add tests and questions service tests` |
|
|
||||||
| H5 | LlmService unit tests (с моком) | `test: add LLM service tests` |
|
|
||||||
| H6 | Admin routes integration tests | `test: add admin routes tests` |
|
|
||||||
| H7 | Coverage ≥70%, npm script | `test: add coverage config` |
|
|
||||||
|
|
||||||
**Итого:** 7 коммитов. После завершения — PR в `dev`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Рекомендуемый порядок запуска
|
|
||||||
|
|
||||||
1. **Сразу:** Agent A и Agent B (в двух отдельных сессиях Cursor)
|
|
||||||
2. **После A и B:** Agent C, D, F (три сессии)
|
|
||||||
3. **После C, D, F:** Agent E, G (две сессии)
|
|
||||||
4. **Параллельно волне 2–3:** Agent H (тесты по мере готовности API)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Чеклист для каждого агента
|
|
||||||
|
|
||||||
Перед каждым коммитом:
|
|
||||||
|
|
||||||
- [ ] `npm run typecheck` проходит
|
|
||||||
- [ ] Сообщение коммита по conventional commits
|
|
||||||
- [ ] Нет `console.log`, только `logger`
|
|
||||||
- [ ] Нет `any` без необходимости
|
|
||||||
|
|
||||||
После завершения всех задач агента:
|
|
||||||
|
|
||||||
- [ ] Создать PR в `dev`
|
|
||||||
- [ ] Проверить, что не сломаны существующие тесты (если есть)
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import 'dotenv/config';
|
|
||||||
import { defineConfig } from 'drizzle-kit';
|
|
||||||
|
|
||||||
const databaseUrl = process.env.DATABASE_URL ?? 'postgresql://samreshu:samreshu_dev@localhost:5432/samreshu';
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
schema: './src/db/schema/*.ts',
|
|
||||||
out: './src/db/migrations',
|
|
||||||
dialect: 'postgresql',
|
|
||||||
dbCredentials: {
|
|
||||||
url: databaseUrl,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"dev": "tsx watch src/server.ts",
|
"dev": "tsx watch src/server.ts",
|
||||||
"start": "node dist/server.js",
|
"start": "node dist/server.js",
|
||||||
"db:generate": "tsx node_modules/drizzle-kit/bin.cjs generate --config=drizzle.config.ts",
|
"db:generate": "drizzle-kit generate --config=drizzle.config.ts",
|
||||||
"db:migrate": "tsx src/db/migrate.ts",
|
"db:migrate": "tsx src/db/migrate.ts",
|
||||||
"db:studio": "drizzle-kit studio",
|
"db:studio": "drizzle-kit studio",
|
||||||
"db:seed": "tsx src/db/seed.ts",
|
"db:seed": "tsx src/db/seed.ts",
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import { drizzle } from 'drizzle-orm/node-postgres';
|
|
||||||
import { migrate } from 'drizzle-orm/node-postgres/migrator';
|
|
||||||
import pg from 'pg';
|
|
||||||
import { env } from '../config/env.js';
|
|
||||||
|
|
||||||
const { Pool } = pg;
|
|
||||||
|
|
||||||
async function runMigrations() {
|
|
||||||
const pool = new Pool({ connectionString: env.DATABASE_URL });
|
|
||||||
const db = drizzle(pool);
|
|
||||||
|
|
||||||
await migrate(db, { migrationsFolder: './src/db/migrations' });
|
|
||||||
await pool.end();
|
|
||||||
}
|
|
||||||
|
|
||||||
runMigrations().catch((err) => {
|
|
||||||
console.error('Migration failed:', err);
|
|
||||||
process.exit(1);
|
|
||||||
});
|
|
||||||
@@ -1,246 +0,0 @@
|
|||||||
CREATE TYPE "public"."level" AS ENUM('basic', 'beginner', 'intermediate', 'advanced', 'expert');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."plan" AS ENUM('free', 'pro');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."question_source" AS ENUM('llm_generated', 'manual');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."question_status" AS ENUM('pending', 'approved', 'rejected');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."question_type" AS ENUM('single_choice', 'multiple_select', 'true_false', 'short_text');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."report_status" AS ENUM('open', 'resolved', 'dismissed');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."self_level" AS ENUM('jun', 'mid', 'sen');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."stack" AS ENUM('html', 'css', 'js', 'ts', 'react', 'vue', 'nodejs', 'git', 'web_basics');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."subscription_status" AS ENUM('active', 'trialing', 'cancelled', 'expired');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."test_mode" AS ENUM('fixed', 'infinite', 'marathon');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."test_status" AS ENUM('in_progress', 'completed', 'abandoned');--> statement-breakpoint
|
|
||||||
CREATE TYPE "public"."user_role" AS ENUM('guest', 'free', 'pro', 'admin');--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "users" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"email" varchar(255) NOT NULL,
|
|
||||||
"password_hash" varchar(255) NOT NULL,
|
|
||||||
"nickname" varchar(30) NOT NULL,
|
|
||||||
"avatar_url" varchar(500),
|
|
||||||
"country" varchar(100),
|
|
||||||
"city" varchar(100),
|
|
||||||
"self_level" "self_level",
|
|
||||||
"is_public" boolean DEFAULT true NOT NULL,
|
|
||||||
"role" "user_role" DEFAULT 'free' NOT NULL,
|
|
||||||
"email_verified_at" timestamp with time zone,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
CONSTRAINT "users_email_unique" UNIQUE("email")
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "sessions" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"refresh_token_hash" varchar(255) NOT NULL,
|
|
||||||
"user_agent" varchar(500),
|
|
||||||
"ip_address" varchar(45),
|
|
||||||
"last_active_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
"expires_at" timestamp with time zone NOT NULL,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "subscriptions" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"plan" "plan" NOT NULL,
|
|
||||||
"status" "subscription_status" NOT NULL,
|
|
||||||
"started_at" timestamp with time zone NOT NULL,
|
|
||||||
"expires_at" timestamp with time zone,
|
|
||||||
"cancelled_at" timestamp with time zone,
|
|
||||||
"payment_provider" varchar(50),
|
|
||||||
"external_id" varchar(255),
|
|
||||||
CONSTRAINT "subscriptions_user_id_unique" UNIQUE("user_id")
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "tests" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"stack" "stack" NOT NULL,
|
|
||||||
"level" "level" NOT NULL,
|
|
||||||
"question_count" integer NOT NULL,
|
|
||||||
"mode" "test_mode" DEFAULT 'fixed' NOT NULL,
|
|
||||||
"status" "test_status" DEFAULT 'in_progress' NOT NULL,
|
|
||||||
"score" integer,
|
|
||||||
"started_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
"finished_at" timestamp with time zone,
|
|
||||||
"time_limit_seconds" integer
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "test_questions" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"test_id" uuid NOT NULL,
|
|
||||||
"question_bank_id" uuid,
|
|
||||||
"order_number" integer NOT NULL,
|
|
||||||
"type" "question_type" NOT NULL,
|
|
||||||
"question_text" text NOT NULL,
|
|
||||||
"options" jsonb,
|
|
||||||
"correct_answer" jsonb NOT NULL,
|
|
||||||
"explanation" text NOT NULL,
|
|
||||||
"user_answer" jsonb,
|
|
||||||
"is_correct" boolean,
|
|
||||||
"answered_at" timestamp with time zone
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "question_bank" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"stack" "stack" NOT NULL,
|
|
||||||
"level" "level" NOT NULL,
|
|
||||||
"type" "question_type" NOT NULL,
|
|
||||||
"question_text" text NOT NULL,
|
|
||||||
"options" jsonb,
|
|
||||||
"correct_answer" jsonb NOT NULL,
|
|
||||||
"explanation" text NOT NULL,
|
|
||||||
"status" "question_status" DEFAULT 'pending' NOT NULL,
|
|
||||||
"source" "question_source" NOT NULL,
|
|
||||||
"usage_count" integer DEFAULT 0 NOT NULL,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
"approved_at" timestamp with time zone
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "question_cache_meta" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"question_bank_id" uuid NOT NULL,
|
|
||||||
"llm_model" varchar(100) NOT NULL,
|
|
||||||
"prompt_hash" varchar(64) NOT NULL,
|
|
||||||
"generation_time_ms" integer NOT NULL,
|
|
||||||
"raw_response" jsonb,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "question_reports" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"question_bank_id" uuid NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"reason" text NOT NULL,
|
|
||||||
"status" "report_status" DEFAULT 'open' NOT NULL,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL,
|
|
||||||
"resolved_at" timestamp with time zone
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "user_stats" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"stack" "stack" NOT NULL,
|
|
||||||
"level" "level" NOT NULL,
|
|
||||||
"total_questions" integer DEFAULT 0 NOT NULL,
|
|
||||||
"correct_answers" integer DEFAULT 0 NOT NULL,
|
|
||||||
"tests_taken" integer DEFAULT 0 NOT NULL,
|
|
||||||
"last_test_at" timestamp with time zone,
|
|
||||||
CONSTRAINT "user_stats_user_id_stack_level_unique" UNIQUE("user_id","stack","level")
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "audit_logs" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"admin_id" uuid NOT NULL,
|
|
||||||
"action" varchar(100) NOT NULL,
|
|
||||||
"target_type" varchar(50) NOT NULL,
|
|
||||||
"target_id" uuid NOT NULL,
|
|
||||||
"details" jsonb,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "user_question_log" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"question_bank_id" uuid NOT NULL,
|
|
||||||
"seen_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "email_verification_codes" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"code" varchar(10) NOT NULL,
|
|
||||||
"expires_at" timestamp with time zone NOT NULL,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
CREATE TABLE IF NOT EXISTS "password_reset_tokens" (
|
|
||||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
|
||||||
"user_id" uuid NOT NULL,
|
|
||||||
"token_hash" varchar(255) NOT NULL,
|
|
||||||
"expires_at" timestamp with time zone NOT NULL,
|
|
||||||
"created_at" timestamp with time zone DEFAULT now() NOT NULL
|
|
||||||
);
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "sessions" ADD CONSTRAINT "sessions_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "subscriptions" ADD CONSTRAINT "subscriptions_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "tests" ADD CONSTRAINT "tests_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "test_questions" ADD CONSTRAINT "test_questions_test_id_tests_id_fk" FOREIGN KEY ("test_id") REFERENCES "public"."tests"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "test_questions" ADD CONSTRAINT "test_questions_question_bank_id_question_bank_id_fk" FOREIGN KEY ("question_bank_id") REFERENCES "public"."question_bank"("id") ON DELETE set null ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "question_cache_meta" ADD CONSTRAINT "question_cache_meta_question_bank_id_question_bank_id_fk" FOREIGN KEY ("question_bank_id") REFERENCES "public"."question_bank"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "question_reports" ADD CONSTRAINT "question_reports_question_bank_id_question_bank_id_fk" FOREIGN KEY ("question_bank_id") REFERENCES "public"."question_bank"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "question_reports" ADD CONSTRAINT "question_reports_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "user_stats" ADD CONSTRAINT "user_stats_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "audit_logs" ADD CONSTRAINT "audit_logs_admin_id_users_id_fk" FOREIGN KEY ("admin_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "user_question_log" ADD CONSTRAINT "user_question_log_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "user_question_log" ADD CONSTRAINT "user_question_log_question_bank_id_question_bank_id_fk" FOREIGN KEY ("question_bank_id") REFERENCES "public"."question_bank"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "email_verification_codes" ADD CONSTRAINT "email_verification_codes_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
--> statement-breakpoint
|
|
||||||
DO $$ BEGIN
|
|
||||||
ALTER TABLE "password_reset_tokens" ADD CONSTRAINT "password_reset_tokens_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "7",
|
|
||||||
"dialect": "postgresql",
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"idx": 0,
|
|
||||||
"version": "7",
|
|
||||||
"when": 1772620981431,
|
|
||||||
"tag": "0000_fearless_salo",
|
|
||||||
"breakpoints": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { jsonb } from 'drizzle-orm/pg-core';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const auditLogs = pgTable('audit_logs', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
adminId: uuid('admin_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
action: varchar('action', { length: 100 }).notNull(),
|
|
||||||
targetType: varchar('target_type', { length: 50 }).notNull(),
|
|
||||||
targetId: uuid('target_id').notNull(),
|
|
||||||
details: jsonb('details').$type<Record<string, unknown>>(),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type AuditLog = typeof auditLogs.$inferSelect;
|
|
||||||
export type NewAuditLog = typeof auditLogs.$inferInsert;
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import { pgEnum } from 'drizzle-orm/pg-core';
|
|
||||||
|
|
||||||
export const userRoleEnum = pgEnum('user_role', ['guest', 'free', 'pro', 'admin']);
|
|
||||||
export const planEnum = pgEnum('plan', ['free', 'pro']);
|
|
||||||
export const subscriptionStatusEnum = pgEnum('subscription_status', ['active', 'trialing', 'cancelled', 'expired']);
|
|
||||||
export const stackEnum = pgEnum('stack', ['html', 'css', 'js', 'ts', 'react', 'vue', 'nodejs', 'git', 'web_basics']);
|
|
||||||
export const levelEnum = pgEnum('level', ['basic', 'beginner', 'intermediate', 'advanced', 'expert']);
|
|
||||||
export const testModeEnum = pgEnum('test_mode', ['fixed', 'infinite', 'marathon']);
|
|
||||||
export const testStatusEnum = pgEnum('test_status', ['in_progress', 'completed', 'abandoned']);
|
|
||||||
export const questionTypeEnum = pgEnum('question_type', ['single_choice', 'multiple_select', 'true_false', 'short_text']);
|
|
||||||
export const questionStatusEnum = pgEnum('question_status', ['pending', 'approved', 'rejected']);
|
|
||||||
export const questionSourceEnum = pgEnum('question_source', ['llm_generated', 'manual']);
|
|
||||||
export const reportStatusEnum = pgEnum('report_status', ['open', 'resolved', 'dismissed']);
|
|
||||||
export const selfLevelEnum = pgEnum('self_level', ['jun', 'mid', 'sen']);
|
|
||||||
|
|
||||||
export type UserRole = (typeof userRoleEnum.enumValues)[number];
|
|
||||||
export type Plan = (typeof planEnum.enumValues)[number];
|
|
||||||
export type SubscriptionStatus = (typeof subscriptionStatusEnum.enumValues)[number];
|
|
||||||
export type Stack = (typeof stackEnum.enumValues)[number];
|
|
||||||
export type Level = (typeof levelEnum.enumValues)[number];
|
|
||||||
export type TestMode = (typeof testModeEnum.enumValues)[number];
|
|
||||||
export type TestStatus = (typeof testStatusEnum.enumValues)[number];
|
|
||||||
export type QuestionType = (typeof questionTypeEnum.enumValues)[number];
|
|
||||||
export type QuestionStatus = (typeof questionStatusEnum.enumValues)[number];
|
|
||||||
export type QuestionSource = (typeof questionSourceEnum.enumValues)[number];
|
|
||||||
export type ReportStatus = (typeof reportStatusEnum.enumValues)[number];
|
|
||||||
export type SelfLevel = (typeof selfLevelEnum.enumValues)[number];
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
export * from './enums.js';
|
|
||||||
export * from './users.js';
|
|
||||||
export * from './sessions.js';
|
|
||||||
export * from './subscriptions.js';
|
|
||||||
export * from './tests.js';
|
|
||||||
export * from './testQuestions.js';
|
|
||||||
export * from './questionBank.js';
|
|
||||||
export * from './questionCacheMeta.js';
|
|
||||||
export * from './questionReports.js';
|
|
||||||
export * from './userStats.js';
|
|
||||||
export * from './auditLogs.js';
|
|
||||||
export * from './userQuestionLog.js';
|
|
||||||
export * from './verificationTokens.js';
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { pgTable, uuid, text, integer, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { jsonb } from 'drizzle-orm/pg-core';
|
|
||||||
import { stackEnum, levelEnum, questionTypeEnum, questionStatusEnum, questionSourceEnum } from './enums.js';
|
|
||||||
|
|
||||||
export const questionBank = pgTable('question_bank', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
stack: stackEnum('stack').notNull(),
|
|
||||||
level: levelEnum('level').notNull(),
|
|
||||||
type: questionTypeEnum('type').notNull(),
|
|
||||||
questionText: text('question_text').notNull(),
|
|
||||||
options: jsonb('options').$type<Array<{ key: string; text: string }>>(),
|
|
||||||
correctAnswer: jsonb('correct_answer').$type<string | string[]>().notNull(),
|
|
||||||
explanation: text('explanation').notNull(),
|
|
||||||
status: questionStatusEnum('status').notNull().default('pending'),
|
|
||||||
source: questionSourceEnum('source').notNull(),
|
|
||||||
usageCount: integer('usage_count').notNull().default(0),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
approvedAt: timestamp('approved_at', { withTimezone: true }),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type QuestionBank = typeof questionBank.$inferSelect;
|
|
||||||
export type NewQuestionBank = typeof questionBank.$inferInsert;
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, integer, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { jsonb } from 'drizzle-orm/pg-core';
|
|
||||||
import { questionBank } from './questionBank.js';
|
|
||||||
|
|
||||||
export const questionCacheMeta = pgTable('question_cache_meta', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
questionBankId: uuid('question_bank_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => questionBank.id, { onDelete: 'cascade' }),
|
|
||||||
llmModel: varchar('llm_model', { length: 100 }).notNull(),
|
|
||||||
promptHash: varchar('prompt_hash', { length: 64 }).notNull(),
|
|
||||||
generationTimeMs: integer('generation_time_ms').notNull(),
|
|
||||||
rawResponse: jsonb('raw_response').$type<unknown>(),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type QuestionCacheMeta = typeof questionCacheMeta.$inferSelect;
|
|
||||||
export type NewQuestionCacheMeta = typeof questionCacheMeta.$inferInsert;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import { pgTable, uuid, text, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { reportStatusEnum } from './enums.js';
|
|
||||||
import { questionBank } from './questionBank.js';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const questionReports = pgTable('question_reports', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
questionBankId: uuid('question_bank_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => questionBank.id, { onDelete: 'cascade' }),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
reason: text('reason').notNull(),
|
|
||||||
status: reportStatusEnum('status').notNull().default('open'),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
resolvedAt: timestamp('resolved_at', { withTimezone: true }),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type QuestionReport = typeof questionReports.$inferSelect;
|
|
||||||
export type NewQuestionReport = typeof questionReports.$inferInsert;
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const sessions = pgTable('sessions', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
refreshTokenHash: varchar('refresh_token_hash', { length: 255 }).notNull(),
|
|
||||||
userAgent: varchar('user_agent', { length: 500 }),
|
|
||||||
ipAddress: varchar('ip_address', { length: 45 }),
|
|
||||||
lastActiveAt: timestamp('last_active_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type Session = typeof sessions.$inferSelect;
|
|
||||||
export type NewSession = typeof sessions.$inferInsert;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { planEnum, subscriptionStatusEnum } from './enums.js';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const subscriptions = pgTable('subscriptions', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' })
|
|
||||||
.unique(),
|
|
||||||
plan: planEnum('plan').notNull(),
|
|
||||||
status: subscriptionStatusEnum('status').notNull(),
|
|
||||||
startedAt: timestamp('started_at', { withTimezone: true }).notNull(),
|
|
||||||
expiresAt: timestamp('expires_at', { withTimezone: true }),
|
|
||||||
cancelledAt: timestamp('cancelled_at', { withTimezone: true }),
|
|
||||||
paymentProvider: varchar('payment_provider', { length: 50 }),
|
|
||||||
externalId: varchar('external_id', { length: 255 }),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type Subscription = typeof subscriptions.$inferSelect;
|
|
||||||
export type NewSubscription = typeof subscriptions.$inferInsert;
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import { pgTable, uuid, text, integer, boolean, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { jsonb } from 'drizzle-orm/pg-core';
|
|
||||||
import { questionTypeEnum } from './enums.js';
|
|
||||||
import { tests } from './tests.js';
|
|
||||||
import { questionBank } from './questionBank.js';
|
|
||||||
|
|
||||||
export const testQuestions = pgTable('test_questions', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
testId: uuid('test_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => tests.id, { onDelete: 'cascade' }),
|
|
||||||
questionBankId: uuid('question_bank_id').references(() => questionBank.id, { onDelete: 'set null' }),
|
|
||||||
orderNumber: integer('order_number').notNull(),
|
|
||||||
type: questionTypeEnum('type').notNull(),
|
|
||||||
questionText: text('question_text').notNull(),
|
|
||||||
options: jsonb('options').$type<Array<{ key: string; text: string }>>(),
|
|
||||||
correctAnswer: jsonb('correct_answer').$type<string | string[]>().notNull(),
|
|
||||||
explanation: text('explanation').notNull(),
|
|
||||||
userAnswer: jsonb('user_answer').$type<string | string[]>(),
|
|
||||||
isCorrect: boolean('is_correct'),
|
|
||||||
answeredAt: timestamp('answered_at', { withTimezone: true }),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type TestQuestion = typeof testQuestions.$inferSelect;
|
|
||||||
export type NewTestQuestion = typeof testQuestions.$inferInsert;
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { pgTable, uuid, integer, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { stackEnum, levelEnum, testModeEnum, testStatusEnum } from './enums.js';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const tests = pgTable('tests', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
stack: stackEnum('stack').notNull(),
|
|
||||||
level: levelEnum('level').notNull(),
|
|
||||||
questionCount: integer('question_count').notNull(),
|
|
||||||
mode: testModeEnum('mode').notNull().default('fixed'),
|
|
||||||
status: testStatusEnum('status').notNull().default('in_progress'),
|
|
||||||
score: integer('score'),
|
|
||||||
startedAt: timestamp('started_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
finishedAt: timestamp('finished_at', { withTimezone: true }),
|
|
||||||
timeLimitSeconds: integer('time_limit_seconds'),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type Test = typeof tests.$inferSelect;
|
|
||||||
export type NewTest = typeof tests.$inferInsert;
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import { pgTable, uuid, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { users } from './users.js';
|
|
||||||
import { questionBank } from './questionBank.js';
|
|
||||||
|
|
||||||
export const userQuestionLog = pgTable('user_question_log', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
questionBankId: uuid('question_bank_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => questionBank.id, { onDelete: 'cascade' }),
|
|
||||||
seenAt: timestamp('seen_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type UserQuestionLog = typeof userQuestionLog.$inferSelect;
|
|
||||||
export type NewUserQuestionLog = typeof userQuestionLog.$inferInsert;
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import { pgTable, uuid, integer, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { unique } from 'drizzle-orm/pg-core';
|
|
||||||
import { stackEnum, levelEnum } from './enums.js';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const userStats = pgTable(
|
|
||||||
'user_stats',
|
|
||||||
{
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
stack: stackEnum('stack').notNull(),
|
|
||||||
level: levelEnum('level').notNull(),
|
|
||||||
totalQuestions: integer('total_questions').notNull().default(0),
|
|
||||||
correctAnswers: integer('correct_answers').notNull().default(0),
|
|
||||||
testsTaken: integer('tests_taken').notNull().default(0),
|
|
||||||
lastTestAt: timestamp('last_test_at', { withTimezone: true }),
|
|
||||||
},
|
|
||||||
(t) => ({
|
|
||||||
userStackLevelUnique: unique().on(t.userId, t.stack, t.level),
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
export type UserStat = typeof userStats.$inferSelect;
|
|
||||||
export type NewUserStat = typeof userStats.$inferInsert;
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, timestamp, boolean } from 'drizzle-orm/pg-core';
|
|
||||||
import { userRoleEnum, selfLevelEnum } from './enums.js';
|
|
||||||
|
|
||||||
export const users = pgTable('users', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
email: varchar('email', { length: 255 }).notNull().unique(),
|
|
||||||
passwordHash: varchar('password_hash', { length: 255 }).notNull(),
|
|
||||||
nickname: varchar('nickname', { length: 30 }).notNull(),
|
|
||||||
avatarUrl: varchar('avatar_url', { length: 500 }),
|
|
||||||
country: varchar('country', { length: 100 }),
|
|
||||||
city: varchar('city', { length: 100 }),
|
|
||||||
selfLevel: selfLevelEnum('self_level'),
|
|
||||||
isPublic: boolean('is_public').notNull().default(true),
|
|
||||||
role: userRoleEnum('role').notNull().default('free'),
|
|
||||||
emailVerifiedAt: timestamp('email_verified_at', { withTimezone: true }),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type User = typeof users.$inferSelect;
|
|
||||||
export type NewUser = typeof users.$inferInsert;
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { pgTable, uuid, varchar, timestamp } from 'drizzle-orm/pg-core';
|
|
||||||
import { users } from './users.js';
|
|
||||||
|
|
||||||
export const emailVerificationCodes = pgTable('email_verification_codes', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
code: varchar('code', { length: 10 }).notNull(),
|
|
||||||
expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const passwordResetTokens = pgTable('password_reset_tokens', {
|
|
||||||
id: uuid('id').primaryKey().defaultRandom(),
|
|
||||||
userId: uuid('user_id')
|
|
||||||
.notNull()
|
|
||||||
.references(() => users.id, { onDelete: 'cascade' }),
|
|
||||||
tokenHash: varchar('token_hash', { length: 255 }).notNull(),
|
|
||||||
expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
|
|
||||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
|
||||||
});
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
import 'dotenv/config';
|
|
||||||
import { drizzle } from 'drizzle-orm/node-postgres';
|
|
||||||
import { eq } from 'drizzle-orm';
|
|
||||||
import pg from 'pg';
|
|
||||||
import argon2 from 'argon2';
|
|
||||||
import { env } from '../config/env.js';
|
|
||||||
import { users } from './schema/index.js';
|
|
||||||
|
|
||||||
const { Pool } = pg;
|
|
||||||
|
|
||||||
const TEST_USER = {
|
|
||||||
email: 'test@example.com',
|
|
||||||
password: 'TestPassword123!',
|
|
||||||
nickname: 'TestUser',
|
|
||||||
};
|
|
||||||
|
|
||||||
async function runSeed() {
|
|
||||||
const pool = new Pool({ connectionString: env.DATABASE_URL });
|
|
||||||
const db = drizzle(pool);
|
|
||||||
|
|
||||||
if (env.NODE_ENV !== 'development') {
|
|
||||||
await pool.end();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const existing = await db.select().from(users).where(eq(users.email, TEST_USER.email)).limit(1);
|
|
||||||
if (existing.length > 0) {
|
|
||||||
await pool.end();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const passwordHash = await argon2.hash(TEST_USER.password);
|
|
||||||
await db.insert(users).values({
|
|
||||||
email: TEST_USER.email,
|
|
||||||
passwordHash,
|
|
||||||
nickname: TEST_USER.nickname,
|
|
||||||
role: 'free',
|
|
||||||
emailVerifiedAt: new Date(),
|
|
||||||
});
|
|
||||||
|
|
||||||
await pool.end();
|
|
||||||
}
|
|
||||||
|
|
||||||
runSeed().catch((err) => {
|
|
||||||
console.error('Seed failed:', err);
|
|
||||||
process.exit(1);
|
|
||||||
});
|
|
||||||
@@ -3,13 +3,12 @@ import { drizzle } from 'drizzle-orm/node-postgres';
|
|||||||
import pg from 'pg';
|
import pg from 'pg';
|
||||||
import fp from 'fastify-plugin';
|
import fp from 'fastify-plugin';
|
||||||
import { env } from '../config/env.js';
|
import { env } from '../config/env.js';
|
||||||
import * as schema from '../db/schema/index.js';
|
|
||||||
|
|
||||||
const { Pool } = pg;
|
const { Pool } = pg;
|
||||||
|
|
||||||
declare module 'fastify' {
|
declare module 'fastify' {
|
||||||
interface FastifyInstance {
|
interface FastifyInstance {
|
||||||
db: ReturnType<typeof drizzle<typeof schema>>;
|
db: ReturnType<typeof drizzle>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,7 +20,7 @@ const databasePlugin: FastifyPluginAsync = async (app: FastifyInstance) => {
|
|||||||
connectionTimeoutMillis: 5000,
|
connectionTimeoutMillis: 5000,
|
||||||
});
|
});
|
||||||
|
|
||||||
const db = drizzle(pool, { schema });
|
const db = drizzle(pool);
|
||||||
|
|
||||||
app.decorate('db', db);
|
app.decorate('db', db);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user