Compare commits
8 Commits
9bada23e2e
...
feat/infra
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b0e1aaa46 | ||
|
|
02b7f2f508 | ||
|
|
ae642d78b8 | ||
|
|
8545fd27a2 | ||
|
|
8940ab6ce9 | ||
|
|
8e550b54a9 | ||
|
|
019bf875ff | ||
|
|
9ffd59eb3e |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +0,0 @@
|
||||
[submodule "samreshu_docs"]
|
||||
path = samreshu_docs
|
||||
url = https://git.vakanaut.ru/admin/samreshu_docs.git
|
||||
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",
|
||||
"dev": "tsx watch src/server.ts",
|
||||
"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:studio": "drizzle-kit studio",
|
||||
"db:seed": "tsx src/db/seed.ts",
|
||||
|
||||
Submodule samreshu_docs deleted from 99cd8ae727
10
src/app.ts
10
src/app.ts
@@ -4,11 +4,6 @@ import databasePlugin from './plugins/database.js';
|
||||
import redisPlugin from './plugins/redis.js';
|
||||
import securityPlugin from './plugins/security.js';
|
||||
import rateLimitPlugin from './plugins/rateLimit.js';
|
||||
import authPlugin from './plugins/auth.js';
|
||||
import subscriptionPlugin from './plugins/subscription.js';
|
||||
import { authRoutes } from './routes/auth.js';
|
||||
import { profileRoutes } from './routes/profile.js';
|
||||
import { testsRoutes } from './routes/tests.js';
|
||||
import { env } from './config/env.js';
|
||||
import { randomUUID } from 'node:crypto';
|
||||
|
||||
@@ -74,11 +69,6 @@ export async function buildApp(): Promise<FastifyInstance> {
|
||||
await app.register(databasePlugin);
|
||||
await app.register(securityPlugin);
|
||||
await app.register(rateLimitPlugin);
|
||||
await app.register(authPlugin);
|
||||
await app.register(subscriptionPlugin);
|
||||
await app.register(authRoutes, { prefix: '/auth' });
|
||||
await app.register(profileRoutes, { prefix: '/profile' });
|
||||
await app.register(testsRoutes, { prefix: '/tests' });
|
||||
|
||||
app.get('/health', async () => ({ status: 'ok', timestamp: new Date().toISOString() }));
|
||||
|
||||
|
||||
@@ -14,11 +14,9 @@ const envSchema = z.object({
|
||||
|
||||
LLM_BASE_URL: z.string().url().default('http://localhost:11434/v1'),
|
||||
LLM_MODEL: z.string().default('qwen2.5:14b'),
|
||||
LLM_FALLBACK_MODEL: z.string().optional(),
|
||||
LLM_API_KEY: z.string().optional(),
|
||||
LLM_TIMEOUT_MS: z.coerce.number().default(15000),
|
||||
LLM_MAX_RETRIES: z.coerce.number().min(0).default(1),
|
||||
LLM_RETRY_DELAY_MS: z.coerce.number().min(0).default(1000),
|
||||
LLM_TEMPERATURE: z.coerce.number().min(0).max(2).default(0.7),
|
||||
LLM_MAX_TOKENS: z.coerce.number().default(2048),
|
||||
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
@@ -1,42 +0,0 @@
|
||||
import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
|
||||
import fp from 'fastify-plugin';
|
||||
import { verifyToken, isAccessPayload } from '../utils/jwt.js';
|
||||
import { unauthorized } from '../utils/errors.js';
|
||||
|
||||
declare module 'fastify' {
|
||||
interface FastifyInstance {
|
||||
authenticate: (req: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||
}
|
||||
interface FastifyRequest {
|
||||
user?: { id: string; email: string };
|
||||
}
|
||||
}
|
||||
|
||||
export async function authenticate(req: FastifyRequest, _reply: FastifyReply): Promise<void> {
|
||||
const authHeader = req.headers.authorization;
|
||||
|
||||
if (!authHeader?.startsWith('Bearer ')) {
|
||||
throw unauthorized('Missing or invalid authorization header');
|
||||
}
|
||||
|
||||
const token = authHeader.slice(7);
|
||||
|
||||
try {
|
||||
const payload = await verifyToken(token);
|
||||
|
||||
if (!isAccessPayload(payload)) {
|
||||
throw unauthorized('Invalid token type');
|
||||
}
|
||||
|
||||
req.user = { id: payload.sub, email: payload.email };
|
||||
} catch {
|
||||
throw unauthorized('Invalid or expired token');
|
||||
}
|
||||
}
|
||||
|
||||
const authPlugin = async (app: FastifyInstance) => {
|
||||
app.decorateRequest('user', undefined);
|
||||
app.decorate('authenticate', authenticate);
|
||||
};
|
||||
|
||||
export default fp(authPlugin, { name: 'auth' });
|
||||
@@ -3,13 +3,12 @@ import { drizzle } from 'drizzle-orm/node-postgres';
|
||||
import pg from 'pg';
|
||||
import fp from 'fastify-plugin';
|
||||
import { env } from '../config/env.js';
|
||||
import * as schema from '../db/schema/index.js';
|
||||
|
||||
const { Pool } = pg;
|
||||
|
||||
declare module 'fastify' {
|
||||
interface FastifyInstance {
|
||||
db: ReturnType<typeof drizzle<typeof schema>>;
|
||||
db: ReturnType<typeof drizzle>;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +20,7 @@ const databasePlugin: FastifyPluginAsync = async (app: FastifyInstance) => {
|
||||
connectionTimeoutMillis: 5000,
|
||||
});
|
||||
|
||||
const db = drizzle(pool, { schema });
|
||||
const db = drizzle(pool);
|
||||
|
||||
app.decorate('db', db);
|
||||
|
||||
|
||||
@@ -29,7 +29,6 @@ const rateLimitPlugin: FastifyPluginAsync = async (app: FastifyInstance) => {
|
||||
app.decorate('rateLimitOptions', options);
|
||||
|
||||
await app.register(rateLimit, {
|
||||
global: false,
|
||||
max: options.apiGuest.max,
|
||||
timeWindow: options.apiGuest.timeWindow,
|
||||
keyGenerator: (req) => {
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
|
||||
import fp from 'fastify-plugin';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import { subscriptions } from '../db/schema/subscriptions.js';
|
||||
import { forbidden } from '../utils/errors.js';
|
||||
|
||||
export type SubscriptionInfo = {
|
||||
plan: 'free' | 'pro';
|
||||
status: 'active' | 'trialing' | 'cancelled' | 'expired';
|
||||
isPro: boolean;
|
||||
expiresAt: Date | null;
|
||||
};
|
||||
|
||||
declare module 'fastify' {
|
||||
interface FastifyRequest {
|
||||
subscription?: SubscriptionInfo | null;
|
||||
}
|
||||
interface FastifyInstance {
|
||||
withSubscription: (req: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||
requirePro: (req: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||
}
|
||||
}
|
||||
|
||||
async function loadSubscription(db: FastifyInstance['db'], userId: string): Promise<SubscriptionInfo | null> {
|
||||
const [sub] = await db
|
||||
.select()
|
||||
.from(subscriptions)
|
||||
.where(eq(subscriptions.userId, userId))
|
||||
.limit(1);
|
||||
|
||||
if (!sub) return null;
|
||||
|
||||
const now = new Date();
|
||||
const isExpired = sub.expiresAt && sub.expiresAt < now;
|
||||
const isPro =
|
||||
sub.plan === 'pro' &&
|
||||
(sub.status === 'active' || sub.status === 'trialing') &&
|
||||
!isExpired;
|
||||
|
||||
return {
|
||||
plan: sub.plan as 'free' | 'pro',
|
||||
status: sub.status as SubscriptionInfo['status'],
|
||||
isPro,
|
||||
expiresAt: sub.expiresAt,
|
||||
};
|
||||
}
|
||||
|
||||
export async function requirePro(req: FastifyRequest, _reply: FastifyReply): Promise<void> {
|
||||
const sub = req.subscription;
|
||||
|
||||
if (!sub?.isPro) {
|
||||
throw forbidden('Pro subscription required');
|
||||
}
|
||||
}
|
||||
|
||||
const subscriptionPlugin = async (app: FastifyInstance) => {
|
||||
app.decorateRequest('subscription', undefined);
|
||||
|
||||
app.decorate('withSubscription', async (req: FastifyRequest, _reply: FastifyReply) => {
|
||||
if (!req.user?.id) return;
|
||||
const sub = await loadSubscription(app.db, req.user.id);
|
||||
req.subscription = sub;
|
||||
});
|
||||
|
||||
app.decorate('requirePro', requirePro);
|
||||
};
|
||||
|
||||
export default fp(subscriptionPlugin, {
|
||||
name: 'subscription',
|
||||
dependencies: ['database', 'auth'],
|
||||
});
|
||||
@@ -1,168 +0,0 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { AuthService } from '../services/auth/auth.service.js';
|
||||
|
||||
const registerSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['email', 'password', 'nickname'],
|
||||
properties: {
|
||||
email: { type: 'string', minLength: 1 },
|
||||
password: { type: 'string', minLength: 8 },
|
||||
nickname: { type: 'string', minLength: 2, maxLength: 30 },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const loginSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['email', 'password'],
|
||||
properties: {
|
||||
email: { type: 'string', minLength: 1 },
|
||||
password: { type: 'string' },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const refreshTokenSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['refreshToken'],
|
||||
properties: {
|
||||
refreshToken: { type: 'string' },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const logoutSchema = refreshTokenSchema;
|
||||
|
||||
const verifyEmailSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['userId', 'code'],
|
||||
properties: {
|
||||
userId: { type: 'string', minLength: 1 },
|
||||
code: { type: 'string', minLength: 1, maxLength: 10 },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const forgotPasswordSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['email'],
|
||||
properties: {
|
||||
email: { type: 'string', minLength: 1 },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const resetPasswordSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['token', 'newPassword'],
|
||||
properties: {
|
||||
token: { type: 'string' },
|
||||
newPassword: { type: 'string', minLength: 8 },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export async function authRoutes(app: FastifyInstance) {
|
||||
const authService = new AuthService(app.db);
|
||||
const { rateLimitOptions } = app;
|
||||
|
||||
app.post(
|
||||
'/register',
|
||||
{ schema: registerSchema, config: { rateLimit: rateLimitOptions.register } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { email: string; password: string; nickname: string };
|
||||
const { userId, verificationCode } = await authService.register(body);
|
||||
|
||||
return reply.status(201).send({
|
||||
userId,
|
||||
message: 'Registration successful. Please verify your email.',
|
||||
verificationCode,
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/login',
|
||||
{ schema: loginSchema, config: { rateLimit: rateLimitOptions.login } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { email: string; password: string };
|
||||
const userAgent = req.headers['user-agent'];
|
||||
const ipAddress = req.ip;
|
||||
|
||||
const result = await authService.login({
|
||||
email: body.email,
|
||||
password: body.password,
|
||||
userAgent,
|
||||
ipAddress,
|
||||
});
|
||||
|
||||
return reply.send(result);
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/logout',
|
||||
{ schema: logoutSchema, config: { rateLimit: rateLimitOptions.apiGuest } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { refreshToken: string };
|
||||
await authService.logout(body.refreshToken);
|
||||
return reply.status(204).send();
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/refresh',
|
||||
{ schema: refreshTokenSchema, config: { rateLimit: rateLimitOptions.apiGuest } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { refreshToken: string };
|
||||
const userAgent = req.headers['user-agent'];
|
||||
const ipAddress = req.ip;
|
||||
|
||||
const result = await authService.refresh({
|
||||
refreshToken: body.refreshToken,
|
||||
userAgent,
|
||||
ipAddress,
|
||||
});
|
||||
|
||||
return reply.send(result);
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/verify-email',
|
||||
{ schema: verifyEmailSchema, config: { rateLimit: rateLimitOptions.verifyEmail } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { userId: string; code: string };
|
||||
await authService.verifyEmail(body.userId, body.code);
|
||||
return reply.send({ message: 'Email verified successfully' });
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/forgot-password',
|
||||
{ schema: forgotPasswordSchema, config: { rateLimit: rateLimitOptions.forgotPassword } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { email: string };
|
||||
await authService.forgotPassword(body.email);
|
||||
return reply.send({
|
||||
message: 'If the email exists, a reset link has been sent.',
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/reset-password',
|
||||
{ schema: resetPasswordSchema, config: { rateLimit: rateLimitOptions.forgotPassword } },
|
||||
async (req, reply) => {
|
||||
const body = req.body as { token: string; newPassword: string };
|
||||
await authService.resetPassword(body.token, body.newPassword);
|
||||
return reply.send({ message: 'Password reset successfully' });
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { UserService } from '../services/user/user.service.js';
|
||||
|
||||
const patchProfileSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
nickname: { type: 'string', minLength: 2, maxLength: 30 },
|
||||
avatarUrl: { type: ['string', 'null'], maxLength: 500 },
|
||||
country: { type: ['string', 'null'], maxLength: 100 },
|
||||
city: { type: ['string', 'null'], maxLength: 100 },
|
||||
selfLevel: { type: ['string', 'null'], enum: ['jun', 'mid', 'sen'] },
|
||||
isPublic: { type: 'boolean' },
|
||||
},
|
||||
additionalProperties: false,
|
||||
},
|
||||
};
|
||||
|
||||
const usernameParamsSchema = {
|
||||
params: {
|
||||
type: 'object',
|
||||
required: ['username'],
|
||||
properties: {
|
||||
username: { type: 'string', minLength: 2, maxLength: 30 },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export async function profileRoutes(app: FastifyInstance) {
|
||||
const userService = new UserService(app.db);
|
||||
const { rateLimitOptions } = app;
|
||||
|
||||
app.get(
|
||||
'/',
|
||||
{
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate, app.withSubscription],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const profile = await userService.getPrivateProfile(userId);
|
||||
return reply.send(profile);
|
||||
},
|
||||
);
|
||||
|
||||
app.patch(
|
||||
'/',
|
||||
{
|
||||
schema: patchProfileSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const body = req.body as Parameters<UserService['updateProfile']>[1];
|
||||
const profile = await userService.updateProfile(userId, body);
|
||||
return reply.send(profile);
|
||||
},
|
||||
);
|
||||
|
||||
app.get(
|
||||
'/:username',
|
||||
{
|
||||
schema: usernameParamsSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiGuest },
|
||||
},
|
||||
async (req, reply) => {
|
||||
const { username } = req.params as { username: string };
|
||||
const profile = await userService.getPublicProfile(username);
|
||||
return reply.send(profile);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -1,185 +0,0 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { LlmService } from '../services/llm/llm.service.js';
|
||||
import { QuestionService } from '../services/questions/question.service.js';
|
||||
import { TestsService } from '../services/tests/tests.service.js';
|
||||
import { notFound } from '../utils/errors.js';
|
||||
import type { CreateTestInput } from '../services/tests/tests.service.js';
|
||||
import type { TestSnapshot } from '../services/tests/tests.service.js';
|
||||
|
||||
const STACKS = ['html', 'css', 'js', 'ts', 'react', 'vue', 'nodejs', 'git', 'web_basics'] as const;
|
||||
const LEVELS = ['basic', 'beginner', 'intermediate', 'advanced', 'expert'] as const;
|
||||
|
||||
const createTestSchema = {
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['stack', 'level', 'questionCount'],
|
||||
properties: {
|
||||
stack: { type: 'string', enum: STACKS },
|
||||
level: { type: 'string', enum: LEVELS },
|
||||
questionCount: { type: 'integer', minimum: 1, maximum: 50 },
|
||||
mode: { type: 'string', enum: ['fixed', 'infinite', 'marathon'] },
|
||||
},
|
||||
additionalProperties: false,
|
||||
},
|
||||
};
|
||||
|
||||
const testIdParamsSchema = {
|
||||
params: {
|
||||
type: 'object',
|
||||
required: ['testId'],
|
||||
properties: {
|
||||
testId: { type: 'string', format: 'uuid' },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const answerSchema = {
|
||||
params: {
|
||||
type: 'object',
|
||||
required: ['testId'],
|
||||
properties: {
|
||||
testId: { type: 'string', format: 'uuid' },
|
||||
},
|
||||
},
|
||||
body: {
|
||||
type: 'object',
|
||||
required: ['questionId', 'answer'],
|
||||
properties: {
|
||||
questionId: { type: 'string', format: 'uuid' },
|
||||
answer: {
|
||||
oneOf: [
|
||||
{ type: 'string' },
|
||||
{ type: 'array', items: { type: 'string' } },
|
||||
],
|
||||
},
|
||||
},
|
||||
additionalProperties: false,
|
||||
},
|
||||
};
|
||||
|
||||
const historyQuerySchema = {
|
||||
querystring: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
limit: { type: 'integer', minimum: 1, maximum: 100 },
|
||||
offset: { type: 'integer', minimum: 0 },
|
||||
},
|
||||
additionalProperties: false,
|
||||
},
|
||||
};
|
||||
|
||||
function stripAnswersForClient(
|
||||
q: TestSnapshot
|
||||
): Omit<TestSnapshot, 'correctAnswer' | 'explanation'> {
|
||||
const { correctAnswer: _, explanation: __, ...rest } = q;
|
||||
return rest;
|
||||
}
|
||||
|
||||
export async function testsRoutes(app: FastifyInstance) {
|
||||
const llmService = new LlmService();
|
||||
const questionService = new QuestionService(app.db, llmService);
|
||||
const testsService = new TestsService(app.db, questionService);
|
||||
const { rateLimitOptions } = app;
|
||||
|
||||
app.get(
|
||||
'/',
|
||||
{
|
||||
schema: historyQuerySchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const { limit, offset } = (req.query as { limit?: number; offset?: number }) ?? {};
|
||||
const { tests: testList, total } = await testsService.getHistory(
|
||||
userId,
|
||||
{ limit, offset }
|
||||
);
|
||||
return reply.send({ tests: testList, total });
|
||||
}
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/',
|
||||
{
|
||||
schema: createTestSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate, app.withSubscription],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const body = req.body as CreateTestInput;
|
||||
const test = await testsService.createTest(userId, body);
|
||||
const hideAnswers = test.status === 'in_progress';
|
||||
const response = {
|
||||
...test,
|
||||
questions: hideAnswers
|
||||
? test.questions.map(stripAnswersForClient)
|
||||
: test.questions,
|
||||
};
|
||||
return reply.status(201).send(response);
|
||||
}
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/:testId/answer',
|
||||
{
|
||||
schema: answerSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const { testId } = req.params as { testId: string };
|
||||
const { questionId, answer } = req.body as { questionId: string; answer: string | string[] };
|
||||
const snapshot = await testsService.answerQuestion(
|
||||
userId,
|
||||
testId,
|
||||
questionId,
|
||||
answer
|
||||
);
|
||||
return reply.send(snapshot);
|
||||
}
|
||||
);
|
||||
|
||||
app.post(
|
||||
'/:testId/finish',
|
||||
{
|
||||
schema: testIdParamsSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const { testId } = req.params as { testId: string };
|
||||
const test = await testsService.finishTest(userId, testId);
|
||||
return reply.send(test);
|
||||
}
|
||||
);
|
||||
|
||||
app.get(
|
||||
'/:testId',
|
||||
{
|
||||
schema: testIdParamsSchema,
|
||||
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||
preHandler: [app.authenticate],
|
||||
},
|
||||
async (req, reply) => {
|
||||
const userId = req.user!.id;
|
||||
const { testId } = req.params as { testId: string };
|
||||
const test = await testsService.getById(userId, testId);
|
||||
if (!test) {
|
||||
throw notFound('Test not found');
|
||||
}
|
||||
const hideAnswers = test.status === 'in_progress';
|
||||
const response = {
|
||||
...test,
|
||||
questions: hideAnswers
|
||||
? test.questions.map(stripAnswersForClient)
|
||||
: test.questions,
|
||||
};
|
||||
return reply.send(response);
|
||||
}
|
||||
);
|
||||
|
||||
}
|
||||
@@ -1,172 +0,0 @@
|
||||
import { eq, asc, count } from 'drizzle-orm';
|
||||
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||
import type * as schema from '../../db/schema/index.js';
|
||||
import { questionBank } from '../../db/schema/index.js';
|
||||
import { notFound } from '../../utils/errors.js';
|
||||
import type { Stack, Level, QuestionType } from '../../db/schema/enums.js';
|
||||
|
||||
type Db = NodePgDatabase<typeof schema>;
|
||||
|
||||
export type PendingQuestion = {
|
||||
id: string;
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
type: QuestionType;
|
||||
questionText: string;
|
||||
options: Array<{ key: string; text: string }> | null;
|
||||
correctAnswer: string | string[];
|
||||
explanation: string;
|
||||
source: string;
|
||||
createdAt: Date;
|
||||
};
|
||||
|
||||
export type EditQuestionInput = {
|
||||
stack?: Stack;
|
||||
level?: Level;
|
||||
type?: QuestionType;
|
||||
questionText?: string;
|
||||
options?: Array<{ key: string; text: string }> | null;
|
||||
correctAnswer?: string | string[];
|
||||
explanation?: string;
|
||||
};
|
||||
|
||||
export type ListPendingResult = {
|
||||
questions: PendingQuestion[];
|
||||
total: number;
|
||||
};
|
||||
|
||||
export class AdminQuestionService {
|
||||
constructor(private readonly db: Db) {}
|
||||
|
||||
async listPending(limit = 50, offset = 0): Promise<ListPendingResult> {
|
||||
const questions = await this.db
|
||||
.select({
|
||||
id: questionBank.id,
|
||||
stack: questionBank.stack,
|
||||
level: questionBank.level,
|
||||
type: questionBank.type,
|
||||
questionText: questionBank.questionText,
|
||||
options: questionBank.options,
|
||||
correctAnswer: questionBank.correctAnswer,
|
||||
explanation: questionBank.explanation,
|
||||
source: questionBank.source,
|
||||
createdAt: questionBank.createdAt,
|
||||
})
|
||||
.from(questionBank)
|
||||
.where(eq(questionBank.status, 'pending'))
|
||||
.orderBy(asc(questionBank.createdAt))
|
||||
.limit(limit)
|
||||
.offset(offset);
|
||||
|
||||
const [{ count: totalCount }] = await this.db
|
||||
.select({ count: count() })
|
||||
.from(questionBank)
|
||||
.where(eq(questionBank.status, 'pending'));
|
||||
|
||||
return {
|
||||
questions: questions.map((q) => ({
|
||||
id: q.id,
|
||||
stack: q.stack,
|
||||
level: q.level,
|
||||
type: q.type,
|
||||
questionText: q.questionText,
|
||||
options: q.options,
|
||||
correctAnswer: q.correctAnswer,
|
||||
explanation: q.explanation,
|
||||
source: q.source,
|
||||
createdAt: q.createdAt,
|
||||
})),
|
||||
total: totalCount ?? 0,
|
||||
};
|
||||
}
|
||||
|
||||
async approve(questionId: string): Promise<void> {
|
||||
const [updated] = await this.db
|
||||
.update(questionBank)
|
||||
.set({
|
||||
status: 'approved',
|
||||
approvedAt: new Date(),
|
||||
})
|
||||
.where(eq(questionBank.id, questionId))
|
||||
.returning({ id: questionBank.id });
|
||||
|
||||
if (!updated) {
|
||||
throw notFound('Question not found');
|
||||
}
|
||||
}
|
||||
|
||||
async reject(questionId: string): Promise<void> {
|
||||
const [updated] = await this.db
|
||||
.update(questionBank)
|
||||
.set({ status: 'rejected' })
|
||||
.where(eq(questionBank.id, questionId))
|
||||
.returning({ id: questionBank.id });
|
||||
|
||||
if (!updated) {
|
||||
throw notFound('Question not found');
|
||||
}
|
||||
}
|
||||
|
||||
async edit(questionId: string, input: EditQuestionInput): Promise<PendingQuestion> {
|
||||
const updates: Partial<{
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
type: QuestionType;
|
||||
questionText: string;
|
||||
options: Array<{ key: string; text: string }> | null;
|
||||
correctAnswer: string | string[];
|
||||
explanation: string;
|
||||
}> = {};
|
||||
|
||||
if (input.stack !== undefined) updates.stack = input.stack;
|
||||
if (input.level !== undefined) updates.level = input.level;
|
||||
if (input.type !== undefined) updates.type = input.type;
|
||||
if (input.questionText !== undefined) updates.questionText = input.questionText;
|
||||
if (input.options !== undefined) updates.options = input.options;
|
||||
if (input.correctAnswer !== undefined) updates.correctAnswer = input.correctAnswer;
|
||||
if (input.explanation !== undefined) updates.explanation = input.explanation;
|
||||
|
||||
if (Object.keys(updates).length === 0) {
|
||||
const [existing] = await this.db
|
||||
.select()
|
||||
.from(questionBank)
|
||||
.where(eq(questionBank.id, questionId));
|
||||
if (!existing) throw notFound('Question not found');
|
||||
return {
|
||||
id: existing.id,
|
||||
stack: existing.stack,
|
||||
level: existing.level,
|
||||
type: existing.type,
|
||||
questionText: existing.questionText,
|
||||
options: existing.options,
|
||||
correctAnswer: existing.correctAnswer,
|
||||
explanation: existing.explanation,
|
||||
source: existing.source,
|
||||
createdAt: existing.createdAt,
|
||||
};
|
||||
}
|
||||
|
||||
const [updated] = await this.db
|
||||
.update(questionBank)
|
||||
.set(updates)
|
||||
.where(eq(questionBank.id, questionId))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
throw notFound('Question not found');
|
||||
}
|
||||
|
||||
return {
|
||||
id: updated.id,
|
||||
stack: updated.stack,
|
||||
level: updated.level,
|
||||
type: updated.type,
|
||||
questionText: updated.questionText,
|
||||
options: updated.options,
|
||||
correctAnswer: updated.correctAnswer,
|
||||
explanation: updated.explanation,
|
||||
source: updated.source,
|
||||
createdAt: updated.createdAt,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,304 +0,0 @@
|
||||
import { eq, and, gt } from 'drizzle-orm';
|
||||
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||
import type * as schema from '../../db/schema/index.js';
|
||||
import { users, sessions, emailVerificationCodes, passwordResetTokens } from '../../db/schema/index.js';
|
||||
import { hashPassword, verifyPassword } from '../../utils/password.js';
|
||||
import {
|
||||
signAccessToken,
|
||||
signRefreshToken,
|
||||
verifyToken,
|
||||
isRefreshPayload,
|
||||
hashToken,
|
||||
} from '../../utils/jwt.js';
|
||||
import {
|
||||
AppError,
|
||||
conflict,
|
||||
unauthorized,
|
||||
notFound,
|
||||
ERROR_CODES,
|
||||
} from '../../utils/errors.js';
|
||||
import { randomBytes, randomUUID } from 'node:crypto';
|
||||
|
||||
type Db = NodePgDatabase<typeof schema>;
|
||||
|
||||
export interface RegisterInput {
|
||||
email: string;
|
||||
password: string;
|
||||
nickname: string;
|
||||
}
|
||||
|
||||
export interface LoginInput {
|
||||
email: string;
|
||||
password: string;
|
||||
userAgent?: string;
|
||||
ipAddress?: string;
|
||||
}
|
||||
|
||||
export interface LoginResult {
|
||||
accessToken: string;
|
||||
refreshToken: string;
|
||||
expiresIn: number;
|
||||
}
|
||||
|
||||
export interface RefreshInput {
|
||||
refreshToken: string;
|
||||
userAgent?: string;
|
||||
ipAddress?: string;
|
||||
}
|
||||
|
||||
export interface ForgotPasswordResult {
|
||||
token: string;
|
||||
expiresAt: Date;
|
||||
}
|
||||
|
||||
const REFRESH_TTL_MS = 7 * 24 * 60 * 60 * 1000;
|
||||
const VERIFICATION_CODE_LENGTH = 6;
|
||||
const VERIFICATION_CODE_TTL_MS = 15 * 60 * 1000;
|
||||
const RESET_TOKEN_TTL_MS = 60 * 60 * 1000;
|
||||
|
||||
export class AuthService {
|
||||
constructor(private readonly db: Db) {}
|
||||
|
||||
async register(input: RegisterInput): Promise<{ userId: string; verificationCode: string }> {
|
||||
const [existing] = await this.db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.email, input.email.toLowerCase().trim()))
|
||||
.limit(1);
|
||||
|
||||
if (existing) {
|
||||
throw conflict(ERROR_CODES.EMAIL_TAKEN, 'Email already registered');
|
||||
}
|
||||
|
||||
const [nicknameConflict] = await this.db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.nickname, input.nickname.trim()))
|
||||
.limit(1);
|
||||
|
||||
if (nicknameConflict) {
|
||||
throw conflict(ERROR_CODES.NICKNAME_TAKEN, 'Nickname already taken');
|
||||
}
|
||||
|
||||
const passwordHash = await hashPassword(input.password);
|
||||
|
||||
const [user] = await this.db
|
||||
.insert(users)
|
||||
.values({
|
||||
email: input.email.toLowerCase().trim(),
|
||||
passwordHash,
|
||||
nickname: input.nickname.trim(),
|
||||
})
|
||||
.returning({ id: users.id });
|
||||
|
||||
if (!user) {
|
||||
throw new AppError(ERROR_CODES.INTERNAL_ERROR, 'Failed to create user', 500);
|
||||
}
|
||||
|
||||
const code = randomBytes(VERIFICATION_CODE_LENGTH)
|
||||
.toString('hex')
|
||||
.slice(0, VERIFICATION_CODE_LENGTH)
|
||||
.toUpperCase();
|
||||
const expiresAt = new Date(Date.now() + VERIFICATION_CODE_TTL_MS);
|
||||
|
||||
await this.db.insert(emailVerificationCodes).values({
|
||||
userId: user.id,
|
||||
code,
|
||||
expiresAt,
|
||||
});
|
||||
|
||||
return { userId: user.id, verificationCode: code };
|
||||
}
|
||||
|
||||
async login(input: LoginInput): Promise<LoginResult> {
|
||||
const [user] = await this.db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.email, input.email.toLowerCase().trim()))
|
||||
.limit(1);
|
||||
|
||||
if (!user || !(await verifyPassword(user.passwordHash, input.password))) {
|
||||
throw unauthorized('Invalid email or password');
|
||||
}
|
||||
|
||||
const [accessToken, refreshToken] = await Promise.all([
|
||||
signAccessToken({ sub: user.id, email: user.email }),
|
||||
signRefreshToken({ sub: user.id, sid: randomUUID() }),
|
||||
]);
|
||||
|
||||
const refreshHash = hashToken(refreshToken);
|
||||
const expiresAt = new Date(Date.now() + REFRESH_TTL_MS);
|
||||
|
||||
await this.db.insert(sessions).values({
|
||||
userId: user.id,
|
||||
refreshTokenHash: refreshHash,
|
||||
userAgent: input.userAgent ?? null,
|
||||
ipAddress: input.ipAddress ?? null,
|
||||
expiresAt,
|
||||
});
|
||||
|
||||
return {
|
||||
accessToken,
|
||||
refreshToken,
|
||||
expiresIn: Math.floor(REFRESH_TTL_MS / 1000),
|
||||
};
|
||||
}
|
||||
|
||||
async logout(refreshToken: string): Promise<void> {
|
||||
const hash = hashToken(refreshToken);
|
||||
await this.db.delete(sessions).where(eq(sessions.refreshTokenHash, hash));
|
||||
}
|
||||
|
||||
async refresh(input: RefreshInput): Promise<LoginResult> {
|
||||
const payload = await verifyToken(input.refreshToken);
|
||||
|
||||
if (!isRefreshPayload(payload)) {
|
||||
throw unauthorized('Invalid refresh token');
|
||||
}
|
||||
|
||||
const hash = hashToken(input.refreshToken);
|
||||
|
||||
const [session] = await this.db
|
||||
.select()
|
||||
.from(sessions)
|
||||
.where(and(eq(sessions.refreshTokenHash, hash), gt(sessions.expiresAt, new Date())))
|
||||
.limit(1);
|
||||
|
||||
if (!session) {
|
||||
throw new AppError(ERROR_CODES.INVALID_REFRESH_TOKEN, 'Invalid or expired refresh token', 401);
|
||||
}
|
||||
|
||||
await this.db.delete(sessions).where(eq(sessions.id, session.id));
|
||||
|
||||
const [user] = await this.db.select().from(users).where(eq(users.id, session.userId)).limit(1);
|
||||
|
||||
if (!user) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
|
||||
const [accessToken, newRefreshToken] = await Promise.all([
|
||||
signAccessToken({ sub: user.id, email: user.email }),
|
||||
signRefreshToken({ sub: user.id, sid: randomUUID() }),
|
||||
]);
|
||||
|
||||
const newHash = hashToken(newRefreshToken);
|
||||
const expiresAt = new Date(Date.now() + REFRESH_TTL_MS);
|
||||
|
||||
await this.db.insert(sessions).values({
|
||||
userId: user.id,
|
||||
refreshTokenHash: newHash,
|
||||
userAgent: input.userAgent ?? session.userAgent,
|
||||
ipAddress: input.ipAddress ?? session.ipAddress,
|
||||
expiresAt,
|
||||
});
|
||||
|
||||
return {
|
||||
accessToken,
|
||||
refreshToken: newRefreshToken,
|
||||
expiresIn: Math.floor(REFRESH_TTL_MS / 1000),
|
||||
};
|
||||
}
|
||||
|
||||
async verifyEmail(userId: string, verificationCode: string): Promise<void> {
|
||||
const codeUpper = verificationCode.toUpperCase();
|
||||
const [record] = await this.db
|
||||
.select()
|
||||
.from(emailVerificationCodes)
|
||||
.where(
|
||||
and(
|
||||
eq(emailVerificationCodes.userId, userId),
|
||||
eq(emailVerificationCodes.code, codeUpper),
|
||||
),
|
||||
)
|
||||
.limit(1);
|
||||
|
||||
if (!record) {
|
||||
throw new AppError(ERROR_CODES.INVALID_CODE, 'Invalid or expired verification code', 400);
|
||||
}
|
||||
|
||||
if (record.expiresAt < new Date()) {
|
||||
await this.db
|
||||
.delete(emailVerificationCodes)
|
||||
.where(eq(emailVerificationCodes.id, record.id));
|
||||
throw new AppError(ERROR_CODES.INVALID_CODE, 'Verification code expired', 400);
|
||||
}
|
||||
|
||||
const [user] = await this.db.select().from(users).where(eq(users.id, userId)).limit(1);
|
||||
|
||||
if (!user) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
|
||||
if (user.emailVerifiedAt) {
|
||||
throw new AppError(ERROR_CODES.ALREADY_VERIFIED, 'Email already verified', 400);
|
||||
}
|
||||
|
||||
await this.db
|
||||
.update(users)
|
||||
.set({ emailVerifiedAt: new Date(), updatedAt: new Date() })
|
||||
.where(eq(users.id, userId));
|
||||
|
||||
await this.db
|
||||
.delete(emailVerificationCodes)
|
||||
.where(eq(emailVerificationCodes.userId, userId));
|
||||
}
|
||||
|
||||
async forgotPassword(email: string): Promise<ForgotPasswordResult> {
|
||||
const [user] = await this.db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.email, email.toLowerCase().trim()))
|
||||
.limit(1);
|
||||
|
||||
if (!user) {
|
||||
return {
|
||||
token: '',
|
||||
expiresAt: new Date(Date.now() + RESET_TOKEN_TTL_MS),
|
||||
};
|
||||
}
|
||||
|
||||
const token = randomBytes(32).toString('hex');
|
||||
const tokenHash = hashToken(token);
|
||||
const expiresAt = new Date(Date.now() + RESET_TOKEN_TTL_MS);
|
||||
|
||||
await this.db.insert(passwordResetTokens).values({
|
||||
userId: user.id,
|
||||
tokenHash,
|
||||
expiresAt,
|
||||
});
|
||||
|
||||
return { token, expiresAt };
|
||||
}
|
||||
|
||||
async resetPassword(token: string, newPassword: string): Promise<void> {
|
||||
const tokenHash = hashToken(token);
|
||||
|
||||
const [record] = await this.db
|
||||
.select()
|
||||
.from(passwordResetTokens)
|
||||
.where(eq(passwordResetTokens.tokenHash, tokenHash))
|
||||
.limit(1);
|
||||
|
||||
if (!record) {
|
||||
throw new AppError(ERROR_CODES.INVALID_RESET_TOKEN, 'Invalid or expired reset token', 400);
|
||||
}
|
||||
|
||||
if (record.expiresAt < new Date()) {
|
||||
await this.db
|
||||
.delete(passwordResetTokens)
|
||||
.where(eq(passwordResetTokens.id, record.id));
|
||||
throw new AppError(ERROR_CODES.INVALID_RESET_TOKEN, 'Reset token expired', 400);
|
||||
}
|
||||
|
||||
const passwordHash = await hashPassword(newPassword);
|
||||
|
||||
await this.db
|
||||
.update(users)
|
||||
.set({ passwordHash, updatedAt: new Date() })
|
||||
.where(eq(users.id, record.userId));
|
||||
|
||||
await this.db
|
||||
.delete(passwordResetTokens)
|
||||
.where(eq(passwordResetTokens.id, record.id));
|
||||
}
|
||||
}
|
||||
@@ -1,237 +0,0 @@
|
||||
import { z } from 'zod';
|
||||
import { createHash } from 'node:crypto';
|
||||
import { env } from '../../config/env.js';
|
||||
import type { Stack, Level, QuestionType } from '../../db/schema/enums.js';
|
||||
|
||||
export interface LlmConfig {
|
||||
baseUrl: string;
|
||||
model: string;
|
||||
fallbackModel?: string;
|
||||
apiKey?: string;
|
||||
timeoutMs: number;
|
||||
temperature: number;
|
||||
maxTokens: number;
|
||||
maxRetries: number;
|
||||
retryDelayMs: number;
|
||||
}
|
||||
|
||||
export interface ChatMessage {
|
||||
role: 'system' | 'user' | 'assistant';
|
||||
content: string;
|
||||
}
|
||||
|
||||
export interface ChatCompletionResponse {
|
||||
choices: Array<{
|
||||
message?: { content: string };
|
||||
text?: string;
|
||||
}>;
|
||||
}
|
||||
|
||||
const QUESTION_TYPES: QuestionType[] = ['single_choice', 'multiple_select', 'true_false', 'short_text'];
|
||||
|
||||
const optionSchema = z.object({
|
||||
key: z.string().min(1),
|
||||
text: z.string().min(1),
|
||||
});
|
||||
|
||||
const generatedQuestionSchema = z.object({
|
||||
questionText: z.string().min(1),
|
||||
type: z.enum(QUESTION_TYPES as [string, ...string[]]),
|
||||
options: z.array(optionSchema).optional(),
|
||||
correctAnswer: z.union([z.string(), z.array(z.string())]),
|
||||
explanation: z.string().min(1),
|
||||
});
|
||||
|
||||
const generateQuestionsResponseSchema = z.object({
|
||||
questions: z.array(generatedQuestionSchema),
|
||||
});
|
||||
|
||||
export type GeneratedQuestion = z.infer<typeof generatedQuestionSchema> & {
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
};
|
||||
|
||||
export interface GenerateQuestionsInput {
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
count: number;
|
||||
types?: QuestionType[];
|
||||
}
|
||||
|
||||
/** Metadata for persisting to question_cache_meta (used by QuestionService) */
|
||||
export interface LlmGenerationMeta {
|
||||
llmModel: string;
|
||||
promptHash: string;
|
||||
generationTimeMs: number;
|
||||
rawResponse: unknown;
|
||||
}
|
||||
|
||||
export interface GenerateQuestionsResult {
|
||||
questions: GeneratedQuestion[];
|
||||
meta: LlmGenerationMeta;
|
||||
}
|
||||
|
||||
export class LlmService {
|
||||
private readonly config: LlmConfig;
|
||||
|
||||
constructor(config?: Partial<LlmConfig>) {
|
||||
this.config = {
|
||||
baseUrl: config?.baseUrl ?? env.LLM_BASE_URL,
|
||||
model: config?.model ?? env.LLM_MODEL,
|
||||
fallbackModel: config?.fallbackModel ?? env.LLM_FALLBACK_MODEL,
|
||||
apiKey: config?.apiKey ?? env.LLM_API_KEY,
|
||||
timeoutMs: config?.timeoutMs ?? env.LLM_TIMEOUT_MS,
|
||||
temperature: config?.temperature ?? env.LLM_TEMPERATURE,
|
||||
maxTokens: config?.maxTokens ?? env.LLM_MAX_TOKENS,
|
||||
maxRetries: config?.maxRetries ?? env.LLM_MAX_RETRIES,
|
||||
retryDelayMs: config?.retryDelayMs ?? env.LLM_RETRY_DELAY_MS,
|
||||
};
|
||||
}
|
||||
|
||||
async chat(messages: ChatMessage[]): Promise<string> {
|
||||
const { content } = await this.chatWithMeta(messages);
|
||||
return content;
|
||||
}
|
||||
|
||||
/** Returns content and model used (for logging to question_cache_meta) */
|
||||
async chatWithMeta(messages: ChatMessage[]): Promise<{ content: string; model: string }> {
|
||||
let lastError: Error | null = null;
|
||||
|
||||
const modelsToTry = [this.config.model];
|
||||
if (this.config.fallbackModel) {
|
||||
modelsToTry.push(this.config.fallbackModel);
|
||||
}
|
||||
|
||||
for (const model of modelsToTry) {
|
||||
for (let attempt = 0; attempt <= this.config.maxRetries; attempt++) {
|
||||
try {
|
||||
const content = await this.executeChat(messages, model);
|
||||
return { content, model };
|
||||
} catch (err) {
|
||||
lastError = err instanceof Error ? err : new Error('LLM request failed');
|
||||
if (attempt < this.config.maxRetries) {
|
||||
const delayMs = this.config.retryDelayMs * Math.pow(2, attempt);
|
||||
await sleep(delayMs);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
throw lastError ?? new Error('LLM request failed');
|
||||
}
|
||||
|
||||
private async executeChat(messages: ChatMessage[], model: string): Promise<string> {
|
||||
const url = `${this.config.baseUrl.replace(/\/$/, '')}/chat/completions`;
|
||||
|
||||
const headers: Record<string, string> = {
|
||||
'Content-Type': 'application/json',
|
||||
};
|
||||
if (this.config.apiKey) {
|
||||
headers['Authorization'] = `Bearer ${this.config.apiKey}`;
|
||||
}
|
||||
|
||||
const body = {
|
||||
model,
|
||||
messages: messages.map((m) => ({ role: m.role, content: m.content })),
|
||||
temperature: this.config.temperature,
|
||||
max_tokens: this.config.maxTokens,
|
||||
};
|
||||
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), this.config.timeoutMs);
|
||||
|
||||
try {
|
||||
const res = await fetch(url, {
|
||||
method: 'POST',
|
||||
headers,
|
||||
body: JSON.stringify(body),
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
clearTimeout(timeoutId);
|
||||
|
||||
if (!res.ok) {
|
||||
const text = await res.text();
|
||||
throw new Error(`LLM request failed: ${res.status} ${res.statusText} - ${text}`);
|
||||
}
|
||||
|
||||
const data = (await res.json()) as ChatCompletionResponse;
|
||||
|
||||
const choice = data.choices?.[0];
|
||||
const content = choice?.message?.content ?? choice?.text ?? '';
|
||||
|
||||
return content.trim();
|
||||
} catch (err) {
|
||||
clearTimeout(timeoutId);
|
||||
if (err instanceof Error) {
|
||||
throw err;
|
||||
}
|
||||
throw new Error('LLM request failed');
|
||||
}
|
||||
}
|
||||
|
||||
async generateQuestions(input: GenerateQuestionsInput): Promise<GenerateQuestionsResult> {
|
||||
const { stack, level, count, types = QUESTION_TYPES } = input;
|
||||
|
||||
const typeList = types.join(', ');
|
||||
const systemPrompt = `You are a technical interview question generator. Generate exactly ${count} programming/tech questions.
|
||||
Return ONLY valid JSON in this exact format (no markdown, no code blocks):
|
||||
{"questions":[{"questionText":"...","type":"single_choice|multiple_select|true_false|short_text","options":[{"key":"a","text":"..."}],"correctAnswer":"a" or ["a","b"],"explanation":"..."}]}
|
||||
Rules: type must be one of: ${typeList}. For single_choice/multiple_select: options array required with key (a,b,c,d). For true_false: options [{"key":"true","text":"True"},{"key":"false","text":"False"}]. For short_text: options omitted, correctAnswer is string.`;
|
||||
|
||||
const userPrompt = `Generate ${count} questions for stack="${stack}", level="${level}". Use types: ${typeList}.`;
|
||||
|
||||
const promptForHash = systemPrompt + '\n---\n' + userPrompt;
|
||||
const promptHash = createHash('sha256').update(promptForHash).digest('hex');
|
||||
|
||||
const start = Date.now();
|
||||
const { content: raw, model } = await this.chatWithMeta([
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{ role: 'user', content: userPrompt },
|
||||
]);
|
||||
const generationTimeMs = Date.now() - start;
|
||||
|
||||
const jsonStr = extractJson(raw);
|
||||
const parsed = JSON.parse(jsonStr) as unknown;
|
||||
|
||||
const result = generateQuestionsResponseSchema.safeParse(parsed);
|
||||
if (!result.success) {
|
||||
throw new Error(`LLM response validation failed: ${result.error.message}`);
|
||||
}
|
||||
|
||||
const questions: GeneratedQuestion[] = result.data.questions.map((q) => ({
|
||||
...q,
|
||||
stack,
|
||||
level,
|
||||
}));
|
||||
|
||||
for (const q of questions) {
|
||||
if ((q.type === 'single_choice' || q.type === 'multiple_select') && (!q.options || q.options.length === 0)) {
|
||||
throw new Error(`Question validation failed: ${q.type} requires options`);
|
||||
}
|
||||
if (q.type === 'true_false' && (!q.options || q.options.length < 2)) {
|
||||
throw new Error(`Question validation failed: true_false requires true/false options`);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
questions,
|
||||
meta: {
|
||||
llmModel: model,
|
||||
promptHash,
|
||||
generationTimeMs,
|
||||
rawResponse: parsed,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function sleep(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
function extractJson(text: string): string {
|
||||
const trimmed = text.trim();
|
||||
const match = trimmed.match(/\{[\s\S]*\}/);
|
||||
return match ? match[0]! : trimmed;
|
||||
}
|
||||
@@ -1,197 +0,0 @@
|
||||
import { eq, and, sql, asc, inArray } from 'drizzle-orm';
|
||||
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||
import type * as schema from '../../db/schema/index.js';
|
||||
import {
|
||||
questionBank,
|
||||
questionCacheMeta,
|
||||
userQuestionLog,
|
||||
} from '../../db/schema/index.js';
|
||||
import { internalError, AppError, ERROR_CODES } from '../../utils/errors.js';
|
||||
import type { Stack, Level, QuestionType } from '../../db/schema/enums.js';
|
||||
import type {
|
||||
GeneratedQuestion,
|
||||
GenerateQuestionsResult,
|
||||
} from '../llm/llm.service.js';
|
||||
|
||||
type Db = NodePgDatabase<typeof schema>;
|
||||
|
||||
export type QuestionForTest = {
|
||||
questionBankId: string;
|
||||
type: QuestionType;
|
||||
questionText: string;
|
||||
options: Array<{ key: string; text: string }> | null;
|
||||
correctAnswer: string | string[];
|
||||
explanation: string;
|
||||
};
|
||||
|
||||
export interface LlmServiceInterface {
|
||||
generateQuestions(input: {
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
count: number;
|
||||
types?: QuestionType[];
|
||||
}): Promise<GenerateQuestionsResult>;
|
||||
}
|
||||
|
||||
function shuffle<T>(arr: T[]): T[] {
|
||||
const result = [...arr];
|
||||
for (let i = result.length - 1; i > 0; i--) {
|
||||
const j = Math.floor(Math.random() * (i + 1));
|
||||
[result[i], result[j]] = [result[j]!, result[i]!];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
export class QuestionService {
|
||||
constructor(
|
||||
private readonly db: Db,
|
||||
private readonly llmService: LlmServiceInterface
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Get questions for a test. Fetches approved questions from question_bank.
|
||||
* If not enough, generates via LLM, persists to question_bank and question_cache_meta.
|
||||
*/
|
||||
async getQuestionsForTest(
|
||||
userId: string,
|
||||
stack: Stack,
|
||||
level: Level,
|
||||
count: number
|
||||
): Promise<QuestionForTest[]> {
|
||||
const approved = await this.db
|
||||
.select({
|
||||
id: questionBank.id,
|
||||
type: questionBank.type,
|
||||
questionText: questionBank.questionText,
|
||||
options: questionBank.options,
|
||||
correctAnswer: questionBank.correctAnswer,
|
||||
explanation: questionBank.explanation,
|
||||
})
|
||||
.from(questionBank)
|
||||
.where(
|
||||
and(eq(questionBank.stack, stack), eq(questionBank.level, level), eq(questionBank.status, 'approved'))
|
||||
)
|
||||
.orderBy(asc(questionBank.usageCount));
|
||||
|
||||
const seenIds = await this.db
|
||||
.select({ questionBankId: userQuestionLog.questionBankId })
|
||||
.from(userQuestionLog)
|
||||
.where(eq(userQuestionLog.userId, userId));
|
||||
|
||||
const seenSet = new Set(seenIds.map((r) => r.questionBankId));
|
||||
const preferred = approved.filter((q) => !seenSet.has(q.id));
|
||||
const pool = preferred.length >= count ? preferred : approved;
|
||||
const shuffled = shuffle(pool);
|
||||
|
||||
const fromBank: QuestionForTest[] = shuffled.slice(0, count).map((q) => ({
|
||||
questionBankId: q.id,
|
||||
type: q.type,
|
||||
questionText: q.questionText,
|
||||
options: q.options,
|
||||
correctAnswer: q.correctAnswer,
|
||||
explanation: q.explanation,
|
||||
}));
|
||||
|
||||
let result = fromBank;
|
||||
|
||||
if (result.length < count) {
|
||||
const generated = await this.generateAndPersistQuestions(
|
||||
stack,
|
||||
level,
|
||||
count - result.length
|
||||
);
|
||||
result = [...result, ...generated];
|
||||
}
|
||||
|
||||
if (result.length < count) {
|
||||
throw new AppError(
|
||||
ERROR_CODES.QUESTIONS_UNAVAILABLE,
|
||||
'Not enough questions available for this stack and level',
|
||||
422
|
||||
);
|
||||
}
|
||||
|
||||
if (result.length > 0) {
|
||||
await this.db.insert(userQuestionLog).values(
|
||||
result.map((q) => ({
|
||||
userId,
|
||||
questionBankId: q.questionBankId,
|
||||
}))
|
||||
);
|
||||
|
||||
const ids = result.map((q) => q.questionBankId);
|
||||
await this.db
|
||||
.update(questionBank)
|
||||
.set({
|
||||
usageCount: sql`${questionBank.usageCount} + 1`,
|
||||
})
|
||||
.where(inArray(questionBank.id, ids));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private async generateAndPersistQuestions(
|
||||
stack: Stack,
|
||||
level: Level,
|
||||
count: number
|
||||
): Promise<QuestionForTest[]> {
|
||||
let generated: GeneratedQuestion[];
|
||||
let meta: GenerateQuestionsResult['meta'];
|
||||
|
||||
try {
|
||||
const result = await this.llmService.generateQuestions({
|
||||
stack,
|
||||
level,
|
||||
count,
|
||||
});
|
||||
generated = result.questions;
|
||||
meta = result.meta;
|
||||
} catch (err) {
|
||||
throw internalError(
|
||||
'Failed to generate questions',
|
||||
err instanceof Error ? err : undefined
|
||||
);
|
||||
}
|
||||
|
||||
const inserted: QuestionForTest[] = [];
|
||||
|
||||
for (const q of generated) {
|
||||
const [row] = await this.db
|
||||
.insert(questionBank)
|
||||
.values({
|
||||
stack,
|
||||
level,
|
||||
type: q.type as QuestionType,
|
||||
questionText: q.questionText,
|
||||
options: q.options ?? null,
|
||||
correctAnswer: q.correctAnswer,
|
||||
explanation: q.explanation,
|
||||
status: 'approved',
|
||||
source: 'llm_generated',
|
||||
})
|
||||
.returning();
|
||||
|
||||
if (row) {
|
||||
await this.db.insert(questionCacheMeta).values({
|
||||
questionBankId: row.id,
|
||||
llmModel: meta.llmModel,
|
||||
promptHash: meta.promptHash,
|
||||
generationTimeMs: meta.generationTimeMs,
|
||||
rawResponse: meta.rawResponse,
|
||||
});
|
||||
|
||||
inserted.push({
|
||||
questionBankId: row.id,
|
||||
type: row.type,
|
||||
questionText: row.questionText,
|
||||
options: row.options,
|
||||
correctAnswer: row.correctAnswer,
|
||||
explanation: row.explanation,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return inserted;
|
||||
}
|
||||
}
|
||||
@@ -1,399 +0,0 @@
|
||||
import { eq, and, desc } from 'drizzle-orm';
|
||||
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||
import type * as schema from '../../db/schema/index.js';
|
||||
import { tests, testQuestions, userStats } from '../../db/schema/index.js';
|
||||
import { notFound, conflict, AppError, ERROR_CODES } from '../../utils/errors.js';
|
||||
import type { Stack, Level, TestMode } from '../../db/schema/enums.js';
|
||||
import type { QuestionService } from '../questions/question.service.js';
|
||||
|
||||
type Db = NodePgDatabase<typeof schema>;
|
||||
|
||||
export type CreateTestInput = {
|
||||
stack: Stack;
|
||||
level: Level;
|
||||
questionCount: number;
|
||||
mode?: TestMode;
|
||||
};
|
||||
|
||||
export type TestSnapshot = {
|
||||
id: string;
|
||||
testId: string;
|
||||
questionBankId: string | null;
|
||||
orderNumber: number;
|
||||
type: string;
|
||||
questionText: string;
|
||||
options: Array<{ key: string; text: string }> | null;
|
||||
correctAnswer: string | string[];
|
||||
explanation: string;
|
||||
userAnswer?: string | string[] | null;
|
||||
isCorrect?: boolean | null;
|
||||
answeredAt?: string | null;
|
||||
};
|
||||
|
||||
export type TestWithQuestions = {
|
||||
id: string;
|
||||
userId: string;
|
||||
stack: string;
|
||||
level: string;
|
||||
questionCount: number;
|
||||
mode: string;
|
||||
status: string;
|
||||
score: number | null;
|
||||
startedAt: string;
|
||||
finishedAt: string | null;
|
||||
timeLimitSeconds: number | null;
|
||||
questions: TestSnapshot[];
|
||||
};
|
||||
|
||||
export class TestsService {
|
||||
constructor(
|
||||
private readonly db: Db,
|
||||
private readonly questionService: QuestionService
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Create a new test: fetch questions, create test record, snapshot questions into test_questions.
|
||||
*/
|
||||
async createTest(userId: string, input: CreateTestInput): Promise<TestWithQuestions> {
|
||||
const { stack, level, questionCount, mode = 'fixed' } = input;
|
||||
|
||||
if (questionCount < 1 || questionCount > 50) {
|
||||
throw new AppError(
|
||||
ERROR_CODES.BAD_REQUEST,
|
||||
'questionCount must be between 1 and 50',
|
||||
400
|
||||
);
|
||||
}
|
||||
|
||||
const questions = await this.questionService.getQuestionsForTest(
|
||||
userId,
|
||||
stack,
|
||||
level,
|
||||
questionCount
|
||||
);
|
||||
|
||||
const [test] = await this.db
|
||||
.insert(tests)
|
||||
.values({
|
||||
userId,
|
||||
stack,
|
||||
level,
|
||||
questionCount,
|
||||
mode,
|
||||
status: 'in_progress',
|
||||
})
|
||||
.returning();
|
||||
|
||||
if (!test) {
|
||||
throw new AppError(
|
||||
ERROR_CODES.INTERNAL_ERROR,
|
||||
'Failed to create test',
|
||||
500
|
||||
);
|
||||
}
|
||||
|
||||
const tqValues = questions.map((q, i) => ({
|
||||
testId: test.id,
|
||||
questionBankId: q.questionBankId,
|
||||
orderNumber: i + 1,
|
||||
type: q.type,
|
||||
questionText: q.questionText,
|
||||
options: q.options,
|
||||
correctAnswer: q.correctAnswer,
|
||||
explanation: q.explanation,
|
||||
}));
|
||||
|
||||
await this.db.insert(testQuestions).values(tqValues);
|
||||
|
||||
const questionsRows = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(eq(testQuestions.testId, test.id))
|
||||
.orderBy(testQuestions.orderNumber);
|
||||
|
||||
return this.toTestWithQuestions(test, questionsRows);
|
||||
}
|
||||
|
||||
/**
|
||||
* Submit an answer for a question in an in-progress test.
|
||||
*/
|
||||
async answerQuestion(
|
||||
userId: string,
|
||||
testId: string,
|
||||
testQuestionId: string,
|
||||
userAnswer: string | string[]
|
||||
): Promise<TestSnapshot> {
|
||||
const [test] = await this.db
|
||||
.select()
|
||||
.from(tests)
|
||||
.where(and(eq(tests.id, testId), eq(tests.userId, userId)))
|
||||
.limit(1);
|
||||
|
||||
if (!test) {
|
||||
throw notFound('Test not found');
|
||||
}
|
||||
if (test.status !== 'in_progress') {
|
||||
throw conflict(ERROR_CODES.TEST_ALREADY_FINISHED, 'Test is already finished');
|
||||
}
|
||||
|
||||
const [tq] = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(
|
||||
and(
|
||||
eq(testQuestions.id, testQuestionId),
|
||||
eq(testQuestions.testId, testId)
|
||||
)
|
||||
)
|
||||
.limit(1);
|
||||
|
||||
if (!tq) {
|
||||
throw conflict(ERROR_CODES.WRONG_QUESTION, 'Question does not belong to this test');
|
||||
}
|
||||
if (tq.userAnswer !== null && tq.userAnswer !== undefined) {
|
||||
throw conflict(ERROR_CODES.QUESTION_ALREADY_ANSWERED, 'Question already answered');
|
||||
}
|
||||
|
||||
const isCorrect = this.checkAnswer(tq.correctAnswer, userAnswer);
|
||||
|
||||
const [updated] = await this.db
|
||||
.update(testQuestions)
|
||||
.set({
|
||||
userAnswer,
|
||||
isCorrect,
|
||||
answeredAt: new Date(),
|
||||
})
|
||||
.where(eq(testQuestions.id, testQuestionId))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
throw notFound('Question not found');
|
||||
}
|
||||
|
||||
return {
|
||||
id: updated.id,
|
||||
testId: updated.testId,
|
||||
questionBankId: updated.questionBankId,
|
||||
orderNumber: updated.orderNumber,
|
||||
type: updated.type,
|
||||
questionText: updated.questionText,
|
||||
options: updated.options,
|
||||
correctAnswer: updated.correctAnswer,
|
||||
explanation: updated.explanation,
|
||||
userAnswer: updated.userAnswer,
|
||||
isCorrect: updated.isCorrect,
|
||||
answeredAt: updated.answeredAt?.toISOString() ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
private checkAnswer(
|
||||
correct: string | string[],
|
||||
user: string | string[]
|
||||
): boolean {
|
||||
if (Array.isArray(correct) && Array.isArray(user)) {
|
||||
if (correct.length !== user.length) return false;
|
||||
const a = [...correct].sort();
|
||||
const b = [...user].sort();
|
||||
return a.every((v, i) => v === b[i]);
|
||||
}
|
||||
if (typeof correct === 'string' && typeof user === 'string') {
|
||||
return correct.trim().toLowerCase() === user.trim().toLowerCase();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finish a test: calculate score, update user_stats.
|
||||
*/
|
||||
async finishTest(userId: string, testId: string): Promise<TestWithQuestions> {
|
||||
const [test] = await this.db
|
||||
.select()
|
||||
.from(tests)
|
||||
.where(and(eq(tests.id, testId), eq(tests.userId, userId)))
|
||||
.limit(1);
|
||||
|
||||
if (!test) {
|
||||
throw notFound('Test not found');
|
||||
}
|
||||
if (test.status !== 'in_progress') {
|
||||
throw conflict(ERROR_CODES.TEST_ALREADY_FINISHED, 'Test is already finished');
|
||||
}
|
||||
|
||||
const questions = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(eq(testQuestions.testId, testId));
|
||||
|
||||
const unanswered = questions.filter(
|
||||
(q) => q.userAnswer === null || q.userAnswer === undefined
|
||||
);
|
||||
if (unanswered.length > 0) {
|
||||
throw new AppError(
|
||||
ERROR_CODES.NO_ANSWERS,
|
||||
`Cannot finish: ${unanswered.length} question(s) not answered`,
|
||||
422
|
||||
);
|
||||
}
|
||||
|
||||
const correctCount = questions.filter((q) => q.isCorrect === true).length;
|
||||
const score = Math.round((correctCount / questions.length) * 100);
|
||||
|
||||
const [updatedTest] = await this.db
|
||||
.update(tests)
|
||||
.set({
|
||||
status: 'completed',
|
||||
score,
|
||||
finishedAt: new Date(),
|
||||
})
|
||||
.where(eq(tests.id, testId))
|
||||
.returning();
|
||||
|
||||
if (!updatedTest) {
|
||||
throw notFound('Test not found');
|
||||
}
|
||||
|
||||
await this.upsertUserStats(userId, test.stack as Stack, test.level as Level, {
|
||||
totalQuestions: questions.length,
|
||||
correctAnswers: correctCount,
|
||||
testsTaken: 1,
|
||||
});
|
||||
|
||||
const questionsRows = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(eq(testQuestions.testId, testId))
|
||||
.orderBy(testQuestions.orderNumber);
|
||||
|
||||
return this.toTestWithQuestions(updatedTest, questionsRows);
|
||||
}
|
||||
|
||||
private async upsertUserStats(
|
||||
userId: string,
|
||||
stack: Stack,
|
||||
level: Level,
|
||||
delta: { totalQuestions: number; correctAnswers: number; testsTaken: number }
|
||||
): Promise<void> {
|
||||
const [existing] = await this.db
|
||||
.select()
|
||||
.from(userStats)
|
||||
.where(
|
||||
and(
|
||||
eq(userStats.userId, userId),
|
||||
eq(userStats.stack, stack),
|
||||
eq(userStats.level, level)
|
||||
)
|
||||
)
|
||||
.limit(1);
|
||||
|
||||
const now = new Date();
|
||||
|
||||
if (existing) {
|
||||
await this.db
|
||||
.update(userStats)
|
||||
.set({
|
||||
totalQuestions: existing.totalQuestions + delta.totalQuestions,
|
||||
correctAnswers: existing.correctAnswers + delta.correctAnswers,
|
||||
testsTaken: existing.testsTaken + delta.testsTaken,
|
||||
lastTestAt: now,
|
||||
})
|
||||
.where(eq(userStats.id, existing.id));
|
||||
} else {
|
||||
await this.db.insert(userStats).values({
|
||||
userId,
|
||||
stack,
|
||||
level,
|
||||
totalQuestions: delta.totalQuestions,
|
||||
correctAnswers: delta.correctAnswers,
|
||||
testsTaken: delta.testsTaken,
|
||||
lastTestAt: now,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a single test by ID (must belong to user).
|
||||
*/
|
||||
async getById(userId: string, testId: string): Promise<TestWithQuestions | null> {
|
||||
const [test] = await this.db
|
||||
.select()
|
||||
.from(tests)
|
||||
.where(and(eq(tests.id, testId), eq(tests.userId, userId)))
|
||||
.limit(1);
|
||||
|
||||
if (!test) return null;
|
||||
|
||||
const questionsRows = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(eq(testQuestions.testId, testId))
|
||||
.orderBy(testQuestions.orderNumber);
|
||||
|
||||
return this.toTestWithQuestions(test, questionsRows);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get test history for a user (most recent first).
|
||||
*/
|
||||
async getHistory(
|
||||
userId: string,
|
||||
options?: { limit?: number; offset?: number }
|
||||
): Promise<{ tests: TestWithQuestions[]; total: number }> {
|
||||
const limit = Math.min(options?.limit ?? 20, 100);
|
||||
const offset = options?.offset ?? 0;
|
||||
|
||||
const all = await this.db
|
||||
.select()
|
||||
.from(tests)
|
||||
.where(eq(tests.userId, userId))
|
||||
.orderBy(desc(tests.startedAt));
|
||||
|
||||
const total = all.length;
|
||||
const page = all.slice(offset, offset + limit);
|
||||
|
||||
const result: TestWithQuestions[] = [];
|
||||
|
||||
for (const test of page) {
|
||||
const questionsRows = await this.db
|
||||
.select()
|
||||
.from(testQuestions)
|
||||
.where(eq(testQuestions.testId, test.id))
|
||||
.orderBy(testQuestions.orderNumber);
|
||||
result.push(this.toTestWithQuestions(test, questionsRows));
|
||||
}
|
||||
|
||||
return { tests: result, total };
|
||||
}
|
||||
|
||||
private toTestWithQuestions(
|
||||
test: (typeof tests.$inferSelect),
|
||||
questionsRows: (typeof testQuestions.$inferSelect)[]
|
||||
): TestWithQuestions {
|
||||
return {
|
||||
id: test.id,
|
||||
userId: test.userId,
|
||||
stack: test.stack,
|
||||
level: test.level,
|
||||
questionCount: test.questionCount,
|
||||
mode: test.mode,
|
||||
status: test.status,
|
||||
score: test.score,
|
||||
startedAt: test.startedAt.toISOString(),
|
||||
finishedAt: test.finishedAt?.toISOString() ?? null,
|
||||
timeLimitSeconds: test.timeLimitSeconds,
|
||||
questions: questionsRows.map((q) => ({
|
||||
id: q.id,
|
||||
testId: q.testId,
|
||||
questionBankId: q.questionBankId,
|
||||
orderNumber: q.orderNumber,
|
||||
type: q.type,
|
||||
questionText: q.questionText,
|
||||
options: q.options,
|
||||
correctAnswer: q.correctAnswer,
|
||||
explanation: q.explanation,
|
||||
userAnswer: q.userAnswer,
|
||||
isCorrect: q.isCorrect,
|
||||
answeredAt: q.answeredAt?.toISOString() ?? null,
|
||||
})),
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,175 +0,0 @@
|
||||
import { eq } from 'drizzle-orm';
|
||||
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||
import type * as schema from '../../db/schema/index.js';
|
||||
import { users, userStats } from '../../db/schema/index.js';
|
||||
import { notFound, conflict, ERROR_CODES } from '../../utils/errors.js';
|
||||
import type { User } from '../../db/schema/users.js';
|
||||
import type { SelfLevel } from '../../db/schema/index.js';
|
||||
|
||||
type Db = NodePgDatabase<typeof schema>;
|
||||
|
||||
export type UserStatItem = {
|
||||
stack: string;
|
||||
level: string;
|
||||
totalQuestions: number;
|
||||
correctAnswers: number;
|
||||
testsTaken: number;
|
||||
lastTestAt: string | null;
|
||||
};
|
||||
|
||||
export type ProfileStats = {
|
||||
byStack: UserStatItem[];
|
||||
totalTestsTaken: number;
|
||||
totalQuestions: number;
|
||||
correctAnswers: number;
|
||||
accuracy: number | null;
|
||||
};
|
||||
|
||||
export type ProfileUpdateInput = {
|
||||
nickname?: string;
|
||||
avatarUrl?: string | null;
|
||||
country?: string | null;
|
||||
city?: string | null;
|
||||
selfLevel?: SelfLevel | null;
|
||||
isPublic?: boolean;
|
||||
};
|
||||
|
||||
export type PublicProfile = {
|
||||
id: string;
|
||||
nickname: string;
|
||||
avatarUrl: string | null;
|
||||
country: string | null;
|
||||
city: string | null;
|
||||
selfLevel: string | null;
|
||||
isPublic: boolean;
|
||||
stats: ProfileStats;
|
||||
};
|
||||
|
||||
export type PrivateProfile = PublicProfile & {
|
||||
email: string;
|
||||
emailVerifiedAt: string | null;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
};
|
||||
|
||||
async function getStatsForUser(db: Db, userId: string): Promise<ProfileStats> {
|
||||
const rows = await db
|
||||
.select()
|
||||
.from(userStats)
|
||||
.where(eq(userStats.userId, userId));
|
||||
|
||||
const byStack: UserStatItem[] = rows.map((r) => ({
|
||||
stack: r.stack,
|
||||
level: r.level,
|
||||
totalQuestions: r.totalQuestions,
|
||||
correctAnswers: r.correctAnswers,
|
||||
testsTaken: r.testsTaken,
|
||||
lastTestAt: r.lastTestAt?.toISOString() ?? null,
|
||||
}));
|
||||
|
||||
const totalTestsTaken = rows.reduce((sum, r) => sum + r.testsTaken, 0);
|
||||
const totalQuestions = rows.reduce((sum, r) => sum + r.totalQuestions, 0);
|
||||
const correctAnswers = rows.reduce((sum, r) => sum + r.correctAnswers, 0);
|
||||
const accuracy = totalQuestions > 0 ? correctAnswers / totalQuestions : null;
|
||||
|
||||
return { byStack, totalTestsTaken, totalQuestions, correctAnswers, accuracy };
|
||||
}
|
||||
|
||||
function toPublicProfile(user: User, stats: ProfileStats): PublicProfile {
|
||||
return {
|
||||
id: user.id,
|
||||
nickname: user.nickname,
|
||||
avatarUrl: user.avatarUrl,
|
||||
country: user.country,
|
||||
city: user.city,
|
||||
selfLevel: user.selfLevel,
|
||||
isPublic: user.isPublic,
|
||||
stats,
|
||||
};
|
||||
}
|
||||
|
||||
function toPrivateProfile(user: User, stats: ProfileStats): PrivateProfile {
|
||||
return {
|
||||
...toPublicProfile(user, stats),
|
||||
email: user.email,
|
||||
emailVerifiedAt: user.emailVerifiedAt?.toISOString() ?? null,
|
||||
createdAt: user.createdAt.toISOString(),
|
||||
updatedAt: user.updatedAt.toISOString(),
|
||||
};
|
||||
}
|
||||
|
||||
export class UserService {
|
||||
constructor(private readonly db: Db) {}
|
||||
|
||||
async getById(userId: string): Promise<User | null> {
|
||||
const [user] = await this.db.select().from(users).where(eq(users.id, userId)).limit(1);
|
||||
return user ?? null;
|
||||
}
|
||||
|
||||
async getByNickname(nickname: string): Promise<User | null> {
|
||||
const [user] = await this.db
|
||||
.select()
|
||||
.from(users)
|
||||
.where(eq(users.nickname, nickname.trim()))
|
||||
.limit(1);
|
||||
return user ?? null;
|
||||
}
|
||||
|
||||
async getPrivateProfile(userId: string): Promise<PrivateProfile> {
|
||||
const [user, stats] = await Promise.all([this.getById(userId), getStatsForUser(this.db, userId)]);
|
||||
if (!user) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
return toPrivateProfile(user, stats);
|
||||
}
|
||||
|
||||
async getPublicProfile(username: string): Promise<PublicProfile> {
|
||||
const user = await this.getByNickname(username);
|
||||
if (!user) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
if (!user.isPublic) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
const stats = await getStatsForUser(this.db, user.id);
|
||||
return toPublicProfile(user, stats);
|
||||
}
|
||||
|
||||
async updateProfile(userId: string, input: ProfileUpdateInput): Promise<PrivateProfile> {
|
||||
const updateData: Partial<typeof users.$inferInsert> = {
|
||||
updatedAt: new Date(),
|
||||
};
|
||||
|
||||
if (input.nickname !== undefined) {
|
||||
const trimmed = input.nickname.trim();
|
||||
const [existing] = await this.db
|
||||
.select({ id: users.id })
|
||||
.from(users)
|
||||
.where(eq(users.nickname, trimmed))
|
||||
.limit(1);
|
||||
|
||||
if (existing && existing.id !== userId) {
|
||||
throw conflict(ERROR_CODES.NICKNAME_TAKEN, 'Nickname already taken');
|
||||
}
|
||||
updateData.nickname = trimmed;
|
||||
}
|
||||
if (input.avatarUrl !== undefined) updateData.avatarUrl = input.avatarUrl;
|
||||
if (input.country !== undefined) updateData.country = input.country;
|
||||
if (input.city !== undefined) updateData.city = input.city;
|
||||
if (input.selfLevel !== undefined) updateData.selfLevel = input.selfLevel;
|
||||
if (input.isPublic !== undefined) updateData.isPublic = input.isPublic;
|
||||
|
||||
const [updated] = await this.db
|
||||
.update(users)
|
||||
.set(updateData)
|
||||
.where(eq(users.id, userId))
|
||||
.returning();
|
||||
|
||||
if (!updated) {
|
||||
throw notFound('User not found');
|
||||
}
|
||||
|
||||
const stats = await getStatsForUser(this.db, userId);
|
||||
return toPrivateProfile(updated, stats);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
import { createHash } from 'node:crypto';
|
||||
import * as jose from 'jose';
|
||||
import { env } from '../config/env.js';
|
||||
|
||||
export function hashToken(token: string): string {
|
||||
return createHash('sha256').update(token).digest('hex');
|
||||
}
|
||||
|
||||
export interface AccessPayload {
|
||||
sub: string;
|
||||
email: string;
|
||||
type: 'access';
|
||||
}
|
||||
|
||||
export interface RefreshPayload {
|
||||
sub: string;
|
||||
sid: string;
|
||||
type: 'refresh';
|
||||
}
|
||||
|
||||
type JwtPayload = AccessPayload | RefreshPayload;
|
||||
|
||||
const secret = new TextEncoder().encode(env.JWT_SECRET);
|
||||
|
||||
export async function signAccessToken(payload: Omit<AccessPayload, 'type'>): Promise<string> {
|
||||
return new jose.SignJWT({ ...payload, type: 'access' })
|
||||
.setProtectedHeader({ alg: 'HS256' })
|
||||
.setIssuedAt()
|
||||
.setExpirationTime(env.JWT_ACCESS_TTL)
|
||||
.sign(secret);
|
||||
}
|
||||
|
||||
export async function signRefreshToken(payload: Omit<RefreshPayload, 'type'>): Promise<string> {
|
||||
return new jose.SignJWT({ ...payload, type: 'refresh' })
|
||||
.setProtectedHeader({ alg: 'HS256' })
|
||||
.setIssuedAt()
|
||||
.setExpirationTime(env.JWT_REFRESH_TTL)
|
||||
.sign(secret);
|
||||
}
|
||||
|
||||
export async function verifyToken(token: string): Promise<JwtPayload> {
|
||||
const { payload } = await jose.jwtVerify(token, secret);
|
||||
return payload as unknown as JwtPayload;
|
||||
}
|
||||
|
||||
export function isAccessPayload(p: JwtPayload): p is AccessPayload {
|
||||
return p.type === 'access';
|
||||
}
|
||||
|
||||
export function isRefreshPayload(p: JwtPayload): p is RefreshPayload {
|
||||
return p.type === 'refresh';
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
import * as argon2 from 'argon2';
|
||||
|
||||
const HASH_OPTIONS: argon2.Options = {
|
||||
type: argon2.argon2id,
|
||||
memoryCost: 19456,
|
||||
timeCost: 2,
|
||||
};
|
||||
|
||||
export async function hashPassword(plain: string): Promise<string> {
|
||||
return argon2.hash(plain, HASH_OPTIONS);
|
||||
}
|
||||
|
||||
export async function verifyPassword(hash: string, plain: string): Promise<boolean> {
|
||||
return argon2.verify(hash, plain);
|
||||
}
|
||||
Reference in New Issue
Block a user