forked from mtusi2026/mtusi2026lab2
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61775836db | ||
|
|
12a3496bc6 |
+5
-11
@@ -1,11 +1,5 @@
|
||||
# Copy to .env for your LOCAL synthetic test environment; never commit .env.
|
||||
# These are logical interface suggestions; map actual framework names in REPORT.md.
|
||||
APP_HOST=0.0.0.0
|
||||
APP_PORT=8080
|
||||
APP_ENV=lab
|
||||
SESSION_TTL_SECONDS=3600
|
||||
# Choose credentials locally. File paths contain no secret values.
|
||||
DATABASE_URL_FILE=/run/secrets/database_url
|
||||
# Optional on 3, required use on 4 in lab2; Redis OR Valkey:
|
||||
SESSION_STORE=postgres
|
||||
CACHE_URL_FILE=/run/secrets/cache_url
|
||||
POSTGRES_DB=messenger
|
||||
POSTGRES_USER=postgres
|
||||
POSTGRES_PASSWORD=postgres
|
||||
PORT=8080
|
||||
SESSION_TTL_SECONDS=3600
|
||||
@@ -30,3 +30,4 @@ coverage/
|
||||
.vscode/
|
||||
# Keep small, sanitized evidence summaries in evidence/ under version control.
|
||||
# Inspect git diff --cached: ignore rules are not a secret scanner.
|
||||
dependency-reduced-pom.xml
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
FROM maven:3.9.9-eclipse-temurin-21 AS builder
|
||||
WORKDIR /build
|
||||
COPY pom.xml .
|
||||
RUN mvn dependency:go-offline -B
|
||||
COPY src ./src
|
||||
RUN mvn clean package -DskipTests
|
||||
|
||||
FROM eclipse-temurin:21-jre
|
||||
WORKDIR /app
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends wget && rm -rf /var/lib/apt/lists/*
|
||||
COPY --from=builder /build/target/messenger-lab1-1.0.0.jar app.jar
|
||||
ENV PORT=8080
|
||||
EXPOSE 8080
|
||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=15s --retries=5 CMD wget -q --spider http://localhost:8080/health/ready || exit 1
|
||||
ENTRYPOINT ["java", "-jar", "app.jar"]
|
||||
@@ -1,8 +0,0 @@
|
||||
# Teaching outline, not a runnable Dockerfile. Implement your own Dockerfile.
|
||||
# 1. Choose a runtime/toolchain version and pin the base image tag/digest.
|
||||
# 2. Copy dependency manifests first; install from the language lockfile.
|
||||
# 3. Copy source and build. For compiled languages use a separate runtime stage.
|
||||
# 4. Run the HTTP process as PID 1; listen on 0.0.0.0:8080.
|
||||
# 5. Add non-root, signals and healthcheck according to the current rubric.
|
||||
# 6. Pass runtime config/secrets at startup, never COPY .env or secret files.
|
||||
# This file deliberately has no FROM/CMD: selecting/implementing them is the task.
|
||||
@@ -1,37 +1,77 @@
|
||||
# Отчёт — лабораторная 2
|
||||
|
||||
- Автор, группа: TODO
|
||||
- Целевая оценка; выбранный трек 5, если нужен: TODO
|
||||
- Commit/PR: TODO после публикации
|
||||
- Использованные источники, библиотеки и помощь ИИ: TODO
|
||||
- Автор, группа: Гилим А.Р., БПИ2302
|
||||
- Целевая оценка: 3
|
||||
- Commit/PR: https://gitea.privcloud.tech/mtusi2026/mtusi2026lab2/pulls/172
|
||||
- Использованные источники, библиотеки и помощь ИИ: README курса, `contracts/openapi.json`, `contracts/README.md`, документация Flyway 10, PostgreSQL JDBC 42.7.3, Javalin 6, Spring Security Crypto. ИИ использовался для отладки сборки, Jackson/Flyway и PowerShell-синтаксиса; код проверен запуском smoke и persistence-тестов.
|
||||
|
||||
## Запуск из чистого clone
|
||||
|
||||
TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных.
|
||||
|
||||
Требования: Docker Desktop с WSL 2 (для persistence-теста), Python 3.9+ (для публичных тестов), `make` (опционально; тесты можно запускать напрямую через `python3 tests/...`).
|
||||
```sh
|
||||
git clone https://gitea.privcloud.tech/altng/mtusi2026lab2.git
|
||||
cd mtusi2026lab2
|
||||
cp .env.example .env # локальные значения; .env в .gitignore
|
||||
docker compose --env-file .env up -d --build
|
||||
# дождаться готовности:
|
||||
curl http://localhost:8080/health/ready # {"status":"ok"}
|
||||
make test
|
||||
make test-persistence ACTION_SCRIPT=scripts/restart.sh
|
||||
```
|
||||
## Архитектура и решения
|
||||
|
||||
TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab1, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации.
|
||||
Схема процессов: Клиент → Javalin API (порт 8080) → PostgreSQL 16 (порт 5432 внутри compose, 15432 наружу на 127.0.0.1). Redis/Valkey не используется — это уровень 4, не заявлен.
|
||||
|
||||
Источник истины: PostgreSQL. Таблицы users, chats, chat_members, messages, sessions (см. src/main/resources/db/migration/V1__initial_schema.sql). Первичные ключи UUID DEFAULT gen_random_uuid(), внешние ключи с ON DELETE CASCADE, UNIQUE на users.username, индексы idx_messages_chat_created, idx_chat_members_user, idx_sessions_expires.
|
||||
|
||||
Миграции: Flyway 10.10.0, classpath:db/migration, применяются при старте API до открытия порта. Повторный запуск идемпотентен благодаря flyway_schema_history. Ручной applyMigrations() из lab1 удалён, чтобы не было двух источников схемы.
|
||||
|
||||
Сессии: opaque Bearer-токен (64 hex-символа), хранится в таблице sessions с expires_at. TTL — из SESSION_TTL_SECONDS (по умолчанию 3600). getUserByToken проверяет expires_at > NOW(). Logout — DELETE FROM sessions WHERE token = ?; повторный logout с тем же токеном → 401 (проверяется getUserByToken до удаления). Активные сессии переживают рестарт API и БД, потому что лежат в PostgreSQL на named volume pgdata.
|
||||
|
||||
Аутентификация: POST /api/v1/auth/sessions принимает Basic (username:password), сверяет BCrypt-хеш, выдаёт токен. Остальные эндпоинты требуют Authorization: Bearer <token>. X-User-Id игнорируется. Basic на защищённых эндпоинтах → 401 с WWW-Authenticate: Bearer.
|
||||
|
||||
Транзакционные границы: createChat — одна транзакция: проверка всех member_ids (SELECT 1 FROM users WHERE id = ?), INSERT INTO chats ... RETURNING, INSERT INTO chat_members батчем, COMMIT. При любой ошибке (включая IllegalArgumentException на несуществующем участнике) — rollback(), в БД не остаётся ни чата, ни членства. Остальные операции — одиночные INSERT/SELECT/UPDATE, атомарны по себе.
|
||||
|
||||
Соответствие .env.example и compose.yaml: POSTGRES_DB, POSTGRES_USER, POSTGRES_PASSWORD пробрасываются в db и в DATABASE_URL/DATABASE_USER/DATABASE_PASSWORD для API; PORT — порт API; SESSION_TTL_SECONDS — TTL сессии в PostgresStore.createSession. Значений по умолчанию в compose.yaml достаточно для локального запуска; .env переопределяет.
|
||||
|
||||
Что перенесено из lab1: модели User, Chat, Message, CursorResponse, эндпоинты POST /users, GET /users/me, GET/POST /chats, GET/POST /chats/{id}/messages, keyset-пагинация.
|
||||
|
||||
Что изменено: добавлены password в регистрацию и BCrypt-KDF; добавлен POST /auth/sessions (Basic → Bearer); все бизнес-эндпоинты переведены с X-User-Id на Bearer; добавлена таблица sessions и TTL/отзыв; состояние перенесено в PostgreSQL через Flyway-миграции.
|
||||
|
||||
## Доказательства критериев
|
||||
|
||||
| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства |
|
||||
| --- | --- | --- | --- |
|
||||
| Публичный smoke | make test | TODO | TODO |
|
||||
| Остальные пункты уровня 3 | TODO | TODO | TODO |
|
||||
| Все пункты уровня 4, если заявлен | TODO | TODO | TODO |
|
||||
| Выбранный трек 5, если заявлен | TODO | TODO | TODO |
|
||||
|
||||
TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены.
|
||||
| Публичный smoke | make test | PASS: lab2 public API scenario; infrastructure and grading evidence remain separate. | evidence/smoke.txt |
|
||||
| Данные и активные сессии переживают рестарт API и БД | make test-persistence ACTION_SCRIPT=scripts/restart.sh (из WSL) | PASS: persistence preserved confirmed data and existing session. | evidence/persistence.txt |
|
||||
| PostgreSQL содержит users/chats/members/messages, PK/FK, уникальность username | V1__initial_schema.sql + \d+ users в psql | схема с PRIMARY KEY, REFERENCES, UNIQUE(username) | src/main/resources/db/migration/V1__initial_schema.sql |
|
||||
| Миграции с нуля и повторно без дублей | docker compose down -v && docker compose --env-file .env up -d, затем ещё раз up -d | Flyway: Successfully applied 1 migration, второй раз Schema "public" is up to date | evidence/flyway.txt |
|
||||
| Составная операция создания чата атомарна | POST /chats с несуществующим member_id → 400, затем SELECT count(*) FROM chats | в chats нет новой записи (rollback) | evidence/rollback.txt |
|
||||
| Basic только на POST /auth/sessions, остальное Bearer | smoke: Basic на /users/me → 401; X-User-Id на /users/me → 401; Bearer + чужой X-User-Id → возвращается владелец Bearer | PASS в smoke | evidence/smoke.txt |
|
||||
| Срок жизни сессии, logout, отзыв | expires_at в ответе > now; DELETE /auth/sessions/current → 204, повторный → 401 | PASS в smoke | evidence/smoke.txt |
|
||||
| Пароли хешируются KDF| SELECT password_hash FROM users | начинается с $2a$10$ (BCrypt) | evidence/bcrypt.txt |
|
||||
| X-User-Id не даёт доступ| smoke: GET /users/me с X-User-Id без Bearer → 401 | PASS в smoke | evidence/smoke.txt |
|
||||
| make check (offline-структура)| make check | PASS: offline skeleton structure, local refs and Python syntax; application NOT tested. | evidence/check.txt |
|
||||
| Secrets и volumes не в Git| git status | .env не отслеживается, pgdata — named volume | .gitignore |
|
||||
|
||||
## Эксперименты и отказы
|
||||
|
||||
TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения.
|
||||
|
||||
| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных |
|
||||
| --- | --- | --- | --- |
|
||||
| TODO | TODO | TODO | TODO |
|
||||
| docker compose --env-file .env restart (API + PostgreSQL, volumes сохранены) через scripts/restart.sh | Тот же Bearer-токен работает; подтверждённые сообщения и чат на месте; сессия не инвалидируется | PASS: persistence preserved confirmed data and existing session; /health/ready → {"status":"ok"} | Восстановление ≈ 10–15 с; потерь данных не |
|
||||
|
||||
## Ограничения и следующие шаги
|
||||
|
||||
TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза.
|
||||
Redis/Valkey не используется: сессии хранятся в PostgreSQL, TTL работает, но нет кэша и нет сценария «Redis недоступен».
|
||||
|
||||
Нагрузочное тестирование (tests/load.py), EXPLAIN (ANALYZE, BUFFERS) на ≥10 000 сообщений, failover между репликами API — не выполнялись, это уровень 4/5.
|
||||
|
||||
createChat делает N+1 SELECT на каждого участника; для «3» допустимо, для «4» нужно заменить на один SELECT ... WHERE id = ANY(?).
|
||||
|
||||
getChats делает N+1 SELECT участников на каждый чат; для «3» допустимо.
|
||||
|
||||
FAIL_ON_UNKNOWN_PROPERTIES в ObjectMapper оставлен выключенным, чтобы клиенты могли присылать дополнительные поля; контракт additionalProperties: false на запросах строго не проверяется.
|
||||
|
||||
Учебное упрощение: пароль хранится как BCrypt-хеш, но нет rate limiting на POST /auth/sessions (код rate_limited в контракте есть, реализация не требуется уровнем «3»).
|
||||
|
||||
Подтверждено: persistence после рестарта API+БД, атомарность createChat, отзыв сессии, игнорирование X-User-Id. Гипотеза, не проверенная: поведение при недоступности БД во время запроса (частично покрыто /health/ready с SELECT 1 → 503, но сквозной сценарий не прогонялся).
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
# Topology worksheet, deliberately NOT a runnable stack (no application supplied).
|
||||
# Implement compose.yaml or stack.yaml; do not submit this empty file as deployment.
|
||||
# Service names below are logical roles, not imposed container names.
|
||||
x-lab-number: 2
|
||||
x-required-roles:
|
||||
- api
|
||||
- postgres
|
||||
# TODO: implement real images/builds, network wiring, volumes, healthchecks,
|
||||
# credentials and bootstrap. Details: contracts/infrastructure.json and README.md.
|
||||
services: {}
|
||||
@@ -0,0 +1,45 @@
|
||||
services:
|
||||
db:
|
||||
image: postgres:16-alpine
|
||||
container_name: mtusi-lab2-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB:-messenger}
|
||||
POSTGRES_USER: ${POSTGRES_USER:-postgres}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
|
||||
ports:
|
||||
- "127.0.0.1:15432:5432"
|
||||
volumes:
|
||||
- pgdata:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-messenger}"]
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 5
|
||||
|
||||
api:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
container_name: mtusi-lab2-api
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
PORT: ${PORT:-8080}
|
||||
DATABASE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB:-messenger}
|
||||
DATABASE_USER: ${POSTGRES_USER:-postgres}
|
||||
DATABASE_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
|
||||
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
|
||||
ports:
|
||||
- "127.0.0.1:8080:8080"
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "-q", "--spider", "http://localhost:8080/health/ready"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
start_period: 30s
|
||||
retries: 5
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
@@ -0,0 +1,9 @@
|
||||
username | hash_prefix
|
||||
----------------------+-------------
|
||||
testuser6 | $2a$10$
|
||||
u_alice_6fed3ed07992 | $2a$10$
|
||||
testuser8 | $2a$10$
|
||||
u_alice_25dca387d520 | $2a$10$
|
||||
u_bob_a13c39c7d441 | $2a$10$
|
||||
(5 rows)
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
python3 scripts/check_contract.py
|
||||
PASS: offline skeleton structure, local refs and Python syntax; application NOT tested.
|
||||
@@ -0,0 +1,8 @@
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.FlywayExecutor - Database: jdbc:postgresql://db:5432/messenger (PostgreSQL 16.14)
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbValidate - Successfully validated 1 migration (execution time 00:00.022s)
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbMigrate - Current version of schema "public": 1
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbMigrate - Schema "public" is up to date. No migration necessary.
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.FlywayExecutor - Database: jdbc:postgresql://db:5432/messenger (PostgreSQL 16.14)
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbValidate - Successfully validated 1 migration (execution time 00:00.027s)
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbMigrate - Current version of schema "public": 1
|
||||
mtusi-lab2-api | [main] INFO org.flywaydb.core.internal.command.DbMigrate - Schema "public" is up to date. No migration necessary.
|
||||
@@ -0,0 +1,3 @@
|
||||
python3 tests/resilience.py --mode persistence --action-script "scripts/restart.sh" --base-url "http://localhost:8080"
|
||||
Executing explicit persistence hook; hook output suppressed to avoid leaking secrets.
|
||||
PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence.
|
||||
@@ -0,0 +1,14 @@
|
||||
=== POST /chats with unknown member_id ===
|
||||
HTTP/1.1 400 Bad Request
|
||||
Date: Thu, 12 Nov 2026 14:37:22 GMT
|
||||
Content-Type: application/json
|
||||
X-Request-Id: 47ee4821-3dfc-41ec-a9d2-2cf2fc9d6610
|
||||
Content-Length: 116
|
||||
|
||||
{"error":{"code":"invalid_request","message":"invalid_request","request_id":"47ee4821-3dfc-41ec-a9d2-2cf2fc9d6610"}}
|
||||
=== count(chats where title='rollback_probe') ===
|
||||
count
|
||||
-------
|
||||
0
|
||||
(1 row)
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
python3 tests/smoke.py --base-url "http://localhost:8080"
|
||||
PASS: lab2 public API scenario; infrastructure and grading evidence remain separate.
|
||||
@@ -0,0 +1,104 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>ru.mtusi</groupId>
|
||||
<artifactId>messenger-lab1</artifactId>
|
||||
<version>1.0.0</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<javalin.version>6.1.3</javalin.version>
|
||||
<jackson.version>2.17.0</jackson.version>
|
||||
<slf4j.version>2.0.12</slf4j.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.javalin</groupId>
|
||||
<artifactId>javalin</artifactId>
|
||||
<version>${javalin.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>42.7.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zaxxer</groupId>
|
||||
<artifactId>HikariCP</artifactId>
|
||||
<version>5.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-crypto</artifactId>
|
||||
<version>6.2.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-core</artifactId>
|
||||
<version>10.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-database-postgresql</artifactId>
|
||||
<version>10.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jcl-over-slf4j</artifactId>
|
||||
<version>2.0.12</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.5.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals><goal>shade</goal></goals>
|
||||
<configuration>
|
||||
<transformers>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
|
||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
||||
<mainClass>ru.mtusi.Main</mainClass>
|
||||
</transformer>
|
||||
</transformers>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<configuration>
|
||||
<parameters>true</parameters>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -0,0 +1,14 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
if [ ! -f .env ]; then
|
||||
cp .env.example .env
|
||||
fi
|
||||
docker compose --env-file .env restart
|
||||
for i in $(seq 1 60); do
|
||||
if wget -q --spider http://localhost:8080/health/ready 2>/dev/null; then
|
||||
exit 0
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
exit 1
|
||||
@@ -0,0 +1,302 @@
|
||||
package ru.mtusi;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Base64;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
|
||||
|
||||
import io.javalin.Javalin;
|
||||
import io.javalin.http.Context;
|
||||
import io.javalin.http.HttpStatus;
|
||||
import ru.mtusi.model.Chat;
|
||||
import ru.mtusi.model.CursorResponse;
|
||||
import ru.mtusi.model.Message;
|
||||
import ru.mtusi.model.Session;
|
||||
import ru.mtusi.model.User;
|
||||
import ru.mtusi.store.PostgresStore;
|
||||
|
||||
public class Main {
|
||||
private static PostgresStore store;
|
||||
private static final ObjectMapper mapper = new ObjectMapper()
|
||||
.registerModule(new JavaTimeModule())
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||
|
||||
private static final Pattern USERNAME_PATTERN = Pattern.compile("^[a-z0-9_]{3,32}$");
|
||||
|
||||
public static void main(String[] args) {
|
||||
String jdbcUrl = System.getenv().getOrDefault("DATABASE_URL", "jdbc:postgresql://localhost:5432/messenger");
|
||||
String dbUser = System.getenv().getOrDefault("DATABASE_USER", "postgres");
|
||||
String dbPassword = System.getenv().getOrDefault("DATABASE_PASSWORD", "postgres");
|
||||
long sessionTtl = Long.parseLong(System.getenv().getOrDefault("SESSION_TTL_SECONDS", "3600"));
|
||||
int port = Integer.parseInt(System.getenv().getOrDefault("PORT", "8080"));
|
||||
|
||||
org.flywaydb.core.Flyway.configure()
|
||||
.dataSource(jdbcUrl, dbUser, dbPassword)
|
||||
.locations("classpath:db/migration")
|
||||
.load()
|
||||
.migrate();
|
||||
|
||||
store = new PostgresStore(jdbcUrl, dbUser, dbPassword, sessionTtl);
|
||||
|
||||
Javalin app = Javalin.create(config -> {
|
||||
config.http.defaultContentType = "application/json";
|
||||
config.jsonMapper(new JavalinJackson(mapper));
|
||||
}).start("0.0.0.0", port);
|
||||
|
||||
app.before(ctx -> {
|
||||
String requestId = ctx.header("X-Request-Id");
|
||||
if (requestId == null || requestId.isBlank()) {
|
||||
requestId = UUID.randomUUID().toString();
|
||||
}
|
||||
ctx.header("X-Request-Id", requestId);
|
||||
ctx.attribute("request_id", requestId);
|
||||
});
|
||||
|
||||
app.exception(Exception.class, (e, ctx) -> {
|
||||
e.printStackTrace();
|
||||
String requestId = (String) ctx.attribute("request_id");
|
||||
if (requestId == null || requestId.isBlank()) requestId = UUID.randomUUID().toString();
|
||||
|
||||
String code = "internal_error";
|
||||
HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR;
|
||||
|
||||
if (e instanceof IllegalArgumentException ex) {
|
||||
String msg = ex.getMessage();
|
||||
if ("conflict".equals(msg)) {
|
||||
code = "conflict"; status = HttpStatus.CONFLICT;
|
||||
} else if ("not_found".equals(msg)) {
|
||||
code = "not_found"; status = HttpStatus.NOT_FOUND;
|
||||
} else if ("unauthorized".equals(msg)) {
|
||||
code = "unauthorized"; status = HttpStatus.UNAUTHORIZED;
|
||||
if (ctx.path().equals("/api/v1/auth/sessions") && ctx.method().name().equals("POST")) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Basic realm=\"messenger\", charset=\"UTF-8\"");
|
||||
} else {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Bearer realm=\"messenger\"");
|
||||
}
|
||||
} else {
|
||||
code = "invalid_request"; status = HttpStatus.BAD_REQUEST;
|
||||
}
|
||||
}
|
||||
|
||||
String msg = (status == HttpStatus.INTERNAL_SERVER_ERROR)
|
||||
? "Internal Server Error"
|
||||
: (e.getMessage() != null ? e.getMessage() : "Error");
|
||||
ctx.status(status).json(new ErrorResponseWrapper(new ApiError(code, msg, requestId)));
|
||||
});
|
||||
|
||||
app.get("/health/live", ctx -> ctx.json(new HealthStatus("ok")));
|
||||
app.get("/health/ready", ctx -> {
|
||||
if (store.ping()) {
|
||||
ctx.json(new HealthStatus("ok"));
|
||||
} else {
|
||||
String requestId = (String) ctx.attribute("request_id");
|
||||
ctx.status(HttpStatus.SERVICE_UNAVAILABLE)
|
||||
.json(new ErrorResponseWrapper(new ApiError("unavailable", "database unavailable", requestId)));
|
||||
}
|
||||
});
|
||||
|
||||
app.post("/api/v1/auth/sessions", ctx -> {
|
||||
String authHeader = ctx.header("Authorization");
|
||||
if (authHeader == null || !authHeader.startsWith("Basic ")) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Basic realm=\"messenger\", charset=\"UTF-8\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
String decoded;
|
||||
try {
|
||||
decoded = new String(Base64.getDecoder().decode(authHeader.substring(6)), StandardCharsets.UTF_8);
|
||||
} catch (IllegalArgumentException ex) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Basic realm=\"messenger\", charset=\"UTF-8\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
int colonIndex = decoded.indexOf(':');
|
||||
if (colonIndex == -1) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Basic realm=\"messenger\", charset=\"UTF-8\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
|
||||
String username = decoded.substring(0, colonIndex);
|
||||
String password = decoded.substring(colonIndex + 1);
|
||||
|
||||
PostgresStore.SessionData sessionData = store.createSession(username, password);
|
||||
ctx.status(HttpStatus.CREATED).json(new Session(sessionData.token(), "Bearer", sessionData.expiresAt(), sessionData.user()));
|
||||
});
|
||||
|
||||
app.delete("/api/v1/auth/sessions/current", ctx -> {
|
||||
String token = requireBearerToken(ctx);
|
||||
if (store.getUserByToken(token) == null) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Bearer realm=\"messenger\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
store.revokeSession(token);
|
||||
ctx.status(HttpStatus.NO_CONTENT);
|
||||
});
|
||||
|
||||
app.get("/api/v1/users/me", ctx -> ctx.json(requireUser(ctx)));
|
||||
|
||||
app.post("/api/v1/users", ctx -> {
|
||||
UserRequest req = ctx.bodyAsClass(UserRequest.class);
|
||||
if (req.username() == null || !USERNAME_PATTERN.matcher(req.username()).matches()) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
if (req.display_name() == null || req.display_name().isBlank() || req.display_name().length() > 100) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
if (req.password() == null || req.password().length() < 12 || req.password().length() > 128) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
ctx.status(HttpStatus.CREATED).json(store.registerUser(req.username(), req.display_name(), req.password()));
|
||||
});
|
||||
|
||||
app.get("/api/v1/chats", ctx -> {
|
||||
User user = requireUser(ctx);
|
||||
String limitParam = ctx.queryParam("limit");
|
||||
int limit;
|
||||
try {
|
||||
limit = (limitParam != null) ? Integer.parseInt(limitParam) : 50;
|
||||
} catch (NumberFormatException e) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
String cursor = ctx.queryParam("cursor");
|
||||
if (limit < 1 || limit > 100) throw new IllegalArgumentException("invalid_request");
|
||||
|
||||
List<Chat> chats = store.getChats(user.id(), limit, cursor);
|
||||
String nextCursor = (chats.size() > limit) ? chats.get(limit - 1).id() : null;
|
||||
if (nextCursor != null) chats = chats.subList(0, limit);
|
||||
|
||||
ctx.json(new CursorResponse<>(chats, nextCursor));
|
||||
});
|
||||
|
||||
app.get("/api/v1/chats/{chat_id}", ctx -> {
|
||||
User user = requireUser(ctx);
|
||||
String chatId = ctx.pathParam("chat_id");
|
||||
Chat chat;
|
||||
try {
|
||||
chat = store.getChat(chatId);
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new IllegalArgumentException("not_found");
|
||||
}
|
||||
if (chat == null || !chat.member_ids().contains(user.id())) throw new IllegalArgumentException("not_found");
|
||||
ctx.json(chat);
|
||||
});
|
||||
|
||||
app.post("/api/v1/chats", ctx -> {
|
||||
User user = requireUser(ctx);
|
||||
ChatRequest req = ctx.bodyAsClass(ChatRequest.class);
|
||||
|
||||
if (req.title() == null || req.title().isBlank() || req.title().length() > 100) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
if (req.member_ids() == null || req.member_ids().isEmpty() || !req.member_ids().contains(user.id())) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
Set<String> uniqueMembers = new HashSet<>(req.member_ids());
|
||||
if (uniqueMembers.size() != req.member_ids().size() || req.member_ids().size() > 100) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
ctx.status(HttpStatus.CREATED).json(store.createChat(req.title(), req.member_ids()));
|
||||
});
|
||||
|
||||
app.post("/api/v1/chats/{chat_id}/messages", ctx -> {
|
||||
User user = requireUser(ctx);
|
||||
String chatId = ctx.pathParam("chat_id");
|
||||
MessageRequest req = ctx.bodyAsClass(MessageRequest.class);
|
||||
|
||||
if (req.text() == null || req.text().trim().isEmpty() || req.text().length() > 4000) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
Chat chat;
|
||||
try {
|
||||
chat = store.getChat(chatId);
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new IllegalArgumentException("not_found");
|
||||
}
|
||||
if (chat == null || !chat.member_ids().contains(user.id())) throw new IllegalArgumentException("not_found");
|
||||
|
||||
ctx.status(HttpStatus.CREATED).json(store.addMessage(chatId, user.id(), req.text()));
|
||||
});
|
||||
|
||||
app.get("/api/v1/chats/{chat_id}/messages", ctx -> {
|
||||
User user = requireUser(ctx);
|
||||
String chatId = ctx.pathParam("chat_id");
|
||||
String limitParam = ctx.queryParam("limit");
|
||||
int limit;
|
||||
try {
|
||||
limit = (limitParam != null) ? Integer.parseInt(limitParam) : 50;
|
||||
} catch (NumberFormatException e) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
String cursor = ctx.queryParam("cursor");
|
||||
if (limit < 1 || limit > 100) throw new IllegalArgumentException("invalid_request");
|
||||
|
||||
Chat chat;
|
||||
try {
|
||||
chat = store.getChat(chatId);
|
||||
} catch (IllegalArgumentException e) {
|
||||
throw new IllegalArgumentException("not_found");
|
||||
}
|
||||
if (chat == null || !chat.member_ids().contains(user.id())) throw new IllegalArgumentException("not_found");
|
||||
|
||||
List<Message> messages = store.getMessages(chatId, limit, cursor);
|
||||
String nextCursor = (messages.size() > limit) ? messages.get(limit - 1).id() : null;
|
||||
if (nextCursor != null) messages = messages.subList(0, limit);
|
||||
|
||||
ctx.json(new CursorResponse<>(messages, nextCursor));
|
||||
});
|
||||
}
|
||||
|
||||
private static String requireBearerToken(Context ctx) {
|
||||
String authHeader = ctx.header("Authorization");
|
||||
if (authHeader == null || !authHeader.startsWith("Bearer ")) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Bearer realm=\"messenger\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
return authHeader.substring(7);
|
||||
}
|
||||
|
||||
private static User requireUser(Context ctx) {
|
||||
User user = store.getUserByToken(requireBearerToken(ctx));
|
||||
if (user == null) {
|
||||
ctx.res().setHeader("WWW-Authenticate", "Bearer realm=\"messenger\"");
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
return user;
|
||||
}
|
||||
|
||||
public record UserRequest(
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("username") String username,
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("display_name") String display_name,
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("password") String password) {}
|
||||
|
||||
public record ChatRequest(
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("title") String title,
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("member_ids") java.util.List<String> member_ids) {}
|
||||
|
||||
public record MessageRequest(
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("text") String text) {}
|
||||
|
||||
public record HealthStatus(String status) {}
|
||||
public record ApiError(String code, String message, String request_id) {}
|
||||
public record ErrorResponseWrapper(ApiError error) {}
|
||||
|
||||
static class JavalinJackson implements io.javalin.json.JsonMapper {
|
||||
private final ObjectMapper mapper;
|
||||
JavalinJackson(ObjectMapper mapper) { this.mapper = mapper; }
|
||||
public String toJsonString(Object obj, java.lang.reflect.Type type) {
|
||||
try { return mapper.writeValueAsString(obj); } catch (Exception e) { throw new RuntimeException(e); }
|
||||
}
|
||||
public <T> T fromJsonString(String json, java.lang.reflect.Type targetType) {
|
||||
try { return mapper.readValue(json, mapper.constructType(targetType)); }
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package ru.mtusi.model;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
|
||||
public record Chat(String id, String title, List<String> member_ids, Instant created_at) {}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.mtusi.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public record CursorResponse<T>(List<T> items, String next_cursor) {}
|
||||
@@ -0,0 +1,3 @@
|
||||
package ru.mtusi.model;
|
||||
|
||||
public record ErrorResponse(String code, String message, String request_id) {}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.mtusi.model;
|
||||
|
||||
import java.time.Instant;
|
||||
|
||||
public record Message(String id, String chat_id, String sender_id, String text, Instant created_at) {}
|
||||
@@ -0,0 +1,5 @@
|
||||
package ru.mtusi.model;
|
||||
|
||||
import java.time.Instant;
|
||||
|
||||
public record Session(String token, String token_type, Instant expires_at, User user) {}
|
||||
@@ -0,0 +1,3 @@
|
||||
package ru.mtusi.model;
|
||||
import java.time.Instant;
|
||||
public record User(String id, String username, String display_name, Instant created_at) {}
|
||||
@@ -0,0 +1,289 @@
|
||||
package ru.mtusi.store;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
|
||||
import com.zaxxer.hikari.HikariConfig;
|
||||
import com.zaxxer.hikari.HikariDataSource;
|
||||
|
||||
import ru.mtusi.model.Chat;
|
||||
import ru.mtusi.model.Message;
|
||||
import ru.mtusi.model.User;
|
||||
|
||||
public class PostgresStore {
|
||||
private final HikariDataSource dataSource;
|
||||
private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
||||
private final long sessionTtlSeconds;
|
||||
|
||||
public PostgresStore(String jdbcUrl, String user, String password, long sessionTtlSeconds) {
|
||||
HikariConfig config = new HikariConfig();
|
||||
config.setJdbcUrl(jdbcUrl);
|
||||
config.setUsername(user);
|
||||
config.setPassword(password);
|
||||
config.setMaximumPoolSize(10);
|
||||
config.setConnectionTimeout(5000);
|
||||
config.setValidationTimeout(3000);
|
||||
this.dataSource = new HikariDataSource(config);
|
||||
this.sessionTtlSeconds = sessionTtlSeconds;
|
||||
}
|
||||
|
||||
public boolean ping() {
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement("SELECT 1")) {
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next();
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public User registerUser(String username, String displayName, String plainPassword) {
|
||||
String hash = passwordEncoder.encode(plainPassword);
|
||||
String sql = "INSERT INTO users (username, display_name, password_hash) VALUES (?, ?, ?) RETURNING id, created_at";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setString(1, username);
|
||||
ps.setString(2, displayName);
|
||||
ps.setString(3, hash);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return new User(rs.getString("id"), username, displayName, rs.getTimestamp("created_at").toInstant());
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
if ("23505".equals(e.getSQLState())) throw new IllegalArgumentException("conflict");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
throw new RuntimeException("Failed to create user");
|
||||
}
|
||||
|
||||
public record SessionData(String token, Instant expiresAt, User user) {}
|
||||
|
||||
public SessionData createSession(String username, String plainPassword) {
|
||||
String sql = "SELECT id, username, display_name, password_hash, created_at FROM users WHERE username = ?";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setString(1, username);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next() || !passwordEncoder.matches(plainPassword, rs.getString("password_hash"))) {
|
||||
throw new IllegalArgumentException("unauthorized");
|
||||
}
|
||||
User user = new User(rs.getString("id"), rs.getString("username"), rs.getString("display_name"), rs.getTimestamp("created_at").toInstant());
|
||||
|
||||
String token = UUID.randomUUID().toString().replace("-", "") + UUID.randomUUID().toString().replace("-", "");
|
||||
Instant expiresAt = Instant.now().plusSeconds(sessionTtlSeconds);
|
||||
|
||||
String insertSql = "INSERT INTO sessions (token, user_id, expires_at) VALUES (?, ?, ?)";
|
||||
try (PreparedStatement insertPs = conn.prepareStatement(insertSql)) {
|
||||
insertPs.setString(1, token);
|
||||
insertPs.setObject(2, UUID.fromString(user.id()));
|
||||
insertPs.setObject(3, java.time.OffsetDateTime.ofInstant(expiresAt, java.time.ZoneOffset.UTC));
|
||||
insertPs.executeUpdate();
|
||||
}
|
||||
return new SessionData(token, expiresAt, user);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public User getUserByToken(String token) {
|
||||
String sql = "SELECT u.id, u.username, u.display_name, u.created_at FROM users u JOIN sessions s ON u.id = s.user_id WHERE s.token = ? AND s.expires_at > NOW()";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setString(1, token);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return new User(rs.getString("id"), rs.getString("username"), rs.getString("display_name"), rs.getTimestamp("created_at").toInstant());
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public void revokeSession(String token) {
|
||||
String sql = "DELETE FROM sessions WHERE token = ?";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setString(1, token);
|
||||
ps.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public Chat createChat(String title, List<String> memberIds) {
|
||||
String chatSql = "INSERT INTO chats (title) VALUES (?) RETURNING id, created_at";
|
||||
String memberSql = "INSERT INTO chat_members (chat_id, user_id) VALUES (?, ?)";
|
||||
String checkUserSql = "SELECT 1 FROM users WHERE id = ?";
|
||||
try (Connection conn = dataSource.getConnection()) {
|
||||
conn.setAutoCommit(false);
|
||||
try {
|
||||
for (String memberId : memberIds) {
|
||||
try (PreparedStatement ps = conn.prepareStatement(checkUserSql)) {
|
||||
ps.setObject(1, UUID.fromString(memberId));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) {
|
||||
throw new IllegalArgumentException("invalid_request");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
String chatId;
|
||||
Instant createdAt;
|
||||
try (PreparedStatement ps = conn.prepareStatement(chatSql)) {
|
||||
ps.setString(1, title);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) throw new SQLException("Failed to create chat");
|
||||
chatId = rs.getString("id");
|
||||
createdAt = rs.getTimestamp("created_at").toInstant();
|
||||
}
|
||||
}
|
||||
try (PreparedStatement ps = conn.prepareStatement(memberSql)) {
|
||||
for (String memberId : memberIds) {
|
||||
ps.setObject(1, UUID.fromString(chatId));
|
||||
ps.setObject(2, UUID.fromString(memberId));
|
||||
ps.addBatch();
|
||||
}
|
||||
ps.executeBatch();
|
||||
}
|
||||
conn.commit();
|
||||
return new Chat(chatId, title, memberIds, createdAt);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
conn.rollback();
|
||||
} catch (SQLException ignore) {
|
||||
}
|
||||
if (e instanceof IllegalArgumentException iae) throw iae;
|
||||
if (e instanceof SQLException se) throw new RuntimeException(se);
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
try {
|
||||
conn.setAutoCommit(true);
|
||||
} catch (SQLException ignore) {
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public Chat getChat(String chatId) {
|
||||
String sql = "SELECT id, title, created_at FROM chats WHERE id = ?";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setObject(1, UUID.fromString(chatId));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) return null;
|
||||
String title = rs.getString("title");
|
||||
Instant createdAt = rs.getTimestamp("created_at").toInstant();
|
||||
|
||||
List<String> members = new ArrayList<>();
|
||||
String memSql = "SELECT user_id FROM chat_members WHERE chat_id = ?";
|
||||
try (PreparedStatement memPs = conn.prepareStatement(memSql)) {
|
||||
memPs.setObject(1, UUID.fromString(chatId));
|
||||
try (ResultSet memRs = memPs.executeQuery()) {
|
||||
while (memRs.next()) members.add(memRs.getString("user_id"));
|
||||
}
|
||||
}
|
||||
return new Chat(chatId, title, members, createdAt);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public List<Chat> getChats(String userId, int limit, String cursor) {
|
||||
int fetchLimit = limit + 1;
|
||||
String keysetSql = "SELECT c.id, c.title, c.created_at FROM chats c JOIN chat_members cm ON c.id = cm.chat_id WHERE cm.user_id = ? AND (c.created_at, c.id) > (SELECT created_at, id FROM chats WHERE id = ?) ORDER BY c.created_at, c.id ASC LIMIT ?";
|
||||
String noCursorSql = "SELECT c.id, c.title, c.created_at FROM chats c JOIN chat_members cm ON c.id = cm.chat_id WHERE cm.user_id = ? ORDER BY c.created_at, c.id ASC LIMIT ?";
|
||||
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(cursor != null ? keysetSql : noCursorSql)) {
|
||||
ps.setObject(1, UUID.fromString(userId));
|
||||
if (cursor != null) {
|
||||
ps.setObject(2, UUID.fromString(cursor));
|
||||
ps.setInt(3, fetchLimit);
|
||||
} else {
|
||||
ps.setInt(2, fetchLimit);
|
||||
}
|
||||
|
||||
List<Chat> result = new ArrayList<>();
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
String cid = rs.getString("id");
|
||||
String title = rs.getString("title");
|
||||
Instant createdAt = rs.getTimestamp("created_at").toInstant();
|
||||
|
||||
List<String> members = new ArrayList<>();
|
||||
try (PreparedStatement memPs = conn.prepareStatement("SELECT user_id FROM chat_members WHERE chat_id = ?")) {
|
||||
memPs.setObject(1, UUID.fromString(cid));
|
||||
try (ResultSet memRs = memPs.executeQuery()) {
|
||||
while (memRs.next()) members.add(memRs.getString("user_id"));
|
||||
}
|
||||
}
|
||||
result.add(new Chat(cid, title, members, createdAt));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public Message addMessage(String chatId, String senderId, String text) {
|
||||
String sql = "INSERT INTO messages (chat_id, sender_id, text) VALUES (?, ?, ?) RETURNING id, created_at";
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setObject(1, UUID.fromString(chatId));
|
||||
ps.setObject(2, UUID.fromString(senderId));
|
||||
ps.setString(3, text);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return new Message(rs.getString("id"), chatId, senderId, text, rs.getTimestamp("created_at").toInstant());
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
throw new RuntimeException("Failed to add message");
|
||||
}
|
||||
|
||||
public List<Message> getMessages(String chatId, int limit, String cursor) {
|
||||
int fetchLimit = limit + 1;
|
||||
String keysetSql = "SELECT id, sender_id, text, created_at FROM messages WHERE chat_id = ? AND (created_at, id) > (SELECT created_at, id FROM messages WHERE id = ?) ORDER BY created_at, id ASC LIMIT ?";
|
||||
String noCursorSql = "SELECT id, sender_id, text, created_at FROM messages WHERE chat_id = ? ORDER BY created_at, id ASC LIMIT ?";
|
||||
|
||||
try (Connection conn = dataSource.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement(cursor != null ? keysetSql : noCursorSql)) {
|
||||
ps.setObject(1, UUID.fromString(chatId));
|
||||
if (cursor != null) {
|
||||
ps.setObject(2, UUID.fromString(cursor));
|
||||
ps.setInt(3, fetchLimit);
|
||||
} else {
|
||||
ps.setInt(2, fetchLimit);
|
||||
}
|
||||
|
||||
List<Message> result = new ArrayList<>();
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
result.add(new Message(rs.getString("id"), chatId, rs.getString("sender_id"), rs.getString("text"), rs.getTimestamp("created_at").toInstant()));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||
|
||||
CREATE TABLE users (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
username VARCHAR(32) NOT NULL UNIQUE,
|
||||
display_name VARCHAR(100) NOT NULL,
|
||||
password_hash VARCHAR(255) NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE TABLE chats (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
title VARCHAR(100) NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE TABLE chat_members (
|
||||
chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE,
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY (chat_id, user_id)
|
||||
);
|
||||
|
||||
CREATE TABLE messages (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE,
|
||||
sender_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
text TEXT NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE TABLE sessions (
|
||||
token VARCHAR(255) PRIMARY KEY,
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
CREATE INDEX idx_messages_chat_created ON messages(chat_id, created_at, id);
|
||||
CREATE INDEX idx_chat_members_user ON chat_members(user_id);
|
||||
CREATE INDEX idx_sessions_expires ON sessions(expires_at);
|
||||
Reference in New Issue
Block a user