commit 812957b93a7bf57a9b4f88fca0821a0b43a54ed7 Author: KamilM1205 Date: Sun Jun 29 18:32:45 2025 +0400 Initial commit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..74dc88a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + java + id("org.springframework.boot") version "3.5.3" + id("io.spring.dependency-management") version "1.1.7" +} + +group = "ru.team58" +version = "0.0.1-SNAPSHOT" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.flywaydb:flyway-core") + implementation("org.mapstruct:mapstruct:1.6.3") + implementation("org.postgresql:postgresql") + implementation("org.flywaydb:flyway-database-postgresql") + implementation("org.apache.logging.log4j:log4j-api:2.22.1") + implementation("org.apache.logging.log4j:log4j-core:2.22.1") + implementation("org.slf4j:slf4j-api:2.0.13") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1") + annotationProcessor("org.mapstruct:mapstruct-processor:1.6.3") + compileOnly("org.projectlombok:lombok") + annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.security:spring-security-test") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ff23a68 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..85ef20f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "profileservice" diff --git a/src/main/java/ru/team58/profileservice/ProfileserviceApplication.java b/src/main/java/ru/team58/profileservice/ProfileserviceApplication.java new file mode 100644 index 0000000..b997433 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/ProfileserviceApplication.java @@ -0,0 +1,19 @@ +package ru.team58.profileservice; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication(exclude = { SecurityAutoConfiguration.class }) +@EnableJpaRepositories +public class ProfileserviceApplication { + private static final Logger log = LoggerFactory.getLogger(ProfileserviceApplication.class); + + public static void main(String[] args) { + SpringApplication.run(ProfileserviceApplication.class, args); + } + +} diff --git a/src/main/java/ru/team58/profileservice/controller/UserController.java b/src/main/java/ru/team58/profileservice/controller/UserController.java new file mode 100644 index 0000000..70378ed --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/UserController.java @@ -0,0 +1,52 @@ +package ru.team58.profileservice.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import ru.team58.profileservice.controller.schemes.CreateUserRequest; +import ru.team58.profileservice.controller.schemes.GetUserResponse; +import ru.team58.profileservice.controller.schemes.UpdateUserRequest; +import ru.team58.profileservice.controller.schemes.UserResponse; +import ru.team58.profileservice.mapper.UserMapper; +import ru.team58.profileservice.service.UserDTO; +import ru.team58.profileservice.service.UserService; + +import java.security.Principal; +import java.util.UUID; + +@RestController +public class UserController { + @Autowired + UserService userService; + + @GetMapping("/") + public UserResponse getMe(Principal principal) { + return UserMapper.INSTANCE.toUserResponse(userService.getByUsername(principal.getName())); + } + + @PutMapping("/") + public void updateMe(Principal principal, @RequestBody UpdateUserRequest request) { + userService.updateUser(UserMapper.INSTANCE.toUserDTO(request)); + } + + @DeleteMapping("/") + public void deleteMe(Principal principal) { + UserDTO user = userService.getByUsername(principal.getName()); + userService.deleteUser(user.getId()); + } + + @PostMapping("/") + public void createMe(@RequestBody CreateUserRequest request) { + userService.createUser(UserMapper.INSTANCE.toUserDTO(request)); + } + + @GetMapping("/{id}") + public GetUserResponse getUser(@PathVariable UUID id) { + UserDTO user = userService.getById(id); + return UserMapper.INSTANCE.toGetUserResponse(user); + } + + @DeleteMapping("/{id}") + public void deleteUser(@PathVariable UUID id) { + userService.deleteUser(id); + } +} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java b/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java new file mode 100644 index 0000000..e809b58 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java @@ -0,0 +1,9 @@ +package ru.team58.profileservice.controller.schemes; + +public class CreateUserRequest { + String username; + String firstName; + String lastName; + String email; + String hashedPassword; +} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/GetUserResponse.java b/src/main/java/ru/team58/profileservice/controller/schemes/GetUserResponse.java new file mode 100644 index 0000000..3b52b02 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/schemes/GetUserResponse.java @@ -0,0 +1,8 @@ +package ru.team58.profileservice.controller.schemes; + +public class GetUserResponse { + String username; + String firstName; + String lastName; + String email; +} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java b/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java new file mode 100644 index 0000000..f97b284 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java @@ -0,0 +1,11 @@ +package ru.team58.profileservice.controller.schemes; + +import java.util.UUID; + +public class UpdateUserRequest { + UUID id; + String username; + String firstName; + String lastName; + String email; +} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/UserResponse.java b/src/main/java/ru/team58/profileservice/controller/schemes/UserResponse.java new file mode 100644 index 0000000..2e0ef09 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UserResponse.java @@ -0,0 +1,11 @@ +package ru.team58.profileservice.controller.schemes; + +import java.util.UUID; + +public class UserResponse { + UUID id; + String username; + String firstName; + String lastName; + String email; +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserMapper.java new file mode 100644 index 0000000..aeced74 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserMapper.java @@ -0,0 +1,25 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import ru.team58.profileservice.controller.schemes.CreateUserRequest; +import ru.team58.profileservice.controller.schemes.GetUserResponse; +import ru.team58.profileservice.controller.schemes.UpdateUserRequest; +import ru.team58.profileservice.controller.schemes.UserResponse; +import ru.team58.profileservice.persistence.entity.UserEntity; +import ru.team58.profileservice.service.UserDTO; + +@Mapper +public interface UserMapper { + UserMapper INSTANCE = Mappers.getMapper(UserMapper.class); + + UserDTO toUserDTO(UserEntity entity); + UserDTO toUserDTO(UpdateUserRequest request); + UserDTO toUserDTO(CreateUserRequest request); + + UserEntity toUserEntity(UserDTO dto); + + UserResponse toUserResponse(UserDTO dto); + + GetUserResponse toGetUserResponse(UserDTO dto); +} diff --git a/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java b/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java new file mode 100644 index 0000000..15f940c --- /dev/null +++ b/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java @@ -0,0 +1,36 @@ +package ru.team58.profileservice.persistence.entity; + +import jakarta.persistence.*; +import lombok.*; +import ru.team58.profileservice.service.UserDTO; + +import java.util.UUID; + +@Entity +@Table(name = "user") +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Getter +@Setter +public class UserEntity { + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.UUID) + UUID id; + + @Column(name = "username", nullable = false) + String username; + + @Column(name = "firstname", nullable = false) + String firstName; + + @Column(name = "lastName", nullable = false) + String lastName; + + @Column(name = "email", nullable = false) + String email; + + @Column(name = "hashed_password", nullable = false) + String hashed_password; +} diff --git a/src/main/java/ru/team58/profileservice/persistence/repo/UserRepository.java b/src/main/java/ru/team58/profileservice/persistence/repo/UserRepository.java new file mode 100644 index 0000000..cd87fe9 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/persistence/repo/UserRepository.java @@ -0,0 +1,11 @@ +package ru.team58.profileservice.persistence.repo; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.team58.profileservice.persistence.entity.UserEntity; + +import java.util.Optional; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + Optional findByUsername(String username); +} diff --git a/src/main/java/ru/team58/profileservice/service/UserDTO.java b/src/main/java/ru/team58/profileservice/service/UserDTO.java new file mode 100644 index 0000000..952d4c9 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/service/UserDTO.java @@ -0,0 +1,24 @@ +package ru.team58.profileservice.service; + +import lombok.*; +import ru.team58.profileservice.persistence.entity.UserEntity; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Objects; +import java.util.UUID; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UserDTO { + UUID id; + String username; + String firstName; + String lastName; + String email; + String hashedPassword; +} \ No newline at end of file diff --git a/src/main/java/ru/team58/profileservice/service/UserService.java b/src/main/java/ru/team58/profileservice/service/UserService.java new file mode 100644 index 0000000..d4e403f --- /dev/null +++ b/src/main/java/ru/team58/profileservice/service/UserService.java @@ -0,0 +1,11 @@ +package ru.team58.profileservice.service; + +import java.util.UUID; + +public interface UserService { + public UserDTO getById(UUID id); + public UserDTO getByUsername(String username); + public UUID createUser(UserDTO user); + public void deleteUser(UUID id); + public void updateUser(UserDTO user); +} diff --git a/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java new file mode 100644 index 0000000..821adcb --- /dev/null +++ b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java @@ -0,0 +1,49 @@ +package ru.team58.profileservice.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import ru.team58.profileservice.mapper.UserMapper; +import ru.team58.profileservice.persistence.entity.UserEntity; +import ru.team58.profileservice.persistence.repo.UserRepository; +import ru.team58.profileservice.service.exceptions.UserAlreadyExistsException; +import ru.team58.profileservice.service.exceptions.UserNotFoundException; + +import java.util.UUID; + +@Service +public class UserServiceImpl implements UserService { + @Autowired + UserRepository userRepository; + + @Override + public UserDTO getById(UUID id) { + UserEntity user = userRepository.findById(id).orElseThrow(UserNotFoundException::new); + return UserMapper.INSTANCE.toUserDTO(user); + } + + @Override + public UserDTO getByUsername(String username) { + UserEntity user = userRepository.findByUsername(username).orElseThrow(UserNotFoundException::new); + return UserMapper.INSTANCE.toUserDTO(user); + } + + @Override + public UUID createUser(UserDTO user) { + userRepository.findByUsername(user.username).ifPresent(u -> { + throw new UserAlreadyExistsException(); + }); + return userRepository.save(UserMapper.INSTANCE.toUserEntity(user)).getId(); + } + + @Override + public void deleteUser(UUID id) { + userRepository.findById(id).orElseThrow(UserNotFoundException::new); + userRepository.deleteById(id); + } + + @Override + public void updateUser(UserDTO user) { + userRepository.findById(user.getId()).orElseThrow(UserNotFoundException::new); + userRepository.save(UserMapper.INSTANCE.toUserEntity(user)); + } +} diff --git a/src/main/java/ru/team58/profileservice/service/exceptions/UserAlreadyExistsException.java b/src/main/java/ru/team58/profileservice/service/exceptions/UserAlreadyExistsException.java new file mode 100644 index 0000000..4df3a01 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/service/exceptions/UserAlreadyExistsException.java @@ -0,0 +1,4 @@ +package ru.team58.profileservice.service.exceptions; + +public class UserAlreadyExistsException extends RuntimeException { +} diff --git a/src/main/java/ru/team58/profileservice/service/exceptions/UserNotFoundException.java b/src/main/java/ru/team58/profileservice/service/exceptions/UserNotFoundException.java new file mode 100644 index 0000000..f2582cb --- /dev/null +++ b/src/main/java/ru/team58/profileservice/service/exceptions/UserNotFoundException.java @@ -0,0 +1,4 @@ +package ru.team58.profileservice.service.exceptions; + +public class UserNotFoundException extends RuntimeException { +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..efdb856 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,6 @@ +spring.application.name=profileservice + +## PostgreSQL +spring.datasource.url=jdbc:postgresql://localhost:5432/userdb +spring.datasource.username=userdb +spring.datasource.password=1205 \ No newline at end of file