From ae0a6d688e567ad9b4897930efedc8331de3bb6f Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Wed, 23 Apr 2025 15:47:49 +0900 Subject: [PATCH 01/33] =?UTF-8?q?feat:=20Repo,=20Service=20Bean=EB=93=B1?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 28 +- build.gradle | 33 +- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 43 +- gradlew.bat | 37 +- settings.gradle | 3 +- .../discodeit/DiscodeitApplication.java | 373 ++++++++++++++++++ .../file/FileChannelRepository.java | 2 + .../file/FileMessageRepository.java | 2 + .../repository/file/FileUserRepository.java | 2 + .../service/basic/BasicChannelService.java | 2 + .../service/basic/BasicMessageService.java | 2 + .../service/basic/BasicUserService.java | 2 + .../service/file/FileChannelService.java | 1 - src/main/resources/application.yaml | 1 + .../discodeit/DiscodeitApplicationTests.java | 13 + 18 files changed, 493 insertions(+), 59 deletions(-) create mode 100644 .gitattributes create mode 100644 src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.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 de9480dd..c2065bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,11 @@ +HELP.md .gradle -.idea/ 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 @@ -29,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/ @@ -38,6 +35,3 @@ bin/ ### VS Code ### .vscode/ - -### Mac OS ### -.DS_Store \ 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 107acd32..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @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 +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -56,11 +59,11 @@ 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. +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 @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 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/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java new file mode 100644 index 00000000..1b8f97d8 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -0,0 +1,373 @@ +package com.sprint.mission.discodeit; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.factory.ServiceFactory; +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.util.DataInitializer; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.*; +import java.util.stream.Collectors; + +@SpringBootApplication +public class DiscodeitApplication { + + public static void main(String[] args) { + SpringApplication.run(DiscodeitApplication.class, args); + + //초기화 + DataInitializer.clearSerializedData(); + + ServiceFactory serviceFactory = ServiceFactory.getInstance(); + + ChannelService channelService = serviceFactory.createChannelService(); + UserService userService = serviceFactory.createUserService(); + MessageService messageService = serviceFactory.createMessageService(); + + + List users = createAndRegisterUsers(userService); + List channels = createAndRegisterChannels(channelService, users); + List messages = createAndRegisterMessages(messageService, users, channels); + + demonstrateUserOperations(userService, users); + demonstrateChannelOperations(channelService, channels,users); + demonstrateMessageOperations(messageService); + + } + + //유저생성 및 등록 + private static List createAndRegisterUsers(UserService userService) { + List users = List.of( + new User("조현아", "여", "akbkck8101@gmail.com", "010-6658-8101", "2701"), + new User("신짱구", "남", "zzang9@gmail.com", "010-1234-5678", "9999"), + new User("김철슈", "남", "steelwater@naver.com", "010-0000-0000", "steelwater"), + new User("이훈이", "남", "2hun2@naver.com", "010-2345-6789", "2hun222"), + new User("맹구", "남", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), + new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345"), + new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) + ); + + System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n."); + + List registeredUsers = users.stream() + .filter(user -> { + try { + userService.create(user); + System.out.println("유저 등록 완료: " + user.getName()); + return true; + } catch (IllegalArgumentException e) { + System.out.println("!!유저 등록 실패!! " + e.getMessage()); + return false; + } + }) + .toList(); + + System.out.println(".\n.\n<--------------------유저 등록 종료---------------------------->\n"); + return registeredUsers; + } + + //채널,멤버,카테고리 생성 및 등록 + private static List createAndRegisterChannels(ChannelService channelService, List users) { + //채널1 멤버, 카테고리생성 + Set members1 = new HashSet<>(Set.of(users.get(0), users.get(1), users.get(3))); + List cat1 = List.of("공지", "질문", "2팀"); + + Set members2 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4))); + List cat2 = List.of("이벤트", "소통"); + + Set members3 = new HashSet<>(Set.of(users.get(5))); + List cat3 = List.of("기타"); + + //중복 카테고리 + List cat5 = List.of("공지","공지"); + + List channels = List.of( + new Channel("sp01", users.get(1), cat1, members1), + new Channel("sp02", users.get(1), cat2, members2), + new Channel("sp03", users.get(5), cat3, members3), + new Channel("sp03", users.get(5), cat3, members3), //중복 채널명_ex) + new Channel("sp05", users.get(5), cat5, members3) //중복 카테고리_ex) + ); + + System.out.println("<--------------------채널을 등록합니다------------------------->\n.\n."); + + List registeredChannels = channels.stream() + .filter(channel -> { + try { + channelService.create(channel); + System.out.println("채널 등록 완료: " + channel.getChannelName()); + return true; + } catch (IllegalArgumentException e) { + System.out.println("!!채널 등록 실패!! " + e.getMessage()); + return false; + } + }) + .toList(); // 성공한 채널만 리스트로 변환 + + System.out.println(".\n.\n<--------------------채널 등록 종료---------------------------->\n"); + return registeredChannels; + } + + //메시지 생성 및 등록 + private static List createAndRegisterMessages(MessageService messageService, List users, List channels) { + List messages = List.of( + new Message(users.get(0), channels.get(0), "공지", "공지입니다."), + new Message(users.get(1), channels.get(0), "2팀", "안녕하세요."), + new Message(users.get(4), channels.get(1), "소통", "소통해요"), + new Message(users.get(2), channels.get(1), "소통", "좋아요"), + new Message(users.get(5), channels.get(1), "소통", "hi"), //채널 멤버가 아닌 유저 + new Message(users.get(0), channels.get(0), "공자", "hi") //채널에 없는 카테고리 + ); + + System.out.println("<--------------------메시지를 저장합니다----------------------->\n.\n."); + + List registeredMessages = messages.stream() + .map(message -> { + try { + messageService.create(message); + System.out.println("[" + message.getChannel().getChannelName() + "] 채널에 메시지 등록 완료"); + return message; + } catch (IllegalArgumentException e) { + System.out.println("!!메시지 등록 실패!! " + e.getMessage()); + return null; + } + }) + .filter(Objects::nonNull) // null 제거 (등록 실패한 메시지 필터링) + .collect(Collectors.toList()); + + System.out.println(".\n.\n<--------------------메시지 저장 종료-------------------------->\n"); + return registeredMessages; + } + + + private static void demonstrateUserOperations(UserService userService, List users){ + System.out.println("\n########################### User ###############################"); + + readUser(userService, users); + updateUser(userService, users); + deleteUser(userService, users); + + } + + private static void readUser(UserService userService, List users){ + System.out.println("------------------------- ReadUser -----------------------------"); + //전체 유저조회(다건 조회) + System.out.println("\n전체 유저 목록: "); + userService.readAll().forEach(System.out::println); + + //특정 유저조회(단건 조회, 이름) + System.out.println("\n신짱구 유저 조회(이름으로 검색): "); + userService.readByName("신짱구").forEach(System.out::println); + + //특정 유저조회(단건 조회, id) + System.out.println("\n이훈이 유저 조회(id로 검색): "); + System.out.println(userService.read(users.get(3).getId()).toString()); + + //이름에 "구"가 포함된 유저 + System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); + userService.readByName("구").forEach(System.out::println); + } + private static void updateUser(UserService userService, List users){ + System.out.println("\n------------------------- UpdateUser ---------------------------"); + //유저 수정 테스트 + System.out.println("\n유저 수정하기\n수정 전: "); + + //수정하려는 유저 original에 저장 + User original = users.get(2); + System.out.println(userService.read(original.getId())); + + //수정한 유저정보 updated에 저장 + User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword())); + System.out.println("수정 후(이름, 번호): "); + System.out.println(userService.read(updated.getId())); + } + private static void deleteUser(UserService userService, List users){ + System.out.println("\n------------------------ DeleteUser ----------------------------"); + System.out.println("\n전체 유저 목록: "); + userService.readAll().forEach(System.out::println); + + //유저 삭제 실패 + System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); + userService.delete(users.get(3).getId(),"0000"); + + //유저 삭제 성공 + System.out.println("\n"+ users.get(3).getName() +"유저 탈퇴 진행중..\n.\n.\n"); + userService.delete(users.get(3).getId(),"2hun222"); + + //삭제 후 전체 유저 조회 + System.out.println("\n\n전체 유저 목록: "); + userService.readAll().forEach(System.out::println); + System.out.println(); + } + + private static void demonstrateChannelOperations(ChannelService channelService, List channels, List users) { + System.out.println("\n########################### Channel ############################"); + + readChannel(channelService,channels,users); + updateChannel(channelService,channels,users); + deleteChannel(channelService,channels,users); + } + + private static void readChannel(ChannelService channelService, List channels, List users){ + System.out.println("------------------------- ReadChannel --------------------------"); + System.out.println("\n전체 채널 목록"); + + if (channelService.readAll().isEmpty()) { + System.out.println("조회할 채널이 없습니다."); + } else { + channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); + } + + + //특정 채널 정보 + try { + Channel channel = channelService.read(channels.get(0).getId()); + System.out.println("\n채널명: " + channel.getChannelName()); + System.out.println("카테고리: " + channel.getCategory()); + + } catch (IllegalArgumentException e) { + System.out.println("!!채널 조회 실패!! " + e.getMessage()); + } + + //채널 멤버조회 + try { + System.out.print("\n[sp01] 채널 멤버: "); + for (User member : channelService.members(channels.get(0).getId())) { + System.out.print(member.getName() + " "); + } + } catch (IllegalArgumentException e) { + System.out.println("!!채널 조회 실패!! " + e.getMessage()); + } + System.out.println(); + } + private static void updateChannel(ChannelService channelService, List channels, List users){ + System.out.println("\n------------------------- UpdateChannel -----------------------"); + + //채널 수정 + Channel original = channels.get(2); //수정하려는 채널 + + System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); + System.out.println("수정 전: " + channelService.read(original.getId())); + + //수정한 채널 updated에 저장, 출력(채널명 수정) + try { + Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); + System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + } catch (IllegalArgumentException e) { + System.out.println("!!채널 수정 실패!! " + e.getMessage()); + } + + //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) + System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); + System.out.println("수정 전: " + channelService.read(original.getId())); + + try { + Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); + System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + } catch (IllegalArgumentException e) { + System.out.println("!!채널 수정 실패!! " + e.getMessage()); + } + + //기존 유저에서 방장변경 + //채널1에서 변경 + original = channels.get(0); + System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); + System.out.println("수정 전: " + channelService.read(original.getId())); + + try { + Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); + System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + } catch (IllegalArgumentException e) { + System.out.println("!!채널 수정 실패!! " + e.getMessage()); + } + + } + private static void deleteChannel(ChannelService channelService, List channels, List users){ + System.out.println("\n------------------------ DeleteChannel ------------------------"); + + System.out.print("\n전체 채널 목록: \n"); + channelService.readAll().forEach(System.out::println); + + //채널 삭제 실패 + System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); + channelService.delete(channels.get(2).getId(), users.get(1), "0000"); + + //채널 삭제 성공 + System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); + channelService.delete(channels.get(2).getId(), users.get(1), "9999"); + + //삭제 후 전체 유저 조회 + System.out.print("\n전체 채널 목록: \n"); + channelService.readAll().forEach(System.out::println); + + } + + private static void demonstrateMessageOperations(MessageService messageService) { + System.out.println("\n########################### Message ###########################"); + + readMessages(messageService); + updateMessages(messageService); + deleteMessages(messageService); + } + + private static void readMessages(MessageService messageService) { + System.out.println("------------------------- ReadMessage -------------------------"); + //메시지 전체조회(다건 조회) + System.out.println("\n전체 메시지"); + messageService.readAll().forEach(System.out::println); + + //메시지3 조회(단건 조회) + try{ + System.out.println("\n메시지 조회"); + System.out.println(messageService.read(messageService.readAll().get(2).getId())); + + } catch (IllegalArgumentException e) { + System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); + + } + + //존재하지 않는 메시지 조회 + try{ + System.out.println("\n메시지 조회"); + System.out.println(messageService.read(UUID.randomUUID())); + } catch (IllegalArgumentException e) { + System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); + } + } + private static void updateMessages(MessageService messageService) { + System.out.println("\n------------------------- UpdateMessage ------------------------"); + //수정할 메시지 original변수에 저장 + Message original = messageService.read(messageService.readAll().get(0).getId()); + System.out.println("\n메시지1 수정 전: \n" + messageService.read(original.getId())); + + //변경 메시지 updated변수에 저장 + Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); + + //메시지 수정 + messageService.update(original.getId(), updated); + System.out.println("\n메시지1 수정 후: \n" + messageService.read(original.getId())); + + //수정후 전체 메시지 + System.out.println("\n전체 메시지"); + messageService.readAll().forEach(System.out::println); + } + private static void deleteMessages(MessageService messageService) { + System.out.println("\n------------------------ DeleteMessage ------------------------"); + //메시지 삭제 + System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); + messageService.delete(messageService.readAll().get(3).getId()); + + //메시지 삭제 후 재조회 + System.out.print("삭제 후 전체 메시지: \n"); + messageService.readAll().forEach(System.out::println); + } +} + 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 090f2b80..b1d3b9ec 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 @@ -4,6 +4,7 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.util.DataInitializer; +import org.springframework.stereotype.Repository; import java.io.*; import java.util.*; @@ -11,6 +12,7 @@ import static com.sprint.mission.discodeit.util.DataInitializer.*; +@Repository public class FileChannelRepository implements ChannelRepository { private final String FILE_PATH = CHANNEL_FILE_PATH; 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 2be15b46..2c2959fe 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 @@ -4,12 +4,14 @@ import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.UserRepository; +import org.springframework.stereotype.Repository; import static com.sprint.mission.discodeit.util.DataInitializer.*; import java.io.*; import java.util.*; +@Repository public class FileMessageRepository implements MessageRepository { private static final long serialVersionUID = 1L; 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 efbd2799..394f37cf 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 @@ -3,6 +3,7 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; +import org.springframework.stereotype.Repository; import static com.sprint.mission.discodeit.util.DataInitializer.*; @@ -10,6 +11,7 @@ import java.util.*; import java.util.stream.Collectors; +@Repository public class FileUserRepository implements UserRepository { private static final long serialVersionUID = 1L; 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 9bab5cfd..ad3a0630 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 @@ -5,9 +5,11 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; +import org.springframework.stereotype.Service; import java.util.*; +@Service public class BasicChannelService implements ChannelService { private final ChannelRepository channelRepository; 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 3db3b2f3..5903b190 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 @@ -6,10 +6,12 @@ import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.MessageService; +import org.springframework.stereotype.Service; import java.util.List; import java.util.UUID; +@Service public class BasicMessageService implements MessageService { private final MessageRepository messageRepository; private final UserRepository userRepository; 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 0bad1511..00c59f79 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 @@ -5,9 +5,11 @@ import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.UserService; +import org.springframework.stereotype.Service; import java.util.*; +@Service public class BasicUserService implements UserService { private final ChannelRepository channelRepository; private final UserRepository userRepository; 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 index b316318c..002e46aa 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java @@ -13,7 +13,6 @@ import static com.sprint.mission.discodeit.util.DataInitializer.*; - public class FileChannelService implements ChannelService { private final String FILE_PATH = CHANNEL_FILE_PATH; private Map data = loadData(); 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 e90a94eb3a64df9c6ed38540ea6fed26062b9f7a Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Wed, 23 Apr 2025 17:49:23 +0900 Subject: [PATCH 02/33] =?UTF-8?q?feat:=20springContext=EB=A1=9C=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94,@getter,@RequiredArgsConstructor?= =?UTF-8?q?=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 13 ++-- .../mission/discodeit/entity/Message.java | 52 +-------------- .../sprint/mission/discodeit/entity/User.java | 63 +------------------ .../service/basic/BasicChannelService.java | 6 +- .../service/basic/BasicMessageService.java | 8 +-- .../service/basic/BasicUserService.java | 7 +-- 6 files changed, 19 insertions(+), 130 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 1b8f97d8..3f4b21c8 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -3,13 +3,13 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.factory.ServiceFactory; 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.util.DataInitializer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; import java.util.*; import java.util.stream.Collectors; @@ -18,16 +18,17 @@ public class DiscodeitApplication { public static void main(String[] args) { - SpringApplication.run(DiscodeitApplication.class, args); + ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); //초기화 DataInitializer.clearSerializedData(); - ServiceFactory serviceFactory = ServiceFactory.getInstance(); +// ServiceFactory serviceFactory = ServiceFactory.getInstance(); - ChannelService channelService = serviceFactory.createChannelService(); - UserService userService = serviceFactory.createUserService(); - MessageService messageService = serviceFactory.createMessageService(); + //콩받기 + UserService userService = context.getBean(UserService.class); + ChannelService channelService = context.getBean(ChannelService.class); + MessageService messageService = context.getBean(MessageService.class); List users = createAndRegisterUsers(userService); 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 c347ae66..dff681d2 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -1,10 +1,13 @@ package com.sprint.mission.discodeit.entity; +import lombok.Getter; + import java.io.Serializable; import java.util.List; import java.util.Set; import java.util.UUID; +@Getter public class Message implements Serializable { private static final long serialVersionUID = 1L; @@ -27,55 +30,6 @@ public Message(User sender,Channel channel, String category, String content) { } - public UUID getId() { - return id; - } - - public User getSender() { - return sender; - } - public void setSender(User sender) { - this.sender = sender; - } - - public Channel getChannel() { - return channel; - } - public void setChannel(Channel channel) { - this.channel = channel; - } - - public String getCategory() {return category;} - public void setCategory(String category) { - this.category = category; - } - - public long getCreatedAt() { - return createdAt; - } - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } - - public String getContent() { - return content; - } - public void setContent(String content) { - this.content = content; - } - - public long getUpdatedAt() { - return updatedAt; - } - public void setUpdatedAt(long updatedAt) { - this.updatedAt = updatedAt; - } - - public void update(Message updateMessageData) { - this.content = updateMessageData.content; - this.updatedAt = System.currentTimeMillis(); - } - public void validateContent() { if (content == null || content.trim().isEmpty()) { throw new IllegalArgumentException("메시지 내용은 비어있을 수 없습니다."); 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 4b7e7871..92ca9c30 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -1,10 +1,13 @@ package com.sprint.mission.discodeit.entity; +import lombok.Getter; + import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.UUID; +@Getter public class User implements Serializable { private static final long serialVersionUID = 1L; @@ -28,66 +31,6 @@ public User(String name, String gender, String email, String phone, String passw this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 } - public UUID getId() { - return id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getGender() { - return gender; - } - - public void setGender(String gender) { - this.gender = gender; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } - - public long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(long updatedAt) { - this.updatedAt = updatedAt; - } - @Override public int hashCode() { return id.hashCode(); 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 ad3a0630..e1469680 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 @@ -5,18 +5,16 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.*; @Service +@RequiredArgsConstructor public class BasicChannelService implements ChannelService { private final ChannelRepository channelRepository; - public BasicChannelService(ChannelRepository channelRepository) { - this.channelRepository = channelRepository; - } - @Override public void create(Channel channel) { validateDuplicateChannelName(channel); 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 5903b190..6b5dce3a 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 @@ -6,23 +6,19 @@ import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.MessageService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; import java.util.UUID; @Service +@RequiredArgsConstructor public class BasicMessageService implements MessageService { private final MessageRepository messageRepository; private final UserRepository userRepository; private final ChannelRepository channelRepository; - public BasicMessageService(MessageRepository messageRepository, UserRepository userRepository, ChannelRepository channelRepository) { - this.messageRepository = messageRepository; - this.userRepository = userRepository; - this.channelRepository = channelRepository; - } - @Override public void create(Message message) { Channel channel = message.getChannel(); 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 00c59f79..32c25a64 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 @@ -5,20 +5,17 @@ import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.UserService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.*; @Service +@RequiredArgsConstructor public class BasicUserService implements UserService { private final ChannelRepository channelRepository; private final UserRepository userRepository; - public BasicUserService(ChannelRepository channelRepository, UserRepository userRepository) { - this.channelRepository = channelRepository; - this.userRepository = userRepository; - } - @Override public void create(User user) { validateDuplicateEmail(user); From 5c8b38723fe0bb6107f34cca76adc69990b2f54e Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Wed, 23 Apr 2025 17:53:25 +0900 Subject: [PATCH 03/33] =?UTF-8?q?feat:=20channel=EC=9D=98=20@Getter?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/Channel.java | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) 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 eac0e57c..a3377ae4 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -1,9 +1,12 @@ package com.sprint.mission.discodeit.entity; +import lombok.Getter; + import java.io.Serializable; import java.util.*; import java.util.stream.Collectors; +@Getter public class Channel implements Serializable { private static final long serialVersionUID = 1L; @@ -28,53 +31,6 @@ public Channel(String channelName, User keyUser, List categories, Set getCategory() { - return categories; - } - - public void setCategory(List categories) { - this.categories = categories; - } - - public Set getMembers() { - return members; - } - public void setMembers(Set members) { - this.members = members; - } - - public long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(long createdAt) { - this.createdAt = createdAt; - } - - public long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(long updatedAt) { - this.updatedAt = updatedAt; - } - - public User getKeyUser() { - return keyUser; - } - public void addMember(User user) { members.add(user); } From 491aef01ef432ec5093778e75d9cd9ab6183bbbf Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Wed, 23 Apr 2025 18:45:08 +0900 Subject: [PATCH 04/33] =?UTF-8?q?refactor:=20Instant=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=9C=BC=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 --- .../com/sprint/mission/discodeit/entity/Channel.java | 9 +++++---- .../com/sprint/mission/discodeit/entity/Message.java | 12 +++++++++--- .../com/sprint/mission/discodeit/entity/User.java | 9 +++++---- 3 files changed, 19 insertions(+), 11 deletions(-) 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 a3377ae4..b21dfe42 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -3,6 +3,7 @@ import lombok.Getter; import java.io.Serializable; +import java.time.Instant; import java.util.*; import java.util.stream.Collectors; @@ -15,8 +16,8 @@ public class Channel implements Serializable { private User keyUser; private List categories; private Set members; - private long createdAt; - private long updatedAt; + private Instant createdAt; + private Instant updatedAt; public Channel(String channelName, User keyUser, List categories, Set members) { this.id = UUID.randomUUID(); @@ -27,7 +28,7 @@ public Channel(String channelName, User keyUser, List categories, Set(members); this.members.add(keyUser); - this.createdAt = System.currentTimeMillis(); + this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 } @@ -40,7 +41,7 @@ public void update(Channel updateChannelData) { this.keyUser = updateChannelData.keyUser; this.categories = new ArrayList<>(updateChannelData.categories); this.members = new HashSet<>(updateChannelData.members); - this.updatedAt = System.currentTimeMillis(); + this.updatedAt = Instant.now(); } //채널 멤버가 아닌 유저가 메시지 생성시 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 dff681d2..68422e91 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -3,6 +3,7 @@ import lombok.Getter; import java.io.Serializable; +import java.time.Instant; import java.util.List; import java.util.Set; import java.util.UUID; @@ -16,8 +17,8 @@ public class Message implements Serializable { private Channel channel; private String category; private String content; //내용 - private long createdAt; - private long updatedAt; + private Instant createdAt; + private Instant updatedAt; public Message(User sender,Channel channel, String category, String content) { this.id = UUID.randomUUID(); @@ -25,11 +26,16 @@ public Message(User sender,Channel channel, String category, String content) { this.channel = channel; this.category = category; this.content = content; - this.createdAt = System.currentTimeMillis(); + this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 } + public void update(Message updateMessageData) { + this.content = updateMessageData.content; + this.updatedAt = Instant.now(); + } + public void validateContent() { if (content == null || content.trim().isEmpty()) { throw new IllegalArgumentException("메시지 내용은 비어있을 수 없습니다."); 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 92ca9c30..0d7be296 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -3,6 +3,7 @@ import lombok.Getter; import java.io.Serializable; +import java.time.Instant; import java.util.ArrayList; import java.util.HashSet; import java.util.UUID; @@ -17,8 +18,8 @@ public class User implements Serializable { private String email; private String phone; private transient String password; - private long createdAt; - private long updatedAt; + private Instant createdAt; + private Instant updatedAt; public User(String name, String gender, String email, String phone, String password) { this.id = UUID.randomUUID(); @@ -27,7 +28,7 @@ public User(String name, String gender, String email, String phone, String passw this.email = email; this.phone = phone; this.password = password; - this.createdAt = System.currentTimeMillis(); + this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 } @@ -49,7 +50,7 @@ public void update(User updateUserData) { this.email = updateUserData.email; this.phone = updateUserData.phone; this.password = updateUserData.password; - this.updatedAt = System.currentTimeMillis(); + this.updatedAt = Instant.now(); } public String toString() { From 82f03acbb4a246c943c0fa0600d842b914bfc986 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 14:27:02 +0900 Subject: [PATCH 05/33] =?UTF-8?q?feat:=20UserStatus=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/UserStatus.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java 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..e7ee7dc4 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -0,0 +1,51 @@ +package com.sprint.mission.discodeit.entity; + +import lombok.Getter; + +import java.time.Duration; +import java.time.Instant; +import java.util.UUID; + +/*사용자 별 마지막으로 확인된 접속시간 표현(사용자의 온라인 상태 확인) +* 마지막 접속 시간이 현재시간으로 부터 5분이내일때 접속중인 유저로 간주 +* 접속중인 유저 = 현재 로그인한 유저로 판단 +* +* 헷갈린다 updateAt을 마지막 접속시간으로 쓰면 안되는 것?? +* +* updatedAt은 객체의 마지막 수정 시간(상태메시지, 로그인 등) +* lastOnlineTime은 사용자가 언제 마지막으로 접속했는가?? +* 나중에 메소드 추가를 위해? 분리하는 것이 좋다?*/ +@Getter +public class UserStatus { + private UUID id; + private UUID userId; //User에서도 userId로 변경하는게 좋을까? + private Instant lastOnlineTime; + + private Instant createdAt; + private Instant updatedAt; + + public UserStatus(UUID userId, Instant lastOnlineTime) { + this.id = UUID.randomUUID(); + this.userId = userId; + this.lastOnlineTime = lastOnlineTime; + this.createdAt = Instant.now(); + this.updatedAt = createdAt; + } + + //lastOnlineTime update + public void updatelastOnline() { + this.lastOnlineTime = Instant.now(); + this.updatedAt = Instant.now(); + } + + //지금 온라인 상태인지?(5분 이내 인지) + public boolean isOnlineNow() { + if (lastOnlineTime == null) { + return false; + } + + Duration duration = Duration.between(lastOnlineTime, Instant.now()); + + return duration.toMinutes() <= 5; + } +} From 4ef5d226bf34eba9c89f1376ef5600bdbe55b21b Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 14:27:19 +0900 Subject: [PATCH 06/33] =?UTF-8?q?feat:=20ReadStatus=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/ReadStatus.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java 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..58a560d7 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -0,0 +1,33 @@ +package com.sprint.mission.discodeit.entity; + +import lombok.Getter; + +import java.time.Instant; +import java.util.UUID; + +/*사용자가 채널 별 마지막으로 메시지를 읽은 시간을 표현 하는 도메인 +* 사용자별 각 채널에 읽지 않은 메시지 확인하기 +* 메시지를 읽음 -> updatedAt 시간이 현재 시간으로*/ +@Getter +public class ReadStatus { + private UUID id; + private UUID userId; + private UUID channelId; + private Instant lastReadTime; + + private Instant createdAt; + private Instant updatedAt; + + public ReadStatus(UUID userId, UUID channelId, Instant createdAt, Instant updatedAt) { + this.id = UUID.randomUUID(); + this.userId = userId; + this.channelId = channelId; + this.createdAt = Instant.now(); + this.updatedAt = createdAt; + } + + public void updateLastReadTime(Instant newReadTime) { + this.lastReadTime = newReadTime; + this.updatedAt = Instant.now(); + } +} From a9faf2dce16275d989c2c3de03b0cab2ecfca30f Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 14:37:41 +0900 Subject: [PATCH 07/33] =?UTF-8?q?feat:=20BinaryStatus=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/entity/BinaryContent.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.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..7eee1af8 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -0,0 +1,31 @@ +package com.sprint.mission.discodeit.entity; + +import lombok.Getter; + +import java.time.Instant; +import java.util.UUID; + +/*바이너리 데이터 표현 도메인 +* 프로필이미지, 메시지 첨부 파일 저장하기 위해 +* 수정불가한 도메인 +* */ +@Getter +public class BinaryContent { + private final UUID id; + private final UUID userId; + private final UUID messageId; + + private final byte[] content; + private final String contentType; + + private final Instant createdAt; + + public BinaryContent(UUID userId, UUID messageId, byte[] content, String contentType, Instant createdAt) { + this.id = UUID.randomUUID(); + this.userId = userId; + this.messageId = messageId; + this.content = content; + this.contentType = contentType; + this.createdAt = Instant.now(); + } +} From 121e8605bf5a658091375bd416ec06e3fdd7f974 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 14:48:07 +0900 Subject: [PATCH 08/33] =?UTF-8?q?feat:=20UserStatusRepository=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/BinaryContentRepository.java | 4 ++++ .../repository/ReadStatusRepository.java | 4 ++++ .../repository/UserStatusRepository.java | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+) 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 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..88eb73b6 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.repository; + +public interface BinaryContentRepository { +} 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..349a0491 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.repository; + +public interface ReadStatusRepository { +} 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..bb4ea4f1 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -0,0 +1,23 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.entity.UserStatus; + +import java.util.List; +import java.util.UUID; + +public interface UserStatusRepository { + public void create(UserStatus userstatus); + + public UserStatus read(UUID id); + + public List readAll(); + + public UserStatus update(UserStatus userstatus); + + public UserStatus delete(UUID id); + + public void deleteByUserId(UUID userId); + + public UserStatus readByUserId(UUID userId); +} From 7fa5780f1c071e212eb73d16ae544f747af0756f Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 16:26:56 +0900 Subject: [PATCH 09/33] =?UTF-8?q?feat:=20ReadStatusRepository=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ReadStatusRepository.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java index 349a0491..cedcf27c 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java @@ -1,4 +1,27 @@ package com.sprint.mission.discodeit.repository; +import com.sprint.mission.discodeit.entity.ReadStatus; + +import java.util.List; +import java.util.UUID; + public interface ReadStatusRepository { + public void create(ReadStatus readStatus); + + public ReadStatus read(UUID id); + + public List readAll(); + + public ReadStatus update(ReadStatus readStatus); + + public ReadStatus delete(UUID id); + + public void deleteByUserId(UUID userId); + + public List readByUserId(UUID userId); + + public void deleteByChannelId(UUID channelId); + + public List readByChannelId(UUID channelId); + } From 9057946861f7776aff25fb6b174ad727ad072d10 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 16:40:54 +0900 Subject: [PATCH 10/33] =?UTF-8?q?feat:=20BinaryContentRepository=20?= =?UTF-8?q?=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=84=A0?= =?UTF-8?q?=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/BinaryContentRepository.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index 88eb73b6..6eb5fbbd 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -1,4 +1,23 @@ package com.sprint.mission.discodeit.repository; +import com.sprint.mission.discodeit.entity.BinaryContent; + +import java.util.List; +import java.util.UUID; + public interface BinaryContentRepository { + public void save(BinaryContent binaryContent); + + public BinaryContent read(UUID id); + + public BinaryContent delete(UUID id); + + //특정 유저의 (프로필 이미지 등) 바이너리 조회 + public List readByUserId(UUID userId); + + public List readByMessageId(UUID messageId); + + public void deleteByMessageId(UUID messageId); + + } From 9aace5296e83b82935d64bb32252a4f3909ab493 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 17:39:01 +0900 Subject: [PATCH 11/33] =?UTF-8?q?feat:=20Channel=EC=9D=98=20getCategory(),?= =?UTF-8?q?=20setMembers()=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sprint/mission/discodeit/dto/UserCreateRequest.java | 4 ++++ .../java/com/sprint/mission/discodeit/entity/Channel.java | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java new file mode 100644 index 00000000..90d5f34d --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.dto; + +public record UserCreateRequest() { +} 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 b21dfe42..417404ed 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -44,6 +44,14 @@ public void update(Channel updateChannelData) { this.updatedAt = Instant.now(); } + public List getCategory() { + return categories; + } + + public void setMembers(Set members) { + this.members = members; + } + //채널 멤버가 아닌 유저가 메시지 생성시 public void validateMembership(User sender) { if (!members.contains(sender)) { From 0ef2e2e5c0289981a7d31d6603fe5c90e3e01347 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 24 Apr 2025 18:45:46 +0900 Subject: [PATCH 12/33] =?UTF-8?q?feat:=20UserCreateRequest=20DTO=EB=A0=88?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sprint/mission/discodeit/dto/UserCreateRequest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java index 90d5f34d..d76d9656 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java @@ -1,4 +1,11 @@ package com.sprint.mission.discodeit.dto; -public record UserCreateRequest() { +import java.util.UUID; + +public record UserCreateRequest( + UUID id, + String name, + String email, + UUID profileId +) { } From 7a4b9f04807aae52ea233afc852300ef6ce7df02 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Sat, 26 Apr 2025 13:04:40 +0900 Subject: [PATCH 13/33] =?UTF-8?q?WIP:=20UserService=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/dto/UserCreateRequest.java | 6 ++- .../sprint/mission/discodeit/dto/UserDto.java | 14 ++++++ .../sprint/mission/discodeit/entity/User.java | 9 ++++ .../discodeit/repository/UserRepository.java | 3 +- .../repository/UserStatusRepository.java | 1 - .../discodeit/service/UserService.java | 3 +- .../service/basic/BasicUserService.java | 47 +++++++++++++++++-- 7 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/UserDto.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java index d76d9656..66a55fdd 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java @@ -3,9 +3,11 @@ import java.util.UUID; public record UserCreateRequest( - UUID id, String name, + String gender, String email, - UUID profileId + String phone, + String password, + UUID profileImageId ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserDto.java b/src/main/java/com/sprint/mission/discodeit/dto/UserDto.java new file mode 100644 index 00000000..1c4a73b1 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserDto.java @@ -0,0 +1,14 @@ +package com.sprint.mission.discodeit.dto; + +import java.util.UUID; + +public record UserDto( + UUID id, + String name, + String email, + String gender, + String phone, + UUID profileImageId, + boolean online +) { +} 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 0d7be296..36856bdd 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -1,6 +1,7 @@ package com.sprint.mission.discodeit.entity; import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.time.Instant; @@ -9,6 +10,7 @@ import java.util.UUID; @Getter +@Setter public class User implements Serializable { private static final long serialVersionUID = 1L; @@ -21,6 +23,8 @@ public class User implements Serializable { private Instant createdAt; private Instant updatedAt; + private UUID profileId; + public User(String name, String gender, String email, String phone, String password) { this.id = UUID.randomUUID(); this.name = name; @@ -30,6 +34,8 @@ public User(String name, String gender, String email, String phone, String passw this.password = password; this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 + + this.profileId = null; // 나중에 등록하는 경우가 대부분?? } @Override @@ -51,11 +57,14 @@ public void update(User updateUserData) { this.phone = updateUserData.phone; this.password = updateUserData.password; this.updatedAt = Instant.now(); + + this.profileId = updateUserData.profileId; } public String toString() { return "User{" + "UserName= '" + name + '\'' + + ", ProfileId= '" + profileId + '\'' + ", Gender= '" + gender + '\'' + ", email= '" + email + '\'' + ", phone= '" + phone + '\'' + 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 fdfbbd73..11be90ed 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -1,12 +1,13 @@ package com.sprint.mission.discodeit.repository; +import com.sprint.mission.discodeit.dto.UserCreateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.List; import java.util.UUID; public interface UserRepository { - public void create(User user); + public void create(UserCreateRequest request); public User read(UUID id); diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index bb4ea4f1..eb10a564 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -1,6 +1,5 @@ package com.sprint.mission.discodeit.repository; -import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import java.util.List; 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 05f894e8..d86e601f 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,11 +1,12 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.UserCreateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; public interface UserService { - public void create(User user); + public void create(UserCreateRequest request); public User read(UUID id); 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 32c25a64..e192a676 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,25 +1,42 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.UserCreateRequest; +import com.sprint.mission.discodeit.dto.UserDto; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.repository.UserStatusRepository; import com.sprint.mission.discodeit.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.Instant; import java.util.*; @Service @RequiredArgsConstructor public class BasicUserService implements UserService { private final ChannelRepository channelRepository; + private final UserRepository userRepository; - @Override - public void create(User user) { - validateDuplicateEmail(user); + private final UserStatusRepository userStatusRepository; + + + public UserDto create(UserCreateRequest request) { + validateDuplicateNameAndEmail(request); + + User user = new User(request.name(), request.gender(), request.email(), request.phone(), request.password()); + + if(request.profileImageId() != null) { + user.setProfileId(request.profileImageId()); + } + userRepository.create(user); + + userRepository.create(new UserStatus(user.getId(), Instant.now())); } @Override @@ -83,12 +100,32 @@ public void removeUserFromChannels(User user) { } } - private void validateDuplicateEmail(User user) { + private void validateDuplicateNameAndEmail(UserCreateRequest request) { List users = userRepository.readAll(); boolean exists = users.stream() - .anyMatch((u -> u.getEmail().equals(user.getEmail()))); + .anyMatch((u -> u.getEmail().equals(request.email()))); if(exists) { throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); } } + + //User를 UserDto로 변환 + private UserDto toDto(User user, boolean includeStatus) { + boolean isOnline = false; + + if (includeStatus) { + UserStatus status = userStatusRepository.readByUserId(user.getId()); + isOnline = status != null && status.isOnlineNow(); + } + + return new UserDto( + user.getId(), + user.getName(), + user.getGender(), + user.getEmail(), + user.getPhone(), + user.getProfileId(), + isOnline + ); + } } From a70390cd808eba9263ac208f15a2bf5e131c0495 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Tue, 29 Apr 2025 14:14:17 +0900 Subject: [PATCH 14/33] =?UTF-8?q?feat:=20BasicUserService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/{UserDto.java => UserResponse.java} | 0 .../discodeit/dto/UserUpdateRequest.java | 4 + .../service/basic/BasicUserService.java | 155 +++++++++++++----- 3 files changed, 115 insertions(+), 44 deletions(-) rename src/main/java/com/sprint/mission/discodeit/dto/{UserDto.java => UserResponse.java} (100%) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserDto.java b/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java similarity index 100% rename from src/main/java/com/sprint/mission/discodeit/dto/UserDto.java rename to src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java new file mode 100644 index 00000000..c9a3b470 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.dto; + +public record UserUpdateRequest() { +} 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 e192a676..7e88a5f7 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,10 +1,13 @@ package com.sprint.mission.discodeit.service.basic; import com.sprint.mission.discodeit.dto.UserCreateRequest; -import com.sprint.mission.discodeit.dto.UserDto; +import com.sprint.mission.discodeit.dto.UserResponse; +import com.sprint.mission.discodeit.dto.UserUpdateRequest; +import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; 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.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.repository.UserStatusRepository; @@ -14,63 +17,123 @@ import java.time.Instant; import java.util.*; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class BasicUserService implements UserService { - private final ChannelRepository channelRepository; + private final ChannelRepository channelRepository; private final UserRepository userRepository; - private final UserStatusRepository userStatusRepository; + private final BinaryContentRepository binaryContentRepository; - public UserDto create(UserCreateRequest request) { - validateDuplicateNameAndEmail(request); + public UserResponse create(UserCreateRequest request) { + // 중복 name, email 검사 + existsByUserName(request.name()); + existsByEmail(request.email()); - User user = new User(request.name(), request.gender(), request.email(), request.phone(), request.password()); + UUID profileImageId = null; + if(request.profileImage() != null && !request.profileImage().isEmpty()) { + BinaryContent binaryContent = binaryContentRepository.save(new BinaryContent( + null, + request.profileImage().getContentType(), + request.profileImage().getBytes(), + Instant.now() + )); - if(request.profileImageId() != null) { - user.setProfileId(request.profileImageId()); - } + profileImageId = binaryContent.getId(); + } - userRepository.create(user); + User user = new User(request.name(), request.email(), request.phone(), request.password()); + user.setProfileImageId(profileImageId); + User savedUser = Objects.requireNonNull(userRepository.create(user)); + + UserStatus status = new UserStatus(savedUser.getId(), false); + userStatusRepository.create(status); - userRepository.create(new UserStatus(user.getId(), Instant.now())); + return toUserResponse(savedUser, status); } @Override - public User read(UUID id) { - User user = userRepository.read(id); - if (user == null) { - throw new IllegalArgumentException(" --해당 유저를 찾을 수 없습니다."); - } - return user; + public UserResponse find(UUID userId) { + User user = userRepository.read(userId).orElseThrow(); + + UserStatus status = userStatusRepository.readByUserId(userId) + .orElse(new UserStatus(userId, false)); + + return toUserResponse(user, status); } @Override - public List readAll() { - return userRepository.readAll(); + public List findAll() { + List users = userRepository.readAll(); + + return users.stream() + .map(user -> { + UserStatus status = + userStatusRepository.readByUserId(user.getId()) + .orElse(new UserStatus(user.getId(), false)); + return toUserResponse(user,status); + }) + .collect(Collectors.toList()); } @Override - public List readByName(String name) { - return userRepository.readByName(name); + public List findByName(String name) { + List users = userRepository.readByName(name); + + return users.stream() + .map(user -> { + UserStatus status = + userStatusRepository.readByUserId(user.getId()) + .orElse(new UserStatus(user.getId(), false)); + return toUserResponse(user,status); + }) + .collect(Collectors.toList()); } @Override - public User update(UUID id, User update) { - User user = userRepository.read(id); - if (user == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); + public UserResponse update(UserUpdateRequest request) { + //1. 수정할 엔티티 조회 + User user = userRepository.read(request.id()).orElseThrow(); + + //2. username/email 변경 시 중복 체크 + if (request.username() != null && !request.username().equals(user.getName())) { + existsByUserName(request.username()); } - user.update(update); - return user; + + if(request.email() != null && !request.email().equals(user.getEmail())) { + existsByEmail(request.email()); + } + + //3. 변경할 값 있으면 반영 + if(request.username() != null) user.setName(request.username()); + if(request.email() != null ) user.setEmail(request.email()); + if(request.password() != null) user.setPassword(request.password()); + + //4. 프로필 이미지 대체( 있으면 새로 저장) + if(request.username() != null && ! request.profileImage().isEmpty()) { + BinaryContent binaryContent = binaryContentRepository.save(request.profileImage().getBytes(), + request.profileImage().getOriginalFilename()); + user.setProfileImageId(binaryContent.getId()); + } + + //5. 변경된 User 엔티티 저장 + userRepository.create(user); + + //6. UserStatus 조회 ( 없으면 기본값) + UserStatus status = userStatusRepository.readByUserId(user.getId()) + .orElse(new UserStatus(user.getId(), false)); + + //dto로 변환해서 반환 + return toUserResponse(user, status); } @Override - public boolean delete(UUID id, String password) { - User user = userRepository.read(id); + public boolean delete(UUID userId, String password) { + User user = userRepository.read(userId).orElseThrow(); if (user == null) { throw new IllegalArgumentException(" --해당 유저를 찾을 수 없습니다."); } @@ -80,9 +143,13 @@ public boolean delete(UUID id, String password) { return false; } - boolean deleted = userRepository.delete(id); + boolean deleted = userRepository.delete(userId); if (deleted) { removeUserFromChannels(user); + binaryContentRepository.deleteByUserId(userId); + userStatusRepository.deleteByUserId(userId); + + userRepository.delete(userId); System.out.println("유저 탈퇴 성공"); } return deleted; @@ -100,32 +167,32 @@ public void removeUserFromChannels(User user) { } } - private void validateDuplicateNameAndEmail(UserCreateRequest request) { + private void existsByEmail(String email) { List users = userRepository.readAll(); boolean exists = users.stream() - .anyMatch((u -> u.getEmail().equals(request.email()))); + .anyMatch((u -> u.getEmail().equals(email))); if(exists) { throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); } } - //User를 UserDto로 변환 - private UserDto toDto(User user, boolean includeStatus) { - boolean isOnline = false; - - if (includeStatus) { - UserStatus status = userStatusRepository.readByUserId(user.getId()); - isOnline = status != null && status.isOnlineNow(); + private void existsByUserName(String userName) { + List users = userRepository.readAll(); + boolean exists = users.stream() + .anyMatch((u -> u.getName().equals(userName))); + if(exists) { + throw new IllegalArgumentException(" --- 이미 등록된 이름입니다."); } + } - return new UserDto( + private UserResponse toUserResponse(User user, UserStatus status) { + return new UserResponse( user.getId(), user.getName(), - user.getGender(), user.getEmail(), - user.getPhone(), - user.getProfileId(), - isOnline + user.getProfileImageId(), + status.isOnline(), + status ); } } From fdb8c3cf7a33d7c4d1b7839fa503e1de438eb2f1 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Tue, 29 Apr 2025 15:41:35 +0900 Subject: [PATCH 15/33] =?UTF-8?q?feat:=20AuthService=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/dto/LoginRequest.java | 7 +++++ .../discodeit/service/AuthService.java | 8 +++++ .../service/basic/BasicAuthService.java | 29 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.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/basic/BasicAuthService.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java new file mode 100644 index 00000000..cd681a40 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java @@ -0,0 +1,7 @@ +package com.sprint.mission.discodeit.dto; + +public record LoginRequest( + String userName, + String password +) { +} 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..ead9b0d2 --- /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.dto.LoginRequest; +import com.sprint.mission.discodeit.entity.User; + +public interface AuthService { + User login(LoginRequest request); +} 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..a9b7430e --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java @@ -0,0 +1,29 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.dto.LoginRequest; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.service.AuthService; +import org.springframework.beans.factory.annotation.Autowired; + +public class BasicAuthService implements AuthService { + private final UserRepository userRepository; + + @Autowired + public BasicAuthService(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Override + public User login(LoginRequest request) { + //1. Username으로 user 찾기 + User user = userRepository. findByUserName(request.userName()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자 입니다.")); + + //2. password 일치 여부 확인 + if (!user.getPassword().equals(request.password())) { + throw new IllegalArgumentException("비밀번호가 일치하지 않습니다."); + } + return user; + } +} From 5f40acb2a16aeae2d5d2507fca2e3e858df31142 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Wed, 30 Apr 2025 18:18:55 +0900 Subject: [PATCH 16/33] =?UTF-8?q?feat:=20ChannelService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../discodeit/DiscodeitApplication.java | 52 ++--- .../mission/discodeit/JavaApplication.java | 36 ++-- .../dto/ChannelCreateRequest_private.java | 10 + .../dto/ChannelCreateRequest_public.java | 13 ++ .../discodeit/dto/ChannelResponse.java | 15 ++ .../discodeit/dto/ChannelUpdateRequest.java | 11 + .../discodeit/dto/UserCreateRequest.java | 5 +- .../mission/discodeit/dto/UserResponse.java | 9 +- .../discodeit/dto/UserUpdateRequest.java | 14 +- .../discodeit/entity/BinaryContent.java | 14 +- .../mission/discodeit/entity/Channel.java | 21 +- .../mission/discodeit/entity/Message.java | 3 + .../mission/discodeit/entity/ReadStatus.java | 2 +- .../sprint/mission/discodeit/entity/User.java | 16 +- .../mission/discodeit/entity/UserStatus.java | 12 +- .../discodeit/factory/ServiceFactory.java | 114 +++++------ .../repository/BinaryContentRepository.java | 12 +- .../repository/ChannelRepository.java | 9 +- .../repository/MessageRepository.java | 5 + .../discodeit/repository/UserRepository.java | 10 +- .../repository/UserStatusRepository.java | 3 +- .../file/FileChannelRepository.java | 6 +- .../repository/file/FileUserRepository.java | 6 +- .../repository/jcf/JCFChannelRepository.java | 6 +- .../repository/jcf/JCFUserRepository.java | 6 +- .../discodeit/service/ChannelService.java | 18 +- .../discodeit/service/UserService.java | 12 +- .../service/basic/BasicAuthService.java | 2 - .../service/basic/BasicChannelService.java | 193 ++++++++++++++++-- .../service/basic/BasicUserService.java | 19 +- .../service/file/FileChannelService.java | 6 +- .../service/file/FileUserService.java | 8 +- .../service/jcf/JCFChannelService.java | 6 +- .../discodeit/service/jcf/JCFUserService.java | 8 +- 35 files changed, 453 insertions(+), 230 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java diff --git a/build.gradle b/build.gradle index 1c8b5c58..76c6bfe1 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 3f4b21c8..50c389ee 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -44,13 +44,13 @@ public static void main(String[] args) { //유저생성 및 등록 private static List createAndRegisterUsers(UserService userService) { List users = List.of( - new User("조현아", "여", "akbkck8101@gmail.com", "010-6658-8101", "2701"), - new User("신짱구", "남", "zzang9@gmail.com", "010-1234-5678", "9999"), - new User("김철슈", "남", "steelwater@naver.com", "010-0000-0000", "steelwater"), - new User("이훈이", "남", "2hun2@naver.com", "010-2345-6789", "2hun222"), - new User("맹구", "남", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), - new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345"), - new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) + new User("조현아", "akbkck8101@gmail.com", "010-6658-8101", "2701"), + new User("신짱구", "zzang9@gmail.com", "010-1234-5678", "9999"), + new User("김철슈", "steelwater@naver.com", "010-0000-0000", "steelwater"), + new User("이훈이", "2hun2@naver.com", "010-2345-6789", "2hun222"), + new User("맹구", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), + new User("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345"), + new User("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) ); System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n."); @@ -159,19 +159,19 @@ private static void readUser(UserService userService, List users){ System.out.println("------------------------- ReadUser -----------------------------"); //전체 유저조회(다건 조회) System.out.println("\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); //특정 유저조회(단건 조회, 이름) System.out.println("\n신짱구 유저 조회(이름으로 검색): "); - userService.readByName("신짱구").forEach(System.out::println); + userService.findByName("신짱구").forEach(System.out::println); //특정 유저조회(단건 조회, id) System.out.println("\n이훈이 유저 조회(id로 검색): "); - System.out.println(userService.read(users.get(3).getId()).toString()); + System.out.println(userService.find(users.get(3).getId()).toString()); //이름에 "구"가 포함된 유저 System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); - userService.readByName("구").forEach(System.out::println); + userService.findByName("구").forEach(System.out::println); } private static void updateUser(UserService userService, List users){ System.out.println("\n------------------------- UpdateUser ---------------------------"); @@ -180,17 +180,17 @@ private static void updateUser(UserService userService, List users){ //수정하려는 유저 original에 저장 User original = users.get(2); - System.out.println(userService.read(original.getId())); + System.out.println(userService.find(original.getId())); //수정한 유저정보 updated에 저장 - User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword())); + User updated = userService.update(original.getId(), new User("김철수", original.getEmail(), "010-0011-0011", original.getPassword())); System.out.println("수정 후(이름, 번호): "); - System.out.println(userService.read(updated.getId())); + System.out.println(userService.find(updated.getId())); } private static void deleteUser(UserService userService, List users){ System.out.println("\n------------------------ DeleteUser ----------------------------"); System.out.println("\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); //유저 삭제 실패 System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); @@ -202,7 +202,7 @@ private static void deleteUser(UserService userService, List users){ //삭제 후 전체 유저 조회 System.out.println("\n\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); System.out.println(); } @@ -218,7 +218,7 @@ private static void readChannel(ChannelService channelService, List cha System.out.println("------------------------- ReadChannel --------------------------"); System.out.println("\n전체 채널 목록"); - if (channelService.readAll().isEmpty()) { + if (channelService.findAllByUserId().isEmpty()) { System.out.println("조회할 채널이 없습니다."); } else { channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); @@ -227,7 +227,7 @@ private static void readChannel(ChannelService channelService, List cha //특정 채널 정보 try { - Channel channel = channelService.read(channels.get(0).getId()); + Channel channel = channelService.find(channels.get(0).getId()); System.out.println("\n채널명: " + channel.getChannelName()); System.out.println("카테고리: " + channel.getCategory()); @@ -254,12 +254,12 @@ private static void updateChannel(ChannelService channelService, List c System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); //수정한 채널 updated에 저장, 출력(채널명 수정) try { Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -267,11 +267,11 @@ private static void updateChannel(ChannelService channelService, List c //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); try { Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -281,11 +281,11 @@ private static void updateChannel(ChannelService channelService, List c original = channels.get(0); System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); try { Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -295,7 +295,7 @@ private static void deleteChannel(ChannelService channelService, List c System.out.println("\n------------------------ DeleteChannel ------------------------"); System.out.print("\n전체 채널 목록: \n"); - channelService.readAll().forEach(System.out::println); + channelService.findAllByUserId().forEach(System.out::println); //채널 삭제 실패 System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); @@ -307,7 +307,7 @@ private static void deleteChannel(ChannelService channelService, List c //삭제 후 전체 유저 조회 System.out.print("\n전체 채널 목록: \n"); - channelService.readAll().forEach(System.out::println); + channelService.findAllByUserId().forEach(System.out::println); } diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java index c513e767..1210e288 100644 --- a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java @@ -152,19 +152,19 @@ private static void readUser(UserService userService, List users){ System.out.println("------------------------- ReadUser -----------------------------"); //전체 유저조회(다건 조회) System.out.println("\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); //특정 유저조회(단건 조회, 이름) System.out.println("\n신짱구 유저 조회(이름으로 검색): "); - userService.readByName("신짱구").forEach(System.out::println); + userService.findByName("신짱구").forEach(System.out::println); //특정 유저조회(단건 조회, id) System.out.println("\n이훈이 유저 조회(id로 검색): "); - System.out.println(userService.read(users.get(3).getId()).toString()); + System.out.println(userService.find(users.get(3).getId()).toString()); //이름에 "구"가 포함된 유저 System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); - userService.readByName("구").forEach(System.out::println); + userService.findByName("구").forEach(System.out::println); } private static void updateUser(UserService userService, List users){ System.out.println("\n------------------------- UpdateUser ---------------------------"); @@ -173,17 +173,17 @@ private static void updateUser(UserService userService, List users){ //수정하려는 유저 original에 저장 User original = users.get(2); - System.out.println(userService.read(original.getId())); + System.out.println(userService.find(original.getId())); //수정한 유저정보 updated에 저장 User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword())); System.out.println("수정 후(이름, 번호): "); - System.out.println(userService.read(updated.getId())); + System.out.println(userService.find(updated.getId())); } private static void deleteUser(UserService userService, List users){ System.out.println("\n------------------------ DeleteUser ----------------------------"); System.out.println("\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); //유저 삭제 실패 System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); @@ -195,7 +195,7 @@ private static void deleteUser(UserService userService, List users){ //삭제 후 전체 유저 조회 System.out.println("\n\n전체 유저 목록: "); - userService.readAll().forEach(System.out::println); + userService.findAll().forEach(System.out::println); System.out.println(); } @@ -211,7 +211,7 @@ private static void readChannel(ChannelService channelService, List cha System.out.println("------------------------- ReadChannel --------------------------"); System.out.println("\n전체 채널 목록"); - if (channelService.readAll().isEmpty()) { + if (channelService.findAllByUserId().isEmpty()) { System.out.println("조회할 채널이 없습니다."); } else { channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); @@ -220,7 +220,7 @@ private static void readChannel(ChannelService channelService, List cha //특정 채널 정보 try { - Channel channel = channelService.read(channels.get(0).getId()); + Channel channel = channelService.find(channels.get(0).getId()); System.out.println("\n채널명: " + channel.getChannelName()); System.out.println("카테고리: " + channel.getCategory()); @@ -247,12 +247,12 @@ private static void updateChannel(ChannelService channelService, List c System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); //수정한 채널 updated에 저장, 출력(채널명 수정) try { Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -260,11 +260,11 @@ private static void updateChannel(ChannelService channelService, List c //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); try { Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -274,11 +274,11 @@ private static void updateChannel(ChannelService channelService, List c original = channels.get(0); System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.read(original.getId())); + System.out.println("수정 전: " + channelService.find(original.getId())); try { Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.read(updatedChannel.getId())); + System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } @@ -288,7 +288,7 @@ private static void deleteChannel(ChannelService channelService, List c System.out.println("\n------------------------ DeleteChannel ------------------------"); System.out.print("\n전체 채널 목록: \n"); - channelService.readAll().forEach(System.out::println); + channelService.findAllByUserId().forEach(System.out::println); //채널 삭제 실패 System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); @@ -300,7 +300,7 @@ private static void deleteChannel(ChannelService channelService, List c //삭제 후 전체 유저 조회 System.out.print("\n전체 채널 목록: \n"); - channelService.readAll().forEach(System.out::println); + channelService.findAllByUserId().forEach(System.out::println); } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java b/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java new file mode 100644 index 00000000..40fd4441 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.dto; + +import java.util.List; +import java.util.UUID; + +public record ChannelCreateRequest_private( + UUID creatorId, + List memberIds +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java b/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java new file mode 100644 index 00000000..05d0509f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java @@ -0,0 +1,13 @@ +package com.sprint.mission.discodeit.dto; + +import java.util.List; +import java.util.Set; +import java.util.UUID; + +public record ChannelCreateRequest_public( + String channelName, + UUID creatorId, + List categories, + Set memberIds +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java new file mode 100644 index 00000000..1299bd46 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java @@ -0,0 +1,15 @@ +package com.sprint.mission.discodeit.dto; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public record ChannelResponse( + UUID channelId, + String channelName, + List categories, + boolean isPrivate, + Instant lastMessageTime, + List memberIds +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java new file mode 100644 index 00000000..c917e8a0 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.dto; + +import java.util.List; +import java.util.UUID; + +public record ChannelUpdateRequest( + UUID channelId, + String newChannelName, + List newCategories +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java index 66a55fdd..90b2317b 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java @@ -1,5 +1,7 @@ package com.sprint.mission.discodeit.dto; +import org.springframework.web.multipart.MultipartFile; + import java.util.UUID; public record UserCreateRequest( @@ -8,6 +10,7 @@ public record UserCreateRequest( String email, String phone, String password, - UUID profileImageId + UUID profileImageId, + MultipartFile profileImage ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java index 1c4a73b1..e49d9c85 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java @@ -2,13 +2,12 @@ import java.util.UUID; -public record UserDto( + +public record UserResponse( UUID id, - String name, + String userName, String email, - String gender, - String phone, - UUID profileImageId, + String profileImageUrl, boolean online ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java index c9a3b470..73b7e4c1 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java @@ -1,4 +1,16 @@ package com.sprint.mission.discodeit.dto; -public record UserUpdateRequest() { +import jakarta.validation.constraints.NotNull; +import org.springframework.web.multipart.MultipartFile; + +import java.util.UUID; + +public record UserUpdateRequest( + @NotNull + UUID id, + String username, + String email, + String password, + MultipartFile profileImage +) { } 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 7eee1af8..67ea72c2 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -12,20 +12,18 @@ @Getter public class BinaryContent { private final UUID id; - private final UUID userId; - private final UUID messageId; - private final byte[] content; private final String contentType; - + private final String originalFilename; + private final String url; private final Instant createdAt; - public BinaryContent(UUID userId, UUID messageId, byte[] content, String contentType, Instant createdAt) { + public BinaryContent(byte[] content, String contentType, String originalFilename, String url, Instant createdAt) { this.id = UUID.randomUUID(); - this.userId = userId; - this.messageId = messageId; this.content = content; this.contentType = contentType; - this.createdAt = Instant.now(); + this.originalFilename = originalFilename; + this.url = "/files/" + originalFilename; + this.createdAt = createdAt; } } 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 417404ed..7dc2da44 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -16,26 +16,27 @@ public class Channel implements Serializable { private User keyUser; private List categories; private Set members; + + private boolean isPrivate; + private Instant createdAt; private Instant updatedAt; - public Channel(String channelName, User keyUser, List categories, Set members) { + public Channel(String channelName, User keyUser, List categories, Set members , boolean isPrivate) { this.id = UUID.randomUUID(); - this.channelName = channelName; - this.categories = categories; + this.channelName = channelName != null ? channelName : ""; + this.categories = categories != null ? categories : new ArrayList<>(); this.keyUser = keyUser; this.members = new HashSet<>(members); this.members.add(keyUser); + this.isPrivate = isPrivate; + this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 } - public void addMember(User user) { - members.add(user); - } - public void update(Channel updateChannelData) { this.channelName = updateChannelData.channelName; this.keyUser = updateChannelData.keyUser; @@ -44,8 +45,10 @@ public void update(Channel updateChannelData) { this.updatedAt = Instant.now(); } - public List getCategory() { - return categories; + public void update(String newChannelName, List newCategories) { + this.channelName = newChannelName; + this.categories = new ArrayList<>(newCategories); + this.updatedAt = Instant.now(); } public void setMembers(Set members) { 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 68422e91..ee6ceb23 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -20,6 +20,8 @@ public class Message implements Serializable { private Instant createdAt; private Instant updatedAt; + private UUID fileAtttachedId; + public Message(User sender,Channel channel, String category, String content) { this.id = UUID.randomUUID(); this.sender = sender; @@ -29,6 +31,7 @@ public Message(User sender,Channel channel, String category, String content) { this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 + this.fileAtttachedId = null; } public void update(Message updateMessageData) { 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 58a560d7..9cb8a9ba 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -18,7 +18,7 @@ public class ReadStatus { private Instant createdAt; private Instant updatedAt; - public ReadStatus(UUID userId, UUID channelId, Instant createdAt, Instant updatedAt) { + public ReadStatus(UUID userId, UUID channelId, Instant createdAt) { this.id = UUID.randomUUID(); this.userId = userId; this.channelId = channelId; 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 36856bdd..b8ab86a2 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -15,7 +15,6 @@ public class User implements Serializable { private static final long serialVersionUID = 1L; private UUID id; - private String gender; private String name; private String email; private String phone; @@ -23,19 +22,19 @@ public class User implements Serializable { private Instant createdAt; private Instant updatedAt; - private UUID profileId; + private UUID profileImageId; + private String profileImageUrl; - public User(String name, String gender, String email, String phone, String password) { + public User(String name, String email, String phone, String password) { this.id = UUID.randomUUID(); this.name = name; - this.gender = gender; this.email = email; this.phone = phone; this.password = password; this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 - this.profileId = null; // 나중에 등록하는 경우가 대부분?? + this.profileImageId = null; // 나중에 등록하는 경우가 대부분?? } @Override @@ -52,20 +51,19 @@ public boolean equals(Object obj) { public void update(User updateUserData) { this.name = updateUserData.name; - this.gender = updateUserData.gender; this.email = updateUserData.email; this.phone = updateUserData.phone; this.password = updateUserData.password; this.updatedAt = Instant.now(); - this.profileId = updateUserData.profileId; + this.profileImageId = updateUserData.profileImageId; + this.profileImageUrl = updateUserData.profileImageUrl; } public String toString() { return "User{" + "UserName= '" + name + '\'' + - ", ProfileId= '" + profileId + '\'' + - ", Gender= '" + gender + '\'' + + ", ProfileId= '" + profileImageId + '\'' + ", email= '" + email + '\'' + ", phone= '" + phone + '\'' + ", password= '" + password + '\'' + 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 e7ee7dc4..c6b2b523 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -17,25 +17,26 @@ * 나중에 메소드 추가를 위해? 분리하는 것이 좋다?*/ @Getter public class UserStatus { - private UUID id; private UUID userId; //User에서도 userId로 변경하는게 좋을까? private Instant lastOnlineTime; private Instant createdAt; private Instant updatedAt; - public UserStatus(UUID userId, Instant lastOnlineTime) { - this.id = UUID.randomUUID(); + private boolean online; + + public UserStatus(UUID userId, boolean online) { this.userId = userId; - this.lastOnlineTime = lastOnlineTime; this.createdAt = Instant.now(); - this.updatedAt = createdAt; + this.updatedAt = this.createdAt; + this.online = isOnlineNow(); } //lastOnlineTime update public void updatelastOnline() { this.lastOnlineTime = Instant.now(); this.updatedAt = Instant.now(); + this.online = isOnline(); } //지금 온라인 상태인지?(5분 이내 인지) @@ -43,7 +44,6 @@ public boolean isOnlineNow() { if (lastOnlineTime == null) { return false; } - Duration duration = Duration.between(lastOnlineTime, Instant.now()); return duration.toMinutes() <= 5; diff --git a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java index c6e6c2f6..2962846b 100644 --- a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java +++ b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java @@ -1,70 +1,54 @@ -package com.sprint.mission.discodeit.factory; - -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 ServiceFactory { - - private static final ServiceFactory instance = new ServiceFactory(); - - private final ChannelService channelService; - private final UserService userService; - private final MessageService messageService; - - //FileRepository 구현체를 활용 - private ServiceFactory() { - FileChannelRepository channelRepository = new FileChannelRepository(); - FileUserRepository userRepository = new FileUserRepository(channelRepository); - FileMessageRepository messageRepository = new FileMessageRepository(userRepository, channelRepository); - - this.channelService = new BasicChannelService(channelRepository); - this.userService = new BasicUserService(channelRepository, userRepository); - this.messageService = new BasicMessageService(messageRepository, userRepository, channelRepository); - } - -//JCFRepository 구현체를 활용 +//package com.sprint.mission.discodeit.factory; +// +//import com.sprint.mission.discodeit.repository.BinaryContentRepository; +//import com.sprint.mission.discodeit.repository.UserStatusRepository; +//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 org.springframework.stereotype.Component; +// +//public class ServiceFactory { +// +// private static final ServiceFactory instance = new ServiceFactory(); +// +// private final ChannelService channelService; +// private final UserService userService; +// private final MessageService messageService; +// +// // private ServiceFactory() { -// JCFChannelRepository channelRepo = new JCFChannelRepository(); -// JCFUserRepository userRepo = new JCFUserRepository(channelRepo); -// JCFMessageRepository messageRepo = new JCFMessageRepository(userRepo, channelRepo); +// FileChannelRepository channelRepository = new FileChannelRepository(); +// FileUserRepository userRepository = new FileUserRepository(channelRepository); +// FileMessageRepository messageRepository = new FileMessageRepository(userRepository, channelRepository); // -// UserService userService = new BasicUserService(channelRepo, userRepo); -// ChannelService channelService = new BasicChannelService(channelRepo); -// MessageService messageService = new BasicMessageService(messageRepo, userRepo, channelRepo); +// UserStatusRepository userStatusRepository = new UserStatusRepository(); +// BinaryContentRepository binaryContentRepository = new BinaryContentRepository(); +// +// this.channelService = new BasicChannelService(channelRepository); +// this.userService = new BasicUserService(channelRepository, userRepository, userStatusRepository, binaryContentRepository); +// this.messageService = new BasicMessageService(messageRepository, userRepository, channelRepository); // } - -//JCFService 구현체를 활용 -// private ServiceFactory() { -// ChannelService channelService = JCFChannelService.getInstance(); -// UserService userService = JCFUserService.getInstance(channelService); -// MessageService messageService = JCFMessageService.getInstance(userService, channelService); // -// this.channelService = channelService; -// this.userService = userService; -// this.messageService = messageService; +// public static ServiceFactory getInstance() { +// return instance; // } - - public static ServiceFactory getInstance() { - return instance; - } - - public ChannelService createChannelService() { - return channelService; - } - - public UserService createUserService() { - return userService; - } - - public MessageService createMessageService() { - return messageService; - } - -} +// +// public ChannelService createChannelService() { +// return channelService; +// } +// +// public UserService createUserService() { +// return userService; +// } +// +// public MessageService createMessageService() { +// return messageService; +// } +// +//} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index 6eb5fbbd..4728d223 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -10,14 +10,12 @@ public interface BinaryContentRepository { public BinaryContent read(UUID id); - public BinaryContent delete(UUID id); + public List readAll(); - //특정 유저의 (프로필 이미지 등) 바이너리 조회 - public List readByUserId(UUID userId); - - public List readByMessageId(UUID messageId); - - public void deleteByMessageId(UUID messageId); + public void delete(UUID id); + //특정 유저의 (프로필 이미지 등) 바이너리 조회 + public List readByUserId(UUID userId);\ + public void deleteByUserId(UUID userId); } 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 8d5d63d0..adc93421 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java @@ -4,15 +4,16 @@ import com.sprint.mission.discodeit.entity.User; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.UUID; public interface ChannelRepository{ - public void create(Channel channel); + public Channel create(Channel channel); - public Channel read(UUID id); + public Optional find(UUID id); - public List readAll(); + public List findAll(); public Channel update(UUID id, Channel update); @@ -20,6 +21,6 @@ public interface ChannelRepository{ public Set members(UUID id); - public List readByName(String channelName); + public List findByChannelName(String channelName); } 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 4d3c3bff..8f11aa98 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -2,7 +2,9 @@ import com.sprint.mission.discodeit.entity.Message; +import java.time.Instant; import java.util.List; +import java.util.Optional; import java.util.UUID; public interface MessageRepository { @@ -16,4 +18,7 @@ public interface MessageRepository { public boolean delete(UUID id); + public Optional findLastMessageTimeByChannelId(UUID channelId); + + public boolean deleteByChannelId(UUID channelId); } 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 11be90ed..a1129219 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -1,19 +1,19 @@ package com.sprint.mission.discodeit.repository; -import com.sprint.mission.discodeit.dto.UserCreateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.List; +import java.util.Optional; import java.util.UUID; public interface UserRepository { - public void create(UserCreateRequest request); + public User create(User user); - public User read(UUID id); + public Optional find(UUID id); - public List readByName(String name); + public Optional findByUserName(String name); - public List readAll(); + public List findAll(); public User update(UUID id, User update); diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index eb10a564..41266c5b 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -3,6 +3,7 @@ import com.sprint.mission.discodeit.entity.UserStatus; import java.util.List; +import java.util.Optional; import java.util.UUID; public interface UserStatusRepository { @@ -18,5 +19,5 @@ public interface UserStatusRepository { public void deleteByUserId(UUID userId); - public UserStatus readByUserId(UUID userId); + public Optional readByUserId(UUID userId); } 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 b1d3b9ec..ad697620 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 @@ -27,18 +27,18 @@ public void create(Channel channel) { //채널 조회 @Override - public Channel read(UUID id) { + public Channel find(UUID id) { return this.data.get(id); } //채널 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } //특정 채널 정보 - public List readByName(String channelName) { + public List findByChannelName(String channelName) { List result = data.values().stream() .filter(channel -> channel.getChannelName().contains(channelName)) .collect(Collectors.toList()); 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 394f37cf..76cc89be 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 @@ -33,13 +33,13 @@ public void create(User user) { //유저 아이디 조회 @Override - public User read(UUID id) { + public User find(UUID id) { return this.data.get(id); } //유저 이름으로 조회 @Override - public List readByName(String name) { + public List findByUserName(String name) { return data.values().stream() .filter(user -> user.getName().contains(name)) .collect(Collectors.toList()); @@ -47,7 +47,7 @@ public List readByName(String name) { //유저 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } 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 8699b593..cce4a701 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 @@ -19,18 +19,18 @@ public void create(Channel channel) { //채널 조회 @Override - public Channel read(UUID id) { + public Channel find(UUID id) { return data.get(id); } //채널 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } //특정 채널 정보 - public List readByName(String channelName) { + public List findByChannelName(String channelName) { return data.values().stream() .filter(channel -> channel.getChannelName().contains(channelName)) .collect(Collectors.toList()); 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 3735e977..52374b6d 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 @@ -18,13 +18,13 @@ public void create(User user) { //유저 아이디 조회 @Override - public User read(UUID id) { + public User find(UUID id) { return this.data.get(id); } //유저 이름으로 조회 @Override - public List readByName(String name) { + public List findByUserName(String name) { List result = data.values().stream() .filter(user -> user.getName().contains(name)) .collect(Collectors.toList()); @@ -33,7 +33,7 @@ public List readByName(String name) { //유저 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } 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 92dfcc17..4d1bb157 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,31 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.ChannelResponse; +import com.sprint.mission.discodeit.dto.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; import java.util.*; public interface ChannelService { - public void create(Channel channel); + public ChannelResponse createPublicChannel(ChannelCreateRequest_public channel); - public Channel read(UUID id); + public ChannelResponse createPrivateChannel(ChannelCreateRequest_private channel); - public List readAll(); + public ChannelResponse find(UUID id); - public List readByName(String channelName); + public List findAllByUserId(); - public Channel update(UUID id, Channel update); + public List findByChannelName(String channelName); + + public ChannelResponse update(ChannelUpdateRequest request); public boolean delete(UUID id, User user, String password); public Set members(UUID id); + public List findAllByUserId(UUID id); + } \ No newline at end of file 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 d86e601f..040aa278 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,20 +1,22 @@ package com.sprint.mission.discodeit.service; import com.sprint.mission.discodeit.dto.UserCreateRequest; +import com.sprint.mission.discodeit.dto.UserResponse; +import com.sprint.mission.discodeit.dto.UserUpdateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; public interface UserService { - public void create(UserCreateRequest request); + public UserResponse create(UserCreateRequest request); - public User read(UUID id); + public UserResponse find(UUID id); - public List readByName(String name); + public List findByUserName(String name); - public List readAll(); + public List findAll(); - public User update(UUID id, User update); + public UserResponse update(UserUpdateRequest request); public boolean delete(UUID id, String password); 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 a9b7430e..220b6364 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 @@ -4,12 +4,10 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.AuthService; -import org.springframework.beans.factory.annotation.Autowired; public class BasicAuthService implements AuthService { private final UserRepository userRepository; - @Autowired public BasicAuthService(UserRepository userRepository) { this.userRepository = userRepository; } 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 e1469680..01ee424e 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,63 +1,201 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.ChannelResponse; +import com.sprint.mission.discodeit.dto.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.ReadStatus; 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.ReadStatusRepository; +import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.ChannelService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.Instant; import java.util.*; @Service @RequiredArgsConstructor public class BasicChannelService implements ChannelService { private final ChannelRepository channelRepository; + private final UserRepository userRepository; + private final ReadStatusRepository readStatusRepository; + private final MessageRepository messageRepository; + //private 채널생성 @Override - public void create(Channel channel) { + public ChannelResponse createPrivateChannel(ChannelCreateRequest_private request) { + //creatorId로 유저조회 + User creator = userRepository.find(request.creatorId()).orElseThrow(); + + //memberIds로 멤버 조회 + Set members = new HashSet<>(); + for(UUID memberId : request.memberIds()) { + members.add(findUserById(memberId)); + } + + Channel channel = new Channel( + "", + creator, + new ArrayList<>(), + members, + true); + + Channel savedChannel = channelRepository.create(channel); + + for(User member : members) { + ReadStatus readStatus = new ReadStatus( + member.getId(), + savedChannel.getId(), + Instant.now() + ); + readStatusRepository.create(readStatus); + } + + //참여자 id추출 + List memberIds = readStatusRepository.readByChannelId(savedChannel.getId()).stream() + .map(ReadStatus::getUserId).toList(); + + return toChannelResponse(savedChannel, lastMessageTime(savedChannel.getId()), memberIds); + } + + //public 채널생성 + @Override + public ChannelResponse createPublicChannel(ChannelCreateRequest_public request) { + User creator = userRepository.find(request.creatorId()).orElseThrow(); + + Set members = new HashSet<>(); + for(UUID memberId : request.memberIds()) { + members.add(findUserById(memberId)); + } + + Channel channel = new Channel( + request.channelName(), + creator, + request.categories(), + members, + false + ); + validateDuplicateChannelName(channel); channel.validateUniqueCategory(); channel.addKeyUserToMembers(); - channelRepository.create(channel); + + Channel savedChannel = channelRepository.create(channel); + + return toChannelResponse(savedChannel, lastMessageTime(savedChannel.getId()), List.of()); } @Override - public Channel read(UUID id) { - Channel channel = channelRepository.read(id); + public ChannelResponse find(UUID channelId) { + Channel channel = channelRepository.find(channelId).orElseThrow(); if (channel == null) { throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); } - return channel; + + List memberIds = new ArrayList<>(); + if (channel.isPrivate()) { + List readStatuses = readStatusRepository.readByChannelId(channelId); + for (ReadStatus readStatus : readStatuses) { + memberIds.add(readStatus.getUserId()); + } + } + + return toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds); } + /* + * 1. 저장소에서 전체 채널 불러오기 + * 2. 응답리스트 생성 + * 3. 채널 순회 하며 필터링(Private, Public) + * 4. 반환*/ @Override - public List readAll() { - return channelRepository.readAll(); + public List findAllByUserId(UUID userId) { + List channels = channelRepository.findAll(); + List responses = new ArrayList<>(); + + for (Channel channel : channels) { + if(channel.isPrivate()) { + List readStatuses = readStatusRepository.readByChannelId(channel.getId()); + + // 해당 유저가 참여자인지 + boolean isMember = readStatuses.stream() + .anyMatch(readStatus -> readStatus.getUserId().equals(userId)); + + //아니라면 조회 대상제외 + if(!isMember) continue; + + //참여자 id리스트 + List memberIds = readStatuses.stream() + .map(ReadStatus::getUserId) + .toList(); + + responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + } else { + //public + List memberIds = List.of(); + responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + } + } + return responses; } @Override - public List readByName(String channelName) { - return channelRepository.readByName(channelName); + public List findByChannelName(String channelName) { + List channels = channelRepository.findByChannelName(channelName); + if (channels.isEmpty()) { + throw new IllegalArgumentException(" --해당 이름의 채널을 찾을 수 없습니다."); + } + + List responses = new ArrayList<>(); + + for (Channel channel : channels) { + List memberIds = channel.isPrivate() + ? readStatusRepository.readByChannelId(channel.getId()).stream() + .map(ReadStatus::getUserId).toList() + :List.of(); + if (channel.isPrivate()) { + List readStatuses = readStatusRepository.readByChannelId(channel.getId()); + for (ReadStatus readStatus : readStatuses) { + memberIds.add(readStatus.getUserId()); + } + } + responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + } + return responses; } @Override - public Channel update(UUID id, Channel update) { - Channel channel = channelRepository.read(id); + public ChannelResponse update(ChannelUpdateRequest request) { + Channel channel = channelRepository.find(request.channelId()).orElseThrow(); if (channel == null) { throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); } - channel.update(update); - return channel; + if(channel.isPrivate()) { + throw new IllegalArgumentException(" --private 채널은 수정할 수 없습니다."); + } + + channel.update(request.newChannelName(), request.newCategories()); + + List memberIds = List.of(); + + return toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds); } @Override public boolean delete(UUID id, User user, String password) { - Channel channel = channelRepository.read(id); + Channel channel = channelRepository.find(id).orElseThrow();; if (channel == null) { throw new IllegalArgumentException(" --해당 채널을 찾을 수 없습니다."); } + + messageRepository.deleteByChannelId(id); + readStatusRepository.deleteByChannelId(id); + return channelRepository.delete(id, user, password); } @@ -67,10 +205,33 @@ public Set members(UUID id) { } private void validateDuplicateChannelName(Channel channel) { - List channels = channelRepository.readByName(channel.getChannelName()); + List channels = channelRepository.findByChannelName(channel.getChannelName()); if (channels.stream().anyMatch(c -> c.getKeyUser().equals(channel.getKeyUser()) && c.getChannelName().equals(channel.getChannelName()))) { throw new IllegalArgumentException(" --- 이미 등록된 채널입니다."); } } + + private User findUserById(UUID userId) { + User user = userRepository.find(userId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자")); + return user; + } + + private Instant lastMessageTime(UUID channelId) { + return messageRepository.findLastMessageTimeByChannelId(channelId) + .orElse(null); + } + + private ChannelResponse toChannelResponse(Channel channel, Instant lastMessageTime, List memberIds) { + return new ChannelResponse( + channel.getId(), + channel.getChannelName(), + channel.getCategories(), + channel.isPrivate(), + lastMessageTime, + memberIds + ); + } + } 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 7e88a5f7..b52b0653 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 @@ -28,7 +28,6 @@ public class BasicUserService implements UserService { private final UserStatusRepository userStatusRepository; private final BinaryContentRepository binaryContentRepository; - public UserResponse create(UserCreateRequest request) { // 중복 name, email 검사 existsByUserName(request.name()); @@ -58,7 +57,7 @@ public UserResponse create(UserCreateRequest request) { @Override public UserResponse find(UUID userId) { - User user = userRepository.read(userId).orElseThrow(); + User user = userRepository.find(userId).orElseThrow(); UserStatus status = userStatusRepository.readByUserId(userId) .orElse(new UserStatus(userId, false)); @@ -68,7 +67,7 @@ public UserResponse find(UUID userId) { @Override public List findAll() { - List users = userRepository.readAll(); + List users = userRepository.findAll(); return users.stream() .map(user -> { @@ -81,8 +80,8 @@ public List findAll() { } @Override - public List findByName(String name) { - List users = userRepository.readByName(name); + public List findByUserName(String name) { + List users = userRepository.findByUserName(name).orElseThrow(); return users.stream() .map(user -> { @@ -97,7 +96,7 @@ public List findByName(String name) { @Override public UserResponse update(UserUpdateRequest request) { //1. 수정할 엔티티 조회 - User user = userRepository.read(request.id()).orElseThrow(); + User user = userRepository.find(request.id()).orElseThrow(); //2. username/email 변경 시 중복 체크 if (request.username() != null && !request.username().equals(user.getName())) { @@ -133,7 +132,7 @@ public UserResponse update(UserUpdateRequest request) { @Override public boolean delete(UUID userId, String password) { - User user = userRepository.read(userId).orElseThrow(); + User user = userRepository.find(userId).orElseThrow(); if (user == null) { throw new IllegalArgumentException(" --해당 유저를 찾을 수 없습니다."); } @@ -157,7 +156,7 @@ public boolean delete(UUID userId, String password) { @Override public void removeUserFromChannels(User user) { - for (Channel channel : channelRepository.readAll()) { + for (Channel channel : channelRepository.findAll()) { Set members = new HashSet<>(channel.getMembers()); if (members.remove(user)) { channel.setMembers(members); @@ -168,7 +167,7 @@ public void removeUserFromChannels(User user) { } private void existsByEmail(String email) { - List users = userRepository.readAll(); + List users = userRepository.findAll(); boolean exists = users.stream() .anyMatch((u -> u.getEmail().equals(email))); if(exists) { @@ -177,7 +176,7 @@ private void existsByEmail(String email) { } private void existsByUserName(String userName) { - List users = userRepository.readAll(); + List users = userRepository.findAll(); boolean exists = users.stream() .anyMatch((u -> u.getName().equals(userName))); if(exists) { 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 index 002e46aa..1a757ef1 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java @@ -30,7 +30,7 @@ public void create(Channel channel) { //채널 조회 @Override - public Channel read(UUID id) { + public Channel find(UUID id) { Channel channel = this.data.get(id); if (channel == null) { //아무 객체도 가리키지 않음 @@ -42,7 +42,7 @@ public Channel read(UUID id) { //특정 채널 정보 @Override - public List readByName(String channelName) { + public List findByChannelName(String channelName) { List result = data.values().stream() .filter(channel -> channel.getChannelName().contains(channelName)) .collect(Collectors.toList()); @@ -55,7 +55,7 @@ public List readByName(String channelName) { //채널 전체 조회 @Override - public List readAll() { + public List findAllByUserId() { List channels = new ArrayList<>(data.values()); if (channels.isEmpty()) { //리스트있지만 요소없음 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 index 2826b6ab..4ca015b5 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java @@ -41,13 +41,13 @@ public void create(User user) { //유저 아이디 조회 @Override - public User read(UUID id) { + public User find(UUID id) { return this.data.get(id); } //유저 이름으로 조회 @Override - public List readByName(String name) { + public List findByName(String name) { List result = data.values().stream() .filter(user -> user.getName().contains(name)) .collect(Collectors.toList()); @@ -60,7 +60,7 @@ public List readByName(String name) { //유저 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } @@ -96,7 +96,7 @@ public boolean delete(UUID id, String password) { //채널 전체에서 해당 유저 삭제 public void removeUserFromChannels(User user) { - for (Channel channel : channelService.readAll()) { + for (Channel channel : channelService.findAllByUserId()) { Set members = new HashSet<>(channel.getMembers()); if (members.remove(user)) { Channel updatedChannel = new Channel( 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 index ea8ce2a3..692a374a 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java @@ -46,7 +46,7 @@ public void create(Channel channel) { //채널 조회 @Override - public Channel read(UUID id) { + public Channel find(UUID id) { Channel channel = this.data.get(id); if (channel == null) { //아무 객체도 가리키지 않음 @@ -58,7 +58,7 @@ public Channel read(UUID id) { //채널 전체 조회 @Override - public List readAll() { + public List findAllByUserId() { List channels = new ArrayList<>(data.values()); if (channels.isEmpty()) { //리스트있지만 요소없음 @@ -102,7 +102,7 @@ public Set members(UUID id) { } //특정 채널 정보 - public List readByName(String channelName) { + public List findByChannelName(String channelName) { List result = data.values().stream() .filter(channel -> channel.getChannelName().contains(channelName)) .collect(Collectors.toList()); 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 index dc9d5a89..148feede 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java @@ -38,13 +38,13 @@ public void create(User user) { //유저 아이디 조회 @Override - public User read(UUID id) { + public User find(UUID id) { return this.data.get(id); } //유저 이름으로 조회 @Override - public List readByName(String name) { + public List findByName(String name) { List result = data.values().stream() .filter(user -> user.getName().contains(name)) .collect(Collectors.toList()); @@ -57,7 +57,7 @@ public List readByName(String name) { //유저 전체 조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(data.values()); } @@ -93,7 +93,7 @@ public boolean delete(UUID id, String password) { //채널 전체에서 해당 유저 삭제 public void removeUserFromChannels(User user) { - for (Channel channel : channelService.readAll()) { + for (Channel channel : channelService.findAllByUserId()) { Set members = new HashSet<>(channel.getMembers()); if (members.remove(user)) { Channel updatedChannel = new Channel( From f8a381aee3b6827ca3fd4da690ad8da7f37fa591 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 1 May 2025 23:32:39 +0900 Subject: [PATCH 17/33] =?UTF-8?q?feat:=20MessageService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 18 +-- .../mission/discodeit/JavaApplication.java | 18 +-- .../discodeit/dto/BinaryContentRequest.java | 8 + .../discodeit/dto/BinaryContentResponse.java | 11 ++ .../ChannelCreateRequest_private.java | 2 +- .../ChannelCreateRequest_public.java | 2 +- .../dto/{ => channel}/ChannelResponse.java | 2 +- .../{ => channel}/ChannelUpdateRequest.java | 2 +- .../dto/message/MessageCreateRequest.java | 15 ++ .../dto/message/MessageResponse.java | 16 ++ .../dto/message/MessageUpdateRequest.java | 9 ++ .../dto/{ => user}/UserCreateRequest.java | 2 +- .../dto/{ => user}/UserResponse.java | 2 +- .../dto/{ => user}/UserUpdateRequest.java | 2 +- .../discodeit/entity/BinaryContent.java | 4 +- .../mission/discodeit/entity/Message.java | 22 ++- .../repository/BinaryContentRepository.java | 10 +- .../repository/MessageRepository.java | 6 +- .../file/FileMessageRepository.java | 4 +- .../repository/jcf/JCFMessageRepository.java | 4 +- .../discodeit/service/ChannelService.java | 9 +- .../discodeit/service/MessageService.java | 12 +- .../discodeit/service/UserService.java | 6 +- .../service/basic/BasicChannelService.java | 8 +- .../service/basic/BasicMessageService.java | 143 ++++++++++++++++-- .../service/basic/BasicUserService.java | 6 +- .../service/file/FileMessageService.java | 4 +- .../service/jcf/JCFMessageService.java | 4 +- 28 files changed, 262 insertions(+), 89 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java rename src/main/java/com/sprint/mission/discodeit/dto/{ => channel}/ChannelCreateRequest_private.java (75%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => channel}/ChannelCreateRequest_public.java (82%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => channel}/ChannelResponse.java (85%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => channel}/ChannelUpdateRequest.java (78%) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java rename src/main/java/com/sprint/mission/discodeit/dto/{ => user}/UserCreateRequest.java (86%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => user}/UserResponse.java (79%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => user}/UserUpdateRequest.java (86%) diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 50c389ee..78f384a6 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -323,12 +323,12 @@ private static void readMessages(MessageService messageService) { System.out.println("------------------------- ReadMessage -------------------------"); //메시지 전체조회(다건 조회) System.out.println("\n전체 메시지"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); //메시지3 조회(단건 조회) try{ System.out.println("\n메시지 조회"); - System.out.println(messageService.read(messageService.readAll().get(2).getId())); + System.out.println(messageService.find(messageService.findAll().get(2).getId())); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); @@ -338,7 +338,7 @@ private static void readMessages(MessageService messageService) { //존재하지 않는 메시지 조회 try{ System.out.println("\n메시지 조회"); - System.out.println(messageService.read(UUID.randomUUID())); + System.out.println(messageService.find(UUID.randomUUID())); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); } @@ -346,29 +346,29 @@ private static void readMessages(MessageService messageService) { private static void updateMessages(MessageService messageService) { System.out.println("\n------------------------- UpdateMessage ------------------------"); //수정할 메시지 original변수에 저장 - Message original = messageService.read(messageService.readAll().get(0).getId()); - System.out.println("\n메시지1 수정 전: \n" + messageService.read(original.getId())); + Message original = messageService.find(messageService.findAll().get(0).getId()); + System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.getId())); //변경 메시지 updated변수에 저장 Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); //메시지 수정 messageService.update(original.getId(), updated); - System.out.println("\n메시지1 수정 후: \n" + messageService.read(original.getId())); + System.out.println("\n메시지1 수정 후: \n" + messageService.find(original.getId())); //수정후 전체 메시지 System.out.println("\n전체 메시지"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); } private static void deleteMessages(MessageService messageService) { System.out.println("\n------------------------ DeleteMessage ------------------------"); //메시지 삭제 System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); - messageService.delete(messageService.readAll().get(3).getId()); + messageService.delete(messageService.findAll().get(3).getId()); //메시지 삭제 후 재조회 System.out.print("삭제 후 전체 메시지: \n"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); } } diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java index 1210e288..c0579ecd 100644 --- a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java @@ -316,12 +316,12 @@ private static void readMessages(MessageService messageService) { System.out.println("------------------------- ReadMessage -------------------------"); //메시지 전체조회(다건 조회) System.out.println("\n전체 메시지"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); //메시지3 조회(단건 조회) try{ System.out.println("\n메시지 조회"); - System.out.println(messageService.read(messageService.readAll().get(2).getId())); + System.out.println(messageService.find(messageService.findAll().get(2).getId())); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); @@ -331,7 +331,7 @@ private static void readMessages(MessageService messageService) { //존재하지 않는 메시지 조회 try{ System.out.println("\n메시지 조회"); - System.out.println(messageService.read(UUID.randomUUID())); + System.out.println(messageService.find(UUID.randomUUID())); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); } @@ -339,29 +339,29 @@ private static void readMessages(MessageService messageService) { private static void updateMessages(MessageService messageService) { System.out.println("\n------------------------- UpdateMessage ------------------------"); //수정할 메시지 original변수에 저장 - Message original = messageService.read(messageService.readAll().get(0).getId()); - System.out.println("\n메시지1 수정 전: \n" + messageService.read(original.getId())); + Message original = messageService.find(messageService.findAll().get(0).getId()); + System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.getId())); //변경 메시지 updated변수에 저장 Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); //메시지 수정 messageService.update(original.getId(), updated); - System.out.println("\n메시지1 수정 후: \n" + messageService.read(original.getId())); + System.out.println("\n메시지1 수정 후: \n" + messageService.find(original.getId())); //수정후 전체 메시지 System.out.println("\n전체 메시지"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); } private static void deleteMessages(MessageService messageService) { System.out.println("\n------------------------ DeleteMessage ------------------------"); //메시지 삭제 System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); - messageService.delete(messageService.readAll().get(3).getId()); + messageService.delete(messageService.findAll().get(3).getId()); //메시지 삭제 후 재조회 System.out.print("삭제 후 전체 메시지: \n"); - messageService.readAll().forEach(System.out::println); + messageService.findAll().forEach(System.out::println); } } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java new file mode 100644 index 00000000..65382266 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java @@ -0,0 +1,8 @@ +package com.sprint.mission.discodeit.dto; + +public record BinaryContentRequest( + byte[] content, + String contentType, + String originalFilename +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java new file mode 100644 index 00000000..14edfa06 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.dto; + +import java.util.UUID; + +public record BinaryContentResponse( + UUID id, + String contentType, + String originalFilename, + String url +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java similarity index 75% rename from src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java rename to src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java index 40fd4441..befa45a1 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_private.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +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/dto/ChannelCreateRequest_public.java b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java similarity index 82% rename from src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java rename to src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java index 05d0509f..64096e08 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/ChannelCreateRequest_public.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.channel; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java similarity index 85% rename from src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java index 1299bd46..0834fab2 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.channel; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java similarity index 78% rename from src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java index c917e8a0..6fd8204b 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/ChannelUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +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/dto/message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java new file mode 100644 index 00000000..dbdec648 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java @@ -0,0 +1,15 @@ +package com.sprint.mission.discodeit.dto.message; + +import com.sprint.mission.discodeit.dto.BinaryContentRequest; + +import java.util.List; +import java.util.UUID; + +public record MessageCreateRequest( + UUID senderId, + UUID channelId, + String category, + String content, + List attachments +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java new file mode 100644 index 00000000..81ea52ea --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java @@ -0,0 +1,16 @@ +package com.sprint.mission.discodeit.dto.message; + +import com.sprint.mission.discodeit.dto.BinaryContentResponse; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public record MessageResponse( + UUID id, + String content, + String senderName, + Instant sentAt, + List attachments +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java new file mode 100644 index 00000000..187279a7 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.dto.message; + +import java.util.UUID; + +public record MessageUpdateRequest( + UUID messageId, + String newContent +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java similarity index 86% rename from src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java index 90b2317b..2e2a334a 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.user; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java similarity index 79% rename from src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java index e49d9c85..9c9ac598 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.user; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java similarity index 86% rename from src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java index 73b7e4c1..eb74a95f 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.user; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; 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 67ea72c2..3016d5dc 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -12,14 +12,16 @@ @Getter public class BinaryContent { private final UUID id; + private final UUID messageId; private final byte[] content; private final String contentType; private final String originalFilename; private final String url; private final Instant createdAt; - public BinaryContent(byte[] content, String contentType, String originalFilename, String url, Instant createdAt) { + public BinaryContent(UUID messageId, byte[] content, String contentType, String originalFilename, String url, Instant createdAt) { this.id = UUID.randomUUID(); + this.messageId = messageId; this.content = content; this.contentType = contentType; this.originalFilename = originalFilename; 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 ee6ceb23..e04bb8a1 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -13,29 +13,25 @@ public class Message implements Serializable { private static final long serialVersionUID = 1L; private UUID id; - private User sender; //보낸사람 - private Channel channel; + private UUID senderId; //보낸사람 + private UUID channelId; private String category; private String content; //내용 private Instant createdAt; private Instant updatedAt; - private UUID fileAtttachedId; - - public Message(User sender,Channel channel, String category, String content) { + public Message(UUID senderId, UUID channelId, String category, String content) { this.id = UUID.randomUUID(); - this.sender = sender; - this.channel = channel; + this.senderId = senderId; + this.channelId = channelId; this.category = category; this.content = content; this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 - - this.fileAtttachedId = null; } - public void update(Message updateMessageData) { - this.content = updateMessageData.content; + public void update(String content) { + this.content = content; this.updatedAt = Instant.now(); } @@ -60,8 +56,8 @@ public boolean equals(Object obj) { public String toString() { return "Message{" + "id= '" + id + '\'' + - ", sender= '" + sender.getName() + '\'' + - ", channel= '" + channel.getChannelName() + '\'' + + ", sender= '" + senderId + '\'' + + ", channel= '" + channelId + '\'' + ", category= '" + category + '\'' + ", content= '" + content + '\'' + '}'; diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index 4728d223..64cea74b 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -6,16 +6,18 @@ import java.util.UUID; public interface BinaryContentRepository { - public void save(BinaryContent binaryContent); + public BinaryContent save(UUID messageId, BinaryContent binaryContent); - public BinaryContent read(UUID id); + public BinaryContent find(UUID id); - public List readAll(); + public List findAll(); public void delete(UUID id); //특정 유저의 (프로필 이미지 등) 바이너리 조회 - public List readByUserId(UUID userId);\ + public List readByUserId(UUID userId); public void deleteByUserId(UUID userId); + + public void deleteByMessageId(UUID messageId); } 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 8f11aa98..b86918f9 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -8,11 +8,11 @@ import java.util.UUID; public interface MessageRepository { - public void create(Message message); + public Message create(Message message); - public Message read(UUID id); + public Message find(UUID id); - public List readAll(); + public List findAll(); public Message update(UUID id, Message update); 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 2c2959fe..3a6c4a2c 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 @@ -36,13 +36,13 @@ public void create(Message message) { //메시지 조회 @Override - public Message read(UUID id) { + public Message find(UUID id) { return this.data.get(id); } //메시지 전체조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(this.data.values()); } 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 a8cac7e2..378b2e98 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 @@ -16,13 +16,13 @@ public void create(Message message) { //메시지 조회 @Override - public Message read(UUID id) { + public Message find(UUID id) { return this.data.get(id); } //메시지 전체조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(this.data.values()); } 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 4d1bb157..e5e21442 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,10 +1,9 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.ChannelCreateRequest_private; -import com.sprint.mission.discodeit.dto.ChannelCreateRequest_public; -import com.sprint.mission.discodeit.dto.ChannelResponse; -import com.sprint.mission.discodeit.dto.ChannelUpdateRequest; -import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.channel.ChannelResponse; +import com.sprint.mission.discodeit.dto.channel.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; 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 4f231390..8630c10a 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -1,18 +1,20 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.dto.message.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.message.MessageResponse; +import com.sprint.mission.discodeit.dto.message.MessageUpdateRequest; import java.util.*; public interface MessageService { - public void create(Message message); + public MessageResponse create(MessageCreateRequest request); - public Message read(UUID id); + public MessageResponse find(UUID id); - public List readAll(); + public List findAllByChannelId(UUID channelId); - public Message update(UUID id, Message update); + public MessageResponse update(MessageUpdateRequest request); public boolean delete(UUID id); 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 040aa278..8a91b7c0 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,8 +1,8 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.UserCreateRequest; -import com.sprint.mission.discodeit.dto.UserResponse; -import com.sprint.mission.discodeit.dto.UserUpdateRequest; +import com.sprint.mission.discodeit.dto.user.UserCreateRequest; +import com.sprint.mission.discodeit.dto.user.UserResponse; +import com.sprint.mission.discodeit.dto.user.UserUpdateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; 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 01ee424e..787e5eb6 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,9 +1,9 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.ChannelCreateRequest_private; -import com.sprint.mission.discodeit.dto.ChannelCreateRequest_public; -import com.sprint.mission.discodeit.dto.ChannelResponse; -import com.sprint.mission.discodeit.dto.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.channel.ChannelResponse; +import com.sprint.mission.discodeit.dto.channel.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.entity.User; 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 6b5dce3a..684c7919 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,7 +1,15 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.message.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.message.MessageResponse; +import com.sprint.mission.discodeit.dto.message.MessageUpdateRequest; +import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; +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; @@ -9,6 +17,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.UUID; @@ -18,41 +29,143 @@ public class BasicMessageService implements MessageService { private final MessageRepository messageRepository; private final UserRepository userRepository; private final ChannelRepository channelRepository; + private final BinaryContentRepository binaryContentRepository; @Override - public void create(Message message) { - Channel channel = message.getChannel(); - channel.validateCategory(message.getCategory()); - channel.validateMembership(message.getSender()); + public MessageResponse create(MessageCreateRequest request) { + + User sender = userRepository.find(request.senderId()).orElseThrow(); + Channel channel = channelRepository.find(request.channelId()).orElseThrow(); + + if(channel == null) { + throw new IllegalArgumentException("존재하지 않는 채널"); + } + + Message message = new Message( + sender.getId(), + channel.getId(), + request.category(), + request.content() + ); + + channel.validateCategory(request.category()); + channel.validateMembership(sender); message.validateContent(); - messageRepository.create(message); + + Message savedMessage = messageRepository.create(message); + + List savedAttachments = new ArrayList<>(); + if(request.attachments() != null && !request.attachments().isEmpty()) { + for(BinaryContentRequest file : request.attachments()) { + BinaryContent attachment = new BinaryContent( + savedMessage.getId(), + file.content(), + file.contentType(), + file.originalFilename(), + "/files/" + file.originalFilename(), // 또는 URL 생성기 따로 + Instant.now() + ); + savedAttachments.add(binaryContentRepository.save(savedMessage.getId(), attachment)); + } + } + + return toMessageResponse(savedMessage, savedAttachments, sender.getName()); } @Override - public Message read(UUID id) { - Message message = messageRepository.read(id); + public MessageResponse find(UUID id) { + Message message = messageRepository.find(id); if (message == null) { throw new IllegalArgumentException(" --해당 메시지를 찾을 수 없습니다."); } - return message; + + User sender= userRepository.find(message.getSenderId()) + .orElseThrow(() -> new IllegalArgumentException("작성자를 찾을 수 없습니다.")); + + List attachmemts = binaryContentRepository.findAll().stream() + .filter(file -> file.getMessageId().equals(message.getId())) + .toList(); + + return toMessageResponse(message, attachmemts, sender.getName()); } @Override - public List readAll() { - return messageRepository.readAll(); + public List findAllByChannelId(UUID channelId) { + Channel channel = channelRepository.find(channelId).orElseThrow(); + if(channel == null) { + throw new IllegalArgumentException("존재하지 않는 채널"); + } + + List messages = messageRepository.findAll().stream() + .filter(msg -> msg.getChannelId().equals(channelId)) + .sorted(Comparator.comparing(Message::getCreatedAt)) + .toList(); + + List responses = new ArrayList<>(); + + for (Message message : messages) { + User sender = userRepository.find(message.getSenderId()) + .orElseThrow(() -> new IllegalArgumentException(("작성자를 찾을 수 없습니다."))); + + List attachments = binaryContentRepository.findAll().stream() + .filter(file -> file.getMessageId().equals(message.getId())) + .toList(); + + responses.add(toMessageResponse(message, attachments, sender.getName())); + } + return responses; } @Override - public Message update(UUID id, Message update) { - return messageRepository.update(id, update); + public MessageResponse update(MessageUpdateRequest request) { + Message message = messageRepository.find(request.messageId()); + if(message == null) { + throw new IllegalArgumentException("해당 메시지를 찾을 수 없습니다."); + } + + message.update(request.newContent()); + + Message updatedMessage = messageRepository.update(request.messageId(), message); + + User sender = userRepository.find(updatedMessage.getSenderId()) + .orElseThrow(() -> new IllegalArgumentException("작성자 조회 실패")); + + List attachments = binaryContentRepository.findAll().stream() + .filter(file -> file.getMessageId().equals(updatedMessage.getId())) + .toList(); + + return toMessageResponse(updatedMessage, attachments, sender.getName()); } @Override - public boolean delete(UUID id) { - Message message = messageRepository.read(id); + public boolean delete(UUID messageId) { + Message message = messageRepository.find(messageId); if (message == null) { throw new IllegalArgumentException(" --해당 메시지를 찾을 수 없습니다."); } - return messageRepository.delete(id); + + //첨부파일 삭제 + binaryContentRepository.deleteByMessageId(messageId); + + //메시지 삭제 + return messageRepository.delete(messageId); + } + + private MessageResponse toMessageResponse(Message message, List attachments, String senderName) { + List attachmentsDtos = attachments.stream() + .map(file -> new BinaryContentResponse( + file.getId(), + file.getContentType(), + file.getOriginalFilename(), + file.getUrl() + )).toList(); + + return new MessageResponse( + message.getId(), + message.getContent(), + senderName, + message.getCreatedAt(), + attachmentsDtos + ); } } 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 b52b0653..c109c1a8 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,8 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.UserCreateRequest; -import com.sprint.mission.discodeit.dto.UserResponse; -import com.sprint.mission.discodeit.dto.UserUpdateRequest; +import com.sprint.mission.discodeit.dto.user.UserCreateRequest; +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.Channel; import com.sprint.mission.discodeit.entity.User; 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 index 96d2a590..5e3bba14 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java @@ -36,7 +36,7 @@ public void create(Message message) { //메시지 조회 @Override - public Message read(UUID id) { + public Message find(UUID id) { Message message = this.data.get(id); //메시지id 존재하지 않음 @@ -48,7 +48,7 @@ public Message read(UUID id) { //메시지 전체조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(this.data.values()); } 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 index 7c284d44..c32bae0f 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java @@ -40,7 +40,7 @@ public void create(Message message) { //메시지 조회 @Override - public Message read(UUID id) { + public Message find(UUID id) { Message message = this.data.get(id); //메시지id 존재하지 않음 @@ -52,7 +52,7 @@ public Message read(UUID id) { //메시지 전체조회 @Override - public List readAll() { + public List findAll() { return new ArrayList<>(this.data.values()); } From 27fafc48bde1c09e4f2521ff8629291539337d99 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 00:35:34 +0900 Subject: [PATCH 18/33] =?UTF-8?q?feat:=20ReadStatusService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BinaryContentRequest.java | 2 +- .../BinaryContentResponse.java | 2 +- .../dto/message/MessageCreateRequest.java | 2 +- .../dto/message/MessageResponse.java | 2 +- .../readstatus/ReadStatusCreateRequest.java | 11 +++ .../readstatus/ReadStatusUpdateRequest.java | 10 +++ .../mission/discodeit/entity/ReadStatus.java | 3 +- .../sprint/mission/discodeit/entity/User.java | 3 +- .../discodeit/service/ReadStatusService.java | 20 +++++ .../service/basic/BasicMessageService.java | 4 +- .../service/basic/BasicReadStatusService.java | 86 +++++++++++++++++++ 11 files changed, 136 insertions(+), 9 deletions(-) rename src/main/java/com/sprint/mission/discodeit/dto/{ => binarycontent}/BinaryContentRequest.java (69%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => binarycontent}/BinaryContentResponse.java (74%) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.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/basic/BasicReadStatusService.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java similarity index 69% rename from src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java index 65382266..d68d8397 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.binarycontent; public record BinaryContentRequest( byte[] content, diff --git a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java similarity index 74% rename from src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java index 14edfa06..cddec61a 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/BinaryContentResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.binarycontent; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java index dbdec648..333760fe 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java @@ -1,6 +1,6 @@ package com.sprint.mission.discodeit.dto.message; -import com.sprint.mission.discodeit.dto.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java index 81ea52ea..94fda9c8 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java @@ -1,6 +1,6 @@ package com.sprint.mission.discodeit.dto.message; -import com.sprint.mission.discodeit.dto.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentResponse; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java new file mode 100644 index 00000000..d005c23a --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.dto.readstatus; + +import java.time.Instant; +import java.util.UUID; + +public record ReadStatusCreateRequest( + UUID userId, + UUID channelId, + Instant lastReadTime +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java new file mode 100644 index 00000000..46469672 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.dto.readstatus; + +import java.time.Instant; +import java.util.UUID; + +public record ReadStatusUpdateRequest( + UUID id, + Instant newReadTime +) { +} 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 9cb8a9ba..398fafd9 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -1,6 +1,7 @@ package com.sprint.mission.discodeit.entity; import lombok.Getter; +import lombok.Setter; import java.time.Instant; import java.util.UUID; @@ -8,7 +9,7 @@ /*사용자가 채널 별 마지막으로 메시지를 읽은 시간을 표현 하는 도메인 * 사용자별 각 채널에 읽지 않은 메시지 확인하기 * 메시지를 읽음 -> updatedAt 시간이 현재 시간으로*/ -@Getter +@Getter @Setter public class ReadStatus { private UUID id; private UUID userId; 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 b8ab86a2..9f529f84 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -9,8 +9,7 @@ import java.util.HashSet; import java.util.UUID; -@Getter -@Setter +@Getter @Setter public class User implements Serializable { private static final long serialVersionUID = 1L; 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..ef5918e7 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java @@ -0,0 +1,20 @@ +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 java.util.List; +import java.util.UUID; + +public interface ReadStatusService { + public ReadStatus create(ReadStatusCreateRequest request); + + public ReadStatus find(UUID id); + + public List findAllByUserId(UUID userId); + + public ReadStatus update(ReadStatusUpdateRequest request); + + public boolean delete(UUID id); +} 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 684c7919..6dd3fec9 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,7 +1,7 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.BinaryContentRequest; -import com.sprint.mission.discodeit.dto.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentResponse; import com.sprint.mission.discodeit.dto.message.MessageCreateRequest; import com.sprint.mission.discodeit.dto.message.MessageResponse; import com.sprint.mission.discodeit.dto.message.MessageUpdateRequest; 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..28d96da4 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java @@ -0,0 +1,86 @@ +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.Channel; +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.entity.User; +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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class BasicReadStatusService implements ReadStatusService { + public final UserRepository userRepository; + public final ChannelRepository channelRepository; + public final ReadStatusRepository readStatusRepository; + + @Override + public ReadStatus create(ReadStatusCreateRequest request) { + User user = userRepository.find(request.userId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다.")); + + Channel channel = channelRepository.find(request.channelId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 채널입니다.")); + + + //가장 최근에 읽은 시간 하나만 두기위해 중복 체크 + boolean alreadyExists = readStatusRepository.readByUserId(request.userId()).stream() + .anyMatch(rs -> rs.getChannelId().equals(request.channelId())); + + if (alreadyExists) { + throw new IllegalStateException("이미 해당 채널에 대한 ReadStatus가 존재합니다."); + } + + ReadStatus readStatus = new ReadStatus( + request.userId(), + request.channelId(), + request.lastReadTime() + ); + + readStatusRepository.create(readStatus); + return readStatus; + } + + @Override + public ReadStatus find(UUID id) { + ReadStatus readStatus = readStatusRepository.read(id); + if (readStatus == null) { + throw new IllegalArgumentException("해당 Id의 Readstatus를 찾을 수 없습니다."); + } + return readStatus; + } + + @Override + public List findAllByUserId(UUID userId) { + return readStatusRepository.readByUserId(userId); + } + + @Override + public ReadStatus update(ReadStatusUpdateRequest request) { + ReadStatus readStatus = readStatusRepository.read(request.id()); + if (readStatus == null) { + throw new IllegalArgumentException("수정할 ReadStatus가 존재하지 않습니다."); + } + + readStatus.setLastReadTime(request.newReadTime()); + return readStatusRepository.update(readStatus); + } + + @Override + public boolean delete(UUID id) { + ReadStatus readStatus = readStatusRepository.read(id); + if (readStatus == null) { + throw new IllegalArgumentException("삭제할 ReadStaus가 존재하지 않습니다."); + } + readStatusRepository.delete(id); + return true; + } +} From 0ff805e74f7f8d6df89db62da0be37001b57eb8c Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 01:18:18 +0900 Subject: [PATCH 19/33] =?UTF-8?q?feat:=20UserStatusService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BinaryContentResponse.java | 2 +- .../ChannelResponse.java | 2 +- .../MessageResponse.java | 4 +- .../dto/{user => Response}/UserResponse.java | 2 +- .../BinaryContentRequest.java | 2 +- .../dto/{ => request}/LoginRequest.java | 2 +- .../create}/ChannelCreateRequest_private.java | 2 +- .../create}/ChannelCreateRequest_public.java | 2 +- .../create}/MessageCreateRequest.java | 4 +- .../create}/ReadStatusCreateRequest.java | 2 +- .../create}/UserCreateRequest.java | 2 +- .../create/UserStatusCreateRequest.java | 9 ++ .../update}/ChannelUpdateRequest.java | 2 +- .../update}/MessageUpdateRequest.java | 2 +- .../update}/ReadStatusUpdateRequest.java | 2 +- .../update/UserStatusUpdateRequest.java | 9 ++ .../update}/UserUpdateRequest.java | 2 +- .../mission/discodeit/entity/UserStatus.java | 23 +++-- .../repository/ReadStatusRepository.java | 4 +- .../repository/UserStatusRepository.java | 6 +- .../discodeit/service/AuthService.java | 2 +- .../discodeit/service/ChannelService.java | 8 +- .../discodeit/service/MessageService.java | 6 +- .../discodeit/service/ReadStatusService.java | 4 +- .../discodeit/service/UserService.java | 6 +- .../discodeit/service/UserStatusService.java | 22 +++++ .../service/basic/BasicAuthService.java | 2 +- .../service/basic/BasicChannelService.java | 8 +- .../service/basic/BasicMessageService.java | 10 +-- .../service/basic/BasicReadStatusService.java | 10 +-- .../service/basic/BasicUserService.java | 14 +-- .../service/basic/BasicUserStatusService.java | 89 +++++++++++++++++++ 32 files changed, 199 insertions(+), 67 deletions(-) rename src/main/java/com/sprint/mission/discodeit/dto/{binarycontent => Response}/BinaryContentResponse.java (74%) rename src/main/java/com/sprint/mission/discodeit/dto/{channel => Response}/ChannelResponse.java (84%) rename src/main/java/com/sprint/mission/discodeit/dto/{message => Response}/MessageResponse.java (66%) rename src/main/java/com/sprint/mission/discodeit/dto/{user => Response}/UserResponse.java (77%) rename src/main/java/com/sprint/mission/discodeit/dto/{binarycontent => request}/BinaryContentRequest.java (69%) rename src/main/java/com/sprint/mission/discodeit/dto/{ => request}/LoginRequest.java (62%) rename src/main/java/com/sprint/mission/discodeit/dto/{channel => request/create}/ChannelCreateRequest_private.java (72%) rename src/main/java/com/sprint/mission/discodeit/dto/{channel => request/create}/ChannelCreateRequest_public.java (80%) rename src/main/java/com/sprint/mission/discodeit/dto/{message => request/create}/MessageCreateRequest.java (64%) rename src/main/java/com/sprint/mission/discodeit/dto/{readstatus => request/create}/ReadStatusCreateRequest.java (74%) rename src/main/java/com/sprint/mission/discodeit/dto/{user => request/create}/UserCreateRequest.java (83%) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/request/create/UserStatusCreateRequest.java rename src/main/java/com/sprint/mission/discodeit/dto/{channel => request/update}/ChannelUpdateRequest.java (75%) rename src/main/java/com/sprint/mission/discodeit/dto/{message => request/update}/MessageUpdateRequest.java (67%) rename src/main/java/com/sprint/mission/discodeit/dto/{readstatus => request/update}/ReadStatusUpdateRequest.java (71%) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/request/update/UserStatusUpdateRequest.java rename src/main/java/com/sprint/mission/discodeit/dto/{user => request/update}/UserUpdateRequest.java (84%) 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/BasicUserStatusService.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/BinaryContentResponse.java similarity index 74% rename from src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/Response/BinaryContentResponse.java index cddec61a..9dd78d2b 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/BinaryContentResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.binarycontent; +package com.sprint.mission.discodeit.dto.Response; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java similarity index 84% rename from src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java index 0834fab2..5b628727 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.channel; +package com.sprint.mission.discodeit.dto.Response; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/MessageResponse.java similarity index 66% rename from src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/Response/MessageResponse.java index 94fda9c8..144d0a14 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/MessageResponse.java @@ -1,6 +1,4 @@ -package com.sprint.mission.discodeit.dto.message; - -import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentResponse; +package com.sprint.mission.discodeit.dto.Response; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java similarity index 77% rename from src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java rename to src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java index 9c9ac598..11585f13 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/user/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.user; +package com.sprint.mission.discodeit.dto.Response; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/BinaryContentRequest.java similarity index 69% rename from src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/BinaryContentRequest.java index d68d8397..b23b0bb3 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/binarycontent/BinaryContentRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/BinaryContentRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.binarycontent; +package com.sprint.mission.discodeit.dto.request; public record BinaryContentRequest( byte[] content, diff --git a/src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/LoginRequest.java similarity index 62% rename from src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/LoginRequest.java index cd681a40..254e45cb 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/LoginRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/LoginRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto; +package com.sprint.mission.discodeit.dto.request; public record LoginRequest( String userName, diff --git a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java similarity index 72% rename from src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java index befa45a1..3480e8fc 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_private.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.channel; +package com.sprint.mission.discodeit.dto.request.create; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_public.java similarity index 80% rename from src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_public.java index 64096e08..26a8bdad 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelCreateRequest_public.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_public.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.channel; +package com.sprint.mission.discodeit.dto.request.create; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/MessageCreateRequest.java similarity index 64% rename from src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/create/MessageCreateRequest.java index 333760fe..b93f4379 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/MessageCreateRequest.java @@ -1,6 +1,6 @@ -package com.sprint.mission.discodeit.dto.message; +package com.sprint.mission.discodeit.dto.request.create; -import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.request.BinaryContentRequest; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ReadStatusCreateRequest.java similarity index 74% rename from src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/create/ReadStatusCreateRequest.java index d005c23a..99f8cb37 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ReadStatusCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.readstatus; +package com.sprint.mission.discodeit.dto.request.create; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java similarity index 83% rename from src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java index 2e2a334a..8b712da1 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/user/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.user; +package com.sprint.mission.discodeit.dto.request.create; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserStatusCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserStatusCreateRequest.java new file mode 100644 index 00000000..32c7f8bd --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserStatusCreateRequest.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.dto.request.create; + +import java.util.UUID; + +public record UserStatusCreateRequest( + UUID userId, + boolean isOnline +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java similarity index 75% rename from src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java index 6fd8204b..bb844547 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/channel/ChannelUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.channel; +package com.sprint.mission.discodeit.dto.request.update; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/MessageUpdateRequest.java similarity index 67% rename from src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/update/MessageUpdateRequest.java index 187279a7..b1de43c9 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/message/MessageUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/MessageUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.message; +package com.sprint.mission.discodeit.dto.request.update; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ReadStatusUpdateRequest.java similarity index 71% rename from src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/update/ReadStatusUpdateRequest.java index 46469672..43bc5f9a 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/readstatus/ReadStatusUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ReadStatusUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.readstatus; +package com.sprint.mission.discodeit.dto.request.update; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserStatusUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserStatusUpdateRequest.java new file mode 100644 index 00000000..f92b5872 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserStatusUpdateRequest.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.dto.request.update; + +import java.util.UUID; + +public record UserStatusUpdateRequest( + UUID id, + boolean newOnlineStatus +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java similarity index 84% rename from src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java rename to src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java index eb74a95f..23f6853b 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/user/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.sprint.mission.discodeit.dto.user; +package com.sprint.mission.discodeit.dto.request.update; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; 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 c6b2b523..67c9960f 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -1,6 +1,7 @@ package com.sprint.mission.discodeit.entity; import lombok.Getter; +import lombok.Setter; import java.time.Duration; import java.time.Instant; @@ -13,9 +14,9 @@ * 헷갈린다 updateAt을 마지막 접속시간으로 쓰면 안되는 것?? * * updatedAt은 객체의 마지막 수정 시간(상태메시지, 로그인 등) -* lastOnlineTime은 사용자가 언제 마지막으로 접속했는가?? + * lastOnlineTime은 사용자가 언제 마지막으로 접속했는가?? * 나중에 메소드 추가를 위해? 분리하는 것이 좋다?*/ -@Getter +@Getter @Setter public class UserStatus { private UUID userId; //User에서도 userId로 변경하는게 좋을까? private Instant lastOnlineTime; @@ -29,23 +30,27 @@ public UserStatus(UUID userId, boolean online) { this.userId = userId; this.createdAt = Instant.now(); this.updatedAt = this.createdAt; - this.online = isOnlineNow(); + this.lastOnlineTime = online ? Instant.now() : null; + this.online = online; } //lastOnlineTime update public void updatelastOnline() { this.lastOnlineTime = Instant.now(); this.updatedAt = Instant.now(); - this.online = isOnline(); + this.online = isOnlineNow(); } //지금 온라인 상태인지?(5분 이내 인지) public boolean isOnlineNow() { - if (lastOnlineTime == null) { - return false; - } - Duration duration = Duration.between(lastOnlineTime, Instant.now()); + return lastOnlineTime != null && + Duration.between(lastOnlineTime, Instant.now()).toMinutes() <= 5; + } - return duration.toMinutes() <= 5; + //온라인상태 수동변경 + public void updateOnlineStatus(boolean online) { + this.online = online; + this.lastOnlineTime = Instant.now(); + this.updatedAt = Instant.now(); } } diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java index cedcf27c..4cf7b1de 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java @@ -8,9 +8,9 @@ public interface ReadStatusRepository { public void create(ReadStatus readStatus); - public ReadStatus read(UUID id); + public ReadStatus find(UUID id); - public List readAll(); + public List findAll(); public ReadStatus update(ReadStatus readStatus); diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index 41266c5b..73e4349e 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -9,9 +9,9 @@ public interface UserStatusRepository { public void create(UserStatus userstatus); - public UserStatus read(UUID id); + public UserStatus find(UUID id); - public List readAll(); + public List findAll(); public UserStatus update(UserStatus userstatus); @@ -19,5 +19,5 @@ public interface UserStatusRepository { public void deleteByUserId(UUID userId); - public Optional readByUserId(UUID userId); + public Optional findByUserId(UUID userId); } 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 ead9b0d2..ce9d93b8 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/AuthService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/AuthService.java @@ -1,6 +1,6 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.LoginRequest; +import com.sprint.mission.discodeit.dto.request.LoginRequest; import com.sprint.mission.discodeit.entity.User; public interface AuthService { 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 e5e21442..c6f22695 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,9 +1,9 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_private; -import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_public; -import com.sprint.mission.discodeit.dto.channel.ChannelResponse; -import com.sprint.mission.discodeit.dto.channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.Response.ChannelResponse; +import com.sprint.mission.discodeit.dto.request.update.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; 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 8630c10a..9e1e7241 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -1,8 +1,8 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.message.MessageCreateRequest; -import com.sprint.mission.discodeit.dto.message.MessageResponse; -import com.sprint.mission.discodeit.dto.message.MessageUpdateRequest; +import com.sprint.mission.discodeit.dto.request.create.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.Response.MessageResponse; +import com.sprint.mission.discodeit.dto.request.update.MessageUpdateRequest; import java.util.*; 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 ef5918e7..7ba87afd 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ReadStatusService.java @@ -1,7 +1,7 @@ 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.dto.request.create.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.dto.request.update.ReadStatusUpdateRequest; import com.sprint.mission.discodeit.entity.ReadStatus; import java.util.List; 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 8a91b7c0..2981e8c5 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -1,8 +1,8 @@ package com.sprint.mission.discodeit.service; -import com.sprint.mission.discodeit.dto.user.UserCreateRequest; -import com.sprint.mission.discodeit.dto.user.UserResponse; -import com.sprint.mission.discodeit.dto.user.UserUpdateRequest; +import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; +import com.sprint.mission.discodeit.dto.Response.UserResponse; +import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; import com.sprint.mission.discodeit.entity.User; import java.util.*; 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..bdcccc9f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java @@ -0,0 +1,22 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.dto.request.create.UserStatusCreateRequest; +import com.sprint.mission.discodeit.dto.request.update.UserStatusUpdateRequest; +import com.sprint.mission.discodeit.entity.UserStatus; + +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(UUID userId, UserStatusUpdateRequest request); + + public boolean delete(UUID 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 index 220b6364..c2a60f4a 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,6 +1,6 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.LoginRequest; +import com.sprint.mission.discodeit.dto.request.LoginRequest; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.AuthService; 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 787e5eb6..e1e06249 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,9 +1,9 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_private; -import com.sprint.mission.discodeit.dto.channel.ChannelCreateRequest_public; -import com.sprint.mission.discodeit.dto.channel.ChannelResponse; -import com.sprint.mission.discodeit.dto.channel.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.Response.ChannelResponse; +import com.sprint.mission.discodeit.dto.request.update.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.entity.User; 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 6dd3fec9..fe1141b4 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,10 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentRequest; -import com.sprint.mission.discodeit.dto.binarycontent.BinaryContentResponse; -import com.sprint.mission.discodeit.dto.message.MessageCreateRequest; -import com.sprint.mission.discodeit.dto.message.MessageResponse; -import com.sprint.mission.discodeit.dto.message.MessageUpdateRequest; +import com.sprint.mission.discodeit.dto.request.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.request.create.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.Response.MessageResponse; +import com.sprint.mission.discodeit.dto.request.update.MessageUpdateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.Message; 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 28d96da4..e39e9bfc 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,7 +1,7 @@ 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.dto.request.create.ReadStatusCreateRequest; +import com.sprint.mission.discodeit.dto.request.update.ReadStatusUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.entity.User; @@ -51,7 +51,7 @@ public ReadStatus create(ReadStatusCreateRequest request) { @Override public ReadStatus find(UUID id) { - ReadStatus readStatus = readStatusRepository.read(id); + ReadStatus readStatus = readStatusRepository.find(id); if (readStatus == null) { throw new IllegalArgumentException("해당 Id의 Readstatus를 찾을 수 없습니다."); } @@ -65,7 +65,7 @@ public List findAllByUserId(UUID userId) { @Override public ReadStatus update(ReadStatusUpdateRequest request) { - ReadStatus readStatus = readStatusRepository.read(request.id()); + ReadStatus readStatus = readStatusRepository.find(request.id()); if (readStatus == null) { throw new IllegalArgumentException("수정할 ReadStatus가 존재하지 않습니다."); } @@ -76,7 +76,7 @@ public ReadStatus update(ReadStatusUpdateRequest request) { @Override public boolean delete(UUID id) { - ReadStatus readStatus = readStatusRepository.read(id); + ReadStatus readStatus = readStatusRepository.find(id); if (readStatus == null) { throw new IllegalArgumentException("삭제할 ReadStaus가 존재하지 않습니다."); } 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 c109c1a8..2e65d780 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,8 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.user.UserCreateRequest; -import com.sprint.mission.discodeit.dto.user.UserResponse; -import com.sprint.mission.discodeit.dto.user.UserUpdateRequest; +import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; +import com.sprint.mission.discodeit.dto.Response.UserResponse; +import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; @@ -59,7 +59,7 @@ public UserResponse create(UserCreateRequest request) { public UserResponse find(UUID userId) { User user = userRepository.find(userId).orElseThrow(); - UserStatus status = userStatusRepository.readByUserId(userId) + UserStatus status = userStatusRepository.findByUserId(userId) .orElse(new UserStatus(userId, false)); return toUserResponse(user, status); @@ -72,7 +72,7 @@ public List findAll() { return users.stream() .map(user -> { UserStatus status = - userStatusRepository.readByUserId(user.getId()) + userStatusRepository.findByUserId(user.getId()) .orElse(new UserStatus(user.getId(), false)); return toUserResponse(user,status); }) @@ -86,7 +86,7 @@ public List findByUserName(String name) { return users.stream() .map(user -> { UserStatus status = - userStatusRepository.readByUserId(user.getId()) + userStatusRepository.findByUserId(user.getId()) .orElse(new UserStatus(user.getId(), false)); return toUserResponse(user,status); }) @@ -123,7 +123,7 @@ public UserResponse update(UserUpdateRequest request) { userRepository.create(user); //6. UserStatus 조회 ( 없으면 기본값) - UserStatus status = userStatusRepository.readByUserId(user.getId()) + UserStatus status = userStatusRepository.findByUserId(user.getId()) .orElse(new UserStatus(user.getId(), false)); //dto로 변환해서 반환 diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java new file mode 100644 index 00000000..c54c1c09 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java @@ -0,0 +1,89 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.dto.request.create.UserStatusCreateRequest; +import com.sprint.mission.discodeit.dto.request.update.UserStatusUpdateRequest; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.entity.UserStatus; +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.repository.UserStatusRepository; +import com.sprint.mission.discodeit.service.UserStatusService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class BasicUserStatusService implements UserStatusService { + public final UserRepository userRepository; + public final UserStatusRepository userStatusRepository; + + + @Override + public UserStatus create(UserStatusCreateRequest request) { + User user = userRepository.find(request.userId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + + Optional existing = userStatusRepository.findByUserId(request.userId()); + if(existing.isPresent()) { + throw new IllegalArgumentException("해당 유저에 대한 상태 정보가 이미 존재"); + } + + UserStatus status = new UserStatus(request.userId(), request.isOnline()); + userStatusRepository.create(status); + return status; + } + + @Override + public UserStatus find(UUID id) { + UserStatus userStatus = userStatusRepository.find(id); + if(userStatus == null) { + throw new IllegalArgumentException("해당 Id의 UserStatus를 찾을 수 없습니다."); + } + return userStatus; + } + + @Override + public List findAll() { + return userStatusRepository.findAll(); + } + + @Override + public UserStatus update(UserStatusUpdateRequest request) { + UserStatus userStatus = userStatusRepository.find(request.id()); + if(userStatus == null) { + throw new IllegalArgumentException("수정할 UserStatus가 존재하지 않습니다."); + } + + userStatus.updateOnlineStatus(request.newOnlineStatus()); + return userStatusRepository.update(userStatus); + } + + @Override + public UserStatus updateByUserId(UUID userId, UserStatusUpdateRequest request) { + Optional optionalUserStatus = userStatusRepository.findByUserId(userId); + + if (optionalUserStatus.isEmpty()) { + throw new IllegalArgumentException("해당 유저에 대한 UserStatus가 존재하지 않습니다."); + } + + UserStatus userStatus = optionalUserStatus.get(); + userStatus.updateOnlineStatus(request.newOnlineStatus()); + return userStatusRepository.update(userStatus); + + } + + @Override + public boolean delete(UUID id) { + UserStatus userStatus = userStatusRepository.find(id); + if(userStatus == null) { + throw new IllegalArgumentException("삭제할 UserStatus가 존재하지 않습니다."); + } + userStatusRepository.delete(id); + return true; + } +} From 7d3ea67344fc95c02a12d9004a869cc319fd42c4 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 01:55:17 +0900 Subject: [PATCH 20/33] =?UTF-8?q?feat:=20BinaryContentService=20=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create/BinaryContentCreateRequest.java | 11 +++ .../repository/BinaryContentRepository.java | 2 +- .../service/BinaryContentService.java | 18 +++++ .../basic/BasicBinaryContentService.java | 67 +++++++++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.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/basic/BasicBinaryContentService.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java new file mode 100644 index 00000000..b5f51b5e --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.dto.request.create; + +import java.util.UUID; + +public record BinaryContentCreateRequest( + UUID messageId, + byte[] content, + String contentType, + String originalFilename +) { +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index 64cea74b..f66e98ac 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -15,7 +15,7 @@ public interface BinaryContentRepository { public void delete(UUID id); //특정 유저의 (프로필 이미지 등) 바이너리 조회 - public List readByUserId(UUID userId); + public List findByUserId(UUID userId); public void deleteByUserId(UUID userId); 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..82f9f111 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java @@ -0,0 +1,18 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; + +import java.util.List; +import java.util.UUID; + +public interface BinaryContentService { + public BinaryContentResponse create(BinaryContentCreateRequest request); + + public BinaryContentResponse find(UUID id); + + public List findAllByIdIn(List ids); + + public boolean delete(UUID id); + +} 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..9dae6180 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java @@ -0,0 +1,67 @@ +package com.sprint.mission.discodeit.service.basic; + +import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; +import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; +import com.sprint.mission.discodeit.service.BinaryContentService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.Instant; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class BasicBinaryContentService implements BinaryContentService { + public final BinaryContentRepository binaryContentRepository; + + @Override + public BinaryContentResponse create(BinaryContentCreateRequest request) { + BinaryContent file = new BinaryContent( + request.messageId(), + request.content(), + request.contentType(), + request.originalFilename(), + "/files/" + request.originalFilename(), + Instant.now() + ); + + binaryContentRepository.save(request.messageId(), file); + return toBinaryContentResponse(file); + } + + @Override + public BinaryContentResponse find(UUID id) { + BinaryContent file = binaryContentRepository.find(id); + if (file == null) { + throw new IllegalArgumentException("해당 Id의 파일이 존재하지 않습니다."); + } + return toBinaryContentResponse(file); + } + + @Override + public List findAllByIdIn(List ids) { + return ids.stream() + .map(this::find) + .filter(Objects::nonNull) + .toList(); + } + + @Override + public boolean delete(UUID id) { + binaryContentRepository.delete(id); + return true; + } + + private BinaryContentResponse toBinaryContentResponse(BinaryContent file) { + return new BinaryContentResponse( + file.getId(), + file.getContentType(), + file.getOriginalFilename(), + file.getUrl() + ); + } +} From ceb6a6f268109a32abda4ae2bda4fe170bbae999 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 02:12:30 +0900 Subject: [PATCH 21/33] =?UTF-8?q?feat:=20UserStatusService=20dto=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/Response/UserStatusResponse.java | 11 ++++++ .../discodeit/service/UserStatusService.java | 12 +++---- .../service/basic/BasicUserStatusService.java | 36 ++++++++++++------- 3 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/dto/Response/UserStatusResponse.java diff --git a/src/main/java/com/sprint/mission/discodeit/dto/Response/UserStatusResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserStatusResponse.java new file mode 100644 index 00000000..fa0d6aea --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserStatusResponse.java @@ -0,0 +1,11 @@ +package com.sprint.mission.discodeit.dto.Response; + +import java.time.Instant; +import java.util.UUID; + +public record UserStatusResponse( + UUID userId, + boolean online, + Instant lastOnlineTime +) { +} 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 bdcccc9f..293344b2 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserStatusService.java @@ -1,22 +1,22 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.Response.UserStatusResponse; import com.sprint.mission.discodeit.dto.request.create.UserStatusCreateRequest; import com.sprint.mission.discodeit.dto.request.update.UserStatusUpdateRequest; -import com.sprint.mission.discodeit.entity.UserStatus; import java.util.List; import java.util.UUID; public interface UserStatusService { - public UserStatus create(UserStatusCreateRequest request); + public UserStatusResponse create(UserStatusCreateRequest request); - public UserStatus find(UUID id); + public UserStatusResponse find(UUID id); - public List findAll(); + public List findAll(); - public UserStatus update(UserStatusUpdateRequest request); + public UserStatusResponse update(UserStatusUpdateRequest request); - public UserStatus updateByUserId(UUID userId, UserStatusUpdateRequest request); + public UserStatusResponse updateByUserId(UUID userId, UserStatusUpdateRequest request); public boolean delete(UUID id); } diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java index c54c1c09..6946fcdf 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java @@ -1,11 +1,10 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.Response.UserStatusResponse; import com.sprint.mission.discodeit.dto.request.create.UserStatusCreateRequest; import com.sprint.mission.discodeit.dto.request.update.UserStatusUpdateRequest; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; -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.repository.UserStatusRepository; import com.sprint.mission.discodeit.service.UserStatusService; @@ -24,7 +23,7 @@ public class BasicUserStatusService implements UserStatusService { @Override - public UserStatus create(UserStatusCreateRequest request) { + public UserStatusResponse create(UserStatusCreateRequest request) { User user = userRepository.find(request.userId()) .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); @@ -35,36 +34,39 @@ public UserStatus create(UserStatusCreateRequest request) { UserStatus status = new UserStatus(request.userId(), request.isOnline()); userStatusRepository.create(status); - return status; + return toUserStatusResponse(status); } @Override - public UserStatus find(UUID id) { + public UserStatusResponse find(UUID id) { UserStatus userStatus = userStatusRepository.find(id); if(userStatus == null) { throw new IllegalArgumentException("해당 Id의 UserStatus를 찾을 수 없습니다."); } - return userStatus; + return toUserStatusResponse(userStatus); } @Override - public List findAll() { - return userStatusRepository.findAll(); + public List findAll() { + return userStatusRepository.findAll().stream() + .map(this::toUserStatusResponse) + .toList(); } @Override - public UserStatus update(UserStatusUpdateRequest request) { + public UserStatusResponse update(UserStatusUpdateRequest request) { UserStatus userStatus = userStatusRepository.find(request.id()); if(userStatus == null) { throw new IllegalArgumentException("수정할 UserStatus가 존재하지 않습니다."); } userStatus.updateOnlineStatus(request.newOnlineStatus()); - return userStatusRepository.update(userStatus); + UserStatus updateUserStatus = userStatusRepository.update(userStatus); + return toUserStatusResponse(updateUserStatus); } @Override - public UserStatus updateByUserId(UUID userId, UserStatusUpdateRequest request) { + public UserStatusResponse updateByUserId(UUID userId, UserStatusUpdateRequest request) { Optional optionalUserStatus = userStatusRepository.findByUserId(userId); if (optionalUserStatus.isEmpty()) { @@ -73,8 +75,8 @@ public UserStatus updateByUserId(UUID userId, UserStatusUpdateRequest request) { UserStatus userStatus = optionalUserStatus.get(); userStatus.updateOnlineStatus(request.newOnlineStatus()); - return userStatusRepository.update(userStatus); - + UserStatus updateUserStatus = userStatusRepository.update(userStatus); + return toUserStatusResponse(updateUserStatus); } @Override @@ -86,4 +88,12 @@ public boolean delete(UUID id) { userStatusRepository.delete(id); return true; } + + private UserStatusResponse toUserStatusResponse(UserStatus status) { + return new UserStatusResponse( + status.getUserId(), + status.isOnline(), + status.getLastOnlineTime() + ); + } } From 9da7d7aeb34062bb56bb0479a3132c3a688169ce Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 11:06:50 +0900 Subject: [PATCH 22/33] =?UTF-8?q?feat:=20service=EA=B3=A0=EB=8F=84?= =?UTF-8?q?=ED=99=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/dto/Response/UserResponse.java | 1 + .../create/BinaryContentCreateRequest.java | 1 + .../discodeit/entity/BinaryContent.java | 11 ++-- .../sprint/mission/discodeit/entity/User.java | 6 ++- .../repository/BinaryContentRepository.java | 2 +- .../discodeit/repository/UserRepository.java | 2 +- .../discodeit/service/UserService.java | 2 +- .../basic/BasicBinaryContentService.java | 13 +++-- .../service/basic/BasicMessageService.java | 7 ++- .../service/basic/BasicUserService.java | 50 +++++++++---------- 10 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java index 11585f13..21065102 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java @@ -7,6 +7,7 @@ public record UserResponse( UUID id, String userName, String email, + UUID profileImageId, String profileImageUrl, boolean online ) { diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java index b5f51b5e..cf5f17c0 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/BinaryContentCreateRequest.java @@ -3,6 +3,7 @@ import java.util.UUID; public record BinaryContentCreateRequest( + UUID userId, UUID messageId, byte[] content, String contentType, 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 3016d5dc..d22b2985 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -7,25 +7,30 @@ /*바이너리 데이터 표현 도메인 * 프로필이미지, 메시지 첨부 파일 저장하기 위해 +* userId(messageId=null)-> 프로필이미지 반대면 메시지 첨부파일 * 수정불가한 도메인 * */ @Getter public class BinaryContent { private final UUID id; - private final UUID messageId; + + private final UUID userId; //프로필이미지 + private final UUID messageId; //첨부파일 + private final byte[] content; private final String contentType; private final String originalFilename; private final String url; private final Instant createdAt; - public BinaryContent(UUID messageId, byte[] content, String contentType, String originalFilename, String url, Instant createdAt) { + public BinaryContent(UUID userId, UUID messageId, byte[] content, String contentType, String originalFilename) { this.id = UUID.randomUUID(); + this.userId = userId; this.messageId = messageId; this.content = content; this.contentType = contentType; this.originalFilename = originalFilename; this.url = "/files/" + originalFilename; - this.createdAt = createdAt; + this.createdAt = 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 9f529f84..1f81a3bc 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -22,7 +22,6 @@ public class User implements Serializable { private Instant updatedAt; private UUID profileImageId; - private String profileImageUrl; public User(String name, String email, String phone, String password) { this.id = UUID.randomUUID(); @@ -56,7 +55,10 @@ public void update(User updateUserData) { this.updatedAt = Instant.now(); this.profileImageId = updateUserData.profileImageId; - this.profileImageUrl = updateUserData.profileImageUrl; + } + + public String getProfileImageUrl() { + return (profileImageId != null) ? "/files/" + profileImageId : null; } public String toString() { diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index f66e98ac..85aa1ac8 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -6,7 +6,7 @@ import java.util.UUID; public interface BinaryContentRepository { - public BinaryContent save(UUID messageId, BinaryContent binaryContent); + public BinaryContent save(BinaryContent binaryContent); public BinaryContent find(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 a1129219..6e771d67 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -15,7 +15,7 @@ public interface UserRepository { public List findAll(); - public User update(UUID id, User update); + public User update(User update); public boolean delete(UUID id); 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 2981e8c5..4dbf01d3 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -12,7 +12,7 @@ public interface UserService { public UserResponse find(UUID id); - public List findByUserName(String name); + public UserResponse findByUserName(String name); public List findAll(); 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 9dae6180..61b09a25 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 @@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.time.Instant; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -20,16 +19,20 @@ public class BasicBinaryContentService implements BinaryContentService { @Override public BinaryContentResponse create(BinaryContentCreateRequest request) { + if ((request.userId() == null && request.messageId() == null) + || request.messageId() == null || request.content().length == 0) { + throw new IllegalArgumentException("파일 업로드 대상 또는 내용이 잘못되었습니다."); + } + BinaryContent file = new BinaryContent( + request.userId(), request.messageId(), request.content(), request.contentType(), - request.originalFilename(), - "/files/" + request.originalFilename(), - Instant.now() + request.originalFilename() ); - binaryContentRepository.save(request.messageId(), file); + binaryContentRepository.save(file); return toBinaryContentResponse(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 fe1141b4..ffd31f89 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 @@ -58,14 +58,13 @@ public MessageResponse create(MessageCreateRequest request) { if(request.attachments() != null && !request.attachments().isEmpty()) { for(BinaryContentRequest file : request.attachments()) { BinaryContent attachment = new BinaryContent( + null, savedMessage.getId(), file.content(), file.contentType(), - file.originalFilename(), - "/files/" + file.originalFilename(), // 또는 URL 생성기 따로 - Instant.now() + file.originalFilename() ); - savedAttachments.add(binaryContentRepository.save(savedMessage.getId(), attachment)); + savedAttachments.add(binaryContentRepository.save(attachment)); } } 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 2e65d780..de1eadd5 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,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; import com.sprint.mission.discodeit.dto.Response.UserResponse; import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; @@ -33,22 +34,23 @@ public UserResponse create(UserCreateRequest request) { existsByUserName(request.name()); existsByEmail(request.email()); - UUID profileImageId = null; + User user = new User(request.name(), request.email(), request.phone(), request.password()); + User savedUser = userRepository.create(user); + + //프로필 이미지 생성 if(request.profileImage() != null && !request.profileImage().isEmpty()) { - BinaryContent binaryContent = binaryContentRepository.save(new BinaryContent( + BinaryContent profileImage = new BinaryContent( + savedUser.getId(), null, - request.profileImage().getContentType(), request.profileImage().getBytes(), - Instant.now() - )); - - profileImageId = binaryContent.getId(); + request.profileImage().getContentType(), + request.profileImage().getOriginalFilename() + ); + BinaryContent savedImage = binaryContentRepository.save(profileImage); + user.setProfileImageId(savedImage.getId()); + userRepository.update(savedUser); } - User user = new User(request.name(), request.email(), request.phone(), request.password()); - user.setProfileImageId(profileImageId); - User savedUser = Objects.requireNonNull(userRepository.create(user)); - UserStatus status = new UserStatus(savedUser.getId(), false); userStatusRepository.create(status); @@ -80,17 +82,14 @@ public List findAll() { } @Override - public List findByUserName(String name) { - List users = userRepository.findByUserName(name).orElseThrow(); + public UserResponse findByUserName(String name) { + User user = userRepository.findByUserName(name) + .orElseThrow(() -> new IllegalArgumentException("해당 이름의 유저가 없습니다.")); - return users.stream() - .map(user -> { - UserStatus status = - userStatusRepository.findByUserId(user.getId()) - .orElse(new UserStatus(user.getId(), false)); - return toUserResponse(user,status); - }) - .collect(Collectors.toList()); + UserStatus status = userStatusRepository.findByUserId(user.getId()) + .orElse(new UserStatus(user.getId(), false)); + + return toUserResponse(user, status); } @Override @@ -113,8 +112,9 @@ public UserResponse update(UserUpdateRequest request) { if(request.password() != null) user.setPassword(request.password()); //4. 프로필 이미지 대체( 있으면 새로 저장) - if(request.username() != null && ! request.profileImage().isEmpty()) { - BinaryContent binaryContent = binaryContentRepository.save(request.profileImage().getBytes(), + if(request.profileImage() != null && ! request.profileImage().isEmpty()) { + BinaryContent binaryContent = binaryContentRepository.save( + request.profileImage().getBytes(), request.profileImage().getOriginalFilename()); user.setProfileImageId(binaryContent.getId()); } @@ -190,8 +190,8 @@ private UserResponse toUserResponse(User user, UserStatus status) { user.getName(), user.getEmail(), user.getProfileImageId(), - status.isOnline(), - status + user.getProfileImageUrl(), + status.isOnline() ); } } From adefcd56dead5839c8a4fa0c2b05e53dc435e9ed Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 11:45:28 +0900 Subject: [PATCH 23/33] =?UTF-8?q?feat:=20FileBinaryContent=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/BinaryContentRepository.java | 6 +- .../file/FileBinaryContentRepository.java | 102 ++++++++++++++++++ .../file/FileChannelRepository.java | 3 +- .../discodeit/util/DataInitializer.java | 5 +- 4 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java index 85aa1ac8..1446ee41 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java @@ -12,12 +12,12 @@ public interface BinaryContentRepository { public List findAll(); - public void delete(UUID id); + public boolean delete(UUID id); //특정 유저의 (프로필 이미지 등) 바이너리 조회 public List findByUserId(UUID userId); - public void deleteByUserId(UUID userId); + public boolean deleteByUserId(UUID userId); - public void deleteByMessageId(UUID messageId); + public boolean deleteByMessageId(UUID messageId); } 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..562b3ea4 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java @@ -0,0 +1,102 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; +import org.springframework.stereotype.Repository; + +import java.io.*; +import java.util.*; +import java.util.stream.Collectors; + +import static com.sprint.mission.discodeit.util.DataInitializer.BINARYCONTENT_FILE_PATH; + +@Repository +public class FileBinaryContentRepository implements BinaryContentRepository { + private final String FILE_PATH = BINARYCONTENT_FILE_PATH; + + private Map data = loadData(); + + @Override + public BinaryContent save(BinaryContent binaryContent) { + data.put(binaryContent.getId(), binaryContent); + saveData(); + return binaryContent; + } + + @Override + public BinaryContent find(UUID id) { + return this.data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public List findByUserId(UUID userId) { + return data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .collect(Collectors.toList()); + } + + @Override + public boolean delete(UUID id) { + return this.data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .map(BinaryContent::getId) + .toList(); + + boolean deleted = false; + for(UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + saveData(); + return deleted; + } + + @Override + public boolean deleteByMessageId(UUID messageId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getMessageId(), messageId)) + .map(BinaryContent::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + saveData(); + return deleted; + } + + private void saveData() { + try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + ObjectOutputStream oos = new ObjectOutputStream(fos)) { + oos.writeObject(data); + } catch (IOException e) { + System.err.println("[binaryContent] 데이터 저장 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + } + + // 불러오기 메서드 + @SuppressWarnings("unchecked") + private Map loadData() { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + return (Map) ois.readObject(); + } catch (FileNotFoundException e) { + System.out.println("[binaryContent] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + } catch (IOException | ClassNotFoundException e) { + System.out.println("[binaryCotent] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + // 실패 시 빈 Map 반환 + return new HashMap<>(); + } +} 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 ad697620..9c947e53 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 @@ -3,14 +3,13 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; -import com.sprint.mission.discodeit.util.DataInitializer; import org.springframework.stereotype.Repository; import java.io.*; import java.util.*; import java.util.stream.Collectors; -import static com.sprint.mission.discodeit.util.DataInitializer.*; +import static com.sprint.mission.discodeit.util.DataInitializer.CHANNEL_FILE_PATH; @Repository public class FileChannelRepository implements ChannelRepository { diff --git a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java index 13713170..cb906d4b 100644 --- a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java +++ b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java @@ -9,11 +9,14 @@ public class DataInitializer { public static final String CHANNEL_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/channel.ser"; public static final String USER_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/user.ser"; public static final String MESSAGE_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/message.ser"; + public static final String BINARYCONTENT_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/binarycontent.ser"; + private static final List FILE_PATHS = List.of( CHANNEL_FILE_PATH, USER_FILE_PATH, - MESSAGE_FILE_PATH + MESSAGE_FILE_PATH, + BINARYCONTENT_FILE_PATH ); public static void clearSerializedData() { From 48933f7f312addf170e2346c3594bdf5b7ee1442 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 13:30:38 +0900 Subject: [PATCH 24/33] =?UTF-8?q?feat:=20FileReadStatus=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ReadStatusRepository.java | 16 +-- .../file/FileReadStatusRepository.java | 118 ++++++++++++++++++ .../service/basic/BasicChannelService.java | 10 +- .../service/basic/BasicReadStatusService.java | 4 +- .../discodeit/util/DataInitializer.java | 5 +- 5 files changed, 137 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java index 4cf7b1de..91275e77 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java @@ -6,22 +6,24 @@ import java.util.UUID; public interface ReadStatusRepository { - public void create(ReadStatus readStatus); + public ReadStatus create(ReadStatus readStatus); public ReadStatus find(UUID id); public List findAll(); - public ReadStatus update(ReadStatus readStatus); + public List findByUserId(UUID userId); - public ReadStatus delete(UUID id); + public List findByChannelId(UUID channelId); - public void deleteByUserId(UUID userId); + public ReadStatus update(ReadStatus update); - public List readByUserId(UUID userId); + public boolean delete(UUID id); + + public boolean deleteByUserId(UUID userId); + + public boolean deleteByChannelId(UUID channelId); - public void deleteByChannelId(UUID channelId); - public List readByChannelId(UUID channelId); } 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..b55b6c41 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -0,0 +1,118 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; + +import java.io.*; +import java.time.Instant; +import java.util.*; +import java.util.stream.Collectors; + +import static com.sprint.mission.discodeit.util.DataInitializer.READSTATUS_FILE_PATH; + +public class FileReadStatusRepository implements ReadStatusRepository { + private final String FILE_PATH = READSTATUS_FILE_PATH; + + private Map data = loadData(); + + @Override + public ReadStatus create(ReadStatus readStatus) { + data.put(readStatus.getId(), readStatus); + saveData(); + return readStatus; + } + + @Override + public ReadStatus find(UUID id) { + return this.data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public ReadStatus update(ReadStatus update) { + ReadStatus readStatus = this.data.get(update.getId()); + readStatus.updateLastReadTime(update.getLastReadTime()); + return readStatus; + } + + @Override + public List findByUserId(UUID userId) { + return data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .collect(Collectors.toList()); + } + + @Override + public List findByChannelId(UUID channelId) { + return data.values().stream() + .filter(file -> Objects.equals(file.getChannelId(), channelId)) + .collect(Collectors.toList()); + } + + @Override + public boolean delete(UUID id) { + return this.data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .map(ReadStatus::getId) + .toList(); + + boolean deleted = false; + for(UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + saveData(); + return deleted; + } + + @Override + public boolean deleteByChannelId(UUID channelId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getChannelId(), channelId)) + .map(ReadStatus::getId) + .toList(); + + boolean deleted = false; + for(UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + saveData(); + return deleted; + } + + + private void saveData() { + try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + ObjectOutputStream oos = new ObjectOutputStream(fos)) { + oos.writeObject(data); + } catch (IOException e) { + System.err.println("[binaryContent] 데이터 저장 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + } + + // 불러오기 메서드 + @SuppressWarnings("unchecked") + private Map loadData() { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + return (Map) ois.readObject(); + } catch (FileNotFoundException e) { + System.out.println("[binaryContent] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + } catch (IOException | ClassNotFoundException e) { + System.out.println("[binaryCotent] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + // 실패 시 빈 Map 반환 + return new HashMap<>(); + } +} 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 e1e06249..2232f289 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 @@ -57,7 +57,7 @@ public ChannelResponse createPrivateChannel(ChannelCreateRequest_private request } //참여자 id추출 - List memberIds = readStatusRepository.readByChannelId(savedChannel.getId()).stream() + List memberIds = readStatusRepository.findByChannelId(savedChannel.getId()).stream() .map(ReadStatus::getUserId).toList(); return toChannelResponse(savedChannel, lastMessageTime(savedChannel.getId()), memberIds); @@ -99,7 +99,7 @@ public ChannelResponse find(UUID channelId) { List memberIds = new ArrayList<>(); if (channel.isPrivate()) { - List readStatuses = readStatusRepository.readByChannelId(channelId); + List readStatuses = readStatusRepository.findByChannelId(channelId); for (ReadStatus readStatus : readStatuses) { memberIds.add(readStatus.getUserId()); } @@ -120,7 +120,7 @@ public List findAllByUserId(UUID userId) { for (Channel channel : channels) { if(channel.isPrivate()) { - List readStatuses = readStatusRepository.readByChannelId(channel.getId()); + List readStatuses = readStatusRepository.findByChannelId(channel.getId()); // 해당 유저가 참여자인지 boolean isMember = readStatuses.stream() @@ -155,11 +155,11 @@ public List findByChannelName(String channelName) { for (Channel channel : channels) { List memberIds = channel.isPrivate() - ? readStatusRepository.readByChannelId(channel.getId()).stream() + ? readStatusRepository.findByChannelId(channel.getId()).stream() .map(ReadStatus::getUserId).toList() :List.of(); if (channel.isPrivate()) { - List readStatuses = readStatusRepository.readByChannelId(channel.getId()); + List readStatuses = readStatusRepository.findByChannelId(channel.getId()); for (ReadStatus readStatus : readStatuses) { memberIds.add(readStatus.getUserId()); } 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 e39e9bfc..0dba8d81 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 @@ -32,7 +32,7 @@ public ReadStatus create(ReadStatusCreateRequest request) { //가장 최근에 읽은 시간 하나만 두기위해 중복 체크 - boolean alreadyExists = readStatusRepository.readByUserId(request.userId()).stream() + boolean alreadyExists = readStatusRepository.findByUserId(request.userId()).stream() .anyMatch(rs -> rs.getChannelId().equals(request.channelId())); if (alreadyExists) { @@ -60,7 +60,7 @@ public ReadStatus find(UUID id) { @Override public List findAllByUserId(UUID userId) { - return readStatusRepository.readByUserId(userId); + return readStatusRepository.findByUserId(userId); } @Override diff --git a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java index cb906d4b..f787ab12 100644 --- a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java +++ b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java @@ -10,13 +10,14 @@ public class DataInitializer { public static final String USER_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/user.ser"; public static final String MESSAGE_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/message.ser"; public static final String BINARYCONTENT_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/binarycontent.ser"; - + public static final String READSTATUS_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/readstatus.ser"; private static final List FILE_PATHS = List.of( CHANNEL_FILE_PATH, USER_FILE_PATH, MESSAGE_FILE_PATH, - BINARYCONTENT_FILE_PATH + BINARYCONTENT_FILE_PATH, + READSTATUS_FILE_PATH ); public static void clearSerializedData() { From c5a8182b141b182203f8a0395821cc0452ed17a4 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 13:44:06 +0900 Subject: [PATCH 25/33] =?UTF-8?q?feat:=20FileUserStatus=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/UserStatusRepository.java | 11 ++- .../file/FileReadStatusRepository.java | 6 +- .../file/FileUserStatusRepository.java | 94 +++++++++++++++++++ .../discodeit/util/DataInitializer.java | 4 +- 4 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index 73e4349e..65bd45bc 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository; +import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import java.util.List; @@ -7,17 +8,17 @@ import java.util.UUID; public interface UserStatusRepository { - public void create(UserStatus userstatus); + public UserStatus create(UserStatus userstatus); public UserStatus find(UUID id); public List findAll(); - public UserStatus update(UserStatus userstatus); + public Optional findByUserId(UUID userId); - public UserStatus delete(UUID id); + public UserStatus update(UserStatus userstatus); - public void deleteByUserId(UUID userId); + public boolean delete(UUID id); - public Optional findByUserId(UUID userId); + public boolean deleteByUserId(UUID userId); } 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 index b55b6c41..605e4bc8 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -96,7 +96,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[binaryContent] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.err.println("[readStatus] 데이터 저장 중 오류 발생: " + e.getMessage()); e.printStackTrace(); } } @@ -107,9 +107,9 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[binaryContent] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println("[readStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[binaryCotent] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println("[readStatus] 데이터 불러오기 중 오류 발생: " + e.getMessage()); e.printStackTrace(); } // 실패 시 빈 Map 반환 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..700d2d6a --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -0,0 +1,94 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.UserStatusRepository; + +import java.io.*; +import java.util.*; +import java.util.stream.Collectors; + +import static com.sprint.mission.discodeit.util.DataInitializer.USERSTATUS_FILE_PATH; + +public class FileUserStatusRepository implements UserStatusRepository { + private final String FILE_PATH = USERSTATUS_FILE_PATH; + + private Map data = loadData(); + + @Override + public UserStatus create(UserStatus userstatus) { + data.put(userstatus.getUserId(), userstatus); + saveData(); + return userstatus; + } + + @Override + public UserStatus find(UUID id) { + return this.data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public Optional findByUserId(UUID userId) { + return data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .findFirst(); + } + + @Override + public UserStatus update(UserStatus userstatus) { + UserStatus userStatus = data.get(userstatus.getUserId()); + userStatus.updateOnlineStatus(userStatus.isOnline()); + userStatus.updatelastOnline();; + saveData(); + return userstatus; + } + + @Override + public boolean delete(UUID id) { + return data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .map(UserStatus::getUserId) + .toList(); + + boolean deleted = false; + for(UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + saveData(); + return deleted; + } + + private void saveData() { + try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + ObjectOutputStream oos = new ObjectOutputStream(fos)) { + oos.writeObject(data); + } catch (IOException e) { + System.err.println("[userStatus] 데이터 저장 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + } + + // 불러오기 메서드 + @SuppressWarnings("unchecked") + private Map loadData() { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + return (Map) ois.readObject(); + } catch (FileNotFoundException e) { + System.out.println("[userStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + } catch (IOException | ClassNotFoundException e) { + System.out.println("[userStatus] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + e.printStackTrace(); + } + // 실패 시 빈 Map 반환 + return new HashMap<>(); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java index f787ab12..26f71f0b 100644 --- a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java +++ b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java @@ -11,13 +11,15 @@ public class DataInitializer { public static final String MESSAGE_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/message.ser"; public static final String BINARYCONTENT_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/binarycontent.ser"; public static final String READSTATUS_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/readstatus.ser"; + public static final String USERSTATUS_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/userstatus.ser"; private static final List FILE_PATHS = List.of( CHANNEL_FILE_PATH, USER_FILE_PATH, MESSAGE_FILE_PATH, BINARYCONTENT_FILE_PATH, - READSTATUS_FILE_PATH + READSTATUS_FILE_PATH, + USERSTATUS_FILE_PATH ); public static void clearSerializedData() { From 52f6332ef2dab7a9976148607e2cf780c6908ea2 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 13:59:03 +0900 Subject: [PATCH 26/33] =?UTF-8?q?feat:=20JCFBinaryContent=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/UserStatusRepository.java | 1 - .../file/FileReadStatusRepository.java | 3 - .../file/FileUserStatusRepository.java | 1 - .../jcf/JCFBinaryContentRepository.java | 67 +++++++++++++++++++ 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index 65bd45bc..18bad51a 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -1,6 +1,5 @@ package com.sprint.mission.discodeit.repository; -import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import java.util.List; 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 index 605e4bc8..594fa564 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -1,12 +1,9 @@ package com.sprint.mission.discodeit.repository.file; -import com.sprint.mission.discodeit.entity.BinaryContent; -import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; import java.io.*; -import java.time.Instant; import java.util.*; import java.util.stream.Collectors; 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 index 700d2d6a..569927e9 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -5,7 +5,6 @@ import java.io.*; import java.util.*; -import java.util.stream.Collectors; import static com.sprint.mission.discodeit.util.DataInitializer.USERSTATUS_FILE_PATH; 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..6b8f3a1f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java @@ -0,0 +1,67 @@ +package com.sprint.mission.discodeit.repository.jcf; + +import com.sprint.mission.discodeit.entity.BinaryContent; +import com.sprint.mission.discodeit.repository.BinaryContentRepository; + +import java.util.*; +import java.util.stream.Collectors; + +public class JCFBinaryContentRepository implements BinaryContentRepository { + private final Map data = new HashMap<>(); + + @Override + public BinaryContent save(BinaryContent binaryContent) { + data.put(binaryContent.getId(), binaryContent); + return binaryContent; + } + + @Override + public BinaryContent find(UUID id) { + return data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public List findByUserId(UUID userId) { + return data.values().stream() + .filter(binaryContent -> binaryContent.getUserId().equals(userId)) + .collect(Collectors.toList()); + } + + @Override + public boolean delete(UUID id) { + return this.data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getUserId(), userId)) + .map(BinaryContent::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + return deleted; + } + + @Override + public boolean deleteByMessageId(UUID messageId) { + List toRemove = data.values().stream() + .filter(file -> Objects.equals(file.getMessageId(), messageId)) + .map(BinaryContent::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + return deleted; + } +} From 6fdf6f34858a5ed2fbb4b1e3d6290332a221a967 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 14:07:08 +0900 Subject: [PATCH 27/33] =?UTF-8?q?feat:=20JCFUserStatus=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/UserStatusRepository.java | 2 +- .../file/FileUserStatusRepository.java | 6 +-- .../jcf/JCFUserStatusRepository.java | 51 +++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java index 18bad51a..9afef845 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java @@ -15,7 +15,7 @@ public interface UserStatusRepository { public Optional findByUserId(UUID userId); - public UserStatus update(UserStatus userstatus); + public UserStatus update(UserStatus update); public boolean delete(UUID id); 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 index 569927e9..28e704e8 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -38,12 +38,12 @@ public Optional findByUserId(UUID userId) { } @Override - public UserStatus update(UserStatus userstatus) { - UserStatus userStatus = data.get(userstatus.getUserId()); + public UserStatus update(UserStatus update) { + UserStatus userStatus = data.get(update.getUserId()); userStatus.updateOnlineStatus(userStatus.isOnline()); userStatus.updatelastOnline();; saveData(); - return userstatus; + return update; } @Override 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..3ce7e0a7 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserStatusRepository.java @@ -0,0 +1,51 @@ +package com.sprint.mission.discodeit.repository.jcf; + +import com.sprint.mission.discodeit.entity.UserStatus; +import com.sprint.mission.discodeit.repository.UserStatusRepository; + +import java.util.*; + +public class JCFUserStatusRepository implements UserStatusRepository { + private final Map data = new HashMap<>(); + + @Override + public UserStatus create(UserStatus userstatus) { + this.data.put(userstatus.getUserId(), userstatus); + return userstatus; + } + + @Override + public UserStatus find(UUID id) { + return this.data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public Optional findByUserId(UUID userId) { + return data.values().stream() + .filter(userStatus -> Objects.equals(userStatus.getUserId(), userId)) + .findFirst(); + } + + @Override + public UserStatus update(UserStatus update) { + UserStatus userStatus = this.data.get(update.getUserId()); + userStatus.updateOnlineStatus(update.isOnline()); + userStatus.updatelastOnline(); + return userStatus; + } + + @Override + public boolean delete(UUID id) { + return data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + return data.remove(userId) != null; + } +} From 501cdc0a71f9dd6315d2cb2af437bd509091a28c Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 14:16:52 +0900 Subject: [PATCH 28/33] =?UTF-8?q?feat:=20JCFReadStatus=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/JCFReadStatusRepository.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java new file mode 100644 index 00000000..9ea76f13 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java @@ -0,0 +1,80 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.ReadStatus; +import com.sprint.mission.discodeit.repository.ReadStatusRepository; + +import java.util.*; + +public class JCFReadStatusRepository implements ReadStatusRepository { + private final Map data = new HashMap<>(); + + @Override + public ReadStatus create(ReadStatus readStatus) { + this.data.put(readStatus.getId(), readStatus); + return readStatus; + } + + @Override + public ReadStatus find(UUID id) { + return this.data.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(data.values()); + } + + @Override + public List findByUserId(UUID userId) { + return data.values().stream() + .filter(readStatus -> Objects.equals(readStatus.getUserId(), userId)) + .toList(); + } + + @Override + public List findByChannelId(UUID channelId) { + return data.values().stream() + .filter(readStatus -> Objects.equals(readStatus.getChannelId(), channelId)) + .toList(); + } + + @Override + public ReadStatus update(ReadStatus update) { + ReadStatus readStatus = this.data.get(update.getId()); + readStatus.updateLastReadTime(update.getLastReadTime()); + return update; + } + + @Override + public boolean delete(UUID id) { + return data.remove(id) != null; + } + + @Override + public boolean deleteByUserId(UUID userId) { + List toRemove = data.values().stream() + .filter(readStatus -> Objects.equals(readStatus.getUserId(), userId)) + .map(ReadStatus::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + return deleted; + } + + @Override + public boolean deleteByChannelId(UUID channelId) { + List toRemove = data.values().stream() + .filter(readStatus -> Objects.equals(readStatus.getChannelId(), channelId)) + .map(ReadStatus::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + return deleted; + } +} From bacd4349bf93cfae26ed1d183312aab7c4259d76 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 14:28:18 +0900 Subject: [PATCH 29/33] =?UTF-8?q?feat:=20File*Repository=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/FileChannelRepository.java | 8 +++-- .../file/FileMessageRepository.java | 35 ++++++++++++++++--- .../file/FileReadStatusRepository.java | 2 ++ .../repository/file/FileUserRepository.java | 23 ++++++------ .../file/FileUserStatusRepository.java | 2 ++ .../JCFReadStatusRepository.java | 4 ++- 6 files changed, 55 insertions(+), 19 deletions(-) rename src/main/java/com/sprint/mission/discodeit/repository/{file => jcf}/JCFReadStatusRepository.java (95%) 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 9c947e53..80956f86 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 @@ -19,15 +19,16 @@ public class FileChannelRepository implements ChannelRepository { //채널 생성 @Override - public void create(Channel channel) { + public Channel create(Channel channel) { data.put(channel.getId(), channel); saveData(); + return channel; } //채널 조회 @Override - public Channel find(UUID id) { - return this.data.get(id); + public Optional find(UUID id) { + return Optional.ofNullable(this.data.get(id)); } //채널 전체 조회 @@ -49,6 +50,7 @@ public List findByChannelName(String channelName) { public Channel update(UUID id, Channel update) { Channel channel = this.data.get(id); channel.update(update); + saveData(); return channel; } 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 3a6c4a2c..bca9cc4a 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 @@ -6,11 +6,12 @@ import com.sprint.mission.discodeit.repository.UserRepository; import org.springframework.stereotype.Repository; -import static com.sprint.mission.discodeit.util.DataInitializer.*; - import java.io.*; +import java.time.Instant; import java.util.*; +import static com.sprint.mission.discodeit.util.DataInitializer.MESSAGE_FILE_PATH; + @Repository public class FileMessageRepository implements MessageRepository { private static final long serialVersionUID = 1L; @@ -29,9 +30,10 @@ public FileMessageRepository(UserRepository userRepository, ChannelRepository ch //메시지 생성 @Override - public void create(Message message) { + public Message create(Message message) { data.put(message.getId(), message); saveData(); + return message; } //메시지 조회 @@ -50,7 +52,8 @@ public List findAll() { @Override public Message update(UUID id, Message update) { Message selected = this.data.get(id); - selected.update(update); + selected.update(update.getContent()); + saveData(); return selected; } @@ -60,6 +63,30 @@ public boolean delete(UUID id) { return data.remove(id) != null; } + @Override + public Optional findLastMessageTimeByChannelId(UUID channelId) { + return data.values().stream() + .filter(msg -> Objects.equals(msg.getChannelId(), channelId)) + .map(Message::getCreatedAt) + .max(Comparator.naturalOrder()); + } + + @Override + public boolean deleteByChannelId(UUID channelId) { + List toRemove = data.values().stream() + .filter(message -> Objects.equals(message.getChannelId(), channelId)) + .map(Message::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + + saveData(); + return deleted; + } + private void saveData() { try (FileOutputStream fos = new FileOutputStream(FILE_PATH); ObjectOutputStream oos = new ObjectOutputStream(fos)) { 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 index 594fa564..88fb3881 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -2,6 +2,7 @@ import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import org.springframework.stereotype.Repository; import java.io.*; import java.util.*; @@ -9,6 +10,7 @@ import static com.sprint.mission.discodeit.util.DataInitializer.READSTATUS_FILE_PATH; +@Repository public class FileReadStatusRepository implements ReadStatusRepository { private final String FILE_PATH = READSTATUS_FILE_PATH; 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 76cc89be..faf3e48c 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 @@ -5,11 +5,10 @@ import com.sprint.mission.discodeit.repository.UserRepository; import org.springframework.stereotype.Repository; -import static com.sprint.mission.discodeit.util.DataInitializer.*; - import java.io.*; import java.util.*; -import java.util.stream.Collectors; + +import static com.sprint.mission.discodeit.util.DataInitializer.USER_FILE_PATH; @Repository public class FileUserRepository implements UserRepository { @@ -26,23 +25,24 @@ public FileUserRepository(ChannelRepository channelRepository) { } @Override - public void create(User user) { + public User create(User user) { this.data.put(user.getId(), user); saveData(); + return user; } //유저 아이디 조회 @Override - public User find(UUID id) { - return this.data.get(id); + public Optional find(UUID id) { + return Optional.ofNullable(this.data.get(id)); } //유저 이름으로 조회 @Override - public List findByUserName(String name) { + public Optional findByUserName(String name) { return data.values().stream() - .filter(user -> user.getName().contains(name)) - .collect(Collectors.toList()); + .filter(user -> Objects.equals(user.getName(), name)) + .findFirst(); } //유저 전체 조회 @@ -53,9 +53,10 @@ public List findAll() { //유저 수정 @Override - public User update(UUID id, User update) { - User user = this.data.get(id); + public User update(User update) { + User user = this.data.get(update.getId()); user.update(update); + saveData(); return user; } 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 index 28e704e8..3f5f7b2f 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -2,12 +2,14 @@ import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserStatusRepository; +import org.springframework.stereotype.Repository; import java.io.*; import java.util.*; import static com.sprint.mission.discodeit.util.DataInitializer.USERSTATUS_FILE_PATH; +@Repository public class FileUserStatusRepository implements UserStatusRepository { private final String FILE_PATH = USERSTATUS_FILE_PATH; diff --git a/src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java similarity index 95% rename from src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java rename to src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java index 9ea76f13..9940adc0 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/JCFReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java @@ -1,10 +1,12 @@ -package com.sprint.mission.discodeit.repository.file; +package com.sprint.mission.discodeit.repository.jcf; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; +import org.springframework.stereotype.Repository; import java.util.*; +@Repository public class JCFReadStatusRepository implements ReadStatusRepository { private final Map data = new HashMap<>(); From 3a1cf4ffb1c166f1488947e4eb8a90f5a038077b Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Fri, 2 May 2025 14:33:16 +0900 Subject: [PATCH 30/33] =?UTF-8?q?feat:=20JCF*Repository=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/jcf/JCFChannelRepository.java | 7 +++-- .../repository/jcf/JCFMessageRepository.java | 28 +++++++++++++++++-- .../repository/jcf/JCFUserRepository.java | 20 ++++++------- 3 files changed, 40 insertions(+), 15 deletions(-) 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 cce4a701..dab79d1d 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 @@ -13,14 +13,15 @@ public class JCFChannelRepository implements ChannelRepository { //채널 생성 @Override - public void create(Channel channel) { + public Channel create(Channel channel) { data.put(channel.getId(), channel); + return channel; } //채널 조회 @Override - public Channel find(UUID id) { - return data.get(id); + public Optional find(UUID id) { + return Optional.ofNullable(this.data.get(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 378b2e98..de1e861e 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 @@ -3,6 +3,7 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.MessageRepository; +import java.time.Instant; import java.util.*; public class JCFMessageRepository implements MessageRepository { @@ -10,8 +11,9 @@ public class JCFMessageRepository implements MessageRepository { //메시지 생성 @Override - public void create(Message message) { + public Message create(Message message) { data.put(message.getId(), message); + return message; } //메시지 조회 @@ -30,7 +32,7 @@ public List findAll() { @Override public Message update(UUID id, Message update) { Message selected = this.data.get(id); - selected.update(update); + selected.update(update.getContent()); return selected; } @@ -40,4 +42,26 @@ public boolean delete(UUID id) { return data.remove(id) != null; } + @Override + public Optional findLastMessageTimeByChannelId(UUID channelId) { + return data.values().stream() + .filter(msg -> Objects.equals(msg.getChannelId(), channelId)) + .map(Message::getCreatedAt) + .max(Comparator.naturalOrder()); + } + + @Override + public boolean deleteByChannelId(UUID channelId) { + List toRemove = data.values().stream() + .filter(message -> Objects.equals(message.getChannelId(), channelId)) + .map(Message::getId) + .toList(); + + boolean deleted = false; + for (UUID id : toRemove) { + deleted |= data.remove(id) != null; + } + + return deleted; + } } 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 52374b6d..50a50ff3 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 @@ -12,23 +12,23 @@ public class JCFUserRepository implements UserRepository { //유저 생성 @Override - public void create(User user) { + public User create(User user) { this.data.put(user.getId(), user); + return user; } //유저 아이디 조회 @Override - public User find(UUID id) { - return this.data.get(id); + public Optional find(UUID id) { + return Optional.ofNullable(this.data.get(id)); } //유저 이름으로 조회 @Override - public List findByUserName(String name) { - List result = data.values().stream() - .filter(user -> user.getName().contains(name)) - .collect(Collectors.toList()); - return result; + public Optional findByUserName(String name) { + return data.values().stream() + .filter(user -> Objects.equals(user.getName(), name)) + .findFirst(); } //유저 전체 조회 @@ -39,8 +39,8 @@ public List findAll() { //유저 수정 @Override - public User update(UUID id, User update) { - User user = this.data.get(id); + public User update(User update) { + User user = this.data.get(update.getId()); user.update(update); return user; } From d849fa437b5c4dfe07673137ea1f8e8dad41d9e1 Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Sun, 4 May 2025 02:38:14 +0900 Subject: [PATCH 31/33] =?UTF-8?q?feat:=20discodeitApp=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 | 376 +++++---- .../mission/discodeit/JavaApplication.java | 734 +++++++++--------- .../com/sprint/mission/discodeit/channel.ser | Bin 1532 -> 0 bytes .../dto/Response/ChannelResponse.java | 3 +- .../discodeit/dto/Response/UserResponse.java | 2 + .../create/ChannelCreateRequest_private.java | 3 +- .../dto/request/create/UserCreateRequest.java | 5 +- .../request/update/ChannelUpdateRequest.java | 3 +- .../dto/request/update/UserUpdateRequest.java | 1 + .../discodeit/entity/BinaryContent.java | 4 +- .../mission/discodeit/entity/Channel.java | 25 +- .../mission/discodeit/entity/Message.java | 2 - .../mission/discodeit/entity/ReadStatus.java | 4 +- .../sprint/mission/discodeit/entity/User.java | 2 - .../mission/discodeit/entity/UserStatus.java | 4 +- .../discodeit/factory/ServiceFactory.java | 1 - .../com/sprint/mission/discodeit/message.ser | Bin 1820 -> 0 bytes .../repository/ChannelRepository.java | 2 +- .../file/FileBinaryContentRepository.java | 14 +- .../file/FileChannelRepository.java | 2 +- .../jcf/JCFBinaryContentRepository.java | 13 +- .../repository/jcf/JCFChannelRepository.java | 2 +- .../jcf/JCFReadStatusRepository.java | 3 +- .../repository/jcf/JCFUserRepository.java | 2 - .../discodeit/service/ChannelService.java | 16 +- .../discodeit/service/UserService.java | 2 + .../basic/BasicBinaryContentService.java | 2 +- .../service/basic/BasicChannelService.java | 20 +- .../service/basic/BasicMessageService.java | 5 +- .../service/basic/BasicUserService.java | 55 +- .../service/file/FileChannelService.java | 264 +++---- .../service/file/FileMessageService.java | 178 ++--- .../service/file/FileUserService.java | 268 +++---- .../service/jcf/JCFChannelService.java | 233 +++--- .../service/jcf/JCFMessageService.java | 148 ++-- .../discodeit/service/jcf/JCFUserService.java | 220 +++--- .../com/sprint/mission/discodeit/user.ser | Bin 921 -> 0 bytes .../discodeit/util/DataInitializer.java | 12 +- src/main/resources/data/binarycontent.ser | Bin 0 -> 82 bytes src/main/resources/data/channel.ser | Bin 0 -> 1991 bytes src/main/resources/data/message.ser | Bin 0 -> 873 bytes src/main/resources/data/readstatus.ser | Bin 0 -> 885 bytes src/main/resources/data/user.ser | Bin 0 -> 1020 bytes src/main/resources/data/userstatus.ser | Bin 0 -> 637 bytes src/main/resources/icon.png | Bin 0 -> 923 bytes 45 files changed, 1390 insertions(+), 1240 deletions(-) delete mode 100644 src/main/java/com/sprint/mission/discodeit/channel.ser delete mode 100644 src/main/java/com/sprint/mission/discodeit/message.ser delete mode 100644 src/main/java/com/sprint/mission/discodeit/user.ser create mode 100644 src/main/resources/data/binarycontent.ser create mode 100644 src/main/resources/data/channel.ser create mode 100644 src/main/resources/data/message.ser create mode 100644 src/main/resources/data/readstatus.ser create mode 100644 src/main/resources/data/user.ser create mode 100644 src/main/resources/data/userstatus.ser create mode 100644 src/main/resources/icon.png diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index 78f384a6..a6ce5a5e 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -1,7 +1,15 @@ package com.sprint.mission.discodeit; -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.dto.Response.ChannelResponse; +import com.sprint.mission.discodeit.dto.Response.MessageResponse; +import com.sprint.mission.discodeit.dto.Response.UserResponse; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_private; +import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_public; +import com.sprint.mission.discodeit.dto.request.create.MessageCreateRequest; +import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; +import com.sprint.mission.discodeit.dto.request.update.ChannelUpdateRequest; +import com.sprint.mission.discodeit.dto.request.update.MessageUpdateRequest; +import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; @@ -18,12 +26,10 @@ public class DiscodeitApplication { public static void main(String[] args) { - ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); - //초기화 DataInitializer.clearSerializedData(); -// ServiceFactory serviceFactory = ServiceFactory.getInstance(); + ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); //콩받기 UserService userService = context.getBean(UserService.class); @@ -31,41 +37,42 @@ public static void main(String[] args) { MessageService messageService = context.getBean(MessageService.class); - List users = createAndRegisterUsers(userService); - List channels = createAndRegisterChannels(channelService, users); - List messages = createAndRegisterMessages(messageService, users, channels); + List users = createAndRegisterUsers(userService); + List channels = createAndRegisterChannels(channelService, users); + List messages = createAndRegisterMessages(messageService, users, channels); demonstrateUserOperations(userService, users); - demonstrateChannelOperations(channelService, channels,users); - demonstrateMessageOperations(messageService); + demonstrateChannelOperations(channelService, channels, users); + demonstrateMessageOperations(messageService, messages, channels); } //유저생성 및 등록 - private static List createAndRegisterUsers(UserService userService) { - List users = List.of( - new User("조현아", "akbkck8101@gmail.com", "010-6658-8101", "2701"), - new User("신짱구", "zzang9@gmail.com", "010-1234-5678", "9999"), - new User("김철슈", "steelwater@naver.com", "010-0000-0000", "steelwater"), - new User("이훈이", "2hun2@naver.com", "010-2345-6789", "2hun222"), - new User("맹구", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), - new User("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345"), - new User("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) + private static List createAndRegisterUsers(UserService userService) { + List users = List.of( + new UserCreateRequest("조현아", "akbkck8101@gmail.com", "010-6658-8101", "2701",null,null), + new UserCreateRequest("신짱구", "zzang9@gmail.com", "010-1234-5678", "9999",null,null), + new UserCreateRequest("김철슈", "steelwater@naver.com", "010-0000-0000", "steelwater", null,null), + new UserCreateRequest("이훈이", "2hun2@naver.com", "010-2345-6789", "2hun222",null,null), + new UserCreateRequest("맹구", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover",null,null), + new UserCreateRequest("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345",null,null), + new UserCreateRequest("한유리", "yuryyy@gmail.com", "010-1111-2222", "12345",null,null) //중복 이메일 유저_ex) ); System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n."); - List registeredUsers = users.stream() - .filter(user -> { + List registeredUsers = users.stream() + .map(user -> { try { - userService.create(user); - System.out.println("유저 등록 완료: " + user.getName()); - return true; + UserResponse response = userService.create(user); + System.out.println("유저 등록 완료: " + user.name()); + return response; } catch (IllegalArgumentException e) { System.out.println("!!유저 등록 실패!! " + e.getMessage()); - return false; + return null; } }) + .filter(Objects::nonNull) .toList(); System.out.println(".\n.\n<--------------------유저 등록 종료---------------------------->\n"); @@ -73,72 +80,93 @@ private static List createAndRegisterUsers(UserService userService) { } //채널,멤버,카테고리 생성 및 등록 - private static List createAndRegisterChannels(ChannelService channelService, List users) { + private static List createAndRegisterChannels(ChannelService channelService, List users) { //채널1 멤버, 카테고리생성 - Set members1 = new HashSet<>(Set.of(users.get(0), users.get(1), users.get(3))); + Set members1 = Set.of(users.get(0).id(), users.get(1).id(), users.get(3).id()); List cat1 = List.of("공지", "질문", "2팀"); - Set members2 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4))); + Set members2 = Set.of(users.get(1).id(), users.get(2).id(), users.get(4).id()); List cat2 = List.of("이벤트", "소통"); - Set members3 = new HashSet<>(Set.of(users.get(5))); + Set members3 = Set.of(users.get(5).id()); List cat3 = List.of("기타"); //중복 카테고리 List cat5 = List.of("공지","공지"); - List channels = List.of( - new Channel("sp01", users.get(1), cat1, members1), - new Channel("sp02", users.get(1), cat2, members2), - new Channel("sp03", users.get(5), cat3, members3), - new Channel("sp03", users.get(5), cat3, members3), //중복 채널명_ex) - new Channel("sp05", users.get(5), cat5, members3) //중복 카테고리_ex) + List> channelConfigs = List.of( + Map.of("name", "sp01", "creator", users.get(1), "categories", cat1, "members", members1, "isPrivate", false), + Map.of("name", "sp02", "creator", users.get(1), "categories", cat2, "members", members2, "isPrivate", false), + Map.of("name", "sp03", "creator", users.get(5), "categories", cat3, "members", members3, "isPrivate", false), + Map.of("name", "sp03", "creator", users.get(5), "categories", cat3, "members", members3, "isPrivate", false), + Map.of("name", "sp05", "creator", users.get(5), "categories", cat5, "members", members3, "isPrivate", false), + Map.of("name", "", "creator", users.get(5), "categories", new ArrayList<>(), "members", members3, "isPrivate", true), + Map.of("name", "", "creator", users.get(5), "categories", new ArrayList<>(), "members", members3, "isPrivate", true) ); System.out.println("<--------------------채널을 등록합니다------------------------->\n.\n."); - - List registeredChannels = channels.stream() - .filter(channel -> { - try { - channelService.create(channel); - System.out.println("채널 등록 완료: " + channel.getChannelName()); - return true; - } catch (IllegalArgumentException e) { - System.out.println("!!채널 등록 실패!! " + e.getMessage()); - return false; - } - }) - .toList(); // 성공한 채널만 리스트로 변환 + List registeredChannels = new ArrayList<>(); + + for (Map channelConfig : channelConfigs) { + String name = (String) channelConfig.get("name"); + UserResponse creator = (UserResponse) channelConfig.get("creator"); + List categories = (List) channelConfig.get("categories"); + Set members = (Set) channelConfig.get("members"); + boolean isPrivate = (boolean) channelConfig.get("isPrivate"); + + try { + ChannelResponse response; + if (isPrivate) { + // PRIVATE 채널은 이름/카테고리 없이 생성 + var request = new ChannelCreateRequest_private(creator.id(), members); + response = channelService.createPrivateChannel(request); + } else { + var request = new ChannelCreateRequest_public(name, creator.id(), categories, members); + response = channelService.createPublicChannel(request); + } + + registeredChannels.add(response); + if(isPrivate){ + System.out.println("Private 채널 등록 완료"); + } else System.out.println("채널 등록 완료: " + name); + // 실제 저장된 채널을 찾아서 registeredChannels에 추가하려면 Repository에서 다시 조회 필요 + } catch (IllegalArgumentException e) { + System.out.println("!!채널 등록 실패!! " + name + ": " + e.getMessage()); + } + } System.out.println(".\n.\n<--------------------채널 등록 종료---------------------------->\n"); return registeredChannels; } //메시지 생성 및 등록 - private static List createAndRegisterMessages(MessageService messageService, List users, List channels) { - List messages = List.of( - new Message(users.get(0), channels.get(0), "공지", "공지입니다."), - new Message(users.get(1), channels.get(0), "2팀", "안녕하세요."), - new Message(users.get(4), channels.get(1), "소통", "소통해요"), - new Message(users.get(2), channels.get(1), "소통", "좋아요"), - new Message(users.get(5), channels.get(1), "소통", "hi"), //채널 멤버가 아닌 유저 - new Message(users.get(0), channels.get(0), "공자", "hi") //채널에 없는 카테고리 + private static List createAndRegisterMessages(MessageService messageService, List users, List channels) { + List messages = List.of( + new MessageCreateRequest(users.get(0).id(), channels.get(0).channelId(), "공지", "공지입니다.",null), + new MessageCreateRequest(users.get(1).id(), channels.get(0).channelId(), "2팀", "안녕하세요.",null), + new MessageCreateRequest(users.get(4).id(), channels.get(1).channelId(), "소통", "소통해요",null), + new MessageCreateRequest(users.get(2).id(), channels.get(1).channelId(), "소통", "좋아요",null), + new MessageCreateRequest(users.get(5).id(), channels.get(1).channelId(), "소통", "hi",null), //채널 멤버가 아닌 유저 + new MessageCreateRequest(users.get(0).id(), channels.get(0).channelId(), "공자", "hi",null) //채널에 없는 카테고리 ); System.out.println("<--------------------메시지를 저장합니다----------------------->\n.\n."); - List registeredMessages = messages.stream() - .map(message -> { + Map channelIdToName = channels.stream() + .collect(Collectors.toMap(ChannelResponse::channelId, ChannelResponse::channelName)); + + List registeredMessages = messages.stream() + .map(request -> { try { - messageService.create(message); - System.out.println("[" + message.getChannel().getChannelName() + "] 채널에 메시지 등록 완료"); - return message; + MessageResponse response = messageService.create(request); + System.out.println("[" + channelIdToName.get(request.channelId()) + "] 채널에 메시지 등록 완료"); + return response; } catch (IllegalArgumentException e) { System.out.println("!!메시지 등록 실패!! " + e.getMessage()); return null; } }) - .filter(Objects::nonNull) // null 제거 (등록 실패한 메시지 필터링) + .filter(Objects::nonNull) .collect(Collectors.toList()); System.out.println(".\n.\n<--------------------메시지 저장 종료-------------------------->\n"); @@ -146,16 +174,16 @@ private static List createAndRegisterMessages(MessageService messageSer } - private static void demonstrateUserOperations(UserService userService, List users){ + private static void demonstrateUserOperations(UserService userService, List users){ System.out.println("\n########################### User ###############################"); - readUser(userService, users); + findUser(userService, users); updateUser(userService, users); deleteUser(userService, users); } - private static void readUser(UserService userService, List users){ + private static void findUser(UserService userService, List users){ System.out.println("------------------------- ReadUser -----------------------------"); //전체 유저조회(다건 조회) System.out.println("\n전체 유저 목록: "); @@ -163,42 +191,42 @@ private static void readUser(UserService userService, List users){ //특정 유저조회(단건 조회, 이름) System.out.println("\n신짱구 유저 조회(이름으로 검색): "); - userService.findByName("신짱구").forEach(System.out::println); + System.out.println(userService.findByUserName("신짱구")); //특정 유저조회(단건 조회, id) System.out.println("\n이훈이 유저 조회(id로 검색): "); - System.out.println(userService.find(users.get(3).getId()).toString()); + System.out.println(userService.find(users.get(3).id()).toString()); //이름에 "구"가 포함된 유저 System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); - userService.findByName("구").forEach(System.out::println); + System.out.println(userService.findByUserNameKeyWords("구")); } - private static void updateUser(UserService userService, List users){ + private static void updateUser(UserService userService, List users){ System.out.println("\n------------------------- UpdateUser ---------------------------"); //유저 수정 테스트 System.out.println("\n유저 수정하기\n수정 전: "); //수정하려는 유저 original에 저장 - User original = users.get(2); - System.out.println(userService.find(original.getId())); + UserResponse original = users.get(2); + System.out.println(userService.find(original.id())); //수정한 유저정보 updated에 저장 - User updated = userService.update(original.getId(), new User("김철수", original.getEmail(), "010-0011-0011", original.getPassword())); + UserResponse updated = userService.update( new UserUpdateRequest(original.id(),"김철수", original.email(), "010-0011-0011", original.password(), null)); System.out.println("수정 후(이름, 번호): "); - System.out.println(userService.find(updated.getId())); + System.out.println(userService.find(updated.id())); } - private static void deleteUser(UserService userService, List users){ + private static void deleteUser(UserService userService, List users){ System.out.println("\n------------------------ DeleteUser ----------------------------"); System.out.println("\n전체 유저 목록: "); userService.findAll().forEach(System.out::println); //유저 삭제 실패 - System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); - userService.delete(users.get(3).getId(),"0000"); + System.out.println("\n"+ users.get(3).userName() +" 유저 탈퇴 진행중..\n.\n.\n"); + userService.delete(users.get(3).id(),"0000"); //유저 삭제 성공 - System.out.println("\n"+ users.get(3).getName() +"유저 탈퇴 진행중..\n.\n.\n"); - userService.delete(users.get(3).getId(),"2hun222"); + System.out.println("\n"+ users.get(3).userName() +"유저 탈퇴 진행중..\n.\n.\n"); + userService.delete(users.get(3).id(),"2hun222"); //삭제 후 전체 유저 조회 System.out.println("\n\n전체 유저 목록: "); @@ -206,129 +234,168 @@ private static void deleteUser(UserService userService, List users){ System.out.println(); } - private static void demonstrateChannelOperations(ChannelService channelService, List channels, List users) { + private static void demonstrateChannelOperations(ChannelService channelService, List channels, List users) { System.out.println("\n########################### Channel ############################"); - readChannel(channelService,channels,users); + findChannel(channelService, users); updateChannel(channelService,channels,users); deleteChannel(channelService,channels,users); } - private static void readChannel(ChannelService channelService, List channels, List users){ - System.out.println("------------------------- ReadChannel --------------------------"); + private static void findChannel(ChannelService channelService, List users){ + System.out.println("------------------------- findChannel --------------------------"); System.out.println("\n전체 채널 목록"); - if (channelService.findAllByUserId().isEmpty()) { + //신짱구 유저가 있는 채널 조회 + UUID userId = users.get(1).id(); + List userChannels = channelService.findAllByUserId(userId); + + if (userChannels.isEmpty()) { System.out.println("조회할 채널이 없습니다."); } else { - channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); + userChannels.forEach(channel -> System.out.println("[" + channel.channelName() + "]")); } - //특정 채널 정보 try { - Channel channel = channelService.find(channels.get(0).getId()); - System.out.println("\n채널명: " + channel.getChannelName()); - System.out.println("카테고리: " + channel.getCategory()); + ChannelResponse channel = channelService.find(userChannels.get(0).channelId()); + System.out.println("\n채널명: " + channel.channelName()); + System.out.println("카테고리: " + channel.categories()); } catch (IllegalArgumentException e) { System.out.println("!!채널 조회 실패!! " + e.getMessage()); } - //채널 멤버조회 + + //조회 위해 private채널 별도 저장 + Set members = Set.of(users.get(1).id(), users.get(2).id(), users.get(5).id()); + + ChannelResponse privateChannel = channelService.createPrivateChannel( + new ChannelCreateRequest_private(users.get(5).id(), members)); + + //private 채널 조회 try { - System.out.print("\n[sp01] 채널 멤버: "); - for (User member : channelService.members(channels.get(0).getId())) { - System.out.print(member.getName() + " "); - } + System.out.println("\nPrivate 채널 조회"); + ChannelResponse channel = channelService.find(privateChannel.channelId()); + System.out.println(channel); + } catch (IllegalArgumentException e) { System.out.println("!!채널 조회 실패!! " + e.getMessage()); } + + //sp01채널 멤버조회 + System.out.println("\n[sp01]채널 멤버 조회"); + ChannelResponse sp01 = userChannels.stream() + .filter(c -> "sp01".equals(c.channelName())) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("[sp01]채널을 찾을 수 없습니다.")); + + for (User member : channelService.members(sp01.channelId())) { + System.out.print(member.getName() + " "); + } + System.out.println(); } - private static void updateChannel(ChannelService channelService, List channels, List users){ + private static void updateChannel(ChannelService channelService, List channels, List users){ System.out.println("\n------------------------- UpdateChannel -----------------------"); //채널 수정 - Channel original = channels.get(2); //수정하려는 채널 + ChannelResponse original = channels.get(2); //수정하려는 채널 - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); - System.out.println("수정 전: " + channelService.find(original.getId())); + System.out.println("\n["+ original.channelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("수정 전: " + channelService.find(original.channelId())); //수정한 채널 updated에 저장, 출력(채널명 수정) try { - Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); + ChannelUpdateRequest updatedChannel1 = new ChannelUpdateRequest( + original.channelId(), "변경sp03", original.categories(), original.creatorId()); + ChannelResponse success_updatedChannel1 = channelService.update(updatedChannel1); + System.out.println("수정 후: " + success_updatedChannel1); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.find(original.getId())); + System.out.println("\n["+ original.channelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("\n["+ original.channelName() +"] 수정 완료(새 유저로 방장 변경): "); + System.out.println("수정 전: " + channelService.find(original.channelId())); try { - Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); + ChannelUpdateRequest updatedChannel2 = new ChannelUpdateRequest( + original.channelId(), original.channelName(), original.categories(), users.get(1).id()); + ChannelResponse success_updatedChannel2 = channelService.update(updatedChannel2); + System.out.println("방장 변경 후: " + success_updatedChannel2); } catch (IllegalArgumentException e) { - System.out.println("!!채널 수정 실패!! " + e.getMessage()); + System.out.println("!!방장 변경 실패!! " + e.getMessage()); } //기존 유저에서 방장변경 //채널1에서 변경 original = channels.get(0); - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.find(original.getId())); + System.out.println("\n["+ original.channelName() +"] 채널 수정 진행중\n.\n.\n."); + System.out.println("\n["+ original.channelName() +"] 수정 완료(기존 유저로 방장 변경): "); + System.out.println("수정 전: " + channelService.find(original.channelId())); try { - Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); + ChannelUpdateRequest updatedChannel3 = new ChannelUpdateRequest( + original.channelId(), original.channelName(), original.categories(), users.get(0).id()); + ChannelResponse success_updatedChannel3 = channelService.update(updatedChannel3); + System.out.println("수정 후: " + success_updatedChannel3); } catch (IllegalArgumentException e) { System.out.println("!!채널 수정 실패!! " + e.getMessage()); } - } - private static void deleteChannel(ChannelService channelService, List channels, List users){ + private static void deleteChannel(ChannelService channelService, List channels, List users){ System.out.println("\n------------------------ DeleteChannel ------------------------"); + //삭제 시도할 유저 + UUID userId = users.get(1).id(); + System.out.print("\n전체 채널 목록: \n"); - channelService.findAllByUserId().forEach(System.out::println); + channelService.findAllByUserId(userId).forEach(System.out::println); //채널 삭제 실패 - System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); - channelService.delete(channels.get(2).getId(), users.get(1), "0000"); + System.out.println("\n["+ channels.get(2).channelName() + "] 채널 삭제 진행중..\n.\n.\n"); + try { + channelService.delete(channels.get(2).channelId(), userId, "0000"); // 비밀번호가 다를 수 있음 + System.out.println("삭제 성공!"); + } catch (IllegalArgumentException e) { + System.out.println("삭제 실패: " + e.getMessage()); // → 비밀번호 불일치로 삭제 실패 + } //채널 삭제 성공 - System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); - channelService.delete(channels.get(2).getId(), users.get(1), "9999"); + System.out.println("\n["+ channels.get(2).channelName()+"] 채널 삭제 진행중..\n.\n.\n"); + try { + channelService.delete(channels.get(2).channelId(), userId, "9999"); // 비밀번호가 다를 수 있음 + System.out.println("삭제 성공!"); + } catch (IllegalArgumentException e) { + System.out.println("삭제 실패: " + e.getMessage()); // → 비밀번호 불일치로 삭제 실패 + } //삭제 후 전체 유저 조회 System.out.print("\n전체 채널 목록: \n"); - channelService.findAllByUserId().forEach(System.out::println); - + channelService.findAllByUserId(userId).forEach(System.out::println); } - private static void demonstrateMessageOperations(MessageService messageService) { + private static void demonstrateMessageOperations(MessageService messageService, List messages, List channels) { System.out.println("\n########################### Message ###########################"); - readMessages(messageService); - updateMessages(messageService); - deleteMessages(messageService); + findMessages(messageService, channels); + updateMessages(messageService, messages, channels); + deleteMessages(messageService, messages, channels); } - private static void readMessages(MessageService messageService) { + private static void findMessages(MessageService messageService, List channels) { System.out.println("------------------------- ReadMessage -------------------------"); //메시지 전체조회(다건 조회) System.out.println("\n전체 메시지"); - messageService.findAll().forEach(System.out::println); + messageService.findAllByChannelId(channels.get(0).channelId()).forEach(System.out::println); //메시지3 조회(단건 조회) try{ + UUID messageId = messageService.findAllByChannelId(channels.get(0).channelId()).get(0).id(); System.out.println("\n메시지 조회"); - System.out.println(messageService.find(messageService.findAll().get(2).getId())); + System.out.println(messageService.find(messageId)); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); @@ -337,38 +404,67 @@ private static void readMessages(MessageService messageService) { //존재하지 않는 메시지 조회 try{ - System.out.println("\n메시지 조회"); + System.out.println("\n존재하지 않는 메시지 조회"); System.out.println(messageService.find(UUID.randomUUID())); } catch (IllegalArgumentException e) { System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); } } - private static void updateMessages(MessageService messageService) { + private static void updateMessages(MessageService messageService, List messages, List channels) { System.out.println("\n------------------------- UpdateMessage ------------------------"); + //수정할 메시지 original변수에 저장 - Message original = messageService.find(messageService.findAll().get(0).getId()); - System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.getId())); + MessageResponse original = messages.get(0); + System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.id())); //변경 메시지 updated변수에 저장 - Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); + MessageUpdateRequest updateRequest = new MessageUpdateRequest( + original.id(), "공지 수정합니다~~~~"); //메시지 수정 - messageService.update(original.getId(), updated); - System.out.println("\n메시지1 수정 후: \n" + messageService.find(original.getId())); + MessageResponse updated = messageService.update(updateRequest); + System.out.println("\n메시지1 수정 후: \n" + updated); //수정후 전체 메시지 - System.out.println("\n전체 메시지"); - messageService.findAll().forEach(System.out::println); + System.out.println("\n["+ channels.get(0).channelName() +"]의 전체 메시지"); + messageService.findAllByChannelId(channels.get(0).channelId()).forEach(System.out::println); } - private static void deleteMessages(MessageService messageService) { + private static void deleteMessages(MessageService messageService, List messages, List channels) { System.out.println("\n------------------------ DeleteMessage ------------------------"); //메시지 삭제 - System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); - messageService.delete(messageService.findAll().get(3).getId()); + MessageResponse original = messages.get(3); + UUID targetChannelId = channels.get(1).channelId(); + + System.out.println("[sp02]채널의 메시지 조회"); + try { + messageService.findAllByChannelId(targetChannelId).forEach(System.out::println); + } catch (Exception e) { + System.out.println("삭제 전 메시지 조회 실패: " + e.getMessage()); + } + + try{ + messageService.delete(original.id()); + System.out.println("\n.\n.\n<<[sp02]의 메시지 삭제 완료>>\n"); + } catch (IllegalArgumentException e) { + System.out.println("\n!!메시지 삭제 실패!!" + e.getMessage()); + } //메시지 삭제 후 재조회 System.out.print("삭제 후 전체 메시지: \n"); - messageService.findAll().forEach(System.out::println); + for (ChannelResponse channel : channels) { + String channelName = channel.channelName(); + + try { + if(channelName == null || channelName.isBlank()) { + System.out.println("\nPrivate 채널입니다."); + } else { + System.out.println("\n[" + channel.channelName() + "]의 메시지"); + messageService.findAllByChannelId(channel.channelId()).forEach(System.out::println); + } + } catch (IllegalArgumentException | NoSuchElementException e) { + System.out.println("메시지가 없거나 조회할 수 없습니다. " + e.getMessage()); + } + } } } diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java index c0579ecd..19b1751b 100644 --- a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java @@ -1,367 +1,367 @@ -package com.sprint.mission.discodeit; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.factory.ServiceFactory; -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.util.DataInitializer; - -import java.util.*; -import java.util.stream.Collectors; - -public class JavaApplication { - public static void main(String[] args) { - //초기화 - DataInitializer.clearSerializedData(); - - ServiceFactory serviceFactory = ServiceFactory.getInstance(); - - ChannelService channelService = serviceFactory.createChannelService(); - UserService userService = serviceFactory.createUserService(); - MessageService messageService = serviceFactory.createMessageService(); - - - List users = createAndRegisterUsers(userService); - List channels = createAndRegisterChannels(channelService, users); - List messages = createAndRegisterMessages(messageService, users, channels); - - demonstrateUserOperations(userService, users); - demonstrateChannelOperations(channelService, channels,users); - demonstrateMessageOperations(messageService); - - } - - //유저생성 및 등록 - private static List createAndRegisterUsers(UserService userService) { - List users = List.of( - new User("조현아", "여", "akbkck8101@gmail.com", "010-6658-8101", "2701"), - new User("신짱구", "남", "zzang9@gmail.com", "010-1234-5678", "9999"), - new User("김철슈", "남", "steelwater@naver.com", "010-0000-0000", "steelwater"), - new User("이훈이", "남", "2hun2@naver.com", "010-2345-6789", "2hun222"), - new User("맹구", "남", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), - new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345"), - new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) - ); - - System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n."); - - List registeredUsers = users.stream() - .filter(user -> { - try { - userService.create(user); - System.out.println("유저 등록 완료: " + user.getName()); - return true; - } catch (IllegalArgumentException e) { - System.out.println("!!유저 등록 실패!! " + e.getMessage()); - return false; - } - }) - .toList(); - - System.out.println(".\n.\n<--------------------유저 등록 종료---------------------------->\n"); - return registeredUsers; - } - - //채널,멤버,카테고리 생성 및 등록 - private static List createAndRegisterChannels(ChannelService channelService, List users) { - //채널1 멤버, 카테고리생성 - Set members1 = new HashSet<>(Set.of(users.get(0), users.get(1), users.get(3))); - List cat1 = List.of("공지", "질문", "2팀"); - - Set members2 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4))); - List cat2 = List.of("이벤트", "소통"); - - Set members3 = new HashSet<>(Set.of(users.get(5))); - List cat3 = List.of("기타"); - - //중복 카테고리 - List cat5 = List.of("공지","공지"); - - List channels = List.of( - new Channel("sp01", users.get(1), cat1, members1), - new Channel("sp02", users.get(1), cat2, members2), - new Channel("sp03", users.get(5), cat3, members3), - new Channel("sp03", users.get(5), cat3, members3), //중복 채널명_ex) - new Channel("sp05", users.get(5), cat5, members3) //중복 카테고리_ex) - ); - - System.out.println("<--------------------채널을 등록합니다------------------------->\n.\n."); - - List registeredChannels = channels.stream() - .filter(channel -> { - try { - channelService.create(channel); - System.out.println("채널 등록 완료: " + channel.getChannelName()); - return true; - } catch (IllegalArgumentException e) { - System.out.println("!!채널 등록 실패!! " + e.getMessage()); - return false; - } - }) - .toList(); // 성공한 채널만 리스트로 변환 - - System.out.println(".\n.\n<--------------------채널 등록 종료---------------------------->\n"); - return registeredChannels; - } - - //메시지 생성 및 등록 - private static List createAndRegisterMessages(MessageService messageService, List users, List channels) { - List messages = List.of( - new Message(users.get(0), channels.get(0), "공지", "공지입니다."), - new Message(users.get(1), channels.get(0), "2팀", "안녕하세요."), - new Message(users.get(4), channels.get(1), "소통", "소통해요"), - new Message(users.get(2), channels.get(1), "소통", "좋아요"), - new Message(users.get(5), channels.get(1), "소통", "hi"), //채널 멤버가 아닌 유저 - new Message(users.get(0), channels.get(0), "공자", "hi") //채널에 없는 카테고리 - ); - - System.out.println("<--------------------메시지를 저장합니다----------------------->\n.\n."); - - List registeredMessages = messages.stream() - .map(message -> { - try { - messageService.create(message); - System.out.println("[" + message.getChannel().getChannelName() + "] 채널에 메시지 등록 완료"); - return message; - } catch (IllegalArgumentException e) { - System.out.println("!!메시지 등록 실패!! " + e.getMessage()); - return null; - } - }) - .filter(Objects::nonNull) // null 제거 (등록 실패한 메시지 필터링) - .collect(Collectors.toList()); - - System.out.println(".\n.\n<--------------------메시지 저장 종료-------------------------->\n"); - return registeredMessages; - } - - - private static void demonstrateUserOperations(UserService userService, List users){ - System.out.println("\n########################### User ###############################"); - - readUser(userService, users); - updateUser(userService, users); - deleteUser(userService, users); - - } - - private static void readUser(UserService userService, List users){ - System.out.println("------------------------- ReadUser -----------------------------"); - //전체 유저조회(다건 조회) - System.out.println("\n전체 유저 목록: "); - userService.findAll().forEach(System.out::println); - - //특정 유저조회(단건 조회, 이름) - System.out.println("\n신짱구 유저 조회(이름으로 검색): "); - userService.findByName("신짱구").forEach(System.out::println); - - //특정 유저조회(단건 조회, id) - System.out.println("\n이훈이 유저 조회(id로 검색): "); - System.out.println(userService.find(users.get(3).getId()).toString()); - - //이름에 "구"가 포함된 유저 - System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); - userService.findByName("구").forEach(System.out::println); - } - private static void updateUser(UserService userService, List users){ - System.out.println("\n------------------------- UpdateUser ---------------------------"); - //유저 수정 테스트 - System.out.println("\n유저 수정하기\n수정 전: "); - - //수정하려는 유저 original에 저장 - User original = users.get(2); - System.out.println(userService.find(original.getId())); - - //수정한 유저정보 updated에 저장 - User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword())); - System.out.println("수정 후(이름, 번호): "); - System.out.println(userService.find(updated.getId())); - } - private static void deleteUser(UserService userService, List users){ - System.out.println("\n------------------------ DeleteUser ----------------------------"); - System.out.println("\n전체 유저 목록: "); - userService.findAll().forEach(System.out::println); - - //유저 삭제 실패 - System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); - userService.delete(users.get(3).getId(),"0000"); - - //유저 삭제 성공 - System.out.println("\n"+ users.get(3).getName() +"유저 탈퇴 진행중..\n.\n.\n"); - userService.delete(users.get(3).getId(),"2hun222"); - - //삭제 후 전체 유저 조회 - System.out.println("\n\n전체 유저 목록: "); - userService.findAll().forEach(System.out::println); - System.out.println(); - } - - private static void demonstrateChannelOperations(ChannelService channelService, List channels, List users) { - System.out.println("\n########################### Channel ############################"); - - readChannel(channelService,channels,users); - updateChannel(channelService,channels,users); - deleteChannel(channelService,channels,users); - } - - private static void readChannel(ChannelService channelService, List channels, List users){ - System.out.println("------------------------- ReadChannel --------------------------"); - System.out.println("\n전체 채널 목록"); - - if (channelService.findAllByUserId().isEmpty()) { - System.out.println("조회할 채널이 없습니다."); - } else { - channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); - } - - - //특정 채널 정보 - try { - Channel channel = channelService.find(channels.get(0).getId()); - System.out.println("\n채널명: " + channel.getChannelName()); - System.out.println("카테고리: " + channel.getCategory()); - - } catch (IllegalArgumentException e) { - System.out.println("!!채널 조회 실패!! " + e.getMessage()); - } - - //채널 멤버조회 - try { - System.out.print("\n[sp01] 채널 멤버: "); - for (User member : channelService.members(channels.get(0).getId())) { - System.out.print(member.getName() + " "); - } - } catch (IllegalArgumentException e) { - System.out.println("!!채널 조회 실패!! " + e.getMessage()); - } - System.out.println(); - } - private static void updateChannel(ChannelService channelService, List channels, List users){ - System.out.println("\n------------------------- UpdateChannel -----------------------"); - - //채널 수정 - Channel original = channels.get(2); //수정하려는 채널 - - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); - System.out.println("수정 전: " + channelService.find(original.getId())); - - //수정한 채널 updated에 저장, 출력(채널명 수정) - try { - Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); - } catch (IllegalArgumentException e) { - System.out.println("!!채널 수정 실패!! " + e.getMessage()); - } - - //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.find(original.getId())); - - try { - Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); - } catch (IllegalArgumentException e) { - System.out.println("!!채널 수정 실패!! " + e.getMessage()); - } - - //기존 유저에서 방장변경 - //채널1에서 변경 - original = channels.get(0); - System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); - System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); - System.out.println("수정 전: " + channelService.find(original.getId())); - - try { - Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); - System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); - } catch (IllegalArgumentException e) { - System.out.println("!!채널 수정 실패!! " + e.getMessage()); - } - - } - private static void deleteChannel(ChannelService channelService, List channels, List users){ - System.out.println("\n------------------------ DeleteChannel ------------------------"); - - System.out.print("\n전체 채널 목록: \n"); - channelService.findAllByUserId().forEach(System.out::println); - - //채널 삭제 실패 - System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); - channelService.delete(channels.get(2).getId(), users.get(1), "0000"); - - //채널 삭제 성공 - System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); - channelService.delete(channels.get(2).getId(), users.get(1), "9999"); - - //삭제 후 전체 유저 조회 - System.out.print("\n전체 채널 목록: \n"); - channelService.findAllByUserId().forEach(System.out::println); - - } - - private static void demonstrateMessageOperations(MessageService messageService) { - System.out.println("\n########################### Message ###########################"); - - readMessages(messageService); - updateMessages(messageService); - deleteMessages(messageService); - } - - private static void readMessages(MessageService messageService) { - System.out.println("------------------------- ReadMessage -------------------------"); - //메시지 전체조회(다건 조회) - System.out.println("\n전체 메시지"); - messageService.findAll().forEach(System.out::println); - - //메시지3 조회(단건 조회) - try{ - System.out.println("\n메시지 조회"); - System.out.println(messageService.find(messageService.findAll().get(2).getId())); - - } catch (IllegalArgumentException e) { - System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); - - } - - //존재하지 않는 메시지 조회 - try{ - System.out.println("\n메시지 조회"); - System.out.println(messageService.find(UUID.randomUUID())); - } catch (IllegalArgumentException e) { - System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); - } - } - private static void updateMessages(MessageService messageService) { - System.out.println("\n------------------------- UpdateMessage ------------------------"); - //수정할 메시지 original변수에 저장 - Message original = messageService.find(messageService.findAll().get(0).getId()); - System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.getId())); - - //변경 메시지 updated변수에 저장 - Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); - - //메시지 수정 - messageService.update(original.getId(), updated); - System.out.println("\n메시지1 수정 후: \n" + messageService.find(original.getId())); - - //수정후 전체 메시지 - System.out.println("\n전체 메시지"); - messageService.findAll().forEach(System.out::println); - } - private static void deleteMessages(MessageService messageService) { - System.out.println("\n------------------------ DeleteMessage ------------------------"); - //메시지 삭제 - System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); - messageService.delete(messageService.findAll().get(3).getId()); - - //메시지 삭제 후 재조회 - System.out.print("삭제 후 전체 메시지: \n"); - messageService.findAll().forEach(System.out::println); - } - -} +//package com.sprint.mission.discodeit; +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.Message; +//import com.sprint.mission.discodeit.entity.User; +//import com.sprint.mission.discodeit.factory.ServiceFactory; +//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.util.DataInitializer; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +//public class JavaApplication { +// public static void main(String[] args) { +// //초기화 +// DataInitializer.clearSerializedData(); +// +// ServiceFactory serviceFactory = ServiceFactory.getInstance(); +// +// ChannelService channelService = serviceFactory.createChannelService(); +// UserService userService = serviceFactory.createUserService(); +// MessageService messageService = serviceFactory.createMessageService(); +// +// +// List users = createAndRegisterUsers(userService); +// List channels = createAndRegisterChannels(channelService, users); +// List messages = createAndRegisterMessages(messageService, users, channels); +// +// demonstrateUserOperations(userService, users); +// demonstrateChannelOperations(channelService, channels,users); +// demonstrateMessageOperations(messageService); +// +// } +// +// //유저생성 및 등록 +// private static List createAndRegisterUsers(UserService userService) { +// List users = List.of( +// new User("조현아", "여", "akbkck8101@gmail.com", "010-6658-8101", "2701"), +// new User("신짱구", "남", "zzang9@gmail.com", "010-1234-5678", "9999"), +// new User("김철슈", "남", "steelwater@naver.com", "010-0000-0000", "steelwater"), +// new User("이훈이", "남", "2hun2@naver.com", "010-2345-6789", "2hun222"), +// new User("맹구", "남", "stone_lover9@gmail.com", "010-1010-0101", "stone_lover"), +// new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345"), +// new User("한유리", "여", "yuryyy@gmail.com", "010-1111-2222", "12345") //중복 이메일 유저_ex) +// ); +// +// System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n."); +// +// List registeredUsers = users.stream() +// .filter(user -> { +// try { +// userService.create(user); +// System.out.println("유저 등록 완료: " + user.getName()); +// return true; +// } catch (IllegalArgumentException e) { +// System.out.println("!!유저 등록 실패!! " + e.getMessage()); +// return false; +// } +// }) +// .toList(); +// +// System.out.println(".\n.\n<--------------------유저 등록 종료---------------------------->\n"); +// return registeredUsers; +// } +// +// //채널,멤버,카테고리 생성 및 등록 +// private static List createAndRegisterChannels(ChannelService channelService, List users) { +// //채널1 멤버, 카테고리생성 +// Set members1 = new HashSet<>(Set.of(users.get(0), users.get(1), users.get(3))); +// List cat1 = List.of("공지", "질문", "2팀"); +// +// Set members2 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4))); +// List cat2 = List.of("이벤트", "소통"); +// +// Set members3 = new HashSet<>(Set.of(users.get(5))); +// List cat3 = List.of("기타"); +// +// //중복 카테고리 +// List cat5 = List.of("공지","공지"); +// +// List channels = List.of( +// new Channel("sp01", users.get(1), cat1, members1), +// new Channel("sp02", users.get(1), cat2, members2), +// new Channel("sp03", users.get(5), cat3, members3), +// new Channel("sp03", users.get(5), cat3, members3), //중복 채널명_ex) +// new Channel("sp05", users.get(5), cat5, members3) //중복 카테고리_ex) +// ); +// +// System.out.println("<--------------------채널을 등록합니다------------------------->\n.\n."); +// +// List registeredChannels = channels.stream() +// .filter(channel -> { +// try { +// channelService.create(channel); +// System.out.println("채널 등록 완료: " + channel.getChannelName()); +// return true; +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 등록 실패!! " + e.getMessage()); +// return false; +// } +// }) +// .toList(); // 성공한 채널만 리스트로 변환 +// +// System.out.println(".\n.\n<--------------------채널 등록 종료---------------------------->\n"); +// return registeredChannels; +// } +// +// //메시지 생성 및 등록 +// private static List createAndRegisterMessages(MessageService messageService, List users, List channels) { +// List messages = List.of( +// new Message(users.get(0), channels.get(0), "공지", "공지입니다."), +// new Message(users.get(1), channels.get(0), "2팀", "안녕하세요."), +// new Message(users.get(4), channels.get(1), "소통", "소통해요"), +// new Message(users.get(2), channels.get(1), "소통", "좋아요"), +// new Message(users.get(5), channels.get(1), "소통", "hi"), //채널 멤버가 아닌 유저 +// new Message(users.get(0), channels.get(0), "공자", "hi") //채널에 없는 카테고리 +// ); +// +// System.out.println("<--------------------메시지를 저장합니다----------------------->\n.\n."); +// +// List registeredMessages = messages.stream() +// .map(message -> { +// try { +// messageService.create(message); +// System.out.println("[" + message.getChannel().getChannelName() + "] 채널에 메시지 등록 완료"); +// return message; +// } catch (IllegalArgumentException e) { +// System.out.println("!!메시지 등록 실패!! " + e.getMessage()); +// return null; +// } +// }) +// .filter(Objects::nonNull) // null 제거 (등록 실패한 메시지 필터링) +// .collect(Collectors.toList()); +// +// System.out.println(".\n.\n<--------------------메시지 저장 종료-------------------------->\n"); +// return registeredMessages; +// } +// +// +// private static void demonstrateUserOperations(UserService userService, List users){ +// System.out.println("\n########################### User ###############################"); +// +// readUser(userService, users); +// updateUser(userService, users); +// deleteUser(userService, users); +// +// } +// +// private static void readUser(UserService userService, List users){ +// System.out.println("------------------------- ReadUser -----------------------------"); +// //전체 유저조회(다건 조회) +// System.out.println("\n전체 유저 목록: "); +// userService.findAll().forEach(System.out::println); +// +// //특정 유저조회(단건 조회, 이름) +// System.out.println("\n신짱구 유저 조회(이름으로 검색): "); +// userService.findByName("신짱구").forEach(System.out::println); +// +// //특정 유저조회(단건 조회, id) +// System.out.println("\n이훈이 유저 조회(id로 검색): "); +// System.out.println(userService.find(users.get(3).getId()).toString()); +// +// //이름에 "구"가 포함된 유저 +// System.out.println("\n이름에 '구'가 포함된 유저('구'로 검색): "); +// userService.findByName("구").forEach(System.out::println); +// } +// private static void updateUser(UserService userService, List users){ +// System.out.println("\n------------------------- UpdateUser ---------------------------"); +// //유저 수정 테스트 +// System.out.println("\n유저 수정하기\n수정 전: "); +// +// //수정하려는 유저 original에 저장 +// User original = users.get(2); +// System.out.println(userService.find(original.getId())); +// +// //수정한 유저정보 updated에 저장 +// User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword())); +// System.out.println("수정 후(이름, 번호): "); +// System.out.println(userService.find(updated.getId())); +// } +// private static void deleteUser(UserService userService, List users){ +// System.out.println("\n------------------------ DeleteUser ----------------------------"); +// System.out.println("\n전체 유저 목록: "); +// userService.findAll().forEach(System.out::println); +// +// //유저 삭제 실패 +// System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n"); +// userService.delete(users.get(3).getId(),"0000"); +// +// //유저 삭제 성공 +// System.out.println("\n"+ users.get(3).getName() +"유저 탈퇴 진행중..\n.\n.\n"); +// userService.delete(users.get(3).getId(),"2hun222"); +// +// //삭제 후 전체 유저 조회 +// System.out.println("\n\n전체 유저 목록: "); +// userService.findAll().forEach(System.out::println); +// System.out.println(); +// } +// +// private static void demonstrateChannelOperations(ChannelService channelService, List channels, List users) { +// System.out.println("\n########################### Channel ############################"); +// +// readChannel(channelService,channels,users); +// updateChannel(channelService,channels,users); +// deleteChannel(channelService,channels,users); +// } +// +// private static void readChannel(ChannelService channelService, List channels, List users){ +// System.out.println("------------------------- ReadChannel --------------------------"); +// System.out.println("\n전체 채널 목록"); +// +// if (channelService.findAllByUserId().isEmpty()) { +// System.out.println("조회할 채널이 없습니다."); +// } else { +// channels.forEach(channel -> System.out.println("[" + channel.getChannelName() + "]")); +// } +// +// +// //특정 채널 정보 +// try { +// Channel channel = channelService.find(channels.get(0).getId()); +// System.out.println("\n채널명: " + channel.getChannelName()); +// System.out.println("카테고리: " + channel.getCategory()); +// +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 조회 실패!! " + e.getMessage()); +// } +// +// //채널 멤버조회 +// try { +// System.out.print("\n[sp01] 채널 멤버: "); +// for (User member : channelService.members(channels.get(0).getId())) { +// System.out.print(member.getName() + " "); +// } +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 조회 실패!! " + e.getMessage()); +// } +// System.out.println(); +// } +// private static void updateChannel(ChannelService channelService, List channels, List users){ +// System.out.println("\n------------------------- UpdateChannel -----------------------"); +// +// //채널 수정 +// Channel original = channels.get(2); //수정하려는 채널 +// +// System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); +// System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): "); +// System.out.println("수정 전: " + channelService.find(original.getId())); +// +// //수정한 채널 updated에 저장, 출력(채널명 수정) +// try { +// Channel updatedChannel = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers())); +// System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 수정 실패!! " + e.getMessage()); +// } +// +// //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가) +// System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); +// System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): "); +// System.out.println("수정 전: " + channelService.find(original.getId())); +// +// try { +// Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers())); +// System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 수정 실패!! " + e.getMessage()); +// } +// +// //기존 유저에서 방장변경 +// //채널1에서 변경 +// original = channels.get(0); +// System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n."); +// System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): "); +// System.out.println("수정 전: " + channelService.find(original.getId())); +// +// try { +// Channel updatedChannel = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers())); +// System.out.println("수정 후: " + channelService.find(updatedChannel.getId())); +// } catch (IllegalArgumentException e) { +// System.out.println("!!채널 수정 실패!! " + e.getMessage()); +// } +// +// } +// private static void deleteChannel(ChannelService channelService, List channels, List users){ +// System.out.println("\n------------------------ DeleteChannel ------------------------"); +// +// System.out.print("\n전체 채널 목록: \n"); +// channelService.findAllByUserId().forEach(System.out::println); +// +// //채널 삭제 실패 +// System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); +// channelService.delete(channels.get(2).getId(), users.get(1), "0000"); +// +// //채널 삭제 성공 +// System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n"); +// channelService.delete(channels.get(2).getId(), users.get(1), "9999"); +// +// //삭제 후 전체 유저 조회 +// System.out.print("\n전체 채널 목록: \n"); +// channelService.findAllByUserId().forEach(System.out::println); +// +// } +// +// private static void demonstrateMessageOperations(MessageService messageService) { +// System.out.println("\n########################### Message ###########################"); +// +// readMessages(messageService); +// updateMessages(messageService); +// deleteMessages(messageService); +// } +// +// private static void readMessages(MessageService messageService) { +// System.out.println("------------------------- ReadMessage -------------------------"); +// //메시지 전체조회(다건 조회) +// System.out.println("\n전체 메시지"); +// messageService.findAll().forEach(System.out::println); +// +// //메시지3 조회(단건 조회) +// try{ +// System.out.println("\n메시지 조회"); +// System.out.println(messageService.find(messageService.findAll().get(2).getId())); +// +// } catch (IllegalArgumentException e) { +// System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); +// +// } +// +// //존재하지 않는 메시지 조회 +// try{ +// System.out.println("\n메시지 조회"); +// System.out.println(messageService.find(UUID.randomUUID())); +// } catch (IllegalArgumentException e) { +// System.out.println("\n!!메시지 조회 실패!!" + e.getMessage()); +// } +// } +// private static void updateMessages(MessageService messageService) { +// System.out.println("\n------------------------- UpdateMessage ------------------------"); +// //수정할 메시지 original변수에 저장 +// Message original = messageService.find(messageService.findAll().get(0).getId()); +// System.out.println("\n메시지1 수정 전: \n" + messageService.find(original.getId())); +// +// //변경 메시지 updated변수에 저장 +// Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~"); +// +// //메시지 수정 +// messageService.update(original.getId(), updated); +// System.out.println("\n메시지1 수정 후: \n" + messageService.find(original.getId())); +// +// //수정후 전체 메시지 +// System.out.println("\n전체 메시지"); +// messageService.findAll().forEach(System.out::println); +// } +// private static void deleteMessages(MessageService messageService) { +// System.out.println("\n------------------------ DeleteMessage ------------------------"); +// //메시지 삭제 +// System.out.println("\n.\n.\n<<메시지4 삭제 완료>>\n"); +// messageService.delete(messageService.findAll().get(3).getId()); +// +// //메시지 삭제 후 재조회 +// System.out.print("삭제 후 전체 메시지: \n"); +// messageService.findAll().forEach(System.out::println); +// } +// +//} diff --git a/src/main/java/com/sprint/mission/discodeit/channel.ser b/src/main/java/com/sprint/mission/discodeit/channel.ser deleted file mode 100644 index a80faa2311ea5711e07cdc2dff70c77dc3fd3c68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1532 zcma)+U2GIp6vyw*w7dPXcAH9wJo!N+ke%6CXlX%1DPL_J8nIOHMV#*3><*os8E5XY zvo(+w+S;^@A(|G9C6c5*x%2mhIs}tov22|l0~|eM4Lja zPE?)JS5CIEXutAR%WLvN@Y6T%1|RIZ0KT@w^%Q3rrlJuprC64tYn-fDab3m=;jl&& zlI8X!B~8OBC4muOP^c4C#!V~{Ebk_;PaCqg7g1Flb_v~7utiXvNKtv3H!ms{*(svx zxaX`(N@0TPy$h+`f#?#!X`nRMZo4gY~IJ_SFm{xo2PfF zSqi6mu?aX&ufplZWT$OFHd9@XPBX=|v{id_Rqe*+k@r7e*smO#1bh%?NA_7 z1~W@gaQTaQCpQ2aCpVg(T_mV1R+t#DVYQ5?@D4iVc5T!DsWe5VHHPu;WiH1lNl~fq zpooGAtjXB)Pf$L(3yG*qgChHH%Z;S2d52=!gZI3&2k$|-`}?5>Ev*UamIG9R*!<}$ z7PV$RTlmF(J~(^_e_hs_InMrA>|=0x`#CTEgnG2I{mk9zlP|yY zVgK^MH-Nh^Iqgi(T0u}%h=f9sT<5S@oG2}sjX<+;@v;Ow~aQt29de_?o!%?f3IT z>y_`$Rv1&i{?wL+!1>(mRr;hNg-3A1u2Itli(sr~;LpokQ*>ts=jKL#xVn8~*RI+> c2M!#DESGN&ICC@3*r>0ED2xc5-280&Z|o5DTmS$7 diff --git a/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java index 5b628727..bfb07c67 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/ChannelResponse.java @@ -10,6 +10,7 @@ public record ChannelResponse( List categories, boolean isPrivate, Instant lastMessageTime, - List memberIds + List memberIds, + UUID creatorId ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java index 21065102..04202ee5 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/Response/UserResponse.java @@ -7,6 +7,8 @@ public record UserResponse( UUID id, String userName, String email, + String phone, + String password, UUID profileImageId, String profileImageUrl, boolean online diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java index 3480e8fc..1a86ec03 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/ChannelCreateRequest_private.java @@ -1,10 +1,11 @@ package com.sprint.mission.discodeit.dto.request.create; import java.util.List; +import java.util.Set; import java.util.UUID; public record ChannelCreateRequest_private( UUID creatorId, - List memberIds + Set memberIds ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java index 8b712da1..dfc84591 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/create/UserCreateRequest.java @@ -6,11 +6,10 @@ public record UserCreateRequest( String name, - String gender, String email, String phone, String password, - UUID profileImageId, - MultipartFile profileImage + UUID profileImageId, //선택, 없으면 null + BinaryContentCreateRequest profileImage //선택, 없으면 null ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java index bb844547..9a62d9d8 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/ChannelUpdateRequest.java @@ -6,6 +6,7 @@ public record ChannelUpdateRequest( UUID channelId, String newChannelName, - List newCategories + List newCategories, + UUID newKeyUserId ) { } diff --git a/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java index 23f6853b..b76dd033 100644 --- a/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java +++ b/src/main/java/com/sprint/mission/discodeit/dto/request/update/UserUpdateRequest.java @@ -10,6 +10,7 @@ public record UserUpdateRequest( UUID id, String username, String email, + String phone, String password, MultipartFile profileImage ) { 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 d22b2985..87b27e7d 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BinaryContent.java @@ -2,6 +2,7 @@ import lombok.Getter; +import java.io.Serializable; import java.time.Instant; import java.util.UUID; @@ -11,7 +12,8 @@ * 수정불가한 도메인 * */ @Getter -public class BinaryContent { +public class BinaryContent implements Serializable { + private static final long serialVersionUID = 1L; private final UUID id; private final UUID userId; //프로필이미지 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 7dc2da44..61574c21 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -1,19 +1,20 @@ package com.sprint.mission.discodeit.entity; import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.time.Instant; import java.util.*; import java.util.stream.Collectors; -@Getter +@Getter @Setter public class Channel implements Serializable { private static final long serialVersionUID = 1L; private UUID id; private String channelName; - private User keyUser; + private User creator; private List categories; private Set members; @@ -22,14 +23,14 @@ public class Channel implements Serializable { private Instant createdAt; private Instant updatedAt; - public Channel(String channelName, User keyUser, List categories, Set members , boolean isPrivate) { + public Channel(String channelName, User creator, List categories, Set members , boolean isPrivate) { this.id = UUID.randomUUID(); this.channelName = channelName != null ? channelName : ""; this.categories = categories != null ? categories : new ArrayList<>(); - this.keyUser = keyUser; + this.creator = creator; this.members = new HashSet<>(members); - this.members.add(keyUser); + this.members.add(creator); this.isPrivate = isPrivate; @@ -39,7 +40,7 @@ public Channel(String channelName, User keyUser, List categories, Set(updateChannelData.categories); this.members = new HashSet<>(updateChannelData.members); this.updatedAt = Instant.now(); @@ -65,9 +66,11 @@ public void validateMembership(User sender) { //카테고리 중복 확인 public void validateUniqueCategory() { - Set categorySet = new HashSet<>(this.categories); - if (categorySet.size() != this.categories.size()) { - throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다."); + Set unique = new HashSet<>(); + for (String category : this.categories) { + if (!unique.add(category)) { + throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다."); + } } } @@ -80,7 +83,7 @@ public void validateCategory(String category){ } public void addKeyUserToMembers() { - this.members.add(this.keyUser); + this.members.add(this.creator); } @Override @@ -98,7 +101,7 @@ public boolean equals(Object obj) { public String toString() { return "Channel{" + "ChannelName= '" + channelName + '\'' + - ", KeyUser= '" + keyUser.getName() + '\'' + + ", KeyUser= '" + creator.getName() + '\'' + ", Category= '" + categories + '\'' + ", Members= '" + members.stream().map(User::getName).collect(Collectors.toList()) + "'}"; 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 e04bb8a1..7af1a69e 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -4,8 +4,6 @@ import java.io.Serializable; import java.time.Instant; -import java.util.List; -import java.util.Set; import java.util.UUID; @Getter 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 398fafd9..66387771 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java @@ -3,6 +3,7 @@ import lombok.Getter; import lombok.Setter; +import java.io.Serializable; import java.time.Instant; import java.util.UUID; @@ -10,7 +11,8 @@ * 사용자별 각 채널에 읽지 않은 메시지 확인하기 * 메시지를 읽음 -> updatedAt 시간이 현재 시간으로*/ @Getter @Setter -public class ReadStatus { +public class ReadStatus implements Serializable { + private static final long serialVersionUID = 1L; private UUID id; private UUID userId; private UUID channelId; 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 1f81a3bc..a9c92d27 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -5,8 +5,6 @@ import java.io.Serializable; import java.time.Instant; -import java.util.ArrayList; -import java.util.HashSet; import java.util.UUID; @Getter @Setter 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 67c9960f..ac0a790c 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -3,6 +3,7 @@ import lombok.Getter; import lombok.Setter; +import java.io.Serializable; import java.time.Duration; import java.time.Instant; import java.util.UUID; @@ -17,7 +18,8 @@ * lastOnlineTime은 사용자가 언제 마지막으로 접속했는가?? * 나중에 메소드 추가를 위해? 분리하는 것이 좋다?*/ @Getter @Setter -public class UserStatus { +public class UserStatus implements Serializable { + private static final long serialVersionUID = 1L; private UUID userId; //User에서도 userId로 변경하는게 좋을까? private Instant lastOnlineTime; diff --git a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java index 2962846b..e8734a65 100644 --- a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java +++ b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java @@ -11,7 +11,6 @@ //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 org.springframework.stereotype.Component; // //public class ServiceFactory { // diff --git a/src/main/java/com/sprint/mission/discodeit/message.ser b/src/main/java/com/sprint/mission/discodeit/message.ser deleted file mode 100644 index c9612fb6b112c088e8903c6d29d91a23f8fb3869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1820 zcma)5T}&KR6u!*<0xLgCtC9FpH6bNC3u}R;RST5zmxWXijSp6b-J9Kk*_n0b(p_rO z>=G6?yTmlarKqWCEe*Az5d@^fMysZMGFofW>VrNQwP9y{Feb*t2hW`uSkN}^By;Ef z%st=vzVn@h9I_}fsvPEyaqKAJ1-6S*g1ubWV*CEe=eu9LZbD24DiI{k-@*BaBzL1? z5|ptLlmve?e6R)4#}To^SOKpYf|cci4Gwm~AG79}WBUxfj`eFbhcX7(w@XX`(KH69cXR0uX@% zUS#tHIZ?y{K~67VyL4=qf$iGDcInuzL;CO9O-UrM`w}{VEMCO$eu64=2r8_LY5~7l z6)gI(Owitf;twiVJ`fE9t(m@`$E!EL1XJt5rMkR(uJXUs6@bU@) z3Z;fdeOw6V+0vN}1RTL*G-QWhnovzh?9yB=wMGF;q691$u5&AN#iUa46N}9I-iwts zXPLdN7657rF%-?eAf+rg#PI^ff{I%MT4jwD)Su2k5wn=r$r27qqAuEIQRBCC{_$HN z_VMH3#^#m)4a-8R1evnq7j!n~SAU7_u_mtIPt8M-r@A7PeEN(!zqqloK+rvP^>xmA z_hb8<4UJ8nol?@C2Fcgk6PcN{kM@}miiRT&U|3-^ut`Ix+Dv5gOVDnGK)x>s(lIP= zON%nQU(agpi)$+r5Aat{+QT!qZ?=tsGqdxTwxvY#g17!|5LF7nScpJd$}J)XIF$D` zfRpj1rQ}x^n;z{uSoU|U^J$>HaVe%Qol#RsgLWM}PCC$QyTAhuy*YB3W%Z5M=%$Gd z59t}FZa!ar^gi`EJN@3($K$=KwhMOpcZZqXxv7|TSZW;Rol3)%Z~4#!q&GfXQRic{ zFXxll1mz$6HSFPusyJ7v|@M$esEq--j#VB_NM@9D?MVhWjzama@ zQFZ members(UUID id); 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 index 562b3ea4..625520cb 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java @@ -18,9 +18,17 @@ public class FileBinaryContentRepository implements BinaryContentRepository { @Override public BinaryContent save(BinaryContent binaryContent) { - data.put(binaryContent.getId(), binaryContent); - saveData(); - return binaryContent; + BinaryContent content = new BinaryContent( + binaryContent.getUserId(), + binaryContent.getMessageId(), + binaryContent.getContent(), + binaryContent.getContentType(), + binaryContent.getOriginalFilename() + ); + data.put(content.getId(), content); // ID 기준으로 저장 + saveData(); // 파일 저장 등 + + return content; } @Override 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 80956f86..234590e5 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 @@ -56,7 +56,7 @@ public Channel update(UUID id, Channel update) { //채널 삭제 @Override - public boolean delete(UUID id, User user, String password) { + public boolean delete(UUID id, UUID userId, String password) { return this.data.remove(id) != null; } 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 index 6b8f3a1f..234e7e7b 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFBinaryContentRepository.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.jcf; +import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.repository.BinaryContentRepository; @@ -11,8 +12,16 @@ public class JCFBinaryContentRepository implements BinaryContentRepository { @Override public BinaryContent save(BinaryContent binaryContent) { - data.put(binaryContent.getId(), binaryContent); - return binaryContent; + BinaryContent content = new BinaryContent( + binaryContent.getUserId(), + binaryContent.getMessageId(), + binaryContent.getContent(), + binaryContent.getContentType(), + binaryContent.getOriginalFilename() + ); + data.put(content.getId(), content); + + return content; } @Override 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 dab79d1d..e3ca995d 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 @@ -47,7 +47,7 @@ public Channel update(UUID id, Channel update) { //채널 삭제 @Override - public boolean delete(UUID id, User user, String password) { + public boolean delete(UUID id, UUID userId, String password) { return this.data.remove(id) != null; } 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 index 9940adc0..f06e45e8 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFReadStatusRepository.java @@ -2,11 +2,10 @@ import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; -import org.springframework.stereotype.Repository; import java.util.*; -@Repository + public class JCFReadStatusRepository implements ReadStatusRepository { private final Map data = new HashMap<>(); 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 50a50ff3..db746c91 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 @@ -3,9 +3,7 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; - import java.util.*; -import java.util.stream.Collectors; public class JCFUserRepository implements UserRepository { private final Map data = new HashMap<>(); 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 c6f22695..a908664e 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,30 +1,30 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.dto.Response.ChannelResponse; import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_private; import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_public; -import com.sprint.mission.discodeit.dto.Response.ChannelResponse; import com.sprint.mission.discodeit.dto.request.update.ChannelUpdateRequest; import com.sprint.mission.discodeit.entity.User; -import java.util.*; +import java.util.List; +import java.util.Set; +import java.util.UUID; public interface ChannelService { - public ChannelResponse createPublicChannel(ChannelCreateRequest_public channel); + public ChannelResponse createPublicChannel(ChannelCreateRequest_public request); - public ChannelResponse createPrivateChannel(ChannelCreateRequest_private channel); + public ChannelResponse createPrivateChannel(ChannelCreateRequest_private request); public ChannelResponse find(UUID id); - public List findAllByUserId(); + public List findAllByUserId(UUID id); public List findByChannelName(String channelName); public ChannelResponse update(ChannelUpdateRequest request); - public boolean delete(UUID id, User user, String password); + public boolean delete(UUID id, UUID userId, String password); public Set members(UUID id); - public List findAllByUserId(UUID id); - } \ No newline at end of file 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 4dbf01d3..736c3e37 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -22,4 +22,6 @@ public interface UserService { public void removeUserFromChannels(User user); + public List findByUserNameKeyWords(String keyword); + } 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 61b09a25..dfbf0e71 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 @@ -20,7 +20,7 @@ public class BasicBinaryContentService implements BinaryContentService { @Override public BinaryContentResponse create(BinaryContentCreateRequest request) { if ((request.userId() == null && request.messageId() == null) - || request.messageId() == null || request.content().length == 0) { + || request.content() == null || request.content().length == 0) { throw new IllegalArgumentException("파일 업로드 대상 또는 내용이 잘못되었습니다."); } 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 2232f289..17b99a6d 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 @@ -180,6 +180,8 @@ public ChannelResponse update(ChannelUpdateRequest request) { } channel.update(request.newChannelName(), request.newCategories()); + User newCreator = findUserById(request.newKeyUserId()); + channel.setCreator(newCreator); List memberIds = List.of(); @@ -187,16 +189,18 @@ public ChannelResponse update(ChannelUpdateRequest request) { } @Override - public boolean delete(UUID id, User user, String password) { - Channel channel = channelRepository.find(id).orElseThrow();; - if (channel == null) { - throw new IllegalArgumentException(" --해당 채널을 찾을 수 없습니다."); + public boolean delete(UUID id, UUID userId, String password) { + Channel channel = channelRepository.find(id) + .orElseThrow(() -> new IllegalArgumentException(" --해당 채널을 찾을 수 없습니다.")); + + if (!channel.getCreator().getPassword().equals(password)) { + throw new IllegalArgumentException("비밀번호 불일치로 삭제 실패"); } messageRepository.deleteByChannelId(id); readStatusRepository.deleteByChannelId(id); - return channelRepository.delete(id, user, password); + return channelRepository.delete(id, userId, password); } @Override @@ -206,7 +210,7 @@ public Set members(UUID id) { private void validateDuplicateChannelName(Channel channel) { List channels = channelRepository.findByChannelName(channel.getChannelName()); - if (channels.stream().anyMatch(c -> c.getKeyUser().equals(channel.getKeyUser()) + if (channels.stream().anyMatch(c -> c.getCreator().equals(channel.getCreator()) && c.getChannelName().equals(channel.getChannelName()))) { throw new IllegalArgumentException(" --- 이미 등록된 채널입니다."); } @@ -230,8 +234,8 @@ private ChannelResponse toChannelResponse(Channel channel, Instant lastMessageTi channel.getCategories(), channel.isPrivate(), lastMessageTime, - memberIds + memberIds, + channel.getCreator().getId() ); } - } 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 ffd31f89..fd366885 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,9 +1,9 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.request.BinaryContentRequest; import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; -import com.sprint.mission.discodeit.dto.request.create.MessageCreateRequest; import com.sprint.mission.discodeit.dto.Response.MessageResponse; +import com.sprint.mission.discodeit.dto.request.BinaryContentRequest; +import com.sprint.mission.discodeit.dto.request.create.MessageCreateRequest; import com.sprint.mission.discodeit.dto.request.update.MessageUpdateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; @@ -17,7 +17,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.time.Instant; import java.util.ArrayList; import java.util.Comparator; import java.util.List; 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 de1eadd5..cb7337b4 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,7 @@ package com.sprint.mission.discodeit.service.basic; -import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; -import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; import com.sprint.mission.discodeit.dto.Response.UserResponse; +import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.entity.Channel; @@ -16,8 +15,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.time.Instant; -import java.util.*; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; @Service @@ -38,17 +40,17 @@ public UserResponse create(UserCreateRequest request) { User savedUser = userRepository.create(user); //프로필 이미지 생성 - if(request.profileImage() != null && !request.profileImage().isEmpty()) { + if (request.profileImage() != null && request.profileImage().content() != null && request.profileImage().content().length > 0) { BinaryContent profileImage = new BinaryContent( savedUser.getId(), null, - request.profileImage().getBytes(), - request.profileImage().getContentType(), - request.profileImage().getOriginalFilename() + request.profileImage().content(), + request.profileImage().contentType(), + request.profileImage().originalFilename() ); BinaryContent savedImage = binaryContentRepository.save(profileImage); user.setProfileImageId(savedImage.getId()); - userRepository.update(savedUser); + userRepository.update(user); } UserStatus status = new UserStatus(savedUser.getId(), false); @@ -110,13 +112,25 @@ public UserResponse update(UserUpdateRequest request) { if(request.username() != null) user.setName(request.username()); if(request.email() != null ) user.setEmail(request.email()); if(request.password() != null) user.setPassword(request.password()); + if(request.phone() != null) user.setPhone(request.phone()); //4. 프로필 이미지 대체( 있으면 새로 저장) - if(request.profileImage() != null && ! request.profileImage().isEmpty()) { - BinaryContent binaryContent = binaryContentRepository.save( - request.profileImage().getBytes(), - request.profileImage().getOriginalFilename()); - user.setProfileImageId(binaryContent.getId()); + if (request.profileImage() != null && !request.profileImage().isEmpty()) { + try { + BinaryContent binaryContent = new BinaryContent( + user.getId(), + null, + request.profileImage().getBytes(), + request.profileImage().getContentType(), + request.profileImage().getOriginalFilename() + ); + + binaryContentRepository.save(binaryContent); + user.setProfileImageId(binaryContent.getId()); + + } catch (IOException e) { + throw new RuntimeException("프로필 이미지 저장 중 오류 발생", e); + } } //5. 변경된 User 엔티티 저장 @@ -189,9 +203,22 @@ private UserResponse toUserResponse(User user, UserStatus status) { user.getId(), user.getName(), user.getEmail(), + user.getPhone(), + user.getPassword(), user.getProfileImageId(), user.getProfileImageUrl(), status.isOnline() ); } + + public List findByUserNameKeyWords(String keyword) { + return userRepository.findAll().stream() + .filter(user -> user.getName().contains(keyword)) + .map(user -> { + UserStatus status = userStatusRepository.findByUserId(user.getId()) + .orElse(new UserStatus(user.getId(), false)); + return toUserResponse(user, status); + }) + .toList(); + } } 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 index 1a757ef1..e4cce545 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java @@ -1,132 +1,132 @@ -package com.sprint.mission.discodeit.service.file; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.ChannelService; - -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.*; -import java.util.stream.Collectors; - -import static com.sprint.mission.discodeit.util.DataInitializer.*; - -public class FileChannelService implements ChannelService { - private final String FILE_PATH = CHANNEL_FILE_PATH; - private Map data = loadData(); - - //채널 생성 - @Override - public void create(Channel channel) { - validateDuplicateChannelName(channel); - channel.validateUniqueCategory(); - channel.addKeyUserToMembers(); - - data.put(channel.getId(), channel); - saveData(); - } - - //채널 조회 - @Override - public Channel find(UUID id) { - Channel channel = this.data.get(id); - - if (channel == null) { //아무 객체도 가리키지 않음 - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - return channel; - } - - //특정 채널 정보 - @Override - public List findByChannelName(String channelName) { - List result = data.values().stream() - .filter(channel -> channel.getChannelName().contains(channelName)) - .collect(Collectors.toList()); - - if (result.isEmpty()) { - throw new IllegalArgumentException("존재하지 않는 채널입니다."); - } - return result; - } - - //채널 전체 조회 - @Override - public List findAllByUserId() { - List channels = new ArrayList<>(data.values()); - - if (channels.isEmpty()) { //리스트있지만 요소없음 - System.out.println(" --조회 가능한 채널이 없습니다."); - } - - return channels; - } - - //채널 수정 - @Override - public Channel update(UUID id, Channel update) { - Channel channel = this.data.get(id); - - if (channel == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - channel.update(update); - return channel; - } - - //채널 삭제 - @Override - public boolean delete(UUID id, User user, String password) { - Channel channel = this.data.get(id); - if (!user.getPassword().equals(password)) { - System.out.println("!!채널 삭제 실패!! --- 비밀번호 불일치"); - return false; - } - System.out.println("<<채널 [" + channel.getChannelName() + "] 삭제 성공>>"); - return this.data.remove(id) != null; - } - - - //채널 멤버셋 - @Override - public Set members(UUID id) { - Channel channel = data.get(id); - return channel != null ? channel.getMembers() : Set.of(); - } - - //중복 채널명 검증 - private void validateDuplicateChannelName(Channel channel) { - for (Channel existingChannel : data.values()) { - if (existingChannel.getChannelName().equals(channel.getChannelName()) - && existingChannel.getKeyUser().equals(channel.getKeyUser())) { - throw new IllegalArgumentException(" --- "+ channel.getKeyUser().getName()+"님! 이미 등록된 채널입니다."); - } - } - } - - private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); - ObjectOutputStream oos = new ObjectOutputStream(fos)) { - oos.writeObject(data); - } catch (Exception e) { - e.printStackTrace(); - } - } - - // 불러오기 메서드 - @SuppressWarnings("unchecked") - private Map loadData() { - try (FileInputStream fis = new FileInputStream(FILE_PATH); - ObjectInputStream ois = new ObjectInputStream(fis)) { - return (Map) ois.readObject(); - } catch (Exception e) { - e.printStackTrace(); - return new HashMap<>(); - } - } - -} +//package com.sprint.mission.discodeit.service.file; +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.User; +//import com.sprint.mission.discodeit.service.ChannelService; +// +//import java.io.FileInputStream; +//import java.io.FileOutputStream; +//import java.io.ObjectInputStream; +//import java.io.ObjectOutputStream; +//import java.util.*; +//import java.util.stream.Collectors; +// +//import static com.sprint.mission.discodeit.util.DataInitializer.*; +// +//public class FileChannelService implements ChannelService { +// private final String FILE_PATH = CHANNEL_FILE_PATH; +// private Map data = loadData(); +// +// //채널 생성 +// @Override +// public void create(Channel channel) { +// validateDuplicateChannelName(channel); +// channel.validateUniqueCategory(); +// channel.addKeyUserToMembers(); +// +// data.put(channel.getId(), channel); +// saveData(); +// } +// +// //채널 조회 +// @Override +// public Channel find(UUID id) { +// Channel channel = this.data.get(id); +// +// if (channel == null) { //아무 객체도 가리키지 않음 +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// return channel; +// } +// +// //특정 채널 정보 +// @Override +// public List findByChannelName(String channelName) { +// List result = data.values().stream() +// .filter(channel -> channel.getChannelName().contains(channelName)) +// .collect(Collectors.toList()); +// +// if (result.isEmpty()) { +// throw new IllegalArgumentException("존재하지 않는 채널입니다."); +// } +// return result; +// } +// +// //채널 전체 조회 +// @Override +// public List findAllByUserId() { +// List channels = new ArrayList<>(data.values()); +// +// if (channels.isEmpty()) { //리스트있지만 요소없음 +// System.out.println(" --조회 가능한 채널이 없습니다."); +// } +// +// return channels; +// } +// +// //채널 수정 +// @Override +// public Channel update(UUID id, Channel update) { +// Channel channel = this.data.get(id); +// +// if (channel == null) { +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// channel.update(update); +// return channel; +// } +// +// //채널 삭제 +// @Override +// public boolean delete(UUID id, User user, String password) { +// Channel channel = this.data.get(id); +// if (!user.getPassword().equals(password)) { +// System.out.println("!!채널 삭제 실패!! --- 비밀번호 불일치"); +// return false; +// } +// System.out.println("<<채널 [" + channel.getChannelName() + "] 삭제 성공>>"); +// return this.data.remove(id) != null; +// } +// +// +// //채널 멤버셋 +// @Override +// public Set members(UUID id) { +// Channel channel = data.get(id); +// return channel != null ? channel.getMembers() : Set.of(); +// } +// +// //중복 채널명 검증 +// private void validateDuplicateChannelName(Channel channel) { +// for (Channel existingChannel : data.values()) { +// if (existingChannel.getChannelName().equals(channel.getChannelName()) +// && existingChannel.getKeyUser().equals(channel.getKeyUser())) { +// throw new IllegalArgumentException(" --- "+ channel.getKeyUser().getName()+"님! 이미 등록된 채널입니다."); +// } +// } +// } +// +// private void saveData() { +// try (FileOutputStream fos = new FileOutputStream(FILE_PATH); +// ObjectOutputStream oos = new ObjectOutputStream(fos)) { +// oos.writeObject(data); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// +// // 불러오기 메서드 +// @SuppressWarnings("unchecked") +// private Map loadData() { +// try (FileInputStream fis = new FileInputStream(FILE_PATH); +// ObjectInputStream ois = new ObjectInputStream(fis)) { +// return (Map) ois.readObject(); +// } catch (Exception e) { +// e.printStackTrace(); +// return new HashMap<>(); +// } +// } +// +//} 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 index 5e3bba14..c7d1064c 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java @@ -1,89 +1,89 @@ -package com.sprint.mission.discodeit.service.file; - -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; - -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.*; - -import static com.sprint.mission.discodeit.util.DataInitializer.*; - -public class FileMessageService implements MessageService { - private static final long serialVersionUID = 1L; - private final String FILE_PATH = MESSAGE_FILE_PATH; - - private final Map data = loadData(); - - private final UserService userService; - private final ChannelService channelService; - - public FileMessageService(UserService userService, ChannelService channelService) { - this.userService = userService; - this.channelService = channelService; - } - - //메시지 생성 - @Override - public void create(Message message) { - data.put(message.getId(), message); - saveData(); - } - - //메시지 조회 - @Override - public Message find(UUID id) { - Message message = this.data.get(id); - - //메시지id 존재하지 않음 - if (message == null) { - throw new IllegalArgumentException(" --해당 ID의 메시지를 찾을 수 없습니다."); - } - return this.data.get(id); - } - - //메시지 전체조회 - @Override - public List findAll() { - return new ArrayList<>(this.data.values()); - } - - //메시지 수정 - @Override - public Message update(UUID id, Message update) { - Message selected = this.data.get(id); - selected.update(update); - return selected; - } - - //메시지 삭제 - @Override - public boolean delete(UUID id) { - return data.remove(id) != null; - } - - private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); - ObjectOutputStream oos = new ObjectOutputStream(fos)) { - oos.writeObject(data); - } catch (Exception e) { - e.printStackTrace(); - } - } - - // 불러오기 메서드 - @SuppressWarnings("unchecked") - private Map loadData() { - try (FileInputStream fis = new FileInputStream(FILE_PATH); - ObjectInputStream ois = new ObjectInputStream(fis)) { - return (Map) ois.readObject(); - } catch (Exception e) { - e.printStackTrace(); - return new HashMap<>(); - } - } -} +//package com.sprint.mission.discodeit.service.file; +// +//import com.sprint.mission.discodeit.entity.Message; +//import com.sprint.mission.discodeit.service.ChannelService; +//import com.sprint.mission.discodeit.service.MessageService; +//import com.sprint.mission.discodeit.service.UserService; +// +//import java.io.FileInputStream; +//import java.io.FileOutputStream; +//import java.io.ObjectInputStream; +//import java.io.ObjectOutputStream; +//import java.util.*; +// +//import static com.sprint.mission.discodeit.util.DataInitializer.*; +// +//public class FileMessageService implements MessageService { +// private static final long serialVersionUID = 1L; +// private final String FILE_PATH = MESSAGE_FILE_PATH; +// +// private final Map data = loadData(); +// +// private final UserService userService; +// private final ChannelService channelService; +// +// public FileMessageService(UserService userService, ChannelService channelService) { +// this.userService = userService; +// this.channelService = channelService; +// } +// +// //메시지 생성 +// @Override +// public void create(Message message) { +// data.put(message.getId(), message); +// saveData(); +// } +// +// //메시지 조회 +// @Override +// public Message find(UUID id) { +// Message message = this.data.get(id); +// +// //메시지id 존재하지 않음 +// if (message == null) { +// throw new IllegalArgumentException(" --해당 ID의 메시지를 찾을 수 없습니다."); +// } +// return this.data.get(id); +// } +// +// //메시지 전체조회 +// @Override +// public List findAll() { +// return new ArrayList<>(this.data.values()); +// } +// +// //메시지 수정 +// @Override +// public Message update(UUID id, Message update) { +// Message selected = this.data.get(id); +// selected.update(update); +// return selected; +// } +// +// //메시지 삭제 +// @Override +// public boolean delete(UUID id) { +// return data.remove(id) != null; +// } +// +// private void saveData() { +// try (FileOutputStream fos = new FileOutputStream(FILE_PATH); +// ObjectOutputStream oos = new ObjectOutputStream(fos)) { +// oos.writeObject(data); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// +// // 불러오기 메서드 +// @SuppressWarnings("unchecked") +// private Map loadData() { +// try (FileInputStream fis = new FileInputStream(FILE_PATH); +// ObjectInputStream ois = new ObjectInputStream(fis)) { +// return (Map) ois.readObject(); +// } catch (Exception e) { +// e.printStackTrace(); +// return new HashMap<>(); +// } +// } +//} 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 index 4ca015b5..9fdf9632 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java @@ -1,134 +1,134 @@ -package com.sprint.mission.discodeit.service.file; - - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.UserService; - -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.*; -import java.util.stream.Collectors; - -import static com.sprint.mission.discodeit.util.DataInitializer.*; - -public class FileUserService implements UserService { - private static final long serialVersionUID = 1L; - private final String FILE_PATH = USER_FILE_PATH; - - private Map data = loadData(); - - private final ChannelService channelService; - - public FileUserService(ChannelService channelService) { - this.channelService = channelService; - } - - @Override - public void create(User user) { - for (User existingUser : data.values()) { - if (existingUser.getEmail().equals(user.getEmail())) { - throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); - } - } - this.data.put(user.getId(), user); - - saveData(); - } - - //유저 아이디 조회 - @Override - public User find(UUID id) { - return this.data.get(id); - } - - //유저 이름으로 조회 - @Override - public List findByName(String name) { - List result = data.values().stream() - .filter(user -> user.getName().contains(name)) - .collect(Collectors.toList()); - - if (result.isEmpty()) { - throw new IllegalArgumentException("존재하지 않는 유저입니다."); - } - return result; - } - - //유저 전체 조회 - @Override - public List findAll() { - return new ArrayList<>(data.values()); - } - - //유저 수정 - @Override - public User update(UUID id, User update) { - User user = this.data.get(id); - - if (user == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - user.update(update); - return user; - } - - //유저 삭제 - @Override - public boolean delete(UUID id, String password) { - User user = this.data.get(id); - if (!user.getPassword().equals(password)) { - System.out.println("!!유저 탈퇴 실패!! --- 비밀번호 불일치"); - return false; - } - System.out.println("<<유저 [" + user.getName() + "] 탈퇴 성공>>"); - boolean isDeleted = this.data.remove(id) != null; - - if (isDeleted){ - removeUserFromChannels(user); - } - return isDeleted; - } - - //채널 전체에서 해당 유저 삭제 - public void removeUserFromChannels(User user) { - for (Channel channel : channelService.findAllByUserId()) { - Set members = new HashSet<>(channel.getMembers()); - if (members.remove(user)) { - Channel updatedChannel = new Channel( - channel.getChannelName(), - channel.getKeyUser(), - channel.getCategory(), - members - ); - channelService.update(channel.getId(), updatedChannel); - } - } - } - - private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); - ObjectOutputStream oos = new ObjectOutputStream(fos)) { - oos.writeObject(data); - } catch (Exception e) { - e.printStackTrace(); - } - } - - // 불러오기 메서드 - @SuppressWarnings("unchecked") - private Map loadData() { - try (FileInputStream fis = new FileInputStream(FILE_PATH); - ObjectInputStream ois = new ObjectInputStream(fis)) { - return (Map) ois.readObject(); - } catch (Exception e) { - e.printStackTrace(); - return new HashMap<>(); - } - } - -} +//package com.sprint.mission.discodeit.service.file; +// +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.User; +//import com.sprint.mission.discodeit.service.ChannelService; +//import com.sprint.mission.discodeit.service.UserService; +// +//import java.io.FileInputStream; +//import java.io.FileOutputStream; +//import java.io.ObjectInputStream; +//import java.io.ObjectOutputStream; +//import java.util.*; +//import java.util.stream.Collectors; +// +//import static com.sprint.mission.discodeit.util.DataInitializer.*; +// +//public class FileUserService implements UserService { +// private static final long serialVersionUID = 1L; +// private final String FILE_PATH = USER_FILE_PATH; +// +// private Map data = loadData(); +// +// private final ChannelService channelService; +// +// public FileUserService(ChannelService channelService) { +// this.channelService = channelService; +// } +// +// @Override +// public void create(User user) { +// for (User existingUser : data.values()) { +// if (existingUser.getEmail().equals(user.getEmail())) { +// throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); +// } +// } +// this.data.put(user.getId(), user); +// +// saveData(); +// } +// +// //유저 아이디 조회 +// @Override +// public User find(UUID id) { +// return this.data.get(id); +// } +// +// //유저 이름으로 조회 +// @Override +// public List findByName(String name) { +// List result = data.values().stream() +// .filter(user -> user.getName().contains(name)) +// .collect(Collectors.toList()); +// +// if (result.isEmpty()) { +// throw new IllegalArgumentException("존재하지 않는 유저입니다."); +// } +// return result; +// } +// +// //유저 전체 조회 +// @Override +// public List findAll() { +// return new ArrayList<>(data.values()); +// } +// +// //유저 수정 +// @Override +// public User update(UUID id, User update) { +// User user = this.data.get(id); +// +// if (user == null) { +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// user.update(update); +// return user; +// } +// +// //유저 삭제 +// @Override +// public boolean delete(UUID id, String password) { +// User user = this.data.get(id); +// if (!user.getPassword().equals(password)) { +// System.out.println("!!유저 탈퇴 실패!! --- 비밀번호 불일치"); +// return false; +// } +// System.out.println("<<유저 [" + user.getName() + "] 탈퇴 성공>>"); +// boolean isDeleted = this.data.remove(id) != null; +// +// if (isDeleted){ +// removeUserFromChannels(user); +// } +// return isDeleted; +// } +// +// //채널 전체에서 해당 유저 삭제 +// public void removeUserFromChannels(User user) { +// for (Channel channel : channelService.findAllByUserId()) { +// Set members = new HashSet<>(channel.getMembers()); +// if (members.remove(user)) { +// Channel updatedChannel = new Channel( +// channel.getChannelName(), +// channel.getKeyUser(), +// channel.getCategory(), +// members +// ); +// channelService.update(channel.getId(), updatedChannel); +// } +// } +// } +// +// private void saveData() { +// try (FileOutputStream fos = new FileOutputStream(FILE_PATH); +// ObjectOutputStream oos = new ObjectOutputStream(fos)) { +// oos.writeObject(data); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } +// +// // 불러오기 메서드 +// @SuppressWarnings("unchecked") +// private Map loadData() { +// try (FileInputStream fis = new FileInputStream(FILE_PATH); +// ObjectInputStream ois = new ObjectInputStream(fis)) { +// return (Map) ois.readObject(); +// } catch (Exception e) { +// e.printStackTrace(); +// return new HashMap<>(); +// } +// } +// +//} 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 index 692a374a..1cfcc086 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java @@ -1,117 +1,116 @@ -package com.sprint.mission.discodeit.service.jcf; -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.ChannelService; - - -import java.util.*; -import java.util.stream.Collectors; - -public class JCFChannelService implements ChannelService { - private static JCFChannelService instance; - private final Map data = new HashMap<>(); - - private JCFChannelService() {} - - public static JCFChannelService getInstance() { - if (instance == null) { - instance = new JCFChannelService(); - } - return instance; - } - - //채널 생성 - @Override - public void create(Channel channel) { - - //중복 채널명 검증 - for (Channel existingChannel : data.values()) { - if (existingChannel.getChannelName().equals(channel.getChannelName()) - && existingChannel.getKeyUser().equals(channel.getKeyUser())) { - throw new IllegalArgumentException(" --- "+ channel.getKeyUser().getName()+"님! 이미 등록된 채널입니다."); - } - } - - //중복 카테고리 검증 - Set categorySet = new HashSet<>(channel.getCategory()); - if (channel.getCategory().size() != categorySet.size()) { //list사이즈=2, set사이즈1 -> 중복있다 - throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다."); - } - channel.getMembers().add(channel.getKeyUser()); // 키 유저를 초기 멤버로 추가 - - data.put(channel.getId(), channel); - - } - - //채널 조회 - @Override - public Channel find(UUID id) { - Channel channel = this.data.get(id); - - if (channel == null) { //아무 객체도 가리키지 않음 - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - return channel; - } - - //채널 전체 조회 - @Override - public List findAllByUserId() { - List channels = new ArrayList<>(data.values()); - - if (channels.isEmpty()) { //리스트있지만 요소없음 - System.out.println(" --조회 가능한 채널이 없습니다."); - } - - return channels; - } - - //채널 수정 - @Override - public Channel update(UUID id, Channel update) { - Channel channel = this.data.get(id); - - if (channel == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - channel.update(update); - return channel; - } - - //채널 삭제 - @Override - public boolean delete(UUID id, User user, String password) { - Channel channel = this.data.get(id); - if (!user.getPassword().equals(password)) { - System.out.println("!!채널 삭제 실패!! --- 비밀번호 불일치"); - return false; - } - System.out.println("<<채널 [" + channel.getChannelName() + "] 삭제 성공>>"); - return this.data.remove(id) != null; - } - - - //채널 멤버셋 - @Override - public Set members(UUID id) { - Channel channel = data.get(id); - return channel != null ? channel.getMembers() : Set.of(); - } - - //특정 채널 정보 - public List findByChannelName(String channelName) { - List result = data.values().stream() - .filter(channel -> channel.getChannelName().contains(channelName)) - .collect(Collectors.toList()); - - if (result.isEmpty()) { - throw new IllegalArgumentException("존재하지 않는 채널입니다."); - } - return result; - } - - -} +//package com.sprint.mission.discodeit.service.jcf; +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.User; +//import com.sprint.mission.discodeit.service.ChannelService; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +//public class JCFChannelService implements ChannelService { +// private static JCFChannelService instance; +// private final Map data = new HashMap<>(); +// +// private JCFChannelService() {} +// +// public static JCFChannelService getInstance() { +// if (instance == null) { +// instance = new JCFChannelService(); +// } +// return instance; +// } +// +// //채널 생성 +// @Override +// public void create(Channel channel) { +// +// //중복 채널명 검증 +// for (Channel existingChannel : data.values()) { +// if (existingChannel.getChannelName().equals(channel.getChannelName()) +// && existingChannel.getKeyUser().equals(channel.getKeyUser())) { +// throw new IllegalArgumentException(" --- "+ channel.getKeyUser().getName()+"님! 이미 등록된 채널입니다."); +// } +// } +// +// //중복 카테고리 검증 +// Set categorySet = new HashSet<>(channel.getCategory()); +// if (channel.getCategory().size() != categorySet.size()) { //list사이즈=2, set사이즈1 -> 중복있다 +// throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다."); +// } +// channel.getMembers().add(channel.getKeyUser()); // 키 유저를 초기 멤버로 추가 +// +// data.put(channel.getId(), channel); +// +// } +// +// //채널 조회 +// @Override +// public Channel find(UUID id) { +// Channel channel = this.data.get(id); +// +// if (channel == null) { //아무 객체도 가리키지 않음 +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// return channel; +// } +// +// //채널 전체 조회 +// @Override +// public List findAllByUserId() { +// List channels = new ArrayList<>(data.values()); +// +// if (channels.isEmpty()) { //리스트있지만 요소없음 +// System.out.println(" --조회 가능한 채널이 없습니다."); +// } +// +// return channels; +// } +// +// //채널 수정 +// @Override +// public Channel update(UUID id, Channel update) { +// Channel channel = this.data.get(id); +// +// if (channel == null) { +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// channel.update(update); +// return channel; +// } +// +// //채널 삭제 +// @Override +// public boolean delete(UUID id, User user, String password) { +// Channel channel = this.data.get(id); +// if (!user.getPassword().equals(password)) { +// System.out.println("!!채널 삭제 실패!! --- 비밀번호 불일치"); +// return false; +// } +// System.out.println("<<채널 [" + channel.getChannelName() + "] 삭제 성공>>"); +// return this.data.remove(id) != null; +// } +// +// +// //채널 멤버셋 +// @Override +// public Set members(UUID id) { +// Channel channel = data.get(id); +// return channel != null ? channel.getMembers() : Set.of(); +// } +// +// //특정 채널 정보 +// public List findByChannelName(String channelName) { +// List result = data.values().stream() +// .filter(channel -> channel.getChannelName().contains(channelName)) +// .collect(Collectors.toList()); +// +// if (result.isEmpty()) { +// throw new IllegalArgumentException("존재하지 않는 채널입니다."); +// } +// return result; +// } +// +// +//} 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 index c32bae0f..5ef604ed 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java @@ -1,74 +1,74 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; - - -import java.util.*; - -public class JCFMessageService implements MessageService { - private static JCFMessageService instance; - private final Map data = new LinkedHashMap<>(); - private final UserService userService; - private final ChannelService channelService; - - public JCFMessageService(UserService userService, ChannelService channelService) { - this.userService = userService; - this.channelService = channelService; - } - - public static JCFMessageService getInstance(UserService userService, ChannelService channelService) { - if (instance == null) { - instance = new JCFMessageService(userService, channelService); - } - return instance; - } - - //메시지 생성 - @Override - public void create(Message message) { - Channel channel = message.getChannel(); - channel.validateMembership(message.getSender()); - channel.validateCategory(message.getCategory()); - - message.validateContent(); - data.put(message.getId(), message); - } - - //메시지 조회 - @Override - public Message find(UUID id) { - Message message = this.data.get(id); - - //메시지id 존재하지 않음 - if (message == null) { - throw new IllegalArgumentException(" --해당 ID의 메시지를 찾을 수 없습니다."); - } - return this.data.get(id); - } - - //메시지 전체조회 - @Override - public List findAll() { - return new ArrayList<>(this.data.values()); - } - - //메시지 수정 - @Override - public Message update(UUID id, Message update) { - Message selected = this.data.get(id); - selected.update(update); - return selected; - } - - //메시지 삭제 - @Override - public boolean delete(UUID id) { - return data.remove(id) != null; - } - - -} +//package com.sprint.mission.discodeit.service.jcf; +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.Message; +//import com.sprint.mission.discodeit.service.ChannelService; +//import com.sprint.mission.discodeit.service.MessageService; +//import com.sprint.mission.discodeit.service.UserService; +// +// +//import java.util.*; +// +//public class JCFMessageService implements MessageService { +// private static JCFMessageService instance; +// private final Map data = new LinkedHashMap<>(); +// private final UserService userService; +// private final ChannelService channelService; +// +// public JCFMessageService(UserService userService, ChannelService channelService) { +// this.userService = userService; +// this.channelService = channelService; +// } +// +// public static JCFMessageService getInstance(UserService userService, ChannelService channelService) { +// if (instance == null) { +// instance = new JCFMessageService(userService, channelService); +// } +// return instance; +// } +// +// //메시지 생성 +// @Override +// public void create(Message message) { +// Channel channel = message.getChannel(); +// channel.validateMembership(message.getSender()); +// channel.validateCategory(message.getCategory()); +// +// message.validateContent(); +// data.put(message.getId(), message); +// } +// +// //메시지 조회 +// @Override +// public Message find(UUID id) { +// Message message = this.data.get(id); +// +// //메시지id 존재하지 않음 +// if (message == null) { +// throw new IllegalArgumentException(" --해당 ID의 메시지를 찾을 수 없습니다."); +// } +// return this.data.get(id); +// } +// +// //메시지 전체조회 +// @Override +// public List findAll() { +// return new ArrayList<>(this.data.values()); +// } +// +// //메시지 수정 +// @Override +// public Message update(UUID id, Message update) { +// Message selected = this.data.get(id); +// selected.update(update); +// return selected; +// } +// +// //메시지 삭제 +// @Override +// public boolean delete(UUID id) { +// return data.remove(id) != null; +// } +// +// +//} 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 index 148feede..585c0a14 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java @@ -1,110 +1,110 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.UserService; - -import java.util.*; -import java.util.stream.Collectors; - -public class JCFUserService implements UserService { - private static JCFUserService instance; - private final Map data = new HashMap<>(); - private final ChannelService channelService; - - public JCFUserService(ChannelService channelService) { - this.channelService = channelService; - } - - public static JCFUserService getInstance(ChannelService channelService) { - if (instance == null) { - instance = new JCFUserService(channelService); - } - return instance; - } - - //유저 생성 - @Override - public void create(User user) { - //이미 등록된 이메일 추가시 - for (User existingUser : data.values()) { - if (existingUser.getEmail().equals(user.getEmail())) { - throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); - } - } - this.data.put(user.getId(), user); - } - - //유저 아이디 조회 - @Override - public User find(UUID id) { - return this.data.get(id); - } - - //유저 이름으로 조회 - @Override - public List findByName(String name) { - List result = data.values().stream() - .filter(user -> user.getName().contains(name)) - .collect(Collectors.toList()); - - if (result.isEmpty()) { - throw new IllegalArgumentException("존재하지 않는 유저입니다."); - } - return result; - } - - //유저 전체 조회 - @Override - public List findAll() { - return new ArrayList<>(data.values()); - } - - //유저 수정 - @Override - public User update(UUID id, User update) { - User user = this.data.get(id); - - if (user == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); - } - - user.update(update); - return user; - } - - //유저 삭제 - @Override - public boolean delete(UUID id, String password) { - User user = this.data.get(id); - if (!user.getPassword().equals(password)) { - System.out.println("!!유저 탈퇴 실패!! --- 비밀번호 불일치"); - return false; - } - System.out.println("<<유저 [" + user.getName() + "] 탈퇴 성공>>"); - boolean isDeleted = this.data.remove(id) != null; - - if (isDeleted){ - removeUserFromChannels(user); - } - return isDeleted; - } - - //채널 전체에서 해당 유저 삭제 - public void removeUserFromChannels(User user) { - for (Channel channel : channelService.findAllByUserId()) { - Set members = new HashSet<>(channel.getMembers()); - if (members.remove(user)) { - Channel updatedChannel = new Channel( - channel.getChannelName(), - channel.getKeyUser(), - channel.getCategory(), - members - ); - channelService.update(channel.getId(), updatedChannel); - } - } - } - -} \ No newline at end of file +//package com.sprint.mission.discodeit.service.jcf; +// +//import com.sprint.mission.discodeit.entity.Channel; +//import com.sprint.mission.discodeit.entity.User; +//import com.sprint.mission.discodeit.service.ChannelService; +//import com.sprint.mission.discodeit.service.UserService; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +//public class JCFUserService implements UserService { +// private static JCFUserService instance; +// private final Map data = new HashMap<>(); +// private final ChannelService channelService; +// +// public JCFUserService(ChannelService channelService) { +// this.channelService = channelService; +// } +// +// public static JCFUserService getInstance(ChannelService channelService) { +// if (instance == null) { +// instance = new JCFUserService(channelService); +// } +// return instance; +// } +// +// //유저 생성 +// @Override +// public void create(User user) { +// //이미 등록된 이메일 추가시 +// for (User existingUser : data.values()) { +// if (existingUser.getEmail().equals(user.getEmail())) { +// throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); +// } +// } +// this.data.put(user.getId(), user); +// } +// +// //유저 아이디 조회 +// @Override +// public User find(UUID id) { +// return this.data.get(id); +// } +// +// //유저 이름으로 조회 +// @Override +// public List findByName(String name) { +// List result = data.values().stream() +// .filter(user -> user.getName().contains(name)) +// .collect(Collectors.toList()); +// +// if (result.isEmpty()) { +// throw new IllegalArgumentException("존재하지 않는 유저입니다."); +// } +// return result; +// } +// +// //유저 전체 조회 +// @Override +// public List findAll() { +// return new ArrayList<>(data.values()); +// } +// +// //유저 수정 +// @Override +// public User update(UUID id, User update) { +// User user = this.data.get(id); +// +// if (user == null) { +// throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); +// } +// +// user.update(update); +// return user; +// } +// +// //유저 삭제 +// @Override +// public boolean delete(UUID id, String password) { +// User user = this.data.get(id); +// if (!user.getPassword().equals(password)) { +// System.out.println("!!유저 탈퇴 실패!! --- 비밀번호 불일치"); +// return false; +// } +// System.out.println("<<유저 [" + user.getName() + "] 탈퇴 성공>>"); +// boolean isDeleted = this.data.remove(id) != null; +// +// if (isDeleted){ +// removeUserFromChannels(user); +// } +// return isDeleted; +// } +// +// //채널 전체에서 해당 유저 삭제 +// public void removeUserFromChannels(User user) { +// for (Channel channel : channelService.findAllByUserId()) { +// Set members = new HashSet<>(channel.getMembers()); +// if (members.remove(user)) { +// Channel updatedChannel = new Channel( +// channel.getChannelName(), +// channel.getKeyUser(), +// channel.getCategory(), +// members +// ); +// channelService.update(channel.getId(), updatedChannel); +// } +// } +// } +// +//} \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/user.ser b/src/main/java/com/sprint/mission/discodeit/user.ser deleted file mode 100644 index ed86f9c8cdc0f4d67162e67fd81cd93d290c4f5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 921 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05KcTFg}D~p`o5GduB3!pOM?D&&0sw#lVx3 znpj*CoSE*FSyJr9z@3{9=T#K!s(xH9D80}&@7GQ{9L`_f}+g46208a z;^NHwJiV06;^h34)XWmS)Vz|+l1jbM;?yFLGk}1RiGkgVfit-%HL)Z$#jym)E-grb zuzeUTn*AFfM8lGS*%pQdh7Rc zDPdrKGkp!n0Ok?~&NmA;yq(eVW@<|b1FwOhfv%aEsf8{`LorAN(~={{x3)-R9-F{X zFzv;4r&6#e3(N)>UBVz%Tmp1Rd`^B@YLO+1U9X!~fK1{kVPJc`eCMmJYoHbZtuW99 zVyH!vG`idK+7c_??E2)oOVmjZmqq+W8Krqf4ta?{i$J~snavL(gg~B|yXEcd4j>7& z!^qggRM*Vh!V=<{o}36TkLJsBYHidfSH1EL!)1p+Woc1mWhKHJAoDpvggDTWw^Qf5 znX};aGPp+!4GndTfB<62(rwQwl-ODirXFBPDi8E1$7xAb6)^IV!V2ya8IVu97ra@% z5h=8QUePrLdIe(1gvL#qI?k^$SM{^!`_teag3A(-;*!+VoN{35E5Z_Fia?8A?QD3n SX~CPW4rq`W0D&%ur~m-WJ2wab diff --git a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java index 26f71f0b..4c2813bf 100644 --- a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java +++ b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java @@ -6,12 +6,12 @@ //초기화 public class DataInitializer { - public static final String CHANNEL_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/channel.ser"; - public static final String USER_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/user.ser"; - public static final String MESSAGE_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/message.ser"; - public static final String BINARYCONTENT_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/binarycontent.ser"; - public static final String READSTATUS_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/readstatus.ser"; - public static final String USERSTATUS_FILE_PATH = "src/main/java/com/sprint/mission/discodeit/userstatus.ser"; + public static final String CHANNEL_FILE_PATH = "src/main/resources/data/channel.ser"; + public static final String USER_FILE_PATH = "src/main/resources/data/user.ser"; + public static final String MESSAGE_FILE_PATH = "src/main/resources/data/message.ser"; + public static final String BINARYCONTENT_FILE_PATH = "src/main/resources/data/binarycontent.ser"; + public static final String READSTATUS_FILE_PATH = "src/main/resources/data/readstatus.ser"; + public static final String USERSTATUS_FILE_PATH = "src/main/resources/data/userstatus.ser"; private static final List FILE_PATHS = List.of( CHANNEL_FILE_PATH, diff --git a/src/main/resources/data/binarycontent.ser b/src/main/resources/data/binarycontent.ser new file mode 100644 index 0000000000000000000000000000000000000000..c5975123e324fcbdfc5624e1442489e4e62468d6 GIT binary patch literal 82 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 eJQ+AkGKx}*GxBp%Dhli!7{H*M14s#gm=yqSWEX`1 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/channel.ser b/src/main/resources/data/channel.ser new file mode 100644 index 0000000000000000000000000000000000000000..d6e77f83cad1943c953a682574e1b088b043869d GIT binary patch literal 1991 zcma)6ZA@EL7(Tr%AKhS@CPR=ybbiIK#Ym=qG%V4?#ASmv?#HtI&>x<2ZhQ3*kftgi=Vh*&vvwg~ur_mQz{AOD8B5>&kbm+QBVd}qHbLTiO`I1= ziW8VoK!IvN5`3Cm-vG#y)su-w3;w0!WINWAwYNJDeKlgd9|@jj8NeI{Spwu#)XMvx z;gNb6Y!6CnUz!}Aw4I8E|AyB)+C9-xR|C#f=9Pk0RaSTrS%bW)@{(xv@v2wyK^|G5 zhCRgaToL9|Hq2j{`HWwkUizhoBp5^Wv9ZQh2B$U~vd$Jj#Z6Lp`)E>J1pN6AL9>p3`CE17{>`O+fkd(U{q`@G^3*;l6szLsl z-M}PbGm^7uazGMSKX%B9^b#*XXOQzlr!N`4NfMPTSW;=TnZM&&Euk(Y6bd!?391#B zKm(aKj(t%1(^TPe)puwAiS6q|PIQaii|! z=wOHD51kHw7@OT^q{3nOfF*fO3}jQTM#dZ+_flK`&3DTU*DS{`YQK%UB6QXS=!@*s z-C{7E`1$FTsZSDb$FOtp!QsTDNi78wWmivXsYbF;{4f%K z)JHIhJQYDG^x#%j8bq!eD(ik+dB1Y(dBCbB%&AD-z7`}!o6T_?5QN?C52Twds$rKZ^jxESAbZ(25ztH#!);5pp z?CA7%)?yzYZ2O@j<4c)!e;p{vmVc~sxNnfQzc87I48+3&$!@EzuBt63dug}12!~?* zjHM`62Cm-Nqt7y*-zi$0-u>$J);nj5griOREbfd)lD-TSuqW50Ke|P=DblxT{{y0p BREz)s literal 0 HcmV?d00001 diff --git a/src/main/resources/data/message.ser b/src/main/resources/data/message.ser new file mode 100644 index 0000000000000000000000000000000000000000..5116e8da353ce9e8a458f359de4f461671057869 GIT binary patch literal 873 zcmZuuT}TvB6uvvV?vKuze{88m_6MOj3%x`d=!S@^D}t*LW#F(g>`v^?OmnX~639Zj zENGO`#+npmLY84*E!iekM3h8APm$F_JxJ+nPm#R@-Mg2Humf}9ob#RU`_7r$8IS`t zP~hNBOgGD<^>KE(nJ_i!h){W)dLc2 zpB=vi__JWL{J&(Ko!*A|G4pydGUR3e(+t?K$V23pf`=pon?YVg`IG5tY~t&zeRcA~ z(yjK)`#o(|%vBXoA{2UqPLNqnr-M+~{cyc~4<5vB^(`hX)4;$>M3dj$jvD1fZ*CXR927Eok_=}&?IkVDX# zi1`E$LZFzUkrWZ#UKt`@MtFdc1cJ3U(^!E2h-&{n`T)6bhXdPkex%W zjw)~<#p;C7OnDcq0eKFUKJNWezcT*FQ%G7)+Io1o`lYO#Pj6oFn6Gs;RcEUf1T6b9 zBT)*u-=R`Ra&+655(R%wtMoa4*mnHcT>iVC_xq> zP)4%~Bc3#_;tg-E4ae7pCkJqB6t7fKR=k`l#M`Ep?KPhc?sclqYCOJo8wO1CKY!@@ EFWq=8N&o-= literal 0 HcmV?d00001 diff --git a/src/main/resources/data/readstatus.ser b/src/main/resources/data/readstatus.ser new file mode 100644 index 0000000000000000000000000000000000000000..2d51d8e7528fb8d485dcdc5805c5fb8f8008f3cb GIT binary patch literal 885 zcmZ4UmVvdnh(Rzbu`E%qv?Mb}&m*xo!#A;jmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8 zJQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05QlgK7?VRp`I>#W-@=Dk=v@z#K7dmz>|}j zSX>gEneLQXQtZXRotqEmRTM0{H`DWtTKY1v2M1LfdHno=X6Ys8=js&~6lLa>=;dY> z7iZ?@>7`^AC+DZ6W|rus=9OfYRO$t#CZ+_JB$kvGgB$|{j7$t{J`9}68Hss$sX3l0 zB@6;SAV=wge5em{lr>1YC^fMpHN~-{gh3c0U6Prbs_&UsT#}eq0#w12nNrA5$H3|X zbT-h{AZtQ^DnMc&<4X%tAo`&KY^BAiMV=5X6$Qm0QKkv6?q^mX607VCxD_y?+VLCE zOT6IV0a>LNoLV$Bwq=*JlE)?<28N1)a$Y8o^E1Rkv>DmfbX0(hV1}5)i7p2*f6>mF zTYIc`owH^;t5C$~V-FGSd2=--t5d80%Gp8*^KhpMuqX>eZlli&PP>W{?-d%ps(Ven zkAp>#O=sYK`vPn;FQ(04Ifyw;;S-HcZ<38L`?CH04i(>Yi0EFIr77+b`g6Niv`r7u z@=ybdLTz6ELGj!csoD#{A0{d01iC?7g<`X`egfELVJtSoLu{e)Nq3NQ{Z6WLsNSV~};3zmZzxv#&W<4c>=?3tCtA}89sze7Y<`u5FVV``}L bqknCF(oWA@ycUUSDu6v8i^U?CoKOV-A~q1T literal 0 HcmV?d00001 diff --git a/src/main/resources/data/user.ser b/src/main/resources/data/user.ser new file mode 100644 index 0000000000000000000000000000000000000000..ba2cd068e348e323c2fb866c06fc4bbf034c4c86 GIT binary patch literal 1020 zcmZ{iUr19?9LJAWH=Q|~IROuBKXit=j^I!upgWsoO6EsKELnxoVfxp zVI9=nf`gDx5K-cLAdX*znyGT_?K{Vf&*gyY2Gx=Zg>D!nsvZIs64w!qtCEn^I)i{k z%}^E1HoDBTS?#}Okx1zLtBLZhtbEVK0j?L+NC;xmC&tc-1owgivbwuVYMDz<*Q)&A zPq$jN_x`T%SK6yJs>(dpbWtI^EMhFG3NMH_stQOXJW_~AQhWp>osB`Gj02TnV2SDo z5+rmH0_wwT92XH~ZX`oi2c%i}$9(%I%a)m~)T4A#oSk<8{;P)|qA6FhNKf zqWvc=yX{W;Ra0C`@K(-j+pOY;#f#W-@=Dk=v@z#K7dmz>|}j zSX>gEneLQXQtZXRotqEmRTOmiueilw^~gqpx8SIiqt9)iS$fI&xq8I~MVWaedbyd! z#hLkedMTO3$@wX%nI(Fuc_o=8m3pDYsYSshi6y1QAjbd!BNGE_6a!m+UQT9Sst*Ha za#3nxNotB?NeP3n56E@;C7HRY`kr~kC5d?@);WeOSU7+8V&N()jT z`k(@Ar9hiJQ%V>FAf|uxu#fplf--J_nht7o1u&HMV7!w35dr9tMVrf^uFa zkjpZ}LbR;*Zw#p@02#>%BAAOoB-5guGq?6w?>cAAc2=Q?(Z?Pv%EADqIFNPUv!4Oc z%>&ZM1<}2)zoFwxo7C)?mBk__+PuHx)cv+;0Yo=HNH;G;cT@O8qtlyYBh0>Rf4@V; wHyxL5YkiIz5Zyu`-2za%*^={ilt>;Zd+G3O_I^h}oVukwpe`2$=@za40IKW5iU0rr literal 0 HcmV?d00001 diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6e6e0fce8704b2ae01a945f6e3f5e050fae75452 GIT binary patch literal 923 zcmZ`#SxggA6n%9RDzYg-0hbUWntO7_38AhVE1dK)$b;Ebts0>-n-DUWBjfX3ENCpDMJ87Fp*+hnSAdJlzQ#J=JNZ=uiX~Dq=P6?3$ zXbxaXA&8LDQzBy*8Tb(vq!e!dl7XY+Me6gMg!7_q3Uojg>x6km5OeI38f%}U1=08k z8(%{s;J7sHq7GVr#LN_?`9(n|!%IQ&QWY?vJ2Zu$zF-OD9biKbR>2G}f_}CgO9Y@n zYJ*u|1eZ@q&@~7Yy4*@?JeYSHKjTHK6fYhXT(Yhib#@0Ju7$wt&Lh*9{kXUm0Oxaf ztQVw0jB%Dpy8sK#H)%BoQQAQNaoLjm1J8*(OH*#w$Z&V5=~RjG&8z7 zEA$U9%00WWCve$^_yxr&x1h;vZF1!ZyH>uRg?z3`V{~)h2 zVd4isA5_Yu4EZEW!J}u4w1LfKW+*e#L}nIj$k~w@scAtw38KmzytZ2Aw#(CVG{nLr zHc^pnedXqdce=Z;J$zD|5KeGqmfO!ftgSUQVb+0*k1VUX9&fIru43r?`NmsyQQY#) zL}etwJ-%C9&~c&3Kb-4|;jZ_zH{KuQ9#nFJ)~jvz;tB3jb5*a8wX?InG_j#MY^tu| z>&^F1e^%U_2yThD1O$XUV3`rm>am#_zg4t1OQr7BsMP!3rK;bSdyskqH&MIAcRAYn zYXjj{MbyD`p{C?4lb$vi6l{?J4irsBZ;v43BBEk5qN5biv5Kf|;UuXb$w0QetQ! literal 0 HcmV?d00001 From 78af390ec9166e778db4214a088584029c09adfb Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Sun, 4 May 2025 04:10:50 +0900 Subject: [PATCH 32/33] =?UTF-8?q?feat:=20=EC=8B=AC=ED=99=94=20=EC=9A=94?= =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/DiscodeitApplication.java | 10 ++- .../discodeit/config/DiscodeitProperties.java | 12 +++ .../discodeit/config/RepositoryConfig.java | 75 ++++++++++++++++++ .../file/FileBinaryContentRepository.java | 19 +++-- .../file/FileChannelRepository.java | 33 +++++--- .../file/FileMessageRepository.java | 27 ++++--- .../file/FileReadStatusRepository.java | 28 +++++-- .../repository/file/FileUserRepository.java | 28 ++++--- .../file/FileUserStatusRepository.java | 28 +++++-- .../discodeit/util/DataInitializer.java | 42 +++++----- src/main/resources/application.yaml | 5 +- src/main/resources/data/channel.ser | Bin 1991 -> 1991 bytes src/main/resources/data/message.ser | Bin 873 -> 873 bytes src/main/resources/data/readstatus.ser | Bin 885 -> 885 bytes src/main/resources/data/user.ser | Bin 1020 -> 1020 bytes src/main/resources/data/userstatus.ser | Bin 637 -> 637 bytes 16 files changed, 233 insertions(+), 74 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/config/DiscodeitProperties.java create mode 100644 src/main/java/com/sprint/mission/discodeit/config/RepositoryConfig.java diff --git a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java index a6ce5a5e..3e70c2e7 100644 --- a/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/DiscodeitApplication.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.dto.Response.ChannelResponse; import com.sprint.mission.discodeit.dto.Response.MessageResponse; import com.sprint.mission.discodeit.dto.Response.UserResponse; @@ -17,19 +18,24 @@ import com.sprint.mission.discodeit.util.DataInitializer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; import java.util.*; import java.util.stream.Collectors; @SpringBootApplication +@EnableConfigurationProperties(DiscodeitProperties.class) public class DiscodeitApplication { public static void main(String[] args) { + ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); //초기화 - DataInitializer.clearSerializedData(); + DataInitializer initializer = context.getBean(DataInitializer.class); + initializer.clearSerializedData(); - ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args); + context.close(); + context = SpringApplication.run(DiscodeitApplication.class, args); //콩받기 UserService userService = context.getBean(UserService.class); diff --git a/src/main/java/com/sprint/mission/discodeit/config/DiscodeitProperties.java b/src/main/java/com/sprint/mission/discodeit/config/DiscodeitProperties.java new file mode 100644 index 00000000..712257f1 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/config/DiscodeitProperties.java @@ -0,0 +1,12 @@ +package com.sprint.mission.discodeit.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter @Setter +@ConfigurationProperties(prefix = "discodeit.repository") +public class DiscodeitProperties { + private String type; + private String filePath; +} diff --git a/src/main/java/com/sprint/mission/discodeit/config/RepositoryConfig.java b/src/main/java/com/sprint/mission/discodeit/config/RepositoryConfig.java new file mode 100644 index 00000000..ca8e6484 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/config/RepositoryConfig.java @@ -0,0 +1,75 @@ +package com.sprint.mission.discodeit.config; + +import com.sprint.mission.discodeit.repository.*; +import com.sprint.mission.discodeit.repository.file.*; +import com.sprint.mission.discodeit.repository.jcf.*; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class RepositoryConfig { + + private final DiscodeitProperties properties; + + @Bean + public UserRepository userRepository(ChannelRepository channelRepository) { + String type = properties.getType(); + + if ("file".equalsIgnoreCase(type)) { + return new FileUserRepository(properties, channelRepository); + } else { // "jcf" 또는 null인 경우 기본값 + return new JCFUserRepository(); + } + } + @Bean + public ChannelRepository channelRepository() { + String type = properties.getType(); + if ("file".equalsIgnoreCase(type)) { + return new FileChannelRepository(properties); + } else { + return new JCFChannelRepository(); + } + } + + @Bean + public MessageRepository messageRepository(UserRepository userRepository, ChannelRepository channelRepository) { + String type = properties.getType(); + if ("file".equalsIgnoreCase(type)) { + return new FileMessageRepository(properties, userRepository, channelRepository); + } else { + return new JCFMessageRepository(); + } + } + + @Bean + public ReadStatusRepository readStatusRepository() { + String type = properties.getType(); + if ("file".equalsIgnoreCase(type)) { + return new FileReadStatusRepository(properties); + } else { + return new JCFReadStatusRepository(); + } + } + + @Bean + public UserStatusRepository userStatusRepository() { + String type = properties.getType(); + if ("file".equalsIgnoreCase(type)) { + return new FileUserStatusRepository(properties); + } else { + return new JCFUserStatusRepository(); + } + } + + @Bean + public BinaryContentRepository binaryContentRepository() { + String type = properties.getType(); + if ("file".equalsIgnoreCase(type)) { + return new FileBinaryContentRepository(properties); + } else { + return new JCFBinaryContentRepository(); + } + } +} \ 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 index 625520cb..4e78519c 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java @@ -1,20 +1,25 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.repository.BinaryContentRepository; -import org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.util.*; import java.util.stream.Collectors; -import static com.sprint.mission.discodeit.util.DataInitializer.BINARYCONTENT_FILE_PATH; -@Repository public class FileBinaryContentRepository implements BinaryContentRepository { - private final String FILE_PATH = BINARYCONTENT_FILE_PATH; + private static final long serialVersionUID = 1L; - private Map data = loadData(); + private final String filePath; + private Map data; + + public FileBinaryContentRepository(DiscodeitProperties properties) { + this.filePath = properties.getFilePath() + "/binarycontent.ser"; + this.data = loadData(); + } @Override public BinaryContent save(BinaryContent binaryContent) { @@ -84,7 +89,7 @@ public boolean deleteByMessageId(UUID messageId) { } private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { @@ -96,7 +101,7 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { System.out.println("[binaryContent] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); 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 234590e5..a46d8954 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 @@ -1,22 +1,35 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; -import org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.util.*; import java.util.stream.Collectors; -import static com.sprint.mission.discodeit.util.DataInitializer.CHANNEL_FILE_PATH; -@Repository public class FileChannelRepository implements ChannelRepository { - private final String FILE_PATH = CHANNEL_FILE_PATH; + private static final long serialVersionUID = 1L; - private Map data = loadData(); + private final String filePath; + private Map data; + public FileChannelRepository(DiscodeitProperties properties) { + if (properties.getFilePath() == null) { + throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + } + this.filePath = properties.getFilePath() + "/channel.ser"; + this.data = new HashMap<>(); + } + + // 파일 있으면 불러오기 + @PostConstruct + public void init() { + this.data = loadData(); + } //채널 생성 @Override public Channel create(Channel channel) { @@ -68,11 +81,11 @@ public Set members(UUID id) { } private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[메시지] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.err.println("[채널] 데이터 저장 중 오류 발생: " + e.getMessage()); e.printStackTrace(); } } @@ -80,12 +93,12 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[메시지] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println("[채널] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[메시지] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println("[채널] 데이터 불러오기 중 오류 발생: " + e.getMessage()); e.printStackTrace(); } // 실패 시 빈 Map 반환 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 bca9cc4a..1aa5ca9a 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 @@ -1,33 +1,40 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; 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 org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.time.Instant; import java.util.*; -import static com.sprint.mission.discodeit.util.DataInitializer.MESSAGE_FILE_PATH; -@Repository public class FileMessageRepository implements MessageRepository { private static final long serialVersionUID = 1L; - private final String FILE_PATH = MESSAGE_FILE_PATH; - + private final String filePath; private final UserRepository userRepository; private final ChannelRepository channelRepository; + private Map data; - private final Map data = loadData(); - - public FileMessageRepository(UserRepository userRepository, ChannelRepository channelRepository) { + public FileMessageRepository(DiscodeitProperties properties, UserRepository userRepository, ChannelRepository channelRepository) { + if (properties.getFilePath() == null) { + throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + } + this.filePath = properties.getFilePath() + "/message.ser"; this.userRepository = userRepository; this.channelRepository = channelRepository; + this.data = new HashMap<>(); } + // 파일 있으면 불러오기 + @PostConstruct + public void init() { + this.data = loadData(); + } //메시지 생성 @Override public Message create(Message message) { @@ -88,7 +95,7 @@ public boolean deleteByChannelId(UUID channelId) { } private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { @@ -100,7 +107,7 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { System.out.println("[메시지] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); 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 index 88fb3881..d0ed40c3 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -1,20 +1,34 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; -import org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.util.*; import java.util.stream.Collectors; -import static com.sprint.mission.discodeit.util.DataInitializer.READSTATUS_FILE_PATH; -@Repository public class FileReadStatusRepository implements ReadStatusRepository { - private final String FILE_PATH = READSTATUS_FILE_PATH; + private static final long serialVersionUID = 1L; - private Map data = loadData(); + private final String filePath; + private Map data; + + public FileReadStatusRepository(DiscodeitProperties properties) { + if (properties.getFilePath() == null) { + throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + } + this.filePath = properties.getFilePath() + "/readstatus.ser"; + this.data = new HashMap<>(); + } + + // 파일 있으면 불러오기 + @PostConstruct + public void init() { + this.data = loadData(); + } @Override public ReadStatus create(ReadStatus readStatus) { @@ -91,7 +105,7 @@ public boolean deleteByChannelId(UUID channelId) { private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { @@ -103,7 +117,7 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { System.out.println("[readStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); 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 faf3e48c..957802bc 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 @@ -1,27 +1,35 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.UserRepository; -import org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.util.*; -import static com.sprint.mission.discodeit.util.DataInitializer.USER_FILE_PATH; -@Repository public class FileUserRepository implements UserRepository { private static final long serialVersionUID = 1L; - private final String FILE_PATH = USER_FILE_PATH; - + private final String filePath; private ChannelRepository channelRepository; + private Map data; - private Map data = loadData(); - - public FileUserRepository(ChannelRepository channelRepository) { + public FileUserRepository(DiscodeitProperties properties, ChannelRepository channelRepository) { + if (properties.getFilePath() == null) { + throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + } + this.filePath = properties.getFilePath() + "/user.ser"; this.channelRepository = channelRepository; + this.data = new HashMap<>(); + } + + // 파일 있으면 불러오기 + @PostConstruct + public void init() { + this.data = loadData(); } @Override @@ -67,7 +75,7 @@ public boolean delete(UUID id) { } private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { @@ -79,7 +87,7 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { System.out.println("[유저] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); 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 index 3f5f7b2f..c3ca1e78 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -1,19 +1,33 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserStatusRepository; -import org.springframework.stereotype.Repository; +import jakarta.annotation.PostConstruct; import java.io.*; import java.util.*; -import static com.sprint.mission.discodeit.util.DataInitializer.USERSTATUS_FILE_PATH; -@Repository public class FileUserStatusRepository implements UserStatusRepository { - private final String FILE_PATH = USERSTATUS_FILE_PATH; + private static final long serialVersionUID = 1L; - private Map data = loadData(); + private final String filePath; + private Map data; + + public FileUserStatusRepository(DiscodeitProperties properties) { + if (properties.getFilePath() == null) { + throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + } + this.filePath = properties.getFilePath() + "/userstatus.ser"; + this.data = new HashMap<>(); + } + + // 파일 있으면 불러오기 + @PostConstruct + public void init() { + this.data = loadData(); + } @Override public UserStatus create(UserStatus userstatus) { @@ -69,7 +83,7 @@ public boolean deleteByUserId(UUID userId) { } private void saveData() { - try (FileOutputStream fos = new FileOutputStream(FILE_PATH); + try (FileOutputStream fos = new FileOutputStream(filePath); ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { @@ -81,7 +95,7 @@ private void saveData() { // 불러오기 메서드 @SuppressWarnings("unchecked") private Map loadData() { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(FILE_PATH))) { + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { System.out.println("[userStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); diff --git a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java index 4c2813bf..47f35194 100644 --- a/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java +++ b/src/main/java/com/sprint/mission/discodeit/util/DataInitializer.java @@ -1,41 +1,43 @@ package com.sprint.mission.discodeit.util; +import com.sprint.mission.discodeit.config.DiscodeitProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + import java.io.File; import java.nio.file.Path; import java.util.List; //초기화 +@Component +@RequiredArgsConstructor public class DataInitializer { - public static final String CHANNEL_FILE_PATH = "src/main/resources/data/channel.ser"; - public static final String USER_FILE_PATH = "src/main/resources/data/user.ser"; - public static final String MESSAGE_FILE_PATH = "src/main/resources/data/message.ser"; - public static final String BINARYCONTENT_FILE_PATH = "src/main/resources/data/binarycontent.ser"; - public static final String READSTATUS_FILE_PATH = "src/main/resources/data/readstatus.ser"; - public static final String USERSTATUS_FILE_PATH = "src/main/resources/data/userstatus.ser"; + private final DiscodeitProperties properties; - private static final List FILE_PATHS = List.of( - CHANNEL_FILE_PATH, - USER_FILE_PATH, - MESSAGE_FILE_PATH, - BINARYCONTENT_FILE_PATH, - READSTATUS_FILE_PATH, - USERSTATUS_FILE_PATH - ); + public void clearSerializedData() { + String basePath = properties.getFilePath(); + List fileNames = List.of( + "channel.ser", + "user.ser", + "message.ser", + "binarycontent.ser", + "readstatus.ser", + "userstatus.ser" + ); - public static void clearSerializedData() { - for (String path : FILE_PATHS) { + for (String fileName : fileNames) { try { - File file = Path.of(path).toFile(); + File file = Path.of(basePath, fileName).toFile(); if (file.exists()) { boolean deleted = file.delete(); if (deleted) { - System.out.println("초기화 완료 " + file.getName()); + System.out.println("초기화 완료: " + file.getName()); } else { - System.out.println("초기화 실패 " + file.getName()); + System.out.println("초기화 실패: " + file.getName()); } } else { - System.out.println("초기화할 파일이 존재하지 않음 " + file.getName()); + System.out.println("초기화할 파일 없음: " + file.getName()); } } catch (Exception e) { System.out.println("!예외 발생!"); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 545cf9f0..52b021e7 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-path: src/main/resources/data/ \ No newline at end of file diff --git a/src/main/resources/data/channel.ser b/src/main/resources/data/channel.ser index d6e77f83cad1943c953a682574e1b088b043869d..6615482f9f1627f214d35315078f4517f5aca7c1 100644 GIT binary patch delta 916 zcmX@kf1H0pufVpsmfv=N_E4NS)#tC?fA6^)=V~%e4r8^R%*~|6oh2yGo-(7NxQIbx z;zE_l2~2eY{N=n%3_y?}mL(`xcj3+CcT7?OD;`NaboG8P^RsD#hkly3_+$xYMMmMt zR?L>lLKTG!bqoT-urtX|w*=Vj%cwIzFu z@47#lEYG57stt0E5?BGMJDG6Vu|na<9}_fReQ4$Q>~_I-M!9bj*d7)}Fa-)IhH@4V2@XX*uqd)Y z@-F#3hyb<#%Of0a4AO}d!q#AUruFwq#8|wKWCSS8Q0!UleGV+j0tsQ6$#a=?{E@AY zI~6Yjwn7W!8Cx_fKsGRgeF>Jpj0Cv=$q$pCvM6{p{qi@>xRI)vw|QoNfuZBs5(c){ z%Xhxox~7DI*TB#~*APSiv0(woI5!-|$v#u$m|VpoCoum?Xq4%Z*xu_cxtffVdzf7(Gcu{Mg=kq2u*+K7W5(nzHU)uwY{_{$ zN+b`Iy>xgsd%vULPrmS-H(^~2!|`fIS+FQH zL6}cAVlnVS@}8EpU9=3?1|^U|j#zA90*hfuE(@J&CiAh%33T|cxW!@h$VP*=;HZ_O z&+W-JtcvyCAmfxENe#(9ZH5!KRUo2F>pv)-+agtaA^5{2#hgGlh$su5ut5$QZ3b!m T1VqpTqB&d;6skyJ6H);HZQ%q( diff --git a/src/main/resources/data/message.ser b/src/main/resources/data/message.ser index 5116e8da353ce9e8a458f359de4f461671057869..f26527e2b5779b35a6804168951e6fbc696fcf05 100644 GIT binary patch delta 358 zcmaFK_L6NvufP_u^FsV5ET=NG=-l|X+O2Ei+-Cyo@0EzLcpu3KP?(|Ev)cRI@P5MJPQ)!g-ErwM@(b3T^3~cXt(Ly zWxncQQI--0wpW|CzFFP?Q8Y*Rd|YjQ&O?LhD|_Vzh1GAU^Q&74&B0c@rWMC01BdU1E1mz8(cmh3UU>;4F&R-pm_ D!$OHQ delta 358 zcmaFK_L6NvuRznprxOrFeW zmJp)NV7Zm2qL87Efw>q&GVNna&f8HUd7$j2!?W4@9R)#xyb!6~b9GPW+hi zVT^|^Sd^uNfyL-;PXk2BcK=<`Ctvu^o3Jj1;dr&9>|}XnC0is*_#w&`?VP!_$9mT} zYqqlrMT|c7AWK9bQmeywRK8`bSC)`p96Ifx3-{!uOxl4!6C%uKfSoA@QMRwYq2o)N z)a;p+#Udx#yuX7?kc3F>5=*!#9Mr5hQAR6xVvr*rSQO|?wpW|CzFFP?QYkc9n@PtK yXsT903D{I=h}I7O6}LF79@%K{796#5^tlZdJ%4{xQ~&^vG=WY4 diff --git a/src/main/resources/data/readstatus.ser b/src/main/resources/data/readstatus.ser index 2d51d8e7528fb8d485dcdc5805c5fb8f8008f3cb..bdda1e0871a51353776904a0f5e3327f76662bc9 100644 GIT binary patch delta 529 zcmey$_LXfyuR!y~2IXoIR~Z3|BL-hDc)CxVdsv`L|FLSo`vUGfO}pba&$>*ST)?Pa zpCzbpxJRa59}_fReQ4$Q>~_I-M!9bjSQN!i z!Mjd?tro|$S{^0`_0oc_M~NnvmMNcG=X2nA-AtEGh)p>Bbm{CAu)#8z1}lK%AP$^= UB{a(PNNn%)8i}y;bG`K|0Ior-mH+?% delta 486 zcmey$_LXfyufVc6y3K{AcmU|t6iflRq_uKjxV5@mCtp-ZI zfEdTr6h6`D^d{K|voG7ZZ)v^><1tzQ2@@!S@v+6%!S zCMo6wxR%Dj)M+!Iz zOe4U73emln1nm{u}H5I@i MB8$aLn4C}r0DDKC1^@s6 diff --git a/src/main/resources/data/user.ser b/src/main/resources/data/user.ser index ba2cd068e348e323c2fb866c06fc4bbf034c4c86..2fb28f785f7eaacf86124edf9524e60f7c54b173 100644 GIT binary patch delta 305 zcmeyv{)c@+ufUpJA1Y40yOMUuE;Up;$L-0)x!>8c1Z7t!9GN_e(N$pgmP&IO-=Fh0 z_IO?XA?sQ-`8}hkT$Z35^Vyb)5(a*wjM6+KhrGnH)FQp){MvOU z)7r9nad(}Um3P*b>@mLU{s^R99%%eEfj2A8uSIWYYqla-ki#l;}{ zS3Ht<=<5Ao=4aCe5B)T6agctX^W^F-yqWxr$x)!`m%nMoja1FN%`^K83?0wH zOy0{Z$EYy*4zrxN62!3iS3;vqkHq#)uaO8lKi69yq*xi~m}iO{K*xv_m!ziVlqZ&? Q7NL4bZSrI$MJA030Q41f4gdfE delta 310 zcmeyv{)c@+uRw?Yid!63k8Ct}3yxYj`rMv4_d8pNmeoS%n#r>mT?H2HoVm5fde=E? zwzCRFj6U|07cz^=1Le>CPN^ti5U8q3%uBa)NY72o%+X8E&n;xAW8j-oWdX>AN>F#QCFkuZkvvfL(&5?c a{f>e#tED|=O!j4#V^o`*!z{<7Q2_uqc5%S~ diff --git a/src/main/resources/data/userstatus.ser b/src/main/resources/data/userstatus.ser index c3cf0ac7d97949e93249b0a276b1ecb7759b18d0..53c9d09b74d8ce1655f810959716aaf21cc851b9 100644 GIT binary patch delta 296 zcmey%@|R^oufUpJA1Y40yOMUuE;Up;$L-0)xmWA61Z9u6Y^f+HWT<1{1QE=|Ad+cq zS-rTs&dbU>YfJVR-*tZk7G+@oQyk^IObkGfAqLcaP2degHxEc37ex1pM-mTRy&uf{ zY}(+VpXM!&OSfEouk90vc7Bj{UWoRlU;d^UH&Qk8HqY!YFmybNQ+vGa4v20ckZu8p k?)g_jqfC#)_D-*n2s=O5TOXHh*)Mqqcp=(FLE42Y0N3$eO8@`> delta 296 zcmey%@|R^ouRw?Yid!63k8Ct}3yxYj`rMv4_iBBJmeu}^Ar%FM40Q~gAcDCVL^3Vf zIdf}|^{#W)Y-bgU7=7%)qAUzxildyDi2(>Q#DKc*+0TIJ<^k#Bg6Q7Y-_Y@;O=|Yc z%3_fdZQkE;>aKs=v;d-=AEccZqP;16qS5J1vJqxqw!hz@;+u|3yR|;Y4Tx?bkZu8} iRWdJ From 501904679ed7059a3eb40b3ab9de0520c94df58b Mon Sep 17 00:00:00 2001 From: hyohyo-zz Date: Thu, 8 May 2025 17:47:17 +0900 Subject: [PATCH 33/33] =?UTF-8?q?refator:=20ErrorMessage=EA=B4=80=EB=A6=AC?= =?UTF-8?q?,=20=EB=A6=AC=EB=B7=B0=EC=B0=B8=EA=B3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/common/ErrorMessages.java | 22 ++++++ .../mission/discodeit/entity/Channel.java | 12 ++- .../mission/discodeit/entity/Message.java | 5 +- .../sprint/mission/discodeit/entity/User.java | 2 +- .../file/FileBinaryContentRepository.java | 16 ++-- .../file/FileChannelRepository.java | 12 +-- .../file/FileMessageRepository.java | 13 ++-- .../file/FileReadStatusRepository.java | 12 +-- .../repository/file/FileUserRepository.java | 13 ++-- .../file/FileUserStatusRepository.java | 12 +-- .../service/basic/BasicAuthService.java | 8 +- .../basic/BasicBinaryContentService.java | 7 +- .../service/basic/BasicChannelService.java | 72 +++++++++++------- .../service/basic/BasicMessageService.java | 25 ++++-- .../service/basic/BasicReadStatusService.java | 24 ++++-- .../service/basic/BasicUserService.java | 20 +++-- .../service/basic/BasicUserStatusService.java | 22 ++++-- src/main/resources/application.yaml | 4 + src/main/resources/data/channel.ser | Bin 1991 -> 1991 bytes src/main/resources/data/message.ser | Bin 873 -> 873 bytes src/main/resources/data/readstatus.ser | Bin 885 -> 885 bytes src/main/resources/data/user.ser | Bin 1020 -> 1020 bytes src/main/resources/data/userstatus.ser | Bin 637 -> 637 bytes 23 files changed, 200 insertions(+), 101 deletions(-) create mode 100644 src/main/java/com/sprint/mission/discodeit/common/ErrorMessages.java diff --git a/src/main/java/com/sprint/mission/discodeit/common/ErrorMessages.java b/src/main/java/com/sprint/mission/discodeit/common/ErrorMessages.java new file mode 100644 index 00000000..125c8d28 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/common/ErrorMessages.java @@ -0,0 +1,22 @@ +package com.sprint.mission.discodeit.common; + +public class ErrorMessages { + public static final String ERROR_NOT_FOUND = "해당 %s을(를) 찾을 수 없습니다!"; + public static final String ERROR_EXISTS = "이미 등록된 %s입니다!"; + public static final String ERROR_MISMATCH = "%s 불 일치!"; + + public static final String ERROR_FILE_UPLOAD_INVALID = "%s 업로드 대상 또는 내용이 잘못되었습니다!"; + + public static final String ERROR_PRIVATE_CHANNEL_NOT_UPDATE = "private 채널은 수정할 수 없습니다."; + + public static final String ERROR_EMPTY = "%s 내용은 비어있을 수 없습니다."; + + public static final String ERROR_FILE_PATH_NULL = "%s 설정이 null입니다. application.yaml 설정 확인 필요"; + public static final String ERROR_SAVE = "%s 저장 중 오류 발생!"; + public static final String ERROR_LOAD = "%s 불러오기 중 오류 발생!"; + + public static String format(String entityName, String messageTemplate) { + return String.format(messageTemplate, entityName); + } + +} 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 61574c21..b1bf9d56 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.entity; +import com.sprint.mission.discodeit.common.ErrorMessages; import lombok.Getter; import lombok.Setter; @@ -60,7 +61,7 @@ public void setMembers(Set members) { public void validateMembership(User sender) { if (!members.contains(sender)) { throw new IllegalArgumentException( - " ---" + sender.getName() + "(은/는) [" + channelName + "]채널 멤버가 아닙니다."); + ErrorMessages.format("Sender", ErrorMessages.ERROR_NOT_FOUND)); } } @@ -69,7 +70,9 @@ public void validateUniqueCategory() { Set unique = new HashSet<>(); for (String category : this.categories) { if (!unique.add(category)) { - throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Category", ErrorMessages.ERROR_EXISTS) + ); } } } @@ -78,11 +81,12 @@ public void validateUniqueCategory() { public void validateCategory(String category){ if (!categories.contains(category)) { throw new IllegalArgumentException( - " ---"+ category + "(은/는) [" +channelName + "]채널에 존재 하지 않는 카테고리입니다."); + ErrorMessages.format("Category", ErrorMessages.ERROR_NOT_FOUND) + ); } } - public void addKeyUserToMembers() { + public void addCreatorToMembers() { this.members.add(this.creator); } 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 7af1a69e..331c191a 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.entity; +import com.sprint.mission.discodeit.common.ErrorMessages; import lombok.Getter; import java.io.Serializable; @@ -35,7 +36,9 @@ public void update(String content) { public void validateContent() { if (content == null || content.trim().isEmpty()) { - throw new IllegalArgumentException("메시지 내용은 비어있을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("MessageContent", ErrorMessages.ERROR_EMPTY) + ); } } 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 a9c92d27..587cd8bf 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -30,7 +30,7 @@ public User(String name, String email, String phone, String password) { this.createdAt = Instant.now(); this.updatedAt = this.createdAt; //updatedAt의 처음 시간은 createAt과 동일해야 함 - this.profileImageId = null; // 나중에 등록하는 경우가 대부분?? + this.profileImageId = null; } @Override 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 index 4e78519c..5b02de8d 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileBinaryContentRepository.java @@ -1,18 +1,19 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.BinaryContent; import com.sprint.mission.discodeit.repository.BinaryContentRepository; -import jakarta.annotation.PostConstruct; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; import java.io.*; import java.util.*; import java.util.stream.Collectors; - +@ConditionalOnProperty(name = "discodeit.repository.type", havingValue = "file") +@Repository public class FileBinaryContentRepository implements BinaryContentRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private Map data; @@ -93,7 +94,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[binaryContent] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[binaryContent]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -104,9 +105,10 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[binaryContent] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[binaryContent]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[binaryCotent] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[binaryContent]", ErrorMessages.ERROR_LOAD)); e.printStackTrace(); } // 실패 시 빈 Map 반환 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 a46d8954..5c1307dd 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 @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; @@ -12,14 +13,12 @@ public class FileChannelRepository implements ChannelRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private Map data; public FileChannelRepository(DiscodeitProperties properties) { if (properties.getFilePath() == null) { - throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + System.out.println(ErrorMessages.format("[Channel]", ErrorMessages.ERROR_FILE_PATH_NULL)); } this.filePath = properties.getFilePath() + "/channel.ser"; this.data = new HashMap<>(); @@ -85,7 +84,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[채널] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[Channel]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -96,9 +95,10 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[채널] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[Channel]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[채널] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[Channel]", ErrorMessages.ERROR_LOAD)); e.printStackTrace(); } // 실패 시 빈 Map 반환 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 1aa5ca9a..a509ac63 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 @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.repository.ChannelRepository; @@ -13,8 +14,6 @@ public class FileMessageRepository implements MessageRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private final UserRepository userRepository; private final ChannelRepository channelRepository; @@ -22,7 +21,7 @@ public class FileMessageRepository implements MessageRepository { public FileMessageRepository(DiscodeitProperties properties, UserRepository userRepository, ChannelRepository channelRepository) { if (properties.getFilePath() == null) { - throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + System.out.println(ErrorMessages.format("[Message]", ErrorMessages.ERROR_FILE_PATH_NULL)); } this.filePath = properties.getFilePath() + "/message.ser"; this.userRepository = userRepository; @@ -99,7 +98,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[메시지] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[Message]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -110,9 +109,11 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[메시지] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[Message]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[메시지] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[Message]", ErrorMessages.ERROR_LOAD)); + e.printStackTrace(); } // 실패 시 빈 Map 반환 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 index d0ed40c3..1c191f84 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileReadStatusRepository.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.ReadStatus; import com.sprint.mission.discodeit.repository.ReadStatusRepository; @@ -11,14 +12,12 @@ public class FileReadStatusRepository implements ReadStatusRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private Map data; public FileReadStatusRepository(DiscodeitProperties properties) { if (properties.getFilePath() == null) { - throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + System.out.println(ErrorMessages.format("[ReadStatus]", ErrorMessages.ERROR_FILE_PATH_NULL)); } this.filePath = properties.getFilePath() + "/readstatus.ser"; this.data = new HashMap<>(); @@ -109,7 +108,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[readStatus] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[ReadStatus]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -120,9 +119,10 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[readStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[ReadStatus]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[readStatus] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[ReadStatus]", ErrorMessages.ERROR_LOAD)); e.printStackTrace(); } // 실패 시 빈 Map 반환 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 957802bc..e7965e7a 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 @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.ChannelRepository; @@ -11,15 +12,13 @@ public class FileUserRepository implements UserRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private ChannelRepository channelRepository; private Map data; public FileUserRepository(DiscodeitProperties properties, ChannelRepository channelRepository) { if (properties.getFilePath() == null) { - throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + System.out.println(ErrorMessages.format("[User]", ErrorMessages.ERROR_FILE_PATH_NULL)); } this.filePath = properties.getFilePath() + "/user.ser"; this.channelRepository = channelRepository; @@ -79,7 +78,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[유저] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[User]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -90,9 +89,11 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[유저] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[User]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[유저] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[User]", ErrorMessages.ERROR_LOAD)); + e.printStackTrace(); } // 실패 시 빈 Map 반환 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 index c3ca1e78..35af6dd0 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserStatusRepository.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.repository.file; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.config.DiscodeitProperties; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserStatusRepository; @@ -10,14 +11,12 @@ public class FileUserStatusRepository implements UserStatusRepository { - private static final long serialVersionUID = 1L; - private final String filePath; private Map data; public FileUserStatusRepository(DiscodeitProperties properties) { if (properties.getFilePath() == null) { - throw new IllegalStateException("filePath 설정이 null입니다. application.yaml 설정 확인 필요"); + System.out.println(ErrorMessages.format("[UserStatus]", ErrorMessages.ERROR_FILE_PATH_NULL)); } this.filePath = properties.getFilePath() + "/userstatus.ser"; this.data = new HashMap<>(); @@ -87,7 +86,7 @@ private void saveData() { ObjectOutputStream oos = new ObjectOutputStream(fos)) { oos.writeObject(data); } catch (IOException e) { - System.err.println("[userStatus] 데이터 저장 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[UserStatus]", ErrorMessages.ERROR_SAVE)); e.printStackTrace(); } } @@ -98,9 +97,10 @@ private Map loadData() { try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { return (Map) ois.readObject(); } catch (FileNotFoundException e) { - System.out.println("[userStatus] 저장된 파일이 없습니다. 새 데이터를 시작합니다."); + System.out.println(ErrorMessages.format("[UserStatus]", ErrorMessages.ERROR_NOT_FOUND)); + System.out.println("새 데이터를 시작합니다."); } catch (IOException | ClassNotFoundException e) { - System.out.println("[userStatus] 데이터 불러오기 중 오류 발생: " + e.getMessage()); + System.out.println(ErrorMessages.format("[UserStatus]", ErrorMessages.ERROR_LOAD)); e.printStackTrace(); } // 실패 시 빈 Map 반환 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 c2a60f4a..6c380575 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,5 +1,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.request.LoginRequest; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.repository.UserRepository; @@ -15,12 +16,13 @@ public BasicAuthService(UserRepository userRepository) { @Override public User login(LoginRequest request) { //1. Username으로 user 찾기 - User user = userRepository. findByUserName(request.userName()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자 입니다.")); + User user = userRepository.findByUserName(request.userName()) + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("user", ErrorMessages.ERROR_NOT_FOUND))); //2. password 일치 여부 확인 if (!user.getPassword().equals(request.password())) { - throw new IllegalArgumentException("비밀번호가 일치하지 않습니다."); + throw new IllegalArgumentException(ErrorMessages.format("password", ErrorMessages.ERROR_MISMATCH)); } return user; } 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 dfbf0e71..76152f73 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,5 +1,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; import com.sprint.mission.discodeit.dto.request.create.BinaryContentCreateRequest; import com.sprint.mission.discodeit.entity.BinaryContent; @@ -21,7 +22,8 @@ public class BasicBinaryContentService implements BinaryContentService { public BinaryContentResponse create(BinaryContentCreateRequest request) { if ((request.userId() == null && request.messageId() == null) || request.content() == null || request.content().length == 0) { - throw new IllegalArgumentException("파일 업로드 대상 또는 내용이 잘못되었습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("binaryContent", ErrorMessages.ERROR_FILE_UPLOAD_INVALID)); } BinaryContent file = new BinaryContent( @@ -40,7 +42,8 @@ public BinaryContentResponse create(BinaryContentCreateRequest request) { public BinaryContentResponse find(UUID id) { BinaryContent file = binaryContentRepository.find(id); if (file == null) { - throw new IllegalArgumentException("해당 Id의 파일이 존재하지 않습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("BinaryContent", ErrorMessages.ERROR_NOT_FOUND)); } return toBinaryContentResponse(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 17b99a6d..691beef8 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,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_private; import com.sprint.mission.discodeit.dto.request.create.ChannelCreateRequest_public; import com.sprint.mission.discodeit.dto.Response.ChannelResponse; @@ -83,7 +84,7 @@ public ChannelResponse createPublicChannel(ChannelCreateRequest_public request) validateDuplicateChannelName(channel); channel.validateUniqueCategory(); - channel.addKeyUserToMembers(); + channel.addCreatorToMembers(); Channel savedChannel = channelRepository.create(channel); @@ -94,7 +95,8 @@ public ChannelResponse createPublicChannel(ChannelCreateRequest_public request) public ChannelResponse find(UUID channelId) { Channel channel = channelRepository.find(channelId).orElseThrow(); if (channel == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); } List memberIds = new ArrayList<>(); @@ -120,25 +122,9 @@ public List findAllByUserId(UUID userId) { for (Channel channel : channels) { if(channel.isPrivate()) { - List readStatuses = readStatusRepository.findByChannelId(channel.getId()); - - // 해당 유저가 참여자인지 - boolean isMember = readStatuses.stream() - .anyMatch(readStatus -> readStatus.getUserId().equals(userId)); - - //아니라면 조회 대상제외 - if(!isMember) continue; - - //참여자 id리스트 - List memberIds = readStatuses.stream() - .map(ReadStatus::getUserId) - .toList(); - - responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + processPrivateChannel(channel, userId, responses); } else { - //public - List memberIds = List.of(); - responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + processPublicChannel(channel, responses); } } return responses; @@ -148,7 +134,9 @@ public List findAllByUserId(UUID userId) { public List findByChannelName(String channelName) { List channels = channelRepository.findByChannelName(channelName); if (channels.isEmpty()) { - throw new IllegalArgumentException(" --해당 이름의 채널을 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); + } List responses = new ArrayList<>(); @@ -173,10 +161,12 @@ public List findByChannelName(String channelName) { public ChannelResponse update(ChannelUpdateRequest request) { Channel channel = channelRepository.find(request.channelId()).orElseThrow(); if (channel == null) { - throw new IllegalArgumentException(" --해당 ID의 채널을 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); } if(channel.isPrivate()) { - throw new IllegalArgumentException(" --private 채널은 수정할 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_PRIVATE_CHANNEL_NOT_UPDATE)); } channel.update(request.newChannelName(), request.newCategories()); @@ -191,10 +181,13 @@ public ChannelResponse update(ChannelUpdateRequest request) { @Override public boolean delete(UUID id, UUID userId, String password) { Channel channel = channelRepository.find(id) - .orElseThrow(() -> new IllegalArgumentException(" --해당 채널을 찾을 수 없습니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND))); if (!channel.getCreator().getPassword().equals(password)) { - throw new IllegalArgumentException("비밀번호 불일치로 삭제 실패"); + throw new IllegalArgumentException( + ErrorMessages.format("password", ErrorMessages.ERROR_MISMATCH) + ); } messageRepository.deleteByChannelId(id); @@ -212,13 +205,15 @@ private void validateDuplicateChannelName(Channel channel) { List channels = channelRepository.findByChannelName(channel.getChannelName()); if (channels.stream().anyMatch(c -> c.getCreator().equals(channel.getCreator()) && c.getChannelName().equals(channel.getChannelName()))) { - throw new IllegalArgumentException(" --- 이미 등록된 채널입니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); } } private User findUserById(UUID userId) { User user = userRepository.find(userId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND))); return user; } @@ -227,6 +222,29 @@ private Instant lastMessageTime(UUID channelId) { .orElse(null); } + private void processPrivateChannel(Channel channel, UUID userId, List responses) { + List readStatuses = readStatusRepository.findByChannelId(channel.getId()); + + // 해당 유저가 참여자인지 + boolean isMember = readStatuses.stream() + .anyMatch(readStatus -> readStatus.getUserId().equals(userId)); + + //아니라면 조회 대상제외 + if(!isMember) return; + + //참여자 id리스트 + List memberIds = readStatuses.stream() + .map(ReadStatus::getUserId) + .toList(); + + responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), memberIds)); + } + + public void processPublicChannel(Channel channel, List responses) { + // Public 채널은 멤버 리스트 없이 응답 + responses.add(toChannelResponse(channel, lastMessageTime(channel.getId()), List.of())); + } + private ChannelResponse toChannelResponse(Channel channel, Instant lastMessageTime, List memberIds) { return new ChannelResponse( channel.getId(), 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 fd366885..5155fe34 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,5 +1,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.Response.BinaryContentResponse; import com.sprint.mission.discodeit.dto.Response.MessageResponse; import com.sprint.mission.discodeit.dto.request.BinaryContentRequest; @@ -37,7 +38,7 @@ public MessageResponse create(MessageCreateRequest request) { Channel channel = channelRepository.find(request.channelId()).orElseThrow(); if(channel == null) { - throw new IllegalArgumentException("존재하지 않는 채널"); + System.out.println(ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); } Message message = new Message( @@ -74,11 +75,12 @@ public MessageResponse create(MessageCreateRequest request) { public MessageResponse find(UUID id) { Message message = messageRepository.find(id); if (message == null) { - throw new IllegalArgumentException(" --해당 메시지를 찾을 수 없습니다."); + System.out.println(ErrorMessages.format("Message", ErrorMessages.ERROR_NOT_FOUND)); } User sender= userRepository.find(message.getSenderId()) - .orElseThrow(() -> new IllegalArgumentException("작성자를 찾을 수 없습니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND))); List attachmemts = binaryContentRepository.findAll().stream() .filter(file -> file.getMessageId().equals(message.getId())) @@ -91,7 +93,8 @@ public MessageResponse find(UUID id) { public List findAllByChannelId(UUID channelId) { Channel channel = channelRepository.find(channelId).orElseThrow(); if(channel == null) { - throw new IllegalArgumentException("존재하지 않는 채널"); + throw new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND)); } List messages = messageRepository.findAll().stream() @@ -103,7 +106,9 @@ public List findAllByChannelId(UUID channelId) { for (Message message : messages) { User sender = userRepository.find(message.getSenderId()) - .orElseThrow(() -> new IllegalArgumentException(("작성자를 찾을 수 없습니다."))); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("Seder", ErrorMessages.ERROR_NOT_FOUND) + )); List attachments = binaryContentRepository.findAll().stream() .filter(file -> file.getMessageId().equals(message.getId())) @@ -118,7 +123,8 @@ public List findAllByChannelId(UUID channelId) { public MessageResponse update(MessageUpdateRequest request) { Message message = messageRepository.find(request.messageId()); if(message == null) { - throw new IllegalArgumentException("해당 메시지를 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Message", ErrorMessages.ERROR_NOT_FOUND)); } message.update(request.newContent()); @@ -126,7 +132,9 @@ public MessageResponse update(MessageUpdateRequest request) { Message updatedMessage = messageRepository.update(request.messageId(), message); User sender = userRepository.find(updatedMessage.getSenderId()) - .orElseThrow(() -> new IllegalArgumentException("작성자 조회 실패")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("Sender", ErrorMessages.ERROR_NOT_FOUND) + )); List attachments = binaryContentRepository.findAll().stream() .filter(file -> file.getMessageId().equals(updatedMessage.getId())) @@ -139,7 +147,8 @@ public MessageResponse update(MessageUpdateRequest request) { public boolean delete(UUID messageId) { Message message = messageRepository.find(messageId); if (message == null) { - throw new IllegalArgumentException(" --해당 메시지를 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Message", ErrorMessages.ERROR_NOT_FOUND)); } //첨부파일 삭제 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 0dba8d81..d47e297d 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,5 +1,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.request.create.ReadStatusCreateRequest; import com.sprint.mission.discodeit.dto.request.update.ReadStatusUpdateRequest; import com.sprint.mission.discodeit.entity.Channel; @@ -25,10 +26,14 @@ public class BasicReadStatusService implements ReadStatusService { @Override public ReadStatus create(ReadStatusCreateRequest request) { User user = userRepository.find(request.userId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND) + )); Channel channel = channelRepository.find(request.channelId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 채널입니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("Channel", ErrorMessages.ERROR_NOT_FOUND) + )); //가장 최근에 읽은 시간 하나만 두기위해 중복 체크 @@ -36,7 +41,9 @@ public ReadStatus create(ReadStatusCreateRequest request) { .anyMatch(rs -> rs.getChannelId().equals(request.channelId())); if (alreadyExists) { - throw new IllegalStateException("이미 해당 채널에 대한 ReadStatus가 존재합니다."); + throw new IllegalStateException( + ErrorMessages.format("Message", ErrorMessages.ERROR_EXISTS) + ); } ReadStatus readStatus = new ReadStatus( @@ -53,7 +60,8 @@ public ReadStatus create(ReadStatusCreateRequest request) { public ReadStatus find(UUID id) { ReadStatus readStatus = readStatusRepository.find(id); if (readStatus == null) { - throw new IllegalArgumentException("해당 Id의 Readstatus를 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("ReadStatus", ErrorMessages.ERROR_NOT_FOUND)); } return readStatus; } @@ -67,7 +75,9 @@ public List findAllByUserId(UUID userId) { public ReadStatus update(ReadStatusUpdateRequest request) { ReadStatus readStatus = readStatusRepository.find(request.id()); if (readStatus == null) { - throw new IllegalArgumentException("수정할 ReadStatus가 존재하지 않습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("ReadStatus", ErrorMessages.ERROR_NOT_FOUND) + ); } readStatus.setLastReadTime(request.newReadTime()); @@ -78,7 +88,9 @@ public ReadStatus update(ReadStatusUpdateRequest request) { public boolean delete(UUID id) { ReadStatus readStatus = readStatusRepository.find(id); if (readStatus == null) { - throw new IllegalArgumentException("삭제할 ReadStaus가 존재하지 않습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("ReadStatus", ErrorMessages.ERROR_NOT_FOUND) + ); } readStatusRepository.delete(id); return true; 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 cb7337b4..62d0565b 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,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.Response.UserResponse; import com.sprint.mission.discodeit.dto.request.create.UserCreateRequest; import com.sprint.mission.discodeit.dto.request.update.UserUpdateRequest; @@ -86,7 +87,8 @@ public List findAll() { @Override public UserResponse findByUserName(String name) { User user = userRepository.findByUserName(name) - .orElseThrow(() -> new IllegalArgumentException("해당 이름의 유저가 없습니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND))); UserStatus status = userStatusRepository.findByUserId(user.getId()) .orElse(new UserStatus(user.getId(), false)); @@ -129,7 +131,8 @@ public UserResponse update(UserUpdateRequest request) { user.setProfileImageId(binaryContent.getId()); } catch (IOException e) { - throw new RuntimeException("프로필 이미지 저장 중 오류 발생", e); + throw new RuntimeException( + ErrorMessages.format("ProfileImage", ErrorMessages.ERROR_SAVE)); } } @@ -148,11 +151,14 @@ public UserResponse update(UserUpdateRequest request) { public boolean delete(UUID userId, String password) { User user = userRepository.find(userId).orElseThrow(); if (user == null) { - throw new IllegalArgumentException(" --해당 유저를 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND) + ); } if (!user.getPassword().equals(password)) { - System.out.println("!!유저 탈퇴 실패!! --- 비밀번호 불일치"); + System.out.println( + ErrorMessages.format("User", ErrorMessages.ERROR_MISMATCH)); return false; } @@ -185,7 +191,8 @@ private void existsByEmail(String email) { boolean exists = users.stream() .anyMatch((u -> u.getEmail().equals(email))); if(exists) { - throw new IllegalArgumentException(" --- 이미 등록된 이메일입니다."); + throw new IllegalArgumentException( + ErrorMessages.format("Email", ErrorMessages.ERROR_EXISTS)); } } @@ -194,7 +201,8 @@ private void existsByUserName(String userName) { boolean exists = users.stream() .anyMatch((u -> u.getName().equals(userName))); if(exists) { - throw new IllegalArgumentException(" --- 이미 등록된 이름입니다."); + throw new IllegalArgumentException( + ErrorMessages.format("UserName", ErrorMessages.ERROR_EXISTS)); } } diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java index 6946fcdf..26e3bed9 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java @@ -1,5 +1,6 @@ package com.sprint.mission.discodeit.service.basic; +import com.sprint.mission.discodeit.common.ErrorMessages; import com.sprint.mission.discodeit.dto.Response.UserStatusResponse; import com.sprint.mission.discodeit.dto.request.create.UserStatusCreateRequest; import com.sprint.mission.discodeit.dto.request.update.UserStatusUpdateRequest; @@ -25,11 +26,15 @@ public class BasicUserStatusService implements UserStatusService { @Override public UserStatusResponse create(UserStatusCreateRequest request) { User user = userRepository.find(request.userId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + .orElseThrow(() -> new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND)) + ); Optional existing = userStatusRepository.findByUserId(request.userId()); if(existing.isPresent()) { - throw new IllegalArgumentException("해당 유저에 대한 상태 정보가 이미 존재"); + throw new IllegalArgumentException( + ErrorMessages.format("UserStatus", ErrorMessages.ERROR_EXISTS) + ); } UserStatus status = new UserStatus(request.userId(), request.isOnline()); @@ -41,7 +46,9 @@ public UserStatusResponse create(UserStatusCreateRequest request) { public UserStatusResponse find(UUID id) { UserStatus userStatus = userStatusRepository.find(id); if(userStatus == null) { - throw new IllegalArgumentException("해당 Id의 UserStatus를 찾을 수 없습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("User", ErrorMessages.ERROR_NOT_FOUND) + ); } return toUserStatusResponse(userStatus); } @@ -57,7 +64,8 @@ public List findAll() { public UserStatusResponse update(UserStatusUpdateRequest request) { UserStatus userStatus = userStatusRepository.find(request.id()); if(userStatus == null) { - throw new IllegalArgumentException("수정할 UserStatus가 존재하지 않습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("UserStatus", ErrorMessages.ERROR_NOT_FOUND)); } userStatus.updateOnlineStatus(request.newOnlineStatus()); @@ -70,7 +78,8 @@ public UserStatusResponse updateByUserId(UUID userId, UserStatusUpdateRequest re Optional optionalUserStatus = userStatusRepository.findByUserId(userId); if (optionalUserStatus.isEmpty()) { - throw new IllegalArgumentException("해당 유저에 대한 UserStatus가 존재하지 않습니다."); + throw new IllegalArgumentException( + ErrorMessages.format("UserStatus", ErrorMessages.ERROR_NOT_FOUND)); } UserStatus userStatus = optionalUserStatus.get(); @@ -83,7 +92,8 @@ public UserStatusResponse updateByUserId(UUID userId, UserStatusUpdateRequest re public boolean delete(UUID id) { UserStatus userStatus = userStatusRepository.find(id); if(userStatus == null) { - throw new IllegalArgumentException("삭제할 UserStatus가 존재하지 않습니다."); + throw new IllegalArgumentException(ErrorMessages.format( + "UserStatus", ErrorMessages.ERROR_NOT_FOUND)); } userStatusRepository.delete(id); return true; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 52b021e7..f000216a 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,3 +1,7 @@ +spring: + application: + name: discodeit + discodeit: repository: type: file diff --git a/src/main/resources/data/channel.ser b/src/main/resources/data/channel.ser index 6615482f9f1627f214d35315078f4517f5aca7c1..88c89c5e3c5b036800247bc441e6ca1e1c8159bc 100644 GIT binary patch delta 907 zcmX@kf1H0pufUqMt#8hA8g81J-Sy+>Yv)ND=V~%CGE6?ss5jY^MRPJElNww08?JK; z946~BEf)|f=Vf95f($XBpsTshUn*`O{HH;2hPSQHt>CL1uD z$S@TbGSo4MfJqd+9C{lj^Rdba?9MJ;JpVFl@A?^52g?8WPMd7Qs%R_+(j;1ep^N)) zcLhY0X_Ly_=?72pzTV>hzt3Zd+tbMtSS8|07#J}1c&s@A(SyYm3r=jQC}9w&EG??6 ztaM1vP0Y;EOU};)8^W|{)nUGq~ZwB%Ob@ksi`^T zi6yB;4ta@XsYM8HuU6|zWNi?ebnL@{l>)~8?IjGHuXZ-P*|gwI$BYsNUIRk|T>}F{ zLoiVQaWY2SJ8S#MiX@ZP! z1=9hR^YP6*Q6t{3*RFr_U;~S?KoXY`D6-30Kx7F6+p8TL-ZoD@&dg_x;xX=}5eVD; LvDl83TtX@Ui?j~e delta 838 zcmX@kf1H0pufVpsmfv=N_E4NS)#tC?fA6^)=V~%CGEP3usK?Dv&cXl$6(tM|lVzFI zxw8c2*;8gz6c;gQOkAikxtOU=fWMrV38W@NEK5+X?!ueN*(_25D;`NaboG8P^RsD# zhkly3_~fZ9ij2aOeVI*^7z-Kd7=$W7q(Cuy#+x0a`3z?*Ou&0m)zmh{1D&&&So~=R7p1zOq-7-Mt1Z z%EADqcqV^h)G+{=g<{L#aXok4;h52kabYuvVrn{l}^S?+du|H0_SxJnJ$E6i(il;iRxsI0O++fjE5u O@(MT&dV^JmQ~&@GyXt-b diff --git a/src/main/resources/data/message.ser b/src/main/resources/data/message.ser index f26527e2b5779b35a6804168951e6fbc696fcf05..f4129a250066d620d5690035d0afe904fd99d5b8 100644 GIT binary patch delta 409 zcmaFK_L6NvufY2GAq&kuE?-vYE8Xy<#d*`jxz8kb>q}&95Sw)D!-16o#{TUfL0+g-<0k7_ zRnqrZ^sK9{fA{bLi?Wn3uo%7VX@DqMv$plkc}~MkQ?t8%9DVIPX|g=CQXtThbb|)4 zCHxR&Q*Zvi%Dv!_m-3slL0u+p4j@ZJAW}Piz1z3;@~`V@{9Dhu?Q>U$S;F>e^VT=Z z8$c?BCTlb4)B{Zoe|raPsu)D;?(E{l^DndZuAgCbp!|>TG_WX7IWH3f5M+pDzu{?4 zeNzEZJ1ec0^+S@^ni-R4F#J^ZGlp0LGMy7daFsCdylLxs+qU)X)GcpjO~EjVTNM^= dvJe9&zrQqn-m^viOy~a27hdgs17wOq1po@>pvwRN delta 409 zcmaFK_L6NvufP_u^FsV5ET=NG=-l|X+O2Ei+-EZD@0EzLcpu3KP?(|Ev)cPy2?NiY zww||bTi;IIGItAv5`&7$r%Q(NB5nu1}D`~izOo?x5BA*Rj05*lTC zB(`^YjYQb_x!(F9Bcvcw%kKQw`T1%B)1&C~PjA$BhRaC-Gr6f)E?Fc%bqD9&7NrO?ylpu8X`K)=2Po5QSDDFpEzgqFgogkMWI&r?G7zCCX)N| zZ-b@LOfSD#m{wb6y#d*5!XS*rYN#ZG5X7dP!ZUb}e(QMZVz2!@HrQWkvLdsTKQM3@ zraFLKFM(+USPr6lwOU^yYlGONV;>Hz6fpL0hl&QyIdoGuBB8M+YhC^mZ*`EFnn;l$ Mi^WV>L*ST)?Pa zpCzbpxJRa59}_fReQ4$Q>~_I-M!9bjSQN!i z!Mjd?tro|$S{^0`_0oc_M~NnvmMNcG=X2nA-AtEGh)p>Bbm{CAu)#8z1}lK%AP$^= UB{a(PNNn%)8i}y;bG`K|0Ior-mH+?% diff --git a/src/main/resources/data/user.ser b/src/main/resources/data/user.ser index 2fb28f785f7eaacf86124edf9524e60f7c54b173..20b9f2890f3d6b28575b939087fbe0ded86ee5fc 100644 GIT binary patch delta 336 zcmeyv{)c@+ufV#a%`AUJDucvR*#GbxaLSuF_j_3O8?NNtXDUh<_>D43^Nbww63bGH z^pf*)3mNJdm`fNq-^|_ec6JAlEMed^Ff`CLGBz>QH8Z!cEC8wCDh82Eliy#OKJVEg zf2MPP=L@g)zAk!zR9d8 zE(1}#Y1LuAs7R%o{yAad?mBL(VTu==*fRMclLVu}z%6SIv$kZ9vD{tvM>y<~y(aKx@&RTEMv=)knH9aoAi7sPl6dIq z{b1&2(*_UyG;eVnn&s*)ya75?pt7{6va%A@<5H7znHB40Am%mw@;A-6k*b-ud1ils zq2pOx<^@Q80GcOOT#}!c8lRI7^tdIesR|_wY_FH^e6@8A)bqdqH_!!QL$K$SAlA*l y5*lTCB(`_DeT_ue`MKWuIP8;srpN(`yyBA7)SU9flGGy9&{mtw$gIeuQ2_wko2Zun diff --git a/src/main/resources/data/userstatus.ser b/src/main/resources/data/userstatus.ser index 53c9d09b74d8ce1655f810959716aaf21cc851b9..69c76fd76273627ca701bf9fa3876f36240890bf 100644 GIT binary patch delta 296 zcmey%@|R^oufXK@m!{8qw#c99+~4`atG#bboO`uC`wiE`wi^`%g$#8JoFIa^7(_Dd z&Msa&|1xXu`WaRS%K!LI1B7TCFdUwLxss zu@47U3K;vh6IykxDoHbHc>kb=+3t)V_g70is(7q+0-@ jd+N>qSGgA)@=|_tHmJ+Q%>k!wS92d;h;~tscHs&DW#3=5 delta 296 zcmey%@|R^oufUpJA1Y40yOMUuE;Up;$L-0)xmWA61Z9u6Y^f+HWT<1{1QE=|Ad+cq zS-rTs&dbU>YfJVR-*tZk7G+@oQyk^IObkGfAqLcaP2degHxEc37ex1pM-mTRy&uf{ zY}(+VpXM!&OSfEouk90vc7Bj{UWoRlU;d^UH&Qk8HqY!YFmybNQ+vGa4v20ckZu8p k?)g_jqfC#)_D-*n2s=O5TOXHh*)Mqqcp=(FLE42Y0N3$eO8@`>