From ffff5d8ed45bca351b4492d20e9bea7b5e9b450a Mon Sep 17 00:00:00 2001 From: barrackkk Date: Mon, 28 Apr 2025 10:20:00 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 31 ++- build.gradle | 33 +++- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 43 ++-- gradlew.bat | 183 +++++++++--------- settings.gradle | 3 +- src/main/java/com/sprint/JavaApplication.java | 53 ----- .../java/com/sprint/JavaApplication2.java | 67 ------- .../java/com/sprint/JavaApplication3.java | 54 ------ .../mission/discodeit/JavaApplication.java | 53 +++++ .../mission/discodeit/entity/Channel.java | 94 ++++----- .../mission/discodeit/entity/ChannelType.java | 6 + .../mission/discodeit/entity/Message.java | 91 ++++----- .../sprint/mission/discodeit/entity/User.java | 97 ++++------ .../mission/discodeit/menu/ChannelMenu.java | 73 ------- .../mission/discodeit/menu/MessageMenu.java | 51 ----- .../mission/discodeit/menu/UserMenu.java | 73 ------- .../repository/ChannelRepository.java | 17 +- .../repository/DefaultChannelFactory.java | 16 -- .../repository/MessageRepository.java | 15 +- .../discodeit/repository/UserRepository.java | 15 +- .../file/FileChannelRepository.java | 119 +++++++----- .../file/FileMessageRepository.java | 117 ++++++----- .../repository/file/FileUserRepository.java | 117 ++++++----- .../repository/jcf/JCFChannelRepository.java | 36 ++-- .../repository/jcf/JCFMessageRepository.java | 37 ++-- .../repository/jcf/JCFUserRepository.java | 41 ++-- .../service/basic/BasicChannelService.java | 68 +++---- .../service/basic/BasicMessageService.java | 62 ++++-- .../service/basic/BasicUserService.java | 94 +++------ .../service/file/FileChannelService.java | 137 ------------- .../service/file/FileMessageService.java | 92 --------- .../service/file/FileUserService.java | 133 ------------- .../service/jcf/JCFChannelService.java | 84 -------- .../service/jcf/JCFMessageService.java | 41 ---- .../discodeit/service/jcf/JCFUserService.java | 79 -------- src/main/resources/application.yaml | 1 + .../discodeit/DiscodeitApplicationTests.java | 13 ++ 40 files changed, 727 insertions(+), 1620 deletions(-) create mode 100644 .gitattributes delete mode 100644 src/main/java/com/sprint/JavaApplication.java delete mode 100644 src/main/java/com/sprint/JavaApplication2.java delete mode 100644 src/main/java/com/sprint/JavaApplication3.java create mode 100644 src/main/java/com/sprint/mission/discodeit/JavaApplication.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/ChannelType.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/repository/DefaultChannelFactory.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java create mode 100644 src/main/resources/application.yaml create mode 100644 src/test/java/com/sprint/mission/discodeit/DiscodeitApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..8af972cd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore index 30f54e02..c2065bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,11 @@ +HELP.md .gradle build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### +### STS ### .apt_generated .classpath .factorypath @@ -28,6 +17,15 @@ bin/ !**/src/main/**/bin/ !**/src/test/**/bin/ +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + ### NetBeans ### /nbproject/private/ /nbbuild/ @@ -37,10 +35,3 @@ bin/ ### VS Code ### .vscode/ - -### Mac OS ### -.DS_Store - -.idea/ -*.iml -*.xml \ No newline at end of file diff --git a/build.gradle b/build.gradle index 668101a2..1c8b5c58 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,36 @@ plugins { - id 'java' + id 'java' + id 'org.springframework.boot' version '3.4.4' + id 'io.spring.dependency-management' version '1.1.7' } group = 'com.sprint.mission' -version = '1.0-SNAPSHOT' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} repositories { - mavenCentral() + mavenCentral() } dependencies { - testImplementation platform('org.junit:junit-bom:5.10.0') - testImplementation 'org.junit.jupiter:junit-jupiter' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } -test { - useJUnitPlatform() -} \ No newline at end of file +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..9bbc975c742b298b441bfb90dbc124400a3751b9 100644 GIT binary patch literal 43705 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 DHx0+F literal 60756 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 /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +133,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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 @@ -193,11 +200,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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" \ @@ -205,6 +216,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +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 - -@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=. -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%" == "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%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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=%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/settings.gradle b/settings.gradle index 79373e36..2437dfb2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -rootProject.name = '3-sprint-mission' - +rootProject.name = 'discodeit' diff --git a/src/main/java/com/sprint/JavaApplication.java b/src/main/java/com/sprint/JavaApplication.java deleted file mode 100644 index 0a3c97e4..00000000 --- a/src/main/java/com/sprint/JavaApplication.java +++ /dev/null @@ -1,53 +0,0 @@ -//package com.sprint; -// -//import com.sprint.mission.discodeit.menu.ChannelMenu; -//import com.sprint.mission.discodeit.menu.MessageMenu; -//import com.sprint.mission.discodeit.menu.UserMenu; -//import com.sprint.mission.discodeit.service.ChannelService; -//import com.sprint.mission.discodeit.service.MessageService; -//import com.sprint.mission.discodeit.service.UserService; -//import com.sprint.mission.discodeit.service.file.FileChannelService; -//import com.sprint.mission.discodeit.service.file.FileMessageService; -//import com.sprint.mission.discodeit.service.file.FileUserService; -//import java.util.Scanner; -// -//public class JavaApplication { -//스프린트 미션1 코드 -// private static final Scanner sc = new Scanner(System.in); -// -// public static void main(String[] args) { -// ChannelService channelService = new FileChannelService(); -// MessageService messageService = new FileMessageService(); -// UserService userService = new FileUserService(); -// -// UserMenu userMenu = new UserMenu(sc, userService); -// ChannelMenu channelMenu = new ChannelMenu(sc, channelService); -// MessageMenu messageMenu = new MessageMenu(sc, messageService); -// -// userMenu.loginUser(); -// -// System.out.println("모든 채널 정보를 출력합니다."); -// channelService.outputAllChannelInfo(); -// System.out.println("들어가실 채널 번호를 선택해 주세요."); -// int channelNumber = Integer.parseInt(sc.nextLine()); -// channelService.selectChannel(channelNumber); -// -// while (true) { -// System.out.println("원하는 기능을 입력 해 주세요."); -// System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃"); -// int choice = Integer.parseInt(sc.nextLine()); -// -// switch (choice) { -// case 1 -> userMenu.run(); -// case 2 -> channelMenu.run(); -// case 3 -> messageMenu.run(); -// case 4 -> { -// System.out.println("Discodeit을 종료합니다. 감사합니다."); -// sc.close(); -// return; -// } -// default -> System.out.println("올바른 번호를 입력해 주세요."); -// } -// } -// } -//} \ No newline at end of file diff --git a/src/main/java/com/sprint/JavaApplication2.java b/src/main/java/com/sprint/JavaApplication2.java deleted file mode 100644 index 408df49b..00000000 --- a/src/main/java/com/sprint/JavaApplication2.java +++ /dev/null @@ -1,67 +0,0 @@ -//package com.sprint; -// -//import com.sprint.mission.discodeit.entity.Channel; -//import com.sprint.mission.discodeit.menu.ChannelMenu; -//import com.sprint.mission.discodeit.menu.MessageMenu; -//import com.sprint.mission.discodeit.menu.UserMenu; -//import com.sprint.mission.discodeit.repository.DefaultChannelFactory; -//import com.sprint.mission.discodeit.repository.jcf.JCFChannelRepository; -//import com.sprint.mission.discodeit.repository.jcf.JCFMessageRepository; -//import com.sprint.mission.discodeit.repository.jcf.JCFUserRepository; -//import com.sprint.mission.discodeit.service.ChannelService; -//import com.sprint.mission.discodeit.service.MessageService; -//import com.sprint.mission.discodeit.service.UserService; -//import com.sprint.mission.discodeit.service.basic.BasicChannelService; -//import com.sprint.mission.discodeit.service.basic.BasicMessageService; -//import com.sprint.mission.discodeit.service.basic.BasicUserService; -//import java.util.Scanner; -// -//public class JavaApplication2 { -// -// private static final Scanner sc = new Scanner(System.in); -// -// //JCF 기반 테스트 -// public static void main(String[] args) { -// JCFUserRepository jcfUserRepo = new JCFUserRepository(); -// JCFChannelRepository jcfChannelRepo = new JCFChannelRepository(); -// JCFMessageRepository jcfMessageRepo = new JCFMessageRepository(); -// DefaultChannelFactory.getChannel() -// .forEach(jcfChannelRepo::saveChannel); -// -// UserService userServiceJCF = new BasicUserService(jcfUserRepo); -// ChannelService channelServiceJCF = new BasicChannelService(jcfChannelRepo); -// MessageService messageServiceJCF = new BasicMessageService(jcfMessageRepo); -// -// UserMenu userMenu = new UserMenu(sc, userServiceJCF); -// -// MessageMenu messageMenu = new MessageMenu(sc, messageServiceJCF); -// -// userMenu.loginUser(); -// -// System.out.println("모든 채널 정보를 출력합니다."); -// channelServiceJCF.outputAllChannelInfo(); -// System.out.println("들어가실 채널 번호를 선택해 주세요."); -// int channelNumber = Integer.parseInt(sc.nextLine()); -// Channel selectedChannel = channelServiceJCF.getChannelByNumber(channelNumber); -// channelServiceJCF.selectChannel(channelNumber); -// -// ChannelMenu channelMenu = new ChannelMenu(sc, channelServiceJCF, selectedChannel); -// while (true) { -// System.out.println("원하는 기능을 입력 해 주세요."); -// System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃"); -// int choice = Integer.parseInt(sc.nextLine()); -// -// switch (choice) { -// case 1 -> userMenu.run(); -// case 2 -> channelMenu.run(); -// case 3 -> messageMenu.run(); -// case 4 -> { -// System.out.println("Discodeit을 종료합니다. 감사합니다."); -// sc.close(); -// return; -// } -// default -> System.out.println("올바른 번호를 입력해 주세요."); -// } -// } -// } -//} \ No newline at end of file diff --git a/src/main/java/com/sprint/JavaApplication3.java b/src/main/java/com/sprint/JavaApplication3.java deleted file mode 100644 index dec256d8..00000000 --- a/src/main/java/com/sprint/JavaApplication3.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.sprint; - -import com.sprint.mission.discodeit.menu.ChannelMenu; -import com.sprint.mission.discodeit.menu.MessageMenu; -import com.sprint.mission.discodeit.menu.UserMenu; -import com.sprint.mission.discodeit.repository.file.FileChannelRepository; -import com.sprint.mission.discodeit.repository.file.FileMessageRepository; -import com.sprint.mission.discodeit.repository.file.FileUserRepository; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.basic.BasicChannelService; -import com.sprint.mission.discodeit.service.basic.BasicMessageService; -import com.sprint.mission.discodeit.service.basic.BasicUserService; -import java.util.Scanner; - -public class JavaApplication3 { - - private static final Scanner sc = new Scanner(System.in); - - public static void main(String[] args) { - FileUserRepository fileUserRepo = new FileUserRepository(); - FileChannelRepository fileChannelRepo = new FileChannelRepository(); - FileMessageRepository fileMessageRepo = new FileMessageRepository(); - - UserService userService = new BasicUserService(fileUserRepo); - ChannelService channelService = new BasicChannelService(fileChannelRepo); - MessageService messageService = new BasicMessageService(fileMessageRepo); - - UserMenu userMenu = new UserMenu(sc, userService); - ChannelMenu channelMenu = new ChannelMenu(sc, channelService); - MessageMenu messageMenu = new MessageMenu(sc, messageService); - - userMenu.loginUser(); - - while (true) { - System.out.println("\n원하는 기능을 입력해 주세요."); - System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃"); - int choice = Integer.parseInt(sc.nextLine()); - - switch (choice) { - case 1 -> userMenu.run(); - case 2 -> channelMenu.run(); - case 3 -> messageMenu.run(); - case 4 -> { - System.out.println("Discodeit을 종료합니다. 감사합니다."); - sc.close(); - return; - } - default -> System.out.println("올바른 번호를 입력해 주세요."); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java new file mode 100644 index 00000000..599bfab6 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java @@ -0,0 +1,53 @@ +package com.sprint.mission.discodeit; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.ChannelType; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.repository.ChannelRepository; +import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.repository.file.FileMessageRepository; +import com.sprint.mission.discodeit.repository.file.FileUserRepository; +import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.basic.BasicChannelService; +import com.sprint.mission.discodeit.service.basic.BasicMessageService; +import com.sprint.mission.discodeit.service.basic.BasicUserService; + +public class JavaApplication { + static User setupUser(UserService userService) { + User user = userService.create("woody", "woody@codeit.com", "woody1234"); + return user; + } + + static Channel setupChannel(ChannelService channelService) { + Channel channel = channelService.create(ChannelType.PUBLIC, "공지", "공지 채널입니다."); + return channel; + } + + static void messageCreateTest(MessageService messageService, Channel channel, User author) { + Message message = messageService.create("안녕하세요.", channel.getId(), author.getId()); + System.out.println("메시지 생성: " + message.getId()); + } + + public static void main(String[] args) { + // 레포지토리 초기화 + UserRepository userRepository = new FileUserRepository(); + ChannelRepository channelRepository = new FileChannelRepository(); + MessageRepository messageRepository = new FileMessageRepository(); + + // 서비스 초기화 + UserService userService = new BasicUserService(userRepository); + ChannelService channelService = new BasicChannelService(channelRepository); + MessageService messageService = new BasicMessageService(messageRepository, channelRepository, userRepository); + + // 셋업 + User user = setupUser(userService); + Channel channel = setupChannel(channelService); + // 테스트 + messageCreateTest(messageService, channel, user); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java index a9316bb8..3a1058e4 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -1,83 +1,65 @@ package com.sprint.mission.discodeit.entity; import java.io.Serializable; +import java.time.Instant; import java.util.UUID; public class Channel implements Serializable { - private static final long serialVersionUID = -8345660952343662023L; - private static int counter = 1; - - private int number; - private String channelName; + private static final long serialVersionUID = 1L; private UUID id; - private long createdAt; - private long updateAt; - - public Channel(String channelName) { - this.number = counter++; - this.channelName = channelName; + private Long createdAt; + private Long updatedAt; + // + private ChannelType type; + private String name; + private String description; + + public Channel(ChannelType type, String name, String description) { this.id = UUID.randomUUID(); - this.createdAt = System.currentTimeMillis(); - this.updateAt = System.currentTimeMillis(); - } - - public void updateChannel(String channelName) { - this.channelName = channelName; - this.updateAt = System.currentTimeMillis(); - } - - public String getChannelName() { - return channelName; + this.createdAt = Instant.now().getEpochSecond(); + // + this.type = type; + this.name = name; + this.description = description; } public UUID getId() { return id; } - public int getChannelNumber() { - return number; - } - public Long getCreatedAt() { return createdAt; } - public Long getUpdateAt() { - return updateAt; - } - - public static void setCounter(int newCounter) { - counter = newCounter; - } - - public void setNumber(int number) { - this.number = number; - } - - public void setChannelName(String channelName) { - this.channelName = channelName; + public Long getUpdatedAt() { + return updatedAt; } - public void setId(UUID id) { - this.id = id; + public ChannelType getType() { + return type; } - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; + public String getName() { + return name; } - public void setUpdateAt(long updateAt) { - this.updateAt = updateAt; + public String getDescription() { + return description; } - @Override - public String toString() { - return "Channel{" + - "number=" + number + - ", channelName='" + channelName + '\'' + - ", id=" + id + - ", createdAt=" + createdAt + - ", updateAt=" + updateAt + - '}'; + public void update(String newName, String newDescription) { + boolean anyValueUpdated = false; + if (newName != null && !newName.equals(this.name)) { + this.name = newName; + anyValueUpdated = true; + } + if (newDescription != null && !newDescription.equals(this.description)) { + this.description = newDescription; + anyValueUpdated = true; + } + + if (anyValueUpdated) { + this.updatedAt = Instant.now().getEpochSecond(); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/ChannelType.java b/src/main/java/com/sprint/mission/discodeit/entity/ChannelType.java new file mode 100644 index 00000000..9a2ff3f0 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/ChannelType.java @@ -0,0 +1,6 @@ +package com.sprint.mission.discodeit.entity; + +public enum ChannelType { + PUBLIC, + PRIVATE, +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java index edb99cb8..e622318a 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -1,84 +1,63 @@ package com.sprint.mission.discodeit.entity; import java.io.Serializable; +import java.time.Instant; import java.util.UUID; public class Message implements Serializable { - private static final long serialVersionUID = -953021662940755622L; - private static int counter = 1; + private static final long serialVersionUID = 1L; - private int number; private UUID id; - private long createdAt; - private long updateAt; - private String message; - - public Message(String message) { - this.number = counter++; + private Long createdAt; + private Long updatedAt; + // + private String content; + // + private UUID channelId; + private UUID authorId; + + public Message(String content, UUID channelId, UUID authorId) { this.id = UUID.randomUUID(); - this.createdAt = System.currentTimeMillis(); - this.updateAt = System.currentTimeMillis(); - this.message = message; - } - - public void updateMessage(String message) { - this.number = counter++; - this.message = message; - this.updateAt = System.currentTimeMillis(); + this.createdAt = Instant.now().getEpochSecond(); + // + this.content = content; + this.channelId = channelId; + this.authorId = authorId; } public UUID getId() { return id; } - public long getCreatedAt() { + public Long getCreatedAt() { return createdAt; } - public long getUpdateAt() { - return updateAt; - } - - public String getMessage() { - return message; - } - - public int getNumber() { - return number; - } - - public static void setCounter(int counter) { - Message.counter = counter; + public Long getUpdatedAt() { + return updatedAt; } - public void setNumber(int number) { - this.number = number; + public String getContent() { + return content; } - public void setId(UUID id) { - this.id = id; + public UUID getChannelId() { + return channelId; } - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; + public UUID getAuthorId() { + return authorId; } - public void setUpdateAt(long updateAt) { - this.updateAt = updateAt; - } - - public void setMessage(String message) { - this.message = message; - } + public void update(String newContent) { + boolean anyValueUpdated = false; + if (newContent != null && !newContent.equals(this.content)) { + this.content = newContent; + anyValueUpdated = true; + } - @Override - public String toString() { - return "Message{" + - "number=" + number + - ", id=" + id + - ", createdAt=" + createdAt + - ", updateAt=" + updateAt + - ", message='" + message + '\'' + - '}'; + if (anyValueUpdated) { + this.updatedAt = Instant.now().getEpochSecond(); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java index 38c759b2..c4f0faaa 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -1,83 +1,70 @@ package com.sprint.mission.discodeit.entity; import java.io.Serializable; +import java.time.Instant; import java.util.UUID; public class User implements Serializable { - private static final long serialVersionUID = 2047441161413796353L; + private static final long serialVersionUID = 1L; - private static int counter = 1; - private int number; - private String username; private UUID id; - private long createdAt; - private long updatedAt; + private Long createdAt; + private Long updatedAt; + // + private String username; + private String email; + private String password; - public User(String name) { - this.number = counter++; + public User(String username, String email, String password) { this.id = UUID.randomUUID(); - this.createdAt = System.currentTimeMillis(); - this.updatedAt = System.currentTimeMillis(); - this.username = name; - } - - public void updateUserName(String username) { + this.createdAt = Instant.now().getEpochSecond(); + // this.username = username; - this.updatedAt = System.currentTimeMillis(); - } - - public String getUsername() { - return username; - } - - public void setNumber(int number) { - this.number = number; - } - - public void setUsername(String username) { - this.username = username; - } - - public void setId(UUID id) { - this.id = id; - } - - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } - - public void setUpdatedAt(long updatedAt) { - this.updatedAt = updatedAt; + this.email = email; + this.password = password; } public UUID getId() { return id; } - public long getCreatedAt() { + public Long getCreatedAt() { return createdAt; } - public long getUpdatedAt() { + public Long getUpdatedAt() { return updatedAt; } - public int getNumber() { - return number; + public String getUsername() { + return username; + } + + public String getEmail() { + return email; } - public static void setCounter(int newCounter) { - counter = newCounter; + public String getPassword() { + return password; } - @Override - public String toString() { - return "User{" + - "number=" + number + - ", username='" + username + '\'' + - ", id=" + id + - ", createdAt=" + createdAt + - ", updatedAt=" + updatedAt + - '}'; + public void update(String newUsername, String newEmail, String newPassword) { + boolean anyValueUpdated = false; + if (newUsername != null && !newUsername.equals(this.username)) { + this.username = newUsername; + anyValueUpdated = true; + } + if (newEmail != null && !newEmail.equals(this.email)) { + this.email = newEmail; + anyValueUpdated = true; + } + if (newPassword != null && !newPassword.equals(this.password)) { + this.password = newPassword; + anyValueUpdated = true; + } + + if (anyValueUpdated) { + this.updatedAt = Instant.now().getEpochSecond(); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java deleted file mode 100644 index 978fa083..00000000 --- a/src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.sprint.mission.discodeit.menu; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.service.ChannelService; -import java.util.Scanner; - -public class ChannelMenu { - private final Scanner sc; - private final ChannelService channelService; - private Channel currentChannel; - - public ChannelMenu(Scanner scanner, ChannelService channelService) { - this.sc = scanner; - this.channelService = channelService; - } - - public void run() { - - System.out.println("모든 채널 정보를 출력합니다."); - channelService.outputAllChannelInfo(); - System.out.println("들어가실 채널 번호를 선택해 주세요."); - int channelNumber = Integer.parseInt(sc.nextLine()); - currentChannel = channelService.getChannelByNumber(channelNumber); - if (currentChannel == null) { - System.out.println("유효하지 않은 채널 번호입니다."); - return; - } - - while (true) { - System.out.println("1. 채널 생성\t2. 현재 채널 정보 출력\t3. 모든 채널 정보 출력\t4. 채널 이름 수정\t5. 채널 삭제\t6. 채널 변경\t7. 이전 메뉴"); - int n = Integer.parseInt(sc.nextLine()); - - switch (n) { - case 1 -> { - System.out.println("새로 추가하실 채널 이름을 입력해 주세요."); - String newChannelName = sc.nextLine(); - channelService.createNewChannel(newChannelName); - } - case 2 -> channelService.outputOneChannelInfo(currentChannel); - case 3 -> channelService.outputAllChannelInfo(); - case 4 -> { - System.out.println("현재 접속중인 채널은 " + currentChannel.getChannelName() + "입니다. 새로운 채널 이름을 입력해 주세요."); - String updateChannelName = sc.nextLine(); - channelService.updateChannelName(currentChannel, updateChannelName); - } - case 5 -> { - System.out.println(currentChannel.getChannelName() + " 채널을 삭제합니다."); - channelService.deleteChannelName(currentChannel); - System.out.println("정상적으로 채널이 삭제됐습니다. 변경하실 채널 번호를 입력해주세요."); - channelService.outputAllChannelInfo(); - int newChannelNumber = Integer.parseInt(sc.nextLine()); - currentChannel = channelService.getChannelByNumber(newChannelNumber); - if (currentChannel == null) { - System.out.println("유효하지 않은 채널 번호입니다."); - } - } - case 6 -> { - System.out.println("변경하실 채널 번호를 입력해주세요."); - channelService.outputAllChannelInfo(); - int newChannelNumber = Integer.parseInt(sc.nextLine()); - currentChannel = channelService.getChannelByNumber(newChannelNumber); - if (currentChannel == null) { - System.out.println("유효하지 않은 채널 번호입니다."); - } - } - case 7 -> { - return; - } - default -> System.out.println("올바른 번호를 입력해 주세요."); - } - } - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java deleted file mode 100644 index 3e6e535b..00000000 --- a/src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.sprint.mission.discodeit.menu; - - -import com.sprint.mission.discodeit.service.MessageService; -import java.util.Scanner; - -public class MessageMenu { - private final Scanner sc; - private final MessageService messageService; - - public MessageMenu(Scanner sc, MessageService messageService) { - this.sc = sc; - this.messageService = messageService; - } - - public void run() { - while (true) { - System.out.println("1. 메시지 작성\t2. 작성한 메시지 출력\t3. 메시지 수정\t4. 메시지 삭제\t5. 이전 메뉴로 돌아가기"); - int n = Integer.parseInt(sc.nextLine()); - - switch (n) { - case 1 -> { - System.out.println("작성하실 메시지를 입력해 주세요."); - String messageText = sc.nextLine(); - messageService.inputMessage(messageText); - System.out.println("메시지 작성 완료!"); - } - case 2 -> messageService.outputUserMessage(); - case 3 -> { - System.out.println("수정할 메시지의 번호를 입력해 주세요."); - messageService.outputUserMessage(); - int messageNumber = Integer.parseInt(sc.nextLine()); - System.out.println("수정할 메시지를 입력해 주세요."); - String newMessage = sc.nextLine(); - messageService.updateUserMessage(messageNumber, newMessage); - } - case 4 -> { - System.out.println("삭제할 메시지의 번호를 입력해 주세요."); - messageService.outputUserMessage(); - int deleteMessageNumber = Integer.parseInt(sc.nextLine()); - messageService.deleteUserMessage(deleteMessageNumber); - System.out.println("삭제가 완료됐습니다."); - } - case 5 -> { - return; - } - default -> System.out.println("올바른 번호를 입력해 주세요."); - } - } - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java deleted file mode 100644 index f96380e5..00000000 --- a/src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.sprint.mission.discodeit.menu; - -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.UserService; -import java.util.Scanner; - -public class UserMenu { - private final Scanner sc; - private final UserService userService; - private User loginUser; - - public UserMenu(Scanner scanner, UserService userService) { - this.sc = scanner; - this.userService = userService; - } - - public void loginUser() { - userService.registerUser(); - - System.out.println("로그인 하실 프로필 번호를 입력해 주세요."); - userService.outputAllUsersInfo(); - int loginNumber = Integer.parseInt(sc.nextLine()); - userService.login(loginNumber); - loginUser = userService.changeUser(loginNumber); - - System.out.println(loginUser.getUsername() + "님, 반갑습니다."); - } - - public void run() { - if (loginUser == null) { - System.out.println("사용자가 로그인되지 않았습니다."); - return; - } - while (true) { - System.out.println( - "1. 새로운 프로필 추가\t2. 모든 프로필 정보 출력\t3. 프로필 정보 출력\t4. 프로필 이름 수정\t5. 프로필 정보 삭제\t6. 프로필 변경\t7. 이전 메뉴"); - int n = Integer.parseInt(sc.nextLine()); - - switch (n) { - case 1 -> { - System.out.println("새로운 프로필 이름을 입력해 주세요."); - String newUser = sc.nextLine(); - userService.createNewUserNames(loginUser.getUsername(), newUser); - } - case 2 -> userService.outputAllUsersInfo(); - case 3 -> userService.outputOneUserInfo(loginUser.getId()); - case 4 -> { - System.out.println("현재 사용자 이름: " + loginUser.getUsername() + ". 변경할 이름을 입력해 주세요."); - String updateUserName = sc.nextLine(); - userService.updateUserName(loginUser, updateUserName); - } - case 5 -> { - userService.outputAllUsersInfo(); - System.out.println("삭제할 사용자의 번호를 입력해 주세요."); - int num = Integer.parseInt(sc.nextLine()); - System.out.println(loginUser.getUsername() + " 정보를 삭제합니다."); - userService.deleteUserName(num); - } - case 6 -> { - System.out.println("변경할 프로필 번호를 입력해 주세요."); - userService.outputAllUsersInfo(); - int loginNumber = Integer.parseInt(sc.nextLine()); - userService.login(loginNumber); - loginUser = userService.changeUser(loginNumber); - } - case 7 -> { - return; - } - default -> System.out.println("올바른 번호를 입력해 주세요."); - } - } - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java index 18c8393a..014ebcb2 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java @@ -1,17 +1,18 @@ package com.sprint.mission.discodeit.repository; import com.sprint.mission.discodeit.entity.Channel; -import java.util.Map; +import java.util.List; +import java.util.Optional; +import java.util.UUID; public interface ChannelRepository { + Channel save(Channel channel); - void saveChannel(Channel channel); + Optional findById(UUID id); - Channel updateChannel(Channel channel); + List findAll(); - void deleteChannel(int channelNumber); + boolean existsById(UUID id); - Channel findChannel(int channelNumber); - - Map findAllChannel(); -} \ No newline at end of file + void deleteById(UUID id); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/DefaultChannelFactory.java b/src/main/java/com/sprint/mission/discodeit/repository/DefaultChannelFactory.java deleted file mode 100644 index bf3a26d3..00000000 --- a/src/main/java/com/sprint/mission/discodeit/repository/DefaultChannelFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sprint.mission.discodeit.repository; - -import com.sprint.mission.discodeit.entity.Channel; -import java.util.Arrays; -import java.util.List; - -public class DefaultChannelFactory { - public static List getChannel() { - return Arrays.asList( - new Channel("코드잇 스프린트:스프링 백엔드 3기"), - new Channel("코드잇 커뮤니티"), - new Channel("알고리즘 스터디"), - new Channel("CS 스터디") - ); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java index 939e14cc..2235070f 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -2,16 +2,17 @@ import com.sprint.mission.discodeit.entity.Message; import java.util.List; +import java.util.Optional; +import java.util.UUID; public interface MessageRepository { + Message save(Message message); - void saveMessage(Message message); + Optional findById(UUID id); - void updateMessage(Message message); + List findAll(); - void deleteMessage(int messageNumber); + boolean existsById(UUID id); - Message findMessage(int messageNumber); - - List findAllMessage(); -} \ No newline at end of file + void deleteById(UUID id); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java index fb1898bf..6e827449 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -2,16 +2,17 @@ import com.sprint.mission.discodeit.entity.User; import java.util.List; +import java.util.Optional; +import java.util.UUID; public interface UserRepository { + User save(User user); - void saveUser(User user); + Optional findById(UUID id); - void updateUser(User user); + List findAll(); - void deleteUser(int userNumber); + boolean existsById(UUID id); - User findUser(int userNumber); - - List findAllUser(); -} \ No newline at end of file + void deleteById(UUID id); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java index 58ee2680..489b540d 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java @@ -2,85 +2,102 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.repository.ChannelRepository; -import com.sprint.mission.discodeit.repository.DefaultChannelFactory; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.HashMap; -import java.util.Map; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; +import java.util.UUID; public class FileChannelRepository implements ChannelRepository { - - private final String FILEPATH = "channels.ser"; - private Map channelMap; + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; public FileChannelRepository() { - channelMap = loadChannels(); - if (channelMap == null || channelMap.isEmpty()) { - channelMap = new HashMap<>(); - for (Channel ch : DefaultChannelFactory.getChannel()) { - channelMap.put(ch.getChannelNumber(), ch); + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", Channel.class.getSimpleName()); + if (Files.notExists(DIRECTORY)) { + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException(e); } - saveChannels(); - } else { - int max = channelMap.keySet().stream().mapToInt(Integer::intValue).max().orElse(0); - Channel.setCounter(max + 1); } } - private Map loadChannels() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (Map) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; + private Path resolvePath(UUID id) { + return DIRECTORY.resolve(id + EXTENSION); } - private void saveChannels() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(channelMap); + @Override + public Channel save(Channel channel) { + Path path = resolvePath(channel.getId()); + try ( + FileOutputStream fos = new FileOutputStream(path.toFile()); + ObjectOutputStream oos = new ObjectOutputStream(fos) + ) { + oos.writeObject(channel); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException(e); } + return channel; } @Override - public void saveChannel(Channel channel) { - channelMap.put(channel.getChannelNumber(), channel); - saveChannels(); - } - - @Override - public Channel updateChannel(Channel channel) { - if (channelMap.containsKey(channel.getChannelNumber())) { - channelMap.put(channel.getChannelNumber(), channel); - saveChannels(); - return channel; + public Optional findById(UUID id) { + Channel channelNullable = null; + Path path = resolvePath(id); + if (Files.exists(path)) { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + channelNullable = (Channel) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } } - return null; + return Optional.ofNullable(channelNullable); } @Override - public void deleteChannel(int channelNumber) { - channelMap.remove(channelNumber); - saveChannels(); + public List findAll() { + try { + return Files.list(DIRECTORY) + .filter(path -> path.toString().endsWith(EXTENSION)) + .map(path -> { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + return (Channel) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + }) + .toList(); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override - public Channel findChannel(int channelNumber) { - return channelMap.get(channelNumber); + public boolean existsById(UUID id) { + Path path = resolvePath(id); + return Files.exists(path); } @Override - public Map findAllChannel() { - return channelMap; + public void deleteById(UUID id) { + Path path = resolvePath(id); + try { + Files.delete(path); + } catch (IOException e) { + throw new RuntimeException(e); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java index c0997281..bf43d924 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java @@ -2,81 +2,102 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.MessageRepository; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.ArrayList; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; +import java.util.Optional; +import java.util.UUID; public class FileMessageRepository implements MessageRepository { - - private final String FILEPATH = "messages.ser"; - private List messages; + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; public FileMessageRepository() { - messages = loadMessages(); - if (messages == null) { - messages = new ArrayList<>(); - } else { - int max = messages.stream().mapToInt(Message::getNumber).max().orElse(0); - Message.setCounter(max + 1); + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", Message.class.getSimpleName()); + if (Files.notExists(DIRECTORY)) { + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException(e); + } } } - @SuppressWarnings("unchecked") - private List loadMessages() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (List) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; + private Path resolvePath(UUID id) { + return DIRECTORY.resolve(id + EXTENSION); } - private void saveMessages() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(messages); + @Override + public Message save(Message message) { + Path path = resolvePath(message.getId()); + try ( + FileOutputStream fos = new FileOutputStream(path.toFile()); + ObjectOutputStream oos = new ObjectOutputStream(fos) + ) { + oos.writeObject(message); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException(e); } + return message; } @Override - public void saveMessage(Message message) { - messages.add(message); - saveMessages(); - } - - @Override - public void updateMessage(Message message) { - deleteMessage(message.getNumber()); - messages.add(message); - saveMessages(); + public Optional findById(UUID id) { + Message messageNullable = null; + Path path = resolvePath(id); + if (Files.exists(path)) { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + messageNullable = (Message) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + return Optional.ofNullable(messageNullable); } @Override - public void deleteMessage(int messageNumber) { - messages.removeIf(m -> m.getNumber() == messageNumber); - saveMessages(); + public List findAll() { + try { + return Files.list(DIRECTORY) + .filter(path -> path.toString().endsWith(EXTENSION)) + .map(path -> { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + return (Message) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + }) + .toList(); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override - public Message findMessage(int messageNumber) { - return messages.stream() - .filter(m -> m.getNumber() == messageNumber) - .findFirst() - .orElse(null); + public boolean existsById(UUID id) { + Path path = resolvePath(id); + return Files.exists(path); } @Override - public List findAllMessage() { - return messages; + public void deleteById(UUID id) { + Path path = resolvePath(id); + try { + Files.delete(path); + } catch (IOException e) { + throw new RuntimeException(e); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java index 30f4cdc9..45049e88 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -2,85 +2,102 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.ArrayList; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; +import java.util.Optional; +import java.util.UUID; public class FileUserRepository implements UserRepository { - - private final String FILEPATH = "users.ser"; - private List users; + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; public FileUserRepository() { - users = loadUsers(); - if (users == null) { - users = new ArrayList<>(); - } else { - int max = users.stream().mapToInt(User::getNumber).max().orElse(0); - User.setCounter(max + 1); + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", User.class.getSimpleName()); + if (Files.notExists(DIRECTORY)) { + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException(e); + } } } - @SuppressWarnings("unchecked") - private List loadUsers() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (List) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; + private Path resolvePath(UUID id) { + return DIRECTORY.resolve(id + EXTENSION); } - private void saveUsers() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(users); + @Override + public User save(User user) { + Path path = resolvePath(user.getId()); + try ( + FileOutputStream fos = new FileOutputStream(path.toFile()); + ObjectOutputStream oos = new ObjectOutputStream(fos) + ) { + oos.writeObject(user); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException(e); } + return user; } @Override - public void saveUser(User user) { - users.add(user); - saveUsers(); - } - - @Override - public void updateUser(User user) { - for (int i = 0; i < users.size(); i++) { - if (users.get(i).getNumber() == user.getNumber()) { - users.set(i, user); - saveUsers(); - return; + public Optional findById(UUID id) { + User userNullable = null; + Path path = resolvePath(id); + if (Files.exists(path)) { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + userNullable = (User) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); } } + return Optional.ofNullable(userNullable); } @Override - public void deleteUser(int userNumber) { - users.removeIf(u -> u.getNumber() == userNumber); - saveUsers(); + public List findAll() { + try { + return Files.list(DIRECTORY) + .filter(path -> path.toString().endsWith(EXTENSION)) + .map(path -> { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + return (User) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + }) + .toList(); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override - public User findUser(int userNumber) { - return users.stream() - .filter(u -> u.getNumber() == userNumber) - .findFirst() - .orElse(null); + public boolean existsById(UUID id) { + Path path = resolvePath(id); + return Files.exists(path); } @Override - public List findAllUser() { - return users; + public void deleteById(UUID id) { + Path path = resolvePath(id); + try { + Files.delete(path); + } catch (IOException e) { + throw new RuntimeException(e); + } } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java index f4df5726..7fe79af0 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java @@ -3,43 +3,41 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.repository.ChannelRepository; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.UUID; public class JCFChannelRepository implements ChannelRepository { - - private final Map channelMap; + private final Map data; public JCFChannelRepository() { - - channelMap = new HashMap<>(); + this.data = new HashMap<>(); } @Override - public void saveChannel(Channel channel) { - channelMap.put(channel.getChannelNumber(), channel); + public Channel save(Channel channel) { + this.data.put(channel.getId(), channel); + return channel; } @Override - public Channel updateChannel(Channel channel) { - if (channelMap.containsKey(channel.getChannelNumber())) { - channelMap.put(channel.getChannelNumber(), channel); - return channel; - } - return null; + public Optional findById(UUID id) { + return Optional.ofNullable(this.data.get(id)); } @Override - public void deleteChannel(int channelNumber) { - channelMap.remove(channelNumber); + public List findAll() { + return this.data.values().stream().toList(); } @Override - public Channel findChannel(int channelNumber) { - return channelMap.get(channelNumber); + public boolean existsById(UUID id) { + return this.data.containsKey(id); } @Override - public Map findAllChannel() { - return channelMap; + public void deleteById(UUID id) { + this.data.remove(id); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java index e958155a..ac1a5e68 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java @@ -2,43 +2,42 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.MessageRepository; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; public class JCFMessageRepository implements MessageRepository { - - private final List messages; + private final Map data; public JCFMessageRepository() { - messages = new ArrayList<>(); + this.data = new HashMap<>(); } @Override - public void saveMessage(Message message) { - messages.add(message); + public Message save(Message message) { + this.data.put(message.getId(), message); + return message; } @Override - public void updateMessage(Message message) { - deleteMessage(message.getNumber()); - messages.add(message); + public Optional findById(UUID id) { + return Optional.ofNullable(this.data.get(id)); } @Override - public void deleteMessage(int messageNumber) { - messages.removeIf(msg -> msg.getNumber() == messageNumber); + public List findAll() { + return this.data.values().stream().toList(); } @Override - public Message findMessage(int messageNumber) { - return messages.stream() - .filter(msg -> msg.getNumber() == messageNumber) - .findFirst() - .orElse(null); + public boolean existsById(UUID id) { + return this.data.containsKey(id); } @Override - public List findAllMessage() { - return messages; + public void deleteById(UUID id) { + this.data.remove(id); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java index e19b8f59..b071c201 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java @@ -2,47 +2,42 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; public class JCFUserRepository implements UserRepository { - - private final List users; + private final Map data; public JCFUserRepository() { - users = new ArrayList<>(); + this.data = new HashMap<>(); } @Override - public void saveUser(User user) { - users.add(user); + public User save(User user) { + this.data.put(user.getId(), user); + return user; } @Override - public void updateUser(User user) { - for (int i = 0; i < users.size(); i++) { - if (users.get(i).getNumber() == user.getNumber()) { - users.set(i, user); - break; - } - } + public Optional findById(UUID id) { + return Optional.ofNullable(this.data.get(id)); } @Override - public void deleteUser(int userNumber) { - users.removeIf(user -> user.getNumber() == userNumber); + public List findAll() { + return this.data.values().stream().toList(); } @Override - public User findUser(int userNumber) { - return users.stream() - .filter(user -> user.getNumber() == userNumber) - .findFirst() - .orElse(null); + public boolean existsById(UUID id) { + return this.data.containsKey(id); } @Override - public List findAllUser() { - return users; + public void deleteById(UUID id) { + this.data.remove(id); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 8420e742..99fe279f 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -1,68 +1,50 @@ package com.sprint.mission.discodeit.service.basic; import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.ChannelType; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.UUID; public class BasicChannelService implements ChannelService { - private final ChannelRepository channelRepo; + private final ChannelRepository channelRepository; - public BasicChannelService(ChannelRepository channelRepo) { - this.channelRepo = channelRepo; + public BasicChannelService(ChannelRepository channelRepository) { + this.channelRepository = channelRepository; } @Override - public void outputAllChannelInfo() { - channelRepo.findAllChannel().values().forEach(System.out::println); + public Channel create(ChannelType type, String name, String description) { + Channel channel = new Channel(type, name, description); + return channelRepository.save(channel); } @Override - public void outputOneChannelInfo(Channel channel) { - Channel c = channelRepo.findChannel(channel.getChannelNumber()); - if (channel == null) { - System.out.println("해당 채널은 존재하지 않습니다."); - } else { - System.out.println(c); - } - } - - @Override - public void updateChannelName(Channel currentChannel, String newName) { - Channel channel = channelRepo.findChannel(currentChannel.getChannelNumber()); - if (channel != null) { - channel.setChannelName(newName); - channelRepo.updateChannel(channel); - } else { - System.out.println("해당 채널을 찾을 수 없습니다."); - } + public Channel find(UUID channelId) { + return channelRepository.findById(channelId) + .orElseThrow(() -> new NoSuchElementException("Channel with id " + channelId + " not found")); } @Override - public void deleteChannelName(Channel currentChannel) { - channelRepo.deleteChannel(currentChannel.getChannelNumber()); + public List findAll() { + return channelRepository.findAll(); } @Override - public void createNewChannel(String channelName) { - Channel channel = new Channel(channelName); - channelRepo.saveChannel(channel); + public Channel update(UUID channelId, String newName, String newDescription) { + Channel channel = channelRepository.findById(channelId) + .orElseThrow(() -> new NoSuchElementException("Channel with id " + channelId + " not found")); + channel.update(newName, newDescription); + return channelRepository.save(channel); } @Override - public Channel getChannelByNumber(int channelNumber) { - return channelRepo.findChannel(channelNumber); - } - - @Override - public void selectChannel(int channelNumber) { - Channel currentChannel = channelRepo.findChannel(channelNumber); - if (currentChannel == null) { - System.out.println("유효하지 않은 채널 번호입니다."); + public void delete(UUID channelId) { + if (!channelRepository.existsById(channelId)) { + throw new NoSuchElementException("Channel with id " + channelId + " not found"); } + channelRepository.deleteById(channelId); } - - @Override - public Channel getCurrentChannel() { - return null; - } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java index 9e2813b4..38930fe3 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java @@ -1,42 +1,64 @@ package com.sprint.mission.discodeit.service.basic; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.MessageService; import java.util.List; +import java.util.NoSuchElementException; +import java.util.UUID; public class BasicMessageService implements MessageService { - private final MessageRepository messageRepo; + private final MessageRepository messageRepository; + // + private final ChannelRepository channelRepository; + private final UserRepository userRepository; - public BasicMessageService(MessageRepository messageRepo) { - this.messageRepo = messageRepo; + public BasicMessageService(MessageRepository messageRepository, ChannelRepository channelRepository, + UserRepository userRepository) { + this.messageRepository = messageRepository; + this.channelRepository = channelRepository; + this.userRepository = userRepository; } @Override - public List inputMessage(String newMessage) { - Message message = new Message(newMessage); - messageRepo.saveMessage(message); - return messageRepo.findAllMessage(); + public Message create(String content, UUID channelId, UUID authorId) { + if (!channelRepository.existsById(channelId)) { + throw new NoSuchElementException("Channel not found with id " + channelId); + } + if (!userRepository.existsById(authorId)) { + throw new NoSuchElementException("Author not found with id " + authorId); + } + + Message message = new Message(content, channelId, authorId); + return messageRepository.save(message); } @Override - public void outputUserMessage() { - for (Message message : messageRepo.findAllMessage()) { - System.out.println(message); - } + public Message find(UUID messageId) { + return messageRepository.findById(messageId) + .orElseThrow(() -> new NoSuchElementException("Message with id " + messageId + " not found")); } @Override - public void updateUserMessage(int number, String newMessage) { - Message message = messageRepo.findMessage(number); - if (message != null) { - message.setMessage(newMessage); - messageRepo.updateMessage(message); - } + public List findAll() { + return messageRepository.findAll(); } @Override - public void deleteUserMessage(int number) { - messageRepo.deleteMessage(number); + public Message update(UUID messageId, String newContent) { + Message message = messageRepository.findById(messageId) + .orElseThrow(() -> new NoSuchElementException("Message with id " + messageId + " not found")); + message.update(newContent); + return messageRepository.save(message); + } + + @Override + public void delete(UUID messageId) { + if (!messageRepository.existsById(messageId)) { + throw new NoSuchElementException("Message with id " + messageId + " not found"); + } + messageRepository.deleteById(messageId); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 25d3d707..ee26a782 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -3,95 +3,47 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.UserService; -import java.util.Scanner; +import java.util.List; +import java.util.NoSuchElementException; import java.util.UUID; public class BasicUserService implements UserService { - private final UserRepository userRepo; - private static Scanner sc = new Scanner(System.in); + private final UserRepository userRepository; - public BasicUserService(UserRepository userRepo) { - this.userRepo = userRepo; + public BasicUserService(UserRepository userRepository) { + this.userRepository = userRepository; } @Override - public User registerUser() { - System.out.println("안녕하세요. DisCodeit에 오신 걸 환영합니다."); - System.out.println("사용자의 이름을 입력해 주세요."); - - while (true) { - String name = sc.nextLine(); - User newUser; - boolean isDuplicate = userRepo.findAllUser().stream() - .anyMatch(u -> u.getUsername().equals(name.trim())); - - if (isDuplicate) { - System.out.println("이미 존재하는 이름입니다. 다시 입력해주세요."); - } else { - newUser = new User(name.trim()); - userRepo.saveUser(newUser); - System.out.println("새로운 프로필이 생성되었습니다."); - return newUser; - } - } - + public User create(String username, String email, String password) { + User user = new User(username, email, password); + return userRepository.save(user); } - @Override - public void createNewUserNames(String existingName, String newName) { - String trimmedNewName = newName.trim(); - - boolean isDuplicate = userRepo.findAllUser().stream() - .anyMatch(u -> u.getUsername().equals(trimmedNewName)); - - if (isDuplicate) { - System.out.println("이미 존재하는 이름입니다."); - } else { - User newUser = new User(trimmedNewName); - userRepo.saveUser(newUser); - System.out.println("새로운 프로필이 생성되었습니다."); - } - } - - @Override - public void outputAllUsersInfo() { - for (User u : userRepo.findAllUser()) { - System.out.println(u); - } - } - - @Override - public void outputOneUserInfo(UUID uuid) { - userRepo.findAllUser().stream() - .filter(u -> u.getId().equals(uuid)) - .forEach(System.out::println); - } - - @Override - public void updateUserName(User user, String newName) { - if (user.getUsername().equals(newName.trim())) { - System.out.println("프로필 이름은 중복 될 수 없습니다."); - } else { - user.setUsername(newName); - userRepo.updateUser(user); - } + public User find(UUID userId) { + return userRepository.findById(userId) + .orElseThrow(() -> new NoSuchElementException("User with id " + userId + " not found")); } @Override - public void deleteUserName(int userNumber) { - userRepo.deleteUser(userNumber); + public List findAll() { + return userRepository.findAll(); } @Override - public User changeUser(int userNumber) { - return userRepo.findUser(userNumber); + public User update(UUID userId, String newUsername, String newEmail, String newPassword) { + User user = userRepository.findById(userId) + .orElseThrow(() -> new NoSuchElementException("User with id " + userId + " not found")); + user.update(newUsername, newEmail, newPassword); + return userRepository.save(user); } @Override - public void login(int loginNumber) { - if (userRepo.findUser(loginNumber) == null) { - throw new RuntimeException("해당 번호의 유저가 존재하지 않습니다"); + public void delete(UUID userId) { + if (!userRepository.existsById(userId)) { + throw new NoSuchElementException("User with id " + userId + " not found"); } + userRepository.deleteById(userId); } -} \ No newline at end of file +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java deleted file mode 100644 index 0639e655..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.sprint.mission.discodeit.service.file; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.repository.DefaultChannelFactory; -import com.sprint.mission.discodeit.service.ChannelService; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class FileChannelService implements ChannelService { - - private Map channelMap; - private Channel currentChannel; - private final static String FILEPATH = "channels.ser"; - - public FileChannelService() { - channelMap = loadChannels(); - - if (channelMap == null || channelMap.isEmpty()) { - channelMap = new HashMap<>(); - List defaultChannels = DefaultChannelFactory.getChannel(); - for (Channel channel : defaultChannels) { - channelMap.put(channel.getChannelNumber(), channel); - } - saveChannels(); - } else { - int max = 0; - for (Channel channel : channelMap.values()) { - if (channel.getChannelNumber() > max) { - max = channel.getChannelNumber(); - } - } - Channel.setCounter(max + 1); - } - } - - @SuppressWarnings("unchecked") - private Map loadChannels() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (Map) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; - } - - private void saveChannels() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(channelMap); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void outputAllChannelInfo() { - for (Channel channel : channelMap.values()) { - System.out.println(channel); - } - } - - @Override - public void outputOneChannelInfo(Channel channel) { - if (channel == null) { - System.out.println("해당 채널은 존재하지 않습니다."); - } else { - System.out.println(channel); - } - } - - @Override - public void updateChannelName(Channel currentChannel, String newName) { - Channel channel = channelMap.get(currentChannel.getChannelNumber()); - if (channel != null) { - channel.updateChannel(newName); - saveChannels(); - } else { - System.out.println("해당 채널을 찾을 수 없습니다."); - } - } - - @Override - public void deleteChannelName(Channel currentChannel) { - Integer findChannelKey = null; - for (Map.Entry entry : channelMap.entrySet()) { - if (entry.getValue().getChannelNumber() == currentChannel.getChannelNumber()) { - findChannelKey = entry.getKey(); - break; - } - } - if (findChannelKey != null) { - channelMap.remove(findChannelKey); - saveChannels(); - } - } - - @Override - public void createNewChannel(String channelName) { - Channel channel = new Channel(channelName); - channelMap.put(channel.getChannelNumber(), channel); - saveChannels(); - } - - @Override - public Channel getChannelByNumber(int channelNumber) { - Channel newChannel = channelMap.get(channelNumber); - if (newChannel != null) { - currentChannel = newChannel; - } - return currentChannel; - } - - @Override - public void selectChannel(int channelNumber) { - Channel channel = channelMap.get(channelNumber); - if (channel != null) { - currentChannel = channel; - } else { - System.out.println("유효하지 않은 채널 번호입니다."); - } - } - - @Override - public Channel getCurrentChannel() { - return currentChannel; - } -} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java deleted file mode 100644 index afc1bdd5..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.sprint.mission.discodeit.service.file; - -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.service.MessageService; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.List; - -public class FileMessageService implements MessageService { - - private List messages; - private final static String FILEPATH = "messages.ser"; - - public FileMessageService() { - messages = loadMessages(); - if (messages == null) { - messages = new ArrayList<>(); - } else { - int max = 0; - for (Message message : messages) { - if (message.getNumber() > max) { - max = message.getNumber(); - } - } - Message.setCounter(max + 1); - } - } - - @SuppressWarnings("unchecked") - private List loadMessages() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (List) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; - } - - private void saveMessages() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(messages); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public List inputMessage(String newMessage) { - Message newMsg = new Message(newMessage); - messages.add(newMsg); - saveMessages(); - return messages; - } - - @Override - public void outputUserMessage() { - if (messages.isEmpty()) { - System.out.println("메시지가 비었습니다."); - } else { - for (Message message1 : messages) { - System.out.println(message1); - } - } - } - - @Override - public void updateUserMessage(int number, String newMessage) { - messages.stream() - .filter(m -> m.getNumber() == number) - .findFirst() - .ifPresent(message1 -> message1.updateMessage(newMessage)); - saveMessages(); - } - - @Override - public void deleteUserMessage(int number) { - messages.stream() - .filter(message1 -> message1.getNumber() == number) - .findFirst() - .ifPresent(message1 -> messages.remove(message1)); - saveMessages(); - } -} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java b/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java deleted file mode 100644 index 30c69a89..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.sprint.mission.discodeit.service.file; - -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.UserService; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; -import java.util.UUID; - -public class FileUserService implements UserService { - - private List users; - private final String FILEPATH = "users.ser"; - private final Scanner sc = new Scanner(System.in); - - public FileUserService() { - users = loadUsers(); - if (users == null) { - users = new ArrayList<>(); - } else { - int max = 0; - for (User user : users) { - if (user.getNumber() > max) { - max = user.getNumber(); - } - } - User.setCounter(max + 1); - } - } - - - @SuppressWarnings("unchecked") //실행은 되는데 무슨 에러떠서 지피티한테 물어보고 추가했습니다 !! - private List loadUsers() { - File file = new File(FILEPATH); - if (!file.exists()) { - return null; - } - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (List) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - } - return null; - } - - private void saveUsers() { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(FILEPATH))) { - oos.writeObject(users); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public User registerUser() { - System.out.println("안녕하세요. DisCodeit에 오신 걸 환영합니다. 사용자의 이름을 입력 해 주세요."); - String userName = sc.nextLine(); - User newUser = new User(userName); - users.add(newUser); - saveUsers(); - return newUser; - } - - @Override - public void createNewUserNames(String existingName, String newName) { - if (existingName.equals(newName.trim())) { - System.out.println("동일한 프로필은 생성할 수 없습니다."); - } else { - users.add(new User(newName)); - saveUsers(); - } - } - - @Override - public void outputAllUsersInfo() { - for (User user : users) { - System.out.println(user); - } - } - - @Override - public void outputOneUserInfo(UUID uuid) { - List userName = users - .stream() - .filter(e -> e.getId().equals(uuid)) - .toList(); - System.out.println(userName); - } - - @Override - public void updateUserName(User user, String newName) { - if (user.getUsername().equals(newName.trim())) { - System.out.println("프로필 이름은 중복 될 수 없습니다."); - } else { - users.stream() - .filter(user1 -> user1.getUsername().equals(user.getUsername())) - .findFirst() - .ifPresent(user1 -> user1.updateUserName(newName)); - saveUsers(); - } - } - - @Override - public void deleteUserName(int userNumber) { - users.stream() - .filter(user -> user.getNumber() == userNumber) - .findFirst() - .ifPresent(user -> users.remove(user)); - saveUsers(); - } - - @Override - public User changeUser(int userNumber) { - return users.stream() - .filter(user1 -> user1.getNumber() == userNumber) - .findFirst() - .orElse(null); - } - - @Override - public void login(int loginNumber) { - users.stream() - .filter(u -> u.getNumber() == loginNumber) - .findFirst() - .orElseThrow(() -> new RuntimeException("해당 번호의 유저가 존재하지 않습니다: ")); - } -} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java deleted file mode 100644 index f35c1a60..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.service.ChannelService; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class JCFChannelService implements ChannelService { - - private final Map channelMap; - private Channel currentChannel; - - public JCFChannelService(List channels) { - this.channelMap = new HashMap<>(); - for (Channel channel : channels) { - channelMap.put(channel.getChannelNumber(), channel); - } - } - - @Override - public void outputAllChannelInfo() { - for (Channel channel : channelMap.values()) { - System.out.println(channel); - } - } - - public void outputOneChannelInfo(Channel channel) { - if (channel == null) { - System.out.println("해당 채널은 존재하지 않습니다."); - } else { - System.out.println(channel); - } - } - - public void updateChannelName(Channel currentChannel, String newName) { - Channel channel = channelMap.get(currentChannel.getChannelNumber()); - if (channel != null) { - channel.updateChannel(newName); - } else { - System.out.println("해당 채널을 찾을 수 없습니다."); - } - } - - public void deleteChannelName(Channel currentChannel) { - Integer findChannelKey = null; - for (Map.Entry entry : channelMap.entrySet()) { - if (entry.getValue().getChannelNumber() == (currentChannel.getChannelNumber())) { - findChannelKey = entry.getKey(); - break; - } - } - if (findChannelKey != null) { - channelMap.remove(findChannelKey); - } - } - - public void createNewChannel(String channelName) { - Channel channel = new Channel(channelName); - channelMap.put(channel.getChannelNumber(), channel); - } - - - public Channel getChannelByNumber(int channelNumber) { - Channel newChannel = channelMap.get(channelNumber); - if (newChannel != null) { - currentChannel = newChannel; - } - return currentChannel; - } - - public void selectChannel(int channelNumber) { - Channel channel = channelMap.get(channelNumber); - if (channel != null) { - currentChannel = channel; - } else { - System.out.println("유효하지 않은 채널 번호입니다."); - } - } - - public Channel getCurrentChannel() { - return currentChannel; - } -} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java deleted file mode 100644 index 0c59ffc7..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.service.MessageService; -import java.util.ArrayList; -import java.util.List; - -public class JCFMessageService implements MessageService { - private final List messages = new ArrayList<>(); - - public List inputMessage(String newMessage) { - Message newMsg = new Message(newMessage); - messages.add(newMsg); - return messages; - } - - public void outputUserMessage() { - if (messages.isEmpty()) { - System.out.println("메시지가 비었습니다."); - } else { - for (Message message1 : messages) { - System.out.println(message1); - } - } - - } - - public void updateUserMessage(int number, String newMessage) { - messages.stream() - .filter(message1 -> message1.getNumber() == number) - .findFirst() - .ifPresent(message1 -> message1.updateMessage(newMessage)); - } - - public void deleteUserMessage(int number) { - messages.stream() - .filter(message1 -> message1.getNumber() == number) - .findFirst() - .ifPresent(message1 -> messages.remove(message1)); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java deleted file mode 100644 index f87b077c..00000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.UserService; -import java.util.List; -import java.util.Scanner; -import java.util.UUID; - -public class JCFUserService implements UserService { - - private final List users; - - public JCFUserService(List users) { - this.users = users; - } - - - public User registerUser() { - Scanner sc = new Scanner(System.in); - System.out.println("안녕하세요. DisCodeit에 오신 걸 환영합니다. 사용자의 이름을 입력 해 주세요."); - String userName = sc.nextLine(); - return new User(userName); - } - - @Override - public void createNewUserNames(String existingName, String newName) { - if (existingName.equals(newName.trim())) { - System.out.println("동일한 프로필은 생성할 수 없습니다."); - } else { - users.add(new User(newName)); - } - } - - public void outputAllUsersInfo() { - for (User user : users) { - System.out.println(user); - } - } - - public void outputOneUserInfo(UUID uuid) { - List userName = users - .stream() - .filter(e -> e.getId().equals(uuid)) - .toList(); - System.out.println(userName); - } - - public void updateUserName(User user, String newName) { - if (user.getUsername().equals(newName.trim())) { - System.out.println("프로필 이름은 중복 될 수 없습니다."); - } else { - users.stream() - .filter(user1 -> user1.getUsername().equals(user.getUsername())) - .findFirst() - .ifPresent(user1 -> user1.updateUserName(newName)); - } - - } - - public void deleteUserName(int userNumber) { - users.stream() - .filter(user -> user.getNumber() == userNumber) - .findFirst() - .ifPresent(user -> users.remove(user)); - } - - public User changeUser(int userNumber) { - return users.stream().filter(user1 -> user1.getNumber() == userNumber).findFirst().orElse(null); - } - - public void login(int loginNumber) { - users.stream() - .filter(user -> user.getNumber() == loginNumber) - .findFirst() - .orElseThrow(() -> new RuntimeException("해당 번호의 유저가 존재하지 않습니다: ")); - } - - -} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 00000000..545cf9f0 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1 @@ +spring.application.name=discodeit diff --git a/src/test/java/com/sprint/mission/discodeit/DiscodeitApplicationTests.java b/src/test/java/com/sprint/mission/discodeit/DiscodeitApplicationTests.java new file mode 100644 index 00000000..3a987a21 --- /dev/null +++ b/src/test/java/com/sprint/mission/discodeit/DiscodeitApplicationTests.java @@ -0,0 +1,13 @@ +package com.sprint.mission.discodeit; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DiscodeitApplicationTests { + + @Test + void contextLoads() { + } + +} From f2409d2794b49737fb0bfbf4e39d4d658737a543 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Mon, 28 Apr 2025 10:21:18 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/service/ChannelService.java | 21 +++++++------------ .../discodeit/service/MessageService.java | 13 +++++++----- .../discodeit/service/UserService.java | 17 ++++++--------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java index c3120f04..67b4e8e2 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,23 +1,18 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.ChannelType; +import java.util.List; +import java.util.UUID; public interface ChannelService { + Channel create(ChannelType type, String name, String description); - public void outputAllChannelInfo(); + Channel find(UUID channelId); - public void outputOneChannelInfo(Channel channel); + List findAll(); - public void updateChannelName(Channel currentChannel, String newName); - - public void deleteChannelName(Channel currentChannel); - - public void createNewChannel(String channelName); - - public Channel getChannelByNumber(int channelNumber); - - public void selectChannel(int channelNumber); - - public Channel getCurrentChannel(); + Channel update(UUID channelId, String newName, String newDescription); + void delete(UUID channelId); } diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java index 8675d42e..38f48915 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -2,13 +2,16 @@ import com.sprint.mission.discodeit.entity.Message; import java.util.List; +import java.util.UUID; public interface MessageService { - public List inputMessage(String newMessage); + Message create(String content, UUID channelId, UUID authorId); - public void outputUserMessage(); + Message find(UUID messageId); - public void updateUserMessage(int number, String newMessage); + List findAll(); - public void deleteUserMessage(int number); -} \ No newline at end of file + Message update(UUID messageId, String newContent); + + void delete(UUID messageId); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java index 2b8decd9..6c4e73df 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,22 +1,17 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.entity.User; +import java.util.List; import java.util.UUID; public interface UserService { - public User registerUser(); + User create(String username, String email, String password); - public void createNewUserNames(String existingName, String newName); + User find(UUID userId); - public void outputAllUsersInfo(); + List findAll(); - public void outputOneUserInfo(UUID uuid); + User update(UUID userId, String newUsername, String newEmail, String newPassword); - public void updateUserName(User user, String newName); - - public void deleteUserName(int userNumber); - - public User changeUser(int userNumber); - - public void login(int loginNumber); + void delete(UUID userId); } From 2f0a38b3225b8940686d2b2ffc8993b1f901329c Mon Sep 17 00:00:00 2001 From: barrackkk Date: Mon, 28 Apr 2025 13:07:02 +0900 Subject: [PATCH 03/15] =?UTF-8?q?=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EB=AF=B8=EC=85=982=20=EC=9E=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 100 ++++++++++++++++++ .../mission/discodeit/entity/Channel.java | 38 +++---- .../mission/discodeit/entity/Message.java | 34 +++--- .../sprint/mission/discodeit/entity/User.java | 35 +++--- .../file/FileChannelRepository.java | 2 + .../file/FileMessageRepository.java | 2 + .../repository/file/FileUserRepository.java | 2 + .../service/basic/BasicChannelService.java | 8 +- .../service/basic/BasicMessageService.java | 10 +- .../service/basic/BasicUserService.java | 8 +- 10 files changed, 155 insertions(+), 84 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java new file mode 100644 index 00000000..4642807c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -0,0 +1,100 @@ +package com.sprint.mission.discodeit; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.ChannelType; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; + +@SpringBootApplication +public class DiscodeitApplication { + + static User setupUser(UserService userService) { + User user = userService.create("woody", "woody@codeit.com", "woody1234"); + return user; + } + + static Channel setupChannel(ChannelService channelService) { + Channel channel = channelService.create(ChannelType.PUBLIC, "공지", "공지 채널입니다."); + return channel; + } + + static void messageCreateTest(MessageService messageService, Channel channel, User author) { + Message message = messageService.create("안녕하세요.", channel.getId(), author.getId()); + System.out.println("메시지 생성: " + message.getId()); + + } + + + public static void main(String[] args) { + ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); + // 서비스 초기화 + + UserService userService = context.getBean(UserService.class); + ChannelService channelService = context.getBean(ChannelService.class); + MessageService messageService = context.getBean(MessageService.class); + + // 셋업 + User user = setupUser(userService); + Channel channel = setupChannel(channelService); + + //유저 테스트 + System.out.println("유저 추가 테스트"); + User user1 = userService.create("고희준", "kgmlwns904@gmail.com", "qwerasdf123"); + User user2 = userService.create("구희준", "kiiigmlwns904@gmail.com", "qwerzdfasdf123"); + System.out.println(user1.getUsername() + "유저를 추가했습니다 "); + + System.out.println("유저 전체 조회 테스트"); + System.out.println(userService.findAll()); + + System.out.println("유저 수정 테스트"); + userService.update(user.getId(), "dongmin", "dongmin@gmail.com", "qwerasdf"); + System.out.println(userService.findAll()); + + System.out.println(user1.getUsername() + "유저 삭제 테스트"); + userService.delete(user1.getId()); + System.out.println(userService.findAll()); + + //채널 테스트 + System.out.println("채널 추가 테스트"); + Channel channel1 = channelService.create(ChannelType.PUBLIC, "스프링 스터디", "코드잇 스프린터들과 스프링 스터디방"); + System.out.println(channel1.getName() + "채널을 추가했습니다."); + + System.out.println("채널 전체 조회 테스트"); + System.out.println(channelService.findAll()); + + System.out.println("채널 수정 테스트"); + channelService.update(channel1.getId(), "알고리즘 스터디", "코드잇 스프린터들과 알고리즘 스터디방"); + System.out.println(channelService.findAll()); + + System.out.println("채널 삭제 테스트"); + System.out.println(channel.getName() + "의 채널을 삭제합니다"); + channelService.delete(channel.getId()); + System.out.println(channelService.findAll()); + + //메시지 테스트 + System.out.println("메시지 추가 테스트"); + Message message1 = messageService.create("안녕하세요.", channel1.getId(), user.getId()); + Message message2 = messageService.create("하이헬로~", channel1.getId(), user2.getId()); + + System.out.println("메시지 전체 조회 테스트"); + System.out.println(messageService.findAll()); + + System.out.println("메시지 수정 테스트"); + messageService.update(message1.getId(), "Hello~"); + System.out.println(messageService.findAll()); + + System.out.println("메시지 삭제 테스트"); + System.out.println(message2.getContent() + "의 메시지를 삭제합니다"); + messageService.delete(message2.getId()); + System.out.println(messageService.findAll()); + + //messageCreateTest(messageService, channel, user); + } + +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java index 3a1058e4..aedd8d01 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -3,13 +3,14 @@ import java.io.Serializable; import java.time.Instant; import java.util.UUID; +import lombok.Getter; +@Getter public class Channel implements Serializable { private static final long serialVersionUID = 1L; private UUID id; private Long createdAt; private Long updatedAt; - // private ChannelType type; private String name; private String description; @@ -17,34 +18,21 @@ public class Channel implements Serializable { public Channel(ChannelType type, String name, String description) { this.id = UUID.randomUUID(); this.createdAt = Instant.now().getEpochSecond(); - // this.type = type; this.name = name; this.description = description; } - public UUID getId() { - return id; - } - - public Long getCreatedAt() { - return createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public ChannelType getType() { - return type; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; + @Override + public String toString() { + return "Channel{" + + "id=" + id + + ", createdAt=" + createdAt + + ", updatedAt=" + updatedAt + + ", type=" + type + + ", name='" + name + '\'' + + ", description='" + description + '\'' + + '}'; } public void update(String newName, String newDescription) { @@ -62,4 +50,4 @@ public void update(String newName, String newDescription) { this.updatedAt = Instant.now().getEpochSecond(); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java index e622318a..2e84771e 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -3,7 +3,9 @@ import java.io.Serializable; import java.time.Instant; import java.util.UUID; +import lombok.Getter; +@Getter public class Message implements Serializable { private static final long serialVersionUID = 1L; @@ -25,28 +27,16 @@ public Message(String content, UUID channelId, UUID authorId) { this.authorId = authorId; } - public UUID getId() { - return id; - } - - public Long getCreatedAt() { - return createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public String getContent() { - return content; - } - - public UUID getChannelId() { - return channelId; - } - - public UUID getAuthorId() { - return authorId; + @Override + public String toString() { + return "Message{" + + "id=" + id + + ", createdAt=" + createdAt + + ", updatedAt=" + updatedAt + + ", content='" + content + '\'' + + ", channelId=" + channelId + + ", authorId=" + authorId + + '}'; } public void update(String newContent) { diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java index c4f0faaa..e8959da3 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -3,14 +3,15 @@ import java.io.Serializable; import java.time.Instant; import java.util.UUID; +import lombok.Getter; +@Getter public class User implements Serializable { private static final long serialVersionUID = 1L; private UUID id; private Long createdAt; private Long updatedAt; - // private String username; private String email; private String password; @@ -24,28 +25,16 @@ public User(String username, String email, String password) { this.password = password; } - public UUID getId() { - return id; - } - - public Long getCreatedAt() { - return createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public String getUsername() { - return username; - } - - public String getEmail() { - return email; - } - - public String getPassword() { - return password; + @Override + public String toString() { + return "User{" + + "id=" + id + + ", createdAt=" + createdAt + + ", updatedAt=" + updatedAt + + ", username='" + username + '\'' + + ", email='" + email + '\'' + + ", password='" + password + '\'' + + '}'; } public void update(String newUsername, String newEmail, String newPassword) { diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java index 489b540d..562c305c 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java @@ -13,7 +13,9 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.springframework.stereotype.Repository; +@Repository public class FileChannelRepository implements ChannelRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java index bf43d924..d0cf0dca 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java @@ -13,7 +13,9 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.springframework.stereotype.Repository; +@Repository public class FileMessageRepository implements MessageRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java index 45049e88..c3523a4a 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -13,7 +13,9 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.springframework.stereotype.Repository; +@Repository public class FileUserRepository implements UserRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 99fe279f..f6f1acac 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -7,14 +7,14 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +@Service +@RequiredArgsConstructor public class BasicChannelService implements ChannelService { private final ChannelRepository channelRepository; - public BasicChannelService(ChannelRepository channelRepository) { - this.channelRepository = channelRepository; - } - @Override public Channel create(ChannelType type, String name, String description) { Channel channel = new Channel(type, name, description); diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java index 38930fe3..6241d249 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java @@ -8,19 +8,17 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +@Service +@RequiredArgsConstructor public class BasicMessageService implements MessageService { private final MessageRepository messageRepository; // private final ChannelRepository channelRepository; private final UserRepository userRepository; - public BasicMessageService(MessageRepository messageRepository, ChannelRepository channelRepository, - UserRepository userRepository) { - this.messageRepository = messageRepository; - this.channelRepository = channelRepository; - this.userRepository = userRepository; - } @Override public Message create(String content, UUID channelId, UUID authorId) { diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index ee26a782..1f2ea753 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -6,14 +6,14 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +@Service +@RequiredArgsConstructor public class BasicUserService implements UserService { private final UserRepository userRepository; - public BasicUserService(UserRepository userRepository) { - this.userRepository = userRepository; - } - @Override public User create(String username, String email, String password) { User user = new User(username, email, password); From 621b53fc3815d4324d42c5c3f343c6e77d02f6de Mon Sep 17 00:00:00 2001 From: barrackkk Date: Mon, 28 Apr 2025 13:52:11 +0900 Subject: [PATCH 04/15] =?UTF-8?q?=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EB=AF=B8=EC=85=982=20=EC=9E=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/BinaryContent.java | 10 ++++++++++ .../sprint/mission/discodeit/entity/ReadStatus.java | 13 +++++++++++++ .../sprint/mission/discodeit/entity/UserStatus.java | 12 ++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java diff --git a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java new file mode 100644 index 00000000..0d38d261 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.entity; + +import java.time.Instant; +import java.util.UUID; + +public class BinaryContent { + private UUID id; + private Instant cratedAt; + private Instant updatedAt; +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java new file mode 100644 index 00000000..ffc77e28 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -0,0 +1,13 @@ +package com.sprint.mission.discodeit.entity; + +import java.time.Instant; +import java.util.UUID; + +public class ReadStatus { + private Instant cratedAt; + private Instant updatedAt; + + UUID id; + UUID userId; + UUID channelId; +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java new file mode 100644 index 00000000..5bae6cb7 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -0,0 +1,12 @@ +package com.sprint.mission.discodeit.entity; + +import java.time.Instant; +import java.util.UUID; + +public class UserStatus { + private Instant cratedAt; + private Instant updatedAt; + + private UUID id; + private UUID userId; +} From 9eaaeabacd08167ad740a69b667705f442ff42d5 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Mon, 28 Apr 2025 13:53:00 +0900 Subject: [PATCH 05/15] =?UTF-8?q?chore:=20=EC=9A=94=EA=B5=AC=EC=82=AC?= =?UTF-8?q?=ED=95=AD=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 7 ------- .../mission/discodeit/entity/Channel.java | 10 +++++----- .../mission/discodeit/entity/Message.java | 18 ++++++++++-------- .../sprint/mission/discodeit/entity/User.java | 13 +++++++------ 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 4642807c..5c1a029d 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -24,13 +24,6 @@ static Channel setupChannel(ChannelService channelService) { return channel; } - static void messageCreateTest(MessageService messageService, Channel channel, User author) { - Message message = messageService.create("안녕하세요.", channel.getId(), author.getId()); - System.out.println("메시지 생성: " + message.getId()); - - } - - public static void main(String[] args) { ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); // 서비스 초기화 diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java index aedd8d01..de75dd2e 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -7,17 +7,17 @@ @Getter public class Channel implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -7977352704315297579L; private UUID id; - private Long createdAt; - private Long updatedAt; + private Instant createdAt; + private Instant updatedAt; private ChannelType type; private String name; private String description; public Channel(ChannelType type, String name, String description) { this.id = UUID.randomUUID(); - this.createdAt = Instant.now().getEpochSecond(); + this.createdAt = Instant.now(); this.type = type; this.name = name; this.description = description; @@ -47,7 +47,7 @@ public void update(String newName, String newDescription) { } if (anyValueUpdated) { - this.updatedAt = Instant.now().getEpochSecond(); + this.updatedAt = Instant.now(); } } } \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java index 2e84771e..d4ce6d30 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -2,26 +2,28 @@ import java.io.Serializable; import java.time.Instant; +import java.util.List; import java.util.UUID; import lombok.Getter; @Getter public class Message implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 85772952824868174L; private UUID id; - private Long createdAt; - private Long updatedAt; - // + private Instant createdAt; + private Instant updatedAt; + private String content; - // + private UUID channelId; private UUID authorId; + private List attachmentIds; public Message(String content, UUID channelId, UUID authorId) { this.id = UUID.randomUUID(); - this.createdAt = Instant.now().getEpochSecond(); - // + this.createdAt = Instant.now(); + this.content = content; this.channelId = channelId; this.authorId = authorId; @@ -47,7 +49,7 @@ public void update(String newContent) { } if (anyValueUpdated) { - this.updatedAt = Instant.now().getEpochSecond(); + this.updatedAt = Instant.now(); } } } diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java index e8959da3..846f8836 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -7,19 +7,20 @@ @Getter public class User implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -7340272091383763402L; private UUID id; - private Long createdAt; - private Long updatedAt; + private UUID profileid; + private Instant createdAt; + private Instant updatedAt; private String username; private String email; private String password; public User(String username, String email, String password) { this.id = UUID.randomUUID(); - this.createdAt = Instant.now().getEpochSecond(); - // + this.profileid = UUID.randomUUID(); + this.createdAt = Instant.now(); this.username = username; this.email = email; this.password = password; @@ -53,7 +54,7 @@ public void update(String newUsername, String newEmail, String newPassword) { } if (anyValueUpdated) { - this.updatedAt = Instant.now().getEpochSecond(); + this.updatedAt = Instant.now(); } } } From 9bca3c85ecfc096606484ad4dc1f17ed213db1b0 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Sun, 4 May 2025 21:39:49 +0900 Subject: [PATCH 06/15] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EB=AF=B8=EC=85=983=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../239eef81-4159-4aa5-b4a6-396152b59822.ser | Bin 0 -> 473 bytes .../fa962b5f-34e6-4e97-ab60-adedccf0ab5d.ser | Bin 0 -> 449 bytes .../e326ff4b-3ebe-49fa-90ac-a4e69f91c1f4.ser | Bin 0 -> 379 bytes .../d125859c-9301-468d-8f45-b9e1afdc24b9.ser | Bin 0 -> 427 bytes .../d125859c-9301-468d-8f45-b9e1afdc24b9.ser | Bin 0 -> 359 bytes .../discodeit/DiscodeitApplication.java | 198 +++++++++++++----- .../mission/discodeit/JavaApplication.java | 53 ----- .../discodeit/entity/BinaryContent.java | 34 ++- .../mission/discodeit/entity/Message.java | 5 +- .../mission/discodeit/entity/ReadStatus.java | 49 ++++- .../sprint/mission/discodeit/entity/User.java | 17 +- .../mission/discodeit/entity/UserStatus.java | 41 +++- .../repository/BinaryContentRepository.java | 18 ++ .../repository/MessageRepository.java | 4 + .../repository/ReadStatusRepository.java | 22 ++ .../repository/UserStatusRepository.java | 18 ++ .../file/FileBinaryContentRepository.java | 90 ++++++++ .../file/FileChannelRepository.java | 62 +++--- .../file/FileMessageRepository.java | 75 +++---- .../file/FileReadStatusRepository.java | 112 ++++++++++ .../repository/file/FileUserRepository.java | 54 ++--- .../file/FileUserStatusRepository.java | 106 ++++++++++ .../jcf/JCFBinaryContentRepository.java | 50 +++++ .../repository/jcf/JCFChannelRepository.java | 22 +- .../repository/jcf/JCFMessageRepository.java | 37 +++- .../jcf/JCFReadStatusRepository.java | 58 +++++ .../repository/jcf/JCFUserRepository.java | 24 ++- .../jcf/JCFUserStatusRepository.java | 45 ++++ .../discodeit/service/AuthService.java | 8 + .../service/BinaryContentService.java | 17 ++ .../discodeit/service/ChannelService.java | 18 +- .../discodeit/service/MessageService.java | 14 +- .../discodeit/service/ReadStatusService.java | 19 ++ .../discodeit/service/UserService.java | 15 +- .../discodeit/service/UserStatusService.java | 21 ++ .../service/basic/BaiscUserStatusService.java | 73 +++++++ .../service/basic/BasicAuthService.java | 31 +++ .../basic/BasicBinaryContentService.java | 44 ++++ .../service/basic/BasicChannelService.java | 122 +++++++++-- .../service/basic/BasicMessageService.java | 51 +++-- .../service/basic/BasicReadStatusService.java | 73 +++++++ .../service/basic/BasicUserService.java | 122 +++++++++-- .../dto/AuthLogin/AuthLoginReponse.java | 10 + .../dto/AuthLogin/AuthLoginRequest.java | 11 + .../BinaryContentCreateRequest.java | 8 + .../dto/Channel/ChannelFindRequest.java | 8 + .../service/dto/Channel/ChannelResponse.java | 16 ++ .../dto/Channel/ChannelUpdateRequest.java | 14 ++ .../Channel/PrivateChannelCreateRequest.java | 9 + .../Channel/PublicChannelCreateRequest.java | 8 + .../dto/Message/MessageCreateRequest.java | 10 + .../dto/Message/MessageUpdateRequest.java | 9 + .../ReadStatus/ReadStatusCreateRequest.java | 11 + .../ReadStatus/ReadStatusUpdateRequest.java | 11 + .../service/dto/User/UserCreateRequest.java | 11 + .../service/dto/User/UserFindRequest.java | 8 + .../service/dto/User/UserResponse.java | 12 ++ .../service/dto/User/UserUpdateRequest.java | 14 ++ .../UserStatus/UserStatusCreateRequest.java | 12 ++ .../UserStatus/UserStatusUpdateRequest.java | 10 + src/main/resources/application.yaml | 5 +- 61 files changed, 1701 insertions(+), 318 deletions(-) create mode 100644 .discodeit/Channel/239eef81-4159-4aa5-b4a6-396152b59822.ser create mode 100644 .discodeit/Message/fa962b5f-34e6-4e97-ab60-adedccf0ab5d.ser create mode 100644 .discodeit/ReadStatus/e326ff4b-3ebe-49fa-90ac-a4e69f91c1f4.ser create mode 100644 .discodeit/User/d125859c-9301-468d-8f45-b9e1afdc24b9.ser create mode 100644 .discodeit/UserStatus/d125859c-9301-468d-8f45-b9e1afdc24b9.ser delete mode 100644 src/main/java/com/sprint/mission/discodeit/JavaApplication.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/AuthService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java diff --git a/.discodeit/Channel/239eef81-4159-4aa5-b4a6-396152b59822.ser b/.discodeit/Channel/239eef81-4159-4aa5-b4a6-396152b59822.ser new file mode 100644 index 0000000000000000000000000000000000000000..7109b4ac4decd579797d0670bbc0b0b7fbfb9714 GIT binary patch literal 473 zcmb8rKT88K6aet&`H#|8LuS z!X*mqlI=E=k_VU7*WdN>*SiB#E@ZrzGvs~|5$4?^cETu%kkg9P$RuvMkoCFtVxiE~ zM3_r+0w!Cuj^@9XNpXaaFq=j?C<5ASR(8z&gk&K+45(WXEti-ZJ{nC=m9DSe6;u32g29Cti zl8pQ!&lFVI&`?hope$!{Mq*xGYK~`0AwwMllMe%Xa(-S3(6|x?A&6NyiFxVz!6iVq zrGwQMr6!i7rZ@r>2tyQdGE0iR7`Suu;k=51e%GB3*WXduc~P}> z&SXZn-eQoUY+IIDCI)Stp`<+TeWPQf*U}OOjW?TCE4<#+@n-oBg}1FeZ@QMe?b@O6 zdgYWi-E-b7Z+J7W^>ug0>+U6bK*#Wc9Ru=!UT|vB)Yz6?(n=nico-Ne3d(tz7=R!{ gJYK=LG;Kiz#Jbf9Yu}#vusZhFH0^kkXMWQQ0B@kE@Bjb+ literal 0 HcmV?d00001 diff --git a/.discodeit/ReadStatus/e326ff4b-3ebe-49fa-90ac-a4e69f91c1f4.ser b/.discodeit/ReadStatus/e326ff4b-3ebe-49fa-90ac-a4e69f91c1f4.ser new file mode 100644 index 0000000000000000000000000000000000000000..1ad0fdce739c64b3cd0f04dda95f1ffa7ff7815a GIT binary patch literal 379 zcmZ4UmVvdnh(RwoKUc4~peQr1L@zh9xHvOEPcJ32I5|HhHM2x7HLoPIq*5;^H8CZ) zB(bElIDZAp>E?>#IZO;}J`9}68Hss$sX3l0B@6;SS&3zd`lThAIr^cYo-Wot3>?Wt zi6yBijwK}w!VuY#%-mFc&%EN2#Jm!q0;bHALWVj9Mjr;QoW$Z1kS&fSAQ2{@*`)<3 z5ZzD#w$kF%B2S2hiUOd^`9K!xfh^PmS-58=^Y?}2O^t2YC9UMKiHCuqqM)3Y zi2(>Q#N!o=esRpGCz&*o1&_~o(Me{Z{ep1;7NY(TaD`yUI4q=EFFM09h);<>}JBot{ zDt-h(aI5$YoZP$k0i0b;T3XDOb8^r5-Msuj#>BARiX<~S7K)e@#)wFV733X e)_cB7?cWd-T*r8|k~WSt^B?7NP_`(!3CbVfbd7TW literal 0 HcmV?d00001 diff --git a/.discodeit/UserStatus/d125859c-9301-468d-8f45-b9e1afdc24b9.ser b/.discodeit/UserStatus/d125859c-9301-468d-8f45-b9e1afdc24b9.ser new file mode 100644 index 0000000000000000000000000000000000000000..131fceded6088d50bd384d690d29ffa592c3bd9a GIT binary patch literal 359 zcmZ4UmVvdnh(RwoKUc4~peQr1L@zh9xHvOEPcJ32I5|HhHM2x7HLoPIq*5=mIJGFa zB(bElc!rS7mlGS6!k8FXeHb_(VvZ#x48lHHiDilUC7HRY`kr~kC5d?@)<6ZxMTsS; zDUKzD40Q~QJ`7BmDJ2X75T&IhnK}BQp`I>4b)2OIDJTlrN`W?drhv3DRTKc7$qO=G z4`jSvaB9)i*p^+=N*fFMIWUcu-RpG8G6NEZvTXkqq;3ZNN$U^77W z>VfRtGn4uIjNDdzCI%)i2A-VM#Nv|R%yg&Bl436g?%aGhucBb;(ci|56Bw!<2{Nc3 hoa%E0(}qi891wfi`(1ZFTz^Mp=S9`lIg=UPdI3&_b;bYy literal 0 HcmV?d00001 diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 5c1a029d..29f9de4a 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -4,9 +4,24 @@ import com.sprint.mission.discodeit.entity.ChannelType; import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import com.sprint.mission.discodeit.service.AuthService; import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; +import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.service.dto.User.UserResponse; +import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; +import java.util.List; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -14,80 +29,155 @@ @SpringBootApplication public class DiscodeitApplication { - static User setupUser(UserService userService) { - User user = userService.create("woody", "woody@codeit.com", "woody1234"); - return user; - } - - static Channel setupChannel(ChannelService channelService) { - Channel channel = channelService.create(ChannelType.PUBLIC, "공지", "공지 채널입니다."); - return channel; - } - public static void main(String[] args) { ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); - // 서비스 초기화 UserService userService = context.getBean(UserService.class); ChannelService channelService = context.getBean(ChannelService.class); MessageService messageService = context.getBean(MessageService.class); + AuthService authService = context.getBean(AuthService.class); + + System.out.println("====== 유저 생성 테스트 ======"); + + UserCreateRequest request1 = new UserCreateRequest( + "user1", + "user1@example.com", + "password1", + false, + null, + null + ); + + UserCreateRequest request2 = new UserCreateRequest( + "user2", + "user2@example.com", + "password2", + false, + null, + null + ); + + User user1 = userService.create(request1); + User user2 = userService.create(request2); + System.out.println("생성된 유저 1 ID: " + user1.getId()); + System.out.println("생성된 유저 2 ID: " + user2.getId()); + + System.out.println("\n====== 유저 로그인 테스트 ======"); + AuthLoginRequest request3 = new AuthLoginRequest( + user1.getId(), + user1.getUsername(), + user1.getPassword() + ); + AuthLoginReponse authLoginReponse = authService.login(request3); + System.out.println(authLoginReponse); + System.out.println("\n====== 유저 단일 조회 테스트 ======"); + + UserFindRequest findRequest = new UserFindRequest(user1.getId()); + UserResponse foundUser = userService.find(findRequest); + System.out.println(foundUser); + + System.out.println("\n====== 유저 전체 조회 테스트 ======"); + + List allUsers = userService.findAll(); + for (UserResponse user : allUsers) { + System.out.println(user); + } + + System.out.println("\n====== 유저 수정 테스트 ======"); + + UserUpdateRequest updateRequest = new UserUpdateRequest( + user2.getId(), + "new_user2", + "new_user2@example.com", + "new_password2", + false, + null, + null + ); + + User updatedUser = userService.update(updateRequest); + + System.out.println("수정된 유저:"); + System.out.println(updatedUser); + + System.out.println("\n====== 유저1 삭제 후 전체 조회 테스트 ======"); + userService.delete(user1.getId()); - // 셋업 - User user = setupUser(userService); - Channel channel = setupChannel(channelService); + List afterDeleteUsers = userService.findAll(); + for (UserResponse user : afterDeleteUsers) { + System.out.println(user); + } - //유저 테스트 - System.out.println("유저 추가 테스트"); - User user1 = userService.create("고희준", "kgmlwns904@gmail.com", "qwerasdf123"); - User user2 = userService.create("구희준", "kiiigmlwns904@gmail.com", "qwerzdfasdf123"); - System.out.println(user1.getUsername() + "유저를 추가했습니다 "); + System.out.println("\n====== 유저 테스트 완료 ======"); - System.out.println("유저 전체 조회 테스트"); - System.out.println(userService.findAll()); + System.out.println("\n====== 채널 테스트 시작 ======"); - System.out.println("유저 수정 테스트"); - userService.update(user.getId(), "dongmin", "dongmin@gmail.com", "qwerasdf"); - System.out.println(userService.findAll()); + Channel publicChannel = channelService.create(new PublicChannelCreateRequest( + "공지사항", "모두가 볼 수 있는 공지" + )); - System.out.println(user1.getUsername() + "유저 삭제 테스트"); - userService.delete(user1.getId()); - System.out.println(userService.findAll()); + // 3. PRIVATE 채널 생성 (user1만 참여) + Channel privateChannel = channelService.create(new PrivateChannelCreateRequest( + List.of(user1.getId()) + )); + + // 4. PUBLIC 채널 조회 테스트 + System.out.println("\n=== PUBLIC 채널 조회 테스트 ==="); + ChannelResponse publicResponse = channelService.find(new ChannelFindRequest(publicChannel.getId())); + System.out.println(publicResponse); + + // 5. PRIVATE 채널 조회 테스트 + System.out.println("\n=== PRIVATE 채널 조회 테스트 ==="); + ChannelResponse privateResponse = channelService.find(new ChannelFindRequest(privateChannel.getId())); + System.out.println(privateResponse); + + // 4. user1이 볼 수 있는 채널 확인 + System.out.println("\n=== user1이 볼 수 있는 채널 ==="); + List user1Channels = channelService.findAllByUserId(user1.getId()); + user1Channels.forEach(System.out::println); + + ReadStatusRepository readStatusRepository = context.getBean(ReadStatusRepository.class); + + System.out.println("\n=== private 채널 참여자 ReadStatus ==="); + readStatusRepository.findAllByChannelId(privateChannel.getId()).forEach(System.out::println); + + // 5. user2가 볼 수 있는 채널 확인 + System.out.println("\n=== user2가 볼 수 있는 채널 ==="); + List user2Channels = channelService.findAllByUserId(user2.getId()); + user2Channels.forEach(System.out::println); - //채널 테스트 - System.out.println("채널 추가 테스트"); - Channel channel1 = channelService.create(ChannelType.PUBLIC, "스프링 스터디", "코드잇 스프린터들과 스프링 스터디방"); - System.out.println(channel1.getName() + "채널을 추가했습니다."); + System.out.println("\n=== public 채널 업데이트 테스트 ==="); + ChannelUpdateRequest channelUpdateRequest = new ChannelUpdateRequest(publicChannel.getId(), ChannelType.PUBLIC, + "새로운 공지", "업데이트햇음"); + channelService.update(channelUpdateRequest); + publicResponse = channelService.find(new ChannelFindRequest(publicChannel.getId())); + System.out.println(publicResponse); - System.out.println("채널 전체 조회 테스트"); - System.out.println(channelService.findAll()); + System.out.println("\n=== public 채널 삭재 테스트 ==="); + channelService.delete(publicChannel.getId()); - System.out.println("채널 수정 테스트"); - channelService.update(channel1.getId(), "알고리즘 스터디", "코드잇 스프린터들과 알고리즘 스터디방"); - System.out.println(channelService.findAll()); + System.out.println("\n=== user2가 볼 수 있는 채널 ==="); + user2Channels = channelService.findAllByUserId(user2.getId()); + user2Channels.forEach(System.out::println); - System.out.println("채널 삭제 테스트"); - System.out.println(channel.getName() + "의 채널을 삭제합니다"); - channelService.delete(channel.getId()); - System.out.println(channelService.findAll()); + // 6. 메시지 테스트 시작 + System.out.println("\n=== 메시지 생성 테스트 ==="); - //메시지 테스트 - System.out.println("메시지 추가 테스트"); - Message message1 = messageService.create("안녕하세요.", channel1.getId(), user.getId()); - Message message2 = messageService.create("하이헬로~", channel1.getId(), user2.getId()); + MessageCreateRequest messageCreateRequest = new MessageCreateRequest( + "첫 번째 테스트 메시지입니다.", + privateChannel.getId(), + user2.getId() + ); - System.out.println("메시지 전체 조회 테스트"); - System.out.println(messageService.findAll()); + Message createdMessage = messageService.create(messageCreateRequest, null); + System.out.println("메시지 생성됨: ID = " + createdMessage.getId()); - System.out.println("메시지 수정 테스트"); - messageService.update(message1.getId(), "Hello~"); - System.out.println(messageService.findAll()); + System.out.println("\n=== 메시지 조회 테스트 ==="); + Message foundMessage = messageService.find(createdMessage.getId()); - System.out.println("메시지 삭제 테스트"); - System.out.println(message2.getContent() + "의 메시지를 삭제합니다"); - messageService.delete(message2.getId()); - System.out.println(messageService.findAll()); + System.out.println("조회된 메시지 내용: " + foundMessage.getContent()); + System.out.println("첨부파일 ID들: " + foundMessage.getAttachmentIds()); - //messageCreateTest(messageService, channel, user); } } diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java deleted file mode 100644 index 599bfab6..00000000 --- a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.sprint.mission.discodeit; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.ChannelType; -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.repository.ChannelRepository; -import com.sprint.mission.discodeit.repository.MessageRepository; -import com.sprint.mission.discodeit.repository.UserRepository; -import com.sprint.mission.discodeit.repository.file.FileChannelRepository; -import com.sprint.mission.discodeit.repository.file.FileMessageRepository; -import com.sprint.mission.discodeit.repository.file.FileUserRepository; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.basic.BasicChannelService; -import com.sprint.mission.discodeit.service.basic.BasicMessageService; -import com.sprint.mission.discodeit.service.basic.BasicUserService; - -public class JavaApplication { - static User setupUser(UserService userService) { - User user = userService.create("woody", "woody@codeit.com", "woody1234"); - return user; - } - - static Channel setupChannel(ChannelService channelService) { - Channel channel = channelService.create(ChannelType.PUBLIC, "공지", "공지 채널입니다."); - return channel; - } - - static void messageCreateTest(MessageService messageService, Channel channel, User author) { - Message message = messageService.create("안녕하세요.", channel.getId(), author.getId()); - System.out.println("메시지 생성: " + message.getId()); - } - - public static void main(String[] args) { - // 레포지토리 초기화 - UserRepository userRepository = new FileUserRepository(); - ChannelRepository channelRepository = new FileChannelRepository(); - MessageRepository messageRepository = new FileMessageRepository(); - - // 서비스 초기화 - UserService userService = new BasicUserService(userRepository); - ChannelService channelService = new BasicChannelService(channelRepository); - MessageService messageService = new BasicMessageService(messageRepository, channelRepository, userRepository); - - // 셋업 - User user = setupUser(userService); - Channel channel = setupChannel(channelService); - // 테스트 - messageCreateTest(messageService, channel, user); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java index 0d38d261..55427d06 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -1,10 +1,40 @@ package com.sprint.mission.discodeit.entity; +import java.io.Serializable; import java.time.Instant; +import java.util.Arrays; import java.util.UUID; +import lombok.Getter; +import lombok.Setter; -public class BinaryContent { + +@Getter +@Setter +public class BinaryContent implements Serializable { + private static final long serialVersionUID = 6424554869951126230L; private UUID id; private Instant cratedAt; - private Instant updatedAt; + + private String fileName; + private String contentType; + private byte[] content; + + public BinaryContent(String fileName, String contentType, byte[] content) { + this.id = UUID.randomUUID(); + this.fileName = fileName; + + this.cratedAt = Instant.now(); + this.content = content; + this.contentType = contentType; + } + + @Override + public String toString() { + return "BinaryContent{" + + "id=" + id + + ", cratedAt=" + cratedAt + + ", content=" + Arrays.toString(content) + + ", contentType='" + contentType + '\'' + + '}'; + } } diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java index d4ce6d30..3cbda61e 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -5,8 +5,10 @@ import java.util.List; import java.util.UUID; import lombok.Getter; +import lombok.Setter; @Getter +@Setter public class Message implements Serializable { private static final long serialVersionUID = 85772952824868174L; @@ -20,13 +22,14 @@ public class Message implements Serializable { private UUID authorId; private List attachmentIds; - public Message(String content, UUID channelId, UUID authorId) { + public Message(String content, UUID channelId, UUID authorId, List attachmentIds) { this.id = UUID.randomUUID(); this.createdAt = Instant.now(); this.content = content; this.channelId = channelId; this.authorId = authorId; + this.attachmentIds = attachmentIds; } @Override diff --git a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java index ffc77e28..9270ad22 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -1,13 +1,52 @@ package com.sprint.mission.discodeit.entity; +import java.io.Serializable; import java.time.Instant; import java.util.UUID; +import lombok.Getter; -public class ReadStatus { +@Getter +public class ReadStatus implements Serializable { + private static final long serialVersionUID = 8045686006427993964L; private Instant cratedAt; private Instant updatedAt; - - UUID id; - UUID userId; - UUID channelId; + + private UUID id; + private UUID userId; + private UUID channelId; + + private Instant lastReadAt; + + + public ReadStatus(UUID userId, UUID channelId, Instant lastReadAt) { + this.cratedAt = Instant.now(); + this.id = UUID.randomUUID(); + this.userId = userId; + this.channelId = channelId; + this.lastReadAt = lastReadAt; + } + + @Override + public String toString() { + return "ReadStatus{" + + "cratedAt=" + cratedAt + + ", updatedAt=" + updatedAt + + ", id=" + id + + ", id=" + userId + + ", channelId=" + channelId + + ", lastReadAt=" + lastReadAt + + '}'; + } + + public void update(Instant newLastReadAt) { + boolean anyValueUpdated = false; + if (newLastReadAt != null && !newLastReadAt.equals(this.lastReadAt)) { + this.lastReadAt = newLastReadAt; + anyValueUpdated = true; + } + + if (anyValueUpdated) { + this.updatedAt = Instant.now(); + } + } } diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java index 846f8836..77d03d0f 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -4,26 +4,37 @@ import java.time.Instant; import java.util.UUID; import lombok.Getter; +import lombok.Setter; +@Setter @Getter public class User implements Serializable { private static final long serialVersionUID = -7340272091383763402L; private UUID id; - private UUID profileid; private Instant createdAt; private Instant updatedAt; private String username; private String email; private String password; + private boolean profileImage; + private UUID profileId; - public User(String username, String email, String password) { + + public User(String username, String email, String password, boolean content) { this.id = UUID.randomUUID(); - this.profileid = UUID.randomUUID(); this.createdAt = Instant.now(); + this.updatedAt = Instant.now(); this.username = username; this.email = email; this.password = password; + this.profileImage = content; + this.profileId = null; + } + + public void setProfileId(UUID profileId) { + this.profileId = profileId; + this.profileImage = true; } @Override diff --git a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java index 5bae6cb7..57299ca1 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -1,12 +1,49 @@ package com.sprint.mission.discodeit.entity; +import java.io.Serializable; import java.time.Instant; import java.util.UUID; +import lombok.Getter; -public class UserStatus { +@Getter +public class UserStatus implements Serializable { + private static final long serialVersionUID = -7488891392699063722L; private Instant cratedAt; private Instant updatedAt; - + private Instant StatusAt; + private UUID id; private UUID userId; + + public UserStatus(Instant recentStatusAt, UUID userId) { + this.cratedAt = Instant.now(); + this.StatusAt = recentStatusAt; + this.updatedAt = Instant.now(); + this.id = UUID.randomUUID(); + this.userId = userId; + } + + public void update(Instant recentStatusAt) { + boolean anyValueUpdated = false; + + if (recentStatusAt != null && !recentStatusAt.equals(this.StatusAt)) { + this.StatusAt = recentStatusAt; + anyValueUpdated = true; + } + + if (anyValueUpdated) { + this.updatedAt = Instant.now(); + } + } + + @Override + public String toString() { + return "UserStatus{" + + "cratedAt=" + cratedAt + + ", updatedAt=" + updatedAt + + ", id=" + id + + ", id=" + userId + + '}'; + } + } diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java new file mode 100644 index 00000000..2a61dd62 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -0,0 +1,18 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface BinaryContentRepository { + BinaryContent save(BinaryContent binaryContent); + + Optional findById(UUID id); + + List findAllByIdIn(List ids); + + boolean existsById(UUID id); + + void deleteById(UUID id); +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java index 2235070f..8b26d6bc 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -12,6 +12,10 @@ public interface MessageRepository { List findAll(); + List findAllByChannelId(UUID channelId); + + void deleteAllByChannelId(UUID channelId); + boolean existsById(UUID id); void deleteById(UUID id); diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java new file mode 100644 index 00000000..8398de6c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java @@ -0,0 +1,22 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface ReadStatusRepository { + ReadStatus save(ReadStatus readStatus); + + Optional findById(UUID id); + + List findAllByUserId(UUID userId); + + List findAllByChannelId(UUID channelId); + + boolean existsById(UUID id); + + void deleteById(UUID id); + + void deleteAllByChannelId(UUID channelId); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java new file mode 100644 index 00000000..4030a81d --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -0,0 +1,18 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.UserStatus; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface UserStatusRepository { + UserStatus save(UserStatus userStatus); + + Optional findByUserId(UUID id); + + boolean existsById(UUID id); + + List findAll(); + + void deleteById(UUID id); +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java new file mode 100644 index 00000000..a9f15a15 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java @@ -0,0 +1,90 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") +public class FileBinaryContentRepository implements BinaryContentRepository { + + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; + + public FileBinaryContentRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, BinaryContent.class.getSimpleName()); + try { + if (Files.notExists(DIRECTORY)) { + Files.createDirectories(DIRECTORY); + } + } catch (IOException e) { + throw new RuntimeException("BinaryContent 저장 디렉토리를 생성하는 중 오류가 발생했습니다."); + } + } + + private Path resolvePath(UUID id) { + return DIRECTORY.resolve(id + EXTENSION); + } + + @Override + public BinaryContent save(BinaryContent binaryContent) { + Path path = resolvePath(binaryContent.getId()); + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(path.toFile()))) { + oos.writeObject(binaryContent); + } catch (IOException e) { + throw new RuntimeException("BinaryContent 저장 중 오류가 발생하였습니다."); + } + return binaryContent; + } + + @Override + public Optional findById(UUID id) { + Path path = resolvePath(id); + if (!Files.exists(path)) { + return Optional.empty(); + } + + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return Optional.of((BinaryContent) ois.readObject()); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException("BinaryContent 로딩 중 오류가 발생하였습니다."); + } + } + + @Override + public List findAllByIdIn(List ids) { + return ids.stream() + .map(this::findById) + .filter(Optional::isPresent) + .map(Optional::get) + .collect(Collectors.toList()); + } + + @Override + public boolean existsById(UUID id) { + return Files.exists(resolvePath(id)); + } + + @Override + public void deleteById(UUID id) { + try { + Files.deleteIfExists(resolvePath(id)); + } catch (IOException e) { + throw new RuntimeException("BinaryContent 삭제 중 오류가 발생하였습니다."); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java index 562c305c..4d7ba5ec 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java @@ -13,21 +13,22 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Repository; @Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") public class FileChannelRepository implements ChannelRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; - public FileChannelRepository() { - this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", Channel.class.getSimpleName()); - if (Files.notExists(DIRECTORY)) { - try { - Files.createDirectories(DIRECTORY); - } catch (IOException e) { - throw new RuntimeException(e); - } + public FileChannelRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, Channel.class.getSimpleName()); + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException("Channel 디렉토리 생성 오류", e); } } @@ -37,69 +38,56 @@ private Path resolvePath(UUID id) { @Override public Channel save(Channel channel) { - Path path = resolvePath(channel.getId()); - try ( - FileOutputStream fos = new FileOutputStream(path.toFile()); - ObjectOutputStream oos = new ObjectOutputStream(fos) - ) { + try (ObjectOutputStream oos = new ObjectOutputStream( + new FileOutputStream(resolvePath(channel.getId()).toFile()))) { oos.writeObject(channel); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Channel 저장 오류", e); } return channel; } @Override public Optional findById(UUID id) { - Channel channelNullable = null; Path path = resolvePath(id); if (Files.exists(path)) { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { - channelNullable = (Channel) ois.readObject(); + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return Optional.of((Channel) ois.readObject()); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("Channel 읽기 오류", e); } } - return Optional.ofNullable(channelNullable); + return Optional.empty(); } @Override public List findAll() { try { return Files.list(DIRECTORY) - .filter(path -> path.toString().endsWith(EXTENSION)) + .filter(p -> p.toString().endsWith(EXTENSION)) .map(path -> { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { return (Channel) ois.readObject(); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("Channel 목록 읽기 오류", e); } - }) - .toList(); + }).toList(); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Channel 디렉토리 탐색 오류", e); } } @Override public boolean existsById(UUID id) { - Path path = resolvePath(id); - return Files.exists(path); + return Files.exists(resolvePath(id)); } @Override public void deleteById(UUID id) { - Path path = resolvePath(id); try { - Files.delete(path); + Files.deleteIfExists(resolvePath(id)); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Channel 삭제 오류", e); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java index d0cf0dca..bb9f79ec 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java @@ -13,21 +13,23 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Repository; @Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") public class FileMessageRepository implements MessageRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; - public FileMessageRepository() { - this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", Message.class.getSimpleName()); - if (Files.notExists(DIRECTORY)) { - try { - Files.createDirectories(DIRECTORY); - } catch (IOException e) { - throw new RuntimeException(e); - } + public FileMessageRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, Message.class.getSimpleName()); + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException("Message 디렉토리 생성 오류", e); } } @@ -37,69 +39,68 @@ private Path resolvePath(UUID id) { @Override public Message save(Message message) { - Path path = resolvePath(message.getId()); - try ( - FileOutputStream fos = new FileOutputStream(path.toFile()); - ObjectOutputStream oos = new ObjectOutputStream(fos) - ) { + try (ObjectOutputStream oos = new ObjectOutputStream( + new FileOutputStream(resolvePath(message.getId()).toFile()))) { oos.writeObject(message); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Message 저장 오류", e); } return message; } @Override public Optional findById(UUID id) { - Message messageNullable = null; Path path = resolvePath(id); if (Files.exists(path)) { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { - messageNullable = (Message) ois.readObject(); + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return Optional.of((Message) ois.readObject()); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("Message 읽기 오류", e); } } - return Optional.ofNullable(messageNullable); + return Optional.empty(); } @Override public List findAll() { try { return Files.list(DIRECTORY) - .filter(path -> path.toString().endsWith(EXTENSION)) + .filter(p -> p.toString().endsWith(EXTENSION)) .map(path -> { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { return (Message) ois.readObject(); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("Message 목록 읽기 오류", e); } - }) - .toList(); + }).toList(); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Message 디렉토리 탐색 오류", e); } } + @Override + public List findAllByChannelId(UUID channelId) { + return findAll().stream() + .filter(m -> m.getChannelId().equals(channelId)) + .collect(Collectors.toList()); + } + + @Override + public void deleteAllByChannelId(UUID channelId) { + findAllByChannelId(channelId).forEach(m -> deleteById(m.getId())); + } + @Override public boolean existsById(UUID id) { - Path path = resolvePath(id); - return Files.exists(path); + return Files.exists(resolvePath(id)); } @Override public void deleteById(UUID id) { - Path path = resolvePath(id); try { - Files.delete(path); + Files.deleteIfExists(resolvePath(id)); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Message 삭제 오류", e); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java new file mode 100644 index 00000000..34e9bb50 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -0,0 +1,112 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") +public class FileReadStatusRepository implements ReadStatusRepository { + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; + + public FileReadStatusRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, ReadStatus.class.getSimpleName()); + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException("ReadStatus 디렉토리 생성 오류", e); + } + } + + private Path resolvePath(UUID id) { + return DIRECTORY.resolve(id + EXTENSION); + } + + @Override + public ReadStatus save(ReadStatus readStatus) { + try (ObjectOutputStream oos = new ObjectOutputStream( + new FileOutputStream(resolvePath(readStatus.getId()).toFile()))) { + oos.writeObject(readStatus); + } catch (IOException e) { + throw new RuntimeException("ReadStatus 저장 오류", e); + } + return readStatus; + } + + @Override + public Optional findById(UUID id) { + Path path = resolvePath(id); + if (Files.exists(path)) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return Optional.of((ReadStatus) ois.readObject()); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException("ReadStatus 읽기 오류", e); + } + } + return Optional.empty(); + } + + @Override + public List findAllByUserId(UUID userId) { + return findAll().stream() + .filter(r -> r.getUserId().equals(userId)) + .collect(Collectors.toList()); + } + + @Override + public List findAllByChannelId(UUID channelId) { + return findAll().stream() + .filter(r -> r.getChannelId().equals(channelId)) + .collect(Collectors.toList()); + } + + private List findAll() { + try { + return Files.list(DIRECTORY) + .filter(p -> p.toString().endsWith(EXTENSION)) + .map(path -> { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return (ReadStatus) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException("ReadStatus 전체 읽기 오류", e); + } + }).toList(); + } catch (IOException e) { + throw new RuntimeException("ReadStatus 디렉토리 탐색 오류", e); + } + } + + @Override + public boolean existsById(UUID id) { + return Files.exists(resolvePath(id)); + } + + @Override + public void deleteById(UUID id) { + try { + Files.deleteIfExists(resolvePath(id)); + } catch (IOException e) { + throw new RuntimeException("ReadStatus 삭제 오류", e); + } + } + + @Override + public void deleteAllByChannelId(UUID channelId) { + findAllByChannelId(channelId).forEach(r -> deleteById(r.getId())); + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java index c3523a4a..199c1b03 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -13,20 +13,23 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Repository; @Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") public class FileUserRepository implements UserRepository { private final Path DIRECTORY; private final String EXTENSION = ".ser"; - public FileUserRepository() { - this.DIRECTORY = Paths.get(System.getProperty("user.dir"), "file-data-map", User.class.getSimpleName()); + public FileUserRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, User.class.getSimpleName()); if (Files.notExists(DIRECTORY)) { try { Files.createDirectories(DIRECTORY); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("User 저장 디렉토리 생성 중 오류 발생", e); } } } @@ -37,69 +40,56 @@ private Path resolvePath(UUID id) { @Override public User save(User user) { - Path path = resolvePath(user.getId()); - try ( - FileOutputStream fos = new FileOutputStream(path.toFile()); - ObjectOutputStream oos = new ObjectOutputStream(fos) - ) { + try (ObjectOutputStream oos = new ObjectOutputStream( + new FileOutputStream(resolvePath(user.getId()).toFile()))) { oos.writeObject(user); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("User 저장 중 오류 발생", e); } return user; } @Override public Optional findById(UUID id) { - User userNullable = null; Path path = resolvePath(id); if (Files.exists(path)) { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { - userNullable = (User) ois.readObject(); + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return Optional.of((User) ois.readObject()); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("User 로드 중 오류 발생", e); } } - return Optional.ofNullable(userNullable); + return Optional.empty(); } @Override public List findAll() { try { return Files.list(DIRECTORY) - .filter(path -> path.toString().endsWith(EXTENSION)) + .filter(p -> p.toString().endsWith(EXTENSION)) .map(path -> { - try ( - FileInputStream fis = new FileInputStream(path.toFile()); - ObjectInputStream ois = new ObjectInputStream(fis) - ) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { return (User) ois.readObject(); } catch (IOException | ClassNotFoundException e) { - throw new RuntimeException(e); + throw new RuntimeException("User 전체 조회 중 오류 발생", e); } - }) - .toList(); + }).toList(); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("디렉토리 로드 오류", e); } } @Override public boolean existsById(UUID id) { - Path path = resolvePath(id); - return Files.exists(path); + return Files.exists(resolvePath(id)); } @Override public void deleteById(UUID id) { - Path path = resolvePath(id); try { - Files.delete(path); + Files.deleteIfExists(resolvePath(id)); } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("User 삭제 중 오류 발생", e); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java new file mode 100644 index 00000000..dd7bb5a6 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -0,0 +1,106 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.UserStatusRepository; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") +public class FileUserStatusRepository implements UserStatusRepository { + private final Path DIRECTORY; + private final String EXTENSION = ".ser"; + + public FileUserStatusRepository(@Value("${discodeit.repository.file-directory}") String directory) { + this.DIRECTORY = Paths.get(System.getProperty("user.dir"), directory, UserStatus.class.getSimpleName()); + if (Files.notExists(DIRECTORY)) { + try { + Files.createDirectories(DIRECTORY); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + private Path resolvePath(UUID userId) { + return DIRECTORY.resolve(userId.toString() + EXTENSION); + } + + @Override + public UserStatus save(UserStatus userStatus) { + Path path = resolvePath(userStatus.getUserId()); + try ( + FileOutputStream fos = new FileOutputStream(path.toFile()); + ObjectOutputStream oos = new ObjectOutputStream(fos)) { + oos.writeObject(userStatus); + } catch (IOException e) { + throw new RuntimeException(e); + } + return userStatus; + } + + @Override + public Optional findByUserId(UUID id) { + Path path = resolvePath(id); + if (Files.exists(path)) { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis)) { + return Optional.of((UserStatus) ois.readObject()); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + return Optional.empty(); + } + + @Override + public List findAll() { + try { + return Files.list(DIRECTORY) + .filter(path -> path.toString().endsWith(EXTENSION)) + .map(path -> { + try ( + FileInputStream fis = new FileInputStream(path.toFile()); + ObjectInputStream ois = new ObjectInputStream(fis) + ) { + return (UserStatus) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException(e); + } + }) + .toList(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public boolean existsById(UUID id) { + Path path = resolvePath(id); + return Files.exists(path); + } + + + @Override + public void deleteById(UUID id) { + Path path = resolvePath(id); + try { + Files.deleteIfExists(path); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java new file mode 100644 index 00000000..84dd8cc0 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java @@ -0,0 +1,50 @@ +package com.sprint.mission.discodeit.repository.jcf; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf", matchIfMissing = true) +public class JCFBinaryContentRepository implements BinaryContentRepository { + private final Map store = new HashMap<>(); + + @Override + public BinaryContent save(BinaryContent binaryContent) { + store.put(binaryContent.getId(), binaryContent); + return binaryContent; + } + + @Override + public Optional findById(UUID id) { + return Optional.ofNullable(store.get(id)); + } + + @Override + public List findAllByIdIn(List ids) { + List result = new ArrayList<>(); + for (UUID id : ids) { + if (store.containsKey(id)) { + result.add(store.get(id)); + } + } + return result; + } + + @Override + public boolean existsById(UUID id) { + return store.containsKey(id); + } + + @Override + public void deleteById(UUID id) { + store.remove(id); + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java index 7fe79af0..14658b9a 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java @@ -2,42 +2,44 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.repository.ChannelRepository; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; -public class JCFChannelRepository implements ChannelRepository { - private final Map data; +@Repository - public JCFChannelRepository() { - this.data = new HashMap<>(); - } +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf") +public class JCFChannelRepository implements ChannelRepository { + private final Map store = new HashMap<>(); @Override public Channel save(Channel channel) { - this.data.put(channel.getId(), channel); + store.put(channel.getId(), channel); return channel; } @Override public Optional findById(UUID id) { - return Optional.ofNullable(this.data.get(id)); + return Optional.ofNullable(store.get(id)); } @Override public List findAll() { - return this.data.values().stream().toList(); + return new ArrayList<>(store.values()); } @Override public boolean existsById(UUID id) { - return this.data.containsKey(id); + return store.containsKey(id); } @Override public void deleteById(UUID id) { - this.data.remove(id); + store.remove(id); } } diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java index ac1a5e68..743493a8 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java @@ -2,42 +2,57 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.MessageRepository; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import java.util.stream.Collectors; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; -public class JCFMessageRepository implements MessageRepository { - private final Map data; +@Repository - public JCFMessageRepository() { - this.data = new HashMap<>(); - } +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf") +public class JCFMessageRepository implements MessageRepository { + private final Map store = new HashMap<>(); @Override public Message save(Message message) { - this.data.put(message.getId(), message); + store.put(message.getId(), message); return message; } @Override public Optional findById(UUID id) { - return Optional.ofNullable(this.data.get(id)); + return Optional.ofNullable(store.get(id)); } @Override public List findAll() { - return this.data.values().stream().toList(); + return new ArrayList<>(store.values()); + } + + @Override + public List findAllByChannelId(UUID channelId) { + return store.values().stream() + .filter(msg -> msg.getChannelId().equals(channelId)) + .collect(Collectors.toList()); + } + + @Override + public void deleteAllByChannelId(UUID channelId) { + store.values().removeIf(msg -> msg.getChannelId().equals(channelId)); } @Override public boolean existsById(UUID id) { - return this.data.containsKey(id); + return store.containsKey(id); } @Override public void deleteById(UUID id) { - this.data.remove(id); + store.remove(id); } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java new file mode 100644 index 00000000..4d550ea8 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java @@ -0,0 +1,58 @@ +package com.sprint.mission.discodeit.repository.jcf; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf") +public class JCFReadStatusRepository implements ReadStatusRepository { + private final Map store = new HashMap<>(); + + @Override + public ReadStatus save(ReadStatus readStatus) { + store.put(readStatus.getId(), readStatus); + return readStatus; + } + + @Override + public Optional findById(UUID id) { + return Optional.ofNullable(store.get(id)); + } + + @Override + public List findAllByUserId(UUID userId) { + return store.values().stream() + .filter(rs -> rs.getUserId().equals(userId)) + .collect(Collectors.toList()); + } + + @Override + public List findAllByChannelId(UUID channelId) { + return store.values().stream() + .filter(rs -> rs.getChannelId().equals(channelId)) + .collect(Collectors.toList()); + } + + @Override + public boolean existsById(UUID id) { + return store.containsKey(id); + } + + @Override + public void deleteById(UUID id) { + store.remove(id); + } + + @Override + public void deleteAllByChannelId(UUID channelId) { + store.values().removeIf(rs -> rs.getChannelId().equals(channelId)); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java index b071c201..1ff21ad4 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java @@ -2,42 +2,44 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; -public class JCFUserRepository implements UserRepository { - private final Map data; +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf") - public JCFUserRepository() { - this.data = new HashMap<>(); - } +public class JCFUserRepository implements UserRepository { + private final Map store = new HashMap<>(); @Override public User save(User user) { - this.data.put(user.getId(), user); + store.put(user.getId(), user); return user; } @Override public Optional findById(UUID id) { - return Optional.ofNullable(this.data.get(id)); + return Optional.ofNullable(store.get(id)); } @Override public List findAll() { - return this.data.values().stream().toList(); + return new ArrayList<>(store.values()); } @Override public boolean existsById(UUID id) { - return this.data.containsKey(id); + return store.containsKey(id); } @Override public void deleteById(UUID id) { - this.data.remove(id); + store.remove(id); } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java new file mode 100644 index 00000000..daa5df57 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java @@ -0,0 +1,45 @@ +package com.sprint.mission.discodeit.repository.jcf; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.UserStatusRepository; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "jcf") + +public class JCFUserStatusRepository implements UserStatusRepository { + private final Map store = new HashMap<>(); + + @Override + public UserStatus save(UserStatus userStatus) { + store.put(userStatus.getUserId(), userStatus); + return userStatus; + } + + @Override + public Optional findByUserId(UUID userId) { + return Optional.ofNullable(store.get(userId)); + } + + @Override + public List findAll() { + return new ArrayList<>(store.values()); + } + + @Override + public boolean existsById(UUID id) { + return store.containsKey(id); + } + + @Override + public void deleteById(UUID id) { + store.remove(id); + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/AuthService.java b/src/main/java/com/sprint/mission/discodeit/service/AuthService.java new file mode 100644 index 00000000..f2b4e584 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/AuthService.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; + +public interface AuthService { + public AuthLoginReponse login(AuthLoginRequest request); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java new file mode 100644 index 00000000..a5404faa --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java @@ -0,0 +1,17 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface BinaryContentService { + public BinaryContent create(BinaryContentCreateRequest request); + + public Optional find(UUID id); + + public List findAllByIdIn(List ids); + + public void delete(UUID id); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java index 67b4e8e2..b3976fb8 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,18 +1,24 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.ChannelType; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; import java.util.List; import java.util.UUID; public interface ChannelService { - Channel create(ChannelType type, String name, String description); + public Channel create(PublicChannelCreateRequest request); - Channel find(UUID channelId); + public Channel create(PrivateChannelCreateRequest request); - List findAll(); + public ChannelResponse find(ChannelFindRequest request); - Channel update(UUID channelId, String newName, String newDescription); + public List findAllByUserId(UUID userId); - void delete(UUID channelId); + public Channel update(ChannelUpdateRequest request); + + public void delete(UUID channelId); } diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java index 38f48915..ebe8f4f3 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -1,17 +1,21 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; +import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.service.dto.Message.MessageUpdateRequest; import java.util.List; import java.util.UUID; public interface MessageService { - Message create(String content, UUID channelId, UUID authorId); + public Message create(MessageCreateRequest messageCreateRequest, + List binaryContentCreateRequests); - Message find(UUID messageId); + public Message find(UUID messageId); - List findAll(); + public List findAllByChannelId(UUID channelId); - Message update(UUID messageId, String newContent); + public Message update(MessageUpdateRequest request); - void delete(UUID messageId); + public void delete(UUID messageId); } diff --git a/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java new file mode 100644 index 00000000..2ab50631 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java @@ -0,0 +1,19 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusUpdateRequest; +import java.util.List; +import java.util.UUID; + +public interface ReadStatusService { + public ReadStatus create(ReadStatusCreateRequest request); + + public ReadStatus find(UUID readStatusId); + + public List findAllByUserId(UUID userId); + + public ReadStatus update(ReadStatusUpdateRequest request); + + public void delete(UUID readStatusId); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java index 6c4e73df..5d96af36 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,17 +1,22 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.service.dto.User.UserResponse; +import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; import java.util.List; import java.util.UUID; + public interface UserService { - User create(String username, String email, String password); + public User create(UserCreateRequest userCreateRequest); - User find(UUID userId); + public UserResponse find(UserFindRequest userFindRequest); - List findAll(); + public List findAll(); - User update(UUID userId, String newUsername, String newEmail, String newPassword); + public User update(UserUpdateRequest request); - void delete(UUID userId); + public void delete(UUID userId); } diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java new file mode 100644 index 00000000..e9d10549 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java @@ -0,0 +1,21 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusCreateRequest; +import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusUpdateRequest; +import java.util.List; +import java.util.UUID; + +public interface UserStatusService { + public UserStatus create(UserStatusCreateRequest request); + + public UserStatus find(UUID id); + + public List findAll(); + + public UserStatus update(UserStatusUpdateRequest request); + + public UserStatus updateByUserId(UserStatusUpdateRequest request); + + public void delete(UUID id); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java new file mode 100644 index 00000000..3ec07a32 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java @@ -0,0 +1,73 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.repository.UserStatusRepository; +import com.sprint.mission.discodeit.service.UserStatusService; +import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusCreateRequest; +import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusUpdateRequest; +import java.time.Instant; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class BaiscUserStatusService implements UserStatusService { + private final UserStatusRepository userStatusRepository; + private final UserRepository userRepository; + + @Override + public UserStatus create(UserStatusCreateRequest request) { + UUID userId = request.userId(); + + if (!userRepository.existsById(userId)) { + throw new NoSuchElementException("해당 유저는 존재하지 않습니다."); + } + if (!userStatusRepository.existsById(userId)) { + throw new RuntimeException("해당 유저의 정보는 이미 등록되어 있습니다."); + } + + Instant recentStatusAt = request.recentStatusAt(); + UserStatus userStatus = new UserStatus(recentStatusAt, request.userId()); + + return userStatusRepository.save(userStatus); + } + + @Override + public UserStatus find(UUID id) { + return userStatusRepository.findByUserId(id) + .orElseThrow(() -> new NoSuchElementException("해당하는 id는 존재하지 않습니다.")); + } + + @Override + public List findAll() { + return userStatusRepository.findAll().stream().toList(); + } + + @Override + public UserStatus update(UserStatusUpdateRequest request) { + UserStatus updatedUserStatus = userStatusRepository.findByUserId(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id는 존재하지 않아 업데이트가 불가능 합니다.")); + updatedUserStatus.update(request.StatusAt()); + return userStatusRepository.save(updatedUserStatus); + } + + @Override + public UserStatus updateByUserId(UserStatusUpdateRequest request) { + UserStatus updatedUserStatus = userStatusRepository.findByUserId(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 유저의 id가 존재하지 않아 업데이트가 불가능 합니다.")); + updatedUserStatus.update(request.StatusAt()); + return userStatusRepository.save(updatedUserStatus); + } + + @Override + public void delete(UUID id) { + if (!userStatusRepository.existsById(id)) { + throw new NoSuchElementException("해당 id는 존재하지 않아 삭제가 불가능합니다."); + } + userStatusRepository.deleteById(id); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java new file mode 100644 index 00000000..70cf5a3c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java @@ -0,0 +1,31 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.service.AuthService; +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; +import java.util.NoSuchElementException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class BasicAuthService implements AuthService { + private final UserRepository userRepository; + + public AuthLoginReponse login(AuthLoginRequest request) { + User user = userRepository.findById(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 유저는 없습니다.")); + + if (user.getUsername().equals(request.userName()) && user.getPassword().equals(request.password())) { + return new AuthLoginReponse( + user.getId(), + user.getUsername(), + user.getEmail() + ); + } else { + throw new IllegalArgumentException("유저이름, 비밀번호가 틀립니다. 프로그램을 종료합니다."); + } + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java new file mode 100644 index 00000000..e48acc65 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java @@ -0,0 +1,44 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; +import com.sprint.mission.discodeit.service.BinaryContentService; +import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class BasicBinaryContentService implements BinaryContentService { + private final BinaryContentRepository binaryContentRepository; + + @Override + public BinaryContent create(BinaryContentCreateRequest request) { + BinaryContent binaryContent = new BinaryContent(request.fileName(), request.contentType(), request.bytes()); + return binaryContentRepository.save(binaryContent); + } + + @Override + public Optional find(UUID id) { + if (!binaryContentRepository.existsById(id)) { + throw new RuntimeException("해당 ID는 존재하지 않습니다."); + } + return binaryContentRepository.findById(id); + } + + @Override + public List findAllByIdIn(List ids) { + return binaryContentRepository.findAllByIdIn(ids); + } + + @Override + public void delete(UUID id) { + if (!binaryContentRepository.existsById(id)) { + throw new RuntimeException("해당 ID는 존재하지 않습니다."); + } + binaryContentRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index f6f1acac..6fccedfd 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -2,10 +2,20 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ChannelType; +import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ChannelRepository; +import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; +import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -14,37 +24,125 @@ @RequiredArgsConstructor public class BasicChannelService implements ChannelService { private final ChannelRepository channelRepository; + private final MessageRepository messageRepository; + private final ReadStatusRepository readStatusRepository; @Override - public Channel create(ChannelType type, String name, String description) { - Channel channel = new Channel(type, name, description); + public Channel create(PublicChannelCreateRequest request) { + Channel channel = new Channel(ChannelType.PUBLIC, request.channelName(), request.description()); return channelRepository.save(channel); } @Override - public Channel find(UUID channelId) { - return channelRepository.findById(channelId) - .orElseThrow(() -> new NoSuchElementException("Channel with id " + channelId + " not found")); + public Channel create(PrivateChannelCreateRequest request) { + Channel channel = new Channel(ChannelType.PRIVATE, null, null); + Channel createChannel = channelRepository.save(channel); + request.participantsIds().stream().map(userId -> new ReadStatus(userId, createChannel.getId(), Instant.MIN)) + .forEach(readStatusRepository::save); + + return channelRepository.save(channel); } + @Override - public List findAll() { - return channelRepository.findAll(); + public ChannelResponse find(ChannelFindRequest request) { + Channel channel = channelRepository.findById(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 채널은 없습니다.")); + + Instant recentMessageAt = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getLastReadAt).max(Instant::compareTo) + .orElse(null); + + List participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getUserId) + .toList(); + + if (channel.getType().equals(ChannelType.PUBLIC)) { + return new ChannelResponse( + channel.getId(), + channel.getType(), + channel.getName(), + channel.getDescription(), + recentMessageAt, + null + ); + } else { + return new ChannelResponse( + channel.getId(), + channel.getType(), + channel.getName(), + channel.getDescription(), + recentMessageAt, + participantIds + ); + } + } + @Override - public Channel update(UUID channelId, String newName, String newDescription) { - Channel channel = channelRepository.findById(channelId) - .orElseThrow(() -> new NoSuchElementException("Channel with id " + channelId + " not found")); - channel.update(newName, newDescription); + public List findAllByUserId(UUID userId) { + return channelRepository.findAll().stream() + .filter(channel -> { + if (channel.getType() == ChannelType.PUBLIC) { + return true; + } + List participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getUserId) + .toList(); + + return participantIds.contains(userId); + }) + .map(channel -> { + Instant recentMessageAt = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getLastReadAt) + .filter(Objects::nonNull) + .max(Instant::compareTo) + .orElse(null); + + List participantIds = null; + if (channel.getType() == ChannelType.PRIVATE) { + participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getUserId) + .toList(); + } + + return new ChannelResponse( + channel.getId(), + channel.getType(), + channel.getName(), + channel.getDescription(), + recentMessageAt, + participantIds + ); + }) + .toList(); + } + + + @Override + public Channel update(ChannelUpdateRequest request) { + Channel channel = channelRepository.findById(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 채널은 없습니다.")); + + if (request.type().equals(ChannelType.PUBLIC)) { + channel.update(request.name(), request.description()); + } else { + throw new RuntimeException("Private 채널은 수정할 수 없습니다. "); + } + return channelRepository.save(channel); } @Override public void delete(UUID channelId) { if (!channelRepository.existsById(channelId)) { - throw new NoSuchElementException("Channel with id " + channelId + " not found"); + throw new NoSuchElementException("해당 id를 가진 채널은 없습니다."); } channelRepository.deleteById(channelId); + readStatusRepository.deleteAllByChannelId(channelId); + messageRepository.deleteAllByChannelId(channelId); + } } + diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java index 6241d249..5067ac3e 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java @@ -1,10 +1,14 @@ package com.sprint.mission.discodeit.service.basic; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; +import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.service.dto.Message.MessageUpdateRequest; import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; @@ -15,48 +19,61 @@ @RequiredArgsConstructor public class BasicMessageService implements MessageService { private final MessageRepository messageRepository; - // private final ChannelRepository channelRepository; private final UserRepository userRepository; + private final BinaryContentRepository binaryContentRepository; @Override - public Message create(String content, UUID channelId, UUID authorId) { - if (!channelRepository.existsById(channelId)) { - throw new NoSuchElementException("Channel not found with id " + channelId); + public Message create(MessageCreateRequest messageCreateRequest, + List binaryContentCreateRequests) { + UUID channelId = messageCreateRequest.channelId(); + UUID authorId = messageCreateRequest.authorId(); + + if (!channelRepository.existsById(messageCreateRequest.channelId())) { + throw new NoSuchElementException("해당 id를 가진 채널은 없습니다."); } - if (!userRepository.existsById(authorId)) { - throw new NoSuchElementException("Author not found with id " + authorId); + if (!userRepository.existsById(messageCreateRequest.authorId())) { + throw new NoSuchElementException("해당 id를 가진 유저는 없습니다."); } - Message message = new Message(content, channelId, authorId); + String content = messageCreateRequest.content(); + Message message = new Message( + content, + channelId, + authorId, + null + ); return messageRepository.save(message); } @Override public Message find(UUID messageId) { return messageRepository.findById(messageId) - .orElseThrow(() -> new NoSuchElementException("Message with id " + messageId + " not found")); + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 메시지는 없습니다.")); } @Override - public List findAll() { - return messageRepository.findAll(); + public List findAllByChannelId(UUID channelId) { + return messageRepository.findAllByChannelId(channelId).stream().toList(); } @Override - public Message update(UUID messageId, String newContent) { - Message message = messageRepository.findById(messageId) - .orElseThrow(() -> new NoSuchElementException("Message with id " + messageId + " not found")); - message.update(newContent); + public Message update(MessageUpdateRequest request) { + Message message = messageRepository.findById(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 메시지은 없습니다.")); + message.update(request.content()); return messageRepository.save(message); } @Override public void delete(UUID messageId) { - if (!messageRepository.existsById(messageId)) { - throw new NoSuchElementException("Message with id " + messageId + " not found"); - } + Message message = messageRepository.findById(messageId) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 메시지은 없습니다.")); + + message.getAttachmentIds() + .forEach(binaryContentRepository::deleteById); + messageRepository.deleteById(messageId); } } diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java new file mode 100644 index 00000000..6eebcc98 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java @@ -0,0 +1,73 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.repository.ChannelRepository; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.service.ReadStatusService; +import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusUpdateRequest; +import java.time.Instant; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.UUID; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class BasicReadStatusService implements ReadStatusService { + private final ReadStatusRepository readStatusRepository; + private final UserRepository userRepository; + private final ChannelRepository channelRepository; + + public ReadStatus create(ReadStatusCreateRequest request) { + UUID userId = request.userId(); + UUID channelId = request.channelId(); + + if (!userRepository.existsById(userId)) { + throw new NoSuchElementException("해당하는 유저 아이디 없습니다."); + } + + if (!channelRepository.existsById(channelId)) { + throw new NoSuchElementException("해당하는 채널 아이디 없습니다."); + } + if (readStatusRepository.findAllByUserId(request.userId()).stream() + .anyMatch(readStatus -> readStatus.getChannelId().equals(channelId))) { + throw new RuntimeException("이미 ReadStatus가 존재합니다."); + } + + Instant recentReadAt = request.recentReadAt(); + ReadStatus readStatus = new ReadStatus(userId, channelId, recentReadAt); + + return readStatusRepository.save(readStatus); + } + + public ReadStatus find(UUID readStatusId) { + return readStatusRepository.findById(readStatusId) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 ReadStatus는 없습니다.")); + } + + public List findAllByUserId(UUID userId) { + return readStatusRepository.findAllByUserId(userId).stream().toList(); + } + + + public ReadStatus update(ReadStatusUpdateRequest request) { + Instant newReadAt = request.newReadAt(); + + ReadStatus readStatus = readStatusRepository.findById(request.id()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 ReadStatus는 없습니다.")); + + readStatus.update(newReadAt); + return readStatusRepository.save(readStatus); + } + + + public void delete(UUID readStatusId) { + if (!readStatusRepository.existsById(readStatusId)) { + throw new NoSuchElementException("해당 id를 가진 ReadStatus는 없습니다."); + } + readStatusRepository.deleteById(readStatusId); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 1f2ea753..8fec515d 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -1,8 +1,17 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.repository.UserStatusRepository; import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.service.dto.User.UserResponse; +import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; +import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; @@ -13,37 +22,122 @@ @RequiredArgsConstructor public class BasicUserService implements UserService { private final UserRepository userRepository; + private final UserStatusRepository userStatusRepository; + private final BinaryContentRepository binaryContentRepository; @Override - public User create(String username, String email, String password) { - User user = new User(username, email, password); - return userRepository.save(user); + public User create(UserCreateRequest request) { + validateUniqueUser(request); + + User user = new User(request.username(), request.email(), request.password(), request.content()); + + if (request.content()) { //주강사님이 동적정적 바인딩? 불러오는거 안배웠다고 null로 표기하라고 하셨습니다. + BinaryContent profile = new BinaryContent( + null, + null, + null + + ); + binaryContentRepository.save(profile); + user.setProfileId(profile.getId()); + } + + User savedUser = userRepository.save(user); + + UserStatus status = new UserStatus( + Instant.now(), + savedUser.getId() + ); + userStatusRepository.save(status); + + return savedUser; + } + + private void validateUniqueUser(UserCreateRequest request) { + List users = userRepository.findAll(); + for (User user : users) { + if (user.getUsername().equals(request.username())) { + throw new IllegalArgumentException("이미 존재하는 이름 입니다."); + } + if (user.getEmail().equals(request.email())) { + throw new IllegalArgumentException("이미 존재하는 이메일 입니다."); + } + } } @Override - public User find(UUID userId) { - return userRepository.findById(userId) - .orElseThrow(() -> new NoSuchElementException("User with id " + userId + " not found")); + public UserResponse find(UserFindRequest request) { + User user = userRepository.findById(request.userId()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 유저는 없습니다.")); + + boolean isOnline = userStatusRepository.findByUserId(user.getId()) + .map(status -> status.getUpdatedAt().isAfter(Instant.now().minusSeconds(300))) + .orElse(false); + + return new UserResponse( + user.getId(), + user.getUsername(), + user.getEmail(), + isOnline, + user.isProfileImage() + ); } @Override - public List findAll() { - return userRepository.findAll(); + public List findAll() { + return userRepository.findAll().stream() + .map(user -> { + boolean isOnline = userStatusRepository.findByUserId(user.getId()) + .map(status -> status.getUpdatedAt().isAfter(Instant.now().minusSeconds(300))) + .orElse(false); + + return new UserResponse( + user.getId(), + user.getUsername(), + user.getEmail(), + isOnline, + user.isProfileImage() + ); + }) + .toList(); } @Override - public User update(UUID userId, String newUsername, String newEmail, String newPassword) { - User user = userRepository.findById(userId) - .orElseThrow(() -> new NoSuchElementException("User with id " + userId + " not found")); - user.update(newUsername, newEmail, newPassword); + public User update(UserUpdateRequest request) { + User user = userRepository.findById(request.userId()) + .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 유저는 없습니다.")); + + user.update(request.newUsername(), request.newEmail(), request.newPassword()); + + if (request.hasProfileImage()) { + BinaryContent profile = new BinaryContent( + null, + null, + null + ); + binaryContentRepository.save(profile); + user.setProfileId(profile.getId()); + } + + userRepository.save(user); + + userStatusRepository.findByUserId(user.getId()).ifPresent(status -> { + status.update(Instant.now()); + userStatusRepository.save(status); + }); + return userRepository.save(user); } @Override public void delete(UUID userId) { if (!userRepository.existsById(userId)) { - throw new NoSuchElementException("User with id " + userId + " not found"); + throw new NoSuchElementException("해당 id를 가진 유저는 없습니다."); } userRepository.deleteById(userId); + + if (userStatusRepository.existsById(userId)) { + userStatusRepository.deleteById(userId); + } } -} +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java new file mode 100644 index 00000000..7a52d5b3 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.service.dto.AuthLogin; + +import java.util.UUID; + +public record AuthLoginReponse( + UUID id, + String userName, + String email +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java new file mode 100644 index 00000000..0d79a034 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.service.dto.AuthLogin; + +import java.util.UUID; + +public record AuthLoginRequest( + UUID id, + String userName, + String password +) { + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java new file mode 100644 index 00000000..555c7c01 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.service.dto.BinaryContent; + +public record BinaryContentCreateRequest( + String fileName, + String contentType, + byte[] bytes +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java new file mode 100644 index 00000000..57f2ce34 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.service.dto.Channel; + +import java.util.UUID; + +public record ChannelFindRequest( + UUID id +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java new file mode 100644 index 00000000..2570545f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java @@ -0,0 +1,16 @@ +package com.sprint.mission.discodeit.service.dto.Channel; + +import com.sprint.mission.discodeit.entity.ChannelType; +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public record ChannelResponse( + UUID id, + ChannelType type, + String name, + String description, + Instant lastMessageAt, + List participantIds +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java new file mode 100644 index 00000000..9cad6362 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java @@ -0,0 +1,14 @@ +package com.sprint.mission.discodeit.service.dto.Channel; + +import com.sprint.mission.discodeit.entity.ChannelType; +import java.util.UUID; + +public record ChannelUpdateRequest( + UUID id, + ChannelType type, + String name, + String description + +) { + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java new file mode 100644 index 00000000..8704aac1 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.service.dto.Channel; + +import java.util.List; +import java.util.UUID; + +public record PrivateChannelCreateRequest( + List participantsIds +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java new file mode 100644 index 00000000..c8834809 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.service.dto.Channel; + +public record PublicChannelCreateRequest( + String channelName, + String description + +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java new file mode 100644 index 00000000..483dd111 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.service.dto.Message; + +import java.util.UUID; + +public record MessageCreateRequest( + String content, + UUID channelId, + UUID authorId +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java new file mode 100644 index 00000000..42a0f0a2 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.service.dto.Message; + +import java.util.UUID; + +public record MessageUpdateRequest( + UUID id, + String content +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java new file mode 100644 index 00000000..62358616 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.service.dto.ReadStatus; + +import java.time.Instant; +import java.util.UUID; + +public record ReadStatusCreateRequest( + UUID userId, + UUID channelId, + Instant recentReadAt +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java new file mode 100644 index 00000000..35129710 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.service.dto.ReadStatus; + +import java.time.Instant; +import java.util.UUID; + +public record ReadStatusUpdateRequest( + UUID id, + Instant newReadAt +) { + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java new file mode 100644 index 00000000..bba0bdf0 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.service.dto.User; + +public record UserCreateRequest( + String username, + String email, + String password, + boolean content, + byte[] profileImage, + String profileContentType +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java new file mode 100644 index 00000000..5ba4f364 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.service.dto.User; + +import java.util.UUID; + +public record UserFindRequest( + UUID userId +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java new file mode 100644 index 00000000..22d40e67 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java @@ -0,0 +1,12 @@ +package com.sprint.mission.discodeit.service.dto.User; + +import java.util.UUID; + +public record UserResponse( + UUID id, + String username, + String email, + boolean isOnline, + boolean profileImage +) { +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java new file mode 100644 index 00000000..c8c75da0 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java @@ -0,0 +1,14 @@ +package com.sprint.mission.discodeit.service.dto.User; + +import java.util.UUID; + +public record UserUpdateRequest( + UUID userId, + String newUsername, + String newEmail, + String newPassword, + boolean hasProfileImage, + byte[] newProfileImage, + String newProfileContentType +) { +} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java new file mode 100644 index 00000000..c26da558 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java @@ -0,0 +1,12 @@ +package com.sprint.mission.discodeit.service.dto.UserStatus; + +import java.time.Instant; +import java.util.UUID; + +public record UserStatusCreateRequest( + + UUID userId, + Instant recentStatusAt +) { + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java new file mode 100644 index 00000000..c1e5cd8b --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.service.dto.UserStatus; + +import java.time.Instant; +import java.util.UUID; + +public record UserStatusUpdateRequest( + UUID id, + Instant StatusAt +) { +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 545cf9f0..2d292a73 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1 +1,4 @@ -spring.application.name=discodeit +discodeit: + repository: + type: file # 또는 file + file-directory: .discodeit \ No newline at end of file From 393547ee37f886b3181117b8a123939e29fbcc38 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 11:44:52 +0900 Subject: [PATCH 07/15] =?UTF-8?q?refactor:=20lombok=EC=9D=98=20Builder=20?= =?UTF-8?q?=ED=8C=A8=ED=84=B4=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - AuthLoginRequest의 id필드 제거 --- .../discodeit/DiscodeitApplication.java | 133 ++++++++++-------- .../dto/AuthLogin/AuthLoginRequest.java | 7 +- .../dto/Channel/ChannelFindRequest.java | 2 + .../dto/Channel/ChannelUpdateRequest.java | 2 + .../Channel/PrivateChannelCreateRequest.java | 2 + .../Channel/PublicChannelCreateRequest.java | 3 + .../dto/Message/MessageCreateRequest.java | 2 + .../service/dto/User/UserCreateRequest.java | 5 + .../service/dto/User/UserFindRequest.java | 2 + .../service/dto/User/UserUpdateRequest.java | 2 + 10 files changed, 99 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 29f9de4a..f1d9105b 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -39,41 +39,42 @@ public static void main(String[] args) { System.out.println("====== 유저 생성 테스트 ======"); - UserCreateRequest request1 = new UserCreateRequest( - "user1", - "user1@example.com", - "password1", - false, - null, - null - ); - - UserCreateRequest request2 = new UserCreateRequest( - "user2", - "user2@example.com", - "password2", - false, - null, - null - ); - - User user1 = userService.create(request1); - User user2 = userService.create(request2); + UserCreateRequest user1CreateRequest = UserCreateRequest.builder() + .username("username1") + .email("user1@example.com") + .password("password1") + .content(false) + .profileImage(null) + .profileContentType(null) + .build(); + + UserCreateRequest user2CreateRequest = UserCreateRequest.builder() + .username("user2") + .email("user2@example.com") + .password("password2") + .content(false) + .profileImage(null) + .profileContentType(null) + .build(); + + User user1 = userService.create(user1CreateRequest); + User user2 = userService.create(user2CreateRequest); System.out.println("생성된 유저 1 ID: " + user1.getId()); System.out.println("생성된 유저 2 ID: " + user2.getId()); System.out.println("\n====== 유저 로그인 테스트 ======"); - AuthLoginRequest request3 = new AuthLoginRequest( - user1.getId(), - user1.getUsername(), - user1.getPassword() - ); - AuthLoginReponse authLoginReponse = authService.login(request3); + AuthLoginRequest loginRequest = AuthLoginRequest.builder() + .userName(user1CreateRequest.username()) + .password(user1CreateRequest.password()) + .build(); + + AuthLoginReponse authLoginReponse = authService.login(loginRequest); System.out.println(authLoginReponse); System.out.println("\n====== 유저 단일 조회 테스트 ======"); - - UserFindRequest findRequest = new UserFindRequest(user1.getId()); - UserResponse foundUser = userService.find(findRequest); + + UserResponse foundUser = userService.find(UserFindRequest.builder() + .userId(user1.getId()) + .build()); System.out.println(foundUser); System.out.println("\n====== 유저 전체 조회 테스트 ======"); @@ -85,15 +86,15 @@ public static void main(String[] args) { System.out.println("\n====== 유저 수정 테스트 ======"); - UserUpdateRequest updateRequest = new UserUpdateRequest( - user2.getId(), - "new_user2", - "new_user2@example.com", - "new_password2", - false, - null, - null - ); + UserUpdateRequest updateRequest = UserUpdateRequest.builder() + .userId(user2.getId()) + .newUsername("new_user2") + .newEmail("new_user2@example.com") + .newPassword("new_password2") + .hasProfileImage(false) + .newProfileImage(null) + .newProfileContentType(null) + .build(); User updatedUser = userService.update(updateRequest); @@ -112,23 +113,35 @@ public static void main(String[] args) { System.out.println("\n====== 채널 테스트 시작 ======"); - Channel publicChannel = channelService.create(new PublicChannelCreateRequest( - "공지사항", "모두가 볼 수 있는 공지" - )); + PublicChannelCreateRequest publicChannelCreateRequest = PublicChannelCreateRequest.builder() + .channelName("공지사항") + .description("모두가 볼 수 있는 공지") + .build(); + + Channel publicChannel = channelService.create(publicChannelCreateRequest); + + PrivateChannelCreateRequest privateChannelCreateRequest = PrivateChannelCreateRequest.builder() + .participantsIds(List.of(user1.getId())) + .build(); // 3. PRIVATE 채널 생성 (user1만 참여) - Channel privateChannel = channelService.create(new PrivateChannelCreateRequest( - List.of(user1.getId()) - )); + Channel privateChannel = channelService.create(privateChannelCreateRequest); - // 4. PUBLIC 채널 조회 테스트 System.out.println("\n=== PUBLIC 채널 조회 테스트 ==="); - ChannelResponse publicResponse = channelService.find(new ChannelFindRequest(publicChannel.getId())); + ChannelResponse publicResponse = channelService.find( + ChannelFindRequest.builder() + .id(publicChannel.getId()) + .build() + ); System.out.println(publicResponse); // 5. PRIVATE 채널 조회 테스트 System.out.println("\n=== PRIVATE 채널 조회 테스트 ==="); - ChannelResponse privateResponse = channelService.find(new ChannelFindRequest(privateChannel.getId())); + ChannelResponse privateResponse = channelService.find( + ChannelFindRequest.builder() + .id(privateChannel.getId()) + .build() + ); System.out.println(privateResponse); // 4. user1이 볼 수 있는 채널 확인 @@ -147,13 +160,19 @@ public static void main(String[] args) { user2Channels.forEach(System.out::println); System.out.println("\n=== public 채널 업데이트 테스트 ==="); - ChannelUpdateRequest channelUpdateRequest = new ChannelUpdateRequest(publicChannel.getId(), ChannelType.PUBLIC, - "새로운 공지", "업데이트햇음"); + ChannelUpdateRequest channelUpdateRequest = ChannelUpdateRequest.builder() + .id(publicChannel.getId()) + .type(ChannelType.PUBLIC) + .name("새로운 공지") + .description("업데이트햇음") + .build(); channelService.update(channelUpdateRequest); - publicResponse = channelService.find(new ChannelFindRequest(publicChannel.getId())); + publicResponse = channelService.find(ChannelFindRequest.builder() + .id(publicChannel.getId()) + .build()); System.out.println(publicResponse); - System.out.println("\n=== public 채널 삭재 테스트 ==="); + System.out.println("\n=== public 채널 삭제 테스트 ==="); channelService.delete(publicChannel.getId()); System.out.println("\n=== user2가 볼 수 있는 채널 ==="); @@ -163,11 +182,11 @@ public static void main(String[] args) { // 6. 메시지 테스트 시작 System.out.println("\n=== 메시지 생성 테스트 ==="); - MessageCreateRequest messageCreateRequest = new MessageCreateRequest( - "첫 번째 테스트 메시지입니다.", - privateChannel.getId(), - user2.getId() - ); + MessageCreateRequest messageCreateRequest = MessageCreateRequest.builder() + .content("첫 번째 테스트 메시지입니다.") + .channelId(privateChannel.getId()) + .authorId(user2.getId()) + .build(); Message createdMessage = messageService.create(messageCreateRequest, null); System.out.println("메시지 생성됨: ID = " + createdMessage.getId()); @@ -177,7 +196,5 @@ public static void main(String[] args) { System.out.println("조회된 메시지 내용: " + foundMessage.getContent()); System.out.println("첨부파일 ID들: " + foundMessage.getAttachmentIds()); - } - } diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java index 0d79a034..e4faaca9 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java @@ -1,11 +1,12 @@ package com.sprint.mission.discodeit.service.dto.AuthLogin; -import java.util.UUID; +import lombok.Builder; public record AuthLoginRequest( - UUID id, String userName, String password ) { - + @Builder + public AuthLoginRequest { + } } diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java index 57f2ce34..401f25f1 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit.service.dto.Channel; import java.util.UUID; +import lombok.Builder; +@Builder public record ChannelFindRequest( UUID id ) { diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java index 9cad6362..75a95e84 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java @@ -2,7 +2,9 @@ import com.sprint.mission.discodeit.entity.ChannelType; import java.util.UUID; +import lombok.Builder; +@Builder public record ChannelUpdateRequest( UUID id, ChannelType type, diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java index 8704aac1..1ee216d7 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java @@ -2,7 +2,9 @@ import java.util.List; import java.util.UUID; +import lombok.Builder; +@Builder public record PrivateChannelCreateRequest( List participantsIds ) { diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java index c8834809..5715ee50 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java @@ -1,5 +1,8 @@ package com.sprint.mission.discodeit.service.dto.Channel; +import lombok.Builder; + +@Builder public record PublicChannelCreateRequest( String channelName, String description diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java index 483dd111..5cfa08bd 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit.service.dto.Message; import java.util.UUID; +import lombok.Builder; +@Builder public record MessageCreateRequest( String content, UUID channelId, diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java index bba0bdf0..3d706acb 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java @@ -1,5 +1,7 @@ package com.sprint.mission.discodeit.service.dto.User; +import lombok.Builder; + public record UserCreateRequest( String username, String email, @@ -8,4 +10,7 @@ public record UserCreateRequest( byte[] profileImage, String profileContentType ) { + @Builder + public UserCreateRequest { + } } diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java index 5ba4f364..5b458e31 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit.service.dto.User; import java.util.UUID; +import lombok.Builder; +@Builder public record UserFindRequest( UUID userId ) { diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java index c8c75da0..56cada11 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit.service.dto.User; import java.util.UUID; +import lombok.Builder; +@Builder public record UserUpdateRequest( UUID userId, String newUsername, From 8001f294ac34acb2bf0aceb1ab524965cb635a13 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 13:11:34 +0900 Subject: [PATCH 08/15] =?UTF-8?q?refactor:=20User=EC=9D=98=20profileImage?= =?UTF-8?q?=20->=20hasProfileImage=20=ED=95=84=EB=93=9C=20=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sprint/mission/discodeit/entity/User.java | 6 +++--- .../mission/discodeit/service/basic/BasicUserService.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java index 77d03d0f..3c566d19 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -17,7 +17,7 @@ public class User implements Serializable { private String username; private String email; private String password; - private boolean profileImage; + private boolean hasProfileImage; private UUID profileId; @@ -28,13 +28,13 @@ public User(String username, String email, String password, boolean content) { this.username = username; this.email = email; this.password = password; - this.profileImage = content; + this.hasProfileImage = content; this.profileId = null; } public void setProfileId(UUID profileId) { this.profileId = profileId; - this.profileImage = true; + this.hasProfileImage = true; } @Override diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 8fec515d..7320cbf3 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -79,7 +79,7 @@ public UserResponse find(UserFindRequest request) { user.getUsername(), user.getEmail(), isOnline, - user.isProfileImage() + user.isHasProfileImage() ); } @@ -96,7 +96,7 @@ public List findAll() { user.getUsername(), user.getEmail(), isOnline, - user.isProfileImage() + user.isHasProfileImage() ); }) .toList(); From 574db42a4f2b9067d732edf53802ceddea1a5407 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 13:14:24 +0900 Subject: [PATCH 09/15] =?UTF-8?q?refactor:=20dto=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 26 +++++++++---------- .../dto/AuthLogin/AuthLoginReponse.java | 2 +- .../dto/AuthLogin/AuthLoginRequest.java | 2 +- .../BinaryContentCreateRequest.java | 2 +- .../dto/Channel/ChannelFindRequest.java | 2 +- .../dto/Channel/ChannelResponse.java | 2 +- .../dto/Channel/ChannelUpdateRequest.java | 2 +- .../Channel/PrivateChannelCreateRequest.java | 2 +- .../Channel/PublicChannelCreateRequest.java | 2 +- .../dto/Message/MessageCreateRequest.java | 2 +- .../dto/Message/MessageUpdateRequest.java | 2 +- .../ReadStatus/ReadStatusCreateRequest.java | 2 +- .../ReadStatus/ReadStatusUpdateRequest.java | 2 +- .../dto/User/UserCreateRequest.java | 2 +- .../dto/User/UserFindRequest.java | 2 +- .../{service => }/dto/User/UserResponse.java | 2 +- .../dto/User/UserUpdateRequest.java | 2 +- .../UserStatus/UserStatusCreateRequest.java | 2 +- .../UserStatus/UserStatusUpdateRequest.java | 2 +- .../discodeit/service/AuthService.java | 4 +-- .../service/BinaryContentService.java | 2 +- .../discodeit/service/ChannelService.java | 10 +++---- .../discodeit/service/MessageService.java | 6 ++--- .../discodeit/service/ReadStatusService.java | 4 +-- .../discodeit/service/UserService.java | 8 +++--- .../discodeit/service/UserStatusService.java | 4 +-- .../service/basic/BaiscUserStatusService.java | 4 +-- .../service/basic/BasicAuthService.java | 4 +-- .../basic/BasicBinaryContentService.java | 2 +- .../service/basic/BasicChannelService.java | 10 +++---- .../service/basic/BasicMessageService.java | 6 ++--- .../service/basic/BasicReadStatusService.java | 4 +-- .../service/basic/BasicUserService.java | 8 +++--- 33 files changed, 69 insertions(+), 69 deletions(-) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/AuthLogin/AuthLoginReponse.java (67%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/AuthLogin/AuthLoginRequest.java (72%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/BinaryContent/BinaryContentCreateRequest.java (65%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Channel/ChannelFindRequest.java (66%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Channel/ChannelResponse.java (84%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Channel/ChannelUpdateRequest.java (81%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Channel/PrivateChannelCreateRequest.java (73%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Channel/PublicChannelCreateRequest.java (70%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Message/MessageCreateRequest.java (74%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/Message/MessageUpdateRequest.java (64%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/ReadStatus/ReadStatusCreateRequest.java (73%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/ReadStatus/ReadStatusUpdateRequest.java (69%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/User/UserCreateRequest.java (83%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/User/UserFindRequest.java (67%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/User/UserResponse.java (76%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/User/UserUpdateRequest.java (84%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/UserStatus/UserStatusCreateRequest.java (71%) rename src/main/java/com/sprint/mission/discodeit/{service => }/dto/UserStatus/UserStatusUpdateRequest.java (69%) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index f1d9105b..4a7d2e43 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -1,5 +1,17 @@ package com.sprint.mission.discodeit; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginRequest; +import com.sprint.mission.discodeit.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.dto.Channel.PublicChannelCreateRequest; +import com.sprint.mission.discodeit.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.dto.User.UserResponse; +import com.sprint.mission.discodeit.dto.User.UserUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ChannelType; import com.sprint.mission.discodeit.entity.Message; @@ -9,18 +21,6 @@ import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; -import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; -import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; -import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; -import com.sprint.mission.discodeit.service.dto.User.UserResponse; -import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; import java.util.List; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -71,7 +71,7 @@ public static void main(String[] args) { AuthLoginReponse authLoginReponse = authService.login(loginRequest); System.out.println(authLoginReponse); System.out.println("\n====== 유저 단일 조회 테스트 ======"); - + UserResponse foundUser = userService.find(UserFindRequest.builder() .userId(user1.getId()) .build()); diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java similarity index 67% rename from src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java index 7a52d5b3..b72a7112 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginReponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.AuthLogin; +package com.sprint.mission.discodeit.dto.AuthLogin; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java similarity index 72% rename from src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java index e4faaca9..d94fc296 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/AuthLogin/AuthLoginRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.AuthLogin; +package com.sprint.mission.discodeit.dto.AuthLogin; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContent/BinaryContentCreateRequest.java similarity index 65% rename from src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/BinaryContent/BinaryContentCreateRequest.java index 555c7c01..abb26e61 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/BinaryContent/BinaryContentCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContent/BinaryContentCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.BinaryContent; +package com.sprint.mission.discodeit.dto.BinaryContent; public record BinaryContentCreateRequest( String fileName, diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelFindRequest.java similarity index 66% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelFindRequest.java index 401f25f1..35e112c1 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelFindRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelFindRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Channel; +package com.sprint.mission.discodeit.dto.Channel; import java.util.UUID; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java similarity index 84% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java index 2570545f..bb07804a 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Channel; +package com.sprint.mission.discodeit.dto.Channel; import com.sprint.mission.discodeit.entity.ChannelType; import java.time.Instant; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelUpdateRequest.java similarity index 81% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelUpdateRequest.java index 75a95e84..b8b66ca4 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/ChannelUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Channel; +package com.sprint.mission.discodeit.dto.Channel; import com.sprint.mission.discodeit.entity.ChannelType; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/PrivateChannelCreateRequest.java similarity index 73% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Channel/PrivateChannelCreateRequest.java index 1ee216d7..b329e2f2 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PrivateChannelCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/PrivateChannelCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Channel; +package com.sprint.mission.discodeit.dto.Channel; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/PublicChannelCreateRequest.java similarity index 70% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Channel/PublicChannelCreateRequest.java index 5715ee50..181a1b05 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Channel/PublicChannelCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/PublicChannelCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Channel; +package com.sprint.mission.discodeit.dto.Channel; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Message/MessageCreateRequest.java similarity index 74% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Message/MessageCreateRequest.java index 5cfa08bd..4d191bef 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Message/MessageCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Message; +package com.sprint.mission.discodeit.dto.Message; import java.util.UUID; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/Message/MessageUpdateRequest.java similarity index 64% rename from src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/Message/MessageUpdateRequest.java index 42a0f0a2..525b316a 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/Message/MessageUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Message/MessageUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.Message; +package com.sprint.mission.discodeit.dto.Message; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusCreateRequest.java similarity index 73% rename from src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusCreateRequest.java index 62358616..5f275480 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.ReadStatus; +package com.sprint.mission.discodeit.dto.ReadStatus; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusUpdateRequest.java similarity index 69% rename from src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusUpdateRequest.java index 35129710..cd6278f7 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/ReadStatus/ReadStatusUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/ReadStatus/ReadStatusUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.ReadStatus; +package com.sprint.mission.discodeit.dto.ReadStatus; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/User/UserCreateRequest.java similarity index 83% rename from src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/User/UserCreateRequest.java index 3d706acb..182faf42 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/User/UserCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.User; +package com.sprint.mission.discodeit.dto.User; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/User/UserFindRequest.java similarity index 67% rename from src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/User/UserFindRequest.java index 5b458e31..e1e40597 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserFindRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/User/UserFindRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.User; +package com.sprint.mission.discodeit.dto.User; import java.util.UUID; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java similarity index 76% rename from src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java index 22d40e67..544fddce 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.User; +package com.sprint.mission.discodeit.dto.User; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/User/UserUpdateRequest.java similarity index 84% rename from src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/User/UserUpdateRequest.java index 56cada11..ea6a670d 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/User/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/User/UserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.User; +package com.sprint.mission.discodeit.dto.User; import java.util.UUID; import lombok.Builder; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusCreateRequest.java similarity index 71% rename from src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusCreateRequest.java index c26da558..a7810ef7 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.UserStatus; +package com.sprint.mission.discodeit.dto.UserStatus; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusUpdateRequest.java similarity index 69% rename from src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusUpdateRequest.java index c1e5cd8b..6886f3d2 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/dto/UserStatus/UserStatusUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserStatus/UserStatusUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.service.dto.UserStatus; +package com.sprint.mission.discodeit.dto.UserStatus; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/AuthService.java b/src/main/java/com/sprint/mission/discodeit/service/AuthService.java index f2b4e584..5fb3cee9 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/AuthService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/AuthService.java @@ -1,7 +1,7 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginRequest; public interface AuthService { public AuthLoginReponse login(AuthLoginRequest request); diff --git a/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java index a5404faa..63e195d0 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java @@ -1,7 +1,7 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.BinaryContent.BinaryContentCreateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; -import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java index b3976fb8..9fcf8822 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,11 +1,11 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.dto.Channel.PublicChannelCreateRequest; import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java index ebe8f4f3..05b5af8a 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -1,9 +1,9 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.BinaryContent.BinaryContentCreateRequest; +import com.sprint.mission.discodeit.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.Message.MessageUpdateRequest; import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; -import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; -import com.sprint.mission.discodeit.service.dto.Message.MessageUpdateRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java index 2ab50631..711eeaad 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java @@ -1,8 +1,8 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.ReadStatus.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.dto.ReadStatus.ReadStatusUpdateRequest; import com.sprint.mission.discodeit.entity.ReadStatus; -import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusCreateRequest; -import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusUpdateRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java index 5d96af36..da3c103c 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,10 +1,10 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.dto.User.UserResponse; +import com.sprint.mission.discodeit.dto.User.UserUpdateRequest; import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; -import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; -import com.sprint.mission.discodeit.service.dto.User.UserResponse; -import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java index e9d10549..39090fc0 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java @@ -1,8 +1,8 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.UserStatus.UserStatusCreateRequest; +import com.sprint.mission.discodeit.dto.UserStatus.UserStatusUpdateRequest; import com.sprint.mission.discodeit.entity.UserStatus; -import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusCreateRequest; -import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusUpdateRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java index 3ec07a32..cf444226 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BaiscUserStatusService.java @@ -1,11 +1,11 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.UserStatus.UserStatusCreateRequest; +import com.sprint.mission.discodeit.dto.UserStatus.UserStatusUpdateRequest; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.repository.UserStatusRepository; import com.sprint.mission.discodeit.service.UserStatusService; -import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusCreateRequest; -import com.sprint.mission.discodeit.service.dto.UserStatus.UserStatusUpdateRequest; import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java index 70cf5a3c..817908aa 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java @@ -1,10 +1,10 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginReponse; +import com.sprint.mission.discodeit.dto.AuthLogin.AuthLoginRequest; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.AuthService; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginReponse; -import com.sprint.mission.discodeit.service.dto.AuthLogin.AuthLoginRequest; import java.util.NoSuchElementException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java index e48acc65..883ff311 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java @@ -1,9 +1,9 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.BinaryContent.BinaryContentCreateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.repository.BinaryContentRepository; import com.sprint.mission.discodeit.service.BinaryContentService; -import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 6fccedfd..07529a61 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -1,5 +1,10 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.Channel.ChannelFindRequest; +import com.sprint.mission.discodeit.dto.Channel.ChannelResponse; +import com.sprint.mission.discodeit.dto.Channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.Channel.PrivateChannelCreateRequest; +import com.sprint.mission.discodeit.dto.Channel.PublicChannelCreateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ChannelType; import com.sprint.mission.discodeit.entity.ReadStatus; @@ -7,11 +12,6 @@ import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.ReadStatusRepository; import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelFindRequest; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelResponse; -import com.sprint.mission.discodeit.service.dto.Channel.ChannelUpdateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PrivateChannelCreateRequest; -import com.sprint.mission.discodeit.service.dto.Channel.PublicChannelCreateRequest; import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java index 5067ac3e..60bc3f73 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java @@ -1,14 +1,14 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.BinaryContent.BinaryContentCreateRequest; +import com.sprint.mission.discodeit.dto.Message.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.Message.MessageUpdateRequest; import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.BinaryContentRepository; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.dto.BinaryContent.BinaryContentCreateRequest; -import com.sprint.mission.discodeit.service.dto.Message.MessageCreateRequest; -import com.sprint.mission.discodeit.service.dto.Message.MessageUpdateRequest; import java.util.List; import java.util.NoSuchElementException; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java index 6eebcc98..866f1b28 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java @@ -1,12 +1,12 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.ReadStatus.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.dto.ReadStatus.ReadStatusUpdateRequest; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.ReadStatusRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.ReadStatusService; -import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusCreateRequest; -import com.sprint.mission.discodeit.service.dto.ReadStatus.ReadStatusUpdateRequest; import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 7320cbf3..478b8e80 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -1,5 +1,9 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.User.UserCreateRequest; +import com.sprint.mission.discodeit.dto.User.UserFindRequest; +import com.sprint.mission.discodeit.dto.User.UserResponse; +import com.sprint.mission.discodeit.dto.User.UserUpdateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; @@ -7,10 +11,6 @@ import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.repository.UserStatusRepository; import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.dto.User.UserCreateRequest; -import com.sprint.mission.discodeit.service.dto.User.UserFindRequest; -import com.sprint.mission.discodeit.service.dto.User.UserResponse; -import com.sprint.mission.discodeit.service.dto.User.UserUpdateRequest; import java.time.Instant; import java.util.List; import java.util.NoSuchElementException; From 06405194bdab3964c1c355028ab80be6a5eb9d87 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 15:22:47 +0900 Subject: [PATCH 10/15] =?UTF-8?q?refactor:=20ChannelType=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=20=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Private 채널만 예외 처리하도록 수정 --- .../com/sprint/mission/discodeit/DiscodeitApplication.java | 1 + .../mission/discodeit/dto/AuthLogin/AuthLoginRequest.java | 2 ++ .../discodeit/service/basic/BasicChannelService.java | 7 ++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 4a7d2e43..39656ce6 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -64,6 +64,7 @@ public static void main(String[] args) { System.out.println("\n====== 유저 로그인 테스트 ======"); AuthLoginRequest loginRequest = AuthLoginRequest.builder() + .id(user1.getId()) .userName(user1CreateRequest.username()) .password(user1CreateRequest.password()) .build(); diff --git a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java index d94fc296..37bc020e 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java @@ -1,8 +1,10 @@ package com.sprint.mission.discodeit.dto.AuthLogin; +import java.util.UUID; import lombok.Builder; public record AuthLoginRequest( + UUID id, String userName, String password ) { diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 07529a61..6d78984d 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -82,6 +82,7 @@ public ChannelResponse find(ChannelFindRequest request) { @Override public List findAllByUserId(UUID userId) { + return channelRepository.findAll().stream() .filter(channel -> { if (channel.getType() == ChannelType.PUBLIC) { @@ -125,10 +126,10 @@ public Channel update(ChannelUpdateRequest request) { Channel channel = channelRepository.findById(request.id()) .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 채널은 없습니다.")); - if (request.type().equals(ChannelType.PUBLIC)) { - channel.update(request.name(), request.description()); - } else { + if (request.type().equals(ChannelType.PRIVATE)) { throw new RuntimeException("Private 채널은 수정할 수 없습니다. "); + } else { + channel.update(request.name(), request.description()); } return channelRepository.save(channel); From f5ee7efef1287daf7b471ee79f02697b8d4e5cee Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 15:37:42 +0900 Subject: [PATCH 11/15] =?UTF-8?q?refactor:=20UserService=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EC=A4=91=EB=B3=B5=20=EA=B2=80=EC=A6=9D=20=EB=B0=A9?= =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/repository/UserRepository.java | 4 ++++ .../repository/file/FileUserRepository.java | 12 ++++++++++++ .../discodeit/repository/jcf/JCFUserRepository.java | 12 ++++++++++++ .../discodeit/service/basic/BasicUserService.java | 13 +++++-------- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java index 6e827449..1054de3a 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -15,4 +15,8 @@ public interface UserRepository { boolean existsById(UUID id); void deleteById(UUID id); + + boolean existsByUsername(String username); + + boolean existsByEmail(String email); } diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java index 199c1b03..95818c09 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -84,6 +84,18 @@ public boolean existsById(UUID id) { return Files.exists(resolvePath(id)); } + @Override + public boolean existsByUsername(String username) { + return findAll().stream() + .anyMatch(user -> user.getUsername().equals(username)); + } + + @Override + public boolean existsByEmail(String email) { + return findAll().stream() + .anyMatch(user -> user.getEmail().equals(email)); + } + @Override public void deleteById(UUID id) { try { diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java index 1ff21ad4..6b44f9cc 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java @@ -42,4 +42,16 @@ public boolean existsById(UUID id) { public void deleteById(UUID id) { store.remove(id); } + + @Override + public boolean existsByUsername(String username) { + return store.values().stream() + .anyMatch(user -> user.getUsername().equals(username)); + } + + @Override + public boolean existsByEmail(String email) { + return store.values().stream() + .anyMatch(user -> user.getEmail().equals(email)); + } } \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 478b8e80..8824d879 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -54,14 +54,11 @@ public User create(UserCreateRequest request) { } private void validateUniqueUser(UserCreateRequest request) { - List users = userRepository.findAll(); - for (User user : users) { - if (user.getUsername().equals(request.username())) { - throw new IllegalArgumentException("이미 존재하는 이름 입니다."); - } - if (user.getEmail().equals(request.email())) { - throw new IllegalArgumentException("이미 존재하는 이메일 입니다."); - } + if (userRepository.existsByUsername(request.username())) { + throw new IllegalArgumentException("이미 존재하는 이름입니다."); + } + if (userRepository.existsByEmail(request.email())) { + throw new IllegalArgumentException("이미 존재하는 이메일입니다."); } } From e0016d73ab1b1c7f662fa9c72dd1b73711809e57 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 16:39:11 +0900 Subject: [PATCH 12/15] =?UTF-8?q?refactor:=20AuthService=20login=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - id 필드 제거 - UserRepository에서 userName으로 user 객체 반환 --- .../dto/AuthLogin/AuthLoginReponse.java | 2 ++ .../dto/AuthLogin/AuthLoginRequest.java | 2 -- .../discodeit/repository/UserRepository.java | 2 ++ .../repository/file/FileUserRepository.java | 19 +++++++++++++++++++ .../repository/jcf/JCFUserRepository.java | 8 ++++++++ .../service/basic/BasicAuthService.java | 14 +++++++------- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java index b72a7112..865ac703 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginReponse.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit.dto.AuthLogin; import java.util.UUID; +import lombok.Builder; +@Builder public record AuthLoginReponse( UUID id, String userName, diff --git a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java index 37bc020e..d94fc296 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/AuthLogin/AuthLoginRequest.java @@ -1,10 +1,8 @@ package com.sprint.mission.discodeit.dto.AuthLogin; -import java.util.UUID; import lombok.Builder; public record AuthLoginRequest( - UUID id, String userName, String password ) { diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java index 1054de3a..54aedc07 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -19,4 +19,6 @@ public interface UserRepository { boolean existsByUsername(String username); boolean existsByEmail(String email); + + Optional findByUserName(String userName); } diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java index 95818c09..ca42e5f1 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -79,6 +79,25 @@ public List findAll() { } } + @Override + public Optional findByUserName(String userName) { + try { + return Files.list(DIRECTORY) + .filter(p -> p.toString().endsWith(EXTENSION)) + .map(path -> { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(path.toFile()))) { + return (User) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + throw new RuntimeException("User 전체 조회 중 오류 발생", e); + } + }) + .filter(u -> u.getUsername().equals(userName)) + .findFirst(); + } catch (IOException e) { + throw new RuntimeException("디렉토리 로드 오류", e); + } + } + @Override public boolean existsById(UUID id) { return Files.exists(resolvePath(id)); diff --git a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java index 6b44f9cc..ba9b68ba 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java @@ -54,4 +54,12 @@ public boolean existsByEmail(String email) { return store.values().stream() .anyMatch(user -> user.getEmail().equals(email)); } + + @Override + public Optional findByUserName(String userName) { + return store.values().stream() + .filter(u -> u.getUsername().equals(userName)) + .findFirst(); + } + } \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java index 817908aa..1bd3b00e 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java @@ -15,15 +15,15 @@ public class BasicAuthService implements AuthService { private final UserRepository userRepository; public AuthLoginReponse login(AuthLoginRequest request) { - User user = userRepository.findById(request.id()) - .orElseThrow(() -> new NoSuchElementException("해당 id를 가진 유저는 없습니다.")); + + User user = userRepository.findByUserName(request.userName()) + .orElseThrow(() -> new NoSuchElementException("해당하는 유저는 존재하지 않습니다.")); if (user.getUsername().equals(request.userName()) && user.getPassword().equals(request.password())) { - return new AuthLoginReponse( - user.getId(), - user.getUsername(), - user.getEmail() - ); + return AuthLoginReponse.builder() + .userName(user.getUsername()) + .email(user.getEmail()) + .build(); } else { throw new IllegalArgumentException("유저이름, 비밀번호가 틀립니다. 프로그램을 종료합니다."); } From 70492c1898ccfab212923eb9aa17db4712a26a4f Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 17:18:11 +0900 Subject: [PATCH 13/15] =?UTF-8?q?refactor:=20ChannelService=20findAllByUse?= =?UTF-8?q?rId=20=EA=B0=9C=EC=84=A0=20=EB=B0=8F=20ChannelResponse=EC=97=90?= =?UTF-8?q?=20Builder=20=ED=8C=A8=ED=84=B4=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/Channel/ChannelResponse.java | 2 + .../service/basic/BasicChannelService.java | 67 ++++++++++--------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java index bb07804a..7e0e0e0d 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Channel/ChannelResponse.java @@ -4,7 +4,9 @@ import java.time.Instant; import java.util.List; import java.util.UUID; +import lombok.Builder; +@Builder public record ChannelResponse( UUID id, ChannelType type, diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 6d78984d..710bbd80 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -7,6 +7,7 @@ import com.sprint.mission.discodeit.dto.Channel.PublicChannelCreateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ChannelType; +import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.MessageRepository; @@ -82,44 +83,44 @@ public ChannelResponse find(ChannelFindRequest request) { @Override public List findAllByUserId(UUID userId) { + List mySubscribedChannelIds = readStatusRepository.findAllByUserId(userId).stream() + .map(ReadStatus::getChannelId) + .toList(); return channelRepository.findAll().stream() - .filter(channel -> { - if (channel.getType() == ChannelType.PUBLIC) { - return true; - } - List participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() - .map(ReadStatus::getUserId) - .toList(); - - return participantIds.contains(userId); - }) - .map(channel -> { - Instant recentMessageAt = readStatusRepository.findAllByChannelId(channel.getId()).stream() - .map(ReadStatus::getLastReadAt) - .filter(Objects::nonNull) - .max(Instant::compareTo) - .orElse(null); - - List participantIds = null; - if (channel.getType() == ChannelType.PRIVATE) { - participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() - .map(ReadStatus::getUserId) - .toList(); - } - - return new ChannelResponse( - channel.getId(), - channel.getType(), - channel.getName(), - channel.getDescription(), - recentMessageAt, - participantIds - ); - }) + .filter(channel -> + channel.getType() == ChannelType.PUBLIC + || mySubscribedChannelIds.contains(channel.getId()) + ) + .map(this::toResponse) .toList(); } + private ChannelResponse toResponse(Channel channel) { + + Instant lastMessageAt = messageRepository.findAllByChannelId(channel.getId()).stream() + .map(Message::getCreatedAt) + .filter(Objects::nonNull) + .max(Instant::compareTo) + .orElse(null); + + List participantIds = null; + if (channel.getType() == ChannelType.PRIVATE) { + participantIds = readStatusRepository.findAllByChannelId(channel.getId()).stream() + .map(ReadStatus::getUserId) + .toList(); + } + + return ChannelResponse.builder() + .id(channel.getId()) + .type(channel.getType()) + .name(channel.getName()) + .description(channel.getDescription()) + .lastMessageAt(lastMessageAt) + .participantIds(participantIds) + .build(); + } + @Override public Channel update(ChannelUpdateRequest request) { From eb05645a4a7eca356c74d02c26ef28c983c58376 Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 17:22:03 +0900 Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20DiscodeitApplication=EC=9D=98?= =?UTF-8?q?=20AuthService=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - id 제거 --- .../java/com/sprint/mission/discodeit/DiscodeitApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 39656ce6..4a7d2e43 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -64,7 +64,6 @@ public static void main(String[] args) { System.out.println("\n====== 유저 로그인 테스트 ======"); AuthLoginRequest loginRequest = AuthLoginRequest.builder() - .id(user1.getId()) .userName(user1CreateRequest.username()) .password(user1CreateRequest.password()) .build(); From e571a6db6f12a8f231c23eb06637724fc60f99db Mon Sep 17 00:00:00 2001 From: barrackkk Date: Thu, 8 May 2025 17:32:03 +0900 Subject: [PATCH 15/15] =?UTF-8?q?refactor:=20Builder=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/dto/User/UserResponse.java | 4 ++- .../service/basic/BasicChannelService.java | 32 +++++++++---------- .../service/basic/BasicUserService.java | 28 ++++++++-------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java index 544fddce..6dbc973c 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/User/UserResponse.java @@ -1,12 +1,14 @@ package com.sprint.mission.discodeit.dto.User; import java.util.UUID; +import lombok.Builder; +@Builder public record UserResponse( UUID id, String username, String email, boolean isOnline, - boolean profileImage + boolean hasProfileImage ) { } \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java index 710bbd80..4006fd0f 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -59,23 +59,23 @@ public ChannelResponse find(ChannelFindRequest request) { .toList(); if (channel.getType().equals(ChannelType.PUBLIC)) { - return new ChannelResponse( - channel.getId(), - channel.getType(), - channel.getName(), - channel.getDescription(), - recentMessageAt, - null - ); + return ChannelResponse.builder() + .id(channel.getId()) + .type(channel.getType()) + .name(channel.getName()) + .description(channel.getDescription()) + .lastMessageAt(recentMessageAt) + .participantIds(null) + .build(); } else { - return new ChannelResponse( - channel.getId(), - channel.getType(), - channel.getName(), - channel.getDescription(), - recentMessageAt, - participantIds - ); + return ChannelResponse.builder() + .id(channel.getId()) + .type(channel.getType()) + .name(channel.getName()) + .description(channel.getDescription()) + .lastMessageAt(recentMessageAt) + .participantIds(participantIds) + .build(); } } diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java index 8824d879..4f7460f6 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -71,13 +71,13 @@ public UserResponse find(UserFindRequest request) { .map(status -> status.getUpdatedAt().isAfter(Instant.now().minusSeconds(300))) .orElse(false); - return new UserResponse( - user.getId(), - user.getUsername(), - user.getEmail(), - isOnline, - user.isHasProfileImage() - ); + return UserResponse.builder() + .id(user.getId()) + .username(user.getUsername()) + .email(user.getEmail()) + .isOnline(isOnline) + .hasProfileImage(user.isHasProfileImage()) + .build(); } @Override @@ -88,13 +88,13 @@ public List findAll() { .map(status -> status.getUpdatedAt().isAfter(Instant.now().minusSeconds(300))) .orElse(false); - return new UserResponse( - user.getId(), - user.getUsername(), - user.getEmail(), - isOnline, - user.isHasProfileImage() - ); + return UserResponse.builder() + .id(user.getId()) + .username(user.getUsername()) + .email(user.getEmail()) + .isOnline(isOnline) + .hasProfileImage(user.isHasProfileImage()) + .build(); }) .toList(); }