From 7a28da9c67fc1643d2fc7eefad04afb19e732cdc Mon Sep 17 00:00:00 2001 From: Ivan Zinchenko Date: Wed, 15 Apr 2026 18:39:01 +0300 Subject: [PATCH] wip --- .env | 13 + .gitattributes | 2 + .gitignore | 33 ++ .mvn/wrapper/maven-wrapper.properties | 3 + Dockerfile | 20 + compose.yaml | 16 + docs/websocket-contract.md | 117 ++++++ mvnw | 295 ++++++++++++++ mvnw.cmd | 189 +++++++++ pom.xml | 194 ++++++++++ postman/README.md | 20 + postman/mts-api.postman_collection.json | 363 ++++++++++++++++++ postman/mts-local.postman_environment.json | 24 ++ .../me/zinch/itmo/mts/MtsApplication.java | 15 + .../zinch/itmo/mts/config/WebCorsConfig.java | 18 + .../itmo/mts/config/WebSocketConfig.java | 24 ++ .../itmo/mts/config/YooKassaProperties.java | 14 + .../itmo/mts/domain/entity/Customer.java | 37 ++ .../zinch/itmo/mts/domain/entity/Order.java | 59 +++ .../itmo/mts/domain/entity/OrderItem.java | 41 ++ .../zinch/itmo/mts/domain/entity/Payment.java | 64 +++ .../zinch/itmo/mts/domain/entity/Product.java | 38 ++ .../me/zinch/itmo/mts/domain/entity/User.java | 44 +++ .../itmo/mts/domain/enums/OrderStatus.java | 7 + .../zinch/itmo/mts/domain/enums/UserRole.java | 7 + .../domain/enums/YooKassaPaymentStatus.java | 8 + .../mts/repository/CustomerRepository.java | 10 + .../itmo/mts/repository/OrderRepository.java | 11 + .../mts/repository/PaymentRepository.java | 10 + .../mts/repository/ProductRepository.java | 8 + .../itmo/mts/repository/UserRepository.java | 13 + .../itmo/mts/service/ServiceException.java | 8 + .../itmo/mts/service/auth/AuthService.java | 17 + .../mts/service/auth/AuthServiceImpl.java | 60 +++ .../mts/service/auth/ForbiddenException.java | 8 + .../mts/service/auth/PasswordService.java | 19 + .../mts/service/auth/SessionAuthService.java | 75 ++++ .../itmo/mts/service/auth/SessionUser.java | 12 + .../service/auth/UnauthorizedException.java | 8 + .../mts/service/manager/ManagerService.java | 9 + .../service/manager/ManagerServiceImpl.java | 29 ++ .../notification/OrderEmailService.java | 8 + .../notification/OrderEmailServiceImpl.java | 55 +++ .../ws/ManagerNotificationEventListener.java | 35 ++ .../ws/ManagerNotificationMessage.java | 14 + .../ws/ManagerNotificationService.java | 61 +++ .../ws/ManagerNotificationType.java | 7 + .../ws/event/NewOrderCreatedEvent.java | 10 + .../ws/event/OrderAssignedEvent.java | 11 + .../ws/event/OrderStatusChangedEvent.java | 11 + .../itmo/mts/service/order/OrderService.java | 25 ++ .../mts/service/order/OrderServiceImpl.java | 310 +++++++++++++++ .../service/order/dto/CreateOrderRequest.java | 11 + .../service/order/dto/OrderItemRequest.java | 9 + .../service/order/dto/UpdateOrderRequest.java | 11 + .../service/payment/CreatePaymentResult.java | 8 + .../payment/YooKassaPaymentService.java | 9 + .../payment/YooKassaPaymentServiceImpl.java | 76 ++++ .../me/zinch/itmo/mts/web/ErrorResponse.java | 9 + .../itmo/mts/web/GlobalExceptionHandler.java | 42 ++ .../itmo/mts/web/auth/AuthController.java | 74 ++++ .../mts/web/auth/dto/AuthUserResponse.java | 12 + .../itmo/mts/web/auth/dto/LoginRequest.java | 16 + .../web/auth/dto/RegisterManagerRequest.java | 28 ++ .../mts/web/manager/ManagerController.java | 43 +++ .../itmo/mts/web/manager/dto/ManagerDto.java | 6 + .../manager/dto/ManagerListItemResponse.java | 9 + .../itmo/mts/web/order/OrderController.java | 123 ++++++ .../order/dto/AssignManagerApiRequest.java | 14 + .../dto/ChangeOrderStatusApiRequest.java | 14 + .../web/order/dto/CreateOrderApiRequest.java | 27 ++ .../order/dto/CreateOrderItemApiRequest.java | 19 + .../order/dto/CreateOrderItemFormRequest.java | 19 + .../mts/web/order/dto/OrderApiResponse.java | 25 ++ .../web/order/dto/OrderItemApiResponse.java | 15 + .../mts/web/order/dto/OrderManagerDto.java | 6 + .../web/order/dto/UpdateOrderApiRequest.java | 27 ++ .../mts/web/order/mapper/OrderMapper.java | 47 +++ src/main/resources/application.yaml | 34 ++ .../zinch/itmo/mts/MtsApplicationTests.java | 13 + 80 files changed, 3255 insertions(+) create mode 100644 .env create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 Dockerfile create mode 100644 compose.yaml create mode 100644 docs/websocket-contract.md create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 postman/README.md create mode 100644 postman/mts-api.postman_collection.json create mode 100644 postman/mts-local.postman_environment.json create mode 100644 src/main/java/me/zinch/itmo/mts/MtsApplication.java create mode 100644 src/main/java/me/zinch/itmo/mts/config/WebCorsConfig.java create mode 100644 src/main/java/me/zinch/itmo/mts/config/WebSocketConfig.java create mode 100644 src/main/java/me/zinch/itmo/mts/config/YooKassaProperties.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/Customer.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/Order.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/OrderItem.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/Payment.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/Product.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/entity/User.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/enums/OrderStatus.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/enums/UserRole.java create mode 100644 src/main/java/me/zinch/itmo/mts/domain/enums/YooKassaPaymentStatus.java create mode 100644 src/main/java/me/zinch/itmo/mts/repository/CustomerRepository.java create mode 100644 src/main/java/me/zinch/itmo/mts/repository/OrderRepository.java create mode 100644 src/main/java/me/zinch/itmo/mts/repository/PaymentRepository.java create mode 100644 src/main/java/me/zinch/itmo/mts/repository/ProductRepository.java create mode 100644 src/main/java/me/zinch/itmo/mts/repository/UserRepository.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/ServiceException.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/AuthService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/AuthServiceImpl.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/ForbiddenException.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/PasswordService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/SessionAuthService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/SessionUser.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/auth/UnauthorizedException.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/manager/ManagerService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/manager/ManagerServiceImpl.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailServiceImpl.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationEventListener.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationMessage.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationType.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/event/NewOrderCreatedEvent.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderAssignedEvent.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderStatusChangedEvent.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/order/OrderService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/order/OrderServiceImpl.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/order/dto/CreateOrderRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/order/dto/OrderItemRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/order/dto/UpdateOrderRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/payment/CreatePaymentResult.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentService.java create mode 100644 src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentServiceImpl.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/ErrorResponse.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/GlobalExceptionHandler.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/auth/AuthController.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/auth/dto/AuthUserResponse.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/auth/dto/LoginRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/auth/dto/RegisterManagerRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/manager/ManagerController.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerDto.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerListItemResponse.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/OrderController.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/AssignManagerApiRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/ChangeOrderStatusApiRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderApiRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemApiRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemFormRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/OrderApiResponse.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/OrderItemApiResponse.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/OrderManagerDto.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/dto/UpdateOrderApiRequest.java create mode 100644 src/main/java/me/zinch/itmo/mts/web/order/mapper/OrderMapper.java create mode 100644 src/main/resources/application.yaml create mode 100644 src/test/java/me/zinch/itmo/mts/MtsApplicationTests.java diff --git a/.env b/.env new file mode 100644 index 0000000..03d5a39 --- /dev/null +++ b/.env @@ -0,0 +1,13 @@ +POSTGRES_URL=jdbc:postgresql://localhost:5432/mts +POSTGRES_USERNAME=postgres +POSTGRES_PASSWORD=0f9640a4311481256172499ae1f01f6ba23c246166f68c1baf9d14c4a65ce5bc + +MAIL_HOST=mail.zinch.me +MAIL_PORT=465 +MAIL_USERNAME=noreply@zinch.me +MAIL_PASSWORD=jAmg4OKlrhuktocN8WEL9zh7t8Vt3E6G +APP_MAIL_FROM=noreply@zinch.me + +YOOKASSA_SHOP_ID=1331618 +YOOKASSA_SECRET_KEY=test_vxpVfxTEa4VDz8QVdo1M9qq_KjMLhi6J76m8FLDn-SA +YOOKASSA_RETURN_URL=https://business.mts.ru/order/return \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..c595b00 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..66a633d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM maven:3.9.9-eclipse-temurin-21 AS builder + +WORKDIR /build + +COPY pom.xml mvnw ./ +COPY .mvn .mvn +RUN chmod +x mvnw + +COPY src src +RUN ./mvnw -q -DskipTests package + +FROM eclipse-temurin:21-jre + +WORKDIR /app + +COPY --from=builder /build/target/*.jar app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java", "-jar", "/app/app.jar"] diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..5fd1ff3 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,16 @@ +services: + postgres: + image: postgres:16-alpine + restart: on-failure + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: 0f9640a4311481256172499ae1f01f6ba23c246166f68c1baf9d14c4a65ce5bc + POSTGRES_DATABASE: mts + PGDATA: /var/lib/postgresql/data/pgdata + ports: + - "5432:5432" + volumes: + - pgdata:/var/lib/postgresql/data + +volumes: + pgdata: \ No newline at end of file diff --git a/docs/websocket-contract.md b/docs/websocket-contract.md new file mode 100644 index 0000000..e6bbec3 --- /dev/null +++ b/docs/websocket-contract.md @@ -0,0 +1,117 @@ +# WebSocket Contract (Manager Notifications) + +## 1. Transport + +- Protocol: `WebSocket + STOMP` +- Handshake endpoint: `/ws` +- Broker prefix: `/topic` +- Application prefix: `/app` (reserved for future client->server messages) + +## 2. Subscriptions + +### 2.1 Senior Manager channel + +- Destination: `/topic/notifications/senior-managers` +- Receives: + - new order created (`NEW_ORDER_CREATED`) + - order status changed (`ORDER_STATUS_CHANGED`) + +### 2.2 Manager personal channel + +- Destination: `/topic/notifications/managers/{managerId}` +- Example: `/topic/notifications/managers/2f7de4ac-6547-4a8e-bd84-f6d4ba81c3f8` +- Receives: + - order assigned to this manager (`ORDER_ASSIGNED`) + +## 3. Message Payload + +All notifications are JSON with this shape: + +```json +{ + "type": "NEW_ORDER_CREATED | ORDER_ASSIGNED | ORDER_STATUS_CHANGED", + "orderId": "uuid", + "managerId": "uuid|null", + "status": "NEW | REJECTED | PLACED", + "timestamp": "2026-04-15T12:34:56.789+03:00" +} +``` + +## 4. Event Semantics + +### 4.1 `NEW_ORDER_CREATED` + +- Sent when customer creates a new order. +- Destination: `/topic/notifications/senior-managers` +- Fields: + - `orderId`: new order id + - `managerId`: `null` + - `status`: `NEW` + +Example: + +```json +{ + "type": "NEW_ORDER_CREATED", + "orderId": "8f2f1407-1b80-4e01-95ae-605fbe8e7fd7", + "managerId": null, + "status": "NEW", + "timestamp": "2026-04-15T13:02:17.001+03:00" +} +``` + +### 4.2 `ORDER_ASSIGNED` + +- Sent when senior manager assigns an order to manager. +- Destination: `/topic/notifications/managers/{managerId}` +- Fields: + - `orderId`: assigned order id + - `managerId`: assigned manager id + - `status`: current order status (usually `NEW`) + +Example: + +```json +{ + "type": "ORDER_ASSIGNED", + "orderId": "8f2f1407-1b80-4e01-95ae-605fbe8e7fd7", + "managerId": "2f7de4ac-6547-4a8e-bd84-f6d4ba81c3f8", + "status": "NEW", + "timestamp": "2026-04-15T13:05:10.450+03:00" +} +``` + +### 4.3 `ORDER_STATUS_CHANGED` + +- Sent when manager changes status (`NEW -> REJECTED | PLACED`). +- Destination: `/topic/notifications/senior-managers` +- Fields: + - `orderId`: changed order id + - `managerId`: manager who owns this order + - `status`: new status (`REJECTED` or `PLACED`) + +Example: + +```json +{ + "type": "ORDER_STATUS_CHANGED", + "orderId": "8f2f1407-1b80-4e01-95ae-605fbe8e7fd7", + "managerId": "2f7de4ac-6547-4a8e-bd84-f6d4ba81c3f8", + "status": "PLACED", + "timestamp": "2026-04-15T13:07:42.913+03:00" +} +``` + +## 5. Ordering and Delivery Guarantees + +- Delivery type: best-effort (in-memory simple broker). +- No persistence/replay. +- No strict ordering guarantee between different topics. + +## 6. Client Integration Notes + +- Subscribe after successful auth and obtaining current user role/id. +- Senior manager UI subscribes to: + - `/topic/notifications/senior-managers` +- Manager UI subscribes to: + - `/topic/notifications/managers/{currentManagerId}` diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..bd8896b --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..5f0a68a --- /dev/null +++ b/pom.xml @@ -0,0 +1,194 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.5 + + + me.zinch.itmo + mts + 0.0.1-SNAPSHOT + mts + mts + + + + + + + + + + + + + + + 21 + 1.6.3 + 0.2.0 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-restclient + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-starter-websocket + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 3.0.2 + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.mindrot + jbcrypt + 0.4 + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-starter-restclient-test + test + + + org.springframework.boot + spring-boot-starter-validation-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.springframework.boot + spring-boot-starter-websocket-test + test + + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-devtools + runtime + + + org.springframework.boot + spring-boot-starter-actuator + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + compile + + compile + + + + + org.projectlombok + lombok + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + ${lombok.mapstruct.binding.version} + + + + + + default-testCompile + test-compile + + testCompile + + + + + org.projectlombok + lombok + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + ${lombok.mapstruct.binding.version} + + + + + + + + + + diff --git a/postman/README.md b/postman/README.md new file mode 100644 index 0000000..9783bf6 --- /dev/null +++ b/postman/README.md @@ -0,0 +1,20 @@ +# Postman Requests + +Files: +- `mts-api.postman_collection.json` +- `mts-local.postman_environment.json` + +## Import + +1. Import collection file. +2. Import environment file. +3. Select environment `mts-local`. + +## Notes + +- Auth is session-based (cookie `JSESSIONID`). +- Run senior and manager flows in different Postman tabs/workspaces if needed. +- Set real values for: + - `managerId` (id of registered manager) + - `orderId` (id of existing order) +- `POST /api/orders` returns `200 OK` with empty body. diff --git a/postman/mts-api.postman_collection.json b/postman/mts-api.postman_collection.json new file mode 100644 index 0000000..a45a8f6 --- /dev/null +++ b/postman/mts-api.postman_collection.json @@ -0,0 +1,363 @@ +{ + "info": { + "name": "MTS API", + "_postman_id": "9f880ad6-2aa0-4aa0-b772-3ba822afc3f0", + "description": "Collection for auth and order endpoints.", + "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" + }, + "variable": [ + { + "key": "baseUrl", + "value": "http://localhost:8080" + }, + { + "key": "orderId", + "value": "00000000-0000-0000-0000-000000000000" + }, + { + "key": "managerId", + "value": "00000000-0000-0000-0000-000000000000" + } + ], + "item": [ + { + "name": "Auth", + "item": [ + { + "name": "Register Senior Manager", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"login\": \"senior1\",\n \"password\": \"password123\",\n \"name\": \"Senior Manager\",\n \"role\": \"SENIOR_MANAGER\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/auth/register", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "register" + ] + } + } + }, + { + "name": "Register Manager", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"login\": \"manager1\",\n \"password\": \"password123\",\n \"name\": \"Manager\",\n \"role\": \"MANAGER\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/auth/register", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "register" + ] + } + } + }, + { + "name": "Login Senior Manager", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"login\": \"senior1\",\n \"password\": \"password123\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/auth/login", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "login" + ] + } + } + }, + { + "name": "Login Manager", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"login\": \"manager1\",\n \"password\": \"password123\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/auth/login", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "login" + ] + } + } + }, + { + "name": "Get Current User", + "request": { + "method": "GET", + "url": { + "raw": "{{baseUrl}}/api/auth/me", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "me" + ] + } + } + }, + { + "name": "Logout", + "request": { + "method": "POST", + "url": { + "raw": "{{baseUrl}}/api/auth/logout", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "auth", + "logout" + ] + } + } + } + ] + }, + { + "name": "Orders", + "item": [ + { + "name": "Create Order (JSON)", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"customerName\": \"Ivan Ivanov\",\n \"phoneNumber\": \"+79991234567\",\n \"email\": \"ivan@example.com\",\n \"items\": [\n {\n \"productId\": \"11111111-1111-1111-1111-111111111111\",\n \"quantity\": 1\n },\n {\n \"productId\": \"22222222-2222-2222-2222-222222222222\",\n \"quantity\": 2\n }\n ]\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/orders", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders" + ] + } + } + }, + { + "name": "Create Order (Form Urlencoded)", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/x-www-form-urlencoded" + } + ], + "body": { + "mode": "urlencoded", + "urlencoded": [ + { + "key": "customerName", + "value": "Ivan Ivanov", + "type": "text" + }, + { + "key": "phoneNumber", + "value": "+79991234567", + "type": "text" + }, + { + "key": "email", + "value": "ivan@example.com", + "type": "text" + }, + { + "key": "items[0].productId", + "value": "11111111-1111-1111-1111-111111111111", + "type": "text" + }, + { + "key": "items[0].quantity", + "value": "1", + "type": "text" + }, + { + "key": "items[1].productId", + "value": "22222222-2222-2222-2222-222222222222", + "type": "text" + }, + { + "key": "items[1].quantity", + "value": "2", + "type": "text" + } + ] + }, + "url": { + "raw": "{{baseUrl}}/api/orders", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders" + ] + } + } + }, + { + "name": "Get Orders (by role)", + "request": { + "method": "GET", + "url": { + "raw": "{{baseUrl}}/api/orders", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders" + ] + } + } + }, + { + "name": "Assign Manager to Order (Senior Session)", + "request": { + "method": "POST", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"managerId\": \"{{managerId}}\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/orders/{{orderId}}/manager", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders", + "{{orderId}}", + "manager" + ] + } + } + }, + { + "name": "Edit Order (Manager Session)", + "request": { + "method": "PUT", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"customerName\": \"Ivan Ivanov\",\n \"phoneNumber\": \"+79991234567\",\n \"email\": \"ivan@example.com\",\n \"items\": [\n {\n \"productId\": \"11111111-1111-1111-1111-111111111111\",\n \"quantity\": 3\n }\n ]\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/orders/{{orderId}}", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders", + "{{orderId}}" + ] + } + } + }, + { + "name": "Change Order Status (Manager Session)", + "request": { + "method": "PATCH", + "header": [ + { + "key": "Content-Type", + "value": "application/json" + } + ], + "body": { + "mode": "raw", + "raw": "{\n \"status\": \"PLACED\"\n}" + }, + "url": { + "raw": "{{baseUrl}}/api/orders/{{orderId}}/status", + "host": [ + "{{baseUrl}}" + ], + "path": [ + "api", + "orders", + "{{orderId}}", + "status" + ] + } + } + } + ] + } + ] +} diff --git a/postman/mts-local.postman_environment.json b/postman/mts-local.postman_environment.json new file mode 100644 index 0000000..3c27e86 --- /dev/null +++ b/postman/mts-local.postman_environment.json @@ -0,0 +1,24 @@ +{ + "id": "5d2cb31e-9f96-4fe8-9ea3-f58a51b613ec", + "name": "mts-local", + "values": [ + { + "key": "baseUrl", + "value": "http://localhost:8080", + "enabled": true + }, + { + "key": "orderId", + "value": "00000000-0000-0000-0000-000000000000", + "enabled": true + }, + { + "key": "managerId", + "value": "00000000-0000-0000-0000-000000000000", + "enabled": true + } + ], + "_postman_variable_scope": "environment", + "_postman_exported_at": "2026-04-15T12:00:00.000Z", + "_postman_exported_using": "Postman/11" +} diff --git a/src/main/java/me/zinch/itmo/mts/MtsApplication.java b/src/main/java/me/zinch/itmo/mts/MtsApplication.java new file mode 100644 index 0000000..194882b --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/MtsApplication.java @@ -0,0 +1,15 @@ +package me.zinch.itmo.mts; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; + +@SpringBootApplication +@ConfigurationPropertiesScan +public class MtsApplication { + + public static void main(String[] args) { + SpringApplication.run(MtsApplication.class, args); + } + +} diff --git a/src/main/java/me/zinch/itmo/mts/config/WebCorsConfig.java b/src/main/java/me/zinch/itmo/mts/config/WebCorsConfig.java new file mode 100644 index 0000000..1301cfc --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/config/WebCorsConfig.java @@ -0,0 +1,18 @@ +package me.zinch.itmo.mts.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebCorsConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost:3000", "http://localhost:3001") + .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") + .allowedHeaders("*") + .allowCredentials(true); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/config/WebSocketConfig.java b/src/main/java/me/zinch/itmo/mts/config/WebSocketConfig.java new file mode 100644 index 0000000..704877c --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/config/WebSocketConfig.java @@ -0,0 +1,24 @@ +package me.zinch.itmo.mts.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; + +@Configuration +@EnableWebSocketMessageBroker +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { + + @Override + public void configureMessageBroker(MessageBrokerRegistry registry) { + registry.enableSimpleBroker("/topic"); + registry.setApplicationDestinationPrefixes("/app"); + } + + @Override + public void registerStompEndpoints(StompEndpointRegistry registry) { + registry.addEndpoint("/ws") + .setAllowedOrigins("http://localhost:3000", "http://localhost:3001"); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/config/YooKassaProperties.java b/src/main/java/me/zinch/itmo/mts/config/YooKassaProperties.java new file mode 100644 index 0000000..1dd56ab --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/config/YooKassaProperties.java @@ -0,0 +1,14 @@ +package me.zinch.itmo.mts.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "yookassa") +public record YooKassaProperties( + String apiUrl, + String shopId, + String secretKey, + Boolean capture, + String currency, + String returnUrl +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/Customer.java b/src/main/java/me/zinch/itmo/mts/domain/entity/Customer.java new file mode 100644 index 0000000..03d8e86 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/Customer.java @@ -0,0 +1,37 @@ +package me.zinch.itmo.mts.domain.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "customers") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Customer { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 150) + private String name; + + @Column(nullable = false, length = 32) + private String phoneNumber; + + @Column(nullable = false, length = 150) + private String email; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/Order.java b/src/main/java/me/zinch/itmo/mts/domain/entity/Order.java new file mode 100644 index 0000000..0468a58 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/Order.java @@ -0,0 +1,59 @@ +package me.zinch.itmo.mts.domain.entity; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "orders") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Order { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(optional = false) + @JoinColumn(name = "customer_id", nullable = false) + private Customer customer; + + @ManyToOne + @JoinColumn(name = "manager_id") + private User manager; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 32) + private OrderStatus status; + + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + @Builder.Default + private List items = new ArrayList<>(); + + @Column(nullable = false) + private OffsetDateTime createdAt; + + private OffsetDateTime updatedAt; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/OrderItem.java b/src/main/java/me/zinch/itmo/mts/domain/entity/OrderItem.java new file mode 100644 index 0000000..e745a79 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/OrderItem.java @@ -0,0 +1,41 @@ +package me.zinch.itmo.mts.domain.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "order_items") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class OrderItem { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(optional = false) + @JoinColumn(name = "order_id", nullable = false) + private Order order; + + @ManyToOne(optional = false) + @JoinColumn(name = "product_id", nullable = false) + private Product product; + + @Column(nullable = false) + private Integer quantity; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/Payment.java b/src/main/java/me/zinch/itmo/mts/domain/entity/Payment.java new file mode 100644 index 0000000..deb7664 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/Payment.java @@ -0,0 +1,64 @@ +package me.zinch.itmo.mts.domain.entity; + +import me.zinch.itmo.mts.domain.enums.YooKassaPaymentStatus; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "payments") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Payment { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @OneToOne(optional = false) + @JoinColumn(name = "order_id", nullable = false, unique = true) + private Order order; + + @Column(unique = true, length = 64) + private String yooKassaPaymentId; + + @Column(nullable = false, unique = true, length = 64) + private String idempotenceKey; + + @Column(nullable = false, precision = 12, scale = 2) + private BigDecimal amount; + + @Column(nullable = false, length = 3) + private String currency; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 32) + private YooKassaPaymentStatus status; + + @Column(length = 1024) + private String confirmationUrl; + + @Column(length = 1024) + private String returnUrl; + + @Column(nullable = false) + private OffsetDateTime createdAt; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/Product.java b/src/main/java/me/zinch/itmo/mts/domain/entity/Product.java new file mode 100644 index 0000000..5fe9adc --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/Product.java @@ -0,0 +1,38 @@ +package me.zinch.itmo.mts.domain.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.math.BigDecimal; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "products") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class Product { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 200) + private String name; + + @Column(nullable = false, columnDefinition = "TEXT") + private String description; + + @Column(nullable = false, precision = 12, scale = 2) + private BigDecimal price; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/entity/User.java b/src/main/java/me/zinch/itmo/mts/domain/entity/User.java new file mode 100644 index 0000000..7d62dc7 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/entity/User.java @@ -0,0 +1,44 @@ +package me.zinch.itmo.mts.domain.entity; + +import me.zinch.itmo.mts.domain.enums.UserRole; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name = "users") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, unique = true, length = 100) + private String login; + + @Column(nullable = false) + private String password; + + @Column(nullable = false, length = 150) + private String name; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 32) + private UserRole role; +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/enums/OrderStatus.java b/src/main/java/me/zinch/itmo/mts/domain/enums/OrderStatus.java new file mode 100644 index 0000000..94930a1 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/enums/OrderStatus.java @@ -0,0 +1,7 @@ +package me.zinch.itmo.mts.domain.enums; + +public enum OrderStatus { + NEW, + REJECTED, + PLACED +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/enums/UserRole.java b/src/main/java/me/zinch/itmo/mts/domain/enums/UserRole.java new file mode 100644 index 0000000..1950c4b --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/enums/UserRole.java @@ -0,0 +1,7 @@ +package me.zinch.itmo.mts.domain.enums; + +public enum UserRole { + ANONYMOUS_BUYER, + MANAGER, + SENIOR_MANAGER +} diff --git a/src/main/java/me/zinch/itmo/mts/domain/enums/YooKassaPaymentStatus.java b/src/main/java/me/zinch/itmo/mts/domain/enums/YooKassaPaymentStatus.java new file mode 100644 index 0000000..cc43f8a --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/domain/enums/YooKassaPaymentStatus.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.domain.enums; + +public enum YooKassaPaymentStatus { + PENDING, + WAITING_FOR_CAPTURE, + SUCCEEDED, + CANCELED +} diff --git a/src/main/java/me/zinch/itmo/mts/repository/CustomerRepository.java b/src/main/java/me/zinch/itmo/mts/repository/CustomerRepository.java new file mode 100644 index 0000000..9bb826e --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/repository/CustomerRepository.java @@ -0,0 +1,10 @@ +package me.zinch.itmo.mts.repository; + +import me.zinch.itmo.mts.domain.entity.Customer; +import java.util.Optional; +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CustomerRepository extends JpaRepository { + Optional findByEmail(String email); +} diff --git a/src/main/java/me/zinch/itmo/mts/repository/OrderRepository.java b/src/main/java/me/zinch/itmo/mts/repository/OrderRepository.java new file mode 100644 index 0000000..5a4221e --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/repository/OrderRepository.java @@ -0,0 +1,11 @@ +package me.zinch.itmo.mts.repository; + +import me.zinch.itmo.mts.domain.entity.Order; +import java.util.List; +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.domain.Sort; + +public interface OrderRepository extends JpaRepository { + List findAllByManagerId(UUID managerId, Sort sort); +} diff --git a/src/main/java/me/zinch/itmo/mts/repository/PaymentRepository.java b/src/main/java/me/zinch/itmo/mts/repository/PaymentRepository.java new file mode 100644 index 0000000..6afc7ec --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/repository/PaymentRepository.java @@ -0,0 +1,10 @@ +package me.zinch.itmo.mts.repository; + +import me.zinch.itmo.mts.domain.entity.Payment; +import java.util.Optional; +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PaymentRepository extends JpaRepository { + Optional findByOrderId(UUID orderId); +} diff --git a/src/main/java/me/zinch/itmo/mts/repository/ProductRepository.java b/src/main/java/me/zinch/itmo/mts/repository/ProductRepository.java new file mode 100644 index 0000000..c2d362b --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/repository/ProductRepository.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.repository; + +import me.zinch.itmo.mts.domain.entity.Product; +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ProductRepository extends JpaRepository { +} diff --git a/src/main/java/me/zinch/itmo/mts/repository/UserRepository.java b/src/main/java/me/zinch/itmo/mts/repository/UserRepository.java new file mode 100644 index 0000000..3b345d9 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/repository/UserRepository.java @@ -0,0 +1,13 @@ +package me.zinch.itmo.mts.repository; + +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.domain.enums.UserRole; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { + Optional findByLogin(String login); + List findAllByRole(UserRole role); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/ServiceException.java b/src/main/java/me/zinch/itmo/mts/service/ServiceException.java new file mode 100644 index 0000000..6ffae64 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/ServiceException.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.service; + +public class ServiceException extends RuntimeException { + + public ServiceException(String message) { + super(message); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/AuthService.java b/src/main/java/me/zinch/itmo/mts/service/auth/AuthService.java new file mode 100644 index 0000000..364de26 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/AuthService.java @@ -0,0 +1,17 @@ +package me.zinch.itmo.mts.service.auth; + +import me.zinch.itmo.mts.web.auth.dto.LoginRequest; +import me.zinch.itmo.mts.web.auth.dto.RegisterManagerRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + +public interface AuthService { + + SessionUser registerManager(RegisterManagerRequest request, HttpServletRequest servletRequest); + + SessionUser login(LoginRequest request, HttpServletRequest servletRequest); + + void logout(HttpSession session); + + SessionUser getCurrentUser(HttpSession session); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/AuthServiceImpl.java b/src/main/java/me/zinch/itmo/mts/service/auth/AuthServiceImpl.java new file mode 100644 index 0000000..c57dce5 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/AuthServiceImpl.java @@ -0,0 +1,60 @@ +package me.zinch.itmo.mts.service.auth; + +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.domain.enums.UserRole; +import me.zinch.itmo.mts.repository.UserRepository; +import me.zinch.itmo.mts.service.ServiceException; +import me.zinch.itmo.mts.web.auth.dto.LoginRequest; +import me.zinch.itmo.mts.web.auth.dto.RegisterManagerRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional +public class AuthServiceImpl implements AuthService { + + private final UserRepository userRepository; + private final PasswordService passwordService; + private final SessionAuthService sessionAuthService; + + @Override + public SessionUser registerManager(RegisterManagerRequest request, HttpServletRequest servletRequest) { + if (userRepository.findByLogin(request.getLogin()).isPresent()) { + throw new ServiceException("Логин уже занят"); + } + + User user = User.builder() + .login(request.getLogin()) + .password(passwordService.hash(request.getPassword())) + .name(request.getName()) + .role(request.getRole()) + .build(); + User saved = userRepository.save(user); + return sessionAuthService.authenticate(servletRequest, saved); + } + + @Override + @Transactional(readOnly = true) + public SessionUser login(LoginRequest request, HttpServletRequest servletRequest) { + User user = userRepository.findByLogin(request.getLogin()) + .orElseThrow(() -> new UnauthorizedException("Неправильный пароль или логин")); + if (!passwordService.matches(request.getPassword(), user.getPassword())) { + throw new UnauthorizedException("Неправильный пароль или логин"); + } + return sessionAuthService.authenticate(servletRequest, user); + } + + @Override + public void logout(HttpSession session) { + sessionAuthService.logout(session); + } + + @Override + public SessionUser getCurrentUser(HttpSession session) { + return sessionAuthService.requireAuthenticated(session); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/ForbiddenException.java b/src/main/java/me/zinch/itmo/mts/service/auth/ForbiddenException.java new file mode 100644 index 0000000..2fa8a19 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/ForbiddenException.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.service.auth; + +public class ForbiddenException extends RuntimeException { + + public ForbiddenException(String message) { + super(message); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/PasswordService.java b/src/main/java/me/zinch/itmo/mts/service/auth/PasswordService.java new file mode 100644 index 0000000..980ca48 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/PasswordService.java @@ -0,0 +1,19 @@ +package me.zinch.itmo.mts.service.auth; + +import org.mindrot.jbcrypt.BCrypt; +import org.springframework.stereotype.Service; + +@Service +public class PasswordService { + + public String hash(String rawPassword) { + return BCrypt.hashpw(rawPassword, BCrypt.gensalt()); + } + + public boolean matches(String rawPassword, String hashedPassword) { + if (hashedPassword == null || hashedPassword.isBlank()) { + return false; + } + return BCrypt.checkpw(rawPassword, hashedPassword); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/SessionAuthService.java b/src/main/java/me/zinch/itmo/mts/service/auth/SessionAuthService.java new file mode 100644 index 0000000..7ff1393 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/SessionAuthService.java @@ -0,0 +1,75 @@ +package me.zinch.itmo.mts.service.auth; + +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.domain.enums.UserRole; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import java.util.Arrays; +import java.util.Set; +import java.util.UUID; +import org.springframework.stereotype.Service; + +@Service +public class SessionAuthService { + + private static final String USER_ID = "auth.user.id"; + private static final String USER_LOGIN = "auth.user.login"; + private static final String USER_NAME = "auth.user.name"; + private static final String USER_ROLE = "auth.user.role"; + + public SessionUser authenticate(HttpServletRequest request, User user) { + HttpSession oldSession = request.getSession(false); + if (oldSession != null) { + oldSession.invalidate(); + } + + HttpSession session = request.getSession(true); + session.setAttribute(USER_ID, user.getId().toString()); + session.setAttribute(USER_LOGIN, user.getLogin()); + session.setAttribute(USER_NAME, user.getName()); + session.setAttribute(USER_ROLE, user.getRole().name()); + + return toSessionUser(session); + } + + public void logout(HttpSession session) { + if (session != null) { + session.invalidate(); + } + } + + public SessionUser requireAuthenticated(HttpSession session) { + if (session == null) { + throw new UnauthorizedException("Требуется авторизация"); + } + return toSessionUser(session); + } + + public SessionUser requireRole(HttpSession session, UserRole... roles) { + SessionUser user = requireAuthenticated(session); + Set allowedRoles = Set.copyOf(Arrays.asList(roles)); + if (!allowedRoles.contains(user.role())) { + throw new ForbiddenException("Недостаточно прав"); + } + return user; + } + + private SessionUser toSessionUser(HttpSession session) { + Object id = session.getAttribute(USER_ID); + Object login = session.getAttribute(USER_LOGIN); + Object name = session.getAttribute(USER_NAME); + Object role = session.getAttribute(USER_ROLE); + + if (!(id instanceof String idValue) || !(login instanceof String loginValue) + || !(name instanceof String nameValue) || !(role instanceof String roleValue)) { + throw new UnauthorizedException("Invalid session"); + } + + return new SessionUser( + UUID.fromString(idValue), + loginValue, + nameValue, + UserRole.valueOf(roleValue) + ); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/SessionUser.java b/src/main/java/me/zinch/itmo/mts/service/auth/SessionUser.java new file mode 100644 index 0000000..15947d5 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/SessionUser.java @@ -0,0 +1,12 @@ +package me.zinch.itmo.mts.service.auth; + +import me.zinch.itmo.mts.domain.enums.UserRole; +import java.util.UUID; + +public record SessionUser( + UUID id, + String login, + String name, + UserRole role +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/auth/UnauthorizedException.java b/src/main/java/me/zinch/itmo/mts/service/auth/UnauthorizedException.java new file mode 100644 index 0000000..53e6eba --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/auth/UnauthorizedException.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.service.auth; + +public class UnauthorizedException extends RuntimeException { + + public UnauthorizedException(String message) { + super(message); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/manager/ManagerService.java b/src/main/java/me/zinch/itmo/mts/service/manager/ManagerService.java new file mode 100644 index 0000000..dbc96e1 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/manager/ManagerService.java @@ -0,0 +1,9 @@ +package me.zinch.itmo.mts.service.manager; + +import me.zinch.itmo.mts.domain.entity.User; +import java.util.List; +import java.util.UUID; + +public interface ManagerService { + List getManagersForSenior(UUID requesterId); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/manager/ManagerServiceImpl.java b/src/main/java/me/zinch/itmo/mts/service/manager/ManagerServiceImpl.java new file mode 100644 index 0000000..18f33f5 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/manager/ManagerServiceImpl.java @@ -0,0 +1,29 @@ +package me.zinch.itmo.mts.service.manager; + +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.domain.enums.UserRole; +import me.zinch.itmo.mts.repository.UserRepository; +import me.zinch.itmo.mts.service.ServiceException; +import java.util.List; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class ManagerServiceImpl implements ManagerService { + + private final UserRepository userRepository; + + @Override + public List getManagersForSenior(UUID requesterId) { + User requester = userRepository.findById(requesterId) + .orElseThrow(() -> new ServiceException("Пользователь не найден: " + requesterId)); + if (requester.getRole() != UserRole.SENIOR_MANAGER) { + throw new ServiceException("Только старший менеджер может назначать на обработку заказа"); + } + return userRepository.findAllByRole(UserRole.MANAGER); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailService.java b/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailService.java new file mode 100644 index 0000000..36ff714 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailService.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.service.notification; + +import me.zinch.itmo.mts.domain.entity.Order; +import java.math.BigDecimal; + +public interface OrderEmailService { + void sendOrderPlacedEmail(Order order, String paymentUrl, BigDecimal totalAmount); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailServiceImpl.java b/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailServiceImpl.java new file mode 100644 index 0000000..59c7db7 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/OrderEmailServiceImpl.java @@ -0,0 +1,55 @@ +package me.zinch.itmo.mts.service.notification; + +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.domain.entity.OrderItem; +import java.math.BigDecimal; +import java.math.RoundingMode; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class OrderEmailServiceImpl implements OrderEmailService { + + private final JavaMailSender mailSender; + + @Value("${app.mail.from}") + private String from; + + @Override + public void sendOrderPlacedEmail(Order order, String paymentUrl, BigDecimal totalAmount) { + SimpleMailMessage message = new SimpleMailMessage(); + message.setFrom(from); + message.setTo(order.getCustomer().getEmail()); + message.setSubject("Заказ " + order.getId() + ": подтверждение и оплата"); + message.setText(buildBody(order, paymentUrl, totalAmount)); + mailSender.send(message); + } + + private String buildBody(Order order, String paymentUrl, BigDecimal totalAmount) { + StringBuilder builder = new StringBuilder(); + builder.append("Здравствуйте, ").append(order.getCustomer().getName()).append("!\n\n") + .append("Ваш заказ согласован менеджером.\n") + .append("Номер заказа: ").append(order.getId()).append("\n") + .append("Состав заказа:\n"); + + for (OrderItem item : order.getItems()) { + BigDecimal lineTotal = item.getProduct().getPrice() + .multiply(BigDecimal.valueOf(item.getQuantity())) + .setScale(2, RoundingMode.HALF_UP); + builder.append("- ") + .append(item.getProduct().getName()) + .append(", кол-во: ").append(item.getQuantity()) + .append(", сумма: ").append(lineTotal.toPlainString()) + .append('\n'); + } + + builder.append("\nИтого: ").append(totalAmount.setScale(2, RoundingMode.HALF_UP).toPlainString()).append('\n') + .append("Ссылка на оплату: ").append(paymentUrl).append("\n\n") + .append("Спасибо за заказ!"); + return builder.toString(); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationEventListener.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationEventListener.java new file mode 100644 index 0000000..676bcf0 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationEventListener.java @@ -0,0 +1,35 @@ +package me.zinch.itmo.mts.service.notification.ws; + +import me.zinch.itmo.mts.service.notification.ws.event.NewOrderCreatedEvent; +import me.zinch.itmo.mts.service.notification.ws.event.OrderAssignedEvent; +import me.zinch.itmo.mts.service.notification.ws.event.OrderStatusChangedEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Component +@RequiredArgsConstructor +public class ManagerNotificationEventListener { + + private final ManagerNotificationService managerNotificationService; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void onNewOrderCreated(NewOrderCreatedEvent event) { + managerNotificationService.notifyNewOrderCreated(event.orderId(), event.status()); + } + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void onOrderAssigned(OrderAssignedEvent event) { + managerNotificationService.notifyOrderAssigned(event.orderId(), event.managerId(), event.status()); + } + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void onOrderStatusChanged(OrderStatusChangedEvent event) { + managerNotificationService.notifyOrderStatusChangedForSeniorManagers( + event.orderId(), + event.managerId(), + event.status() + ); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationMessage.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationMessage.java new file mode 100644 index 0000000..ffbb493 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationMessage.java @@ -0,0 +1,14 @@ +package me.zinch.itmo.mts.service.notification.ws; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import java.time.OffsetDateTime; +import java.util.UUID; + +public record ManagerNotificationMessage( + ManagerNotificationType type, + UUID orderId, + UUID managerId, + OrderStatus status, + OffsetDateTime timestamp +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationService.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationService.java new file mode 100644 index 0000000..ce8ceed --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationService.java @@ -0,0 +1,61 @@ +package me.zinch.itmo.mts.service.notification.ws; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import java.time.OffsetDateTime; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.messaging.simp.SimpMessagingTemplate; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Slf4j +public class ManagerNotificationService { + + private static final String SENIOR_TOPIC = "/topic/notifications/senior-managers"; + private static final String MANAGER_TOPIC_PREFIX = "/topic/notifications/managers/"; + + private final SimpMessagingTemplate messagingTemplate; + + public void notifyNewOrderCreated(UUID orderId, OrderStatus status) { + ManagerNotificationMessage payload = new ManagerNotificationMessage( + ManagerNotificationType.NEW_ORDER_CREATED, + orderId, + null, + status, + OffsetDateTime.now() + ); + send(SENIOR_TOPIC, payload); + } + + public void notifyOrderAssigned(UUID orderId, UUID managerId, OrderStatus status) { + ManagerNotificationMessage payload = new ManagerNotificationMessage( + ManagerNotificationType.ORDER_ASSIGNED, + orderId, + managerId, + status, + OffsetDateTime.now() + ); + send(MANAGER_TOPIC_PREFIX + managerId, payload); + } + + public void notifyOrderStatusChangedForSeniorManagers(UUID orderId, UUID managerId, OrderStatus status) { + ManagerNotificationMessage payload = new ManagerNotificationMessage( + ManagerNotificationType.ORDER_STATUS_CHANGED, + orderId, + managerId, + status, + OffsetDateTime.now() + ); + send(SENIOR_TOPIC, payload); + } + + private void send(String destination, ManagerNotificationMessage payload) { + try { + messagingTemplate.convertAndSend(destination, payload); + } catch (Exception e) { + log.warn("Failed to send websocket notification to {}: {}", destination, e.getMessage()); + } + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationType.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationType.java new file mode 100644 index 0000000..f9a5edb --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/ManagerNotificationType.java @@ -0,0 +1,7 @@ +package me.zinch.itmo.mts.service.notification.ws; + +public enum ManagerNotificationType { + NEW_ORDER_CREATED, + ORDER_ASSIGNED, + ORDER_STATUS_CHANGED +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/NewOrderCreatedEvent.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/NewOrderCreatedEvent.java new file mode 100644 index 0000000..9f2f7fc --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/NewOrderCreatedEvent.java @@ -0,0 +1,10 @@ +package me.zinch.itmo.mts.service.notification.ws.event; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import java.util.UUID; + +public record NewOrderCreatedEvent( + UUID orderId, + OrderStatus status +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderAssignedEvent.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderAssignedEvent.java new file mode 100644 index 0000000..2cc82cc --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderAssignedEvent.java @@ -0,0 +1,11 @@ +package me.zinch.itmo.mts.service.notification.ws.event; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import java.util.UUID; + +public record OrderAssignedEvent( + UUID orderId, + UUID managerId, + OrderStatus status +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderStatusChangedEvent.java b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderStatusChangedEvent.java new file mode 100644 index 0000000..55bc033 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/notification/ws/event/OrderStatusChangedEvent.java @@ -0,0 +1,11 @@ +package me.zinch.itmo.mts.service.notification.ws.event; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import java.util.UUID; + +public record OrderStatusChangedEvent( + UUID orderId, + UUID managerId, + OrderStatus status +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/order/OrderService.java b/src/main/java/me/zinch/itmo/mts/service/order/OrderService.java new file mode 100644 index 0000000..8161b76 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/order/OrderService.java @@ -0,0 +1,25 @@ +package me.zinch.itmo.mts.service.order; + +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import me.zinch.itmo.mts.service.order.dto.CreateOrderRequest; +import me.zinch.itmo.mts.service.order.dto.UpdateOrderRequest; +import java.util.List; +import java.util.UUID; + +public interface OrderService { + + Order createOrder(CreateOrderRequest request); + + List getAllOrders(); + + List getOrdersAssignedToManager(UUID managerId); + + List getOrdersForUser(UUID userId); + + Order assignManager(UUID orderId, UUID seniorManagerId, UUID managerId); + + Order editOrder(UUID orderId, UUID managerId, UpdateOrderRequest request); + + Order changeStatus(UUID orderId, UUID managerId, OrderStatus newStatus); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/order/OrderServiceImpl.java b/src/main/java/me/zinch/itmo/mts/service/order/OrderServiceImpl.java new file mode 100644 index 0000000..839f8a1 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/order/OrderServiceImpl.java @@ -0,0 +1,310 @@ +package me.zinch.itmo.mts.service.order; + +import me.zinch.itmo.mts.config.YooKassaProperties; +import me.zinch.itmo.mts.domain.entity.Customer; +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.domain.entity.OrderItem; +import me.zinch.itmo.mts.domain.entity.Payment; +import me.zinch.itmo.mts.domain.entity.Product; +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import me.zinch.itmo.mts.domain.enums.UserRole; +import me.zinch.itmo.mts.domain.enums.YooKassaPaymentStatus; +import me.zinch.itmo.mts.repository.CustomerRepository; +import me.zinch.itmo.mts.repository.OrderRepository; +import me.zinch.itmo.mts.repository.PaymentRepository; +import me.zinch.itmo.mts.repository.ProductRepository; +import me.zinch.itmo.mts.repository.UserRepository; +import me.zinch.itmo.mts.service.ServiceException; +import me.zinch.itmo.mts.service.notification.OrderEmailService; +import me.zinch.itmo.mts.service.notification.ws.event.NewOrderCreatedEvent; +import me.zinch.itmo.mts.service.notification.ws.event.OrderAssignedEvent; +import me.zinch.itmo.mts.service.notification.ws.event.OrderStatusChangedEvent; +import me.zinch.itmo.mts.service.order.dto.CreateOrderRequest; +import me.zinch.itmo.mts.service.order.dto.OrderItemRequest; +import me.zinch.itmo.mts.service.order.dto.UpdateOrderRequest; +import me.zinch.itmo.mts.service.payment.CreatePaymentResult; +import me.zinch.itmo.mts.service.payment.YooKassaPaymentService; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Sort; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Slf4j +@Transactional +public class OrderServiceImpl implements OrderService { + + private final OrderRepository orderRepository; + private final CustomerRepository customerRepository; + private final ProductRepository productRepository; + private final PaymentRepository paymentRepository; + private final UserRepository userRepository; + private final YooKassaPaymentService yooKassaPaymentService; + private final OrderEmailService orderEmailService; + private final ApplicationEventPublisher eventPublisher; + private final YooKassaProperties yooKassaProperties; + private static final Sort CREATED_AT_DESC = Sort.by(Sort.Direction.DESC, "createdAt"); + + @Override + public Order createOrder(CreateOrderRequest request) { + log.info("Creating order for customer email={}", request.email()); + validateCustomer(request.customerName(), request.phoneNumber(), request.email()); + List itemRequests = validateItems(request.items()); + + Customer customer = upsertCustomer(request.customerName(), request.phoneNumber(), request.email()); + Order order = new Order(); + order.setCustomer(customer); + order.setStatus(OrderStatus.NEW); + order.setCreatedAt(OffsetDateTime.now()); + order.setUpdatedAt(OffsetDateTime.now()); + + replaceItems(order, itemRequests); + Order savedOrder = orderRepository.save(order); + log.info("Order created: orderId={}, customerId={}, items={}", + savedOrder.getId(), savedOrder.getCustomer().getId(), savedOrder.getItems().size()); + eventPublisher.publishEvent(new NewOrderCreatedEvent(savedOrder.getId(), savedOrder.getStatus())); + return savedOrder; + } + + @Override + @Transactional(readOnly = true) + public List getAllOrders() { + List orders = orderRepository.findAll(CREATED_AT_DESC); + log.debug("Loaded all orders: count={}", orders.size()); + return orders; + } + + @Override + @Transactional(readOnly = true) + public List getOrdersAssignedToManager(UUID managerId) { + requireRole(managerId, UserRole.MANAGER); + List orders = orderRepository.findAllByManagerId(managerId, CREATED_AT_DESC); + log.debug("Loaded manager orders: managerId={}, count={}", managerId, orders.size()); + return orders; + } + + @Override + @Transactional(readOnly = true) + public List getOrdersForUser(UUID userId) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new ServiceException("User not found: " + userId)); + if (user.getRole() == UserRole.SENIOR_MANAGER) { + List orders = orderRepository.findAll(CREATED_AT_DESC); + log.debug("Loaded orders for senior manager: userId={}, count={}", userId, orders.size()); + return orders; + } + if (user.getRole() == UserRole.MANAGER) { + List orders = orderRepository.findAllByManagerId(userId, CREATED_AT_DESC); + log.debug("Loaded orders for manager: userId={}, count={}", userId, orders.size()); + return orders; + } + throw new ServiceException("User must have role MANAGER or SENIOR_MANAGER"); + } + + @Override + public Order assignManager(UUID orderId, UUID seniorManagerId, UUID managerId) { + log.info("Assigning manager to order: orderId={}, seniorManagerId={}, managerId={}", + orderId, seniorManagerId, managerId); + requireRole(seniorManagerId, UserRole.SENIOR_MANAGER); + User manager = requireRole(managerId, UserRole.MANAGER); + Order order = loadOrder(orderId); + + order.setManager(manager); + order.setUpdatedAt(OffsetDateTime.now()); + Order savedOrder = orderRepository.save(order); + log.info("Manager assigned to order: orderId={}, managerId={}", savedOrder.getId(), managerId); + eventPublisher.publishEvent(new OrderAssignedEvent( + savedOrder.getId(), + manager.getId(), + savedOrder.getStatus() + )); + return savedOrder; + } + + @Override + public Order editOrder(UUID orderId, UUID managerId, UpdateOrderRequest request) { + log.info("Editing order: orderId={}, managerId={}", orderId, managerId); + validateCustomer(request.customerName(), request.phoneNumber(), request.email()); + List itemRequests = validateItems(request.items()); + + requireRole(managerId, UserRole.MANAGER); + Order order = loadOrder(orderId); + assertManagedBy(order, managerId); + assertStatusIsNew(order); + + Customer customer = upsertCustomer(request.customerName(), request.phoneNumber(), request.email()); + order.setCustomer(customer); + replaceItems(order, itemRequests); + order.setUpdatedAt(OffsetDateTime.now()); + Order savedOrder = orderRepository.save(order); + log.info("Order updated: orderId={}, managerId={}, items={}", + savedOrder.getId(), managerId, savedOrder.getItems().size()); + return savedOrder; + } + + @Override + public Order changeStatus(UUID orderId, UUID managerId, OrderStatus newStatus) { + log.info("Changing order status: orderId={}, managerId={}, newStatus={}", + orderId, managerId, newStatus); + requireRole(managerId, UserRole.MANAGER); + Order order = loadOrder(orderId); + assertManagedBy(order, managerId); + assertStatusIsNew(order); + + if (newStatus != OrderStatus.REJECTED && newStatus != OrderStatus.PLACED) { + throw new ServiceException("Недопустимое состояние для этого заказа"); + } + + order.setStatus(newStatus); + order.setUpdatedAt(OffsetDateTime.now()); + Order savedOrder = orderRepository.save(order); + + if (newStatus == OrderStatus.PLACED) { + createPaymentAndSendEmail(savedOrder); + } + + log.info("Order status changed: orderId={}, managerId={}, status={}", + savedOrder.getId(), managerId, newStatus); + eventPublisher.publishEvent(new OrderStatusChangedEvent( + savedOrder.getId(), + savedOrder.getManager() == null ? null : savedOrder.getManager().getId(), + newStatus + )); + return savedOrder; + } + + private void replaceItems(Order order, List itemRequests) { + order.getItems().clear(); + for (OrderItemRequest itemRequest : itemRequests) { + Product product = productRepository.findById(itemRequest.productId()) + .orElseThrow(() -> new ServiceException("Product not found: " + itemRequest.productId())); + + OrderItem orderItem = new OrderItem(); + orderItem.setOrder(order); + orderItem.setProduct(product); + orderItem.setQuantity(itemRequest.quantity()); + order.getItems().add(orderItem); + } + } + + private Customer upsertCustomer(String name, String phoneNumber, String email) { + Customer customer = customerRepository.findByEmail(email).orElseGet(Customer::new); + customer.setName(name); + customer.setPhoneNumber(phoneNumber); + customer.setEmail(email); + return customerRepository.save(customer); + } + + private User requireRole(UUID userId, UserRole role) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new ServiceException("User not found: " + userId)); + if (user.getRole() != role) { + throw new ServiceException("User " + userId + " must have role " + role); + } + return user; + } + + private Order loadOrder(UUID orderId) { + return orderRepository.findById(orderId) + .orElseThrow(() -> new ServiceException("Order not found: " + orderId)); + } + + private void assertManagedBy(Order order, UUID managerId) { + if (order.getManager() == null || !order.getManager().getId().equals(managerId)) { + throw new ServiceException("Order is not assigned to manager: " + managerId); + } + } + + private void assertStatusIsNew(Order order) { + if (order.getStatus() != OrderStatus.NEW) { + throw new ServiceException("Order can be changed only in NEW status"); + } + } + + private void createPaymentAndSendEmail(Order order) { + if (paymentRepository.findByOrderId(order.getId()).isPresent()) { + throw new ServiceException("Payment already exists for order: " + order.getId()); + } + + BigDecimal totalAmount = calculateTotalAmount(order); + String idempotenceKey = UUID.randomUUID().toString(); + log.info("Creating payment for order: orderId={}, amount={}, currency={}", + order.getId(), totalAmount, yooKassaProperties.currency()); + CreatePaymentResult result = yooKassaPaymentService.createPayment(order, totalAmount, idempotenceKey); + + Payment payment = new Payment(); + payment.setOrder(order); + payment.setYooKassaPaymentId(result.yooKassaPaymentId()); + payment.setIdempotenceKey(idempotenceKey); + payment.setAmount(totalAmount); + payment.setCurrency(yooKassaProperties.currency()); + payment.setStatus(mapYooKassaStatus(result.rawStatus())); + payment.setConfirmationUrl(result.confirmationUrl()); + payment.setReturnUrl(yooKassaProperties.returnUrl()); + payment.setCreatedAt(OffsetDateTime.now()); + paymentRepository.save(payment); + log.info("Payment created for order: orderId={}, yooKassaPaymentId={}", + order.getId(), result.yooKassaPaymentId()); + + orderEmailService.sendOrderPlacedEmail(order, result.confirmationUrl(), totalAmount); + log.info("Order payment email sent: orderId={}, email={}", order.getId(), order.getCustomer().getEmail()); + } + + private BigDecimal calculateTotalAmount(Order order) { + BigDecimal total = BigDecimal.ZERO; + for (OrderItem item : order.getItems()) { + BigDecimal lineAmount = item.getProduct().getPrice() + .multiply(BigDecimal.valueOf(item.getQuantity())); + total = total.add(lineAmount); + } + return total.setScale(2, RoundingMode.HALF_UP); + } + + private YooKassaPaymentStatus mapYooKassaStatus(String status) { + return switch (status) { + case "pending" -> YooKassaPaymentStatus.PENDING; + case "waiting_for_capture" -> YooKassaPaymentStatus.WAITING_FOR_CAPTURE; + case "succeeded" -> YooKassaPaymentStatus.SUCCEEDED; + case "canceled" -> YooKassaPaymentStatus.CANCELED; + default -> throw new ServiceException("Unsupported YooKassa status: " + status); + }; + } + + private void validateCustomer(String customerName, String phoneNumber, String email) { + if (isBlank(customerName) || isBlank(phoneNumber) || isBlank(email)) { + throw new ServiceException("Customer name, phone number and email are required"); + } + } + + private List validateItems(List items) { + if (items == null || items.isEmpty()) { + throw new ServiceException("Order must contain at least one item"); + } + + List validatedItems = new ArrayList<>(items.size()); + for (OrderItemRequest item : items) { + if (item == null || item.productId() == null) { + throw new ServiceException("Each item must contain productId"); + } + if (item.quantity() == null || item.quantity() <= 0) { + throw new ServiceException("Quantity must be positive"); + } + validatedItems.add(item); + } + return validatedItems; + } + + private boolean isBlank(String value) { + return value == null || value.isBlank(); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/service/order/dto/CreateOrderRequest.java b/src/main/java/me/zinch/itmo/mts/service/order/dto/CreateOrderRequest.java new file mode 100644 index 0000000..8ec6327 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/order/dto/CreateOrderRequest.java @@ -0,0 +1,11 @@ +package me.zinch.itmo.mts.service.order.dto; + +import java.util.List; + +public record CreateOrderRequest( + String customerName, + String phoneNumber, + String email, + List items +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/order/dto/OrderItemRequest.java b/src/main/java/me/zinch/itmo/mts/service/order/dto/OrderItemRequest.java new file mode 100644 index 0000000..a2827ce --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/order/dto/OrderItemRequest.java @@ -0,0 +1,9 @@ +package me.zinch.itmo.mts.service.order.dto; + +import java.util.UUID; + +public record OrderItemRequest( + UUID productId, + Integer quantity +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/order/dto/UpdateOrderRequest.java b/src/main/java/me/zinch/itmo/mts/service/order/dto/UpdateOrderRequest.java new file mode 100644 index 0000000..af62d1c --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/order/dto/UpdateOrderRequest.java @@ -0,0 +1,11 @@ +package me.zinch.itmo.mts.service.order.dto; + +import java.util.List; + +public record UpdateOrderRequest( + String customerName, + String phoneNumber, + String email, + List items +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/payment/CreatePaymentResult.java b/src/main/java/me/zinch/itmo/mts/service/payment/CreatePaymentResult.java new file mode 100644 index 0000000..32ec408 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/payment/CreatePaymentResult.java @@ -0,0 +1,8 @@ +package me.zinch.itmo.mts.service.payment; + +public record CreatePaymentResult( + String yooKassaPaymentId, + String confirmationUrl, + String rawStatus +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentService.java b/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentService.java new file mode 100644 index 0000000..1a56d73 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentService.java @@ -0,0 +1,9 @@ +package me.zinch.itmo.mts.service.payment; + +import me.zinch.itmo.mts.domain.entity.Order; +import java.math.BigDecimal; + +public interface YooKassaPaymentService { + + CreatePaymentResult createPayment(Order order, BigDecimal amount, String idempotenceKey); +} diff --git a/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentServiceImpl.java b/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentServiceImpl.java new file mode 100644 index 0000000..d2ae06d --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/service/payment/YooKassaPaymentServiceImpl.java @@ -0,0 +1,76 @@ +package me.zinch.itmo.mts.service.payment; + +import me.zinch.itmo.mts.config.YooKassaProperties; +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.service.ServiceException; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClient; + +@Service +@RequiredArgsConstructor +public class YooKassaPaymentServiceImpl implements YooKassaPaymentService { + + private final RestClient.Builder restClientBuilder; + private final YooKassaProperties properties; + + @Override + public CreatePaymentResult createPayment(Order order, BigDecimal amount, String idempotenceKey) { + Map amountNode = Map.of( + "value", amount.setScale(2).toPlainString(), + "currency", properties.currency() + ); + Map confirmationNode = Map.of( + "type", "redirect", + "return_url", properties.returnUrl() + ); + Map metadataNode = Map.of( + "orderId", order.getId().toString(), + "customerEmail", order.getCustomer().getEmail() + ); + + Map payload = new HashMap<>(); + payload.put("amount", amountNode); + payload.put("capture", properties.capture()); + payload.put("confirmation", confirmationNode); + payload.put("description", "Оплата заказа " + order.getId()); + payload.put("metadata", metadataNode); + + Map response = restClientBuilder.build() + .post() + .uri(properties.apiUrl() + "/payments") + .contentType(MediaType.APPLICATION_JSON) + .headers(headers -> { + headers.setBasicAuth(properties.shopId(), properties.secretKey()); + headers.add("Idempotence-Key", idempotenceKey); + }) + .body(payload) + .retrieve() + .body(Map.class); + + if (response == null) { + throw new ServiceException("YooKassa response is empty or invalid"); + } + + String paymentId = asString(response.get("id")); + String status = asString(response.get("status")); + String confirmationUrl = null; + Object confirmation = response.get("confirmation"); + if (confirmation instanceof Map confirmationMap) { + confirmationUrl = asString(confirmationMap.get("confirmation_url")); + } + if (paymentId == null || status == null || confirmationUrl == null) { + throw new ServiceException("YooKassa response does not contain required payment fields"); + } + + return new CreatePaymentResult(paymentId, confirmationUrl, status); + } + + private String asString(Object value) { + return value == null ? null : String.valueOf(value); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/web/ErrorResponse.java b/src/main/java/me/zinch/itmo/mts/web/ErrorResponse.java new file mode 100644 index 0000000..bd6caca --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/ErrorResponse.java @@ -0,0 +1,9 @@ +package me.zinch.itmo.mts.web; + +import java.time.OffsetDateTime; + +public record ErrorResponse( + String message, + OffsetDateTime timestamp +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/GlobalExceptionHandler.java b/src/main/java/me/zinch/itmo/mts/web/GlobalExceptionHandler.java new file mode 100644 index 0000000..d6bb6fb --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/GlobalExceptionHandler.java @@ -0,0 +1,42 @@ +package me.zinch.itmo.mts.web; + +import me.zinch.itmo.mts.service.ServiceException; +import me.zinch.itmo.mts.service.auth.ForbiddenException; +import me.zinch.itmo.mts.service.auth.UnauthorizedException; +import java.time.OffsetDateTime; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(ServiceException.class) + public ResponseEntity handleServiceException(ServiceException ex) { + return ResponseEntity.badRequest() + .body(new ErrorResponse(ex.getMessage(), OffsetDateTime.now())); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity handleUnauthorized(UnauthorizedException ex) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(new ErrorResponse(ex.getMessage(), OffsetDateTime.now())); + } + + @ExceptionHandler(ForbiddenException.class) + public ResponseEntity handleForbidden(ForbiddenException ex) { + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .body(new ErrorResponse(ex.getMessage(), OffsetDateTime.now())); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException(MethodArgumentNotValidException ex) { + String message = ex.getBindingResult().getFieldErrors().isEmpty() + ? "Validation failed" + : ex.getBindingResult().getFieldErrors().getFirst().getDefaultMessage(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ErrorResponse(message, OffsetDateTime.now())); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/web/auth/AuthController.java b/src/main/java/me/zinch/itmo/mts/web/auth/AuthController.java new file mode 100644 index 0000000..7e83c78 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/auth/AuthController.java @@ -0,0 +1,74 @@ +package me.zinch.itmo.mts.web.auth; + +import me.zinch.itmo.mts.service.auth.AuthService; +import me.zinch.itmo.mts.service.auth.SessionUser; +import me.zinch.itmo.mts.web.auth.dto.AuthUserResponse; +import me.zinch.itmo.mts.web.auth.dto.LoginRequest; +import me.zinch.itmo.mts.web.auth.dto.RegisterManagerRequest; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.validation.Valid; +import java.util.Map; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/auth") +public class AuthController { + + private final AuthService authService; + + public AuthController(AuthService authService) { + this.authService = authService; + } + + @PostMapping("/register") + @Operation( + summary = "Register manager account", + description = "Who can call: currently open endpoint. Intended for MANAGER/SENIOR_MANAGER account bootstrap only." + ) + public ResponseEntity register( + @Valid @RequestBody RegisterManagerRequest request, + HttpServletRequest servletRequest + ) { + SessionUser saved = authService.registerManager(request, servletRequest); + return ResponseEntity.status(HttpStatus.CREATED) + .body(new AuthUserResponse(saved.id(), saved.login(), saved.name(), saved.role())); + } + + @PostMapping("/login") + @Operation( + summary = "Login manager", + description = "Who can call: MANAGER or SENIOR_MANAGER with valid login/password. On success user is stored in HTTP session." + ) + public AuthUserResponse login(@Valid @RequestBody LoginRequest request, HttpServletRequest servletRequest) { + SessionUser sessionUser = authService.login(request, servletRequest); + return new AuthUserResponse(sessionUser.id(), sessionUser.login(), sessionUser.name(), sessionUser.role()); + } + + @PostMapping("/logout") + @Operation( + summary = "Logout current user", + description = "Who can call: any authenticated session." + ) + public Map logout(HttpSession session) { + authService.logout(session); + return Map.of("message", "Logged out"); + } + + @GetMapping("/me") + @Operation( + summary = "Get current session user", + description = "Who can call: any authenticated session." + ) + public AuthUserResponse me(HttpSession session) { + SessionUser user = authService.getCurrentUser(session); + return new AuthUserResponse(user.id(), user.login(), user.name(), user.role()); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/web/auth/dto/AuthUserResponse.java b/src/main/java/me/zinch/itmo/mts/web/auth/dto/AuthUserResponse.java new file mode 100644 index 0000000..2f2787d --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/auth/dto/AuthUserResponse.java @@ -0,0 +1,12 @@ +package me.zinch.itmo.mts.web.auth.dto; + +import me.zinch.itmo.mts.domain.enums.UserRole; +import java.util.UUID; + +public record AuthUserResponse( + UUID id, + String login, + String name, + UserRole role +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/auth/dto/LoginRequest.java b/src/main/java/me/zinch/itmo/mts/web/auth/dto/LoginRequest.java new file mode 100644 index 0000000..e3247ee --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/auth/dto/LoginRequest.java @@ -0,0 +1,16 @@ +package me.zinch.itmo.mts.web.auth.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class LoginRequest { + + @NotBlank + private String login; + + @NotBlank + private String password; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/auth/dto/RegisterManagerRequest.java b/src/main/java/me/zinch/itmo/mts/web/auth/dto/RegisterManagerRequest.java new file mode 100644 index 0000000..722639f --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/auth/dto/RegisterManagerRequest.java @@ -0,0 +1,28 @@ +package me.zinch.itmo.mts.web.auth.dto; + +import me.zinch.itmo.mts.domain.enums.UserRole; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RegisterManagerRequest { + + @NotBlank + @Size(min = 3, max = 100) + private String login; + + @NotBlank + @Size(min = 6, max = 255) + private String password; + + @NotBlank + @Size(max = 150) + private String name; + + @NotNull + private UserRole role; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/manager/ManagerController.java b/src/main/java/me/zinch/itmo/mts/web/manager/ManagerController.java new file mode 100644 index 0000000..4ed66aa --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/manager/ManagerController.java @@ -0,0 +1,43 @@ +package me.zinch.itmo.mts.web.manager; + +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpSession; +import java.util.List; +import me.zinch.itmo.mts.domain.entity.User; +import me.zinch.itmo.mts.service.auth.SessionUser; +import me.zinch.itmo.mts.service.manager.ManagerService; +import me.zinch.itmo.mts.service.auth.SessionAuthService; +import me.zinch.itmo.mts.web.manager.dto.ManagerDto; +import me.zinch.itmo.mts.web.manager.dto.ManagerListItemResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/managers") +public class ManagerController { + + private final ManagerService managerService; + private final SessionAuthService sessionAuthService; + + public ManagerController(ManagerService managerService, SessionAuthService sessionAuthService) { + this.managerService = managerService; + this.sessionAuthService = sessionAuthService; + } + + @GetMapping + @Operation( + summary = "Get all managers", + description = "Who can call: only SENIOR_MANAGER from active session. Returns users with role MANAGER only." + ) + public List getManagers(HttpSession session) { + SessionUser user = sessionAuthService.requireAuthenticated(session); + return managerService.getManagersForSenior(user.id()).stream() + .map(this::toResponse) + .toList(); + } + + private ManagerListItemResponse toResponse(User user) { + return new ManagerListItemResponse(user.getId(), new ManagerDto(user.getName())); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerDto.java b/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerDto.java new file mode 100644 index 0000000..80cb668 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerDto.java @@ -0,0 +1,6 @@ +package me.zinch.itmo.mts.web.manager.dto; + +public record ManagerDto( + String name +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerListItemResponse.java b/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerListItemResponse.java new file mode 100644 index 0000000..977d574 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/manager/dto/ManagerListItemResponse.java @@ -0,0 +1,9 @@ +package me.zinch.itmo.mts.web.manager.dto; + +import java.util.UUID; + +public record ManagerListItemResponse( + UUID managerId, + ManagerDto manager +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/OrderController.java b/src/main/java/me/zinch/itmo/mts/web/order/OrderController.java new file mode 100644 index 0000000..28be939 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/OrderController.java @@ -0,0 +1,123 @@ +package me.zinch.itmo.mts.web.order; + +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.service.order.OrderService; +import me.zinch.itmo.mts.service.order.dto.CreateOrderRequest; +import me.zinch.itmo.mts.service.order.dto.UpdateOrderRequest; +import me.zinch.itmo.mts.service.auth.SessionAuthService; +import me.zinch.itmo.mts.service.auth.SessionUser; +import me.zinch.itmo.mts.web.order.dto.AssignManagerApiRequest; +import me.zinch.itmo.mts.web.order.dto.ChangeOrderStatusApiRequest; +import me.zinch.itmo.mts.web.order.dto.CreateOrderApiRequest; +import me.zinch.itmo.mts.web.order.dto.OrderApiResponse; +import me.zinch.itmo.mts.web.order.dto.UpdateOrderApiRequest; +import me.zinch.itmo.mts.web.order.mapper.OrderMapper; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpSession; +import jakarta.validation.Valid; +import java.util.List; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/orders") +public class OrderController { + + private final OrderService orderService; + private final OrderMapper orderMapper; + private final SessionAuthService sessionAuthService; + + public OrderController( + OrderService orderService, + OrderMapper orderMapper, + SessionAuthService sessionAuthService + ) { + this.orderService = orderService; + this.orderMapper = orderMapper; + this.sessionAuthService = sessionAuthService; + } + + @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) + @Operation( + summary = "Create order", + description = "Who can call: anonymous buyer (no manager session required)." + ) + public ResponseEntity createOrder(@Valid @RequestBody CreateOrderApiRequest request) { + orderService.createOrder(new CreateOrderRequest( + request.getCustomerName(), + request.getPhoneNumber(), + request.getEmail(), + orderMapper.toServiceItems(request.getItems()) + )); + return ResponseEntity.ok().build(); + } + + @GetMapping + @Operation( + summary = "Get orders list", + description = "Who can call: MANAGER or SENIOR_MANAGER from active session. SENIOR_MANAGER sees all orders, MANAGER sees only assigned orders." + ) + public List getOrders(HttpSession session) { + SessionUser user = sessionAuthService.requireAuthenticated(session); + List orders = orderService.getOrdersForUser(user.id()); + return orders.stream().map(orderMapper::toResponse).toList(); + } + + @PostMapping("/{orderId}/manager") + @Operation( + summary = "Assign manager to order", + description = "Who can call: only SENIOR_MANAGER from active session." + ) + public OrderApiResponse assignManager( + @PathVariable java.util.UUID orderId, + @Valid @RequestBody AssignManagerApiRequest request, + HttpSession session + ) { + SessionUser user = sessionAuthService.requireAuthenticated(session); + Order updated = orderService.assignManager(orderId, user.id(), request.getManagerId()); + return orderMapper.toResponse(updated); + } + +// @PutMapping("/{orderId}") +// @Operation( +// summary = "Edit order", +// description = "Who can call: only MANAGER from active session, and only for orders assigned to this manager." +// ) +// public OrderApiResponse editOrder( +// @PathVariable java.util.UUID orderId, +// @Valid @RequestBody UpdateOrderApiRequest request, +// HttpSession session +// ) { +// SessionUser user = sessionAuthService.requireAuthenticated(session); +// Order updated = orderService.editOrder(orderId, user.id(), new UpdateOrderRequest( +// request.getCustomerName(), +// request.getPhoneNumber(), +// request.getEmail(), +// orderMapper.toServiceItems(request.getItems()) +// )); +// return orderMapper.toResponse(updated); +// } + + @PatchMapping("/{orderId}/status") + @Operation( + summary = "Change order status", + description = "Who can call: only MANAGER from active session, and only for orders assigned to this manager." + ) + public OrderApiResponse changeStatus( + @PathVariable java.util.UUID orderId, + @Valid @RequestBody ChangeOrderStatusApiRequest request, + HttpSession session + ) { + SessionUser user = sessionAuthService.requireAuthenticated(session); + Order updated = orderService.changeStatus(orderId, user.id(), request.getStatus()); + return orderMapper.toResponse(updated); + } +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/AssignManagerApiRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/AssignManagerApiRequest.java new file mode 100644 index 0000000..54f6814 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/AssignManagerApiRequest.java @@ -0,0 +1,14 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.constraints.NotNull; +import java.util.UUID; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AssignManagerApiRequest { + + @NotNull + private UUID managerId; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/ChangeOrderStatusApiRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/ChangeOrderStatusApiRequest.java new file mode 100644 index 0000000..046b38f --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/ChangeOrderStatusApiRequest.java @@ -0,0 +1,14 @@ +package me.zinch.itmo.mts.web.order.dto; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ChangeOrderStatusApiRequest { + + @NotNull + private OrderStatus status; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderApiRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderApiRequest.java new file mode 100644 index 0000000..3f0cc7b --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderApiRequest.java @@ -0,0 +1,27 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class CreateOrderApiRequest { + + @NotBlank + private String customerName; + + @NotBlank + private String phoneNumber; + + @NotBlank + @Email + private String email; + + @NotEmpty + private List<@Valid CreateOrderItemApiRequest> items; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemApiRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemApiRequest.java new file mode 100644 index 0000000..46a7dd8 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemApiRequest.java @@ -0,0 +1,19 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import java.util.UUID; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class CreateOrderItemApiRequest { + + @NotNull + private UUID productId; + + @NotNull + @Positive + private Integer quantity; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemFormRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemFormRequest.java new file mode 100644 index 0000000..070a7a5 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/CreateOrderItemFormRequest.java @@ -0,0 +1,19 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import java.util.UUID; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class CreateOrderItemFormRequest { + + @NotNull + private UUID productId; + + @NotNull + @Positive + private Integer quantity; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderApiResponse.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderApiResponse.java new file mode 100644 index 0000000..8cc17a7 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderApiResponse.java @@ -0,0 +1,25 @@ +package me.zinch.itmo.mts.web.order.dto; + +import me.zinch.itmo.mts.domain.enums.OrderStatus; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.util.List; +import java.util.UUID; + +public record OrderApiResponse( + @NotNull UUID id, + @NotNull UUID customerId, + @NotNull String customerName, + @NotNull String customerEmail, + @NotNull String customerPhoneNumber, + UUID managerId, + OrderManagerDto manager, + @NotNull OrderStatus status, + @NotNull OffsetDateTime createdAt, + @NotNull OffsetDateTime updatedAt, + @NotNull BigDecimal totalAmount, + @NotNull List<@Valid OrderItemApiResponse> items +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderItemApiResponse.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderItemApiResponse.java new file mode 100644 index 0000000..dcb0a6e --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderItemApiResponse.java @@ -0,0 +1,15 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.UUID; + +public record OrderItemApiResponse( + @NotNull UUID id, + @NotNull UUID productId, + @NotNull String productName, + @NotNull Integer quantity, + @NotNull BigDecimal unitPrice, + @NotNull BigDecimal lineTotal +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderManagerDto.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderManagerDto.java new file mode 100644 index 0000000..33f6182 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/OrderManagerDto.java @@ -0,0 +1,6 @@ +package me.zinch.itmo.mts.web.order.dto; + +public record OrderManagerDto( + String name +) { +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/dto/UpdateOrderApiRequest.java b/src/main/java/me/zinch/itmo/mts/web/order/dto/UpdateOrderApiRequest.java new file mode 100644 index 0000000..bf03136 --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/dto/UpdateOrderApiRequest.java @@ -0,0 +1,27 @@ +package me.zinch.itmo.mts.web.order.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UpdateOrderApiRequest { + + @NotBlank + private String customerName; + + @NotBlank + private String phoneNumber; + + @NotBlank + @Email + private String email; + + @NotEmpty + private List<@Valid CreateOrderItemApiRequest> items; +} diff --git a/src/main/java/me/zinch/itmo/mts/web/order/mapper/OrderMapper.java b/src/main/java/me/zinch/itmo/mts/web/order/mapper/OrderMapper.java new file mode 100644 index 0000000..ad9719c --- /dev/null +++ b/src/main/java/me/zinch/itmo/mts/web/order/mapper/OrderMapper.java @@ -0,0 +1,47 @@ +package me.zinch.itmo.mts.web.order.mapper; + +import me.zinch.itmo.mts.domain.entity.Order; +import me.zinch.itmo.mts.domain.entity.OrderItem; +import me.zinch.itmo.mts.service.order.dto.OrderItemRequest; +import me.zinch.itmo.mts.web.order.dto.CreateOrderItemApiRequest; +import me.zinch.itmo.mts.web.order.dto.OrderApiResponse; +import me.zinch.itmo.mts.web.order.dto.OrderItemApiResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.List; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; + +@Mapper(componentModel = "spring") +public interface OrderMapper { + + @Mapping(target = "customerId", source = "customer.id") + @Mapping(target = "customerName", source = "customer.name") + @Mapping(target = "customerEmail", source = "customer.email") + @Mapping(target = "customerPhoneNumber", source = "customer.phoneNumber") + @Mapping(target = "managerId", source = "manager.id") + @Mapping(target = "manager.name", source = "manager.name") + @Mapping(target = "totalAmount", expression = "java(calculateOrderTotal(order.getItems()))") + OrderApiResponse toResponse(Order order); + + @Mapping(target = "productId", source = "product.id") + @Mapping(target = "productName", source = "product.name") + @Mapping(target = "unitPrice", source = "product.price") + @Mapping(target = "lineTotal", expression = "java(calculateLineTotal(item))") + OrderItemApiResponse toResponse(OrderItem item); + + List toServiceItems(List items); + + default BigDecimal calculateLineTotal(OrderItem item) { + return item.getProduct().getPrice() + .multiply(BigDecimal.valueOf(item.getQuantity())) + .setScale(2, RoundingMode.HALF_UP); + } + + default BigDecimal calculateOrderTotal(List items) { + return items.stream() + .map(this::calculateLineTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add) + .setScale(2, RoundingMode.HALF_UP); + } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..c7a4c4e --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,34 @@ +spring: + application: + name: mts + datasource: + url: ${POSTGRES_URL:jdbc:postgresql://localhost:5432/postgres} + username: ${POSTGRES_USERNAME:postgres} + password: ${POSTGRES_PASSWORD:postgres} + driver-class-name: org.postgresql.Driver + jpa: + hibernate: + ddl-auto: update + mail: + host: ${MAIL_HOST:smtp.example.com} + port: ${MAIL_PORT:587} + username: ${MAIL_USERNAME:example@example.com} + password: ${MAIL_PASSWORD:change-me} + properties: + mail: + smtp: + auth: true + ssl: + enable: true + +yookassa: + api-url: ${YOOKASSA_API_URL:https://api.yookassa.ru/v3} + shop-id: ${YOOKASSA_SHOP_ID:000000} + secret-key: ${YOOKASSA_SECRET_KEY:change-me} + capture: ${YOOKASSA_CAPTURE:true} + currency: ${YOOKASSA_CURRENCY:RUB} + return-url: ${YOOKASSA_RETURN_URL:https://example.com/payment/return} + +app: + mail: + from: ${APP_MAIL_FROM:no-reply@example.com} diff --git a/src/test/java/me/zinch/itmo/mts/MtsApplicationTests.java b/src/test/java/me/zinch/itmo/mts/MtsApplicationTests.java new file mode 100644 index 0000000..1fe970e --- /dev/null +++ b/src/test/java/me/zinch/itmo/mts/MtsApplicationTests.java @@ -0,0 +1,13 @@ +package me.zinch.itmo.mts; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MtsApplicationTests { + + @Test + void contextLoads() { + } + +}