diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml index 3bd52c70..a5211e8c 100644 --- a/.github/workflows/dockerhub-push.yml +++ b/.github/workflows/dockerhub-push.yml @@ -41,6 +41,10 @@ jobs: - name: Build with Gradle env: + USER_DB_URI: ${{ secrets.USER_DB_URI }} + USER_DB_USERNAME: ${{ secrets.USER_DB_USERNAME }} + USER_DB_PASSWORD: ${{ secrets.USER_DB_PASSWORD }} + SOCIAL_DB_USERNAME: ${{ secrets.SOCIAL_DB_USERNAME }} SOCIAL_DB_PASSWORD: ${{ secrets.SOCIAL_DB_PASSWORD }} SOCIAL_DB_URI: ${{ secrets.SOCIAL_DB_URI }} @@ -55,6 +59,10 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} BRANCH_NAME: ${{ env.BRANCH_NAME }} + USER_DB_URI: ${{ secrets.USER_DB_URI }} + USER_DB_USERNAME: ${{ secrets.USER_DB_USERNAME }} + USER_DB_PASSWORD: ${{ secrets.USER_DB_PASSWORD }} + SOCIAL_DB_USERNAME: ${{ secrets.SOCIAL_DB_USERNAME }} SOCIAL_DB_PASSWORD: ${{ secrets.SOCIAL_DB_PASSWORD }} SOCIAL_DB_URI: ${{ secrets.SOCIAL_DB_URI }} @@ -72,4 +80,4 @@ jobs: docker buildx create --use docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker buildx build --platform=linux/amd64,linux/arm64 -t $DOCKER_USERNAME/$BRANCH_NAME-service:latest . --push - docker push $DOCKER_USERNAME/$BRANCH_NAME-service:latest \ No newline at end of file + \ No newline at end of file diff --git a/src/common-module/src/main/proto/send_email_auth.proto b/src/common-module/src/main/proto/send_email_auth.proto new file mode 100644 index 00000000..e6950503 --- /dev/null +++ b/src/common-module/src/main/proto/send_email_auth.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.palette.grpc"; + +service GAuthService { + rpc sendEmailAuth (GSendEmailAuthRequest) returns (GSendEmailAuthResponse) {} +} + +message GSendEmailAuthRequest { + int64 id = 1; + string email = 2; + string nickname = 3; +} + +message GSendEmailAuthResponse { + bool message = 1; +} diff --git a/src/user-service/.gitignore b/src/user-service/.gitignore new file mode 100644 index 00000000..74b5cc54 --- /dev/null +++ b/src/user-service/.gitignore @@ -0,0 +1,69 @@ +*.class +*.log +*.ctxt +.mtj.tmp/ +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar +hs_err_pid* +replay_pid* +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf +.idea/**/aws.xml +.idea/**/contentModel.xml +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml +.idea/**/gradle.xml +.idea/**/libraries +cmake-build-*/ +.idea/**/mongoSettings.xml +*.iws +out/ +.idea_modules/ +atlassian-ide-plugin.xml +.idea/replstate.xml +.idea/sonarlint/ +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +.idea/httpRequests +.idea/caches/build_file_checksums.ser +.gradle +**/build/ +!src/**/build/ +gradle-app.setting +!gradle-wrapper.jar +!gradle-wrapper.properties +.gradletasknamecache +.project +.classpath +.DS_Store +.AppleDouble +.LSOverride +Icon +._* +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/src/user-service/Dockerfile b/src/user-service/Dockerfile new file mode 100644 index 00000000..630c67da --- /dev/null +++ b/src/user-service/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:17-oracle +ENV USER_DB_URI=${USER_DB_URI} +ENV USER_DB_USERNAME=${USER_DB_USERNAME} +ENV USER_DB_PASSWORD=${USER_DB_PASSWORD} +ARG JAR_FILE=build/libs/easel-user-service-0.0.1-SNAPSHOT.jar +ADD ${JAR_FILE} easel-user-service.jar +ENTRYPOINT ["java", "-jar", "/easel-user-service.jar"] \ No newline at end of file diff --git a/src/user-service/HELP.md b/src/user-service/HELP.md new file mode 100644 index 00000000..0efe6ad8 --- /dev/null +++ b/src/user-service/HELP.md @@ -0,0 +1,32 @@ +# Read Me First +The following was discovered as part of building this project: + +* The original package name 'org.palette.easel-user-service' is invalid and this project uses 'org.palette.easeluserservice' instead. + +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.2.1/gradle-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.2.1/gradle-plugin/reference/html/#build-image) +* [Spring Web](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#web) +* [Eureka Discovery Client](https://docs.spring.io/spring-cloud-netflix/docs/current/reference/html/#service-discovery-eureka-clients) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#data.sql.jpa-and-spring-data) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) +* [Service Registration and Discovery with Eureka and Spring Cloud](https://spring.io/guides/gs/service-registration-and-discovery/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/src/user-service/build.gradle.kts b/src/user-service/build.gradle.kts new file mode 100644 index 00000000..0df95d8a --- /dev/null +++ b/src/user-service/build.gradle.kts @@ -0,0 +1,56 @@ +plugins { + java + id("org.springframework.boot") version "3.2.1" + id("io.spring.dependency-management") version "1.1.4" +} + +group = "org.palette" +version = "0.0.1-SNAPSHOT" + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} + +configurations { + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } +} + +repositories { + mavenCentral() +} + +extra["springCloudVersion"] = "2023.0.0" + +dependencies { + implementation ("net.devh:grpc-spring-boot-starter:2.15.0.RELEASE") + implementation(project(":common-module")) + + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + + implementation("io.hypersistence:hypersistence-utils-hibernate-60:3.7.0") + implementation("com.vladmihalcea:hibernate-types-52:2.10.4") + implementation("io.hypersistence:hypersistence-utils-hibernate-5:3.1.1") + + implementation("com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations") + + runtimeOnly("com.mysql:mysql-connector-j") + implementation("org.springframework.boot:spring-boot-starter-validation") + + compileOnly("org.projectlombok:lombok") + annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") +} + +dependencyManagement { + imports { + mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}") + } +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/src/user-service/gradle/wrapper/gradle-wrapper.jar b/src/user-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..d64cd491 Binary files /dev/null and b/src/user-service/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/user-service/gradle/wrapper/gradle-wrapper.properties b/src/user-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1af9e093 --- /dev/null +++ b/src/user-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/user-service/gradlew b/src/user-service/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/src/user-service/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/user-service/gradlew.bat b/src/user-service/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/src/user-service/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/user-service/settings.gradle.kts b/src/user-service/settings.gradle.kts new file mode 100644 index 00000000..8c0da803 --- /dev/null +++ b/src/user-service/settings.gradle.kts @@ -0,0 +1,4 @@ +rootProject.name = "easel-user-service" + +include(":common-module") +findProject(":common-module")?.projectDir = file("../common-module") diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/EaselUserServiceApplication.java b/src/user-service/src/main/java/org/palette/easeluserservice/EaselUserServiceApplication.java new file mode 100644 index 00000000..433d0192 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/EaselUserServiceApplication.java @@ -0,0 +1,13 @@ +package org.palette.easeluserservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EaselUserServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(EaselUserServiceApplication.class, args); + } + +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/common/BcryptPasswordEncoder.java b/src/user-service/src/main/java/org/palette/easeluserservice/common/BcryptPasswordEncoder.java new file mode 100644 index 00000000..538489b4 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/common/BcryptPasswordEncoder.java @@ -0,0 +1,27 @@ +package org.palette.easeluserservice.common; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +@Configuration +public class BcryptPasswordEncoder implements PasswordEncoder { + + + private static final BCryptPasswordEncoder passwordEncoder = bCryptPasswordEncoder(); + + @Bean + protected static BCryptPasswordEncoder bCryptPasswordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Override + public String encode(String password) { + return passwordEncoder.encode(password); + } + + @Override + public Boolean match(String inputPassword, String persistencePassword) { + return passwordEncoder.matches(inputPassword, persistencePassword); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaServiceName.java b/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaServiceName.java new file mode 100644 index 00000000..f1b19506 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaServiceName.java @@ -0,0 +1,14 @@ +package org.palette.easeluserservice.common; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum EurekaServiceName { + SOCIAL_SERVICE_NAME("SOCIAL-SERVICE"), + AUTH_SERVICE_NAME("AUTH-SERVICE"), + ; + + final String value; +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaUtilizer.java b/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaUtilizer.java new file mode 100644 index 00000000..15370a1c --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/common/EurekaUtilizer.java @@ -0,0 +1,27 @@ +package org.palette.easeluserservice.common; + +import com.netflix.appinfo.InstanceInfo; +import com.netflix.discovery.EurekaClient; +import com.netflix.discovery.shared.Application; +import com.netflix.discovery.shared.Pair; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Random; + +@Component +@RequiredArgsConstructor +public class EurekaUtilizer { + + private final EurekaClient eurekaClient; + + public Pair getInstanceInfo(String serviceName) { + final Application application = eurekaClient.getApplication(serviceName); + final Random random = new Random(); + final List instances = application.getInstances(); + final InstanceInfo instanceInfo = instances.get(random.nextInt(instances.size())); + + return new Pair<>(instanceInfo.getIPAddr(), instanceInfo.getPort()); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/common/PasswordEncoder.java b/src/user-service/src/main/java/org/palette/easeluserservice/common/PasswordEncoder.java new file mode 100644 index 00000000..bf54a6cb --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/common/PasswordEncoder.java @@ -0,0 +1,8 @@ +package org.palette.easeluserservice.common; + +public interface PasswordEncoder { + + String encode(String inputPassword); + + Boolean match(String inputPassword, String persistencePassword); +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/config/ApplicationConfig.java b/src/user-service/src/main/java/org/palette/easeluserservice/config/ApplicationConfig.java new file mode 100644 index 00000000..c4c6c0bc --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/config/ApplicationConfig.java @@ -0,0 +1,11 @@ +package org.palette.easeluserservice.config; + +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.scheduling.annotation.EnableAsync; + +@EnableDiscoveryClient +@EnableJpaAuditing +@EnableAsync +public class ApplicationConfig { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/config/GrpcConfig.java b/src/user-service/src/main/java/org/palette/easeluserservice/config/GrpcConfig.java new file mode 100644 index 00000000..c959fd09 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/config/GrpcConfig.java @@ -0,0 +1,32 @@ +package org.palette.easeluserservice.config; + +import jakarta.annotation.PostConstruct; +import net.devh.boot.grpc.common.util.GrpcUtils; +import net.devh.boot.grpc.server.config.GrpcServerProperties; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties +public class GrpcConfig { + private final EurekaRegistration eurekaRegistration; + private final GrpcServerProperties grpcProperties; + + public GrpcConfig( + @Qualifier("eurekaRegistration") EurekaRegistration eurekaRegistration, + GrpcServerProperties grpcProperties + ) { + this.eurekaRegistration = eurekaRegistration; + this.grpcProperties = grpcProperties; + } + + @PostConstruct + public void init() { + final int port = grpcProperties.getPort(); + eurekaRegistration.getInstanceConfig() + .getMetadataMap() + .put(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT, Integer.toString(port)); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/controller/UserController.java b/src/user-service/src/main/java/org/palette/easeluserservice/controller/UserController.java new file mode 100644 index 00000000..a0d7b7dc --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/controller/UserController.java @@ -0,0 +1,46 @@ +package org.palette.easeluserservice.controller; + +import lombok.RequiredArgsConstructor; +import org.palette.easeluserservice.dto.request.EmailDuplicationVerifyRequest; +import org.palette.easeluserservice.dto.request.JoinRequest; +import org.palette.easeluserservice.dto.request.TemporaryJoinRequest; +import org.palette.easeluserservice.dto.response.EmailDuplicationVerifyResponse; +import org.palette.easeluserservice.usecase.UserUsecase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/users") +@RequiredArgsConstructor +public class UserController { + + private final UserUsecase userUsecase; + + @PostMapping("verify-email") + public ResponseEntity verifyUsername( + @RequestBody EmailDuplicationVerifyRequest emailDuplicationVerifyRequest + ) { + return ResponseEntity.ok( + userUsecase.executeNicknameDuplicationVerify( + emailDuplicationVerifyRequest.email() + ) + ); + } + + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("temporary-join") + public void temporaryJoin( + @RequestBody TemporaryJoinRequest temporaryJoinRequest + ) { + userUsecase.executeTemporaryJoin(temporaryJoinRequest); + } + + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("join") + public void join( + @RequestBody JoinRequest joinRequest + ) { + userUsecase.executeJoin(joinRequest); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/EmailDuplicationVerifyRequest.java b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/EmailDuplicationVerifyRequest.java new file mode 100644 index 00000000..be010b61 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/EmailDuplicationVerifyRequest.java @@ -0,0 +1,9 @@ +package org.palette.easeluserservice.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record EmailDuplicationVerifyRequest( + @NotBlank + String email +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/JoinRequest.java b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/JoinRequest.java new file mode 100644 index 00000000..8cd4a3ce --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/JoinRequest.java @@ -0,0 +1,19 @@ +package org.palette.easeluserservice.dto.request; + +import jakarta.validation.constraints.NotBlank; + +import java.util.Optional; + +public record JoinRequest( + @NotBlank + String email, + @NotBlank + String password, + @NotBlank + String username, + Optional introduce, + Optional profilePath, + Optional backgroundPath, + Optional websitePath +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/TemporaryJoinRequest.java b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/TemporaryJoinRequest.java new file mode 100644 index 00000000..578bf435 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/dto/request/TemporaryJoinRequest.java @@ -0,0 +1,12 @@ +package org.palette.easeluserservice.dto.request; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; + +public record TemporaryJoinRequest( + @Email + String email, + @NotBlank + String nickname +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/dto/response/EmailDuplicationVerifyResponse.java b/src/user-service/src/main/java/org/palette/easeluserservice/dto/response/EmailDuplicationVerifyResponse.java new file mode 100644 index 00000000..e99d0b77 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/dto/response/EmailDuplicationVerifyResponse.java @@ -0,0 +1,6 @@ +package org.palette.easeluserservice.dto.response; + +public record EmailDuplicationVerifyResponse( + Boolean isDuplicated +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/exception/BaseException.java b/src/user-service/src/main/java/org/palette/easeluserservice/exception/BaseException.java new file mode 100644 index 00000000..16f95a95 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/exception/BaseException.java @@ -0,0 +1,14 @@ +package org.palette.easeluserservice.exception; + +import lombok.Getter; + +@Getter +public class BaseException extends RuntimeException { + + private final ExceptionType exceptionType; + + public BaseException(ExceptionType exceptionType) { + super(exceptionType.getMessage()); + this.exceptionType = exceptionType; + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionResponse.java b/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionResponse.java new file mode 100644 index 00000000..93137e80 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionResponse.java @@ -0,0 +1,11 @@ +package org.palette.easeluserservice.exception; + +import lombok.Builder; + +@Builder +public record ExceptionResponse( + String code, + String message, + String description +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionType.java b/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionType.java new file mode 100644 index 00000000..7a540dac --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/exception/ExceptionType.java @@ -0,0 +1,80 @@ +package org.palette.easeluserservice.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ExceptionType { + + // 400 + USER_000001( + "USER_000001", + "INCORRECT_PARAMETER", + "요청 파라미터가 올바르지 않습니다.", + HttpStatus.BAD_REQUEST + ), + + // 401 + USER_000002( + "USER_000002", + "MISSED AUTHENTICATION", + "해당 요청은 인증이 필요합니다.", + HttpStatus.UNAUTHORIZED + ), + + // 403 + USER_000003( + "USER_000003", + "NOT ALLOWED PERMISSION", + "해당 요청에 대한 권한이 없습니다.", + HttpStatus.FORBIDDEN + ), + + + // 404 + USER_000004( + "USER_000004", + "NOT FOUNDED", + "해당 리소스가 존재하지 않습니다.", + HttpStatus.NOT_FOUND + ), + + // 405 + USER_000005( + "USER_000005", + "NOT ALLOWED METHOD", + "올바르지 않은 요청 메서드입니다.", + HttpStatus.METHOD_NOT_ALLOWED + ), + + // 409 + USER_000006( + "USER_000006", + "DUPLICATED", + "중복된 리소스가 있습니다.", + HttpStatus.CONFLICT + ), + + USER_000007( + "USER_000007", + "BROKEN_TOKEN", + "요청 토큰이 올바르지 않습니다.", + HttpStatus.BAD_REQUEST + ), + + USER_000008( + "USER_000008", + "EXPIRED_TOKEN", + "요청 토큰이 만료되었습니다.", + HttpStatus.FORBIDDEN + ), + + ; + + private final String code; + private final String message; + private final String description; + private final HttpStatus httpStatus; +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/exception/GlobalExceptionHandler.java b/src/user-service/src/main/java/org/palette/easeluserservice/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..e099c08e --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/exception/GlobalExceptionHandler.java @@ -0,0 +1,76 @@ +package org.palette.easeluserservice.exception; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; + +@Slf4j +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(value = { + MethodArgumentNotValidException.class, + MethodArgumentTypeMismatchException.class, + }) + public ResponseEntity handleRequestValidationException(Exception e) { + ExceptionType exceptionType = ExceptionType.USER_000001; + ExceptionResponse exceptionResponse = ExceptionResponse.builder() + .code(exceptionType.getCode()) + .message(exceptionType.getMessage()) + .description(exceptionType.getDescription()) + .build(); + + logException(exceptionResponse); + + return ResponseEntity + .status(exceptionType.getHttpStatus()) + .body(exceptionResponse); + } + + @ExceptionHandler(value = {BaseException.class}) + public ResponseEntity handleBaseException( + BaseException baseException + ) { + ExceptionType exceptionType = baseException.getExceptionType(); + ExceptionResponse exceptionResponse = ExceptionResponse.builder() + .code(exceptionType.getCode()) + .description(exceptionType.getDescription()) + .message(exceptionType.getMessage()) + .build(); + + logException(exceptionResponse); + + return ResponseEntity + .status(exceptionType.getHttpStatus()) + .body(exceptionResponse); + } + + @ExceptionHandler(value = {Exception.class}) + public ResponseEntity handleException(Exception e) { + ExceptionResponse exceptionResponse = ExceptionResponse.builder() + .code("USER_SERVICE_EXCEPTION") + .message(e.getCause().getMessage()) + .description(e.getLocalizedMessage()) + .build(); + + logException(exceptionResponse); + + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(exceptionResponse); + } + + + private static void logException(ExceptionResponse exceptionResponse) { + log.error( + "code : {}, message : {}, description : {}", + exceptionResponse.code(), + exceptionResponse.description(), + exceptionResponse.message() + ); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcAuth.java b/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcAuth.java new file mode 100644 index 00000000..533c21e3 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcAuth.java @@ -0,0 +1,39 @@ +package org.palette.easeluserservice.external; + +import com.netflix.discovery.shared.Pair; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; +import lombok.RequiredArgsConstructor; +import org.palette.easeluserservice.common.EurekaUtilizer; +import org.palette.grpc.GAuthServiceGrpc; +import org.palette.grpc.GSendEmailAuthRequest; +import org.palette.grpc.GSendEmailAuthResponse; +import org.springframework.stereotype.Component; + +import static org.palette.easeluserservice.common.EurekaServiceName.AUTH_SERVICE_NAME; + +@Component +@RequiredArgsConstructor +public class GrpcAuth { + + private final EurekaUtilizer eurekaUtilizer; + + public GSendEmailAuthResponse sendEmailAuth(GSendEmailAuthRequest request) { + final Pair instanceInfo = eurekaUtilizer.getInstanceInfo( + AUTH_SERVICE_NAME.getValue() + ); + final ManagedChannel channel = ManagedChannelBuilder.forAddress( + instanceInfo.first(), + instanceInfo.second() + ) + .usePlaintext() + .build(); + + final GSendEmailAuthResponse response = GAuthServiceGrpc + .newBlockingStub(channel) + .sendEmailAuth(request); + channel.shutdown(); + + return response; + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcSocial.java b/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcSocial.java new file mode 100644 index 00000000..c22ff8de --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/external/GrpcSocial.java @@ -0,0 +1,35 @@ +package org.palette.easeluserservice.external; + +import io.grpc.StatusRuntimeException; +import net.devh.boot.grpc.client.inject.GrpcClient; +import org.palette.easeluserservice.persistence.User; +import org.palette.grpc.GCreateUserRequest; +import org.palette.grpc.GCreateUserResponse; +import org.palette.grpc.GSocialServiceGrpc; +import org.springframework.stereotype.Component; + +@Component +public class GrpcSocial { + + @GrpcClient("social-service") + private GSocialServiceGrpc.GSocialServiceBlockingStub gSocialServiceBlockingStub; + + public GCreateUserResponse createSocialUser(User user) { + // TODO: 매개변수 및 반환값 변경, 예외처리 + try { + final GCreateUserResponse response = gSocialServiceBlockingStub.createUser( + GCreateUserRequest.newBuilder() + .setId(user.getId()) + .setUsername(user.getUsername().value()) + .setImagePath(user.getProfile().staticContentPath().profileImagePath()) + .setNickname(user.getProfile().nickname().value()) + .setIsActive(user.getAuthed()) + .build()); + return response; + + } catch (final StatusRuntimeException e) { + System.out.println(e.getMessage()); + return null; + } + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/User.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/User.java new file mode 100644 index 00000000..1a3e9b1a --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/User.java @@ -0,0 +1,109 @@ +package org.palette.easeluserservice.persistence; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.DynamicUpdate; +import org.palette.easeluserservice.persistence.embed.*; +import org.palette.easeluserservice.persistence.enums.Role; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import java.time.LocalDateTime; +import java.util.UUID; + +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@Builder(access = AccessLevel.PRIVATE) +@Getter +@Entity +@DynamicUpdate +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Embedded + private Email email; + + @Embedded + private Username username; + + @Embedded + private Password password; + + @Embedded + private Profile profile; + + @Embedded + private PaintPin paintPin; + + @Embedded + private DmPin dmPin; + + @Enumerated(value = EnumType.STRING) + private Role role; + + @Column(name = "authed") + private Boolean authed = true; + + @Column(name = "accessed_at") + private LocalDateTime accessedAt; + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; + + @LastModifiedDate + private LocalDateTime deletedAt; + + public Boolean isUserNotAuthed() { + return !this.getAuthed(); + } + + public void stampAccessedAt() { + this.accessedAt = LocalDateTime.now(); + } + + public static User preJoin( + String email, + String nickname, + String defaultStringValue + ) { + + return User.builder() + .email(new Email(email)) + .username(new Username(UUID.randomUUID().toString())) + .password(new Password(defaultStringValue)) + .profile( + new Profile( + new Nickname(nickname), + new Introduce(defaultStringValue), + new StaticContentPath( + defaultStringValue, + defaultStringValue, + defaultStringValue + ) + ) + ) + .role(Role.NORMAL) + .paintPin(new PaintPin(defaultStringValue)) + .dmPin(new DmPin(defaultStringValue)) + .accessedAt(null) + .authed(false) + .build(); + } + + public void join( + String password, + String username, + Profile profile + ) { + this.password = new Password(password); + this.username = new Username(username); + this.profile = profile; + this.role = Role.NORMAL; + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/UserJpaRepository.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/UserJpaRepository.java new file mode 100644 index 00000000..43fd5bb0 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/UserJpaRepository.java @@ -0,0 +1,18 @@ +package org.palette.easeluserservice.persistence; + +import org.palette.easeluserservice.persistence.embed.Email; +import org.palette.easeluserservice.persistence.embed.Username; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserJpaRepository extends JpaRepository { + + Boolean existsByEmail(Email email); + + Boolean existsByUsername(Username username); + + Optional findByEmail(Email email); +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/DmPin.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/DmPin.java new file mode 100644 index 00000000..7773a2ef --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/DmPin.java @@ -0,0 +1,12 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public record DmPin( + + @Column(name = "dm_pin", nullable = false, length = Integer.MAX_VALUE) + String value +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Email.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Email.java new file mode 100644 index 00000000..24a34dec --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Email.java @@ -0,0 +1,18 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.palette.easeluserservice.exception.BaseException; +import org.palette.easeluserservice.exception.ExceptionType; + +@Embeddable +public record Email( + @Column(name = "email", nullable = false, unique = true, length = 70) + String value +) { + public Email { + if (value.length() > 70) throw new BaseException(ExceptionType.USER_000001); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Introduce.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Introduce.java new file mode 100644 index 00000000..e204e301 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Introduce.java @@ -0,0 +1,17 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import org.palette.easeluserservice.exception.BaseException; +import org.palette.easeluserservice.exception.ExceptionType; + +@Embeddable +public record Introduce( + @Column(name = "introduce", nullable = false, length = 160) + String value +) { + + public Introduce { + if (value.length() > 160) throw new BaseException(ExceptionType.USER_000001); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Nickname.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Nickname.java new file mode 100644 index 00000000..a9157ee8 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Nickname.java @@ -0,0 +1,12 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public record Nickname( + + @Column(name = "nickname", nullable = false, unique = true, length = 70) + String value +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/PaintPin.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/PaintPin.java new file mode 100644 index 00000000..6c723551 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/PaintPin.java @@ -0,0 +1,12 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public record PaintPin( + + @Column(name = "paint_pin", nullable = false, length = Integer.MAX_VALUE) + String value +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Password.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Password.java new file mode 100644 index 00000000..ea6aaae5 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Password.java @@ -0,0 +1,18 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import org.palette.easeluserservice.common.BcryptPasswordEncoder; +import org.palette.easeluserservice.common.PasswordEncoder; + +@Embeddable +public record Password( + @Column(name = "password", nullable = false, length = 100) + String value +) { + public Password(String value) { + this.value = passwordEncoder.encode(value); + } + + private static final PasswordEncoder passwordEncoder = new BcryptPasswordEncoder(); +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Profile.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Profile.java new file mode 100644 index 00000000..195c48f9 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Profile.java @@ -0,0 +1,15 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; + +@Embeddable +public record Profile( + @Embedded + Nickname nickname, + @Embedded + Introduce introduce, + @Embedded + StaticContentPath staticContentPath +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/StaticContentPath.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/StaticContentPath.java new file mode 100644 index 00000000..cb72bd86 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/StaticContentPath.java @@ -0,0 +1,20 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +@DynamicUpdate +@DynamicInsert +@Embeddable +public record StaticContentPath( + + @Column(name = "profile_image_path", nullable = false) + String profileImagePath, + @Column(name = "background_image_path", nullable = false) + String backgroundImagePath, + @Column(name = "website_path", nullable = false) + String websitePath +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Status.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Status.java new file mode 100644 index 00000000..19e3f5cf --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Status.java @@ -0,0 +1,13 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@Embeddable +public record Status( + @Column(name = "status", nullable = false) + Boolean value +) { +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Username.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Username.java new file mode 100644 index 00000000..63f25f81 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/embed/Username.java @@ -0,0 +1,16 @@ +package org.palette.easeluserservice.persistence.embed; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import org.palette.easeluserservice.exception.BaseException; +import org.palette.easeluserservice.exception.ExceptionType; + +@Embeddable +public record Username( + @Column(name = "username", nullable = false, unique = true, length = 50) + String value +) { + public Username { + if (value.length() > 50) throw new BaseException(ExceptionType.USER_000001); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/persistence/enums/Role.java b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/enums/Role.java new file mode 100644 index 00000000..84152f15 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/persistence/enums/Role.java @@ -0,0 +1,5 @@ +package org.palette.easeluserservice.persistence.enums; + +public enum Role { + NORMAL, ADMIN +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/service/UserService.java b/src/user-service/src/main/java/org/palette/easeluserservice/service/UserService.java new file mode 100644 index 00000000..cc963db5 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/service/UserService.java @@ -0,0 +1,79 @@ +package org.palette.easeluserservice.service; + +import lombok.RequiredArgsConstructor; +import org.palette.easeluserservice.exception.BaseException; +import org.palette.easeluserservice.exception.ExceptionType; +import org.palette.easeluserservice.persistence.User; +import org.palette.easeluserservice.persistence.UserJpaRepository; +import org.palette.easeluserservice.persistence.embed.*; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Service +@Transactional(readOnly = true) +@RequiredArgsConstructor +public class UserService { + + private static final String DEFAULT_STRING_VALUE = ""; + + private final UserJpaRepository userJpaRepository; + + @Transactional + public User createTemporaryUser( + String email, + String nickname + ) { + User user = User.preJoin(email, nickname, DEFAULT_STRING_VALUE); + + userJpaRepository.save(user); + + return user; + } + + @Transactional + public User createCompletedUser( + User user, + String password, + String username, + Optional introduce, + Optional profileImagePath, + Optional backgroundImagePath, + Optional websitePath + ) { + user.join( + password, + username, + new Profile( + user.getProfile().nickname(), + new Introduce(introduce.orElse(DEFAULT_STRING_VALUE)), + new StaticContentPath( + profileImagePath.orElse(DEFAULT_STRING_VALUE), + backgroundImagePath.orElse(DEFAULT_STRING_VALUE), + websitePath.orElse(DEFAULT_STRING_VALUE) + ) + ) + ); + + userJpaRepository.save(user); + + return user; + } + + public Email isEmailAlreadyExists(String requestedEmail) { + Email email = new Email(requestedEmail); + if (userJpaRepository.existsByEmail(email)) throw new BaseException(ExceptionType.USER_000006); + return email; + } + + public Username isUsernameAlreadyExists(String requestedUsername) { + Username username = new Username(requestedUsername); + if (userJpaRepository.existsByUsername(username)) throw new BaseException(ExceptionType.USER_000006); + return username; + } + + public Optional loadByEmail(Email email) { + return userJpaRepository.findByEmail(email); + } +} diff --git a/src/user-service/src/main/java/org/palette/easeluserservice/usecase/UserUsecase.java b/src/user-service/src/main/java/org/palette/easeluserservice/usecase/UserUsecase.java new file mode 100644 index 00000000..369774f9 --- /dev/null +++ b/src/user-service/src/main/java/org/palette/easeluserservice/usecase/UserUsecase.java @@ -0,0 +1,96 @@ +package org.palette.easeluserservice.usecase; + +import lombok.RequiredArgsConstructor; +import org.palette.easeluserservice.dto.request.JoinRequest; +import org.palette.easeluserservice.dto.request.TemporaryJoinRequest; +import org.palette.easeluserservice.dto.response.EmailDuplicationVerifyResponse; +import org.palette.easeluserservice.exception.BaseException; +import org.palette.easeluserservice.exception.ExceptionType; +import org.palette.easeluserservice.external.GrpcAuth; +import org.palette.easeluserservice.external.GrpcSocial; +import org.palette.easeluserservice.persistence.User; +import org.palette.easeluserservice.persistence.embed.Email; +import org.palette.easeluserservice.service.UserService; +import org.palette.grpc.GCreateUserRequest; +import org.palette.grpc.GSendEmailAuthRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@RequiredArgsConstructor +@Service +@Transactional(readOnly = true) +public class UserUsecase { + + private final UserService userService; + private final GrpcSocial gRPCSocial; + private final GrpcAuth gRPCAuth; + + public EmailDuplicationVerifyResponse executeNicknameDuplicationVerify( + String email + ) { + return new EmailDuplicationVerifyResponse( + userService.isEmailAlreadyExists(email) != null + ); + } + + @Transactional + public void executeTemporaryJoin( + TemporaryJoinRequest temporaryJoinRequest + ) { + userService.isEmailAlreadyExists(temporaryJoinRequest.email()); + + final User user = userService.createTemporaryUser( + temporaryJoinRequest.email(), + temporaryJoinRequest.nickname() + ); + +// gRPCSendEmailAuth(user); + } + + @Transactional + public void executeJoin( + JoinRequest joinRequest + ) { + final Optional optionalUser = userService.loadByEmail( + new Email(joinRequest.email()) + ); + + User user = validateJoinRequest(joinRequest, optionalUser); + + user = userService.createCompletedUser( + user, + joinRequest.password(), + joinRequest.username(), + joinRequest.introduce(), + joinRequest.profilePath(), + joinRequest.backgroundPath(), + joinRequest.websitePath() + ); + + gRPCCreateSocialUser(user); + } + + private void gRPCSendEmailAuth(User user) { + final GSendEmailAuthRequest gSendEmailAuthRequest = GSendEmailAuthRequest.newBuilder() + .setId(user.getId()) + .setEmail(user.getEmail().value()) + .setNickname(user.getProfile().nickname().value()) + .build(); + + gRPCAuth.sendEmailAuth(gSendEmailAuthRequest); + } + + private void gRPCCreateSocialUser(User user) { + gRPCSocial.createSocialUser(user); + } + + private User validateJoinRequest(JoinRequest joinRequest, Optional optionalUser) { + if (optionalUser.isEmpty()) throw new BaseException(ExceptionType.USER_000004); + User user = optionalUser.get(); + if (user.isUserNotAuthed()) throw new BaseException(ExceptionType.USER_000002); + userService.isUsernameAlreadyExists(joinRequest.username()); + return user; + } +} diff --git a/src/user-service/src/main/resources/application.yml b/src/user-service/src/main/resources/application.yml new file mode 100644 index 00000000..bb7eb895 --- /dev/null +++ b/src/user-service/src/main/resources/application.yml @@ -0,0 +1,39 @@ +server: + port: 10002 + +spring: + application: + name: user-service + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${USER_DB_URI} + username: ${USER_DB_USERNAME} + password: ${USER_DB_PASSWORD} + jpa: + hibernate: + ddl-auto: validate + properties: + hibernate: + default_batch_size: 999 + show_sql: true + format_sql: true + use-new-id-generator-mappings: false + +eureka: + instance: + hostname: localhost + client: + fetch-registry: true + register-with-eureka: true + service-url: + defaultZone: http://localhost:8761/eureka + +grpc: + server: + port: 11002 + client: + social-service: + address: 'discovery:///SOCIAL-SERVICE' + enableKeepAlive: true + keepAliveWithoutCalls: true + negotiationType: plaintext diff --git a/src/user-service/src/main/resources/ddl/User.sql b/src/user-service/src/main/resources/ddl/User.sql new file mode 100644 index 00000000..5edf6bb1 --- /dev/null +++ b/src/user-service/src/main/resources/ddl/User.sql @@ -0,0 +1,20 @@ +create table user +( + id bigint auto_increment primary key, + email varchar(70) unique key, + username varchar(255) unique key, + password varchar(100) not null default '', + nickname varchar(50) not null default '', + introduce varchar(160) not null default '', + profile_image_path varchar(100) not null default '', + background_image_path varchar(100) not null default '', + website_path varchar(100) not null default '', + paint_pin text not null, + dm_pin text not null, + role enum ('NORMAL', 'ADMIN') not null default 'NORMAL', + authed bit not null default false, + accessed_at datetime(6) null, + created_at datetime(6) null, + deleted_at datetime(6) null, + updated_at datetime(6) null +); diff --git a/src/user-service/src/test/java/org/palette/easeluserservice/e2e/AcceptanceTestBase.java b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/AcceptanceTestBase.java new file mode 100644 index 00000000..352e6fb1 --- /dev/null +++ b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/AcceptanceTestBase.java @@ -0,0 +1,45 @@ +package org.palette.easeluserservice.e2e; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.transaction.annotation.Transactional; + +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; + +// @Transactional +@Disabled +@SpringBootTest +@AutoConfigureMockMvc +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class AcceptanceTestBase { + + @Autowired + protected MockMvc mvc; + @Autowired + protected ObjectMapper objectMapper; + + public ResultActions executePost( + final String url, + final Object requestDto + ) { + + try { + return mvc.perform( + post(url) + .content(objectMapper.writeValueAsString(requestDto)) + .contentType(APPLICATION_JSON) + .accept(APPLICATION_JSON)) + .andDo(print()); + } catch (Exception e) { + throw new BuildResultActionsException(e.getCause()); + } + } +} diff --git a/src/user-service/src/test/java/org/palette/easeluserservice/e2e/BuildResultActionsException.java b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/BuildResultActionsException.java new file mode 100644 index 00000000..2a1495de --- /dev/null +++ b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/BuildResultActionsException.java @@ -0,0 +1,7 @@ +package org.palette.easeluserservice.e2e; + +public class BuildResultActionsException extends RuntimeException { + public BuildResultActionsException(Throwable cause) { + super(cause); + } +} diff --git a/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/Join.java b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/Join.java new file mode 100644 index 00000000..2c3ed077 --- /dev/null +++ b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/Join.java @@ -0,0 +1,102 @@ +package org.palette.easeluserservice.e2e.api; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.palette.easeluserservice.dto.request.JoinRequest; +import org.palette.easeluserservice.e2e.AcceptanceTestBase; +import org.palette.easeluserservice.persistence.User; +import org.palette.easeluserservice.persistence.UserJpaRepository; +import org.palette.easeluserservice.persistence.embed.*; +import org.palette.easeluserservice.persistence.enums.Role; +import org.springframework.beans.factory.annotation.Autowired; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.time.LocalDateTime; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +public class Join extends AcceptanceTestBase { + + @Autowired + private UserJpaRepository userJpaRepository; + + @BeforeEach + public void insertTemporaryUser() throws NoSuchMethodException, + InvocationTargetException, + InstantiationException, + IllegalAccessException { + + if (userJpaRepository.existsByEmail(new Email("diger@gmail.com"))) return; + + Class userClass = User.class; + Constructor constructor = userClass.getDeclaredConstructor( + Long.class, + Email.class, + Username.class, + Password.class, + Profile.class, + PaintPin.class, + DmPin.class, + Role.class, + Boolean.class, + LocalDateTime.class, + LocalDateTime.class, + LocalDateTime.class, + LocalDateTime.class + ); + + constructor.setAccessible(true); + + User user = constructor.newInstance( + 1L, + new Email("diger@gmail.com"), + new Username(""), + new Password(""), + new Profile( + new Nickname("digerDisplayName1"), + new Introduce(""), + new StaticContentPath( + "", + "", + "" + ) + ), + new PaintPin(""), + new DmPin(""), + Role.NORMAL, + true, + null, + null, + null, + null + ); + + userJpaRepository.save(user); + } + + @Test + @DisplayName("회원가입 정상 로직 테스트") + public void executePassCase() throws Exception { + JoinRequest joinRequest = new JoinRequest( + "diger@gmail.com", + "digerPassword", + "digerHashTag", + null, + null, + null, + null + ); + executePost( + "/users/join", + joinRequest + ).andExpect(status().isCreated()); + } + + @Test + @DisplayName("회원가입 실패 로직 테스트 - 이메일 길이 초과") + public void executeBrokenCaseBy() { + + } +} diff --git a/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/TemporaryJoin.java b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/TemporaryJoin.java new file mode 100644 index 00000000..72023810 --- /dev/null +++ b/src/user-service/src/test/java/org/palette/easeluserservice/e2e/api/TemporaryJoin.java @@ -0,0 +1,24 @@ +package org.palette.easeluserservice.e2e.api; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.palette.easeluserservice.dto.request.TemporaryJoinRequest; +import org.palette.easeluserservice.e2e.AcceptanceTestBase; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +public class TemporaryJoin extends AcceptanceTestBase { + + @Test + @DisplayName("임시 회원가입 정상 로직 테스트") + public void executePassCase() throws Exception { + TemporaryJoinRequest temporaryJoinRequest = new TemporaryJoinRequest( + "diger@gmail.com", + "digerDisplayName" + ); + executePost( + "/users/temporary-join", + temporaryJoinRequest + ).andExpect(status().isCreated()); + } +}