diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e6e63eb2..f9fe0521 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,70 @@ ## Лабораторная 3 -Автор / группа: TODO -Целевая оценка (3/4/5): TODO -Трек 5, если заявлен: TODO +**Автор / группа:** Гуреев Дмитрий, БПИ2301 +**Целевая оценка (3/4/5):** 5 +**Трек 5, если заявлен:** Трек 1 — «Цена масштабирования» -Что реализовано и что перенесено: TODO -Команды запуска из чистого clone: TODO -Результаты проверок и ссылка на REPORT.md: TODO -Ограничения / известные ошибки: TODO -Источники и использование ИИ: TODO +### Что реализовано и что перенесено -- [ ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. -- [ ] Контракт и публичные тесты не ослаблены. -- [ ] make check и make test выполнены; приложен реальный вывод. -- [ ] Сценарии отказов/безопасности своего уровня воспроизведены. -- [ ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. -- [ ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения. +**Перенесено из lab2:** in-memory → PostgreSQL + Flyway, JPA, регистрация с password KDF, Basic → opaque Bearer-сессии (PG + Redis TTL), чаты/участники/сообщения, курсорная пагинация, идемпотентность сообщений, Compose (db, redis, api), `REPORT.md`. + +**Новое в lab3:** +- несколько реплик API за **nginx** (`--scale api=N`), без publish портов api на хост; +- `/health/live`, `/health/ready`, graceful shutdown (`markNotReady` + `server.shutdown`); +- заголовки `X-Request-Id`, `X-Instance-Id`; +- one-shot **migrate**, у api `FLYWAY_ENABLED=false`; +- `scripts/restart.sh` (рестарт без удаления volumes); +- CPU/RAM limits на api, без `container_name` у масштабируемого api; +- сценарии отказа реплик, rolling-замена под нагрузкой, параллельная идемпотентность; +- эксперимент **Трека 1** (фиксированный суммарный CPU/RAM, 1/2/4 реплики, saturation, одно улучшение) — детали в `REPORT.md`. + +### Команды запуска из чистого clone + +```bash +git clone https://gitea.privcloud.tech/Dmitry/mtusi2026lab3 +cd mtusi2026lab3/Lido +cp .env.example .env # при наличии; секреты не коммитить + +docker compose build +docker compose run --rm migrate +docker compose up -d --scale api=3 + +curl -sf http://127.0.0.1:8080/health/live +curl -sf http://127.0.0.1:8080/health/ready + +cd .. +make test BASE_URL=http://127.0.0.1:8080 +# make test-persistence ACTION_SCRIPT=scripts/restart.sh + +cd Lido && docker compose stop # безопасная остановка +# docker compose down -v # только для полного сброса учебных данных +``` + +### Результаты проверок и ссылка на REPORT.md + +- `make test` — **PASS** (smoke публичного контракта через `BASE_URL` на nginx). +- Persistence / restart — hook без `down -v`, данные и сессии сохраняются. +- Отказ реплик: recovery live через LB **~3.8 / 4.4 / 7.2 s**; в окне stop при 20 VU — порядка **~21%** неуспешных live-проверок. +- Идемпотентность: 20 параллельных POST с одним ключом → **один** `message.id`; другой body → **409**. + +Подробные таблицы, методика Трека 1, ограничения: **[REPORT.md](./REPORT.md)**. + +### Ограничения / известные ошибки + +- PostgreSQL и nginx — **SPOF**; отказ узла БД не маскируется и не заявляется как пережитый. +- Redis — кэш сессий; source of truth — PG. +- Один хост Docker; k6 на той же машине искажает «чистый» RPS. +- Dev-пароли только через env, не в образе и не в отчёте (токенов в REPORT нет). + +### Источники и использование ИИ + +Документация Spring Boot, PostgreSQL, Redis, nginx, Flyway, k6. ИИ — разбор multi-instance, health, идемпотентности и структуры отчёта; реализация, прогоны и цифры — авторские. + +--- + +- [x] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами. +- [x] Контракт и публичные тесты не ослаблены. +- [x] `make check` и `make test` выполнены; приложен реальный вывод. +- [x] Сценарии отказов/безопасности своего уровня воспроизведены. +- [x] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens. +- [x] README задания сохранён, `REPORT.md` содержит инструкцию именно моего решения. \ No newline at end of file diff --git a/Lido/.dockerignore b/Lido/.dockerignore new file mode 100644 index 00000000..2d7fae82 --- /dev/null +++ b/Lido/.dockerignore @@ -0,0 +1,5 @@ +.gradle +build +.git +*.iml +.idea \ No newline at end of file diff --git a/Lido/.gitignore b/Lido/.gitignore new file mode 100644 index 00000000..b1d77e7b --- /dev/null +++ b/Lido/.gitignore @@ -0,0 +1,2 @@ +build.gradle.kts +.gradle diff --git a/Lido/Dockerfile b/Lido/Dockerfile new file mode 100644 index 00000000..15356a7f --- /dev/null +++ b/Lido/Dockerfile @@ -0,0 +1,24 @@ +FROM eclipse-temurin:22-jdk-alpine AS builder +WORKDIR /app +RUN apk add --no-cache dos2unix +COPY gradlew . +COPY gradle gradle +COPY build.gradle.* settings.gradle* build.gradle.kts* settings.gradle.kts* ./ +RUN dos2unix gradlew && chmod +x gradlew +RUN ./gradlew dependencies --no-daemon || true +COPY src src +RUN apk add --no-cache curl +RUN ./gradlew bootJar -x test --no-daemon + +FROM eclipse-temurin:22-jre-alpine AS runtime +WORKDIR /app +RUN addgroup -S appgroup && adduser -S appuser -G appgroup +COPY --from=builder /app/build/libs/*.jar app.jar +RUN chown -R appuser:appgroup /app +USER appuser +EXPOSE 8080 + +HEALTHCHECK --interval=10s --timeout=3s --retries=3 \ + CMD wget --no-verbose --tries=1 --spider http://localhost:8080/actuator/health || exit 1 + +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/Lido/docker-compose.yml b/Lido/docker-compose.yml new file mode 100644 index 00000000..293670f2 --- /dev/null +++ b/Lido/docker-compose.yml @@ -0,0 +1,104 @@ +services: + db: + image: postgres:16-alpine + container_name: Lido-db + mem_limit: 128m + environment: + POSTGRES_DB: lido_db + POSTGRES_USER: user + POSTGRES_PASSWORD: user + ports: + - "5433:5432" + volumes: + - messenger_pg_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U user -d lido_db"] + interval: 5s + timeout: 5s + retries: 5 + networks: [messenger] + + redis: + image: redis:7-alpine + mem_limit: 128m + container_name: lido-redis + ports: + - "6379:6379" + volumes: + - lido_redis_data:/data + command: [ "redis-server", "--appendonly", "yes" ] + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + interval: 5s + timeout: 3s + retries: 10 + networks: [messenger] + + + api: + build: + context: . + dockerfile: Dockerfile + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + networks: [messenger] + mem_limit: 512m + cpus: 1.0 + mem_reservation: 256m + environment: + FLYWAY_ENABLED: "false" + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/lido_db + SPRING_DATASOURCE_USERNAME: user + SPRING_DATASOURCE_PASSWORD: user + SPRING_DATA_REDIS_HOST: redis + SPRING_DATA_REDIS_PORT: "6379" + SESSION_TTL_SECONDS: "604800" + SERVER_SHUTDOWN: graceful + deploy: + replicas: 3 + healthcheck: + test: ["CMD-SHELL", "wget -q -O- http://127.0.0.1:8080/health/live || exit 1"] + interval: 5s + timeout: 3s + retries: 3 + start_period: 40s + + + nginx: + image: nginx:1.27-alpine + mem_limit: 128m + ports: + - "8080:80" + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro + depends_on: + - api + networks: [ messenger ] + + migrate: + build: . + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/lido_db + SPRING_DATASOURCE_USERNAME: user + SPRING_DATASOURCE_PASSWORD: user + FLYWAY_ENABLED: "true" + SPRING_MAIN_WEB_APPLICATION_TYPE: none + networks: [ messenger ] + restart: "no" + image: flyway/flyway:10 + command: -url=jdbc:postgresql://db:5432/lido_db -user=user -password=user -locations=filesystem:/flyway/sql migrate + volumes: + - ./src/main/resources/db/migration:/flyway/sql:ro + depends_on: + db: + condition: service_healthy + +volumes: + messenger_pg_data: + lido_redis_data: + +networks: + messenger: \ No newline at end of file diff --git a/Lido/docs/arch/model.c4 b/Lido/docs/arch/model.c4 new file mode 100644 index 00000000..40093d0a --- /dev/null +++ b/Lido/docs/arch/model.c4 @@ -0,0 +1,11 @@ +model { + messenger = softwareSystem "Messenger" { + api = container "API" "Spring Boot" { + userSvc = component "UserService" + chatSvc = component "ChatService" + msgSvc = component "MessageService" + } + db = container "PostgreSQL" "users, chats, chat_members, messages" + } + api -> db "JDBC / Flyway" +} \ No newline at end of file diff --git a/Lido/gradle/wrapper/gradle-wrapper.jar b/Lido/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e6441136 Binary files /dev/null and b/Lido/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Lido/gradle/wrapper/gradle-wrapper.properties b/Lido/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..45a79d25 --- /dev/null +++ b/Lido/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists + diff --git a/Lido/gradlew b/Lido/gradlew new file mode 100755 index 00000000..b740cf13 --- /dev/null +++ b/Lido/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Lido/gradlew.bat b/Lido/gradlew.bat new file mode 100644 index 00000000..7101f8e4 --- /dev/null +++ b/Lido/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Lido/nginx/nginx.conf b/Lido/nginx/nginx.conf new file mode 100644 index 00000000..87140a5c --- /dev/null +++ b/Lido/nginx/nginx.conf @@ -0,0 +1,51 @@ +worker_processes auto; + +events { + worker_connections 1024; +} + +http { + upstream api_backend { + least_conn; + server api:8080 max_fails=2 fail_timeout=5s; + } + + server { + listen 80; + + location /health/live { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_read_timeout 5s; + proxy_next_upstream error timeout http_502 http_503 http_504; + } + + location /health/ready { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_read_timeout 5s; + proxy_next_upstream error timeout http_502 http_503 http_504; + } + + location / { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection ""; + proxy_connect_timeout 2s; + proxy_send_timeout 30s; + proxy_read_timeout 30s; + proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_next_upstream_tries 3; + } + } +} \ No newline at end of file diff --git a/Lido/settings.gradle.kts b/Lido/settings.gradle.kts new file mode 100644 index 00000000..b27426c4 --- /dev/null +++ b/Lido/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "Lido" diff --git a/Lido/src/main/java/org/example/LidoApplication.java b/Lido/src/main/java/org/example/LidoApplication.java new file mode 100644 index 00000000..96bf147d --- /dev/null +++ b/Lido/src/main/java/org/example/LidoApplication.java @@ -0,0 +1,11 @@ +package org.example; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class LidoApplication { + public static void main(String[] args) { + SpringApplication.run(LidoApplication.class, args); + } +} diff --git a/Lido/src/main/java/org/example/config/AuthFilter.java b/Lido/src/main/java/org/example/config/AuthFilter.java new file mode 100644 index 00000000..b80a81f2 --- /dev/null +++ b/Lido/src/main/java/org/example/config/AuthFilter.java @@ -0,0 +1,50 @@ +package org.example.config; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.example.repository.SessionRepository; +import org.example.service.AuthService; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AuthFilter extends OncePerRequestFilter { + + private final AuthService authService; + + @Override + protected boolean shouldNotFilter(HttpServletRequest request) { + String path = request.getRequestURI(); + return path.startsWith("/health/") + || path.startsWith("/actuator/"); + } + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + String auth = request.getHeader("Authorization"); + if (auth != null && auth.startsWith("Bearer ")) { + String token = auth.substring(7).trim(); + if (!token.isEmpty()) { + authService.resolveUserByBearer(token) + .ifPresent(UserContext::setCurrentUser); + } + } + try { + filterChain.doFilter(request, response); + } finally { + UserContext.clear(); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/CodePointSize.java b/Lido/src/main/java/org/example/config/CodePointSize.java new file mode 100644 index 00000000..6925048f --- /dev/null +++ b/Lido/src/main/java/org/example/config/CodePointSize.java @@ -0,0 +1,18 @@ +package org.example.config; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CodePointSizeValidator.class) +@Target({ ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface CodePointSize { + int min() default 0; + int max() default Integer.MAX_VALUE; + String message() default "size must be between {min} and {max} code points"; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/CodePointSizeValidator.java b/Lido/src/main/java/org/example/config/CodePointSizeValidator.java new file mode 100644 index 00000000..7d769fc4 --- /dev/null +++ b/Lido/src/main/java/org/example/config/CodePointSizeValidator.java @@ -0,0 +1,25 @@ +package org.example.config; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class CodePointSizeValidator implements ConstraintValidator { + + private int min; + private int max; + + @Override + public void initialize(CodePointSize annotation) { + this.min = annotation.min(); + this.max = annotation.max(); + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + if (value == null) { + return true; + } + int n = value.codePointCount(0, value.length()); + return n >= min && n <= max; + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/GracefulShutdownListener.java b/Lido/src/main/java/org/example/config/GracefulShutdownListener.java new file mode 100644 index 00000000..9f202c5b --- /dev/null +++ b/Lido/src/main/java/org/example/config/GracefulShutdownListener.java @@ -0,0 +1,25 @@ +package org.example.config; + +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +@Component +public class GracefulShutdownListener { + + private final ReadinessState state; + + public GracefulShutdownListener(ReadinessState state) { + this.state = state; + } + + @EventListener(ContextClosedEvent.class) + public void onClose(){ + state.setReady(false); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } +} diff --git a/Lido/src/main/java/org/example/config/InstanceIdFilter.java b/Lido/src/main/java/org/example/config/InstanceIdFilter.java new file mode 100644 index 00000000..06256e31 --- /dev/null +++ b/Lido/src/main/java/org/example/config/InstanceIdFilter.java @@ -0,0 +1,52 @@ +package org.example.config; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +public class InstanceIdFilter extends OncePerRequestFilter { + + public static final String HEADER = "X-Instance-Id"; + private final String instanceId; + + public InstanceIdFilter() { + this.instanceId = resolve(); + } + + private static String resolve() { + String id = firstNonBlank( + System.getenv("INSTANCE_ID"), + System.getenv("HOSTNAME"), + System.getProperty("HOSTNAME") + ); + if (id == null) { + id = "unknown-" + UUID.randomUUID().toString().substring(0, 8); + } + return id; + } + + private static String firstNonBlank(String... values) { + if (values == null) return null; + for (String v : values) { + if (v != null && !v.isBlank()) return v.trim(); + } + return null; + } + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain + ) throws ServletException, IOException { + response.setHeader(HEADER, instanceId); + filterChain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/PasswordConfig.java b/Lido/src/main/java/org/example/config/PasswordConfig.java new file mode 100644 index 00000000..e23ca1f2 --- /dev/null +++ b/Lido/src/main/java/org/example/config/PasswordConfig.java @@ -0,0 +1,42 @@ +package org.example.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HexFormat; + +@Configuration +public class PasswordConfig { + + @Bean + public PasswordEncoder passwordEncoder() { + BCryptPasswordEncoder bcrypt = new BCryptPasswordEncoder(); + + return new PasswordEncoder() { + private String prehash(String raw) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] digest = md.digest(raw.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(digest); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException(e); + } + } + + @Override + public String encode(CharSequence rawPassword) { + return bcrypt.encode(prehash(rawPassword.toString())); + } + + @Override + public boolean matches(CharSequence rawPassword, String encodedPassword) { + return bcrypt.matches(prehash(rawPassword.toString()), encodedPassword); + } + }; + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/ReadinessState.java b/Lido/src/main/java/org/example/config/ReadinessState.java new file mode 100644 index 00000000..a341211d --- /dev/null +++ b/Lido/src/main/java/org/example/config/ReadinessState.java @@ -0,0 +1,17 @@ +package org.example.config; + + +import org.springframework.stereotype.Component; + +import java.util.concurrent.atomic.AtomicBoolean; + +@Component +public class ReadinessState { + private final AtomicBoolean ready = new AtomicBoolean(true); + public boolean isReady() { + return ready.get(); + } + public void setReady(boolean v) { + ready.set(v); + } +} diff --git a/Lido/src/main/java/org/example/config/RequestIdFilter.java b/Lido/src/main/java/org/example/config/RequestIdFilter.java new file mode 100644 index 00000000..5277ccba --- /dev/null +++ b/Lido/src/main/java/org/example/config/RequestIdFilter.java @@ -0,0 +1,43 @@ +package org.example.config; + + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.MDC; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +public class RequestIdFilter extends OncePerRequestFilter { + + public static final String REQUEST_ID_HEADER = "X-Request-Id"; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String requestId = request.getHeader(REQUEST_ID_HEADER); + + if (requestId == null || requestId.trim().isEmpty()) { + requestId = UUID.randomUUID().toString(); + } + + MDC.put(REQUEST_ID_HEADER, requestId); + + request.setAttribute(REQUEST_ID_HEADER, requestId); + response.setHeader(REQUEST_ID_HEADER, requestId); + + try { + filterChain.doFilter(request, response); + } finally { + MDC.remove(REQUEST_ID_HEADER); + } + + } +} diff --git a/Lido/src/main/java/org/example/config/StrictStringDeserializer.java b/Lido/src/main/java/org/example/config/StrictStringDeserializer.java new file mode 100644 index 00000000..1d25693c --- /dev/null +++ b/Lido/src/main/java/org/example/config/StrictStringDeserializer.java @@ -0,0 +1,19 @@ +package org.example.config; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import java.io.IOException; + +public class StrictStringDeserializer extends JsonDeserializer { + + @Override + public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + if (p.currentToken() != JsonToken.VALUE_STRING) { + return (String) ctxt.handleUnexpectedToken(String.class, p); + } + return p.getValueAsString(); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/config/TokenHasher.java b/Lido/src/main/java/org/example/config/TokenHasher.java new file mode 100644 index 00000000..6f6c9d44 --- /dev/null +++ b/Lido/src/main/java/org/example/config/TokenHasher.java @@ -0,0 +1,28 @@ +package org.example.config; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.SecureRandom; +import java.util.HexFormat; + +public final class TokenHasher { + private static final SecureRandom RANDOM = new SecureRandom(); + + public TokenHasher() {} + + public static String newRawToken(){ + byte[] bytes = new byte[32]; + RANDOM.nextBytes(bytes); + return HexFormat.of().formatHex(bytes); + } + + public static String sha256(String rawToken) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] dig = md.digest(rawToken.getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(dig); + } catch (Exception e) { + throw new IllegalStateException(e); + } + } +} diff --git a/Lido/src/main/java/org/example/config/UserContext.java b/Lido/src/main/java/org/example/config/UserContext.java new file mode 100644 index 00000000..6017a387 --- /dev/null +++ b/Lido/src/main/java/org/example/config/UserContext.java @@ -0,0 +1,19 @@ +package org.example.config; + +import org.example.model.User; + +public class UserContext { + private static final ThreadLocal CURRENT_USER = new ThreadLocal<>(); + + public static void setCurrentUser(User user) { + CURRENT_USER.set(user); + } + + public static User getCurrentUser() { + return CURRENT_USER.get(); + } + + public static void clear() { + CURRENT_USER.remove(); + } +} diff --git a/Lido/src/main/java/org/example/controller/AuthController.java b/Lido/src/main/java/org/example/controller/AuthController.java new file mode 100644 index 00000000..2457a378 --- /dev/null +++ b/Lido/src/main/java/org/example/controller/AuthController.java @@ -0,0 +1,66 @@ +package org.example.controller; + + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.example.dto.response.SessionInfoResponse; +import org.example.dto.response.SessionResponse; +import org.example.exception.UnauthorizedException; +import org.example.service.AuthService; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.List; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthService authService; + + @PostMapping("/sessions") + @ResponseStatus(HttpStatus.CREATED) + public SessionResponse login(HttpServletRequest request) { + String header = request.getHeader("Authorization"); + if (header == null || !header.startsWith("Basic ")) { + throw new UnauthorizedException("Unauthorized"); + } + String decoded; + try { + decoded = new String( + Base64.getDecoder().decode(header.substring(6).trim()), + StandardCharsets.UTF_8); + } catch (IllegalArgumentException e) { + throw new UnauthorizedException("Unauthorized"); + } + int colon = decoded.indexOf(':'); + if (colon < 0) { + throw new UnauthorizedException("Unauthorized"); + } + String username = decoded.substring(0, colon); + String password = decoded.substring(colon + 1); + return authService.login(username, password); + } + + @DeleteMapping("/sessions/current") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void revokeCurrent(HttpServletRequest request) { + String header = request.getHeader("Authorization"); + if (header == null || !header.startsWith("Bearer ")) { + throw new UnauthorizedException("Unauthorized"); + } + String token = header.substring(7).trim(); + if (token.isEmpty()) { + throw new UnauthorizedException("Unauthorized"); + } + authService.logoutCurrent(token); + } + + @GetMapping("/sessions") + public List sessions() { + return authService.listSessionsForCurrentUser(); + } +} diff --git a/Lido/src/main/java/org/example/controller/ChatController.java b/Lido/src/main/java/org/example/controller/ChatController.java new file mode 100644 index 00000000..ff33d9ad --- /dev/null +++ b/Lido/src/main/java/org/example/controller/ChatController.java @@ -0,0 +1,114 @@ +package org.example.controller; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import lombok.RequiredArgsConstructor; +import org.example.dto.ChatPage; +import org.example.dto.MessagePage; +import org.example.dto.create.CreateChatDto; +import org.example.dto.create.CreateMessageDto; +import org.example.dto.response.ChatResponse; +import org.example.dto.update.UpdateChatDto; +import org.example.dto.update.UpdateMessageDto; +import org.example.model.Message; +import org.example.service.ChatService; +import org.example.service.MessageService; +import org.example.service.UserService; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/chats") +@RequiredArgsConstructor +@Validated +public class ChatController { + + private final ChatService chatService; + private final MessageService messageService; + private final UserService userService; + + // ——— Chats ——— + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public ChatResponse createChat(@Valid @RequestBody CreateChatDto dto) { + return chatService.createChat(dto); + } + + @GetMapping + public ChatPage getChats( + @RequestParam(defaultValue = "50") + @Max(100) + @Min(value = 1, message = "limit must be >= 1") int limit + ) { + return chatService.getChatsForCurrentUser(limit); + } + + @GetMapping("/{id}") + public ChatResponse getChatById(@PathVariable UUID id) { + return chatService.getChatById(id); + } + + @PutMapping("/{id}") + public ChatResponse updateChat( + @PathVariable UUID id, + @Valid @RequestBody UpdateChatDto object + ) { + return chatService.updateChat(id, object); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteChat(@PathVariable UUID id) { + chatService.deleteChat(id); + } + + // ——— Messages ——— + + @PostMapping("/{id}/messages") + @ResponseStatus(HttpStatus.CREATED) + public Message sendMessage( + @PathVariable("id") UUID id, + @RequestHeader("Idempotency-Key") String idempotencyKey, + @Valid @RequestBody CreateMessageDto messageDto + ) { + UUID senderId = userService.getCurrentUser().getId(); + return messageService.sendMessage(id, senderId, messageDto, idempotencyKey); + } + + @GetMapping("/{id}/messages") + public MessagePage getMessages( + @PathVariable("id") UUID id, + @RequestParam(required = false) String cursor, + @RequestParam(defaultValue = "50") + @Max(100) + @Min(value = 1, message = "limit must be >= 1") int limit + ) { + UUID userId = userService.getCurrentUser().getId(); + return messageService.getMessage(id, userId, cursor, limit); + } + + @PutMapping("/{id}/messages/{messageId}") + public Message updateMessage( + @PathVariable("id") UUID id, + @PathVariable UUID messageId, + @Valid @RequestBody UpdateMessageDto object + ) { + UUID userId = userService.getCurrentUser().getId(); + return messageService.updateMessage(id, messageId, userId, object); + } + + @DeleteMapping("/{id}/messages/{messageId}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteMessage( + @PathVariable("id") UUID id, + @PathVariable UUID messageId + ) { + UUID userId = userService.getCurrentUser().getId(); + messageService.deleteMessage(id, messageId, userId); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/controller/HealthController.java b/Lido/src/main/java/org/example/controller/HealthController.java new file mode 100644 index 00000000..ec8f49f1 --- /dev/null +++ b/Lido/src/main/java/org/example/controller/HealthController.java @@ -0,0 +1,48 @@ +package org.example.controller; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +@RestController +@RequestMapping("/health") +public class HealthController { + + private final DataSource dataSource; + private final AtomicBoolean ready = new AtomicBoolean(true); + + public HealthController(DataSource dataSource) { + this.dataSource = dataSource; + } + + @GetMapping({"/live"}) + public ResponseEntity> live() { + return ResponseEntity.ok(Map.of("status", "ok")); + } + + @GetMapping("/ready") + public ResponseEntity> ready(){ + if (!ready.get()){ + return ResponseEntity.status(503).body(Map.of("status", "NOT_READY")); + } + try (Connection c = dataSource.getConnection()){ + if (!c.isValid(1)){ + return ResponseEntity.status(503).body(Map.of("status", "DB_DOWN")); + } + } catch (Exception e){ + return ResponseEntity.status(503).body(Map.of("status", "DB_DOWN")); + } + return ResponseEntity.ok(Map.of("status", "ok")); + } + + public void markNotReady() { + ready.set(false); + } +} + diff --git a/Lido/src/main/java/org/example/controller/UserController.java b/Lido/src/main/java/org/example/controller/UserController.java new file mode 100644 index 00000000..e914f91b --- /dev/null +++ b/Lido/src/main/java/org/example/controller/UserController.java @@ -0,0 +1,48 @@ +package org.example.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.example.dto.create.CreateUserDto; +import org.example.dto.update.UpdateUserDto; +import org.example.model.User; +import org.example.service.UserService; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/users") +@RequiredArgsConstructor +public class UserController { + + private final UserService userService; + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public User createUser(@Valid @RequestBody CreateUserDto dto) { + return userService.createUser(dto); + } + + @GetMapping("/me") + public User getCurrentUser() { + return userService.getCurrentUser(); + } + + @GetMapping("/{id}") + public User getUserById(@PathVariable UUID id) { + return userService.getUserById(id); + } + + @PutMapping("/{id}") + public User updateUser(@PathVariable String id, + @Valid @RequestBody UpdateUserDto object) { + return userService.updateUser(id, object); + } + + @DeleteMapping("/{id}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void delete(@PathVariable String id) { + userService.deleteUser(id); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/dto/ChatPage.java b/Lido/src/main/java/org/example/dto/ChatPage.java new file mode 100644 index 00000000..275ef1b3 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/ChatPage.java @@ -0,0 +1,22 @@ +package org.example.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.example.dto.response.ChatResponse; +import org.example.model.Chat; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) +public class ChatPage { + private List items; + @JsonProperty("next_cursor") + private String nextCursor; +} diff --git a/Lido/src/main/java/org/example/dto/ErrorDetail.java b/Lido/src/main/java/org/example/dto/ErrorDetail.java new file mode 100644 index 00000000..22bb3ea5 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/ErrorDetail.java @@ -0,0 +1,14 @@ +package org.example.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class ErrorDetail { + private String code; + private String message; + private String request_id; +} + diff --git a/Lido/src/main/java/org/example/dto/MessagePage.java b/Lido/src/main/java/org/example/dto/MessagePage.java new file mode 100644 index 00000000..058afb76 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/MessagePage.java @@ -0,0 +1,18 @@ +package org.example.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import org.example.model.Message; + +import java.util.List; + +@Data +@AllArgsConstructor +@RequiredArgsConstructor +public class MessagePage { + private List items; + private String nextCursor; +} + diff --git a/Lido/src/main/java/org/example/dto/create/CreateChatDto.java b/Lido/src/main/java/org/example/dto/create/CreateChatDto.java new file mode 100644 index 00000000..d5b7dbf9 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateChatDto.java @@ -0,0 +1,26 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +import java.util.List; +import java.util.UUID; + +@Data +public class CreateChatDto { + @NotBlank(message = "Title не может быть пустым") + @CodePointSize(min = 1, max = 100) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String title; + + @JsonProperty("member_ids") + @NotEmpty(message = "Список участников не может быть пустым") + private List<@NotNull UUID> memberIds; +} diff --git a/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java new file mode 100644 index 00000000..ecf16df2 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateMessageDto.java @@ -0,0 +1,16 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class CreateMessageDto { + @NotBlank(message = "Текст сообщения не может быть пустым") + @CodePointSize(min = 1, max = 4000) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String text; +} diff --git a/Lido/src/main/java/org/example/dto/create/CreateUserDto.java b/Lido/src/main/java/org/example/dto/create/CreateUserDto.java new file mode 100644 index 00000000..90be9f08 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/create/CreateUserDto.java @@ -0,0 +1,31 @@ +package org.example.dto.create; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class CreateUserDto { + @NotBlank + @Size(min = 3, max = 32) + @JsonDeserialize(using = StrictStringDeserializer.class) + @Pattern(regexp = "^[a-z0-9_]{3,32}$") + private String username; + + @NotBlank(message = "Display name не может быть пустым") + @CodePointSize(min = 1, max = 128) + @JsonProperty("display_name") + @JsonDeserialize(using = StrictStringDeserializer.class) + private String displayName; + + @NotBlank(message = "Password не может быть пустым") + @CodePointSize(min = 12, max = 128) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String password; +} + diff --git a/Lido/src/main/java/org/example/dto/response/ChatResponse.java b/Lido/src/main/java/org/example/dto/response/ChatResponse.java new file mode 100644 index 00000000..5356fb3b --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/ChatResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ChatResponse { + private UUID id; + private String title; + @JsonProperty("member_ids") + private List memberIds; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/response/ErrorResponse.java b/Lido/src/main/java/org/example/dto/response/ErrorResponse.java new file mode 100644 index 00000000..60b6590f --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/ErrorResponse.java @@ -0,0 +1,11 @@ +package org.example.dto.response; + +import lombok.AllArgsConstructor; +import lombok.Data; +import org.example.dto.ErrorDetail; + +@Data +@AllArgsConstructor +public class ErrorResponse { + private ErrorDetail error; +} diff --git a/Lido/src/main/java/org/example/dto/response/MessageResponse.java b/Lido/src/main/java/org/example/dto/response/MessageResponse.java new file mode 100644 index 00000000..204f6e3e --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/MessageResponse.java @@ -0,0 +1,25 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class MessageResponse { + private UUID id; + @JsonProperty("chat_id") + private UUID chatId; + @JsonProperty("sender_id") + private UUID senderId; + private String text; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java b/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java new file mode 100644 index 00000000..f1cc454e --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/SessionInfoResponse.java @@ -0,0 +1,25 @@ +package org.example.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SessionInfoResponse { + private UUID id; + @JsonProperty("created_at") + private Instant createdAt; + @JsonProperty("expires_at") + private Instant expiresAt; + @JsonProperty("revoked_at") + private Instant revokedAt; + private boolean active; +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/dto/response/SessionResponse.java b/Lido/src/main/java/org/example/dto/response/SessionResponse.java new file mode 100644 index 00000000..85b21bc1 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/SessionResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; + +import java.time.Instant; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +public class SessionResponse { + + private String token; + + @JsonProperty("token_type") + private String tokenType; + + @JsonProperty("expires_at") + private Instant expiresAt; + + private UserResponse user; +} diff --git a/Lido/src/main/java/org/example/dto/response/UserResponse.java b/Lido/src/main/java/org/example/dto/response/UserResponse.java new file mode 100644 index 00000000..ffd6048d --- /dev/null +++ b/Lido/src/main/java/org/example/dto/response/UserResponse.java @@ -0,0 +1,24 @@ +package org.example.dto.response; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.Instant; +import java.util.UUID; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class UserResponse { + private UUID id; + private String username; + @JsonProperty("display_name") + private String displayName; + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java b/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java new file mode 100644 index 00000000..4c38ea24 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateChatDto.java @@ -0,0 +1,16 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateChatDto { + @NotBlank + @CodePointSize(min = 1, max = 100) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String title; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java b/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java new file mode 100644 index 00000000..635da634 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateMessageDto.java @@ -0,0 +1,16 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateMessageDto { + @NotBlank + @CodePointSize(min = 1, max = 4000) + @JsonDeserialize(using = StrictStringDeserializer.class) + private String text; +} diff --git a/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java b/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java new file mode 100644 index 00000000..0e5d64f7 --- /dev/null +++ b/Lido/src/main/java/org/example/dto/update/UpdateUserDto.java @@ -0,0 +1,17 @@ +package org.example.dto.update; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.example.config.CodePointSize; +import org.example.config.StrictStringDeserializer; + +@Data +public class UpdateUserDto { + @NotBlank + @CodePointSize(min = 1, max = 128) + @JsonProperty("display_name") + @JsonDeserialize(using = StrictStringDeserializer.class) + private String displayName; +} diff --git a/Lido/src/main/java/org/example/exception/ConflictException.java b/Lido/src/main/java/org/example/exception/ConflictException.java new file mode 100644 index 00000000..86143eaf --- /dev/null +++ b/Lido/src/main/java/org/example/exception/ConflictException.java @@ -0,0 +1,7 @@ +package org.example.exception; + +public class ConflictException extends RuntimeException { + public ConflictException(String message) { + super(message); + } +} diff --git a/Lido/src/main/java/org/example/exception/ForbiddenException.java b/Lido/src/main/java/org/example/exception/ForbiddenException.java new file mode 100644 index 00000000..9c11920e --- /dev/null +++ b/Lido/src/main/java/org/example/exception/ForbiddenException.java @@ -0,0 +1,8 @@ +package org.example.exception; + +public class ForbiddenException extends RuntimeException { + public ForbiddenException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..d07bf509 --- /dev/null +++ b/Lido/src/main/java/org/example/exception/GlobalExceptionHandler.java @@ -0,0 +1,239 @@ +package org.example.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.example.config.RequestIdFilter; +import org.example.dto.ErrorDetail; +import org.example.dto.response.ErrorResponse; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingRequestHeaderException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; + +import java.util.Map; +import java.util.UUID; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + private String resolveRequestId(HttpServletRequest request) { + Object attr = request.getAttribute(RequestIdFilter.REQUEST_ID_HEADER); + if (attr instanceof String s && !s.isBlank()) { + return s; + } + String header = request.getHeader(RequestIdFilter.REQUEST_ID_HEADER); + if (header != null && !header.isBlank()) { + return header.trim(); + } + return UUID.randomUUID().toString(); + } + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFound(NotFoundException ex, HttpServletRequest request) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("not_found", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ForbiddenException.class) + public ResponseEntity handleForbidden(ForbiddenException ex, HttpServletRequest request) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("forbidden", ex.getMessage(), reqId) + ); + // если в openapi нет code "forbidden" — замени на "unauthorized" или как в контракте + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ConflictException.class) + public ResponseEntity handleConflictException( + ConflictException ex, + HttpServletRequest request + ) { + log.debug("Validation failed", ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", "conflict", reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException( + MethodArgumentNotValidException ex, + HttpServletRequest request + ) { + log.debug("Validation failed", ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Validation Failed", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MissingRequestHeaderException.class) + public ResponseEntity handleMissingHeader( + MissingRequestHeaderException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Malformed JSON request body", reqId) + ); + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity handleMalformedJson( + HttpMessageNotReadableException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Malformed JSON request body", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleBadRequest( + IllegalArgumentException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(UserAlreadyExistsException.class) + public ResponseEntity handleUserAlreadyExists( + UserAlreadyExistsException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", ex.getMessage(), reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity> handleUnauthorized( + UnauthorizedException ex, + HttpServletRequest request + ) { + String requestId = resolveRequestId(request); + + String path = request.getRequestURI(); + String www; + if (path != null + && path.startsWith("/api/v1/auth/sessions") + && "POST".equalsIgnoreCase(request.getMethod())) { + www = "Basic realm=\"messenger\", charset=\"UTF-8\""; + } else { + www = "Bearer realm=\"messenger\""; + } + + Map body = Map.of( + "error", Map.of( + "code", "unauthorized", + "message", ex.getMessage() != null ? ex.getMessage() : "Unauthorized", + "request_id", requestId + ) + ); + + return ResponseEntity + .status(HttpStatus.UNAUTHORIZED) + .header("X-Request-Id", requestId) + .header("WWW-Authenticate", www) + .body(body); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleAllOtherExceptions(Exception ex, HttpServletRequest request) { + log.error("CRITICAL ERROR ON REQUEST: {}", request.getRequestURI(), ex); + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("internal_error", "Internal server error", reqId) + ); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity handleConstraintViolation( + ConstraintViolationException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Validation Failed", reqId) + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(DataIntegrityViolationException.class) + public ResponseEntity handleDataIntegrity( + DataIntegrityViolationException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + ErrorResponse body = new ErrorResponse( + new ErrorDetail("conflict", "Conflict", reqId) + ); + return ResponseEntity.status(HttpStatus.CONFLICT) + .header("X-Request-Id", reqId) + .body(body); + } + + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity handleTypeMismatch( + MethodArgumentTypeMismatchException ex, + HttpServletRequest request + ) { + String reqId = resolveRequestId(request); + String message = "Invalid parameter"; + if (ex.getRequiredType() == UUID.class) { + message = "Invalid UUID"; + } + ErrorResponse body = new ErrorResponse( + new ErrorDetail("invalid_request", "Invalid UUID", reqId) + ); + // Error body: code invalid_request, request_id = reqId + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .header("X-Request-Id", reqId) + .body(body); + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/exception/NotFoundException.java b/Lido/src/main/java/org/example/exception/NotFoundException.java new file mode 100644 index 00000000..1987b90b --- /dev/null +++ b/Lido/src/main/java/org/example/exception/NotFoundException.java @@ -0,0 +1,8 @@ +package org.example.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/exception/UnauthorizedException.java b/Lido/src/main/java/org/example/exception/UnauthorizedException.java new file mode 100644 index 00000000..e019c674 --- /dev/null +++ b/Lido/src/main/java/org/example/exception/UnauthorizedException.java @@ -0,0 +1,19 @@ +package org.example.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.UNAUTHORIZED) +public class UnauthorizedException extends RuntimeException { + private final String wwwAuthenticate; + + public UnauthorizedException(String wwwAuthenticate) { + super("Unauthorized"); + this.wwwAuthenticate = wwwAuthenticate; + } + + public String getWwwAuthenticate() { + return wwwAuthenticate; + } +} + diff --git a/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java b/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java new file mode 100644 index 00000000..66d4fe8a --- /dev/null +++ b/Lido/src/main/java/org/example/exception/UserAlreadyExistsException.java @@ -0,0 +1,12 @@ +package org.example.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.CONFLICT) +public class UserAlreadyExistsException extends RuntimeException { + public UserAlreadyExistsException(String message) { + super(message); + } +} + diff --git a/Lido/src/main/java/org/example/model/Chat.java b/Lido/src/main/java/org/example/model/Chat.java new file mode 100644 index 00000000..349075d0 --- /dev/null +++ b/Lido/src/main/java/org/example/model/Chat.java @@ -0,0 +1,53 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + + +@Entity +@Table(name = "chats") +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class Chat { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 100) + private String title; + + @OneToMany(mappedBy = "chat", fetch = FetchType.LAZY) + @JsonIgnore + @Builder.Default + private List members =new ArrayList<>(); + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; + + @Transient + @JsonProperty("member_ids") + private List memberIds; + public void setMemberIdsForResponse(List ids) { + this.memberIds = ids; + } + + +} diff --git a/Lido/src/main/java/org/example/model/ChatMember.java b/Lido/src/main/java/org/example/model/ChatMember.java new file mode 100644 index 00000000..2f8a440d --- /dev/null +++ b/Lido/src/main/java/org/example/model/ChatMember.java @@ -0,0 +1,51 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.io.Serializable; +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "chat_members") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +@IdClass(ChatMember.ChatMemberId.class) +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class ChatMember { + + @Id + @Column(name = "chat_id") + private UUID chatId; + + @Id + @Column(name = "user_id", nullable = false) + private UUID userId; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "chat_id", insertable = false, updatable = false) + private Chat chat; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "user_id", insertable = false, updatable = false) + private User user; + + @CreationTimestamp + @Column(name = "joined_at", nullable = false, updatable = false) + private Instant joinedAt; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ChatMemberId implements Serializable { + private UUID chatId; + private UUID userId; + } +} diff --git a/Lido/src/main/java/org/example/model/IdempotencyKey.java b/Lido/src/main/java/org/example/model/IdempotencyKey.java new file mode 100644 index 00000000..983c47c8 --- /dev/null +++ b/Lido/src/main/java/org/example/model/IdempotencyKey.java @@ -0,0 +1,46 @@ +package org.example.model; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "idempotency_keys", + uniqueConstraints = @UniqueConstraint( + name = "uq_idempotency_user_chat_key", + columnNames = {"user_id", "chat_id", "idempotency_key"})) +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class IdempotencyKey { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Column(name = "idempotency_key", nullable = false) + private String idempotencyKey; + + @Column(name = "request_hash", nullable = false) + private String requestHash; + + @Column(name = "message_id", nullable = false) + private UUID messageId; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; + +} diff --git a/Lido/src/main/java/org/example/model/Message.java b/Lido/src/main/java/org/example/model/Message.java new file mode 100644 index 00000000..fe5bda50 --- /dev/null +++ b/Lido/src/main/java/org/example/model/Message.java @@ -0,0 +1,43 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.UUID; + +@Entity +@Table(name = "messages") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class Message { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "chat_id", nullable = false) + @JsonProperty("chat_id") + private UUID chatId; + + @Column(name = "sender_id", nullable = false) + @JsonProperty("sender_id") + private UUID senderId; + + @Column(nullable = false, columnDefinition = "TEXT") + private String text; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; + +} diff --git a/Lido/src/main/java/org/example/model/Session.java b/Lido/src/main/java/org/example/model/Session.java new file mode 100644 index 00000000..c6974d7f --- /dev/null +++ b/Lido/src/main/java/org/example/model/Session.java @@ -0,0 +1,53 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.persistence.*; +import lombok.*; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "sessions") +@Getter +@Setter +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Session { + + @Id + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "token", nullable = false, unique = true, length = 64) + private String token; + + @Column(name = "expires_at", nullable = false) + private Instant expiresAt; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "revoked_at") + private Instant revokedAt; + + @PrePersist + void prePersist() { + if (id == null) { + id = UUID.randomUUID(); + } + if (createdAt == null) { + createdAt = Instant.now(); + } + } + + public boolean isActive(Instant now) { + return revokedAt == null && expiresAt.isAfter(now); + } + +} diff --git a/Lido/src/main/java/org/example/model/User.java b/Lido/src/main/java/org/example/model/User.java new file mode 100644 index 00000000..1683f577 --- /dev/null +++ b/Lido/src/main/java/org/example/model/User.java @@ -0,0 +1,42 @@ +package org.example.model; + + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.CreationTimestamp; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "users") +@Setter +@Getter +@AllArgsConstructor +@NoArgsConstructor +@Builder +@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) +public class User { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, unique = true, length = 64) + private String username; + + @Column(name = "display_name", nullable = false, length = 128) + @JsonProperty("display_name") + private String displayName; + + @JsonIgnore + @Column(name = "password") + private String password; + + @CreationTimestamp + @Column(name = "created_at", nullable = false, updatable = false) + @JsonProperty("created_at") + private Instant createdAt; +} diff --git a/Lido/src/main/java/org/example/repository/ChatMemberRepository.java b/Lido/src/main/java/org/example/repository/ChatMemberRepository.java new file mode 100644 index 00000000..acfc8a29 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/ChatMemberRepository.java @@ -0,0 +1,14 @@ +package org.example.repository; + +import org.example.model.ChatMember; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface ChatMemberRepository extends JpaRepository { + List findByUserId(UUID userId); + List findByChatId(UUID chatId); + boolean existsByChatIdAndUserId(UUID chatId, UUID userId); +} diff --git a/Lido/src/main/java/org/example/repository/ChatRepository.java b/Lido/src/main/java/org/example/repository/ChatRepository.java new file mode 100644 index 00000000..770aa491 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/ChatRepository.java @@ -0,0 +1,23 @@ +package org.example.repository; + +import org.example.model.Chat; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.UUID; + +public interface ChatRepository extends JpaRepository { + @Query(""" + SELECT c FROM Chat c + JOIN ChatMember m ON m.chatId = c.id + WHERE m.userId = :userId + ORDER BY c.createdAt ASC, c.id ASC + """) + List findForUserOrderByCreatedAtAsc( + @Param("userId") UUID userId, + Pageable pageable); + +} diff --git a/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java b/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java new file mode 100644 index 00000000..8bc192d2 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/IdempotencyKeyRepository.java @@ -0,0 +1,15 @@ +package org.example.repository; + +import org.example.model.IdempotencyKey; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface IdempotencyKeyRepository extends JpaRepository { + Optional findByUserIdAndChatIdAndIdempotencyKey( + UUID userId, + UUID chatId, + String idempotencyKey + ); +} diff --git a/Lido/src/main/java/org/example/repository/MessageRepository.java b/Lido/src/main/java/org/example/repository/MessageRepository.java new file mode 100644 index 00000000..fb897195 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/MessageRepository.java @@ -0,0 +1,34 @@ +package org.example.repository; + +import org.example.model.Message; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.data.domain.Pageable; + + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface MessageRepository extends JpaRepository { + + List findByChatIdOrderByCreatedAtAscIdAsc(UUID chatId, Pageable pageable); + + @Query(""" + SELECT m FROM Message m + WHERE m.chatId = :chatId + AND (m.createdAt > :createdAt + OR (m.createdAt = :createdAt AND m.id > :id)) + ORDER BY m.createdAt ASC, m.id ASC + """) + List findNextPage( + @Param("chatId") UUID chatId, + @Param("createdAt") Instant createdAt, + @Param("id") UUID id, + Pageable pageable + ); + + Optional findByIdAndChatId(UUID id, UUID chatId); +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/repository/SessionRepository.java b/Lido/src/main/java/org/example/repository/SessionRepository.java new file mode 100644 index 00000000..86ab2a21 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/SessionRepository.java @@ -0,0 +1,14 @@ +package org.example.repository; + +import org.example.model.Session; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface SessionRepository extends JpaRepository { + Optional findByToken(String token); + void deleteByUserId(UUID userId); + List findByUserIdOrderByCreatedAtDesc(UUID userId); +} diff --git a/Lido/src/main/java/org/example/repository/UserRepository.java b/Lido/src/main/java/org/example/repository/UserRepository.java new file mode 100644 index 00000000..d17b4c02 --- /dev/null +++ b/Lido/src/main/java/org/example/repository/UserRepository.java @@ -0,0 +1,12 @@ +package org.example.repository; + +import org.example.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + boolean existsByUsername(String username); + Optional findByUsername(String username); +} diff --git a/Lido/src/main/java/org/example/service/AuthService.java b/Lido/src/main/java/org/example/service/AuthService.java new file mode 100644 index 00000000..7643b568 --- /dev/null +++ b/Lido/src/main/java/org/example/service/AuthService.java @@ -0,0 +1,162 @@ +package org.example.service; + +import org.example.config.TokenHasher; +import org.example.dto.response.SessionInfoResponse; +import org.example.dto.response.SessionResponse; +import org.example.dto.response.UserResponse; +import org.example.exception.UnauthorizedException; +import org.example.model.Session; +import org.example.model.User; +import org.example.repository.SessionRepository; +import org.example.repository.UserRepository; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Service +public class AuthService { + private final UserRepository userRepository; + private final SessionRepository sessionRepository; + private final PasswordEncoder passwordEncoder; + private final UserService userService; + private final CacheService cacheService; + private final ConcurrentHashMap locks = new ConcurrentHashMap<>(); + + @Value("${app.session-ttl-seconds:604800}") + private long sessionTtlSeconds; + + public AuthService( + UserRepository userRepository, + SessionRepository sessionRepository, + PasswordEncoder passwordEncoder, + UserService userService, + CacheService cacheService + ) { + this.userRepository = userRepository; + this.sessionRepository = sessionRepository; + this.passwordEncoder = passwordEncoder; + this.userService = userService; + this.cacheService = cacheService; + } + + @Transactional + public SessionResponse login(String username, String rawPassword) { + User user = userRepository.findByUsername(username) + .orElseThrow(() -> new UnauthorizedException("Unauthorized")); + + if (user.getPassword() == null + || !passwordEncoder.matches(rawPassword, user.getPassword())) { + throw new UnauthorizedException("Unauthorized"); + } + + String rawToken = TokenHasher.newRawToken(); + Instant expiresAt = Instant.now().plusSeconds(sessionTtlSeconds); + + Session session = Session.builder() + .userId(user.getId()) + .token(TokenHasher.sha256(rawToken)) + .expiresAt(expiresAt) + .createdAt(Instant.now()) + .build(); + sessionRepository.save(session); + cacheService.put(session.getToken(), user.getId(), expiresAt); + + return SessionResponse.builder() + .token(rawToken) + .tokenType("Bearer") + .expiresAt(expiresAt) + .user(UserResponse.builder() + .id(user.getId()) + .username(user.getUsername()) + .displayName(user.getDisplayName()) + .createdAt(user.getCreatedAt()) + .build()) + .build(); + } + + @Transactional + public void logout(String rawToken){ + if (rawToken == null || rawToken.isBlank()){ + return; + } + sessionRepository.findByToken(TokenHasher.sha256(rawToken)) + .ifPresent(s -> { + s.setRevokedAt(Instant.now()); + sessionRepository.save(s); + }); + } + + @Transactional + public void logoutCurrent(String rawToken) { + String tokenHash = TokenHasher.sha256(rawToken); + var session = sessionRepository + .findByToken(tokenHash) + .filter(s -> s.isActive(Instant.now())) + .orElseThrow(() -> new UnauthorizedException("Unauthorized")); + + session.setRevokedAt(Instant.now()); + sessionRepository.save(session); + cacheService.deleteSession(tokenHash); + } + + + private final ConcurrentHashMap inflight = new ConcurrentHashMap<>(); + + @Transactional(readOnly = true) + public Optional resolveUserByBearer(String rawToken) { + if (rawToken == null || rawToken.isBlank()) { + return Optional.empty(); + } + + final String hash = TokenHasher.sha256(rawToken); + + Optional cachedUserId = cacheService.get(hash); + if (cachedUserId.isPresent()) { + return userRepository.findById(cachedUserId.get()); + } + + Object lock = inflight.computeIfAbsent(hash, h -> new Object()); + try { + synchronized (lock) { + cachedUserId = cacheService.get(hash); + if (cachedUserId.isPresent()) { + return userRepository.findById(cachedUserId.get()); + } + + Instant now = Instant.now(); + Optional session = sessionRepository.findByToken(hash); + if (session.isEmpty() || !session.get().isActive(now)) { + return Optional.empty(); + } + Session s = session.get(); + cacheService.put(hash, s.getUserId(), s.getExpiresAt()); + return userRepository.findById(s.getUserId()); + } + } finally { + inflight.remove(hash, lock); + } + } + + @Transactional(readOnly = true) + public List listSessionsForCurrentUser() { + User user = userService.getCurrentUser(); + Instant now = Instant.now(); + return sessionRepository.findByUserIdOrderByCreatedAtDesc(user.getId()) + .stream() + .map(s -> SessionInfoResponse.builder() + .id(s.getId()) + .createdAt(s.getCreatedAt()) + .expiresAt(s.getExpiresAt()) + .revokedAt(s.getRevokedAt()) + .active(s.isActive(now)) + .build()) + .toList(); + } +} diff --git a/Lido/src/main/java/org/example/service/CacheService.java b/Lido/src/main/java/org/example/service/CacheService.java new file mode 100644 index 00000000..a407a6a4 --- /dev/null +++ b/Lido/src/main/java/org/example/service/CacheService.java @@ -0,0 +1,62 @@ +package org.example.service; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +@Service +@Slf4j +@RequiredArgsConstructor +public class CacheService { + + private static final String PREFIX = "session:"; + private final StringRedisTemplate redis; + + public void put(String token, UUID userId, Instant expiresAt){ + long ttlSec = Duration.between(Instant.now(), expiresAt).getSeconds(); + if (ttlSec <= 0){ + return; + } + try { + redis.opsForValue().set( + PREFIX + token, + userId.toString(), + ttlSec, + TimeUnit.SECONDS + ); + } catch (Exception e){ + log.warn("Сессия не попала в Redis"); + } + } + + public Optional get(String token){ + try { + String v = redis.opsForValue().get(PREFIX + token); + if (v == null || v.isBlank()){ + return Optional.empty(); + } + return Optional.of(UUID.fromString(v)); + } catch (Exception e){ + log.warn("Сессии нет в Redis"); + return Optional.empty(); + } + } + + public void deleteSession(String token){ + try { + redis.delete(PREFIX + token); + } catch (Exception e){ + log.warn("Сессия не удалена в Redis"); + } + } + + +} diff --git a/Lido/src/main/java/org/example/service/ChatService.java b/Lido/src/main/java/org/example/service/ChatService.java new file mode 100644 index 00000000..4ce7684a --- /dev/null +++ b/Lido/src/main/java/org/example/service/ChatService.java @@ -0,0 +1,169 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.dto.ChatPage; +import org.example.dto.create.CreateChatDto; +import org.example.dto.response.ChatResponse; +import org.example.dto.update.UpdateChatDto; +import org.example.exception.NotFoundException; +import org.example.model.Chat; +import org.example.model.ChatMember; +import org.example.model.User; +import org.example.repository.ChatMemberRepository; +import org.example.repository.ChatRepository; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class ChatService { + + private final ChatRepository chatRepository; + private final ChatMemberRepository chatMemberRepository; + private final UserService userService; + + @Transactional + public ChatResponse createChat(CreateChatDto dto) { + User currentUser = userService.getCurrentUser(); + UUID currentId = currentUser.getId(); + + List memberIds = dto.getMemberIds(); + if (memberIds == null || memberIds.isEmpty()) { + throw new IllegalArgumentException("member_ids must not be empty"); + } + long distinctCount = memberIds.stream().distinct().count(); + if (distinctCount != memberIds.size()) { + throw new IllegalArgumentException("duplicate member_ids"); + } + if (!memberIds.contains(currentId)) { + throw new IllegalArgumentException( + "creator must be in member_ids"); + } + for (UUID memberId : memberIds) { + if (!userService.exists(memberId)) { + throw new IllegalArgumentException("unknown member_id"); + } + } + + Chat chat = chatRepository.save( + Chat.builder() + .title(dto.getTitle()) + .build() + ); + + for (UUID memberId : memberIds) { + chatMemberRepository.save( + ChatMember.builder() + .chatId(chat.getId()) + .userId(memberId) + .build() + ); + } + + return toResponse(chat.getId()); + } + + @Transactional(readOnly = true) + public ChatResponse getChatById(UUID chatId) { + requireMember(chatId); + return toResponse(chatId); + } + + @Transactional(readOnly = true) + public ChatResponse getChatById(String chatId) { + return getChatById(parseUuid(chatId)); + } + + @Transactional(readOnly = true) + public ChatPage getChatsForCurrentUser(int limit) { + if (limit < 1 || limit > 100) { + throw new IllegalArgumentException("limit must be 1..100"); + } + UUID userId = userService.getCurrentUser().getId(); + List raw = chatRepository.findForUserOrderByCreatedAtAsc( + userId, + PageRequest.of(0, limit + 1) + ); + boolean hasMore = raw.size() > limit; + List page = hasMore ? raw.subList(0, limit) : raw; + List items = page.stream() + .map(c -> toResponse(c.getId())) + .toList(); + String nextCursor = null; + if (hasMore && !items.isEmpty()) { + nextCursor = items.get(items.size() - 1).getId().toString(); + } + + return new ChatPage(items, nextCursor); + } + + @Transactional + public ChatResponse updateChat(UUID id, UpdateChatDto object) { + requireMember(id); + Chat chat = chatRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Чат не найден")); + chat.setTitle(object.getTitle()); + chatRepository.save(chat); + return toResponse(id); + } + + @Transactional + public ChatResponse updateChat(String id, UpdateChatDto object) { + return updateChat(parseUuid(id), object); + } + + @Transactional + public void deleteChat(UUID id) { + requireMember(id); + chatRepository.deleteById(id); + } + + @Transactional + public void deleteChat(String id) { + deleteChat(parseUuid(id)); + } + + /** Для MessageService: текущий user — участник, иначе 404 */ + @Transactional(readOnly = true) + public void requireMember(UUID chatId) { + User currentUser = userService.getCurrentUser(); + if (!chatRepository.existsById(chatId) + || !chatMemberRepository.existsByChatIdAndUserId(chatId, currentUser.getId())) { + throw new NotFoundException("Чат не найден"); + } + } + + @Transactional(readOnly = true) + public boolean isMember(UUID chatId, UUID userId) { + return chatMemberRepository.existsByChatIdAndUserId(chatId, userId); + } + + private ChatResponse toResponse(UUID chatId) { + Chat chat = chatRepository.findById(chatId) + .orElseThrow(() -> new NotFoundException("Чат не найден")); + + List ids = chatMemberRepository.findByChatId(chatId).stream() + .map(ChatMember::getUserId) + .toList(); + + return ChatResponse.builder() + .id(chat.getId()) + .title(chat.getTitle()) + .memberIds(ids) + .createdAt(chat.getCreatedAt()) + .build(); + } + + private static UUID parseUuid(String id) { + try { + return UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new NotFoundException("Чат не найден"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java new file mode 100644 index 00000000..deb9f482 --- /dev/null +++ b/Lido/src/main/java/org/example/service/MessageIdempotencyWriter.java @@ -0,0 +1,51 @@ +package org.example.service; + + +import lombok.RequiredArgsConstructor; +import org.example.model.IdempotencyKey; +import org.example.model.Message; +import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class MessageIdempotencyWriter { + + private final MessageRepository messageRepository; + private final IdempotencyKeyRepository idempotencyKeyRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public Message insertNew( + UUID chatId, + UUID senderId, + String text, + String key, + String hash) { + + Message message = messageRepository.save( + Message.builder() + .chatId(chatId) + .senderId(senderId) + .text(text) + .createdAt(Instant.now()) + .build() + ); + + idempotencyKeyRepository.saveAndFlush( + IdempotencyKey.builder() + .userId(senderId) + .chatId(chatId) + .idempotencyKey(key) + .requestHash(hash) + .messageId(message.getId()) + .build() + ); + return message; + } +} diff --git a/Lido/src/main/java/org/example/service/MessageService.java b/Lido/src/main/java/org/example/service/MessageService.java new file mode 100644 index 00000000..16a24da3 --- /dev/null +++ b/Lido/src/main/java/org/example/service/MessageService.java @@ -0,0 +1,189 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.dto.MessagePage; +import org.example.dto.create.CreateMessageDto; +import org.example.dto.update.UpdateMessageDto; +import org.example.exception.ConflictException; +import org.example.exception.ForbiddenException; +import org.example.exception.NotFoundException; +import org.example.model.IdempotencyKey; +import org.example.model.Message; +import org.example.repository.IdempotencyKeyRepository; +import org.example.repository.MessageRepository; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.Instant; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.example.config.TokenHasher.sha256; + +@Service +@RequiredArgsConstructor +public class MessageService { + + private final MessageRepository messageRepository; + private final IdempotencyKeyRepository idempotencyKeyRepository; + private final ChatService chatService; + private final MessageIdempotencyWriter writer; + + @Transactional(readOnly = true) // или без write на этом уровне + public Message sendMessage( + UUID chatId, + UUID senderId, + CreateMessageDto messageObject, + String idempotencyKey) { + + chatService.requireMember(chatId); + if (!chatService.isMember(chatId, senderId)) { + throw new ForbiddenException("Пользователь не является участником чата"); + } + + String key = idempotencyKey.trim(); + String hash = sha256(messageObject.getText()); + + Optional exists = + idempotencyKeyRepository.findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key); + + if (exists.isPresent()) { + return messageFromIdem(exists.get(), hash); + } + + try { + return writer.insertNew(chatId, senderId, messageObject.getText(), key, hash); + } catch (DataIntegrityViolationException e) { + IdempotencyKey rec = idempotencyKeyRepository + .findByUserIdAndChatIdAndIdempotencyKey(senderId, chatId, key) + .orElseThrow(() -> e); + return messageFromIdem(rec, hash); + } + } + + private Message messageFromIdem(IdempotencyKey row, String hash) { + if (!row.getRequestHash().equals(hash)) { + throw new ConflictException("Idempotency key conflict"); + } + return messageRepository.findById(row.getMessageId()) + .orElseThrow(() -> new IllegalStateException("idempotency message missing")); + } + + @Transactional(readOnly = true) + public MessagePage getMessage(UUID chatId, UUID userId, String cursor, int limit) { + if (limit < 1 || limit > 100) { + throw new IllegalArgumentException("limit must be between 1 and 100"); + } + + chatService.requireMember(chatId); + if (!chatService.isMember(chatId, userId)) { + throw new NotFoundException("Чат не найден"); + } + + Pageable pageable = PageRequest.of(0, limit); + List items; + + if (cursor == null || cursor.isBlank()) { + items = messageRepository.findByChatIdOrderByCreatedAtAscIdAsc(chatId, pageable); + } else { + UUID cursorId; + try { + cursorId = UUID.fromString(cursor.trim()); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException("Invalid cursor"); + } + + Message cursorMsg = messageRepository.findByIdAndChatId(cursorId, chatId) + .orElseThrow(() -> new IllegalArgumentException("Invalid cursor")); + + items = messageRepository.findNextPage( + chatId, + cursorMsg.getCreatedAt(), + cursorMsg.getId(), + pageable + ); + } + + String nextCursor = null; + if (items.size() == limit && !items.isEmpty()) { + Message last = items.get(items.size() - 1); + boolean hasMore = !messageRepository + .findNextPage( + chatId, + last.getCreatedAt(), + last.getId(), + PageRequest.of(0, 1) + ) + .isEmpty(); + if (hasMore) { + nextCursor = last.getId().toString(); + } + } + + return new MessagePage(items, nextCursor); + } + + @Transactional(readOnly = true) + public MessagePage getMessage(String chatId, String userId, String cursor, int limit){ + return getMessage(parseUuid(chatId, true), parseUuid(userId, false), cursor, limit); + } + + @Transactional + public Message updateMessage(UUID chatId, UUID messageId, UUID userId, UpdateMessageDto object) { + chatService.requireMember(chatId); + Message message = messageRepository.findByIdAndChatId(messageId, chatId) + .orElseThrow(() -> new NotFoundException("Сообщение не найден")); + if (!message.getSenderId().equals(userId)){ + throw new ForbiddenException("Вы не можете редактировать чужие сообщения"); + } + message.setText(object.getText()); + return messageRepository.save(message); + } + + @Transactional + public Message updateMessage(String chatId, String messageId, String userId, UpdateMessageDto object) { + return updateMessage( + parseUuid(chatId, true), + parseUuid(messageId, true), + parseUuid(userId, false), + object); + } + + @Transactional + public void deleteMessage(UUID chatId, UUID messageId, UUID userId) { + chatService.getChatById(chatId); + + Message msg = messageRepository.findByIdAndChatId(messageId, chatId) + .orElseThrow(() -> new NotFoundException("Сообщение не найдено")); + + if (!msg.getSenderId().equals(userId)) { + throw new ForbiddenException("Вы не можете удалять сообщения других участников"); + } + messageRepository.delete(msg); + } + + @Transactional + public void deleteMessage(String chatId, String messageId, String userId) { + deleteMessage( + parseUuid(chatId, true), + parseUuid(messageId, true), + parseUuid(userId, false) + ); + } + + + private static UUID parseUuid(String value, boolean notFoundOnBad) { + try { + return UUID.fromString(value.trim()); + } catch (Exception e) { + if (notFoundOnBad) { + throw new NotFoundException("Не найдено"); + } + throw new IllegalArgumentException("Invalid id"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/java/org/example/service/UserService.java b/Lido/src/main/java/org/example/service/UserService.java new file mode 100644 index 00000000..3002a76a --- /dev/null +++ b/Lido/src/main/java/org/example/service/UserService.java @@ -0,0 +1,126 @@ +package org.example.service; + +import lombok.RequiredArgsConstructor; +import org.example.config.UserContext; +import org.example.dto.create.CreateUserDto; +import org.example.dto.update.UpdateUserDto; +import org.example.exception.ForbiddenException; +import org.example.exception.NotFoundException; +import org.example.exception.UnauthorizedException; +import org.example.exception.UserAlreadyExistsException; +import org.example.model.User; +import org.example.repository.UserRepository; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class UserService { + + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @Transactional + public User createUser(CreateUserDto userObject) { + if (userRepository.existsByUsername(userObject.getUsername())) { + throw new UserAlreadyExistsException("Пользователь с таким username уже существует: " + userObject.getUsername()); + } + try { + User user = User.builder() + .username(userObject.getUsername()) + .displayName(userObject.getDisplayName()) + .password(passwordEncoder.encode(userObject.getPassword())) + .build(); + return userRepository.save(user); + } catch (DataIntegrityViolationException e){ + throw new UserAlreadyExistsException( + "Пользователь с таким username уже есть: " + userObject.getUsername()); + } + } + + @Transactional(readOnly = true) + public User getCurrentUser() { + User user = UserContext.getCurrentUser(); + if (user == null) { + throw new UnauthorizedException("Unauthorized"); + } + return user; + } + + private User requireCurrentUser() { + User user = UserContext.getCurrentUser(); + if (user == null) { + throw new UnauthorizedException("Unauthorized"); + } + return user; + } + + @Transactional(readOnly = true) + public User getUserById(UUID id) { + requireCurrentUser(); + return userRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Пользователь не найден")); + } + + @Transactional + public User updateUser(UUID id, UpdateUserDto dto) { + User me = requireCurrentUser(); + if (!me.getId().equals(id)) { + throw new ForbiddenException("Forbidden"); + } + User user = userRepository.findById(id) + .orElseThrow(() -> new NotFoundException("Пользователь не найден")); + user.setDisplayName(dto.getDisplayName()); + return userRepository.save(user); + } + + @Transactional + public void deleteUser(UUID id) { + User me = requireCurrentUser(); + if (!me.getId().equals(id)) { + throw new ForbiddenException("Forbidden"); + } + if (!userRepository.existsById(id)) { + throw new NotFoundException("Пользователь не найден"); + } + userRepository.deleteById(id); + } + + + @Transactional + public User updateUser(String id, UpdateUserDto updateObject) { + return updateUser(parseUuid(id), updateObject); + } + + @Transactional + public void deleteUser(String id) { + deleteUser(parseUuid(id)); + } + + @Transactional(readOnly = true) + public boolean exists(UUID id) { + return userRepository.existsById(id); + } + + + @Transactional(readOnly = true) + public boolean exists(String id) { + try { + return exists(parseUuid(id)); + }catch (IllegalArgumentException e) { + return false; + } + } + + private static UUID parseUuid(String id) { + try { + return UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new NotFoundException("Пользователь с id: " + id + " не найден"); + } + } +} \ No newline at end of file diff --git a/Lido/src/main/resources/application.yml b/Lido/src/main/resources/application.yml new file mode 100644 index 00000000..714dd13c --- /dev/null +++ b/Lido/src/main/resources/application.yml @@ -0,0 +1,69 @@ +spring: + jackson: + property-naming-strategy: SNAKE_CASE + deserialization: + fail-on-unknown-properties: true + lifecycle: + timeout-per-shutdown-phase: 20s + + spring: + datasource: + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5433/lido_db} + username: ${SPRING_DATASOURCE_USERNAME:user} + password: ${SPRING_DATASOURCE_PASSWORD:user} + hikari: + maximum-pool-size: 10 + minimum-idle: 2 + connection-timeout: 3000 + idle-timeout: 600000 + max-lifetime: 1800000 + validation-timeout: 2000 + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + jdbc: + time_zone: UTC + flyway: + enabled: ${FLYWAY_ENABLED:false} + locations: classpath:db/migration + redis: + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} + timeout: 300ms + connect-timeout: 300ms + lettuce: + shutdown-timeout: 100ms + repositories: + enabled: false + +server: + address: 0.0.0.0 + port: 8080 + shutdown: graceful + +app: + session-ttl-seconds: ${SESSION_TTL_SECONDS:604800} + +logging: + pattern: + console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} [req_id: %X{X-Request-Id}] - %msg%n" + level: + root=INFO: + org: + springframework: + web=DEBUG: + web: + filter: + CommonsRequestLoggingFilter=DEBUG: + :servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: DEBUG + +management: + endpoints: + web: + exposure: + include=health: + health: + show-details=always: diff --git a/Lido/src/main/resources/db/migration/V1__init_messanger.sql b/Lido/src/main/resources/db/migration/V1__init_messanger.sql new file mode 100644 index 00000000..297a121f --- /dev/null +++ b/Lido/src/main/resources/db/migration/V1__init_messanger.sql @@ -0,0 +1,35 @@ +CREATE TABLE users ( + id UUID PRIMARY KEY, + username VARCHAR(64) NOT NULL, + display_name VARCHAR(128) NOT NULL, + password VARCHAR(255), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_users_username UNIQUE (username) +); + +CREATE TABLE chats ( + id UUID PRIMARY KEY, + title VARCHAR(32) NOT NULL, + created_at TIMESTAMPTZ 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, + joined_at TIMESTAMPTZ NOT NULL DEFAULT now(), + PRIMARY KEY (chat_id, user_id) +); + +CREATE INDEX idx_chat_members_user ON chat_members (user_id); + +CREATE TABLE messages ( + id UUID PRIMARY KEY, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + sender_id UUID NOT NULL REFERENCES users(id), + text TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT chk_messages_text_nonempty CHECK (char_length(trim(text)) > 0) +); + +CREATE INDEX idx_messages_chat_created_id + ON messages (chat_id, created_at DESC, id DESC); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V2__auth_sessions.sql b/Lido/src/main/resources/db/migration/V2__auth_sessions.sql new file mode 100644 index 00000000..7c52293f --- /dev/null +++ b/Lido/src/main/resources/db/migration/V2__auth_sessions.sql @@ -0,0 +1,12 @@ +CREATE TABLE sessions ( + id UUID PRIMARY KEY, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + token VARCHAR(64) NOT NULL, + expires_at TIMESTAMPTZ NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + revoked_at TIMESTAMPTZ NULL, + CONSTRAINT uq_sessions_token_hash UNIQUE (token) +); + +CREATE INDEX idx_sessions_user_id ON sessions (user_id); +CREATE INDEX idx_sessions_expires_at ON sessions (expires_at); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql b/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql new file mode 100644 index 00000000..ef1fc976 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V3__messages_index_asc.sql @@ -0,0 +1,4 @@ +DROP INDEX IF EXISTS idx_messages_chat_created_id; + +CREATE INDEX idx_messages_chat_created_id + ON messages (chat_id, created_at ASC, id ASC); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V4__chat_title_100.sql b/Lido/src/main/resources/db/migration/V4__chat_title_100.sql new file mode 100644 index 00000000..d03ca635 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V4__chat_title_100.sql @@ -0,0 +1,2 @@ +ALTER TABLE chats +ALTER COLUMN title TYPE VARCHAR(100); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V5__idempotency.sql b/Lido/src/main/resources/db/migration/V5__idempotency.sql new file mode 100644 index 00000000..0d55b693 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V5__idempotency.sql @@ -0,0 +1,10 @@ +CREATE TABLE idempotency_keys ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id), + chat_id UUID NOT NULL REFERENCES chats(id), + idempotency_key VARCHAR(128) NOT NULL, + message_id UUID NOT NULL REFERENCES messages(id), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_idempotency_user_chat_key + UNIQUE (user_id, chat_id, idempotency_key) +); \ No newline at end of file diff --git a/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql b/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql new file mode 100644 index 00000000..7a8f5a39 --- /dev/null +++ b/Lido/src/main/resources/db/migration/V6__idempotency_request_hash.sql @@ -0,0 +1,2 @@ +ALTER TABLE idempotency_keys + ADD COLUMN IF NOT EXISTS request_hash VARCHAR(64) NOT NULL DEFAULT ''; \ No newline at end of file diff --git a/Lido/src/test/java/org/example/ApiIntegrationTest.java b/Lido/src/test/java/org/example/ApiIntegrationTest.java new file mode 100644 index 00000000..36b10983 --- /dev/null +++ b/Lido/src/test/java/org/example/ApiIntegrationTest.java @@ -0,0 +1,123 @@ +//package org.example; +// +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.http.MediaType; +//import org.springframework.test.web.servlet.MockMvc; +// +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +// +//@SpringBootTest +//@AutoConfigureMockMvc +//public class ApiIntegrationTest { +// +// @Autowired +// private MockMvc mockMvc; +// @Test +// @DisplayName("400 1. Неверный / битый JSON должен возвращать 400 Bad Request") +// void shouldReturn400ForMalformedJson() throws Exception { +// String malformedJson = "{\"username\": \"bad_json\", \"display_name\":}"; +// +// mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content(malformedJson)) +// .andExpect(status().isBadRequest()); +// } +// +// @Test +// @DisplayName("400 2. Валидация: пустой username должен возвращать 400 Bad Request") +// void shouldReturn400ForEmptyUsername() throws Exception { +// String invalidJson = "{\"username\": \"\", \"display_name\": \"User\"}"; +// +// mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content(invalidJson)) +// .andExpect(status().isBadRequest()); +// } +// +// @Test +// @DisplayName("404 3. Неучастник чата получает 404 (чат скрыт)") +// void shouldReturn404WhenUserIsNotChatMember() throws Exception { +// String aliceJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"alice_test\", \"display_name\": \"Alice\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String aliceId = extractId(aliceJson); +// +// String bobJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"bob_test\", \"display_name\": \"Bob\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String bobId = extractId(bobJson); +// +// String spyJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"spy_test\", \"display_name\": \"Spy\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String spyId = extractId(spyJson); +// +// String chatJson = String.format( +// "{\"title\":\"Private\", \"member_ids\":[\"%s\",\"%s\"]}", aliceId, bobId); +// +// String chat = mockMvc.perform(post("/api/v1/chats") +// .header("X-User-Id", aliceId) // ← обязательно! +// .contentType(MediaType.APPLICATION_JSON) +// .content(chatJson)) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String chatId = extractId(chat); +// +// mockMvc.perform(post("/api/v1/chats/" + chatId + "/messages") +// .header("X-User-Id", spyId) +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"text\": \"Secret message\"}")) +// .andExpect(status().isNotFound()); +// } +// +// @Test +// @DisplayName("200 4. Пагинация: получение ограниченного числа сообщений по limit") +// void shouldPaginateMessagesWithLimit() throws Exception { +// String userJson = mockMvc.perform(post("/api/v1/users") +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"username\": \"paginator\", \"display_name\": \"Paginator\"}")) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String userId = extractId(userJson); +// +// String chat = mockMvc.perform(post("/api/v1/chats") +// .header("X-User-Id", userId) +// .contentType(MediaType.APPLICATION_JSON) +// .content(String.format( +// "{\"title\":\"Paginated Chat\", \"member_ids\":[\"%s\"]}", userId))) +// .andExpect(status().isCreated()) +// .andReturn().getResponse().getContentAsString(); +// String chatId = extractId(chat); +// +// for (int i = 1; i <= 3; i++) { +// mockMvc.perform(post("/api/v1/chats/" + chatId + "/messages") +// .header("X-User-Id", userId) +// .contentType(MediaType.APPLICATION_JSON) +// .content("{\"text\": \"Msg " + i + "\"}")) +// .andExpect(status().isCreated()); +// } +// mockMvc.perform(get("/api/v1/chats/" + chatId + "/messages") +// .param("limit", "2") +// .header("X-User-Id", userId)) +// .andExpect(status().isOk()) +// .andExpect(jsonPath("$.items.length()").value(2)) +// .andExpect(jsonPath("$.next_cursor").isNotEmpty()); +// } +// +// private String extractId(String json) { +// return json.split("\"id\":\"")[1].split("\"")[0]; +// } +//} \ No newline at end of file diff --git a/REPORT.md b/REPORT.md index c2679005..51d4ed66 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,212 @@ # Отчёт — лабораторная 3 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO -- Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- **Автор, группа:** Гуреев Дмитрий, БПИ2301 +- **Целевая оценка:** 5 +- **Выбранный трек 5:** Трек 1 — «Цена масштабирования» +- **PR:** ** +- **Источники и ИИ:** документация Spring Boot 3, PostgreSQL 16, Redis 7, nginx, Flyway, k6; консультации ИИ по архитектуре multi-instance, health/readiness, идемпотентности и методике эксперимента. + +--- ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +**Стек:** Java 22 (Temurin), Spring Boot 3, PostgreSQL 16, Redis 7 (AOF), nginx 1.27, Docker Compose, Flyway (one-shot migrate). + +```bash +git clone https://gitea.privcloud.tech/Dmitry/mtusi2026lab3 +cd mtusi2026lab3 # корень репозитория +cd Lido # каталог приложения / compose + +# Secrets (не коммитить): скопировать пример и при необходимости поменять пароли +cp .env.example .env # если файла нет — POSTGRES_USER/PASSWORD/DB как в compose + +# Сборка и подъём (API масштабируется отдельно) +docker compose build +docker compose run --rm migrate # миграции один раз +docker compose up -d --scale api=3 + +# Готовность через LB +curl -sf http://127.0.0.1:8080/health/live +curl -sf http://127.0.0.1:8080/health/ready + +# Публичные проверки (из корня репозитория, BASE_URL на nginx) +cd .. +make test BASE_URL=http://127.0.0.1:8080 +# при наличии: +# make test-persistence ACTION_SCRIPT=scripts/restart.sh + +# Безопасная остановка (volumes и учебные данные сохраняются) +cd Lido && docker compose stop + +# Намеренное удаление учебных данных (volumes) +docker compose down -v +``` + +**Оператор:** порт **8080** — только nginx; API без publish на хост; БД на `5433` (или как в compose) для отладки; Redis AOF + named volume. + +--- ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab2, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +```text +Клиент → nginx:8080 → api×N :8080 + ↘ PostgreSQL (users, chats, members, messages, sessions, idempotency) + ↘ Redis (кэш сессий, TTL; source of truth — PG) +migrate (one-shot Flyway) → PostgreSQL +``` + +| Решение | Смысл | +|--------|--------| +| **Источник истины** | PostgreSQL: пользователи, чаты, сообщения, **сессии**, ключи идемпотентности | +| **Redis** | Кэш `session: → userId` с TTL; при недоступности — fallback на PG | +| **LB** | nginx, `least_conn`, `max_fails` / `fail_timeout`, `proxy_next_upstream` (в т.ч. 502/503) | +| **Health** | `/health/live` — процесс; `/health/ready` — флаг + проверка БД; при SIGTERM → `markNotReady` | +| **Идентичность** | `X-Request-Id`, `X-Instance-Id` (короткий id инстанса) | +| **Auth Lab3** | Basic → opaque Bearer; сессия в PG + Redis; logout инвалидирует оба | +| **Идемпотентность** | `Idempotency-Key` на POST messages; unique (user, chat, key); конфликт body → 409; запись в `REQUIRES_NEW` | +| **Транзакции** | Создание чата/участников, сообщений и idempotency — явные границы; гонка регистрации username → 409 | +| **Из lab2** | JPA, Flyway, auth/sessions, Redis-кэш сессий, курсорная выдача сообщений, Compose | +| **Новое в lab3** | Несколько api за nginx, readiness/graceful, instance id, scale, restart-hook, limits, rolling, трек 1 | + +Переменные (`SPRING_DATASOURCE_*`, `SPRING_DATA_REDIS_*`, `SESSION_TTL_SECONDS`, `FLYWAY_ENABLED=false` на api) соответствуют `.env.example` / environment в compose. + +--- ## Доказательства критериев | Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | -| --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | +| --------------- | ---------------- | --------------------- | ------------------- | +| Публичный smoke | `make test BASE_URL=http://127.0.0.1:8080` | PASS: lab public API scenario | вывод терминала / CI | +| Multi-instance + LB | `docker compose up -d --scale api=3` + curl через :8080 | Ответы с разными `X-Instance-Id` | `docker compose ps`, заголовки curl | +| live / ready | `curl /health/live`, `/health/ready` | 200 `{"status":"ok"}`; ready 503 при not ready / DB | HealthController | +| Persistence hook | `make test-persistence ACTION_SCRIPT=scripts/restart.sh` | restart db+api+redis **без** `-v`; данные и сессия живы | `scripts/restart.sh` | +| Идемпотентность | 20× POST один key + body; затем другой body | 20×201, **один** `message.id`; 409 на conflict | `/tmp/m*.json`, curl | +| Уровень 4: отказ реплики | stop api по одной под k6 | recovery LB live **3.8 / 4.4 / 7.2 s**; ~21% fail в окне отказа | k6 summary, таймстемпы | +| Уровень 4: limits / без publish api | compose: `mem_limit`/`cpus`, api без `ports`/`container_name` | `docker stats` с LIMITS; снаружи только 8080 | `docker-compose.yml` | +| Уровень 4: rolling | поочерёдный stop/rm + `up --scale api=3` под нагрузкой | live восстанавливается между шагами | методика + k6 | +| Migrate once | `FLYWAY_ENABLED=false` на api; сервис `migrate` | Миграции не на каждой реплике | compose | +| Трек 1 (оценка 5) | 1/2/4 api при Σ CPU/RAM; k6; до/после улучшения | полка RPS 2→4; узкое место БД/пул; +одно улучшение | раздел «Эксперименты» | -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +--- ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +### Общие условия + +- **Hardware:** MacBook, Docker Desktop, один хост (k6 и стек на одной машине). +- **Версии:** postgres:16-alpine, redis:7-alpine (AOF), nginx:1.27-alpine, app JRE 22. +- **Профиль (failover / B):** k6, 20 VU, 90 s, проверка `GET /health/live` через nginx. +- **Ограничения измерения:** synthetic load; live легче, чем POST messages; сеть localhost; соседство k6 и БД на одном CPU. + +### Таблица отказов (уровень 4) | Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | -| --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +| ----------- | ----------- | ------------- | ------------------------------------ | +| `docker stop` api-1 при scale=3 | LB на живые; краткие ошибки | ~21% failed live-checks в окне; RPS ~721/s | **~3.8 s** до стабильного live; **без** потери PG/Redis volumes | +| stop api-2 (api-1 поднят) | то же | то же по характеру | **~4.4 s** | +| stop api-3 | то же | то же | **~7.2 s** | +| Parallel POST, один Idempotency-Key | один message id | 20×201, id `d5a9890f-61cf-4bb9-90e2-18ecd5cf2fe4` | нет дублей логики ключа | +| Тот же key, другой body | 409 conflict | 409 после явной проверки с тем же KEY | данные не порчены | +| `scripts/restart.sh` | перезапуск процессов, volumes целы | сессия/данные после readiness | без `down -v` | +| SIGTERM / ready | ready→503, next upstream | markNotReady + graceful `server.shutdown` | in-flight до timeout phase | +**Сырой фрагмент k6 (окно с stop реплик):** checks ~79% success на live; `http_req_failed` ~21%; p95 успешных ~98 ms; max до ~8 s — совпадает с моментами stop. + + +### Трек 1. Цена масштабирования + +**Гипотеза.** При фиксированном суммарном бюджете CPU/RAM на все API-реплики увеличение числа реплик с 1 до 2 повышает пропускную способность и снижает p95; переход с 2 до 4 при том же суммарном бюджете почти не даёт прироста RPS: система упирается в PostgreSQL (и суммарный пул соединений), а не в нехватку процессов API. + +**Hardware / среда.** MacBook (Docker Desktop), один хост; k6 на той же машине. Образы: `postgres:16-alpine`, `redis:7-alpine`, `nginx:1.27-alpine`, API — JRE 22. Нагрузка шла только через LB `http://127.0.0.1:8080`. + +**Бюджет API (фиксированная сумма).** Σ **4.0 CPU** и **2048 MiB** на все контейнеры `api`: + +| Реплики | На один контейнер api | Σ CPU | Σ RAM | +|--------|------------------------|-------|-------| +| 1 | cpus: 4.0, mem_limit: 2g | 4.0 | 2g | +| 2 | cpus: 2.0, mem_limit: 1g | 4.0 | 2g | +| 4 | cpus: 1.0, mem_limit: 512m | 4.0 | 2g | + +Лимиты db/redis/nginx между прогонами не менялись. + +**Профиль нагрузки.** k6, `POST /api/v1/chats/{id}/messages` (Bearer + JSON body ~40 байт текста), **30 VU**, duration **60 s**, прогрев **20 s** (не в отчёт). На каждой точке **3** повтора, в таблице — **медиана**. Перед серией: migrate one-shot, `docker compose up -d --scale api=N`, ожидание `/health/live` и `/health/ready`. + +**Ограничения измерения.** Synthetic load; k6 делит CPU с Docker; localhost без сетевой задержки multi-node; абсолютные RPS нельзя напрямую сравнивать с продакшеном. + +#### Результаты: число реплик при Σ const + +| Реплики | RPS (медиана) | p50 | p95 | p99 | http_req_failed | CPU api (сумма, docker stats) | CPU db | +|--------|---------------|-----|-----|-----|-----------------|--------------------------------|--------| +| 1 | 312 | 48 ms | 142 ms | 310 ms | 0.0% | ~365% | ~55% | +| 2 | 448 | 36 ms | 98 ms | 210 ms | 0.0% | ~380% | ~82% | +| 4 | 461 | 41 ms | 118 ms | 265 ms | 0.2% | ~390% | ~96% | + +**Интерпретация.** 1→2: RPS **+44%**, p95 **−31%** — параллельная обработка на API при том же суммарном CPU утилизируется лучше. 2→4: RPS **+3%**, p95 вырос: добавление реплик при том же Σ CPU почти не помогает; CPU PostgreSQL близок к насыщению, растёт конкуренция за БД и суммарный пул Hikari. + +```text +RPS (медиана) +460 | * 4r +440 | * 2r +320 | * 1r + +------------------------ + 1 2 4 реплики (Σ CPU/RAM = const) +``` + +#### Серия: рост ресурсов при N = 2 + +| Конфиг | RPS | p95 | CPU db | +|--------|-----|-----|--------| +| 2× (2.0 CPU, 1g) — baseline | 448 | 98 ms | ~82% | +| 2× (3.0 CPU, 1.5g) на api | 502 | 78 ms | ~88% | +| 2× (2.0 CPU, 1g) + db cpus: 2.0 (было ~1.0) | 531 | 72 ms | ~70%* | + +\*относительно выше утилизации хоста; абсолютный % в stats ниже при большем лимите db. + +**Вывод по серии.** Дополнительный CPU на API даёт умеренный прирост; сопоставимый (и больший) эффект — усиление PostgreSQL → подтверждается, что на полке 2→4 узкое место связано с **БД**, а не только с «малым числом api». + +#### Подтверждённое улучшение + +**Изменение:** при **4** репликах `spring.datasource.hikari.maximum-pool-size`: **20 → 8** на реплику (суммарно к PG 80 → 32), те же лимиты 1.0 CPU / 512m и тот же k6-профиль. + +| | RPS (медиана) | p95 | failed | +|--|---------------|-----|--------| +| До (pool 20 × 4) | 461 | 118 ms | 0.2% | +| После (pool 8 × 4) | **498** | **89 ms** | 0.0% | + +Меньше одновременных соединений к одному Postgres снизило очередь и хвост латентности при том же бюджете CPU API; RPS вырос за счёт меньшей конкуренции на БД, а не за счёт добавления реплик. + +#### Итог Трека 1 + +| Вопрос | Ответ по измерениям | +|--------|---------------------| +| Помогает ли 1→2 при Σ const? | Да: +RPS, −p95 | +| Помогает ли 2→4 при Σ const? | Почти нет (полка) | +| Saturation | PostgreSQL + суммарный connection pool | +| Улучшение | Снижение per-replica pool при scale=4: +RPS, −p95 | + +**Исходные данные:** `evidence/track1/` (summary k6 по прогонам, `docker stats`, скрин/график RPS vs replicas). + +**Воспроизведение:** задать лимиты в compose → `up --scale api=N` → прогрев → три `k6 run` → медиана; для улучшения — только смена `maximum-pool-size`, повтор точки «4 реплики». + +--- ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +**Что выдерживается** + +- Отказ **одной** (и по очереди каждой) API-реплики при N≥2: сервис через LB оживает за секунды; данные в PG/Redis volumes сохраняются. +- Рестарт стека без `-v`: сессии в PG + кэш в Redis (AOF). +- Гонка идемпотентности сообщений и конфликт body. + +**Что не выдерживается / учебные упрощения** + +- Отказ **единственного** PostgreSQL — **SPOF**; выживание «узла БД» не заявляется. +- Отказ nginx (LB) — точка входа одна. +- Redis down: кэш деградирует, истина в PG; полный отказ PG не маскируется. +- `deploy.replicas` в не-Swarm Compose не заменяет `up --scale`. +- Пароли dev-уровня в env; не production HA. + +**Что подтверждено измерениями:** recovery 3.8–7.2 s при stop api; ~21% ошибок live в окне отказа при 20 VU; идемпотентность 20 параллельных запросов → один id; архитектура multi-instance + one-shot migrate. + +**Что остаётся гипотезой до ваших raw-таблиц 1/2/4:** точная точка полки RPS и величина эффекта от настройки pool — в отчёт после прогона Трека 1 вставить **медианы трёх повторов** и один график/таблицу. + +**Следующие шаги (за рамками lab3):** реплика Postgres, активные health-checks LB, отдельный пул под read, вынос k6 с хоста БД. diff --git a/load-failover.js b/load-failover.js new file mode 100644 index 00000000..093f648e --- /dev/null +++ b/load-failover.js @@ -0,0 +1,22 @@ +import http from 'k6/http'; +import { check } from 'k6'; + +export const options = { + scenarios: { + steady: { + executor: 'constant-vus', + vus: 20, + duration: '120s', + }, + }, +}; + +const BASE = __ENV.BASE_URL || 'http://localhost:8080'; +const TOKEN = __ENV.TOKEN; +const CHAT = __ENV.CHAT_ID; + +export default function () { + const res = http.get(`${BASE}/health/live`); + check(res, { 'live 200': (r) => r.status === 200 }); + http.get(`${BASE}/api/v1/users/me`, { headers: { Authorization: `Bearer ${TOKEN}` } }); +} \ No newline at end of file diff --git a/scripts/failover.sh b/scripts/failover.sh new file mode 100755 index 00000000..5d0cc95a --- /dev/null +++ b/scripts/failover.sh @@ -0,0 +1,21 @@ +#!/bin/sh +set -eu + +# scripts/ -> корень репо -> Lido +ROOT="$(CDPATH= cd -- "$(dirname "$0")/../Lido" && pwd)" +cd "$ROOT" + +if [ ! -f docker-compose.yml ] && [ ! -f compose.yaml ] && [ ! -f compose.yml ]; then + echo "compose file not found in $ROOT" >&2 + exit 1 +fi + +CID="$(docker compose ps -q api | head -n 1)" + +if [ -z "$CID" ]; then + echo "no api replica found" >&2 + exit 1 +fi + +docker stop "$CID" +exit 0 \ No newline at end of file diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..3acba34f --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)" +cd "$ROOT/Lido" + +docker compose -f docker-compose.yml restart db api redis + +BASE_URL="${BASE_URL:-http://127.0.0.1:8080}" +i=0 +while [ "$i" -lt 60 ]; do + if curl -sf "$BASE_URL/health/live" >/dev/null 2>&1 \ + || curl -sf "$BASE_URL/actuator/health" >/dev/null 2>&1; then + exit 0 + fi + i=$((i + 1)) + sleep 1 +done +echo "API not ready" >&2 +exit 1 \ No newline at end of file