From 2e40c71a8f93bc2c1b8f36205e92bfbe11f1dfa6 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Wed, 4 Jun 2025 18:56:41 +0900 Subject: [PATCH 01/16] first commit --- .gitignore | 43 +++ build.gradle | 31 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 +++++++++++++++++ gradlew.bat | 89 +++++++ settings.gradle | 1 + .../mission/discodeit/entity/Channel.java | 98 +++++++ .../mission/discodeit/entity/Message.java | 53 ++++ .../mission/discodeit/entity/Parents.java | 31 +++ .../sprint/mission/discodeit/entity/User.java | 106 ++++++++ .../mission/discodeit/factory/Factory.java | 41 +++ .../discodeit/service/ChannelService.java | 23 ++ .../discodeit/service/MessageService.java | 16 ++ .../discodeit/service/UserService.java | 19 ++ .../service/jcf/JCFChannelService.java | 196 ++++++++++++++ .../service/jcf/JCFMessageService.java | 127 +++++++++ .../discodeit/service/jcf/JCFUserService.java | 117 +++++++++ src/main/java/main/JavaApplication.java | 245 ++++++++++++++++++ 19 files changed, 1476 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Channel.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Message.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Parents.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/User.java create mode 100644 src/main/java/com/sprint/mission/discodeit/factory/Factory.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/ChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/MessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/UserService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java create mode 100644 src/main/java/main/JavaApplication.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..869d741f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ +.idea + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..84dbf9536 --- /dev/null +++ b/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'application' + id 'org.openjfx.javafxplugin' version '0.0.14' +} + +group = 'com.sprint.misson' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' +} + +application { + mainClass = 'com.sprint.mission.discodeit.GUI.SelectUserGUI' + +} + +javafx { + version = "21.0.1" // 사용 중인 JavaFX SDK 버전에 맞게 조정 + modules = [ 'javafx.controls', 'javafx.fxml' ] // 필요한 모듈만 적으면 됨 +} + +test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..f95851276 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = '4-sprint-mission' \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java new file mode 100644 index 000000000..6134d21ad --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -0,0 +1,98 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.ArrayList; + +public class Channel extends Parents +{ + private String channelName; + private User hostUser; + + private ArrayList messages; + private ArrayList users; + + public Channel(User hostUser, String name) { + super(); + this.channelName = name; + this.hostUser = hostUser; + this.messages = new ArrayList<>(); + this.users = new ArrayList<>(); + } + + public String getChannelName() { + return channelName; + } + + public void updateChannelName(String channelName) { + super.updateUpdatedAt(); + this.channelName = channelName; + } + + public User getHostUser() { + return hostUser; + } + + public void updateHostUser(User newHostUser) { + updateUpdatedAt(); + this.hostUser = newHostUser; + } + + public ArrayList getMessages() { + return messages; + } + + public void addMessage(Message message) { + if (!messages.contains(message)) { + messages.add(message); + message.getUser().addMessage(message); + } + } + + public void addUser(User user) { + if (!users.contains(user)) { + users.add(user); + user.addChannel(this); + } + } + + public void removeUser(User user) { + if (users.contains(user)) { + users.remove(user); + user.removeChannel(this); + } + } + + public void clearUsers(){ + users.clear(); + } + + public void clearMessages() { + messages.clear(); + } + + public ArrayList getUsers() { + return users; + } + + public void removeMessage(Message message) { + if (messages.contains(message)) { + messages.remove(message); + message.getUser().removeMessage(message); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("Channel{") + .append("channelId=").append(getId()) + .append(", channelName='").append(channelName).append('\'') + .append(", hostUserId=").append(hostUser.getId()) + .append(", createdAt=").append(getCreatedAt()) + .append(", updatedAt=").append(getUpdatedAt()) + .append(", messageIds=").append(messages.stream().map(Message::getId).toList()) + .append(", userIds=").append(users.stream().map(User::getId).toList()) + .append('}'); + return sb.toString(); + } + +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java new file mode 100644 index 000000000..8735afa9f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -0,0 +1,53 @@ +package com.sprint.mission.discodeit.entity; + +public class Message extends Parents{ + + + private String messageContents; + private User user; + private Channel channel; + + + public Message(User user, Channel channel, String contents) { + super(); + this.messageContents = contents; + this.user = user; + this.channel = channel; + } + + public String getMessageContents() { + return messageContents; + } + + public void updateMessageContent(String messageContents) { + updateUpdatedAt(); + this.messageContents = messageContents; + } + + public User getUser() { + return user; + } + + public Channel getChannel() { + return channel; + } + + public void registerMessageToUserAndChannel(User user, Channel channel) { + user.addMessage(this); + channel.addMessage(this); + } + + + + @Override + public String toString() { + return "Message{" + + "messageId=" + getId() + + ", messageContents='" + messageContents + '\'' + + ", user=" + user.getId() + + ", channel=" + channel.getId() + + ", createdAt=" + getCreatedAt() + + ", updatedAt=" + getUpdatedAt() + + '}'; + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java b/src/main/java/com/sprint/mission/discodeit/entity/Parents.java new file mode 100644 index 000000000..99efe8547 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Parents.java @@ -0,0 +1,31 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.UUID; + +public class Parents { + + private final long createdAt; + private long updatedAt; + private UUID id; + + public long getCreatedAt() { + return createdAt; + } + public long getUpdatedAt() { + return updatedAt; + } + + public void updateUpdatedAt() { + this.updatedAt = System.currentTimeMillis(); + } + public UUID getId() { + return id; + } + + // 생성자 만들기 + public Parents() { + this.createdAt = System.currentTimeMillis(); + this.updatedAt = createdAt; + this.id = UUID.randomUUID(); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java new file mode 100644 index 000000000..f4fda690b --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -0,0 +1,106 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.ArrayList; + +public class User extends Parents{ + + private String userName; + + private ArrayList channels; + private ArrayList messages; + + private UserStatus status; + // 유저가 회원가입 상태인지 탈퇴 상태인지를 판별 + // 유저 조회 할 때 조회 되지는 않지만 데이터를 완전 삭제하지 않은 상태이다. + + // enum 추가 + // 팩토리 패턴을 이용해보기 + // 상태추가 + // forEach에서 데이터 값 바꾸지 않기, map에서 바꾸기 + + public enum UserStatus { + ACTIVE, + DEACTIVE // true와 false 로나누는 것보단 확장성이 더 좋을 것 같다. + } + + public User(String userName) { + super(); + this.userName = userName; + this.channels = new ArrayList<>(); + this.messages = new ArrayList<>(); + this.status = UserStatus.ACTIVE; + } + + public String getUserName() { + return userName; + } + + public ArrayList getChannels() { + return channels; + } + + public void addChannel(Channel channel) { + if(!channels.contains(channel)) { + channels.add(channel); + channel.addUser(this); + } + } + + public void removeChannel(Channel channel) { + if(channels.contains(channel)) { + channels.remove(channel); + channel.removeUser(this); + } + } + + public ArrayList getMessages() { + return messages; + } + + public void addMessage(Message message) { + if(!this.messages.contains(message)) { + this.messages.add(message); + } + } + + public void removeMessage(Message message) { + if(messages.contains(message)) { + this.messages.remove(message); + message.getChannel().getMessages().remove(message); + } + } + + public void setUserName(String userName) { + this.userName = userName; + updateUpdatedAt(); + } + + public UserStatus getStatus() { + return status; + } + + public void setStatus(UserStatus status) { + this.status = status; // 유저 삭제와 유저 복구에 쓰일 수 있다. + } + + public void clearChannels() { + channels.clear(); + } + + public void clearMessages() { + messages.clear(); + } + + @Override + public String toString() { + return "User{" + + "userId=" + getId() + + ", userName='" + userName + '\'' + + //", createdAt=" + getCreatedAt() + + //", updatedAt=" + getUpdatedAt() + + ", channels=" + channels.stream().map(channel -> channel.getId()).toList() + + '}'; + } +} + +// remove 통일 \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java new file mode 100644 index 000000000..84966343d --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java @@ -0,0 +1,41 @@ +package com.sprint.mission.discodeit.factory; + +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.jcf.JCFChannelService; +import com.sprint.mission.discodeit.service.jcf.JCFMessageService; +import com.sprint.mission.discodeit.service.jcf.JCFUserService; + +public class Factory { + private static Factory instance; + private UserService userService; + private ChannelService channelService; + private MessageService messageService; + + public static Factory getInstance() { + if (instance == null) { + instance = new Factory(); + } + return instance; + } + + private Factory() { + userService = new JCFUserService(); + channelService = new JCFChannelService(); + messageService = new JCFMessageService(); + } + + public UserService getUserService() { + return userService; + } + + public ChannelService getChannelService() { + return channelService; + } + + public MessageService getMessageService() { + return messageService; + } + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java new file mode 100644 index 000000000..bf531120c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -0,0 +1,23 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; + +import java.util.UUID; + +public interface ChannelService { + + Channel createChannel(User user, String channelName); + void deleteChannel(User user, Channel channel); + + void userJoinChannel(User user, Channel channelName); + void userLeaveChannel(User user, Channel channel); + + void printChannel(Channel channel); + void printAllChannels(); + void printUsersFromChannel(Channel channel); + + void updateChannelName(User user, Channel channel, String newName); + void updateHostUser(User oldHostUser, Channel channel, User newHostUser); + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java new file mode 100644 index 000000000..0af653603 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -0,0 +1,16 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; + +public interface MessageService { + Message createMessage(User user, Channel channel, String contents); + void deleteMessage(User user, Message message); + void updateMessage(User user, Message message, String newContents); + + void printMessagesByChannel(Channel channel); + void printMessage(Message message); + void printAllMessage(); + void printAllMessageByUser(User user); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java new file mode 100644 index 000000000..e225c0ce4 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -0,0 +1,19 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.User; + +public interface UserService { + + // 사용자 추가 + void addUser(User user); + // 사용자 정보 업데이트 + void updateUser(User user, String newUserName); + // 사용자 삭제 + void deleteUser(User user); + void restorationUser(User user); + void printUser(User user); + void printAllUsers(); + void printActiveUsers(); + void printDeactivatedUsers(); + User createUser(String userName); +} 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 new file mode 100644 index 000000000..bc0992a30 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java @@ -0,0 +1,196 @@ +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.ArrayList; + +public class JCFChannelService implements ChannelService { + + + private static final JCFChannelService instance = new JCFChannelService(); + + private final ArrayList data; // channelData + + public JCFChannelService() { + data = new ArrayList<>(); + } + + public static JCFChannelService getInstance() { + return instance; + } + + @Override + public Channel createChannel(User user, String channelName) { + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); + return null; + } + Channel channel = new Channel(user, channelName); + data.add(channel); + + System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", + user.getId(), channelName, channel.getId()); + user.addChannel(channel); + return channel; + } + + @Override + public void userJoinChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); + channel.addUser(user); + user.addChannel(channel); + } + + @Override + public void userLeaveChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); + user.removeChannel(channel); + if (channel.getUsers().isEmpty()) { + System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); + data.remove(channel); + } + } + + @Override + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } + + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); + //System.out.println(channel.toString()); + } + + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + + channel.getUsers().forEach(u -> System.out.println(u.getUserName())); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); + return; // 메서드 종료 + } + if (channel.getHostUser().equals(user)) { + System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", + channel.getChannelName(), newName); + channel.updateChannelName(newName); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + user.getUserName(), channel.getChannelName()); + } + } + + @Override + public void deleteChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + if (!user.equals(channel.getHostUser())) { + System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("채널 삭제: %s%n", channel.getChannelName()); + channel.getMessages() + .stream() + .map(message -> { + message.getUser().removeMessage(message); + return message; + }); + + channel.getUsers() + .stream() + .map(u -> { + u.removeChannel(channel); + return u; + }); + + channel.clearUsers(); + channel.clearMessages(); + data.remove(channel); + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); + return; + } + + if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + return; + } + + if(!channel.getUsers().contains(newHostUser)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); + return; + } + if (channel.getHostUser().equals(oldHostUser)) { + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + oldHostUser.getUserName(), channel.getChannelName()); + } + } +} 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 new file mode 100644 index 000000000..0591e0c82 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java @@ -0,0 +1,127 @@ +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.MessageService; + +import java.util.ArrayList; + +public class JCFMessageService implements MessageService { + + private static JCFMessageService instance = new JCFMessageService(); + private final ArrayList data; + + public JCFMessageService() { + data = new ArrayList<>(); + } + + public static JCFMessageService getInstance() { + return instance; + } + + @Override + public Message createMessage(User user, Channel channel, String contents) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return null; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + return null; + } + System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", + user.getId(), channel.getId(), contents); + Message newMessage = new Message(user, channel, contents); + data.add(newMessage); + newMessage.registerMessageToUserAndChannel(user, channel); + + return newMessage; + } + + @Override + public void deleteMessage(User user, Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); + return; + } + if (user.getId().equals(message.getUser().getId())) { + System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", + user.getUserName(), message.getId(), message.getMessageContents()); + } else { + System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", + user.getUserName(), message.getId()); + return; + } + message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 + user.removeMessage(message); + data.remove(message); + } + + @Override + public void updateMessage(User user, Message message, String newContents) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + return; + } + if(!user.equals(message.getUser())) { + System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + return; + } + + System.out.println("메세지를 업데이트 합니다."); + System.out.printf("이전 메세지: %s%n", message.getMessageContents()); + System.out.printf("현재 메세지: %s%n", newContents); + message.updateMessageContent(newContents); + } + + @Override + public void printMessagesByChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", + channel.getChannelName(), channel.getMessages().size()); + data.stream() + .filter(message -> message.getChannel().equals(channel)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printMessage(Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); + System.out.println(message.toString()); + } + + @Override + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printAllMessageByUser(User user) { + System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", + user.getUserName(), user.getMessages().size()); + user.getMessages() + .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + } +} 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 new file mode 100644 index 000000000..ad057d97f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java @@ -0,0 +1,117 @@ +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.UserService; + +import java.util.*; + +public class JCFUserService implements UserService { + + + private static JCFUserService instance = new JCFUserService(); + private final ArrayList data; + + public JCFUserService() { + data = new ArrayList<>(); + } + + public static JCFUserService getInstance() { + return instance; + } + + @Override + public void addUser(User user) { + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + data.add(user); + } + + @Override + public User createUser(String userName) { + User user = new User(userName); // 직접 생성 + addUser(user); // 내부 등록 + return user; + } + + @Override + public void updateUser(User user, String newName) { + System.out.println("유저의 이름을 변경합니다."); + System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + user.setUserName(newName); + } + + @Override + public void deleteUser(User user) { + + Optional hostChannel = user.getChannels().stream() + .filter(channel -> channel.getHostUser().equals(user)) + .findFirst(); + + if (hostChannel.isPresent()) { + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); + return; //메서드 종료 + } + + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + // usersData.remove(user); + // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. + user.setStatus(User.UserStatus.DEACTIVE); + // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear + // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 + // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. + user.getChannels().stream() + .map(channel -> + { + channel.removeUser(user); + return channel; + }); + user.clearChannels(); + // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. + user.getMessages().stream() + .map(message -> + { + message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. + return message; + }); + user.clearMessages(); + } + + @Override + public void printActiveUsers(){ + // status를 판별하는 식을 추가 + System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE)) + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printUser(User user) { + System.out.print("단일 유저 조회\n"); + System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + } + + @Override + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printDeactivatedUsers() { + System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void restorationUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(User.UserStatus.ACTIVE); + } + +} diff --git a/src/main/java/main/JavaApplication.java b/src/main/java/main/JavaApplication.java new file mode 100644 index 000000000..f291b3e55 --- /dev/null +++ b/src/main/java/main/JavaApplication.java @@ -0,0 +1,245 @@ +package main; + +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.Factory; +import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; + +public class JavaApplication { + + public static void main(String[] args) { + + System.out.println("\n========== userService Test start ==========================================\n"); + userTestApplication(); + System.out.println("\n========== userService Test end ==========================================\n"); + // userService 테스트 + System.out.println("\n========== channelService Test start ==========================================\n"); + channelTestApplication(); + System.out.println("\n========== channelService Test end ==========================================\n"); + // channelService 테스트 + System.out.println("\n========== messageService Test start ==========================================\n"); + messageTestApplication(); + System.out.println("\n========== messageService Test end ==========================================\n"); + // messageService 테스트 + } + + public static void userTestApplication() { + UserService jcfUserService = Factory.getInstance().getUserService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + System.out.println("1. 유저 등록================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 줄바꾸 + // 두 명의 유저를 등록 + + System.out.println("2. 단일 유저 조회================="); + jcfUserService.printUser(user1); + System.out.println(); + // 유저 한명의 정보를 단일 조회 + + System.out.println("3. 전체 유저 조회================="); + jcfUserService.printActiveUsers(); + System.out.println(); + // 유저 전체의 정보를 조회 + System.out.println("4. 유저 정보 변경================="); + jcfUserService.updateUser(user1, "수정된 권용진-1"); + System.out.println(); + // 유저의 이름을 변경 + jcfUserService.printUser(user1); + System.out.println(); + // 변경된 유저의 정보를 조회 + System.out.println("5. 유저 삭제================="); + jcfUserService.deleteUser(user1); + System.out.println(); + // 유저 한 명을 삭제를 통해 비활성화 + jcfUserService.printActiveUsers(); // 조회 + System.out.println(); + // 정상적을 삭제 되었는지를 확인 하기 위한 활성화 상태인 유저 전체 조회 + jcfUserService.printAllUsers(); // 조회 + System.out.println(); + // 활성화된 유저와 비활성화된 유저 전체 조회 + jcfUserService.printDeactivatedUsers(); // 조회 + System.out.println(); + // 비활성화된 유저만 조회 + } + + public static void channelTestApplication() { + UserService jcfUserService = Factory.getInstance().getUserService(); + ChannelService jcfChannelService = Factory.getInstance().getChannelService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + System.out.println("1. 유저 생성================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); + // 채널을 만들기 위한 유저 생성 + + System.out.println("2. 채널 생성================="); + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1-서버"); + Channel channel2 = jcfChannelService.createChannel(user2, "권용진-2-서버"); + System.out.println(); + // 만들어진 유저를 이용하여 채널 생성 + System.out.println(); + System.out.println("3. 채널 전체 조회================="); + jcfChannelService.printAllChannels(); + System.out.println(); + // 생성된 채널 전체 조회 + System.out.println("4. 채널 단일 조회================="); + jcfChannelService.printChannel(channel1); + System.out.println(); + // 생성된 채널 단일 조회 + + System.out.println("5. 채널 정보 수정, 유저 채널 입장================="); + jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + // 이미 만들어진 채널에 다른 유저가 입장 + jcfChannelService.printUsersFromChannel(channel1); + System.out.println(); + // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 + + System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); + jcfChannelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); + // 채널 주인인 유저만 채널의 이름을 변경할 수 있음 + jcfChannelService.printChannel(channel1); + System.out.println(); + // 채널의 정보가 안변했음을 확인하기 위해 채널 정보 조회 + + jcfChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 + System.out.println(); + // 채널 주인은 채널의 이름을 변경할 수 있음 + + jcfChannelService.printAllChannels(); + System.out.println(); + // 변경된 채널 이름 조회 + + System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); + jcfChannelService.userLeaveChannel(user2, channel1); + jcfChannelService.printChannel(channel1); + System.out.println(); + // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 + + System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); + jcfChannelService.userJoinChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 + jcfChannelService.updateHostUser(user2, channel1, user1); + // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. + jcfChannelService.updateHostUser(user1, channel1, user2); + // 채널의 주인을 변경 + jcfChannelService.printChannel(channel1); + System.out.println(); + // 주인이 변경된 채널을 조회 + + System.out.println("9. 채널 삭제, 권한 없는 유저가 삭제하려 할 때================="); + jcfChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 주인이 아니면 채널을 삭제 할 수 없다. + jcfChannelService.printAllChannels(); + System.out.println(); + + jcfChannelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 채널 주인은 채널을 성공적으로 지울 수 있다. + + jcfChannelService.printAllChannels(); + System.out.println(); + // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 + + } + + public static void messageTestApplication() { + + UserService jcfUserService = Factory.getInstance().getUserService(); + ChannelService jcfChannelService = Factory.getInstance().getChannelService(); + MessageService jcfMessageService = Factory.getInstance().getMessageService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정, 의존성 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + + System.out.println("1. 유저 생성================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 유저 생성 + System.out.println("2. 채널 생성================="); + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1의 채널1"); + Channel channel2 = jcfChannelService.createChannel(user1, "권용진-1의 채널2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 채널 생성 + System.out.println("3. 메세지 생성================="); + Message message1 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 + Message message2 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 + Message message3 = jcfMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 + System.out.println(); + System.out.println("4. 유저 별 메세지 조회================="); + jcfMessageService.printAllMessageByUser(user1); //유저 별 조회 + System.out.println(); + System.out.println("5. 채널 별 메시지 조회================="); + jcfMessageService.printMessagesByChannel(channel1); // 채널 별 조회 + System.out.println(); + jcfMessageService.printMessagesByChannel(channel2); // 채널 별 조회 + System.out.println(); + + System.out.println("6. 메세지 단일 조회================="); + jcfMessageService.printMessage(message1); + System.out.println(); + + System.out.println("7. 메세지 전체 조회================="); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메세지 정보 수정================="); + jcfMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메시지 주인이 아닌 유저가 메세지 삭제 하고자 할 때와 메시지 주인인 유저가 메시지 삭제할 떄================="); + jcfMessageService.deleteMessage(user2, message1); + jcfMessageService.deleteMessage(user1, message1); + System.out.println(); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); + jcfChannelService.userJoinChannel(user2, channel1); + Message message4 = jcfMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + jcfUserService.deleteUser(user2); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); + jcfMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); + System.out.println(); + jcfUserService.restorationUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 + jcfMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("11. 유저 본인이 아닌 다른 유저가 메시지를 변경하고자 시도 했을 때================="); + jcfMessageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); // user2는 해당 메시지의 주인이 아니므로 메시지의 내용을 변경할 수 없다. + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + } +} From d3c4e894f59988bf3567a8608852c70178a8db98 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 5 Jun 2025 09:35:01 +0900 Subject: [PATCH 02/16] sprint1-basic --- .../mission/discodeit/entity/Channel.java | 16 +- .../mission/discodeit/entity/Message.java | 8 +- .../sprint/mission/discodeit/entity/User.java | 43 +-- .../mission/discodeit/factory/Factory.java | 41 --- .../discodeit/main/JavaApplication.java | 188 ++++++++++++++ .../discodeit/service/UserService.java | 14 +- .../service/jcf/JCFChannelService.java | 103 ++------ .../service/jcf/JCFMessageService.java | 63 +---- .../discodeit/service/jcf/JCFUserService.java | 85 +----- src/main/java/main/JavaApplication.java | 245 ------------------ 10 files changed, 253 insertions(+), 553 deletions(-) delete mode 100644 src/main/java/com/sprint/mission/discodeit/factory/Factory.java create mode 100644 src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java delete mode 100644 src/main/java/main/JavaApplication.java 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 6134d21ad..75735951e 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -47,6 +47,12 @@ public void addMessage(Message message) { } } + public void removeMessage(Message message) { + if (!messages.contains(message)) { + messages.remove(message); + } + } + public void addUser(User user) { if (!users.contains(user)) { users.add(user); @@ -56,11 +62,12 @@ public void addUser(User user) { public void removeUser(User user) { if (users.contains(user)) { - users.remove(user); + users.remove(user); //!!!!!!!!!!!!!!!!! 오류 왜 남? user.removeChannel(this); } } + public void clearUsers(){ users.clear(); } @@ -73,13 +80,6 @@ public ArrayList getUsers() { return users; } - public void removeMessage(Message message) { - if (messages.contains(message)) { - messages.remove(message); - message.getUser().removeMessage(message); - } - } - @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 8735afa9f..0fc2a38ca 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -6,7 +6,7 @@ public class Message extends Parents{ private String messageContents; private User user; private Channel channel; - +; public Message(User user, Channel channel, String contents) { super(); @@ -36,8 +36,10 @@ public void registerMessageToUserAndChannel(User user, Channel channel) { user.addMessage(this); channel.addMessage(this); } - - + + public void deleteMessage() { + user.removeMessage(this); + } @Override public String toString() { 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 f4fda690b..24cee6533 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -9,32 +9,22 @@ public class User extends Parents{ private ArrayList channels; private ArrayList messages; - private UserStatus status; - // 유저가 회원가입 상태인지 탈퇴 상태인지를 판별 - // 유저 조회 할 때 조회 되지는 않지만 데이터를 완전 삭제하지 않은 상태이다. - - // enum 추가 - // 팩토리 패턴을 이용해보기 - // 상태추가 - // forEach에서 데이터 값 바꾸지 않기, map에서 바꾸기 - - public enum UserStatus { - ACTIVE, - DEACTIVE // true와 false 로나누는 것보단 확장성이 더 좋을 것 같다. - } - public User(String userName) { super(); this.userName = userName; this.channels = new ArrayList<>(); this.messages = new ArrayList<>(); - this.status = UserStatus.ACTIVE; } public String getUserName() { return userName; } + public void reUserName(String newUserName) { + updateUpdatedAt(); // 메소드 쓰지 말고 필드 그대로 + this.userName = newUserName; + } + public ArrayList getChannels() { return channels; } @@ -70,27 +60,6 @@ public void removeMessage(Message message) { } } - public void setUserName(String userName) { - this.userName = userName; - updateUpdatedAt(); - } - - public UserStatus getStatus() { - return status; - } - - public void setStatus(UserStatus status) { - this.status = status; // 유저 삭제와 유저 복구에 쓰일 수 있다. - } - - public void clearChannels() { - channels.clear(); - } - - public void clearMessages() { - messages.clear(); - } - @Override public String toString() { return "User{" + @@ -102,5 +71,3 @@ public String toString() { '}'; } } - -// remove 통일 \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java deleted file mode 100644 index 84966343d..000000000 --- a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.sprint.mission.discodeit.factory; - -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.jcf.JCFChannelService; -import com.sprint.mission.discodeit.service.jcf.JCFMessageService; -import com.sprint.mission.discodeit.service.jcf.JCFUserService; - -public class Factory { - private static Factory instance; - private UserService userService; - private ChannelService channelService; - private MessageService messageService; - - public static Factory getInstance() { - if (instance == null) { - instance = new Factory(); - } - return instance; - } - - private Factory() { - userService = new JCFUserService(); - channelService = new JCFChannelService(); - messageService = new JCFMessageService(); - } - - public UserService getUserService() { - return userService; - } - - public ChannelService getChannelService() { - return channelService; - } - - public MessageService getMessageService() { - return messageService; - } - -} diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java new file mode 100644 index 000000000..4e4d7ef30 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java @@ -0,0 +1,188 @@ +package com.sprint.mission.discodeit.main; + +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 com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.jcf.JCFChannelService; +import com.sprint.mission.discodeit.service.jcf.JCFMessageService; +import com.sprint.mission.discodeit.service.jcf.JCFUserService; + +public class JavaApplication { + + public static void main(String[] args) { + System.out.println("start!!\n"); + + System.out.println("\n========== userService Test start ==========================================\n"); + userTestApplication(); + System.out.println("\n========== userService Test end ==========================================\n"); + // userService 테스트 + System.out.println("\n========== channelService Test start ==========================================\n"); + channelTestApplication(); + System.out.println("\n========== channelService Test end ==========================================\n"); + // channelService 테스트 + System.out.println("\n========== messageService Test start ==========================================\n"); + messageTestApplication(); + System.out.println("\n========== messageService Test end ==========================================\n"); + // messageService 테스트 + } + + public static void userTestApplication() { + UserService jcfUserService = JCFUserService.getInstance(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + + User user1 = new User("권용진-1"); + User user2 = new User("권용진-2"); + + jcfUserService.addUser(user1); // 유저 등록 + System.out.println(); + jcfUserService.addUser(user2); + System.out.println(); + + jcfUserService.printUser(user1); + System.out.println(); + + jcfUserService.printAllUsers(); + System.out.println(); + + jcfUserService.updateUser(user1, "수정된 권용진-1"); + System.out.println(); + + jcfUserService.printUser(user1); + System.out.println(); + + jcfUserService.deleteUser(user1); //삭제 + System.out.println(); + + jcfUserService.printAllUsers(); // 조회 + System.out.println(); + } + + public static void channelTestApplication() { + UserService jcfUserService = JCFUserService.getInstance(); + ChannelService jcfChannelService = JCFChannelService.getInstance(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + // 권용진 2가 메소드에 추가 되어 있음 + User user1 = new User("권용진-1"); + User user2 = new User("권용진-2"); + + jcfUserService.addUser(user1); // 유저 등록 + jcfUserService.addUser(user2); + System.out.println(); + + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1-서버"); + Channel channel2 = jcfChannelService.createChannel(user2, "권용진-2-서버"); + System.out.println(); + + jcfChannelService.printAllChannels(); + System.out.println(); + jcfChannelService.printChannel(channel1); + System.out.println(); + + // 수정및 조회 + jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + jcfChannelService.printUsersFromChannel(channel1); + System.out.println(); + + jcfChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 + System.out.println(); + + jcfChannelService.printAllChannels(); + System.out.println(); + + // 채널 떠남 + jcfChannelService.userLeaveChannel(user2, channel1); + jcfChannelService.printChannel(channel1); + System.out.println(); + + //주인 변경 + jcfChannelService.updateHostUser(user2, channel1, user1); + jcfChannelService.updateHostUser(user1, channel1, user2); + System.out.println(); + + // 채널 삭제 및 조회 + jcfChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + + jcfChannelService.printAllChannels(); + System.out.println(); + } + + public static void messageTestApplication() { + + UserService jcfUserService = JCFUserService.getInstance(); + ChannelService jcfChannelService = JCFChannelService.getInstance(); + MessageService jcfMessageService = JCFMessageService.getInstance(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정, 의존성 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + + User user1 = new User("권용진-1"); + User user2 = new User("권용진-2"); + + jcfUserService.addUser(user1); // 유저 등록 + System.out.println(); // 가독성을 위한 개행 + + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1의 채널1"); + Channel channel2 = jcfChannelService.createChannel(user1, "권용진-1의 채널2"); + + System.out.println(); // 가독성을 위한 개행 + + Message message1 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 + Message message2 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 + + Message message3 = jcfMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 + System.out.println(); + + jcfMessageService.printAllMessageByUser(user1); //유저 별 조회 + System.out.println(); + + jcfMessageService.printMessagesByChannel(channel1); // 채널 별 조회 + System.out.println(); + + jcfMessageService.printMessagesByChannel(channel2); // 채널 별 조회 + System.out.println(); + + jcfMessageService.printMessage(message1); + System.out.println(); + + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + // 메세지 전체 조회, 채널별 조회, 메세지 아이디 별 조회 + // 수정 해야 됨 + jcfMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); + + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + jcfMessageService.deleteMessage(user2, message1); + jcfMessageService.deleteMessage(user1, message1); + System.out.println(); + + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + } +} 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 e225c0ce4..ca08bfa26 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -2,18 +2,22 @@ import com.sprint.mission.discodeit.entity.User; +import java.util.ArrayList; +import java.util.UUID; + public interface UserService { // 사용자 추가 void addUser(User user); + + // 사용자 정보 업데이트 void updateUser(User user, String newUserName); + // 사용자 삭제 - void deleteUser(User user); - void restorationUser(User user); + void deleteUser(User userId); + void printUser(User user); void printAllUsers(); - void printActiveUsers(); - void printDeactivatedUsers(); - User createUser(String userName); + } 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 bc0992a30..499f13f5c 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 @@ -5,16 +5,18 @@ import com.sprint.mission.discodeit.service.ChannelService; import java.util.ArrayList; +import java.util.UUID; public class JCFChannelService implements ChannelService { private static final JCFChannelService instance = new JCFChannelService(); - private final ArrayList data; // channelData + // 정적 대신 인스턴스 변수로 변경 + private final ArrayList channelsData; - public JCFChannelService() { - data = new ArrayList<>(); + private JCFChannelService() { + channelsData = new ArrayList<>(); } public static JCFChannelService getInstance() { @@ -23,12 +25,8 @@ public static JCFChannelService getInstance() { @Override public Channel createChannel(User user, String channelName) { - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); - return null; - } Channel channel = new Channel(user, channelName); - data.add(channel); + channelsData.add(channel); System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", user.getId(), channelName, channel.getId()); @@ -36,17 +34,9 @@ public Channel createChannel(User user, String channelName) { return channel; } + @Override public void userJoinChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); - return; // 메서드 종료 - } System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); channel.addUser(user); user.addChannel(channel); @@ -54,50 +44,30 @@ public void userJoinChannel(User user, Channel channel) { @Override public void userLeaveChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); - return; // 메서드 종료 - } - if(!channel.getUsers().contains(user)) { - System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; // 메서드 종료 - } System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); - user.removeChannel(channel); + //user.removeChannel(channel); 오류 남 if (channel.getUsers().isEmpty()) { System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); - data.remove(channel); + channelsData.remove(channel); } } @Override public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); - data.forEach(channel -> System.out.println(channel.getChannelName())); + System.out.printf("전체 채널 조회, 채널 수: %d%n", channelsData.size()); + channelsData.forEach(channel -> System.out.println(channel.getChannelName())); } @Override public void printChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); - System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); - //System.out.println(channel.toString()); + System.out.printf("채널 단일 조회, 채널 이름: %s%n", channel.getChannelName()); + System.out.println(channel.toString()); } @Override public void printUsersFromChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", channel.getChannelName(), channel.getUsers().size()); @@ -106,14 +76,6 @@ public void printUsersFromChannel(Channel channel) { @Override public void updateChannelName(User user, Channel channel, String newName) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); - return; // 메서드 종료 - } if (channel.getHostUser().equals(user)) { System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", channel.getChannelName(), newName); @@ -126,21 +88,7 @@ public void updateChannelName(User user, Channel channel, String newName) { @Override public void deleteChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; // 메서드 종료 - } - if(!channel.getUsers().contains(user)) { - System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; - } - if (!user.equals(channel.getHostUser())) { - System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); return; } @@ -161,33 +109,16 @@ public void deleteChannel(User user, Channel channel) { channel.clearUsers(); channel.clearMessages(); - data.remove(channel); + + channelsData.remove(channel); } @Override public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); - return; - } - - if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); - return; - } - - if(!channel.getUsers().contains(newHostUser)) { - System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); - return; - } if (channel.getHostUser().equals(oldHostUser)) { System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(newHostUser); + channel.updateHostUser(oldHostUser); } else { System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", oldHostUser.getUserName(), channel.getChannelName()); 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 0591e0c82..3f0bdc3b7 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 @@ -10,10 +10,10 @@ public class JCFMessageService implements MessageService { private static JCFMessageService instance = new JCFMessageService(); - private final ArrayList data; + private final ArrayList messagesData; - public JCFMessageService() { - data = new ArrayList<>(); + private JCFMessageService() { + messagesData = new ArrayList<>(); } public static JCFMessageService getInstance() { @@ -22,33 +22,16 @@ public static JCFMessageService getInstance() { @Override public Message createMessage(User user, Channel channel, String contents) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return null; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); - return null; - } System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", user.getId(), channel.getId(), contents); Message newMessage = new Message(user, channel, contents); - data.add(newMessage); + messagesData.add(newMessage); newMessage.registerMessageToUserAndChannel(user, channel); - return newMessage; } @Override public void deleteMessage(User user, Message message) { - if(message == null) { - System.out.println("메세지가 null 입니다."); - return; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); - return; - } if (user.getId().equals(message.getUser().getId())) { System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", user.getUserName(), message.getId(), message.getMessageContents()); @@ -59,24 +42,11 @@ public void deleteMessage(User user, Message message) { } message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 user.removeMessage(message); - data.remove(message); + messagesData.remove(message); } @Override public void updateMessage(User user, Message message, String newContents) { - if(message == null) { - System.out.println("메세지가 null 입니다."); - return; - } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); - return; - } - if(!user.equals(message.getUser())) { - System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); - return; - } - System.out.println("메세지를 업데이트 합니다."); System.out.printf("이전 메세지: %s%n", message.getMessageContents()); System.out.printf("현재 메세지: %s%n", newContents); @@ -85,13 +55,9 @@ public void updateMessage(User user, Message message, String newContents) { @Override public void printMessagesByChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", channel.getChannelName(), channel.getMessages().size()); - data.stream() + messagesData.stream() .filter(message -> message.getChannel().equals(channel)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); @@ -99,29 +65,22 @@ public void printMessagesByChannel(Channel channel) { @Override public void printMessage(Message message) { - if(message == null) { - System.out.println("메세지가 null 입니다."); - return; - } System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); System.out.println(message.toString()); } @Override public void printAllMessage() { - System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() - .filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) - .toList().size()); - data - .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) - .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", messagesData.size()); + messagesData.forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); } @Override public void printAllMessageByUser(User user) { System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", user.getUserName(), user.getMessages().size()); - user.getMessages() - .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + user.getMessages().forEach(message -> + System.out.printf("내용: %s%n", message.getMessageContents())); } } 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 ad057d97f..2ca29ee42 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,6 +1,5 @@ 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.UserService; @@ -10,10 +9,10 @@ public class JCFUserService implements UserService { private static JCFUserService instance = new JCFUserService(); - private final ArrayList data; + private final ArrayList usersData; - public JCFUserService() { - data = new ArrayList<>(); + private JCFUserService() { + usersData = new ArrayList<>(); } public static JCFUserService getInstance() { @@ -23,67 +22,26 @@ public static JCFUserService getInstance() { @Override public void addUser(User user) { System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); - data.add(user); - } - - @Override - public User createUser(String userName) { - User user = new User(userName); // 직접 생성 - addUser(user); // 내부 등록 - return user; + usersData.add(user); } @Override public void updateUser(User user, String newName) { System.out.println("유저의 이름을 변경합니다."); System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); - user.setUserName(newName); + user.reUserName(newName); } @Override public void deleteUser(User user) { - - Optional hostChannel = user.getChannels().stream() - .filter(channel -> channel.getHostUser().equals(user)) - .findFirst(); - - if (hostChannel.isPresent()) { - System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); - return; //메서드 종료 - } - - System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); - // usersData.remove(user); - // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. - user.setStatus(User.UserStatus.DEACTIVE); - // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear - // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 - // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. - user.getChannels().stream() - .map(channel -> - { - channel.removeUser(user); - return channel; - }); - user.clearChannels(); - // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. - user.getMessages().stream() - .map(message -> - { - message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. - return message; - }); - user.clearMessages(); + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n" ,user.getUserName(), user.getId()); + usersData.remove(user); } @Override - public void printActiveUsers(){ - // status를 판별하는 식을 추가 - System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE))).toList().size()); - data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE)) - .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + public void printAllUsers() { + System.out.printf("전체 유저 조회, 유저 수: %d \n", usersData.size()); + usersData.forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); } @Override @@ -91,27 +49,4 @@ public void printUser(User user) { System.out.print("단일 유저 조회\n"); System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); } - - @Override - public void printAllUsers() { - System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); - data - .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); - } - - @Override - public void printDeactivatedUsers() { - System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE))).toList().size()); - data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 - .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); - } - - @Override - public void restorationUser(User user) { - System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); - user.setStatus(User.UserStatus.ACTIVE); - } - } diff --git a/src/main/java/main/JavaApplication.java b/src/main/java/main/JavaApplication.java deleted file mode 100644 index f291b3e55..000000000 --- a/src/main/java/main/JavaApplication.java +++ /dev/null @@ -1,245 +0,0 @@ -package main; - -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.Factory; -import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; - -public class JavaApplication { - - public static void main(String[] args) { - - System.out.println("\n========== userService Test start ==========================================\n"); - userTestApplication(); - System.out.println("\n========== userService Test end ==========================================\n"); - // userService 테스트 - System.out.println("\n========== channelService Test start ==========================================\n"); - channelTestApplication(); - System.out.println("\n========== channelService Test end ==========================================\n"); - // channelService 테스트 - System.out.println("\n========== messageService Test start ==========================================\n"); - messageTestApplication(); - System.out.println("\n========== messageService Test end ==========================================\n"); - // messageService 테스트 - } - - public static void userTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - System.out.println("1. 유저 등록================="); - User user1 = jcfUserService.createUser("권용진-1"); - User user2 = jcfUserService.createUser("권용진-2"); - System.out.println(); // 가독성을 위한 줄바꾸 - // 두 명의 유저를 등록 - - System.out.println("2. 단일 유저 조회================="); - jcfUserService.printUser(user1); - System.out.println(); - // 유저 한명의 정보를 단일 조회 - - System.out.println("3. 전체 유저 조회================="); - jcfUserService.printActiveUsers(); - System.out.println(); - // 유저 전체의 정보를 조회 - System.out.println("4. 유저 정보 변경================="); - jcfUserService.updateUser(user1, "수정된 권용진-1"); - System.out.println(); - // 유저의 이름을 변경 - jcfUserService.printUser(user1); - System.out.println(); - // 변경된 유저의 정보를 조회 - System.out.println("5. 유저 삭제================="); - jcfUserService.deleteUser(user1); - System.out.println(); - // 유저 한 명을 삭제를 통해 비활성화 - jcfUserService.printActiveUsers(); // 조회 - System.out.println(); - // 정상적을 삭제 되었는지를 확인 하기 위한 활성화 상태인 유저 전체 조회 - jcfUserService.printAllUsers(); // 조회 - System.out.println(); - // 활성화된 유저와 비활성화된 유저 전체 조회 - jcfUserService.printDeactivatedUsers(); // 조회 - System.out.println(); - // 비활성화된 유저만 조회 - } - - public static void channelTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); - ChannelService jcfChannelService = Factory.getInstance().getChannelService(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - System.out.println("1. 유저 생성================="); - User user1 = jcfUserService.createUser("권용진-1"); - User user2 = jcfUserService.createUser("권용진-2"); - System.out.println(); - // 채널을 만들기 위한 유저 생성 - - System.out.println("2. 채널 생성================="); - Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1-서버"); - Channel channel2 = jcfChannelService.createChannel(user2, "권용진-2-서버"); - System.out.println(); - // 만들어진 유저를 이용하여 채널 생성 - System.out.println(); - System.out.println("3. 채널 전체 조회================="); - jcfChannelService.printAllChannels(); - System.out.println(); - // 생성된 채널 전체 조회 - System.out.println("4. 채널 단일 조회================="); - jcfChannelService.printChannel(channel1); - System.out.println(); - // 생성된 채널 단일 조회 - - System.out.println("5. 채널 정보 수정, 유저 채널 입장================="); - jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 - // 이미 만들어진 채널에 다른 유저가 입장 - jcfChannelService.printUsersFromChannel(channel1); - System.out.println(); - // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 - - System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); - jcfChannelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); - // 채널 주인인 유저만 채널의 이름을 변경할 수 있음 - jcfChannelService.printChannel(channel1); - System.out.println(); - // 채널의 정보가 안변했음을 확인하기 위해 채널 정보 조회 - - jcfChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 - System.out.println(); - // 채널 주인은 채널의 이름을 변경할 수 있음 - - jcfChannelService.printAllChannels(); - System.out.println(); - // 변경된 채널 이름 조회 - - System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); - jcfChannelService.userLeaveChannel(user2, channel1); - jcfChannelService.printChannel(channel1); - System.out.println(); - // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 - - System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); - jcfChannelService.userJoinChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 - jcfChannelService.updateHostUser(user2, channel1, user1); - // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. - jcfChannelService.updateHostUser(user1, channel1, user2); - // 채널의 주인을 변경 - jcfChannelService.printChannel(channel1); - System.out.println(); - // 주인이 변경된 채널을 조회 - - System.out.println("9. 채널 삭제, 권한 없는 유저가 삭제하려 할 때================="); - jcfChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 - System.out.println(); - // 주인이 아니면 채널을 삭제 할 수 없다. - jcfChannelService.printAllChannels(); - System.out.println(); - - jcfChannelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 - System.out.println(); - // 채널 주인은 채널을 성공적으로 지울 수 있다. - - jcfChannelService.printAllChannels(); - System.out.println(); - // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 - - } - - public static void messageTestApplication() { - - UserService jcfUserService = Factory.getInstance().getUserService(); - ChannelService jcfChannelService = Factory.getInstance().getChannelService(); - MessageService jcfMessageService = Factory.getInstance().getMessageService(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정, 의존성 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - - System.out.println("1. 유저 생성================="); - User user1 = jcfUserService.createUser("권용진-1"); - User user2 = jcfUserService.createUser("권용진-2"); - System.out.println(); // 가독성을 위한 개행 - // 메세지를 생성하기 위한 유저 생성 - System.out.println("2. 채널 생성================="); - Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1의 채널1"); - Channel channel2 = jcfChannelService.createChannel(user1, "권용진-1의 채널2"); - System.out.println(); // 가독성을 위한 개행 - // 메세지를 생성하기 위한 채널 생성 - System.out.println("3. 메세지 생성================="); - Message message1 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 - Message message2 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 - Message message3 = jcfMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 - System.out.println(); - System.out.println("4. 유저 별 메세지 조회================="); - jcfMessageService.printAllMessageByUser(user1); //유저 별 조회 - System.out.println(); - System.out.println("5. 채널 별 메시지 조회================="); - jcfMessageService.printMessagesByChannel(channel1); // 채널 별 조회 - System.out.println(); - jcfMessageService.printMessagesByChannel(channel2); // 채널 별 조회 - System.out.println(); - - System.out.println("6. 메세지 단일 조회================="); - jcfMessageService.printMessage(message1); - System.out.println(); - - System.out.println("7. 메세지 전체 조회================="); - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - System.out.println("8. 메세지 정보 수정================="); - jcfMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); - System.out.println(); - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - System.out.println("8. 메시지 주인이 아닌 유저가 메세지 삭제 하고자 할 때와 메시지 주인인 유저가 메시지 삭제할 떄================="); - jcfMessageService.deleteMessage(user2, message1); - jcfMessageService.deleteMessage(user1, message1); - System.out.println(); - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); - jcfChannelService.userJoinChannel(user2, channel1); - Message message4 = jcfMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - jcfUserService.deleteUser(user2); - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); - jcfMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); - System.out.println(); - jcfUserService.restorationUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 - jcfMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - System.out.println("11. 유저 본인이 아닌 다른 유저가 메시지를 변경하고자 시도 했을 때================="); - jcfMessageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); - System.out.println(); // user2는 해당 메시지의 주인이 아니므로 메시지의 내용을 변경할 수 없다. - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - } -} From 4aef4dac68b62d9884a0e8c1877bef70a1b43c6f Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 5 Jun 2025 10:00:25 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=EC=8B=AC=ED=99=94=20=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/Channel.java | 98 --------- .../mission/discodeit/entity/Message.java | 55 ----- .../mission/discodeit/entity/Parents.java | 31 --- .../sprint/mission/discodeit/entity/User.java | 73 ------- .../discodeit/main/JavaApplication.java | 188 ------------------ .../discodeit/service/ChannelService.java | 23 --- .../discodeit/service/MessageService.java | 16 -- .../discodeit/service/UserService.java | 23 --- .../service/jcf/JCFChannelService.java | 127 ------------ .../service/jcf/JCFMessageService.java | 86 -------- .../discodeit/service/jcf/JCFUserService.java | 52 ----- 11 files changed, 772 deletions(-) delete mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Channel.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Message.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Parents.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/entity/User.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/ChannelService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/MessageService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/UserService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java deleted file mode 100644 index 75735951e..000000000 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.sprint.mission.discodeit.entity; - -import java.util.ArrayList; - -public class Channel extends Parents -{ - private String channelName; - private User hostUser; - - private ArrayList messages; - private ArrayList users; - - public Channel(User hostUser, String name) { - super(); - this.channelName = name; - this.hostUser = hostUser; - this.messages = new ArrayList<>(); - this.users = new ArrayList<>(); - } - - public String getChannelName() { - return channelName; - } - - public void updateChannelName(String channelName) { - super.updateUpdatedAt(); - this.channelName = channelName; - } - - public User getHostUser() { - return hostUser; - } - - public void updateHostUser(User newHostUser) { - updateUpdatedAt(); - this.hostUser = newHostUser; - } - - public ArrayList getMessages() { - return messages; - } - - public void addMessage(Message message) { - if (!messages.contains(message)) { - messages.add(message); - message.getUser().addMessage(message); - } - } - - public void removeMessage(Message message) { - if (!messages.contains(message)) { - messages.remove(message); - } - } - - public void addUser(User user) { - if (!users.contains(user)) { - users.add(user); - user.addChannel(this); - } - } - - public void removeUser(User user) { - if (users.contains(user)) { - users.remove(user); //!!!!!!!!!!!!!!!!! 오류 왜 남? - user.removeChannel(this); - } - } - - - public void clearUsers(){ - users.clear(); - } - - public void clearMessages() { - messages.clear(); - } - - public ArrayList getUsers() { - return users; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("Channel{") - .append("channelId=").append(getId()) - .append(", channelName='").append(channelName).append('\'') - .append(", hostUserId=").append(hostUser.getId()) - .append(", createdAt=").append(getCreatedAt()) - .append(", updatedAt=").append(getUpdatedAt()) - .append(", messageIds=").append(messages.stream().map(Message::getId).toList()) - .append(", userIds=").append(users.stream().map(User::getId).toList()) - .append('}'); - return sb.toString(); - } - -} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java deleted file mode 100644 index 0fc2a38ca..000000000 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.sprint.mission.discodeit.entity; - -public class Message extends Parents{ - - - private String messageContents; - private User user; - private Channel channel; -; - - public Message(User user, Channel channel, String contents) { - super(); - this.messageContents = contents; - this.user = user; - this.channel = channel; - } - - public String getMessageContents() { - return messageContents; - } - - public void updateMessageContent(String messageContents) { - updateUpdatedAt(); - this.messageContents = messageContents; - } - - public User getUser() { - return user; - } - - public Channel getChannel() { - return channel; - } - - public void registerMessageToUserAndChannel(User user, Channel channel) { - user.addMessage(this); - channel.addMessage(this); - } - - public void deleteMessage() { - user.removeMessage(this); - } - - @Override - public String toString() { - return "Message{" + - "messageId=" + getId() + - ", messageContents='" + messageContents + '\'' + - ", user=" + user.getId() + - ", channel=" + channel.getId() + - ", createdAt=" + getCreatedAt() + - ", updatedAt=" + getUpdatedAt() + - '}'; - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java b/src/main/java/com/sprint/mission/discodeit/entity/Parents.java deleted file mode 100644 index 99efe8547..000000000 --- a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.sprint.mission.discodeit.entity; - -import java.util.UUID; - -public class Parents { - - private final long createdAt; - private long updatedAt; - private UUID id; - - public long getCreatedAt() { - return createdAt; - } - public long getUpdatedAt() { - return updatedAt; - } - - public void updateUpdatedAt() { - this.updatedAt = System.currentTimeMillis(); - } - public UUID getId() { - return id; - } - - // 생성자 만들기 - public Parents() { - this.createdAt = System.currentTimeMillis(); - this.updatedAt = createdAt; - this.id = UUID.randomUUID(); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java deleted file mode 100644 index 24cee6533..000000000 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.sprint.mission.discodeit.entity; - -import java.util.ArrayList; - -public class User extends Parents{ - - private String userName; - - private ArrayList channels; - private ArrayList messages; - - public User(String userName) { - super(); - this.userName = userName; - this.channels = new ArrayList<>(); - this.messages = new ArrayList<>(); - } - - public String getUserName() { - return userName; - } - - public void reUserName(String newUserName) { - updateUpdatedAt(); // 메소드 쓰지 말고 필드 그대로 - this.userName = newUserName; - } - - public ArrayList getChannels() { - return channels; - } - - public void addChannel(Channel channel) { - if(!channels.contains(channel)) { - channels.add(channel); - channel.addUser(this); - } - } - - public void removeChannel(Channel channel) { - if(channels.contains(channel)) { - channels.remove(channel); - channel.removeUser(this); - } - } - - public ArrayList getMessages() { - return messages; - } - - public void addMessage(Message message) { - if(!this.messages.contains(message)) { - this.messages.add(message); - } - } - - public void removeMessage(Message message) { - if(messages.contains(message)) { - this.messages.remove(message); - message.getChannel().getMessages().remove(message); - } - } - - @Override - public String toString() { - return "User{" + - "userId=" + getId() + - ", userName='" + userName + '\'' + - //", createdAt=" + getCreatedAt() + - //", updatedAt=" + getUpdatedAt() + - ", channels=" + channels.stream().map(channel -> channel.getId()).toList() + - '}'; - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java deleted file mode 100644 index 4e4d7ef30..000000000 --- a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.sprint.mission.discodeit.main; - -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 com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.jcf.JCFChannelService; -import com.sprint.mission.discodeit.service.jcf.JCFMessageService; -import com.sprint.mission.discodeit.service.jcf.JCFUserService; - -public class JavaApplication { - - public static void main(String[] args) { - System.out.println("start!!\n"); - - System.out.println("\n========== userService Test start ==========================================\n"); - userTestApplication(); - System.out.println("\n========== userService Test end ==========================================\n"); - // userService 테스트 - System.out.println("\n========== channelService Test start ==========================================\n"); - channelTestApplication(); - System.out.println("\n========== channelService Test end ==========================================\n"); - // channelService 테스트 - System.out.println("\n========== messageService Test start ==========================================\n"); - messageTestApplication(); - System.out.println("\n========== messageService Test end ==========================================\n"); - // messageService 테스트 - } - - public static void userTestApplication() { - UserService jcfUserService = JCFUserService.getInstance(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - - User user1 = new User("권용진-1"); - User user2 = new User("권용진-2"); - - jcfUserService.addUser(user1); // 유저 등록 - System.out.println(); - jcfUserService.addUser(user2); - System.out.println(); - - jcfUserService.printUser(user1); - System.out.println(); - - jcfUserService.printAllUsers(); - System.out.println(); - - jcfUserService.updateUser(user1, "수정된 권용진-1"); - System.out.println(); - - jcfUserService.printUser(user1); - System.out.println(); - - jcfUserService.deleteUser(user1); //삭제 - System.out.println(); - - jcfUserService.printAllUsers(); // 조회 - System.out.println(); - } - - public static void channelTestApplication() { - UserService jcfUserService = JCFUserService.getInstance(); - ChannelService jcfChannelService = JCFChannelService.getInstance(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - // 권용진 2가 메소드에 추가 되어 있음 - User user1 = new User("권용진-1"); - User user2 = new User("권용진-2"); - - jcfUserService.addUser(user1); // 유저 등록 - jcfUserService.addUser(user2); - System.out.println(); - - Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1-서버"); - Channel channel2 = jcfChannelService.createChannel(user2, "권용진-2-서버"); - System.out.println(); - - jcfChannelService.printAllChannels(); - System.out.println(); - jcfChannelService.printChannel(channel1); - System.out.println(); - - // 수정및 조회 - jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 - jcfChannelService.printUsersFromChannel(channel1); - System.out.println(); - - jcfChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 - System.out.println(); - - jcfChannelService.printAllChannels(); - System.out.println(); - - // 채널 떠남 - jcfChannelService.userLeaveChannel(user2, channel1); - jcfChannelService.printChannel(channel1); - System.out.println(); - - //주인 변경 - jcfChannelService.updateHostUser(user2, channel1, user1); - jcfChannelService.updateHostUser(user1, channel1, user2); - System.out.println(); - - // 채널 삭제 및 조회 - jcfChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 - System.out.println(); - - jcfChannelService.printAllChannels(); - System.out.println(); - } - - public static void messageTestApplication() { - - UserService jcfUserService = JCFUserService.getInstance(); - ChannelService jcfChannelService = JCFChannelService.getInstance(); - MessageService jcfMessageService = JCFMessageService.getInstance(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정, 의존성 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ - - User user1 = new User("권용진-1"); - User user2 = new User("권용진-2"); - - jcfUserService.addUser(user1); // 유저 등록 - System.out.println(); // 가독성을 위한 개행 - - Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1의 채널1"); - Channel channel2 = jcfChannelService.createChannel(user1, "권용진-1의 채널2"); - - System.out.println(); // 가독성을 위한 개행 - - Message message1 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 - Message message2 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 - - Message message3 = jcfMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 - System.out.println(); - - jcfMessageService.printAllMessageByUser(user1); //유저 별 조회 - System.out.println(); - - jcfMessageService.printMessagesByChannel(channel1); // 채널 별 조회 - System.out.println(); - - jcfMessageService.printMessagesByChannel(channel2); // 채널 별 조회 - System.out.println(); - - jcfMessageService.printMessage(message1); - System.out.println(); - - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - // 메세지 전체 조회, 채널별 조회, 메세지 아이디 별 조회 - // 수정 해야 됨 - jcfMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); - System.out.println(); - - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - - jcfMessageService.deleteMessage(user2, message1); - jcfMessageService.deleteMessage(user1, message1); - System.out.println(); - - jcfMessageService.printAllMessage(); // 전체 조회 - System.out.println(); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java deleted file mode 100644 index bf531120c..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.sprint.mission.discodeit.service; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.User; - -import java.util.UUID; - -public interface ChannelService { - - Channel createChannel(User user, String channelName); - void deleteChannel(User user, Channel channel); - - void userJoinChannel(User user, Channel channelName); - void userLeaveChannel(User user, Channel channel); - - void printChannel(Channel channel); - void printAllChannels(); - void printUsersFromChannel(Channel channel); - - void updateChannelName(User user, Channel channel, String newName); - void updateHostUser(User oldHostUser, Channel channel, User newHostUser); - -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java deleted file mode 100644 index 0af653603..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.sprint.mission.discodeit.service; - -import com.sprint.mission.discodeit.entity.Channel; -import com.sprint.mission.discodeit.entity.Message; -import com.sprint.mission.discodeit.entity.User; - -public interface MessageService { - Message createMessage(User user, Channel channel, String contents); - void deleteMessage(User user, Message message); - void updateMessage(User user, Message message, String newContents); - - void printMessagesByChannel(Channel channel); - void printMessage(Message message); - void printAllMessage(); - void printAllMessageByUser(User user); -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java deleted file mode 100644 index ca08bfa26..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.sprint.mission.discodeit.service; - -import com.sprint.mission.discodeit.entity.User; - -import java.util.ArrayList; -import java.util.UUID; - -public interface UserService { - - // 사용자 추가 - void addUser(User user); - - - // 사용자 정보 업데이트 - void updateUser(User user, String newUserName); - - // 사용자 삭제 - void deleteUser(User userId); - - void printUser(User user); - void printAllUsers(); - -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java deleted file mode 100644 index 499f13f5c..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java +++ /dev/null @@ -1,127 +0,0 @@ -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.ArrayList; -import java.util.UUID; - -public class JCFChannelService implements ChannelService { - - - private static final JCFChannelService instance = new JCFChannelService(); - - // 정적 대신 인스턴스 변수로 변경 - private final ArrayList channelsData; - - private JCFChannelService() { - channelsData = new ArrayList<>(); - } - - public static JCFChannelService getInstance() { - return instance; - } - - @Override - public Channel createChannel(User user, String channelName) { - Channel channel = new Channel(user, channelName); - channelsData.add(channel); - - System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", - user.getId(), channelName, channel.getId()); - user.addChannel(channel); - return channel; - } - - - @Override - public void userJoinChannel(User user, Channel channel) { - System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); - channel.addUser(user); - user.addChannel(channel); - } - - @Override - public void userLeaveChannel(User user, Channel channel) { - System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); - - channel.removeUser(user); - //user.removeChannel(channel); 오류 남 - if (channel.getUsers().isEmpty()) { - System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); - channelsData.remove(channel); - } - } - - @Override - public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", channelsData.size()); - channelsData.forEach(channel -> System.out.println(channel.getChannelName())); - } - - @Override - public void printChannel(Channel channel) { - System.out.printf("채널 단일 조회, 채널 이름: %s%n", channel.getChannelName()); - System.out.println(channel.toString()); - } - - @Override - public void printUsersFromChannel(Channel channel) { - System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", - channel.getChannelName(), channel.getUsers().size()); - - channel.getUsers().forEach(u -> System.out.println(u.getUserName())); - } - - @Override - public void updateChannelName(User user, Channel channel, String newName) { - if (channel.getHostUser().equals(user)) { - System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", - channel.getChannelName(), newName); - channel.updateChannelName(newName); - } else { - System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", - user.getUserName(), channel.getChannelName()); - } - } - - @Override - public void deleteChannel(User user, Channel channel) { - if (!user.equals(channel.getHostUser())) { - return; - } - - System.out.printf("채널 삭제: %s%n", channel.getChannelName()); - channel.getMessages() - .stream() - .map(message -> { - message.getUser().removeMessage(message); - return message; - }); - - channel.getUsers() - .stream() - .map(u -> { - u.removeChannel(channel); - return u; - }); - - channel.clearUsers(); - channel.clearMessages(); - - channelsData.remove(channel); - } - - @Override - public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - if (channel.getHostUser().equals(oldHostUser)) { - System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", - channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(oldHostUser); - } else { - System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", - oldHostUser.getUserName(), channel.getChannelName()); - } - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java deleted file mode 100644 index 3f0bdc3b7..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java +++ /dev/null @@ -1,86 +0,0 @@ -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.MessageService; - -import java.util.ArrayList; - -public class JCFMessageService implements MessageService { - - private static JCFMessageService instance = new JCFMessageService(); - private final ArrayList messagesData; - - private JCFMessageService() { - messagesData = new ArrayList<>(); - } - - public static JCFMessageService getInstance() { - return instance; - } - - @Override - public Message createMessage(User user, Channel channel, String contents) { - System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", - user.getId(), channel.getId(), contents); - Message newMessage = new Message(user, channel, contents); - messagesData.add(newMessage); - newMessage.registerMessageToUserAndChannel(user, channel); - return newMessage; - } - - @Override - public void deleteMessage(User user, Message message) { - if (user.getId().equals(message.getUser().getId())) { - System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", - user.getUserName(), message.getId(), message.getMessageContents()); - } else { - System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", - user.getUserName(), message.getId()); - return; - } - message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 - user.removeMessage(message); - messagesData.remove(message); - } - - @Override - public void updateMessage(User user, Message message, String newContents) { - System.out.println("메세지를 업데이트 합니다."); - System.out.printf("이전 메세지: %s%n", message.getMessageContents()); - System.out.printf("현재 메세지: %s%n", newContents); - message.updateMessageContent(newContents); - } - - @Override - public void printMessagesByChannel(Channel channel) { - System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", - channel.getChannelName(), channel.getMessages().size()); - messagesData.stream() - .filter(message -> message.getChannel().equals(channel)) - .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", - message.getUser().getUserName(), message.getMessageContents())); - } - - @Override - public void printMessage(Message message) { - System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); - System.out.println(message.toString()); - } - - @Override - public void printAllMessage() { - System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", messagesData.size()); - messagesData.forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", - message.getUser().getUserName(), message.getMessageContents())); - } - - @Override - public void printAllMessageByUser(User user) { - System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", - user.getUserName(), user.getMessages().size()); - user.getMessages().forEach(message -> - System.out.printf("내용: %s%n", message.getMessageContents())); - } -} diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java deleted file mode 100644 index 2ca29ee42..000000000 --- a/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.sprint.mission.discodeit.service.jcf; - -import com.sprint.mission.discodeit.entity.User; -import com.sprint.mission.discodeit.service.UserService; - -import java.util.*; - -public class JCFUserService implements UserService { - - - private static JCFUserService instance = new JCFUserService(); - private final ArrayList usersData; - - private JCFUserService() { - usersData = new ArrayList<>(); - } - - public static JCFUserService getInstance() { - return instance; - } - - @Override - public void addUser(User user) { - System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); - usersData.add(user); - } - - @Override - public void updateUser(User user, String newName) { - System.out.println("유저의 이름을 변경합니다."); - System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); - user.reUserName(newName); - } - - @Override - public void deleteUser(User user) { - System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n" ,user.getUserName(), user.getId()); - usersData.remove(user); - } - - @Override - public void printAllUsers() { - System.out.printf("전체 유저 조회, 유저 수: %d \n", usersData.size()); - usersData.forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); - } - - @Override - public void printUser(User user) { - System.out.print("단일 유저 조회\n"); - System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); - } -} From 71dadedcf3f824989742437eaaaf09a5fee59a2b Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 5 Jun 2025 10:02:28 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EC=8B=AC=ED=99=94=20=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/entity/Channel.java | 98 +++++++ .../mission/discodeit/entity/Message.java | 53 ++++ .../mission/discodeit/entity/Parents.java | 31 +++ .../sprint/mission/discodeit/entity/User.java | 106 ++++++++ .../mission/discodeit/factory/Factory.java | 41 +++ .../discodeit/main/JavaApplication.java | 245 ++++++++++++++++++ .../discodeit/service/ChannelService.java | 23 ++ .../discodeit/service/MessageService.java | 16 ++ .../discodeit/service/UserService.java | 19 ++ .../service/jcf/JCFChannelService.java | 196 ++++++++++++++ .../service/jcf/JCFMessageService.java | 127 +++++++++ .../discodeit/service/jcf/JCFUserService.java | 117 +++++++++ 12 files changed, 1072 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Channel.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Message.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/Parents.java create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/User.java create mode 100644 src/main/java/com/sprint/mission/discodeit/factory/Factory.java create mode 100644 src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/ChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/MessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/UserService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java new file mode 100644 index 000000000..6134d21ad --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -0,0 +1,98 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.ArrayList; + +public class Channel extends Parents +{ + private String channelName; + private User hostUser; + + private ArrayList messages; + private ArrayList users; + + public Channel(User hostUser, String name) { + super(); + this.channelName = name; + this.hostUser = hostUser; + this.messages = new ArrayList<>(); + this.users = new ArrayList<>(); + } + + public String getChannelName() { + return channelName; + } + + public void updateChannelName(String channelName) { + super.updateUpdatedAt(); + this.channelName = channelName; + } + + public User getHostUser() { + return hostUser; + } + + public void updateHostUser(User newHostUser) { + updateUpdatedAt(); + this.hostUser = newHostUser; + } + + public ArrayList getMessages() { + return messages; + } + + public void addMessage(Message message) { + if (!messages.contains(message)) { + messages.add(message); + message.getUser().addMessage(message); + } + } + + public void addUser(User user) { + if (!users.contains(user)) { + users.add(user); + user.addChannel(this); + } + } + + public void removeUser(User user) { + if (users.contains(user)) { + users.remove(user); + user.removeChannel(this); + } + } + + public void clearUsers(){ + users.clear(); + } + + public void clearMessages() { + messages.clear(); + } + + public ArrayList getUsers() { + return users; + } + + public void removeMessage(Message message) { + if (messages.contains(message)) { + messages.remove(message); + message.getUser().removeMessage(message); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("Channel{") + .append("channelId=").append(getId()) + .append(", channelName='").append(channelName).append('\'') + .append(", hostUserId=").append(hostUser.getId()) + .append(", createdAt=").append(getCreatedAt()) + .append(", updatedAt=").append(getUpdatedAt()) + .append(", messageIds=").append(messages.stream().map(Message::getId).toList()) + .append(", userIds=").append(users.stream().map(User::getId).toList()) + .append('}'); + return sb.toString(); + } + +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java new file mode 100644 index 000000000..8735afa9f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -0,0 +1,53 @@ +package com.sprint.mission.discodeit.entity; + +public class Message extends Parents{ + + + private String messageContents; + private User user; + private Channel channel; + + + public Message(User user, Channel channel, String contents) { + super(); + this.messageContents = contents; + this.user = user; + this.channel = channel; + } + + public String getMessageContents() { + return messageContents; + } + + public void updateMessageContent(String messageContents) { + updateUpdatedAt(); + this.messageContents = messageContents; + } + + public User getUser() { + return user; + } + + public Channel getChannel() { + return channel; + } + + public void registerMessageToUserAndChannel(User user, Channel channel) { + user.addMessage(this); + channel.addMessage(this); + } + + + + @Override + public String toString() { + return "Message{" + + "messageId=" + getId() + + ", messageContents='" + messageContents + '\'' + + ", user=" + user.getId() + + ", channel=" + channel.getId() + + ", createdAt=" + getCreatedAt() + + ", updatedAt=" + getUpdatedAt() + + '}'; + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java b/src/main/java/com/sprint/mission/discodeit/entity/Parents.java new file mode 100644 index 000000000..99efe8547 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/Parents.java @@ -0,0 +1,31 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.UUID; + +public class Parents { + + private final long createdAt; + private long updatedAt; + private UUID id; + + public long getCreatedAt() { + return createdAt; + } + public long getUpdatedAt() { + return updatedAt; + } + + public void updateUpdatedAt() { + this.updatedAt = System.currentTimeMillis(); + } + public UUID getId() { + return id; + } + + // 생성자 만들기 + public Parents() { + this.createdAt = System.currentTimeMillis(); + this.updatedAt = createdAt; + this.id = UUID.randomUUID(); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java new file mode 100644 index 000000000..f4fda690b --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -0,0 +1,106 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.ArrayList; + +public class User extends Parents{ + + private String userName; + + private ArrayList channels; + private ArrayList messages; + + private UserStatus status; + // 유저가 회원가입 상태인지 탈퇴 상태인지를 판별 + // 유저 조회 할 때 조회 되지는 않지만 데이터를 완전 삭제하지 않은 상태이다. + + // enum 추가 + // 팩토리 패턴을 이용해보기 + // 상태추가 + // forEach에서 데이터 값 바꾸지 않기, map에서 바꾸기 + + public enum UserStatus { + ACTIVE, + DEACTIVE // true와 false 로나누는 것보단 확장성이 더 좋을 것 같다. + } + + public User(String userName) { + super(); + this.userName = userName; + this.channels = new ArrayList<>(); + this.messages = new ArrayList<>(); + this.status = UserStatus.ACTIVE; + } + + public String getUserName() { + return userName; + } + + public ArrayList getChannels() { + return channels; + } + + public void addChannel(Channel channel) { + if(!channels.contains(channel)) { + channels.add(channel); + channel.addUser(this); + } + } + + public void removeChannel(Channel channel) { + if(channels.contains(channel)) { + channels.remove(channel); + channel.removeUser(this); + } + } + + public ArrayList getMessages() { + return messages; + } + + public void addMessage(Message message) { + if(!this.messages.contains(message)) { + this.messages.add(message); + } + } + + public void removeMessage(Message message) { + if(messages.contains(message)) { + this.messages.remove(message); + message.getChannel().getMessages().remove(message); + } + } + + public void setUserName(String userName) { + this.userName = userName; + updateUpdatedAt(); + } + + public UserStatus getStatus() { + return status; + } + + public void setStatus(UserStatus status) { + this.status = status; // 유저 삭제와 유저 복구에 쓰일 수 있다. + } + + public void clearChannels() { + channels.clear(); + } + + public void clearMessages() { + messages.clear(); + } + + @Override + public String toString() { + return "User{" + + "userId=" + getId() + + ", userName='" + userName + '\'' + + //", createdAt=" + getCreatedAt() + + //", updatedAt=" + getUpdatedAt() + + ", channels=" + channels.stream().map(channel -> channel.getId()).toList() + + '}'; + } +} + +// remove 통일 \ No newline at end of file diff --git a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java new file mode 100644 index 000000000..84966343d --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java @@ -0,0 +1,41 @@ +package com.sprint.mission.discodeit.factory; + +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.jcf.JCFChannelService; +import com.sprint.mission.discodeit.service.jcf.JCFMessageService; +import com.sprint.mission.discodeit.service.jcf.JCFUserService; + +public class Factory { + private static Factory instance; + private UserService userService; + private ChannelService channelService; + private MessageService messageService; + + public static Factory getInstance() { + if (instance == null) { + instance = new Factory(); + } + return instance; + } + + private Factory() { + userService = new JCFUserService(); + channelService = new JCFChannelService(); + messageService = new JCFMessageService(); + } + + public UserService getUserService() { + return userService; + } + + public ChannelService getChannelService() { + return channelService; + } + + public MessageService getMessageService() { + return messageService; + } + +} diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java new file mode 100644 index 000000000..01e813052 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java @@ -0,0 +1,245 @@ +package com.sprint.mission.discodeit.main; + +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.Factory; +import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; + +public class JavaApplication { + + public static void main(String[] args) { + + System.out.println("\n========== userService Test start ==========================================\n"); + userTestApplication(); + System.out.println("\n========== userService Test end ==========================================\n"); + // userService 테스트 + System.out.println("\n========== channelService Test start ==========================================\n"); + channelTestApplication(); + System.out.println("\n========== channelService Test end ==========================================\n"); + // channelService 테스트 + System.out.println("\n========== messageService Test start ==========================================\n"); + messageTestApplication(); + System.out.println("\n========== messageService Test end ==========================================\n"); + // messageService 테스트 + } + + public static void userTestApplication() { + UserService jcfUserService = Factory.getInstance().getUserService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + System.out.println("1. 유저 등록================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 줄바꾸 + // 두 명의 유저를 등록 + + System.out.println("2. 단일 유저 조회================="); + jcfUserService.printUser(user1); + System.out.println(); + // 유저 한명의 정보를 단일 조회 + + System.out.println("3. 전체 유저 조회================="); + jcfUserService.printActiveUsers(); + System.out.println(); + // 유저 전체의 정보를 조회 + System.out.println("4. 유저 정보 변경================="); + jcfUserService.updateUser(user1, "수정된 권용진-1"); + System.out.println(); + // 유저의 이름을 변경 + jcfUserService.printUser(user1); + System.out.println(); + // 변경된 유저의 정보를 조회 + System.out.println("5. 유저 삭제================="); + jcfUserService.deleteUser(user1); + System.out.println(); + // 유저 한 명을 삭제를 통해 비활성화 + jcfUserService.printActiveUsers(); // 조회 + System.out.println(); + // 정상적을 삭제 되었는지를 확인 하기 위한 활성화 상태인 유저 전체 조회 + jcfUserService.printAllUsers(); // 조회 + System.out.println(); + // 활성화된 유저와 비활성화된 유저 전체 조회 + jcfUserService.printDeactivatedUsers(); // 조회 + System.out.println(); + // 비활성화된 유저만 조회 + } + + public static void channelTestApplication() { + UserService jcfUserService = Factory.getInstance().getUserService(); + ChannelService jcfChannelService = Factory.getInstance().getChannelService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + System.out.println("1. 유저 생성================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); + // 채널을 만들기 위한 유저 생성 + + System.out.println("2. 채널 생성================="); + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1-서버"); + Channel channel2 = jcfChannelService.createChannel(user2, "권용진-2-서버"); + System.out.println(); + // 만들어진 유저를 이용하여 채널 생성 + System.out.println(); + System.out.println("3. 채널 전체 조회================="); + jcfChannelService.printAllChannels(); + System.out.println(); + // 생성된 채널 전체 조회 + System.out.println("4. 채널 단일 조회================="); + jcfChannelService.printChannel(channel1); + System.out.println(); + // 생성된 채널 단일 조회 + + System.out.println("5. 채널 정보 수정, 유저 채널 입장================="); + jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + // 이미 만들어진 채널에 다른 유저가 입장 + jcfChannelService.printUsersFromChannel(channel1); + System.out.println(); + // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 + + System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); + jcfChannelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); + // 채널 주인인 유저만 채널의 이름을 변경할 수 있음 + jcfChannelService.printChannel(channel1); + System.out.println(); + // 채널의 정보가 안변했음을 확인하기 위해 채널 정보 조회 + + jcfChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 + System.out.println(); + // 채널 주인은 채널의 이름을 변경할 수 있음 + + jcfChannelService.printAllChannels(); + System.out.println(); + // 변경된 채널 이름 조회 + + System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); + jcfChannelService.userLeaveChannel(user2, channel1); + jcfChannelService.printChannel(channel1); + System.out.println(); + // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 + + System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); + jcfChannelService.userJoinChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 + jcfChannelService.updateHostUser(user2, channel1, user1); + // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. + jcfChannelService.updateHostUser(user1, channel1, user2); + // 채널의 주인을 변경 + jcfChannelService.printChannel(channel1); + System.out.println(); + // 주인이 변경된 채널을 조회 + + System.out.println("9. 채널 삭제, 권한 없는 유저가 삭제하려 할 때================="); + jcfChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 주인이 아니면 채널을 삭제 할 수 없다. + jcfChannelService.printAllChannels(); + System.out.println(); + + jcfChannelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 채널 주인은 채널을 성공적으로 지울 수 있다. + + jcfChannelService.printAllChannels(); + System.out.println(); + // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 + + } + + public static void messageTestApplication() { + + UserService jcfUserService = Factory.getInstance().getUserService(); + ChannelService jcfChannelService = Factory.getInstance().getChannelService(); + MessageService jcfMessageService = Factory.getInstance().getMessageService(); + /* + [ ] 등록 + [ ] 조회(단건, 다건) + [ ] 수정, 의존성 + [ ] 수정된 데이터 조회 + [ ] 삭제 + [ ] 조회를 통해 삭제되었는지 확인 + */ + + System.out.println("1. 유저 생성================="); + User user1 = jcfUserService.createUser("권용진-1"); + User user2 = jcfUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 유저 생성 + System.out.println("2. 채널 생성================="); + Channel channel1 = jcfChannelService.createChannel(user1, "권용진-1의 채널1"); + Channel channel2 = jcfChannelService.createChannel(user1, "권용진-1의 채널2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 채널 생성 + System.out.println("3. 메세지 생성================="); + Message message1 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 + Message message2 = jcfMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 + Message message3 = jcfMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 + System.out.println(); + System.out.println("4. 유저 별 메세지 조회================="); + jcfMessageService.printAllMessageByUser(user1); //유저 별 조회 + System.out.println(); + System.out.println("5. 채널 별 메시지 조회================="); + jcfMessageService.printMessagesByChannel(channel1); // 채널 별 조회 + System.out.println(); + jcfMessageService.printMessagesByChannel(channel2); // 채널 별 조회 + System.out.println(); + + System.out.println("6. 메세지 단일 조회================="); + jcfMessageService.printMessage(message1); + System.out.println(); + + System.out.println("7. 메세지 전체 조회================="); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메세지 정보 수정================="); + jcfMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메시지 주인이 아닌 유저가 메세지 삭제 하고자 할 때와 메시지 주인인 유저가 메시지 삭제할 떄================="); + jcfMessageService.deleteMessage(user2, message1); + jcfMessageService.deleteMessage(user1, message1); + System.out.println(); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); + jcfChannelService.userJoinChannel(user2, channel1); + Message message4 = jcfMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + jcfUserService.deleteUser(user2); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); + jcfMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); + System.out.println(); + jcfUserService.restorationUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 + jcfMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("11. 유저 본인이 아닌 다른 유저가 메시지를 변경하고자 시도 했을 때================="); + jcfMessageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); // user2는 해당 메시지의 주인이 아니므로 메시지의 내용을 변경할 수 없다. + jcfMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java new file mode 100644 index 000000000..bf531120c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -0,0 +1,23 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; + +import java.util.UUID; + +public interface ChannelService { + + Channel createChannel(User user, String channelName); + void deleteChannel(User user, Channel channel); + + void userJoinChannel(User user, Channel channelName); + void userLeaveChannel(User user, Channel channel); + + void printChannel(Channel channel); + void printAllChannels(); + void printUsersFromChannel(Channel channel); + + void updateChannelName(User user, Channel channel, String newName); + void updateHostUser(User oldHostUser, Channel channel, User newHostUser); + +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java new file mode 100644 index 000000000..0af653603 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -0,0 +1,16 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; + +public interface MessageService { + Message createMessage(User user, Channel channel, String contents); + void deleteMessage(User user, Message message); + void updateMessage(User user, Message message, String newContents); + + void printMessagesByChannel(Channel channel); + void printMessage(Message message); + void printAllMessage(); + void printAllMessageByUser(User user); +} diff --git a/src/main/java/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java new file mode 100644 index 000000000..e225c0ce4 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -0,0 +1,19 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.User; + +public interface UserService { + + // 사용자 추가 + void addUser(User user); + // 사용자 정보 업데이트 + void updateUser(User user, String newUserName); + // 사용자 삭제 + void deleteUser(User user); + void restorationUser(User user); + void printUser(User user); + void printAllUsers(); + void printActiveUsers(); + void printDeactivatedUsers(); + User createUser(String userName); +} 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 new file mode 100644 index 000000000..bc0992a30 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java @@ -0,0 +1,196 @@ +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.ArrayList; + +public class JCFChannelService implements ChannelService { + + + private static final JCFChannelService instance = new JCFChannelService(); + + private final ArrayList data; // channelData + + public JCFChannelService() { + data = new ArrayList<>(); + } + + public static JCFChannelService getInstance() { + return instance; + } + + @Override + public Channel createChannel(User user, String channelName) { + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); + return null; + } + Channel channel = new Channel(user, channelName); + data.add(channel); + + System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", + user.getId(), channelName, channel.getId()); + user.addChannel(channel); + return channel; + } + + @Override + public void userJoinChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); + channel.addUser(user); + user.addChannel(channel); + } + + @Override + public void userLeaveChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); + user.removeChannel(channel); + if (channel.getUsers().isEmpty()) { + System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); + data.remove(channel); + } + } + + @Override + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } + + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); + //System.out.println(channel.toString()); + } + + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + + channel.getUsers().forEach(u -> System.out.println(u.getUserName())); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); + return; // 메서드 종료 + } + if (channel.getHostUser().equals(user)) { + System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", + channel.getChannelName(), newName); + channel.updateChannelName(newName); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + user.getUserName(), channel.getChannelName()); + } + } + + @Override + public void deleteChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + if (!user.equals(channel.getHostUser())) { + System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("채널 삭제: %s%n", channel.getChannelName()); + channel.getMessages() + .stream() + .map(message -> { + message.getUser().removeMessage(message); + return message; + }); + + channel.getUsers() + .stream() + .map(u -> { + u.removeChannel(channel); + return u; + }); + + channel.clearUsers(); + channel.clearMessages(); + data.remove(channel); + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); + return; + } + + if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + return; + } + + if(!channel.getUsers().contains(newHostUser)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); + return; + } + if (channel.getHostUser().equals(oldHostUser)) { + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + oldHostUser.getUserName(), channel.getChannelName()); + } + } +} 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 new file mode 100644 index 000000000..0591e0c82 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFMessageService.java @@ -0,0 +1,127 @@ +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.MessageService; + +import java.util.ArrayList; + +public class JCFMessageService implements MessageService { + + private static JCFMessageService instance = new JCFMessageService(); + private final ArrayList data; + + public JCFMessageService() { + data = new ArrayList<>(); + } + + public static JCFMessageService getInstance() { + return instance; + } + + @Override + public Message createMessage(User user, Channel channel, String contents) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return null; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + return null; + } + System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", + user.getId(), channel.getId(), contents); + Message newMessage = new Message(user, channel, contents); + data.add(newMessage); + newMessage.registerMessageToUserAndChannel(user, channel); + + return newMessage; + } + + @Override + public void deleteMessage(User user, Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); + return; + } + if (user.getId().equals(message.getUser().getId())) { + System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", + user.getUserName(), message.getId(), message.getMessageContents()); + } else { + System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", + user.getUserName(), message.getId()); + return; + } + message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 + user.removeMessage(message); + data.remove(message); + } + + @Override + public void updateMessage(User user, Message message, String newContents) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + return; + } + if(!user.equals(message.getUser())) { + System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + return; + } + + System.out.println("메세지를 업데이트 합니다."); + System.out.printf("이전 메세지: %s%n", message.getMessageContents()); + System.out.printf("현재 메세지: %s%n", newContents); + message.updateMessageContent(newContents); + } + + @Override + public void printMessagesByChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", + channel.getChannelName(), channel.getMessages().size()); + data.stream() + .filter(message -> message.getChannel().equals(channel)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printMessage(Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); + System.out.println(message.toString()); + } + + @Override + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printAllMessageByUser(User user) { + System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", + user.getUserName(), user.getMessages().size()); + user.getMessages() + .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + } +} 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 new file mode 100644 index 000000000..ad057d97f --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java @@ -0,0 +1,117 @@ +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.UserService; + +import java.util.*; + +public class JCFUserService implements UserService { + + + private static JCFUserService instance = new JCFUserService(); + private final ArrayList data; + + public JCFUserService() { + data = new ArrayList<>(); + } + + public static JCFUserService getInstance() { + return instance; + } + + @Override + public void addUser(User user) { + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + data.add(user); + } + + @Override + public User createUser(String userName) { + User user = new User(userName); // 직접 생성 + addUser(user); // 내부 등록 + return user; + } + + @Override + public void updateUser(User user, String newName) { + System.out.println("유저의 이름을 변경합니다."); + System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + user.setUserName(newName); + } + + @Override + public void deleteUser(User user) { + + Optional hostChannel = user.getChannels().stream() + .filter(channel -> channel.getHostUser().equals(user)) + .findFirst(); + + if (hostChannel.isPresent()) { + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); + return; //메서드 종료 + } + + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + // usersData.remove(user); + // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. + user.setStatus(User.UserStatus.DEACTIVE); + // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear + // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 + // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. + user.getChannels().stream() + .map(channel -> + { + channel.removeUser(user); + return channel; + }); + user.clearChannels(); + // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. + user.getMessages().stream() + .map(message -> + { + message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. + return message; + }); + user.clearMessages(); + } + + @Override + public void printActiveUsers(){ + // status를 판별하는 식을 추가 + System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE)) + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printUser(User user) { + System.out.print("단일 유저 조회\n"); + System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + } + + @Override + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printDeactivatedUsers() { + System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void restorationUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(User.UserStatus.ACTIVE); + } + +} From ddc194abfd86d851970eabb9e8ccf051177e94f7 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 5 Jun 2025 10:34:57 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EA=B0=80=EB=8F=85=EC=84=B1=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BC=80?= =?UTF-8?q?=EC=9D=B4=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/main/JavaApplication.java | 15 ++++++++++++--- .../discodeit/service/jcf/JCFChannelService.java | 5 ++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java index 01e813052..8c1a327aa 100644 --- a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java @@ -58,7 +58,7 @@ public static void userTestApplication() { jcfUserService.printUser(user1); System.out.println(); // 변경된 유저의 정보를 조회 - System.out.println("5. 유저 삭제================="); + System.out.println("5. 유저 삭제(비활성화)================="); jcfUserService.deleteUser(user1); System.out.println(); // 유저 한 명을 삭제를 통해 비활성화 @@ -71,6 +71,13 @@ public static void userTestApplication() { jcfUserService.printDeactivatedUsers(); // 조회 System.out.println(); // 비활성화된 유저만 조회 + System.out.println("6. 유저 활성화==============="); + jcfUserService.restorationUser(user1); + System.out.println(); + jcfUserService.printActiveUsers(); // 조회 + System.out.println(); + jcfUserService.printDeactivatedUsers(); // 조회 + System.out.println(); } public static void channelTestApplication() { @@ -105,11 +112,14 @@ public static void channelTestApplication() { System.out.println(); // 생성된 채널 단일 조회 - System.out.println("5. 채널 정보 수정, 유저 채널 입장================="); + System.out.println("5. 채널 정보 수정, 유저 채널 입장, 동일 유저가 중복 입장하려 할 때================="); jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 // 이미 만들어진 채널에 다른 유저가 입장 + jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + System.out.println(); jcfChannelService.printUsersFromChannel(channel1); System.out.println(); + // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); @@ -161,7 +171,6 @@ public static void channelTestApplication() { } public static void messageTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); ChannelService jcfChannelService = Factory.getInstance().getChannelService(); MessageService jcfMessageService = Factory.getInstance().getMessageService(); 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 bc0992a30..2a6705336 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 @@ -42,11 +42,14 @@ public void userJoinChannel(User user, Channel channel) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); return; // 메서드 종료 } + if(channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 이미 존재합니다.", user.getUserName(), channel.getChannelName()); + return; + } System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); channel.addUser(user); user.addChannel(channel); From cdda550096cc104d6a6e6b4a8ac4322f0c4b8ed7 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 5 Jun 2025 11:43:40 +0900 Subject: [PATCH 06/16] =?UTF-8?q?Parents=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/entity/{Parents.java => BaseEntity.java} | 4 ++-- .../java/com/sprint/mission/discodeit/entity/Channel.java | 2 +- .../java/com/sprint/mission/discodeit/entity/Message.java | 2 +- src/main/java/com/sprint/mission/discodeit/entity/User.java | 2 +- .../com/sprint/mission/discodeit/main/JavaApplication.java | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-) rename src/main/java/com/sprint/mission/discodeit/entity/{Parents.java => BaseEntity.java} (91%) diff --git a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java b/src/main/java/com/sprint/mission/discodeit/entity/BaseEntity.java similarity index 91% rename from src/main/java/com/sprint/mission/discodeit/entity/Parents.java rename to src/main/java/com/sprint/mission/discodeit/entity/BaseEntity.java index 99efe8547..cd824690d 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Parents.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/BaseEntity.java @@ -2,7 +2,7 @@ import java.util.UUID; -public class Parents { +public class BaseEntity { private final long createdAt; private long updatedAt; @@ -23,7 +23,7 @@ public UUID getId() { } // 생성자 만들기 - public Parents() { + public BaseEntity() { this.createdAt = System.currentTimeMillis(); this.updatedAt = createdAt; this.id = UUID.randomUUID(); 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 6134d21ad..61b51ffc2 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -2,7 +2,7 @@ import java.util.ArrayList; -public class Channel extends Parents +public class Channel extends BaseEntity { private String channelName; private User hostUser; 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 8735afa9f..0ad0b5884 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -1,6 +1,6 @@ package com.sprint.mission.discodeit.entity; -public class Message extends Parents{ +public class Message extends BaseEntity { private String messageContents; 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 f4fda690b..0e97b346d 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -2,7 +2,7 @@ import java.util.ArrayList; -public class User extends Parents{ +public class User extends BaseEntity { private String userName; diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java index 8c1a327aa..989504c6b 100644 --- a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java @@ -11,7 +11,6 @@ public class JavaApplication { public static void main(String[] args) { - System.out.println("\n========== userService Test start ==========================================\n"); userTestApplication(); System.out.println("\n========== userService Test end ==========================================\n"); @@ -167,7 +166,6 @@ public static void channelTestApplication() { jcfChannelService.printAllChannels(); System.out.println(); // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 - } public static void messageTestApplication() { From 111f72b5040d64ae28866b13805953db771faeff Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Tue, 10 Jun 2025 11:58:51 +0900 Subject: [PATCH 07/16] first commit --- .../com/sprint/mission/discodeit/main/JavaApplication.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java index 989504c6b..c79e70ed7 100644 --- a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java @@ -11,6 +11,10 @@ public class JavaApplication { public static void main(String[] args) { + + } + + public static void sprint1Application() { System.out.println("\n========== userService Test start ==========================================\n"); userTestApplication(); System.out.println("\n========== userService Test end ==========================================\n"); From cb29cfa9a12a95d7399bd9958818af638d6baebd Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Wed, 11 Jun 2025 10:02:43 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80=EB=B0=8F=20=EC=BD=94=EB=A9=98?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/channels.ser | Bin 0 -> 58 bytes data/messages.ser | Bin 0 -> 58 bytes data/users.ser | Bin 0 -> 725 bytes .../mission/discodeit/entity/BaseEntity.java | 3 +- .../mission/discodeit/entity/Channel.java | 11 +- .../mission/discodeit/entity/Message.java | 18 +- .../sprint/mission/discodeit/entity/User.java | 27 +- .../mission/discodeit/entity/UserStatus.java | 6 + .../mission/discodeit/factory/Factory.java | 41 --- .../discodeit/factory/ServiceFactory.java | 61 ++++ .../repository/ChannelRepository.java | 10 + .../repository/MessageRepository.java | 10 + .../discodeit/repository/UserRepository.java | 13 + .../file/FileChannelRepository.java | 67 ++++ .../file/FileMessageRepository.java | 66 ++++ .../repository/file/FileUserRepository.java | 115 +++++++ .../repository/jcf/JCFChannelRepository.java | 165 ++++++++++ .../repository/jcf/JCFMessageRepository.java | 126 ++++++++ .../repository/jcf/JCFUserRepository.java | 73 +++++ .../Sprint1Application.java} | 47 ++- .../discodeit/run/Sprint2Application.java | 295 ++++++++++++++++++ .../discodeit/service/ChannelService.java | 13 +- .../discodeit/service/MessageService.java | 1 + .../discodeit/service/UserService.java | 9 +- .../service/file/FileChannelService.java | 254 +++++++++++++++ .../service/file/FileMessageService.java | 173 ++++++++++ .../service/file/FileUserService.java | 159 ++++++++++ .../service/jcf/JCFChannelService.java | 98 +++--- .../service/jcf/JCFMessageService.java | 13 +- .../discodeit/service/jcf/JCFUserService.java | 43 +-- .../discodeit/\353\251\224\353\252\250" | 29 ++ 31 files changed, 1752 insertions(+), 194 deletions(-) create mode 100644 data/channels.ser create mode 100644 data/messages.ser create mode 100644 data/users.ser create mode 100644 src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java delete mode 100644 src/main/java/com/sprint/mission/discodeit/factory/Factory.java create mode 100644 src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java rename src/main/java/com/sprint/mission/discodeit/{main/JavaApplication.java => run/Sprint1Application.java} (88%) create mode 100644 src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java create mode 100644 "src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" diff --git a/data/channels.ser b/data/channels.ser new file mode 100644 index 0000000000000000000000000000000000000000..665a8492e104a67e962def8efdf29300b4a78bae GIT binary patch literal 58 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(BZ KpqvFnRsaBEClVU~ literal 0 HcmV?d00001 diff --git a/data/messages.ser b/data/messages.ser new file mode 100644 index 0000000000000000000000000000000000000000..665a8492e104a67e962def8efdf29300b4a78bae GIT binary patch literal 58 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(BZ KpqvFnRsaBEClVU~ literal 0 HcmV?d00001 diff --git a/data/users.ser b/data/users.ser new file mode 100644 index 0000000000000000000000000000000000000000..4b1558d40619cf1faa56c7969d4318b6bfbdf62f GIT binary patch literal 725 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(AG z7?{dgKqOF;Msj|xUU5NDW?qS2Zf0?DW`3StN@j6#eoAU)iC$`6NoGlcg$I1}e!-EiO(>Pc1HFsAFLEVPGpR zNh~P^YB2QyTB#4QQXguiKHN%uh?V*vD^);5FjyPNz)~R3FEKZ@gh2>mXHH^Xx_)p8 z(Cz8g6-5ks#CXLiu{hNg>?;{%4yoeQOLLeQn7tS{lZ#RlOHxxDOMvXsf)ohbhk+?G zrG!BM$%~<(o-Wp)Fl3w_siheTrRM@ek`EF5AVqs-GJl_u+p5pRz~sfilarcQToRm_ z?vzP%`44CmMkb?U~_a1@eFeX#_yYs8E+O$eLZ20!mDjPZ)UB0 zv%E#u5bPu-sP8AiXs{?}|H_|B-h6iD4m^J5md_) messages; - private ArrayList users; + private final ArrayList messages = new ArrayList<>(); + private final ArrayList users = new ArrayList<>(); public Channel(User hostUser, String name) { super(); this.channelName = name; this.hostUser = hostUser; - this.messages = new ArrayList<>(); - this.users = new ArrayList<>(); } public String getChannelName() { @@ -94,5 +92,4 @@ public String toString() { .append('}'); return sb.toString(); } - } 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 0ad0b5884..504de6d8b 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -1,13 +1,13 @@ package com.sprint.mission.discodeit.entity; -public class Message extends BaseEntity { +import java.io.Serializable; +public class Message extends BaseEntity implements Serializable { private String messageContents; private User user; private Channel channel; - public Message(User user, Channel channel, String contents) { super(); this.messageContents = contents; @@ -37,17 +37,15 @@ public void registerMessageToUserAndChannel(User user, Channel channel) { channel.addMessage(this); } - - @Override public String toString() { return "Message{" + - "messageId=" + getId() + - ", messageContents='" + messageContents + '\'' + - ", user=" + user.getId() + - ", channel=" + channel.getId() + - ", createdAt=" + getCreatedAt() + - ", updatedAt=" + getUpdatedAt() + + "\nmessageId=" + getId() + + "\nmessageContents='" + messageContents + '\'' + + "\nuser=" + user.getId() + + "\nchannel=" + channel.getId() + + "\ncreatedAt=" + getCreatedAt() + + "\nupdatedAt=" + getUpdatedAt() + '}'; } } 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 0e97b346d..cc4e87777 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -1,33 +1,22 @@ package com.sprint.mission.discodeit.entity; +import java.io.Serializable; import java.util.ArrayList; -public class User extends BaseEntity { +public class User extends BaseEntity implements Serializable { private String userName; - private ArrayList channels; - private ArrayList messages; + private ArrayList channels = new ArrayList<>();; + private ArrayList messages = new ArrayList<>();; private UserStatus status; // 유저가 회원가입 상태인지 탈퇴 상태인지를 판별 // 유저 조회 할 때 조회 되지는 않지만 데이터를 완전 삭제하지 않은 상태이다. - // enum 추가 - // 팩토리 패턴을 이용해보기 - // 상태추가 - // forEach에서 데이터 값 바꾸지 않기, map에서 바꾸기 - - public enum UserStatus { - ACTIVE, - DEACTIVE // true와 false 로나누는 것보단 확장성이 더 좋을 것 같다. - } - public User(String userName) { super(); this.userName = userName; - this.channels = new ArrayList<>(); - this.messages = new ArrayList<>(); this.status = UserStatus.ACTIVE; } @@ -95,12 +84,10 @@ public void clearMessages() { public String toString() { return "User{" + "userId=" + getId() + - ", userName='" + userName + '\'' + + "\nuserName='" + userName + //", createdAt=" + getCreatedAt() + //", updatedAt=" + getUpdatedAt() + - ", channels=" + channels.stream().map(channel -> channel.getId()).toList() + + "\nchannels=" + channels.stream().map(channel -> channel.getId()).toList() + '}'; } -} - -// remove 통일 \ No newline at end of file +} \ No newline at end of file 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 000000000..68d4427bf --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java @@ -0,0 +1,6 @@ +package com.sprint.mission.discodeit.entity; + +public enum UserStatus { + ACTIVE, + DEACTIVE // true와 false 로나누는 것보단 확장성이 더 좋을 것 같다. +} diff --git a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java b/src/main/java/com/sprint/mission/discodeit/factory/Factory.java deleted file mode 100644 index 84966343d..000000000 --- a/src/main/java/com/sprint/mission/discodeit/factory/Factory.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.sprint.mission.discodeit.factory; - -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.jcf.JCFChannelService; -import com.sprint.mission.discodeit.service.jcf.JCFMessageService; -import com.sprint.mission.discodeit.service.jcf.JCFUserService; - -public class Factory { - private static Factory instance; - private UserService userService; - private ChannelService channelService; - private MessageService messageService; - - public static Factory getInstance() { - if (instance == null) { - instance = new Factory(); - } - return instance; - } - - private Factory() { - userService = new JCFUserService(); - channelService = new JCFChannelService(); - messageService = new JCFMessageService(); - } - - public UserService getUserService() { - return userService; - } - - public ChannelService getChannelService() { - return channelService; - } - - public MessageService getMessageService() { - return messageService; - } - -} diff --git a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java new file mode 100644 index 000000000..093c0605c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java @@ -0,0 +1,61 @@ +package com.sprint.mission.discodeit.factory; + +import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.file.FileChannelService; +import com.sprint.mission.discodeit.service.file.FileMessageService; +import com.sprint.mission.discodeit.service.file.FileUserService; +import com.sprint.mission.discodeit.service.jcf.JCFChannelService; +import com.sprint.mission.discodeit.service.jcf.JCFMessageService; +import com.sprint.mission.discodeit.service.jcf.JCFUserService; + +public class ServiceFactory { + private static ServiceFactory instance; + private UserService userService; + private ChannelService channelService; + private MessageService messageService; + + private FileUserService fileUserService; + private FileChannelService fileChannelService; + private FileMessageService fileMessageService; + + public static ServiceFactory getInstance() { + if (instance == null) { + instance = new ServiceFactory(); + } + return instance; + } + + private ServiceFactory() { + userService = JCFUserService.getInstance(); + channelService = JCFChannelService.getInstance(); + messageService = JCFMessageService.getInstance(); + + fileUserService = FileUserService.getInstance(); + fileChannelService = FileChannelService.getInstance(); + fileMessageService = FileMessageService.getInstance(); + } + + public UserService getUserService() { + return userService; + } + + public ChannelService getChannelService() { + return channelService; + } + + public MessageService getMessageService() { + return messageService; + } + + public FileUserService getFileUserService() { + return fileUserService; + } + public FileChannelService getFileChannelService() { + return fileChannelService; + } + public FileMessageService getFileMessageService() { + return fileMessageService; + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java new file mode 100644 index 000000000..6efa56c4a --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.Channel; + +import java.util.ArrayList; + +public interface ChannelRepository { + void saveChannels(); + ArrayList loadChannels(); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java new file mode 100644 index 000000000..04dc260eb --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -0,0 +1,10 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.Message; + +import java.util.ArrayList; + +public interface MessageRepository { + void saveMessages(); + ArrayList loadMessages(); +} diff --git a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java new file mode 100644 index 000000000..7e311fffc --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -0,0 +1,13 @@ +package com.sprint.mission.discodeit.repository; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; + +import java.util.ArrayList; + +public interface UserRepository { + void updateUser(User user, String newUserName); + void deleteUser(User user); + void restoreUser(User user); + User createUser(String userName); +} 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 new file mode 100644 index 000000000..50f7410fb --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java @@ -0,0 +1,67 @@ +package com.sprint.mission.discodeit.repository.file; + +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.repository.ChannelRepository; + +import java.io.*; +import java.util.ArrayList; + +public class FileChannelRepository implements ChannelRepository, Serializable { + + private static final FileChannelRepository instance = new FileChannelRepository(); + private final ArrayList data; + + public FileChannelRepository() { + this.data = loadChannels(); + } + public ArrayList getChannels() { + return data; + } + + public static FileChannelRepository getInstance() { + return instance; + } + + @Override + public void saveChannels(){ + System.out.println("채널 리스트 저장"); + String filePath = "./data/channels.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("Channel 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public ArrayList loadChannels(){ + ArrayList deserializedChannels = null; + System.out.println("채널 리스트 불러오기"); + String filePath = "./data/channels.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedChannels = (ArrayList) ois.readObject(); + + /* + System.out.println("역직렬화된 Channel 리스트 정보:"); + + for (Channel channel : deserializedChannels) { + System.out.println("------------"); + System.out.println("Channel: " + channel.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedChannels; + } +} 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 new file mode 100644 index 000000000..6ae6dc5ad --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileMessageRepository.java @@ -0,0 +1,66 @@ +package com.sprint.mission.discodeit.repository.file; + +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.MessageRepository; + +import java.io.*; +import java.util.ArrayList; + +public class FileMessageRepository implements MessageRepository, Serializable { + + private static final FileMessageRepository instance = new FileMessageRepository(); + private final ArrayList data; + + public FileMessageRepository() { + this.data = loadMessages(); + } + public ArrayList getMessages() { + return data; + } + public static FileMessageRepository getInstance() { + return instance; + } + + @Override + public void saveMessages(){ + System.out.println("메세지 리스트 저장"); + String filePath = "./data/messages.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("Message 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public ArrayList loadMessages(){ + ArrayList deserializedMessages = null; + System.out.println("메세지 리스트 불러오기"); + String filePath = "./data/messages.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedMessages = (ArrayList) ois.readObject(); + /* + System.out.println("역직렬화된 Message 리스트 정보:"); + + for (Message message : deserializedMessages) { + System.out.println("------------"); + System.out.println("Message: " + message.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedMessages; + } +} 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 new file mode 100644 index 000000000..8f786863e --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileUserRepository.java @@ -0,0 +1,115 @@ +package com.sprint.mission.discodeit.repository.file; + +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.UserRepository; + +import java.io.*; +import java.util.ArrayList; +import java.util.Optional; + +public class FileUserRepository implements UserRepository, Serializable { + + private static final FileUserRepository instance = new FileUserRepository(); + private final ArrayList data; + + public FileUserRepository() { + this.data = loadUsers(); + } + public ArrayList getUsers() { + return data; + } + public static FileUserRepository getInstance() { + return instance; + } + + public void saveUsers() { + System.out.println("유저 리스트 저장"); + String filePath = "./data/users.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("User 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public ArrayList loadUsers() { + ArrayList deserializedUsers = null; + System.out.println("유저 리스트 불러오기"); + String filePath = "./data/users.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedUsers = (ArrayList) ois.readObject(); + + /* + System.out.println("역직렬화된 User 리스트 정보:"); + for (User user : deserializedUsers) { + System.out.println("------------"); + System.out.println("User: " + user.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedUsers; + } + + @Override + public User createUser(String userName) { + User user = new User(userName); // 직접 생성 + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + data.add(user); + return user; + } + + @Override + public void updateUser(User user, String newName) { + System.out.println("유저의 이름을 변경합니다."); + System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + user.setUserName(newName); + } + + @Override + public void deleteUser(User user) { + Optional hostChannel = user.getChannels().stream() + .filter(channel -> channel.getHostUser().equals(user)) + .findFirst(); + + if (hostChannel.isPresent()) { + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); + return; //메서드 종료 + } + + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + + user.setStatus(UserStatus.DEACTIVE); + user.getChannels().stream() + .map(channel -> { + channel.removeUser(user); + return channel; + }); + user.clearChannels(); + user.getMessages().stream() + .map(message -> { + message.getChannel().removeMessage(message); + return message; + }); + user.clearMessages(); + // 상세한 주석은 service에 + } + + @Override + public void restoreUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(UserStatus.ACTIVE); + } + +} 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 new file mode 100644 index 000000000..cdba4dbd9 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java @@ -0,0 +1,165 @@ +package com.sprint.mission.discodeit.repository.jcf; + +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.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.service.ChannelService; + +import java.util.ArrayList; + +public class JCFChannelRepository implements ChannelRepository { + + private static final JCFChannelRepository instance = new JCFChannelRepository(); + private final FileChannelRepository fileChannelRepository; + + private final ArrayList data; // channelData + // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? + + public JCFChannelRepository() { + fileChannelRepository = new FileChannelRepository(); + data = fileChannelRepository.getChannels(); + } + + public Channel createChannel(User user, String channelName) { + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); + return null; + } + Channel channel = new Channel(user, channelName); + data.add(channel); + + System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", + user.getId(), channelName, channel.getId()); + user.addChannel(channel); + return channel; + } + + public void userJoinChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); + return; // 메서드 종료 + } + if(channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 이미 존재합니다.", user.getUserName(), channel.getChannelName()); + return; + } + System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); + channel.addUser(user); + user.addChannel(channel); + } + + public void userLeaveChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); + user.removeChannel(channel); + if (channel.getUsers().isEmpty()) { + System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); + data.remove(channel); + } + } + + public void updateChannelName(User user, Channel channel, String newName) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); + return; // 메서드 종료 + } + if (channel.getHostUser().equals(user)) { + System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", + channel.getChannelName(), newName); + channel.updateChannelName(newName); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + user.getUserName(), channel.getChannelName()); + } + } + + public void deleteChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + if (!user.equals(channel.getHostUser())) { + System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("채널 삭제: %s%n", channel.getChannelName()); + channel.getMessages() + .stream() + .map(message -> { + message.getUser().removeMessage(message); + return message; + }); + + channel.getUsers() + .stream() + .map(u -> { + u.removeChannel(channel); + return u; + }); + + channel.clearUsers(); + channel.clearMessages(); + data.remove(channel); + } + + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); + return; + } + + if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + return; + } + + if(!channel.getUsers().contains(newHostUser)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); + return; + } + if (channel.getHostUser().equals(oldHostUser)) { + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + oldHostUser.getUserName(), channel.getChannelName()); + } + } + // data를 다뤄야 하나? +} 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 new file mode 100644 index 000000000..bdbcb5a73 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java @@ -0,0 +1,126 @@ +package com.sprint.mission.discodeit.repository.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.entity.UserStatus; +import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.service.MessageService; + +import java.util.ArrayList; + +public class JCFMessageRepository implements MessageRepository { + + private static JCFMessageRepository instance = new JCFMessageRepository(); + private final ArrayList data; + + public JCFMessageRepository() { + data = new ArrayList<>(); + } + + public static JCFMessageRepository getInstance() { + return instance; + } + + public Message createMessage(User user, Channel channel, String contents) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return null; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + return null; + } + System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", + user.getId(), channel.getId(), contents); + Message newMessage = new Message(user, channel, contents); + data.add(newMessage); + newMessage.registerMessageToUserAndChannel(user, channel); + + return newMessage; + } + + public void deleteMessage(User user, Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); + return; + } + if (user.getId().equals(message.getUser().getId())) { + System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", + user.getUserName(), message.getId(), message.getMessageContents()); + } else { + System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", + user.getUserName(), message.getId()); + return; + } + message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 + user.removeMessage(message); + data.remove(message); + } + + public void updateMessage(User user, Message message, String newContents) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + return; + } + if(!user.equals(message.getUser())) { + System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + return; + } + + System.out.println("메세지를 업데이트 합니다."); + System.out.printf("이전 메세지: %s%n", message.getMessageContents()); + System.out.printf("현재 메세지: %s%n", newContents); + message.updateMessageContent(newContents); + } + + @Override + public void printMessagesByChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", + channel.getChannelName(), channel.getMessages().size()); + data.stream() + .filter(message -> message.getChannel().equals(channel)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printMessage(Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); + System.out.println(message.toString()); + } + + @Override + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printAllMessageByUser(User user) { + System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", + user.getUserName(), user.getMessages().size()); + user.getMessages() + .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + } +} 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 new file mode 100644 index 000000000..27c90ec6e --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java @@ -0,0 +1,73 @@ +package com.sprint.mission.discodeit.repository.jcf; + +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.UserRepository; +import com.sprint.mission.discodeit.service.UserService; + +import java.util.ArrayList; +import java.util.Optional; + +public class JCFUserRepository implements UserRepository { + private static final JCFUserRepository instance = new JCFUserRepository(); + private final ArrayList data; + + public JCFUserRepository() { + data = new ArrayList<>(); + } + + public static JCFUserRepository getInstance() { + return instance; + } + + @Override + public User createUser(String userName) { + User user = new User(userName); // 직접 생성 + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + data.add(user); + return user; + } + + @Override + public void updateUser(User user, String newName) { + System.out.println("유저의 이름을 변경합니다."); + System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + user.setUserName(newName); + } + + @Override + public void deleteUser(User user) { + Optional hostChannel = user.getChannels().stream() + .filter(channel -> channel.getHostUser().equals(user)) + .findFirst(); + + if (hostChannel.isPresent()) { + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); + return; //메서드 종료 + } + + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + + user.setStatus(UserStatus.DEACTIVE); + user.getChannels().stream() + .map(channel -> { + channel.removeUser(user); + return channel; + }); + user.clearChannels(); + user.getMessages().stream() + .map(message -> { + message.getChannel().removeMessage(message); + return message; + }); + user.clearMessages(); + // 상세한 주석은 service에 + } + + @Override + public void restoreUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(UserStatus.ACTIVE); + } +} diff --git a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java similarity index 88% rename from src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java rename to src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java index c79e70ed7..294400178 100644 --- a/src/main/java/com/sprint/mission/discodeit/main/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java @@ -1,17 +1,18 @@ -package com.sprint.mission.discodeit.main; +package com.sprint.mission.discodeit.run; 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.Factory; +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; -public class JavaApplication { +public class Sprint1Application { public static void main(String[] args) { - + sprint1Application(); + // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 } public static void sprint1Application() { @@ -19,10 +20,12 @@ public static void sprint1Application() { userTestApplication(); System.out.println("\n========== userService Test end ==========================================\n"); // userService 테스트 + System.out.println("\n========== channelService Test start ==========================================\n"); channelTestApplication(); System.out.println("\n========== channelService Test end ==========================================\n"); // channelService 테스트 + System.out.println("\n========== messageService Test start ==========================================\n"); messageTestApplication(); System.out.println("\n========== messageService Test end ==========================================\n"); @@ -30,15 +33,9 @@ public static void sprint1Application() { } public static void userTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); - /* - [ ] 등록 - [ ] 조회(단건, 다건) - [ ] 수정 - [ ] 수정된 데이터 조회 - [ ] 삭제 - [ ] 조회를 통해 삭제되었는지 확인 - */ + + UserService jcfUserService = ServiceFactory.getInstance().getUserService(); + System.out.println("1. 유저 등록================="); User user1 = jcfUserService.createUser("권용진-1"); User user2 = jcfUserService.createUser("권용진-2"); @@ -75,7 +72,7 @@ public static void userTestApplication() { System.out.println(); // 비활성화된 유저만 조회 System.out.println("6. 유저 활성화==============="); - jcfUserService.restorationUser(user1); + jcfUserService.restoreUser(user1); System.out.println(); jcfUserService.printActiveUsers(); // 조회 System.out.println(); @@ -84,8 +81,8 @@ public static void userTestApplication() { } public static void channelTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); - ChannelService jcfChannelService = Factory.getInstance().getChannelService(); + UserService jcfUserService = ServiceFactory.getInstance().getUserService(); + ChannelService jcfChannelService = ServiceFactory.getInstance().getChannelService(); /* [ ] 등록 [ ] 조회(단건, 다건) @@ -116,9 +113,9 @@ public static void channelTestApplication() { // 생성된 채널 단일 조회 System.out.println("5. 채널 정보 수정, 유저 채널 입장, 동일 유저가 중복 입장하려 할 때================="); - jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + jcfChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 // 이미 만들어진 채널에 다른 유저가 입장 - jcfChannelService.userJoinChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + jcfChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 System.out.println(); jcfChannelService.printUsersFromChannel(channel1); System.out.println(); @@ -141,13 +138,13 @@ public static void channelTestApplication() { // 변경된 채널 이름 조회 System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); - jcfChannelService.userLeaveChannel(user2, channel1); + jcfChannelService.leaveUserFromChannel(user2, channel1); jcfChannelService.printChannel(channel1); System.out.println(); // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); - jcfChannelService.userJoinChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 + jcfChannelService.addUserToChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 jcfChannelService.updateHostUser(user2, channel1, user1); // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. jcfChannelService.updateHostUser(user1, channel1, user2); @@ -173,9 +170,9 @@ public static void channelTestApplication() { } public static void messageTestApplication() { - UserService jcfUserService = Factory.getInstance().getUserService(); - ChannelService jcfChannelService = Factory.getInstance().getChannelService(); - MessageService jcfMessageService = Factory.getInstance().getMessageService(); + UserService jcfUserService = ServiceFactory.getInstance().getUserService(); + ChannelService jcfChannelService = ServiceFactory.getInstance().getChannelService(); + MessageService jcfMessageService = ServiceFactory.getInstance().getMessageService(); /* [ ] 등록 [ ] 조회(단건, 다건) @@ -231,7 +228,7 @@ public static void messageTestApplication() { System.out.println(); System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); - jcfChannelService.userJoinChannel(user2, channel1); + jcfChannelService.addUserToChannel(user2, channel1); Message message4 = jcfMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 jcfMessageService.printAllMessage(); // 전체 조회 System.out.println(); @@ -242,7 +239,7 @@ public static void messageTestApplication() { System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); jcfMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); System.out.println(); - jcfUserService.restorationUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 + jcfUserService.restoreUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 jcfMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); jcfMessageService.printAllMessage(); // 전체 조회 System.out.println(); diff --git a/src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java b/src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java new file mode 100644 index 000000000..e2ef823e1 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java @@ -0,0 +1,295 @@ +package com.sprint.mission.discodeit.run; + +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 java.io.*; + +public class Sprint2Application implements Serializable { + public static void main(String[] args) { + sprint1Application(); + // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 + } + + public static void sprint1Application() { + /* + System.out.println("***************************************************************"); + System.out.println("\n========== userService Test start ==========================================\n"); + userTestApplication(); + System.out.println("\n========== userService Test end ==========================================\n"); + // userService 테스트 + + System.out.println("\n========== channelService Test start ==========================================\n"); + //channelTestApplication(); + System.out.println("\n========== channelService Test end ==========================================\n"); + // channelService 테스트 + + System.out.println("\n========== messageService Test start ==========================================\n"); + //messageTestApplication(); + System.out.println("\n========== messageService Test end ==========================================\n"); + // messageService 테스트 + */ + + + System.out.println("***************************************************************"); + System.out.println("\n========== load userService Test start ==========================================\n"); + loadUserTestApplication(); + System.out.println("\n========== load userService Test end ==========================================\n"); + // userService 테스트 + /* + System.out.println("\n========== load channelService Test start ==========================================\n"); + //loadChannelTestApplication(); + System.out.println("\n========== load channelService Test end ==========================================\n"); + // channelService 테스트 + + System.out.println("\n========== load messageService Test start ==========================================\n"); + //loadMessageTestApplication(); + System.out.println("\n========== load messageService Test end ==========================================\n"); + // messageService 테스트 + System.out.println("***************************************************************"); + // 데이터를 계속 추가히나까 저장되는게 점점 더 많아진다. + // 현재 출력되는게 정상 + // 좀 더 정상적으로 볼려면 testApplication을 하나씩 만 사용해야된다.*/ + } + + public static void userTestApplication() { + + UserService FileUserService = ServiceFactory.getInstance().getFileUserService(); + // sprint2 이므로 file 서비스를 이용하게 될것 + + System.out.println("1. 유저 등록================="); + User user1 = FileUserService.createUser("권용진-1"); + User user2 = FileUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 줄바꾸 + // 두 명의 유저를 등록 + + System.out.println("2. 단일 유저 조회================="); + FileUserService.printUser(user1); + System.out.println(); + // 유저 한명의 정보를 단일 조회 + + System.out.println("3. 전체 유저 조회================="); + FileUserService.printActiveUsers(); + System.out.println(); + // 유저 전체의 정보를 조회 + System.out.println("4. 유저 정보 변경================="); + FileUserService.updateUser(user1, "수정된 권용진-1"); + System.out.println(); + // 유저의 이름을 변경 + FileUserService.printUser(user1); + System.out.println(); + // 변경된 유저의 정보를 조회 + System.out.println("5. 유저 삭제(비활성화)================="); + FileUserService.deleteUser(user1); + System.out.println(); + // 유저 한 명을 삭제를 통해 비활성화 + FileUserService.printActiveUsers(); // 조회 + System.out.println(); + // 정상적을 삭제 되었는지를 확인 하기 위한 활성화 상태인 유저 전체 조회 + FileUserService.printAllUsers(); // 조회 + System.out.println(); + // 활성화된 유저와 비활성화된 유저 전체 조회 + FileUserService.printDeactivatedUsers(); // 조회 + System.out.println(); + // 비활성화된 유저만 조회 + System.out.println("6. 유저 활성화==============="); + FileUserService.restoreUser(user1); + System.out.println(); + FileUserService.printActiveUsers(); // 조회 + System.out.println(); + FileUserService.printDeactivatedUsers(); // 조회 + System.out.println(); + } + + public static void loadUserTestApplication() { + System.out.println("1. 유저 파일 불러온 후 전체 유저 조회"); + UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); + fileUserService.printAllUsers(); + System.out.println(); + } + + public static void channelTestApplication() { + UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); + ChannelService fileChannelService = ServiceFactory.getInstance().getFileChannelService(); + + System.out.println("1. 유저 생성================="); + User user1 = fileUserService.createUser("권용진-1"); + User user2 = fileUserService.createUser("권용진-2"); + System.out.println(); + // 채널을 만들기 위한 유저 생성 + + System.out.println("2. 채널 생성================="); + Channel channel1 = fileChannelService.createChannel(user1, "권용진-1-서버"); + Channel channel2 = fileChannelService.createChannel(user2, "권용진-2-서버"); + System.out.println(); + // 만들어진 유저를 이용하여 채널 생성 + System.out.println(); + System.out.println("3. 채널 전체 조회================="); + fileChannelService.printAllChannels(); + System.out.println(); + // 생성된 채널 전체 조회 + System.out.println("4. 채널 단일 조회================="); + fileChannelService.printChannel(channel1); + System.out.println(); + // 생성된 채널 단일 조회 + + System.out.println("5. 채널 정보 수정, 유저 채널 입장, 동일 유저가 중복 입장하려 할 때================="); + fileChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + // 이미 만들어진 채널에 다른 유저가 입장 + fileChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + System.out.println(); + fileChannelService.printUsersFromChannel(channel1); + System.out.println(); + + // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 + + System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); + fileChannelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); + // 채널 주인인 유저만 채널의 이름을 변경할 수 있음 + fileChannelService.printChannel(channel1); + System.out.println(); + // 채널의 정보가 안변했음을 확인하기 위해 채널 정보 조회 + + fileChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 + System.out.println(); + // 채널 주인은 채널의 이름을 변경할 수 있음 + + fileChannelService.printAllChannels(); + System.out.println(); + // 변경된 채널 이름 조회 + + System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); + fileChannelService.leaveUserFromChannel(user2, channel1); + fileChannelService.printChannel(channel1); + System.out.println(); + // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 + + System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); + fileChannelService.addUserToChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 + fileChannelService.updateHostUser(user2, channel1, user1); + // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. + fileChannelService.updateHostUser(user1, channel1, user2); + // 채널의 주인을 변경 + fileChannelService.printChannel(channel1); + System.out.println(); + // 주인이 변경된 채널을 조회 + + System.out.println("9. 채널 삭제, 권한 없는 유저가 삭제하려 할 때================="); + fileChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 주인이 아니면 채널을 삭제 할 수 없다. + fileChannelService.printAllChannels(); + System.out.println(); + + fileChannelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 + System.out.println(); + // 채널 주인은 채널을 성공적으로 지울 수 있다. + + fileChannelService.printAllChannels(); + System.out.println(); + // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 + } + + public static void loadChannelTestApplication() { + System.out.println("1. 유저 파일및 채널 파일 불러온 후 전체 유저 조회"); + UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); + ChannelService fileChannelService = ServiceFactory.getInstance().getFileChannelService(); + + fileUserService.printAllUsers(); + System.out.println(); + fileChannelService.printAllChannels(); + System.out.println(); + } + public static void messageTestApplication() { + UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); + ChannelService fileChannelService = ServiceFactory.getInstance().getFileChannelService(); + MessageService fileMessageService = ServiceFactory.getInstance().getFileMessageService(); + + System.out.println("1. 유저 생성================="); + User user1 = fileUserService.createUser("권용진-1"); + User user2 = fileUserService.createUser("권용진-2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 유저 생성 + System.out.println("2. 채널 생성================="); + Channel channel1 = fileChannelService.createChannel(user1, "권용진-1의 채널1"); + Channel channel2 = fileChannelService.createChannel(user1, "권용진-1의 채널2"); + System.out.println(); // 가독성을 위한 개행 + // 메세지를 생성하기 위한 채널 생성 + System.out.println("3. 메세지 생성================="); + Message message1 = fileMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 + Message message2 = fileMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 + Message message3 = fileMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 + System.out.println(); + System.out.println("4. 유저 별 메세지 조회================="); + fileMessageService.printAllMessageByUser(user1); //유저 별 조회 + System.out.println(); + System.out.println("5. 채널 별 메시지 조회================="); + fileMessageService.printMessagesByChannel(channel1); // 채널 별 조회 + System.out.println(); + fileMessageService.printMessagesByChannel(channel2); // 채널 별 조회 + System.out.println(); + + System.out.println("6. 메세지 단일 조회================="); + fileMessageService.printMessage(message1); + System.out.println(); + + System.out.println("7. 메세지 전체 조회================="); + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메세지 정보 수정================="); + fileMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("8. 메시지 주인이 아닌 유저가 메세지 삭제 하고자 할 때와 메시지 주인인 유저가 메시지 삭제할 떄================="); + fileMessageService.deleteMessage(user2, message1); + fileMessageService.deleteMessage(user1, message1); + System.out.println(); + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); + fileChannelService.addUserToChannel(user2, channel1); + Message message4 = fileMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + fileUserService.deleteUser(user2); + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); + fileMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); + System.out.println(); + fileUserService.restoreUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 + fileMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + + System.out.println("11. 유저 본인이 아닌 다른 유저가 메시지를 변경하고자 시도 했을 때================="); + fileMessageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + System.out.println(); // user2는 해당 메시지의 주인이 아니므로 메시지의 내용을 변경할 수 없다. + fileMessageService.printAllMessage(); // 전체 조회 + System.out.println(); + } + + public static void loadMessageTestApplication() { + System.out.println("1. 유저 파일 채널 파일및 메세지 파일을 불러온 후 전체 유저 조회"); + UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); + ChannelService fileChannelService = ServiceFactory.getInstance().getFileChannelService(); + MessageService fileMessageService = ServiceFactory.getInstance().getFileMessageService(); + + fileUserService.printAllUsers(); + System.out.println(); + fileChannelService.printAllChannels(); + System.out.println(); + fileMessageService.printAllMessage(); + System.out.println(); + } +} 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 bf531120c..5b5b19ff2 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java @@ -3,21 +3,16 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; -import java.util.UUID; - public interface ChannelService { Channel createChannel(User user, String channelName); void deleteChannel(User user, Channel channel); - - void userJoinChannel(User user, Channel channelName); - void userLeaveChannel(User user, Channel channel); + void addUserToChannel(User user, Channel channelName); + void leaveUserFromChannel(User user, Channel channel); + void updateChannelName(User user, Channel channel, String newName); + void updateHostUser(User oldHostUser, Channel channel, User newHostUser); void printChannel(Channel channel); void printAllChannels(); void printUsersFromChannel(Channel channel); - - void updateChannelName(User user, Channel channel, String newName); - void updateHostUser(User oldHostUser, Channel channel, User newHostUser); - } 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 0af653603..a19639cc5 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java @@ -5,6 +5,7 @@ import com.sprint.mission.discodeit.entity.User; public interface MessageService { + Message createMessage(User user, Channel channel, String contents); void deleteMessage(User user, Message message); void updateMessage(User user, Message message, String newContents); 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 e225c0ce4..9b2fa7642 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/UserService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/UserService.java @@ -4,16 +4,13 @@ public interface UserService { - // 사용자 추가 - void addUser(User user); - // 사용자 정보 업데이트 void updateUser(User user, String newUserName); - // 사용자 삭제 void deleteUser(User user); - void restorationUser(User user); + void restoreUser(User user); + User createUser(String userName); + void printUser(User user); void printAllUsers(); void printActiveUsers(); void printDeactivatedUsers(); - User createUser(String userName); } 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 new file mode 100644 index 000000000..d7d8a568c --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java @@ -0,0 +1,254 @@ +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.entity.UserStatus; +import com.sprint.mission.discodeit.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.service.ChannelService; + +import java.io.*; +import java.util.ArrayList; + +public class FileChannelService implements ChannelService { + + private static final FileChannelService instance = new FileChannelService(); + private final ArrayList data; + + public FileChannelService() { + this.data = loadChannels(); + } + public ArrayList getChannels() { + return data; + } + + public static FileChannelService getInstance() { + return instance; + } + + public void saveChannels(){ + System.out.println("채널 리스트 저장"); + String filePath = "./data/channels.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("Channel 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public ArrayList loadChannels(){ + ArrayList deserializedChannels = null; + System.out.println("채널 리스트 불러오기"); + String filePath = "./data/channels.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedChannels = (ArrayList) ois.readObject(); + + /* + System.out.println("역직렬화된 Channel 리스트 정보:"); + + for (Channel channel : deserializedChannels) { + System.out.println("------------"); + System.out.println("Channel: " + channel.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedChannels; + } + + @Override + public Channel createChannel(User user, String channelName) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); + return null; + } + Channel channel = new Channel(user, channelName); + data.add(channel); + + System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", + user.getId(), channelName, channel.getId()); + user.addChannel(channel); + + FileChannelRepository.getInstance().saveChannels(); + saveChannels(); + return channel; + } + + @Override + public void addUserToChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); + return; // 메서드 종료 + } + if(channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 이미 존재합니다.", user.getUserName(), channel.getChannelName()); + return; + } + System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); + channel.addUser(user); + user.addChannel(channel); + + saveChannels(); + } + + @Override + public void leaveUserFromChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); + user.removeChannel(channel); + if (channel.getUsers().isEmpty()) { + System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); + data.remove(channel); + } + saveChannels(); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); + return; // 메서드 종료 + } + if (channel.getHostUser().equals(user)) { + System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", + channel.getChannelName(), newName); + channel.updateChannelName(newName); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + user.getUserName(), channel.getChannelName()); + } + saveChannels(); + } + + @Override + public void deleteChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + if (!user.equals(channel.getHostUser())) { + System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("채널 삭제: %s%n", channel.getChannelName()); + channel.getMessages() + .stream() + .map(message -> { + message.getUser().removeMessage(message); + return message; + }); + + channel.getUsers() + .stream() + .map(u -> { + u.removeChannel(channel); + return u; + }); + + channel.clearUsers(); + channel.clearMessages(); + data.remove(channel); + + saveChannels(); + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(oldHostUser.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); + return; + } + + if(newHostUser.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + return; + } + + if(!channel.getUsers().contains(newHostUser)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); + return; + } + if (channel.getHostUser().equals(oldHostUser)) { + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + oldHostUser.getUserName(), channel.getChannelName()); + } + saveChannels(); + } + + @Override + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } + + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); + //System.out.println(channel.toString()); + } + + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + + channel.getUsers().forEach(u -> System.out.println(u.getUserName())); + } + +} 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 new file mode 100644 index 000000000..bfab5f751 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileMessageService.java @@ -0,0 +1,173 @@ +package com.sprint.mission.discodeit.service.file; + +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.MessageService; + +import java.io.*; +import java.util.ArrayList; + +public class FileMessageService implements MessageService { + private static final FileMessageService instance = new FileMessageService(); + private final ArrayList data; + + public FileMessageService() { + this.data = loadMessages(); + } + public ArrayList getMessages() { + return data; + } + public static FileMessageService getInstance() { + return instance; + } + + public void saveMessages(){ + System.out.println("메세지 리스트 저장"); + String filePath = "./data/messages.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("Message 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public ArrayList loadMessages(){ + ArrayList deserializedMessages = null; + System.out.println("메세지 리스트 불러오기"); + String filePath = "./data/messages.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedMessages = (ArrayList) ois.readObject(); + /* + System.out.println("역직렬화된 Message 리스트 정보:"); + + for (Message message : deserializedMessages) { + System.out.println("------------"); + System.out.println("Message: " + message.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedMessages; + } + + @Override + public Message createMessage(User user, Channel channel, String contents){ + if(channel == null) { + System.out.println("채널이 null 입니다."); + return null; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + return null; + } + System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", + user.getId(), channel.getId(), contents); + Message newMessage = new Message(user, channel, contents); + data.add(newMessage); + newMessage.registerMessageToUserAndChannel(user, channel); + + saveMessages(); + return newMessage; + } + + @Override + public void deleteMessage(User user, Message message){ + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); + return; + } + if (user.getId().equals(message.getUser().getId())) { + System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", + user.getUserName(), message.getId(), message.getMessageContents()); + } else { + System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", + user.getUserName(), message.getId()); + return; + } + message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 + user.removeMessage(message); + data.remove(message); + + saveMessages(); + } + + @Override + public void updateMessage(User user, Message message, String newContents){ + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + return; + } + if(!user.equals(message.getUser())) { + System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + return; + } + + System.out.println("메세지를 업데이트 합니다."); + System.out.printf("이전 메세지: %s%n", message.getMessageContents()); + System.out.printf("현재 메세지: %s%n", newContents); + message.updateMessageContent(newContents); + + saveMessages(); + } + + @Override + public void printMessagesByChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", + channel.getChannelName(), channel.getMessages().size()); + data.stream() + .filter(message -> message.getChannel().equals(channel)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printMessage(Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); + System.out.println(message.toString()); + } + + @Override + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printAllMessageByUser(User user) { + System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", + user.getUserName(), user.getMessages().size()); + user.getMessages() + .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + } +} 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 new file mode 100644 index 000000000..fb1efc936 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/file/FileUserService.java @@ -0,0 +1,159 @@ +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.entity.UserStatus; +import com.sprint.mission.discodeit.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.repository.file.FileMessageRepository; +import com.sprint.mission.discodeit.service.UserService; + +import java.io.*; +import java.util.ArrayList; +import java.util.Optional; + +public class FileUserService implements UserService{ + private static final FileUserService instance = new FileUserService(); + private final ArrayList data; + + public FileUserService() { + this.data = loadUsers(); + } + public ArrayList getUsers() { + return data; + } + public static FileUserService getInstance() { + return instance; + } + + public void saveUsers() { + System.out.println("유저 리스트 저장"); + String filePath = "./data/users.ser"; + + // ArrayList 직렬화및 저장 + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { + oos.writeObject(data); + System.out.println("User 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public ArrayList loadUsers() { + ArrayList deserializedUsers = null; + System.out.println("유저 리스트 불러오기"); + String filePath = "./data/users.ser"; // 유저 직렬화 + + if (!new File(filePath).exists() || new File(filePath).length() == 0) { + return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 + } + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { + deserializedUsers = (ArrayList) ois.readObject(); + + /* + System.out.println("역직렬화된 User 리스트 정보:"); + for (User user : deserializedUsers) { + System.out.println("------------"); + System.out.println("User: " + user.toString()); + }*/ + + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + } + return deserializedUsers; + } + + @Override + public User createUser(String userName) { + User user = new User(userName); // 직접 생성 + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + data.add(user); + saveUsers(); + return user; + } + + @Override + public void updateUser(User user, String newName) { + System.out.println("유저의 이름을 변경합니다."); + System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + user.setUserName(newName); + saveUsers(); // 데이터를 바꿀 때 마다 저장 -> 비효율적이라 생각, 나중에 질문 + } + + @Override + public void deleteUser(User user) { + Optional hostChannel = user.getChannels().stream() + .filter(channel -> channel.getHostUser().equals(user)) + .findFirst(); + + if (hostChannel.isPresent()) { + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n", user.getUserName(), hostChannel.get().getChannelName()); + return; //메서드 종료 + } + + System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. + user.setStatus(UserStatus.DEACTIVE); + // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear + // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 + // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. + user.getChannels().stream() + .map(channel -> { + channel.removeUser(user); + return channel; + }); + user.clearChannels(); + // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. + user.getMessages().stream() + .map(message -> { + message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. !!오류가 날 것 같은 코드, 오류가 나면 이 부분을 의심하자 + return message; + }); + user.clearMessages(); + + saveUsers(); + FileMessageRepository.getInstance().saveMessages(); + FileChannelRepository.getInstance().saveChannels(); + // 채널과 메세지들도 변경되었으니 변경 + } + + @Override + public void restoreUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(UserStatus.ACTIVE); + saveUsers(); + } + + @Override + public void printActiveUsers(){ + // status를 판별하는 식을 추가 + System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE)) + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printUser(User user) { + System.out.print("단일 유저 조회\n"); + System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + } + + @Override + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printDeactivatedUsers() { + System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + +} 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 2a6705336..3f52a4d8d 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 @@ -2,16 +2,17 @@ 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.service.ChannelService; import java.util.ArrayList; public class JCFChannelService implements ChannelService { - private static final JCFChannelService instance = new JCFChannelService(); private final ArrayList data; // channelData + // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? public JCFChannelService() { data = new ArrayList<>(); @@ -23,7 +24,7 @@ public static JCFChannelService getInstance() { @Override public Channel createChannel(User user, String channelName) { - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); return null; } @@ -37,12 +38,12 @@ public Channel createChannel(User user, String channelName) { } @Override - public void userJoinChannel(User user, Channel channel) { + public void addUserToChannel(User user, Channel channel) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); return; // 메서드 종료 } @@ -56,12 +57,12 @@ public void userJoinChannel(User user, Channel channel) { } @Override - public void userLeaveChannel(User user, Channel channel) { + public void leaveUserFromChannel(User user, Channel channel) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); return; // 메서드 종료 } @@ -78,42 +79,13 @@ public void userLeaveChannel(User user, Channel channel) { } } - @Override - public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); - data.forEach(channel -> System.out.println(channel.getChannelName())); - } - - @Override - public void printChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); - System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); - //System.out.println(channel.toString()); - } - - @Override - public void printUsersFromChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", - channel.getChannelName(), channel.getUsers().size()); - - channel.getUsers().forEach(u -> System.out.println(u.getUserName())); - } - @Override public void updateChannelName(User user, Channel channel, String newName) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); return; // 메서드 종료 } @@ -133,7 +105,7 @@ public void deleteChannel(User user, Channel channel) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); return; // 메서드 종료 } @@ -157,10 +129,10 @@ public void deleteChannel(User user, Channel channel) { channel.getUsers() .stream() - .map(u -> { - u.removeChannel(channel); - return u; - }); + .map(userInChannel -> { + userInChannel.removeChannel(channel); + return userInChannel; + });// user는 매개변수 이름이기 때문에 userInChannel 변수명 사용 channel.clearUsers(); channel.clearMessages(); @@ -173,12 +145,12 @@ public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) System.out.println("채널이 null 입니다."); return; } - if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(oldHostUser.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); return; } - if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(newHostUser.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); return; } @@ -187,13 +159,43 @@ public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); return; } - if (channel.getHostUser().equals(oldHostUser)) { - System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", - channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(newHostUser); - } else { + + if (!channel.getHostUser().equals(oldHostUser)) { System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", oldHostUser.getUserName(), channel.getChannelName()); } + + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } + + @Override + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } + + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); + //System.out.println(channel.toString()); + } + + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + + channel.getUsers().forEach(u -> System.out.println(u.getUserName())); } } 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 0591e0c82..522ae71d8 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 @@ -3,6 +3,7 @@ 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.entity.UserStatus; import com.sprint.mission.discodeit.service.MessageService; import java.util.ArrayList; @@ -13,7 +14,7 @@ public class JCFMessageService implements MessageService { private final ArrayList data; public JCFMessageService() { - data = new ArrayList<>(); + data = new ArrayList<>(); } public static JCFMessageService getInstance() { @@ -26,7 +27,7 @@ public Message createMessage(User user, Channel channel, String contents) { System.out.println("채널이 null 입니다."); return null; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); return null; } @@ -45,7 +46,7 @@ public void deleteMessage(User user, Message message) { System.out.println("메세지가 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); return; } @@ -68,7 +69,7 @@ public void updateMessage(User user, Message message, String newContents) { System.out.println("메세지가 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); return; } @@ -110,10 +111,10 @@ public void printMessage(Message message) { @Override public void printAllMessage() { System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() - .filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .toList().size()); data - .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); } 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 ad057d97f..ed2f4d0d5 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 @@ -2,34 +2,35 @@ 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.service.UserService; import java.util.*; public class JCFUserService implements UserService { - - - private static JCFUserService instance = new JCFUserService(); + private static final JCFUserService instance = new JCFUserService(); private final ArrayList data; public JCFUserService() { data = new ArrayList<>(); } + // CRUD는 REPOSITORY로 다 넘기고 print만 남기자 + // 저장된 파일의 정보가 달라질 때마다 data는 새로이 파일을 불러와야 하는가? ? + // -> 불러오기는 O(n)인데 add 메소드는 O(1)이라서 + // -> 데이터 리스트는 따로 관리하고 저장은 또 따로 한다. + // ex) data.add(user); + // ex) saveUsers(); + public static JCFUserService getInstance() { return instance; } - @Override - public void addUser(User user) { - System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); - data.add(user); - } - @Override public User createUser(String userName) { User user = new User(userName); // 직접 생성 - addUser(user); // 내부 등록 + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + data.add(user); return user; } @@ -55,7 +56,7 @@ public void deleteUser(User user) { System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); // usersData.remove(user); // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. - user.setStatus(User.UserStatus.DEACTIVE); + user.setStatus(UserStatus.DEACTIVE); // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. @@ -76,13 +77,19 @@ public void deleteUser(User user) { user.clearMessages(); } + @Override + public void restoreUser(User user) { + System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); + user.setStatus(UserStatus.ACTIVE); + } + @Override public void printActiveUsers(){ // status를 판별하는 식을 추가 System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE))).toList().size()); + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE))).toList().size()); data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.ACTIVE)) + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE)) .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); } @@ -102,16 +109,10 @@ public void printAllUsers() { @Override public void printDeactivatedUsers() { System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE))).toList().size()); + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE))).toList().size()); data.stream() - .filter(user -> user.getStatus().equals(User.UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); } - @Override - public void restorationUser(User user) { - System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); - user.setStatus(User.UserStatus.ACTIVE); - } - } diff --git "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" new file mode 100644 index 000000000..8085f2808 --- /dev/null +++ "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" @@ -0,0 +1,29 @@ +JCFUserRepository 에서는 data를 다뤄야 할 것 같음 +정확히는 data만 +print는 전부 안쓰는 방향으로 가야할 것 같아 +보여주는 것을 원하는 요구사항은 아니였음 + +FileUserRepository 에서는 data를 파일로 저장하는 것과 +초기에 파일을 불러와서 그 정보를 data에 저장하는 것 + +아마 지금 서비스가 레포지터리의 기능도 포함하고 있기 때문에 코드를 두 번 짜는 것이라 느껴지는 것 같음 +원래는 서비스와 레포지터리를 분리해서 코딩해야하지만 교육을 위해서 일단 서비스 모든 기능을 다 넣은 것 같음 +그래서 지금와서 레포지터리를 만들라고 해서 이상하게 느껴지는 듯 + +파일에서는 JCF에서 데이터를 받아와서 저장 +JCF는 data를 변경하는 것 + +파일에서의 data와 JCF에서의 data는 동일해야 할 것 + +- 06/10/ 18:46 + +레포지터리 인터페이스에 뭐가 있어야 하지? + +JCF와 File에서 공통으로 쓰는 것 +그럼 그것이 뭐가 있는지? + +data에 유저 추가 및 삭제 등 + +File에만 따로 저장하는 로직이 있을 것 +JCF에 있는 것은? +뭐가 있어야 하지? \ No newline at end of file From 9ad2ddffaac0c14b72119d26e16cdab4317ce603 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Wed, 11 Jun 2025 13:48:09 +0900 Subject: [PATCH 09/16] =?UTF-8?q?basic=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/channels.ser | Bin 58 -> 0 bytes data/messages.ser | Bin 58 -> 0 bytes data/users.ser | Bin 725 -> 0 bytes .../discodeit/factory/ServiceFactory.java | 21 +++ .../repository/ChannelRepository.java | 9 +- .../repository/MessageRepository.java | 7 +- .../file/FileChannelRepository.java | 173 +++++++++++++++++- .../file/FileMessageRepository.java | 83 ++++++++- .../repository/file/FileUserRepository.java | 32 +++- .../repository/jcf/JCFChannelRepository.java | 59 +++--- .../repository/jcf/JCFMessageRepository.java | 48 +---- .../repository/jcf/JCFUserRepository.java | 7 + ...n.java => TestFileServiceApplication.java} | 49 ++--- ...on.java => TestJCFServiceApplication.java} | 6 +- .../service/file/FileChannelService.java | 16 +- .../service/file/FileMessageService.java | 6 + .../service/file/FileUserService.java | 4 +- .../service/jcf/JCFChannelService.java | 1 + 18 files changed, 413 insertions(+), 108 deletions(-) delete mode 100644 data/channels.ser delete mode 100644 data/messages.ser delete mode 100644 data/users.ser rename src/main/java/com/sprint/mission/discodeit/run/{Sprint2Application.java => TestFileServiceApplication.java} (95%) rename src/main/java/com/sprint/mission/discodeit/run/{Sprint1Application.java => TestJCFServiceApplication.java} (99%) diff --git a/data/channels.ser b/data/channels.ser deleted file mode 100644 index 665a8492e104a67e962def8efdf29300b4a78bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(BZ KpqvFnRsaBEClVU~ diff --git a/data/messages.ser b/data/messages.ser deleted file mode 100644 index 665a8492e104a67e962def8efdf29300b4a78bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(BZ KpqvFnRsaBEClVU~ diff --git a/data/users.ser b/data/users.ser deleted file mode 100644 index 4b1558d40619cf1faa56c7969d4318b6bfbdf62f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 725 zcmZ4UmVvdnh(S0ju`E%qv?Mb}&#|Z|vC=2AxTK=-lI+amiF2757(E$SiZiQHD+(AG z7?{dgKqOF;Msj|xUU5NDW?qS2Zf0?DW`3StN@j6#eoAU)iC$`6NoGlcg$I1}e!-EiO(>Pc1HFsAFLEVPGpR zNh~P^YB2QyTB#4QQXguiKHN%uh?V*vD^);5FjyPNz)~R3FEKZ@gh2>mXHH^Xx_)p8 z(Cz8g6-5ks#CXLiu{hNg>?;{%4yoeQOLLeQn7tS{lZ#RlOHxxDOMvXsf)ohbhk+?G zrG!BM$%~<(o-Wp)Fl3w_siheTrRM@ek`EF5AVqs-GJl_u+p5pRz~sfilarcQToRm_ z?vzP%`44CmMkb?U~_a1@eFeX#_yYs8E+O$eLZ20!mDjPZ)UB0 zv%E#u5bPu-sP8AiXs{?}|H_|B-h6iD4m^J5md_) loadChannels(); + Channel createChannel(User user, String channelName); + void deleteChannel(User user, Channel channel); + void addUserToChannel(User user, Channel channelName); + void leaveUserFromChannel(User user, Channel channel); + void updateChannelName(User user, Channel channel, String newName); + void updateHostUser(User oldHostUser, Channel channel, User newHostUser); } 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 04dc260eb..593bcdfc3 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -1,10 +1,13 @@ package com.sprint.mission.discodeit.repository; +import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; import java.util.ArrayList; public interface MessageRepository { - void saveMessages(); - ArrayList loadMessages(); + Message createMessage(User user, Channel channel, String contents); + void deleteMessage(User user, Message message); + void updateMessage(User user, Message message, String newContents); } 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 50f7410fb..69f1e83dd 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/file/FileChannelRepository.java @@ -2,7 +2,9 @@ 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.service.file.FileChannelService; import java.io.*; import java.util.ArrayList; @@ -23,7 +25,6 @@ public static FileChannelRepository getInstance() { return instance; } - @Override public void saveChannels(){ System.out.println("채널 리스트 저장"); String filePath = "./data/channels.ser"; @@ -35,9 +36,10 @@ public void saveChannels(){ } catch (IOException e) { e.printStackTrace(); } + + FileUserRepository.getInstance().saveUsers(); //채널을 변경하면 유저도 변경되니까 유저 파일도 변경 } - @Override public ArrayList loadChannels(){ ArrayList deserializedChannels = null; System.out.println("채널 리스트 불러오기"); @@ -64,4 +66,171 @@ public ArrayList loadChannels(){ } return deserializedChannels; } + + @Override + public Channel createChannel(User user, String channelName) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); + return null; + } + Channel channel = new Channel(user, channelName); + data.add(channel); + + System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", + user.getId(), channelName, channel.getId()); + user.addChannel(channel); + + saveChannels(); + return channel; + } + + @Override + public void addUserToChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); + return; // 메서드 종료 + } + if(channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 이미 존재합니다.", user.getUserName(), channel.getChannelName()); + return; + } + System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); + channel.addUser(user); + user.addChannel(channel); + + saveChannels(); + } + + @Override + public void leaveUserFromChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); + channel.removeUser(user); + user.removeChannel(channel); + if (channel.getUsers().isEmpty()) { + System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); + data.remove(channel); + } + saveChannels(); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); + return; // 메서드 종료 + } + if (channel.getHostUser().equals(user)) { + System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", + channel.getChannelName(), newName); + channel.updateChannelName(newName); + } else { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + user.getUserName(), channel.getChannelName()); + } + saveChannels(); + FileMessageRepository.getInstance().saveMessages(); + } + + @Override + public void deleteChannel(User user, Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; // 메서드 종료 + } + if(!channel.getUsers().contains(user)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + if (!user.equals(channel.getHostUser())) { + System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("채널 삭제: %s%n", channel.getChannelName()); + channel.getMessages() + .stream() + .map(message -> { + message.getUser().removeMessage(message); + return message; + }); + + channel.getUsers() + .stream() + .map(u -> { + u.removeChannel(channel); + return u; + }); + + channel.clearUsers(); + channel.clearMessages(); + data.remove(channel); + + saveChannels(); + FileMessageRepository.getInstance().saveMessages(); // 채널을 변경하면 메시지도 벼경 + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + if(oldHostUser.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); + return; + } + + if(newHostUser.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + return; + } + + if(!channel.getUsers().contains(newHostUser)) { + System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); + return; + } + + if (!channel.getHostUser().equals(oldHostUser)) { + System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", + oldHostUser.getUserName(), channel.getChannelName()); + return; + } + + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + + saveChannels(); + FileMessageRepository.getInstance().saveMessages(); + } + + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } } 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 6ae6dc5ad..b2072d5c9 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 @@ -3,7 +3,9 @@ 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.entity.UserStatus; import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.service.file.FileMessageService; import java.io.*; import java.util.ArrayList; @@ -23,7 +25,6 @@ public static FileMessageRepository getInstance() { return instance; } - @Override public void saveMessages(){ System.out.println("메세지 리스트 저장"); String filePath = "./data/messages.ser"; @@ -35,9 +36,10 @@ public void saveMessages(){ } catch (IOException e) { e.printStackTrace(); } + + FileChannelRepository.getInstance().saveChannels(); } - @Override public ArrayList loadMessages(){ ArrayList deserializedMessages = null; System.out.println("메세지 리스트 불러오기"); @@ -63,4 +65,81 @@ public ArrayList loadMessages(){ } return deserializedMessages; } + + @Override + public Message createMessage(User user, Channel channel, String contents){ + if(channel == null) { + System.out.println("채널이 null 입니다."); + return null; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + return null; + } + System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", + user.getId(), channel.getId(), contents); + Message newMessage = new Message(user, channel, contents); + data.add(newMessage); + newMessage.registerMessageToUserAndChannel(user, channel); + + saveMessages(); + return newMessage; + } + + @Override + public void deleteMessage(User user, Message message){ + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); + return; + } + if (user.getId().equals(message.getUser().getId())) { + System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", + user.getUserName(), message.getId(), message.getMessageContents()); + } else { + System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", + user.getUserName(), message.getId()); + return; + } + message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 + user.removeMessage(message); + data.remove(message); + + saveMessages(); + } + + @Override + public void updateMessage(User user, Message message, String newContents){ + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + if(user.getStatus().equals(UserStatus.DEACTIVE)) { + System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + return; + } + if(!user.equals(message.getUser())) { + System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + return; + } + + System.out.println("메세지를 업데이트 합니다."); + System.out.printf("이전 메세지: %s%n", message.getMessageContents()); + System.out.printf("현재 메세지: %s%n", newContents); + message.updateMessageContent(newContents); + + saveMessages(); + } + + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } } 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 8f786863e..580ae5263 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 @@ -4,6 +4,7 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserRepository; +import com.sprint.mission.discodeit.service.file.FileUserService; import java.io.*; import java.util.ArrayList; @@ -65,8 +66,9 @@ public ArrayList loadUsers() { @Override public User createUser(String userName) { User user = new User(userName); // 직접 생성 - System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName() ,user.getId()); + System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); data.add(user); + saveUsers(); return user; } @@ -75,6 +77,10 @@ public void updateUser(User user, String newName) { System.out.println("유저의 이름을 변경합니다."); System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); user.setUserName(newName); + saveUsers(); // 데이터를 바꿀 때 마다 저장 -> 비효율적이라 생각, 나중에 질문 + FileMessageRepository.getInstance().saveMessages(); + FileChannelRepository.getInstance().saveChannels(); + // 유저를 가지고 있는 채널과, 유저를 가지고 있는 메세지들의 데이터가 달라졌으므로 저장 } @Override @@ -84,32 +90,48 @@ public void deleteUser(User user) { .findFirst(); if (hostChannel.isPresent()) { - System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n",user.getUserName(), hostChannel.get().getChannelName()); + System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n", user.getUserName(), hostChannel.get().getChannelName()); return; //메서드 종료 } System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); - + // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. user.setStatus(UserStatus.DEACTIVE); + // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear + // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 + // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. user.getChannels().stream() .map(channel -> { channel.removeUser(user); return channel; }); user.clearChannels(); + // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. user.getMessages().stream() .map(message -> { - message.getChannel().removeMessage(message); + message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. !!오류가 날 것 같은 코드, 오류가 나면 이 부분을 의심하자 return message; }); user.clearMessages(); - // 상세한 주석은 service에 + + saveUsers(); + FileMessageRepository.getInstance().saveMessages(); + FileChannelRepository.getInstance().saveChannels(); + // 채널과 메세지들도 변경되었으니 변경 } @Override public void restoreUser(User user) { System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); user.setStatus(UserStatus.ACTIVE); + saveUsers(); + } + + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + //제대로 레포지터리가 작동하는지를 확인하기위한 메소드 } } 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 cdba4dbd9..aea4bc47f 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java @@ -2,27 +2,32 @@ 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.file.FileChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; +import com.sprint.mission.discodeit.service.jcf.JCFChannelService; import java.util.ArrayList; public class JCFChannelRepository implements ChannelRepository { private static final JCFChannelRepository instance = new JCFChannelRepository(); - private final FileChannelRepository fileChannelRepository; private final ArrayList data; // channelData // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? public JCFChannelRepository() { - fileChannelRepository = new FileChannelRepository(); - data = fileChannelRepository.getChannels(); + data = new ArrayList<>(); } + public static JCFChannelRepository getInstance() { + return instance; + } + + @Override public Channel createChannel(User user, String channelName) { - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); return null; } @@ -35,12 +40,13 @@ public Channel createChannel(User user, String channelName) { return channel; } - public void userJoinChannel(User user, Channel channel) { + @Override + public void addUserToChannel(User user, Channel channel) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); return; // 메서드 종료 } @@ -53,12 +59,13 @@ public void userJoinChannel(User user, Channel channel) { user.addChannel(channel); } - public void userLeaveChannel(User user, Channel channel) { + @Override + public void leaveUserFromChannel(User user, Channel channel) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); return; // 메서드 종료 } @@ -75,12 +82,13 @@ public void userLeaveChannel(User user, Channel channel) { } } + @Override public void updateChannelName(User user, Channel channel, String newName) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); return; // 메서드 종료 } @@ -94,12 +102,13 @@ public void updateChannelName(User user, Channel channel, String newName) { } } + @Override public void deleteChannel(User user, Channel channel) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); return; // 메서드 종료 } @@ -123,27 +132,28 @@ public void deleteChannel(User user, Channel channel) { channel.getUsers() .stream() - .map(u -> { - u.removeChannel(channel); - return u; - }); + .map(userInChannel -> { + userInChannel.removeChannel(channel); + return userInChannel; + });// user는 매개변수 이름이기 때문에 userInChannel 변수명 사용 channel.clearUsers(); channel.clearMessages(); data.remove(channel); } + @Override public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { if(channel == null) { System.out.println("채널이 null 입니다."); return; } - if(oldHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(oldHostUser.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); return; } - if(newHostUser.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(newHostUser.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); return; } @@ -152,14 +162,19 @@ public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); return; } - if (channel.getHostUser().equals(oldHostUser)) { - System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", - channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(newHostUser); - } else { + + if (!channel.getHostUser().equals(oldHostUser)) { System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", oldHostUser.getUserName(), channel.getChannelName()); } + + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + } + + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); } - // data를 다뤄야 하나? } 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 bdbcb5a73..87c30081f 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 @@ -5,8 +5,6 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.MessageRepository; -import com.sprint.mission.discodeit.service.MessageService; - import java.util.ArrayList; public class JCFMessageRepository implements MessageRepository { @@ -15,19 +13,20 @@ public class JCFMessageRepository implements MessageRepository { private final ArrayList data; public JCFMessageRepository() { - data = new ArrayList<>(); + data = new ArrayList<>(); } public static JCFMessageRepository getInstance() { return instance; } + @Override public Message createMessage(User user, Channel channel, String contents) { if(channel == null) { System.out.println("채널이 null 입니다."); return null; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); return null; } @@ -40,12 +39,13 @@ public Message createMessage(User user, Channel channel, String contents) { return newMessage; } + @Override public void deleteMessage(User user, Message message) { if(message == null) { System.out.println("메세지가 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); return; } @@ -62,12 +62,13 @@ public void deleteMessage(User user, Message message) { data.remove(message); } + @Override public void updateMessage(User user, Message message, String newContents) { if(message == null) { System.out.println("메세지가 null 입니다."); return; } - if(user.getStatus().equals(User.UserStatus.DEACTIVE)) { + if(user.getStatus().equals(UserStatus.DEACTIVE)) { System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); return; } @@ -82,45 +83,12 @@ public void updateMessage(User user, Message message, String newContents) { message.updateMessageContent(newContents); } - @Override - public void printMessagesByChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", - channel.getChannelName(), channel.getMessages().size()); - data.stream() - .filter(message -> message.getChannel().equals(channel)) - .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", - message.getUser().getUserName(), message.getMessageContents())); - } - - @Override - public void printMessage(Message message) { - if(message == null) { - System.out.println("메세지가 null 입니다."); - return; - } - System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); - System.out.println(message.toString()); - } - - @Override public void printAllMessage() { System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .toList().size()); data - .stream().filter(message -> message.getUser().getStatus().equals(User.UserStatus.ACTIVE)) + .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); } - - @Override - public void printAllMessageByUser(User user) { - System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", - user.getUserName(), user.getMessages().size()); - user.getMessages() - .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); - } } 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 27c90ec6e..b85bfe222 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 @@ -70,4 +70,11 @@ public void restoreUser(User user) { System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); user.setStatus(UserStatus.ACTIVE); } + + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + //제대로 레포지터리가 작동하는지를 확인하기위한 메소드 + } } diff --git a/src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java b/src/main/java/com/sprint/mission/discodeit/run/TestFileServiceApplication.java similarity index 95% rename from src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java rename to src/main/java/com/sprint/mission/discodeit/run/TestFileServiceApplication.java index e2ef823e1..c220affb1 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/Sprint2Application.java +++ b/src/main/java/com/sprint/mission/discodeit/run/TestFileServiceApplication.java @@ -10,51 +10,57 @@ import java.io.*; -public class Sprint2Application implements Serializable { +public class TestFileServiceApplication implements Serializable { public static void main(String[] args) { - sprint1Application(); + testFileService(); // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 } - public static void sprint1Application() { + public static void testFileService() { + /* - System.out.println("***************************************************************"); + System.out.println("************************************************************** *"); System.out.println("\n========== userService Test start ==========================================\n"); userTestApplication(); System.out.println("\n========== userService Test end ==========================================\n"); - // userService 테스트 - System.out.println("\n========== channelService Test start ==========================================\n"); - //channelTestApplication(); - System.out.println("\n========== channelService Test end ==========================================\n"); - // channelService 테스트 - - System.out.println("\n========== messageService Test start ==========================================\n"); - //messageTestApplication(); - System.out.println("\n========== messageService Test end ==========================================\n"); - // messageService 테스트 - */ - - - System.out.println("***************************************************************"); System.out.println("\n========== load userService Test start ==========================================\n"); loadUserTestApplication(); System.out.println("\n========== load userService Test end ==========================================\n"); + System.out.println("***************************************************************");*/ + // userService 테스트 /* + System.out.println("***************************************************************"); + System.out.println("\n========== channelService Test start ==========================================\n"); + //channelTestApplication(); + System.out.println("\n========== channelService Test end ==========================================\n"); + // channelService 테스트 + System.out.println("\n========== load channelService Test start ==========================================\n"); //loadChannelTestApplication(); System.out.println("\n========== load channelService Test end ==========================================\n"); + System.out.println("***************************************************************"); // channelService 테스트 + */ + + System.out.println("***************************************************************"); + System.out.println("\n========== messageService Test start ==========================================\n"); + messageTestApplication(); + System.out.println("\n========== messageService Test end ==========================================\n"); + // messageService 테스트 + System.out.println("***************************************************************"); System.out.println("\n========== load messageService Test start ==========================================\n"); - //loadMessageTestApplication(); + loadMessageTestApplication(); System.out.println("\n========== load messageService Test end ==========================================\n"); - // messageService 테스트 System.out.println("***************************************************************"); + // messageService 테스트 + // 데이터를 계속 추가히나까 저장되는게 점점 더 많아진다. // 현재 출력되는게 정상 - // 좀 더 정상적으로 볼려면 testApplication을 하나씩 만 사용해야된다.*/ + // 좀 더 정상적으로 볼려면 testApplication을 하나씩 만 사용해야된다. + // data 폴더 내의 파일들을 모두 지워야 보기편하다. } public static void userTestApplication() { @@ -205,6 +211,7 @@ public static void loadChannelTestApplication() { fileChannelService.printAllChannels(); System.out.println(); } + public static void messageTestApplication() { UserService fileUserService = ServiceFactory.getInstance().getFileUserService(); ChannelService fileChannelService = ServiceFactory.getInstance().getFileChannelService(); diff --git a/src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java b/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java similarity index 99% rename from src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java rename to src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java index 294400178..9721474a6 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/Sprint1Application.java +++ b/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java @@ -8,14 +8,14 @@ import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; -public class Sprint1Application { +public class TestJCFServiceApplication { public static void main(String[] args) { - sprint1Application(); + testJCFService(); // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 } - public static void sprint1Application() { + public static void testJCFService() { System.out.println("\n========== userService Test start ==========================================\n"); userTestApplication(); System.out.println("\n========== userService Test end ==========================================\n"); 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 d7d8a568c..5b3b10340 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 @@ -4,6 +4,7 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.repository.file.FileUserRepository; import com.sprint.mission.discodeit.service.ChannelService; import java.io.*; @@ -36,6 +37,7 @@ public void saveChannels(){ } catch (IOException e) { e.printStackTrace(); } + FileUserService.getInstance().saveUsers(); } public ArrayList loadChannels(){ @@ -78,7 +80,6 @@ public Channel createChannel(User user, String channelName) { user.getId(), channelName, channel.getId()); user.addChannel(channel); - FileChannelRepository.getInstance().saveChannels(); saveChannels(); return channel; } @@ -211,14 +212,17 @@ public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); return; } - if (channel.getHostUser().equals(oldHostUser)) { - System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", - channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(newHostUser); - } else { + + if (!channel.getHostUser().equals(oldHostUser)) { System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", oldHostUser.getUserName(), channel.getChannelName()); + return; } + + System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", + channel.getChannelName(), newHostUser.getUserName()); + channel.updateHostUser(newHostUser); + saveChannels(); } 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 bfab5f751..884a138b3 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 @@ -3,7 +3,11 @@ 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.entity.UserStatus; +import com.sprint.mission.discodeit.repository.file.FileChannelRepository; +import com.sprint.mission.discodeit.repository.file.FileUserRepository; import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.UserService; import java.io.*; import java.util.ArrayList; @@ -33,6 +37,8 @@ public void saveMessages(){ } catch (IOException e) { e.printStackTrace(); } + + FileChannelService.getInstance().saveChannels(); //메시지가 변경되면 채널과 유저 둘 다변경 되어야 함 } public ArrayList loadMessages(){ 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 fb1efc936..c60e3e801 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 @@ -111,9 +111,7 @@ public void deleteUser(User user) { }); user.clearMessages(); - saveUsers(); - FileMessageRepository.getInstance().saveMessages(); - FileChannelRepository.getInstance().saveChannels(); + FileMessageService.getInstance().saveMessages(); // 채널과 메세지들도 변경되었으니 변경 } 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 3f52a4d8d..0e140888e 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 @@ -163,6 +163,7 @@ public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) if (!channel.getHostUser().equals(oldHostUser)) { System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", oldHostUser.getUserName(), channel.getChannelName()); + return; } System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", From a02d652712141fe9580f1fa834325f98d8770cbc Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Wed, 11 Jun 2025 13:48:37 +0900 Subject: [PATCH 10/16] =?UTF-8?q?basic=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/channels.ser | Bin 0 -> 2524 bytes data/messages.ser | Bin 0 -> 2544 bytes data/users.ser | Bin 0 -> 2524 bytes .../discodeit/run/JavaApplication.java | 300 ++++++++++++++++++ .../mission/discodeit/run/TestRepository.java | 13 + .../service/basic/BasicChannelService.java | 91 ++++++ .../service/basic/BasicMessageService.java | 83 +++++ .../service/basic/BasicUserService.java | 77 +++++ 8 files changed, 564 insertions(+) create mode 100644 data/channels.ser create mode 100644 data/messages.ser create mode 100644 data/users.ser create mode 100644 src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java create mode 100644 src/main/java/com/sprint/mission/discodeit/run/TestRepository.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java create mode 100644 src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java diff --git a/data/channels.ser b/data/channels.ser new file mode 100644 index 0000000000000000000000000000000000000000..f0adf530cdc18d4f66bce12195485170e950f721 GIT binary patch literal 2524 zcmbtUYfM{Z82)Grf=nDZwuQ~56O9Ap913h`z`3r}+IrAAE^bDQCvXDC^k&b87NTUE zkO^fASy0*1xyDc#6M|F5z!Eq2W12W4S)5r0#LJes(1Vw-I5OSze3xD}KpX9k^PRr^ z-sgSZ=Y8Jx&wzNz1@3u?e}!inplD_EE*Ia(i4t`0JbUl{&-sID5N8G&No*3_P5^-B zRSkM7NjWtR8zVVgq8&0eQIbT5ov9V28b_@lLPoGd5jHZ0dfsjqtbbLXtAAMb-lqZ@ z4kXu*;8VO!fFO-S#aSzFuVc%hf>u||fy8=;1S=)M1wl5a)L}^-meygzby!k|MR!r2 zO^_tMPLLo-C%C97Hr$kQCB8wqD!mMvLA=`qm{^+F%u9k1_p>@PF+&p0dR0Je0ZBD3 zfrmn^9xCq*&RX)$0hL$_!P2Pmm6hhwVx(T&JJovTa_CevOo<4OE{*M1U+cEDvMQjm zfF)LemteVAw^@Xe1ti-PN$5AX^OMFcYjT!XG#fKn+q2(bU|c*eq>$mNYz+^7d5o=&HfA?=P;MQt4kq38@fd z5kKT3Ys|EE$n8Bd?IYS?Uzgl6BKPjlY2|lYgPu2oo*pcO`*tNrG!mxz<7?@Z!LOl{ zFnLQ;J@mCT?JdmO{0{vF8J}W z>0|xDPVYZc4x5HSiR-X0*WMx{-m8ZqoTBzNC6beh*^m|H{ASEiISI!-gKNgqeMfFu zmt|}?QegRcu@%qIrqpGiS72}t0lsuSzEs&C&I+FkyvSAPvhk!n$d2tbGhM*%nj zFt~m$JE{3_=Dr`#zaQ9DdUP=sxZ%Pu{QMbk{%sU_8$ljj;W2OjsQ$ti`M+PupEO-Y zvJ{2)B*u*`j7UsNBA7yVBs_m(Ie!IZQbCyPyIQ$1aOTg^KX#VRefe2gFM`m8nZ&rU zg($0d0V@!Bk>*hwwFy@y?&SPUlur}kb9`c~UB0n((sXl6(X#VpR?6ppZWQM?(K04d z=ETYe+)sAQeY5F@k+ime;R=o-p5Wg%iu1Qour>m=$N9(&!|V%pUSIX#?8)!A$0+Cj Xwoy+kAR{&yH*c<}4wjze6uJKfvbUe^ literal 0 HcmV?d00001 diff --git a/data/messages.ser b/data/messages.ser new file mode 100644 index 0000000000000000000000000000000000000000..b28d91bf76ec589c081b7bd3b3a869d9667739e3 GIT binary patch literal 2544 zcmbtTYfKzf6uvAE7b%EqsV&uJm6{5K85Yvj2B>bAb+gN$wLEN%7$-1+G5d1oq61OV zR!D`VhBT zXU@InyWjVnbB5+Yvfu^xyvV-HQq7QeP$sXJZDDu;io4FJD(ddo@q^=>C6c)Yv|QchkFc(;pc;Dvg31II&(b3q=qP?ek@u#MdKOvqqKsr73> zA_MNIZ(?08&H+IIBV*76gH|wT6@w-iw3!?)VZdEZ0%vx+pu8zSpkokq+QGUS=_)95 zX_Sv8H4B^ypmC^|4IpD@3Ufrscj?MpN#Am(D@Z2dZ#EdFGp6qm-A;{g&|YAW4)*D#qwV4L9)qmt;dqLJSoUR|S-odge*w$UDsl*y z819%G15yOY!e&`XVceZkg)?N4S|n2S=@y*8Zif&y}_vF9};sn{ia0 zA)vvdq(NlTaWG9uoQtdkVBnXp3I|)Q35}l?l)lzvJGq=uMF>f!!Y5$(1pKd25EmjV zK_1O`d$w(2?TGICix13dOs^tD`X7 z?~SmpAKxhc^GXtphGT?k(cT)dEzWsEB_)<4!_cDxKps{yEokZ~i>uj5w#cRjf)tav z+E#0UAT6e$RFa9}w=Z67?sOSDf>)EJb3)7GG`_2`w4g^+$_g4I}_yb^i)uGVZ0o%wU( zk6q=9Uw&3OfTLt;n4nELYa?g(j;x!?3LLrVSeb1+Qf&Wuxv4SWE&At0fj zYENurYQKGbbWhbYe$zD^Mco#oyBG%}EEolVApj#A7xPlv4(IIq@%;Ot-Q`D@V}X4& zs_?g$nh9=Kkhc@$iF9 zwnS493z01`vqgfDLbfX8TM7B&)017&jcqg5n_C}QdA`ztkcXx85;yn9G;v0{WS2(5-3J%8P^>R(DAVS}+v-j=)f;*@MaaN!cg=XI80RZS; z)uCVc&_i`@CnI{if(tTEK@VjHI(I!UK!$fg0X8w!BJb@Ay~aYU3Im!tO(f`_in9;2}W1h#1z$e^wIc!?e!jKn?VCK zHn76Mb0Vx1?4<$}Z6Mj{R-SyG!@bWGpXxvTd~wV1qKL&*g3XdU12nin8W}q`7HMYE zj=yTpHEfmw>v4~gX^)U^s0Z<~j}0<8au$M|n7gnmDfG;Mb)(;>yE%$2tZzDfmOC4%49)ee7S z9?8kgzGitpQhoy+NP!@m%0!B1+d8F=-r0^(eWbrzY8{pOb{6QR_u3-n9CoKxl}3!18S&% zOVO3k1i~+#J21I&u<1GX>B&R3HoS{+32<+KPuYmW8*%tKT5ATaJ%fM^cdkD5fdAsA zxAMCSw@p~aXwAmRC&y-v4Me&E|6HI!gyHz)c!zXz+mz+j)<@FLS2!rc z|D0GhWT7+`LUUs6gT5`D^WQ%4<7jGo*nCAXA%=-%L+uo-oq+B2JbKeS_rjew)@_(O z`91qMt@*!AY{?RF!C5a|GGe%gCFE5!4lFH?CFKomoX<&WIh?icr}H0#cb6SqE)JMQ zjl<%JVnf?0@^*qec8}k> data; // channelData + // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? + + public BasicChannelService() { + fileChannelRepository = FileChannelRepository.getInstance(); + data = fileChannelRepository.getChannels(); + } + + public static BasicChannelService getInstance() { + return instance; + } + + @Override + public Channel createChannel(User user, String channelName) { + return fileChannelRepository.createChannel(user, channelName); + } + + @Override + public void addUserToChannel(User user, Channel channel) { + fileChannelRepository.addUserToChannel(user, channel); + } + + @Override + public void leaveUserFromChannel(User user, Channel channel) { + fileChannelRepository.leaveUserFromChannel(user, channel); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + fileChannelRepository.updateChannelName(user, channel, newName); + } + + @Override + public void deleteChannel(User user, Channel channel) { + fileChannelRepository.deleteChannel(user, channel); + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + fileChannelRepository.updateHostUser(oldHostUser, channel, newHostUser); + } + + @Override + public void printAllChannels() { + System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); + data.forEach(channel -> System.out.println(channel.getChannelName())); + } + + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수 %d%n", channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채절 주인: '%s', 채널 내 유저 들=%s%n", channel.getHostUser().getUserName(), channel.getUsers()); + //System.out.println(channel.toString()); + } + + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + + channel.getUsers().forEach(u -> System.out.println(u.getUserName())); + } + +} 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 new file mode 100644 index 000000000..0b61a3edf --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java @@ -0,0 +1,83 @@ +package com.sprint.mission.discodeit.service.basic; + +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.entity.UserStatus; +import com.sprint.mission.discodeit.repository.file.FileMessageRepository; +import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.service.jcf.JCFMessageService; + +import java.util.ArrayList; + +public class BasicMessageService implements MessageService { + private static BasicMessageService instance = new BasicMessageService(); + private final FileMessageRepository fileMessageRepository; + private final ArrayList data; + + public BasicMessageService() { + fileMessageRepository = FileMessageRepository.getInstance(); + data = fileMessageRepository.getMessages(); + } + + public static BasicMessageService getInstance() { + return instance; + } + + @Override + public Message createMessage(User user, Channel channel, String contents) { + return fileMessageRepository.createMessage(user, channel, contents); + } + + @Override + public void deleteMessage(User user, Message message) { + fileMessageRepository.deleteMessage(user, message); + } + + @Override + public void updateMessage(User user, Message message, String newContents) { + fileMessageRepository.updateMessage(user, message, newContents); + } + + @Override + public void printMessagesByChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", + channel.getChannelName(), channel.getMessages().size()); + data.stream() + .filter(message -> message.getChannel().equals(channel)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", + message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printMessage(Message message) { + if(message == null) { + System.out.println("메세지가 null 입니다."); + return; + } + System.out.printf("메세지 ID: %s 의 정보를 출력합니다.%n", message.getId()); + System.out.println(message.toString()); + } + + @Override + public void printAllMessage() { + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() + .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .toList().size()); + data + .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + } + + @Override + public void printAllMessageByUser(User user) { + System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", + user.getUserName(), user.getMessages().size()); + user.getMessages() + .forEach(message -> System.out.printf("내용: %s%n", message.getMessageContents())); + } +} 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 new file mode 100644 index 000000000..7b557e2c8 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java @@ -0,0 +1,77 @@ +package com.sprint.mission.discodeit.service.basic; + +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.file.FileUserRepository; +import com.sprint.mission.discodeit.service.UserService; + +import java.util.ArrayList; +import java.util.Optional; + +public class BasicUserService implements UserService { + private static final BasicUserService instance = new BasicUserService(); + private final FileUserRepository fileUserRepository; + private final ArrayList data; + + public BasicUserService() { + fileUserRepository = FileUserRepository.getInstance(); + data = fileUserRepository.getUsers(); + } + + public static BasicUserService getInstance() { + return instance; + } + + @Override + public User createUser(String userName) { + return fileUserRepository.createUser(userName); + } + + @Override + public void updateUser(User user, String newName) { + fileUserRepository.updateUser(user, newName); + } + + @Override + public void deleteUser(User user) { + fileUserRepository.deleteUser(user); + } + + @Override + public void restoreUser(User user) { + fileUserRepository.restoreUser(user); + } + + @Override + public void printActiveUsers(){ + // status를 판별하는 식을 추가 + System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(UserStatus.ACTIVE)) + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printUser(User user) { + System.out.print("단일 유저 조회\n"); + System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + } + + @Override + public void printAllUsers() { + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); + data + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } + + @Override + public void printDeactivatedUsers() { + System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE))).toList().size()); + data.stream() + .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE)) // getStatus는 boolean 값이므로 equal 생략 + .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); + } +} From cd30ba1c9e0aeb697b9c9bf6cde0c217d1b55f09 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Wed, 11 Jun 2025 14:47:30 +0900 Subject: [PATCH 11/16] =?UTF-8?q?basic=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 34 +++++++++--------- build.gradle | 5 --- data/channels.ser | Bin 2524 -> 1674 bytes data/messages.ser | Bin 2544 -> 1684 bytes data/users.ser | Bin 2524 -> 1674 bytes .../repository/jcf/JCFChannelRepository.java | 1 - .../service/basic/BasicChannelService.java | 6 ---- .../service/basic/BasicMessageService.java | 1 - .../service/basic/BasicUserService.java | 2 -- .../discodeit/\353\251\224\353\252\250" | 29 --------------- 10 files changed, 17 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 869d741f3..ac1f380c3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,28 +16,28 @@ out/ !**/src/main/**/out/ !**/src/test/**/out/ .idea - +### ### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ +#.apt_generated +#.classpath +#.factorypath +#.project +#.settings +#.springBeans +#.sts4-cache +#bin/ +#!**/src/main/**/bin/ +#!**/src/test/**/bin/ ### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ +#/nbproject/private/ +#/nbbuild/ +#/dist/ +#/nbdist/ +#/.nb-gradle/ ### VS Code ### -.vscode/ +#.vscode/ ### Mac OS ### .DS_Store \ No newline at end of file diff --git a/build.gradle b/build.gradle index 84dbf9536..7cbfc11b8 100644 --- a/build.gradle +++ b/build.gradle @@ -21,11 +21,6 @@ application { } -javafx { - version = "21.0.1" // 사용 중인 JavaFX SDK 버전에 맞게 조정 - modules = [ 'javafx.controls', 'javafx.fxml' ] // 필요한 모듈만 적으면 됨 -} - test { useJUnitPlatform() } diff --git a/data/channels.ser b/data/channels.ser index f0adf530cdc18d4f66bce12195485170e950f721..815167f93c0cf0c179e2352ad325263ab798df3e 100644 GIT binary patch delta 340 zcmca3+{HV=h@GjNg@J*AX|e*d#>PZJM($=8YX%0!>9Ih1axJ5cKJocNU&5wBx z{m+6d5u7}W-C(i=iwV$RH>h$qi1J4Ec|R|&EQy?)B*Z>*i5KtWT$b}dRT)rK84y*i z9j<=AisIsnxA7m2sB~F7IhNH8sLBee$_k=t+wI;1Qkz^kmsQ+P**4oJW3m{h4p3Dw gR8=uV)yf5*cYonhZ`OQN!?eA@+kLViTLohU0LAiq?EnA( delta 854 zcmeC;y(2uqh@GXJg@J*AWwHXZ#>PZJMs7#FXABIC(_?}3fnAjWa@t}cx>L5f z?b-R!{lesvjK>un^%g)CEhsKzsAJ$Za&rnsLA*#0UO}ksSQ+mD7gU5<@nH*~-KW5GZ zs`>y`^#P)4DogB^^Um9}v^BrDFM93zYjQ5jc|}KkA&4q{A&9E^Px872Bl%XY*`T@F zcCDBHa5$mYb&GjkKLZ{)jIhIs}9gCDX3XePcH}wg-*1V-XIDC%dcd#fh#u%7D z5jS~16I(q*Kg;p z=5Np)_kRKAA~$?Zvh diff --git a/data/messages.ser b/data/messages.ser index b28d91bf76ec589c081b7bd3b3a869d9667739e3..573fdad5e8e11d58d226f0786479fea70cbacfb5 100644 GIT binary patch delta 338 zcmew$JcW0H5j#sc3j+fK%SKCQM($=8HwFgA>9Ih1ayz4qKqLFSpO;sbL{3f;VxPIh zi+7@>#^m3O1&Yls)=+iU#f1!Y44j?Md%EZRa_({woM|%kr2E{-h3pcOmoTkYY|}nHKR{I(P*oWaRjnPa ze!q(1;)}QOAC9PWSvy&W)eWf13aZKqqH5di-UCvbTsfCj+)vpy+b3i4dk!6-s$!_B eVu-4h3qJ4u!lmA<`KX3zdxN+89(_?}3#vEH8k2uB7AQLEJ%g%yR$RzX$H2L(GC)pSEJSz8Hn%-HKe}I-+{1JnsA>UJ)dGmB z6-xqb4y`;EV^g=?`n9{G-Q*Hx1)!=|P*txWs+PY$Yp}A)oiTl%u1#%*=K-Ku5|hs| zD*{!1hN}DwQMrY0+TFUH((8pDJXXBR-Mazv!eRvCM}1A1Jl9u&L+P<6^M8lryp^RWGx9v_7e;s7pMeap zoGij(U};u?ZVuS+3WP9{>kUD2wiO^!Ve(xTB_l%=ORJ!kR)Ix1x8L5=_2zHT9ru3$ z<{~$Ib3odRCmXUlD*7yShbnc4DBUliTH)RE9YUSEonL@rTg_)_Csb7@L{)Er z6$#sl20xJu*{Jph_ z>ElH~`-QAW{l88=#kg0o*~J>7$i=$2kfDx&v-5dR_ncqOT`qz%O{Si7pF8;@o9yJH zOq!t zs9L$;^X@NP>dl&uYM8b+c)L$t&vFl_$^oj%0itSO*h_NJnq*H^oqpf uW2}lmuXsXLdO}og4g71jWVw0lH%Xfx^B(%21$jk%ay+NOWLq{L#tHyM(1b() delta 863 zcmeC;y(2uqh?}LHg@J*ArMQSeWAZ&lm5qr)jNFcT3m6y}r^f>6$#sl20xOmT+8kPW zEXJm8yY*{#N4v?V822hV>OF%hdRAP>P{+Wzt1>`NTP#F($~Lz>J3qQ#n7ocvV)6l| z9YB>IpejE=R8D1y-E!V}o0hib7xzW4U4KoU$?T};s4oOjr7r|gHUCLow_qgS$~7A_ zSKF@j@}K;h*$rsc6R25FAgboxCXXR=msPSTmV}tuX^E#ROL9vs4*ILp1Du9=6}qC+u4DmiFNAIga1K zqQF3BU;>9d6PV8f)#C}HA$oh)%Uuv%u3-;FLmP9OAL4vH_6$@7>Ej3CCqv{ga1RYA0EzrCmH&EKFq z?*9VJMQ-@!fVE9xaa8nK>JC-u4pF&ZLbbxX=f@R?hdYEicRRlT#e$m8(oU$VPKc`B z0?WV7pX0cGNvnT8aNoxs;*2dU7D;v$AhvP|1NWdwL8VT zJtH?|+&W?O?S;`D_h%r}-6!+185kQPtY-uVGb7mg3WP8;4ne{eAi{fc0h data; // channelData - // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? public JCFChannelRepository() { data = new ArrayList<>(); 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 784e4f4c7..053845c40 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,16 +1,10 @@ package com.sprint.mission.discodeit.service.basic; 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.entity.UserStatus; import com.sprint.mission.discodeit.repository.file.FileChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; -import com.sprint.mission.discodeit.service.file.FileChannelService; -import com.sprint.mission.discodeit.service.file.FileMessageService; -import com.sprint.mission.discodeit.service.jcf.JCFChannelService; -import java.io.*; import java.util.ArrayList; public class BasicChannelService implements ChannelService { 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 0b61a3edf..0ff1eed7a 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,7 +6,6 @@ import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.file.FileMessageRepository; import com.sprint.mission.discodeit.service.MessageService; -import com.sprint.mission.discodeit.service.jcf.JCFMessageService; import java.util.ArrayList; 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 7b557e2c8..ca20bce0b 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,13 +1,11 @@ package com.sprint.mission.discodeit.service.basic; -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.file.FileUserRepository; import com.sprint.mission.discodeit.service.UserService; import java.util.ArrayList; -import java.util.Optional; public class BasicUserService implements UserService { private static final BasicUserService instance = new BasicUserService(); diff --git "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" index 8085f2808..e69de29bb 100644 --- "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" +++ "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" @@ -1,29 +0,0 @@ -JCFUserRepository 에서는 data를 다뤄야 할 것 같음 -정확히는 data만 -print는 전부 안쓰는 방향으로 가야할 것 같아 -보여주는 것을 원하는 요구사항은 아니였음 - -FileUserRepository 에서는 data를 파일로 저장하는 것과 -초기에 파일을 불러와서 그 정보를 data에 저장하는 것 - -아마 지금 서비스가 레포지터리의 기능도 포함하고 있기 때문에 코드를 두 번 짜는 것이라 느껴지는 것 같음 -원래는 서비스와 레포지터리를 분리해서 코딩해야하지만 교육을 위해서 일단 서비스 모든 기능을 다 넣은 것 같음 -그래서 지금와서 레포지터리를 만들라고 해서 이상하게 느껴지는 듯 - -파일에서는 JCF에서 데이터를 받아와서 저장 -JCF는 data를 변경하는 것 - -파일에서의 data와 JCF에서의 data는 동일해야 할 것 - -- 06/10/ 18:46 - -레포지터리 인터페이스에 뭐가 있어야 하지? - -JCF와 File에서 공통으로 쓰는 것 -그럼 그것이 뭐가 있는지? - -data에 유저 추가 및 삭제 등 - -File에만 따로 저장하는 로직이 있을 것 -JCF에 있는 것은? -뭐가 있어야 하지? \ No newline at end of file From 6d5d423c88373df32c9158bb7a108970c26d5301 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 12 Jun 2025 17:57:44 +0900 Subject: [PATCH 12/16] =?UTF-8?q?basic=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/channels.ser | Bin 1674 -> 0 bytes data/messages.ser | Bin 1684 -> 0 bytes data/users.ser | Bin 1674 -> 0 bytes .../mission/discodeit/entity/Channel.java | 19 +- .../mission/discodeit/entity/Message.java | 4 +- .../sprint/mission/discodeit/entity/User.java | 13 +- .../discodeit/factory/ServiceFactory.java | 22 +- .../repository/ChannelRepository.java | 3 + .../repository/MessageRepository.java | 3 + .../discodeit/repository/UserRepository.java | 8 +- .../file/FileChannelRepository.java | 318 ++++++++-------- .../file/FileMessageRepository.java | 197 ++++++---- .../repository/file/FileUserRepository.java | 200 ++++++---- .../repository/jcf/JCFChannelRepository.java | 5 + .../repository/jcf/JCFMessageRepository.java | 5 + .../repository/jcf/JCFUserRepository.java | 7 + .../discodeit/run/JavaApplication.java | 356 +++++++++++------- .../run/TestJCFServiceApplication.java | 2 +- .../mission/discodeit/run/TestRepository.java | 2 +- .../service/basic/BasicChannelService.java | 34 +- .../service/basic/BasicMessageService.java | 35 +- .../service/basic/BasicUserService.java | 30 +- .../discodeit/\353\251\224\353\252\250" | 3 + 23 files changed, 736 insertions(+), 530 deletions(-) delete mode 100644 data/channels.ser delete mode 100644 data/messages.ser delete mode 100644 data/users.ser diff --git a/data/channels.ser b/data/channels.ser deleted file mode 100644 index 815167f93c0cf0c179e2352ad325263ab798df3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcma)6S!fec6up_GZECgJO5IS5`r$rfs-Rd=YZ4`OtVpfsN0qS|nvrHP??tB~QnjJl zRw$_0YFZ)`OQ3$Zv=&?tL_|-X70Ru?>Xn5H+@5p zgCa0?hqO!Lqgbiu%Oeq~K~xY{_dl4@c}wcDg2f9qr0kK^FaU77ZRD;e&8-aucodE( zLCgmfgp^Q__bI40;$J{uCNBqVz%pUE@qlaTx%&VjW8@@pfqgk@hj)}NzcAA1&oQ+yc4 z3~OIq?RA$C^(-f94!X5!8&hIZ4U?8iCqgd55{~LZFUWd8RWyT)iOhhEpVYFd=XMK#*ka?+UVWn z!B8;l5TzBcQZHBukjXS?^7R{h{fuwykf-u%Wa~CGF#5*k2KQNm??UasSuGKFq}me> zEuPR4jepLdHLlMfL!74tM;hgqnk#EF@Z`w#N#{NJXVmAufm0%DP6<(*keQKbVgkg( zjErK46-y@GU4B1e=E2!7_i~pS*RC-zJ5v|>U-$Q=+T;I+oHh+l5@%6gPWwehdamYW OFd4of+Y2)}Me0xW!&@r= diff --git a/data/messages.ser b/data/messages.ser deleted file mode 100644 index 573fdad5e8e11d58d226f0786479fea70cbacfb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1684 zcma)5YiLtv7=Ck-wyAArjdZM{7~DW>@f_0)9Cl3GB$jq(6{!{dQRS>TBu8>H-xqf} zhE#2+wiOC0wp&^b!%J(y3&I#8Y>3MKctP~fz?{Ow%e)}^T~02YPI7*n@A^L9 z^E~hSPR&6HioxRD%3ei`V=X8)#bQd2tRbxLzp-reiZW&eODour_JgWN0l@aXjs8hc zeRm`zqG(JDV=<&5q(#D_Pea`ipQ>R|4Py=Wh~KIRDSmbK&Uu%&bX!sYs|;n`0VNz( zgBaGx1ViE&l8GVZFeHv4x%u@*85V{(oI4W60Z-9|kIVli@>6{LEZvZbHemmu{9Rn!LM-7!_cs;>!?c|7Xla~TB9hoPENr0zZ9dE*Fn#w>`2`FD4zm)>B6Y>-;q#45uZB@l)#&q>f*I$7zjpPaeY%)}snQ2!->K@ofx9kD(81;y*OUT+x z0r9@3Kv=G9i2WthenjtA>hxb~%52Pz?5zCo-$R4Rm+k@2qR}soUu_w~@bSZ$A>*gC zG1<4qWsHqDjZ=M@zF`+pw5pioP?jS#e|*w^*LjP{v72%@mjdpLn+&B0D>zP+tS!1y zI#>h|X{RD{J{9V8zv4RGuei?ip0lrSofaNlU$o(ulHWH!WxJ$@KwzyTP%>3)v%)lJ zV|L^Km-b#<-tSIa`^WQU%5tT>|No3?ph%7!yoJGA*jg|VTeBlap5F5M>xs#AUC(O2 zdOm)C^Pd!;216Y;zJcaoE-_>bOw0|;Iy32GM&GP4+3Ru|&uaC3MfMv_DYu*&Mn4AtX;$7XwChE0I3D6h{4k24w8_1-b( z5}Wcai43sXgkPT>`7<-Ok6d1I+FSmse$O}av&h-s+T3ulP diff --git a/data/users.ser b/data/users.ser deleted file mode 100644 index 1f1824d158a34909bb71cf5325dbc2d644ad6960..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcma)6TSyd97(P4eHSMBZDCx4)gIPG!T2N$Ey1T{NW`rsAU@^IaJKl!yQ5^WFLUPnGw1*Q@B9A$^o@g5 z=m+zUh{r@efaE&9#P1jD9Wq49sgY%&M`D)|80;Vg$|oen2LRxXr;sN;w7SOY=Aq9o zdl2uIA(Xuy-YLTxuTzo{FL{uR>iJ42`8yXrS={`_G|GV#2gs;#i5`zs2N784Ag}^~ z6%w$;_!qYXp;#-yqo4s89Uu)N5e4vpbq)+EFi1gz6cUgEgA@p41wBD>1@Nw1bV~^2 zGPpX?Q!7*;Ty|}-;s<;(EJ{Tv*(jl$09;9L& zT^O7wi@=(sU6{ekRN@CSRw1d=m=@OJ_)5QJp8e3?7XD>vwdRC2TztH<3xP#rgYD|& zsM_09XjZ#AP3n!NSW}0YHH`3-bVqKHszMJ*g(CcBdEv<@p>Hz5)cLWNP;;HF} zsm|5f*5dUb+={d)tXv9VOv;=+jqnbQ@D4`!RC@Q%7g2QJ{Ndd6P*2%xa$pVu1sYAl zcs$syw)Tv-4w+)n3u@Dl+S^!UQoDn(ww731k1j;6mf00w8A7ndR{qO>@DLoF`(S^) z^}2?zUOjzXjf73Hj)+MON7P8;-&k#7jHN^IG$E&@-yB~V%;2kY_w)K~nb(xJ&cQ1V z7mbp>1k@X#BmxE+FwlLxW~e2DELk-2dHBn${4)jbPja^#ckR?_Hpgxbj1Ba~I>P@i zIUx>D4(2HhNsc?|b9RH!!tn#whwlnDtmFdWZJvO8>PH^}X(g6@_9`0!S$eA$5#Z%I zXYKYR(F|4-C7P|#-X32W{d>pmu4uLdpMA7W_8A_PH~(u2D2hG>GYMwne`r^40K)^B#Y|dDRdW*Z)@oYtePef9pOCX E53B@RAOHXW 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 f40967ecf..fa29179fa 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java @@ -46,6 +46,13 @@ public void addMessage(Message message) { } public void addUser(User user) { + for (User u : users) { + if (u.getId().equals(user.getId())) { + // 같은 걸 찾믕 + //System.out.println("동일 유저가 안에 있네요"); + return; + } + } if (!users.contains(user)) { users.add(user); user.addChannel(this); @@ -83,12 +90,12 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("Channel{") .append("channelId=").append(getId()) - .append(", channelName='").append(channelName).append('\'') - .append(", hostUserId=").append(hostUser.getId()) - .append(", createdAt=").append(getCreatedAt()) - .append(", updatedAt=").append(getUpdatedAt()) - .append(", messageIds=").append(messages.stream().map(Message::getId).toList()) - .append(", userIds=").append(users.stream().map(User::getId).toList()) + .append("\nchannelName='").append(channelName).append('\'') + .append("\nhostUserId=").append(hostUser.getId()) + //.append("\ncreatedAt=").append(getCreatedAt()) + //.append("\nupdatedAt=").append(getUpdatedAt()) + .append("\nmessageIds=").append(messages.stream().map(Message::getId).toList()) + .append("\nuserIds=").append(users.stream().map(User::getId).toList()) .append('}'); return sb.toString(); } 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 504de6d8b..78e330f52 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/Message.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/Message.java @@ -44,8 +44,8 @@ public String toString() { "\nmessageContents='" + messageContents + '\'' + "\nuser=" + user.getId() + "\nchannel=" + channel.getId() + - "\ncreatedAt=" + getCreatedAt() + - "\nupdatedAt=" + getUpdatedAt() + + //"\ncreatedAt=" + getCreatedAt() + + //"\nupdatedAt=" + getUpdatedAt() + '}'; } } 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 cc4e87777..8475fe42c 100644 --- a/src/main/java/com/sprint/mission/discodeit/entity/User.java +++ b/src/main/java/com/sprint/mission/discodeit/entity/User.java @@ -29,7 +29,16 @@ public ArrayList getChannels() { } public void addChannel(Channel channel) { + for (Channel c : channels) { + if(c.getId().equals(channel.getId())) { + // 같은 걸 찾믕 + System.out.println("동일 채널이 안에 있네요"); + return; + } + } + if(!channels.contains(channel)) { + System.out.println("1231231"+channel.getUsers()); channels.add(channel); channel.addUser(this); } @@ -54,6 +63,7 @@ public void addMessage(Message message) { public void removeMessage(Message message) { if(messages.contains(message)) { + System.out.println("메세지 삭제 성공적 유저 에서"); this.messages.remove(message); message.getChannel().getMessages().remove(message); } @@ -87,7 +97,8 @@ public String toString() { "\nuserName='" + userName + //", createdAt=" + getCreatedAt() + //", updatedAt=" + getUpdatedAt() + - "\nchannels=" + channels.stream().map(channel -> channel.getId()).toList() + + //"\nchannels=" + channels.stream().map(Channel::toString).toList() + + "\nmessages=" + messages.stream().map(Message::toString).toList() + '}'; } } \ No newline at end of file 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 f48f44670..a2cf6bdc7 100644 --- a/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java +++ b/src/main/java/com/sprint/mission/discodeit/factory/ServiceFactory.java @@ -1,5 +1,8 @@ package com.sprint.mission.discodeit.factory; +import com.sprint.mission.discodeit.repository.ChannelRepository; +import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; @@ -35,17 +38,14 @@ public static ServiceFactory getInstance() { } private ServiceFactory() { + /* userService = JCFUserService.getInstance(); channelService = JCFChannelService.getInstance(); messageService = JCFMessageService.getInstance(); fileUserService = FileUserService.getInstance(); fileChannelService = FileChannelService.getInstance(); - fileMessageService = FileMessageService.getInstance(); - - basicUserService = BasicUserService.getInstance(); - basicChannelService = BasicChannelService.getInstance(); - basicMessageService = BasicMessageService.getInstance(); + fileMessageService = FileMessageService.getInstance();*/ //sprint2에서는 안 쓰는 코드 } public UserService getUserService() { @@ -70,13 +70,13 @@ public FileMessageService getFileMessageService() { return fileMessageService; } - public BasicUserService getBasicUserService() { - return basicUserService; + public BasicUserService getBasicUserService(UserRepository userRepository) { + return new BasicUserService(userRepository); } - public BasicChannelService getBasicChannelService() { - return basicChannelService; + public BasicChannelService getBasicChannelService(ChannelRepository channelRepository) { + return new BasicChannelService(channelRepository); } - public BasicMessageService getBasicMessageService() { - return basicMessageService; + public BasicMessageService getBasicMessageService(MessageRepository messageRepository) { + return new BasicMessageService(messageRepository); } } 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 2640e2b55..02c52c438 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java @@ -4,6 +4,7 @@ import com.sprint.mission.discodeit.entity.User; import java.util.ArrayList; +import java.util.List; public interface ChannelRepository { Channel createChannel(User user, String channelName); @@ -12,4 +13,6 @@ public interface ChannelRepository { void leaveUserFromChannel(User user, Channel channel); void updateChannelName(User user, Channel channel, String newName); void updateHostUser(User oldHostUser, Channel channel, User newHostUser); + + List getAllChannels(); } 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 593bcdfc3..774103b8d 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java @@ -5,9 +5,12 @@ import com.sprint.mission.discodeit.entity.User; import java.util.ArrayList; +import java.util.List; public interface MessageRepository { Message createMessage(User user, Channel channel, String contents); void deleteMessage(User user, Message message); void updateMessage(User user, Message message, String newContents); + + List getMessages(); } 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 7e311fffc..1e15a686e 100644 --- a/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java @@ -1,13 +1,15 @@ package com.sprint.mission.discodeit.repository; -import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; -import java.util.ArrayList; +import java.util.List; public interface UserRepository { + + User createUser(String userName); void updateUser(User user, String newUserName); void deleteUser(User user); void restoreUser(User user); - User createUser(String userName); + + List getUsers(); } 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 69f1e83dd..db839e3bc 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,6 +1,7 @@ package com.sprint.mission.discodeit.repository.file; 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.entity.UserStatus; import com.sprint.mission.discodeit.repository.ChannelRepository; @@ -8,229 +9,204 @@ import java.io.*; import java.util.ArrayList; +import java.util.List; public class FileChannelRepository implements ChannelRepository, Serializable { + private static final String CHANNEL_FILE_PATH = "./data/channels.ser"; private static final FileChannelRepository instance = new FileChannelRepository(); - private final ArrayList data; - - public FileChannelRepository() { - this.data = loadChannels(); - } - public ArrayList getChannels() { - return data; - } + public FileChannelRepository() {} public static FileChannelRepository getInstance() { return instance; } - public void saveChannels(){ - System.out.println("채널 리스트 저장"); - String filePath = "./data/channels.ser"; + private List loadChannels() { + File file = new File(CHANNEL_FILE_PATH); + if (!file.exists() || file.length() == 0) { + return new ArrayList<>(); + } - // ArrayList 직렬화및 저장 - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { - oos.writeObject(data); - System.out.println("Channel 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { + return (List) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } + + public void saveChannels(List channels) { + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(CHANNEL_FILE_PATH))) { + oos.writeObject(channels); } catch (IOException e) { e.printStackTrace(); } - - FileUserRepository.getInstance().saveUsers(); //채널을 변경하면 유저도 변경되니까 유저 파일도 변경 } + + @Override + public Channel createChannel(User user, String channelName) { + if (user.getStatus() == UserStatus.DEACTIVE) return null; - public ArrayList loadChannels(){ - ArrayList deserializedChannels = null; - System.out.println("채널 리스트 불러오기"); - String filePath = "./data/channels.ser"; // 유저 직렬화 - - if (!new File(filePath).exists() || new File(filePath).length() == 0) { - return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 - } + List channels = loadChannels(); + Channel channel = new Channel(user, channelName); - // ArrayList 역직렬화및 반환 - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { - deserializedChannels = (ArrayList) ois.readObject(); + channel.addUser(user); + channels.add(channel); + + saveChannels(channels); - /* - System.out.println("역직렬화된 Channel 리스트 정보:"); + List users = FileUserRepository.getInstance().getUsers(); - for (Channel channel : deserializedChannels) { - System.out.println("------------"); - System.out.println("Channel: " + channel.toString()); - }*/ - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); + for (User userFromFile : users) { + if(userFromFile.getId().equals(user.getId())) { + System.out.println("\n1231412 - 1"+channel+"\n"); + userFromFile.addChannel(channel); // 여기가 문제네, 중복 뭔데 왜 중복제거 안하는데 + System.out.println("\n1231412 - 2"+channel+"\n"); + break; + } } - return deserializedChannels; + + FileUserRepository.getInstance().saveUsers(users); // 채널을 생성하면 자동으로 유저 정보도 재저장 + // 무한루프 이거 어떻게 해결할 수 있을까?? + return channel; } @Override - public Channel createChannel(User user, String channelName) { - if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널을 생성할 수 없습니다.", user.getUserName()); - return null; - } - Channel channel = new Channel(user, channelName); - data.add(channel); + public void deleteChannel(User user, Channel channel) { + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + channels.removeIf(ch -> ch.getId().equals(channel.getId()) && ch.getHostUser().getId().equals(user.getId())); + + // 유저 리스트에서 해당 유저 찾아서 채널 삭제 및 메시지 삭제 + List users = FileUserRepository.getInstance().getUsers(); + users.stream() + .filter(u -> u.getId().equals(user.getId())) + .findFirst() + .ifPresent(userFromFile -> { + userFromFile.removeChannel(channel); + userFromFile.getMessages().removeIf(message -> message.getChannel().getId().equals(channel.getId())); + }); - System.out.printf("채널 생성 - 채널 주인: %s, 채널 이름: %s, 채널 ID: %s%n", - user.getId(), channelName, channel.getId()); - user.addChannel(channel); - - saveChannels(); - return channel; + // 메시지 리스트에서 해당 채널과 관련된 메시지 모두 삭제 (removeIf 사용) + List messages = FileMessageRepository.getInstance().getMessages(); + messages.removeIf(message -> message.getChannel().getId().equals(channel.getId())); + + // 메세지는 어떻게하지? 메세지 전부 삭제 + saveChannels(channels); + FileUserRepository.getInstance().saveUsers(users); + FileMessageRepository.getInstance().saveMessages(messages); } @Override public void addUserToChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널에 입장 할 수 없습니다.", user.getUserName()); - return; // 메서드 종료 + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + for (Channel ch : channels) { + if (ch.getId().equals(channel.getId()) && + ch.getUsers().stream().noneMatch(u -> u.getId().equals(user.getId()))) { + + ch.addUser(user); + break; + } } - if(channel.getUsers().contains(user)) { - System.out.printf("'%s'는 '%s' 채널에 이미 존재합니다.", user.getUserName(), channel.getChannelName()); - return; + + List users = FileUserRepository.getInstance().getUsers(); + for (User userFromFile : users) { + if(userFromFile.getId().equals(user.getId())) { + userFromFile.addChannel(channel); + break; + } } - System.out.printf("'%s' 에 '%s' 이 입장했습니다.%n", channel.getChannelName(), user.getUserName()); - channel.addUser(user); - user.addChannel(channel); - saveChannels(); + saveChannels(channels); + FileUserRepository.getInstance().saveUsers(users); } @Override public void leaveUserFromChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태 입니다.", user.getUserName()); - return; // 메서드 종료 - } - if(!channel.getUsers().contains(user)) { - System.out.printf("'%s'는 '%s' 채널에 존재 하지 않아서 퇴장할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; // 메서드 종료 - } - System.out.printf("'%s' 유저가 '%s' 채널을 떠났습니다.%n", user.getUserName(), channel.getChannelName()); - channel.removeUser(user); - user.removeChannel(channel); - if (channel.getUsers().isEmpty()) { - System.out.printf("'%s' 채널은 유저 수가 0이므로 삭제합니다.%n", channel.getChannelName()); - data.remove(channel); - } - saveChannels(); + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + channels.removeIf(ch -> { + if (ch.equals(channel)) { + ch.removeUser(user); + return ch.getUsers().isEmpty(); // 유저 다 나가면 삭제 + } + return false; + }); + + List users = FileUserRepository.getInstance().getUsers(); + for (User userFromFile : users) { + if(userFromFile.getId().equals(user.getId())) { + userFromFile.removeChannel(channel); + break; + } + } + + saveChannels(channels); + FileUserRepository.getInstance().saveUsers(users); } @Override public void updateChannelName(User user, Channel channel, String newName) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 채널의 이름을 변경할 수 없습니다.%n", user.getUserName()); - return; // 메서드 종료 - } - if (channel.getHostUser().equals(user)) { - System.out.printf("'%s' 채널의 이름이 '%s' 으로 변경되었습니다.%n", - channel.getChannelName(), newName); - channel.updateChannelName(newName); - } else { - System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", - user.getUserName(), channel.getChannelName()); - } - saveChannels(); - FileMessageRepository.getInstance().saveMessages(); - } - - @Override - public void deleteChannel(User user, Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 이미 비활성 상태입니다. 따라서 '%s' 채널을 삭제할 수 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; // 메서드 종료 - } - if(!channel.getUsers().contains(user)) { - System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; - } - - if (!user.equals(channel.getHostUser())) { - System.out.printf("'%s'는 '%s' 채널의 주인이 아니어서 지울 수 있는 권한이 없습니다.%n", user.getUserName(), channel.getChannelName()); - return; - } - - System.out.printf("채널 삭제: %s%n", channel.getChannelName()); - channel.getMessages() - .stream() - .map(message -> { - message.getUser().removeMessage(message); - return message; + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + channels.stream() + .filter(ch -> ch.getId().equals(channel.getId()) && ch.getHostUser().getId().equals(user.getId())) + .findFirst() + .ifPresent(ch -> ch.updateChannelName(newName)); + + List users = FileUserRepository.getInstance().getUsers(); + users.stream() + .filter(userFromFile -> userFromFile.getId().equals(user.getId())) + .findFirst() + .ifPresent(userFromFile -> { + userFromFile.getChannels().removeIf(ch -> ch.getId().equals(channel.getId())); + userFromFile.getChannels().add(channel); }); - - channel.getUsers() - .stream() - .map(u -> { - u.removeChannel(channel); - return u; - }); - - channel.clearUsers(); - channel.clearMessages(); - data.remove(channel); - - saveChannels(); - FileMessageRepository.getInstance().saveMessages(); // 채널을 변경하면 메시지도 벼경 + saveChannels(channels); + FileUserRepository.getInstance().saveUsers(users); } @Override public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - if(oldHostUser.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", oldHostUser.getUserName()); - return; - } - - if(newHostUser.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s'는 비활성 상태이므로 권한이 없습니다.%n", newHostUser.getUserName()); + if (channel == null || oldHostUser.getStatus() == UserStatus.DEACTIVE || newHostUser.getStatus() == UserStatus.DEACTIVE) return; - } - if(!channel.getUsers().contains(newHostUser)) { - System.out.printf("'%s'는 '%s' 채널에 존재하지 않아서 권한이 없습니다.%n", newHostUser.getUserName(), channel.getChannelName()); - return; + List channels = loadChannels(); + for (Channel ch : channels) { + if (ch.equals(channel) && ch.getHostUser().equals(oldHostUser) && ch.getUsers().contains(newHostUser)) { + ch.updateHostUser(newHostUser); + break; + } } - if (!channel.getHostUser().equals(oldHostUser)) { - System.out.printf("'%s' 은 '%s' 채널 주인이 아닙니다.%n", - oldHostUser.getUserName(), channel.getChannelName()); - return; + List users = FileUserRepository.getInstance().getUsers(); + for (User userFromFile : users) { + if(userFromFile.getId().equals(oldHostUser.getId())) { + userFromFile.getChannels().removeIf(ch -> ch.equals(channel)); + userFromFile.getChannels().add(channel); + break; + } } + // 원하는 채널을 찾고 유저한테서 해당 채널을 지우고 정보가 바뀐 같은 채널을 유저한테 집어 넣음 + + saveChannels(channels); + FileUserRepository.getInstance().saveUsers(users); + } - System.out.printf("'%s' 채널 주인을 변경합니다. 새 주인: '%s'%n", - channel.getChannelName(), newHostUser.getUserName()); - channel.updateHostUser(newHostUser); - - saveChannels(); - FileMessageRepository.getInstance().saveMessages(); + @Override + public List getAllChannels() { + return loadChannels(); } public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); - data.forEach(channel -> System.out.println(channel.getChannelName())); + System.out.printf("전체 채널 조회, 채널 수: %d%n", loadChannels().size()); + loadChannels().forEach(channel -> System.out.println(channel.getChannelName())); + // 테스트용으로 남겨둔 메소드, 레퍼지토리에는 없어야 됨, 개발 중이므로 남겨둠, 나중에 본 메소드 지우기 } } 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 b2072d5c9..0fe1455d5 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 @@ -5,141 +5,192 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; import com.sprint.mission.discodeit.repository.MessageRepository; -import com.sprint.mission.discodeit.service.file.FileMessageService; import java.io.*; import java.util.ArrayList; +import java.util.List; public class FileMessageRepository implements MessageRepository, Serializable { + private static final String USER_FILE_PATH = "./data/message.ser"; private static final FileMessageRepository instance = new FileMessageRepository(); - private final ArrayList data; - public FileMessageRepository() { - this.data = loadMessages(); - } - public ArrayList getMessages() { - return data; - } + public FileMessageRepository() {} + public static FileMessageRepository getInstance() { return instance; } - public void saveMessages(){ - System.out.println("메세지 리스트 저장"); - String filePath = "./data/messages.ser"; + private List loadMessages(){ + File file = new File(USER_FILE_PATH); - // ArrayList 직렬화및 저장 - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { - oos.writeObject(data); - System.out.println("Message 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); - } catch (IOException e) { + if (!file.exists() || file.length() == 0) { + return new ArrayList(); // 해당 파일이 없거나 비어 있다면 빈 ArrayList를 반환 + } + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(USER_FILE_PATH))) { + return (List) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { e.printStackTrace(); + return new ArrayList<>(); } - - FileChannelRepository.getInstance().saveChannels(); } - public ArrayList loadMessages(){ - ArrayList deserializedMessages = null; - System.out.println("메세지 리스트 불러오기"); - String filePath = "./data/messages.ser"; // 유저 직렬화 - - if (!new File(filePath).exists() || new File(filePath).length() == 0) { - return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 - } - - // ArrayList 역직렬화및 반환 - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { - deserializedMessages = (ArrayList) ois.readObject(); - /* - System.out.println("역직렬화된 Message 리스트 정보:"); - - for (Message message : deserializedMessages) { - System.out.println("------------"); - System.out.println("Message: " + message.toString()); - }*/ - - } catch (IOException | ClassNotFoundException e) { + public void saveMessages(List messages){ + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(USER_FILE_PATH))) { + oos.writeObject(messages); + } catch (IOException e) { e.printStackTrace(); } - return deserializedMessages; } @Override public Message createMessage(User user, Channel channel, String contents){ if(channel == null) { - System.out.println("채널이 null 입니다."); + //System.out.println("채널이 null 입니다."); return null; } if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); + //System.out.printf("'%s' 비활성 상태라 메세지를 작성할 수 없습니다.", user.getUserName()); return null; } - System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", - user.getId(), channel.getId(), contents); + //System.out.printf("메세지를 추가합니다. User: %s, ChannelId: %s, Contents: %s%n", user.getId(), channel.getId(), contents); + List messages = loadMessages(); Message newMessage = new Message(user, channel, contents); - data.add(newMessage); newMessage.registerMessageToUserAndChannel(user, channel); + messages.add(newMessage); + + List users = FileUserRepository.getInstance().getUsers(); + + for(User userFromFile : users) { + if(userFromFile.getId().equals(user.getId())) { + userFromFile.addMessage(newMessage); + break; + } + } + + List channels = FileChannelRepository.getInstance().getAllChannels(); + for(Channel channelFromFile : channels) { + if(channelFromFile.getId().equals(channel.getId())) { + channelFromFile.addMessage(newMessage); + } + } + + saveMessages(messages); + FileUserRepository.getInstance().saveUsers(users); + FileChannelRepository.getInstance().saveChannels(channels); - saveMessages(); return newMessage; } @Override public void deleteMessage(User user, Message message){ if(message == null) { - System.out.println("메세지가 null 입니다."); return; } if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 삭제할 수 없습니다.", user.getUserName()); return; } - if (user.getId().equals(message.getUser().getId())) { - System.out.printf("메세지를 삭제합니다. User: %s, MessageId: %s, Contents: %s%n", - user.getUserName(), message.getId(), message.getMessageContents()); - } else { - System.out.printf("'%s' 은 '%s' 메시지 주인이 아닙니다%n", - user.getUserName(), message.getId()); + if (!user.getId().equals(message.getUser().getId())) { return; } - message.getChannel().getMessages().remove(message); // 채널에서 메세지 삭제 - user.removeMessage(message); - data.remove(message); + List messagesFromFile = loadMessages(); + messagesFromFile.remove(message); + for( Message messageFromFile : messagesFromFile) { + if(messageFromFile.getId().equals(message.getId())) { + messagesFromFile.remove(messageFromFile); + break; + } + } + + + List usersFromFile = FileUserRepository.getInstance().getUsers(); + for(User userFromFile : usersFromFile) { + if(userFromFile.getId().equals(user.getId())) { + for( Message messageFromUserFromFile : userFromFile.getMessages()) { + if(messageFromUserFromFile.getId().equals(message.getId())) { + userFromFile.removeMessage(messageFromUserFromFile); + break; + } + } + } + } - saveMessages(); + List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); + for(Channel channelFromFile : channelsFromFile) { + if(channelFromFile.getId().equals(message.getChannel().getId())) { + for( Message messageFromChannelFromFile : channelFromFile.getMessages()) { + if(messageFromChannelFromFile.getId().equals(message.getId())) { + channelFromFile.removeMessage(messageFromChannelFromFile); + break; + } + } + } + } + + saveMessages(messagesFromFile); + FileUserRepository.getInstance().saveUsers(usersFromFile); + FileChannelRepository.getInstance().saveChannels(channelsFromFile); } @Override public void updateMessage(User user, Message message, String newContents){ if(message == null) { - System.out.println("메세지가 null 입니다."); + //System.out.println("메세지가 null 입니다."); return; } if(user.getStatus().equals(UserStatus.DEACTIVE)) { - System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); + //System.out.printf("'%s' 비활성 상태라 메세지를 업데이트할 수 없습니다.", user.getUserName()); return; } if(!user.equals(message.getUser())) { - System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); + //System.out.printf("'%s'는 '%s' 메시지의 주인이 아닙니다. 따라서 해당 메시지를 '%s'로 바꾸는 것은 불가능합니다.", user.getUserName(), message.getMessageContents(), newContents); return; } - System.out.println("메세지를 업데이트 합니다."); - System.out.printf("이전 메세지: %s%n", message.getMessageContents()); - System.out.printf("현재 메세지: %s%n", newContents); - message.updateMessageContent(newContents); + List messagesFromFile = loadMessages(); + for (Message messageFromFile : messagesFromFile) { + if(messageFromFile.getId().equals(message.getId())) { + messageFromFile.updateMessageContent(newContents); + break; + } + } - saveMessages(); + List usersFromFile = FileUserRepository.getInstance().getUsers(); + for (User userFromFile : usersFromFile) { + if(userFromFile.getId().equals(user.getId())) { + // 유저를 찾음 + for(Message messageFromUser : userFromFile.getMessages()) { + if(messageFromUser.getId().equals(message.getId())) { + messageFromUser.updateMessageContent(newContents); + break; + } + } + } + } //이야 화살이 미쳤구만 + // 유저 파일에서 원하는 유저 찾기 -> 유저의 메세지들에서 원하는 메세지 찾기 -> 해당 메세지가 맞다면 변환 + + List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); + for (Channel channelFromFile : channelsFromFile) { + if(channelFromFile.getId().equals(message.getChannel().getId())) { + // 속한 채널 찾음 + for(Message messageFromChannelFromFile : channelFromFile.getMessages()) { + if(messageFromChannelFromFile.getId().equals(message.getId())) { + messageFromChannelFromFile.updateMessageContent(newContents); + break; + } + } + } + } + + saveMessages(messagesFromFile); + FileUserRepository.getInstance().saveUsers(usersFromFile); + FileChannelRepository.getInstance().saveChannels(channelsFromFile); } - public void printAllMessage() { - System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() - .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) - .toList().size()); - data - .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) - .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); + @Override + public List getMessages() { + return loadMessages(); } + } 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 580ae5263..69f973ffb 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,137 +1,181 @@ package com.sprint.mission.discodeit.repository.file; 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.entity.UserStatus; import com.sprint.mission.discodeit.repository.UserRepository; -import com.sprint.mission.discodeit.service.file.FileUserService; import java.io.*; import java.util.ArrayList; +import java.util.List; import java.util.Optional; public class FileUserRepository implements UserRepository, Serializable { + private static final String USER_FILE_PATH = "./data/user.ser"; private static final FileUserRepository instance = new FileUserRepository(); - private final ArrayList data; - public FileUserRepository() { - this.data = loadUsers(); - } - public ArrayList getUsers() { - return data; - } + public FileUserRepository() {} public static FileUserRepository getInstance() { return instance; } - public void saveUsers() { - System.out.println("유저 리스트 저장"); - String filePath = "./data/users.ser"; + public List loadUsers() { + File file = new File(USER_FILE_PATH); - // ArrayList 직렬화및 저장 - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath))) { - oos.writeObject(data); - System.out.println("User 리스트가 직렬화되어 '" + filePath + "' 파일에 저장되었습니다."); - } catch (IOException e) { + if (!file.exists() || file.length() == 0) { + return new ArrayList(); // 해당 파일이 없거나 비어 있다면 빈 ArrayList를 반환 + } + // ArrayList 역직렬화및 반환 + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(USER_FILE_PATH))) { + return (List) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { e.printStackTrace(); + return new ArrayList<>(); } } - public ArrayList loadUsers() { - ArrayList deserializedUsers = null; - System.out.println("유저 리스트 불러오기"); - String filePath = "./data/users.ser"; // 유저 직렬화 - - if (!new File(filePath).exists() || new File(filePath).length() == 0) { - return new ArrayList(); // 해당 파일이 없으면 빈 ArrayList를 반환 - } - // ArrayList 역직렬화및 반환 - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(filePath))) { - deserializedUsers = (ArrayList) ois.readObject(); - - /* - System.out.println("역직렬화된 User 리스트 정보:"); - for (User user : deserializedUsers) { - System.out.println("------------"); - System.out.println("User: " + user.toString()); - }*/ - - } catch (IOException | ClassNotFoundException e) { + public void saveUsers(List users) { + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(USER_FILE_PATH))) { + oos.writeObject(users); + } catch (IOException e) { e.printStackTrace(); } - return deserializedUsers; } @Override public User createUser(String userName) { + List users = loadUsers(); User user = new User(userName); // 직접 생성 - System.out.printf("유저 추가 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); - data.add(user); - saveUsers(); + users.add(user); + saveUsers(users); // 유저 생성은 유저한테만 영향을 미치니까 채널과 메시지는 저장하지 않음 + return user; } @Override public void updateUser(User user, String newName) { - System.out.println("유저의 이름을 변경합니다."); - System.out.printf("변경 전: '%s', 변경 후: '%s' \n", user.getUserName(), newName); + List users = loadUsers(); user.setUserName(newName); - saveUsers(); // 데이터를 바꿀 때 마다 저장 -> 비효율적이라 생각, 나중에 질문 - FileMessageRepository.getInstance().saveMessages(); - FileChannelRepository.getInstance().saveChannels(); - // 유저를 가지고 있는 채널과, 유저를 가지고 있는 메세지들의 데이터가 달라졌으므로 저장 + + for (User userFromFile : users) { + if (userFromFile.getId().equals(user.getId())) { + userFromFile.setUserName(newName); + break; + } + } + + // 채널에 있는 유저 이름 변경 + List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); + + // 채널에 있는 유저의 이름 변경 + channelsFromFile.stream() + .filter(channel -> user.getChannels().stream() + .anyMatch(userChannel -> userChannel.getId().equals(channel.getId()))) + .forEach(channel -> + channel.getUsers().stream() + .filter(u -> u.getId().equals(user.getId())) + .forEach(u -> u.setUserName(newName)) + ); + + List messagesFromFile = FileMessageRepository.getInstance().getMessages(); + + messagesFromFile.stream() + .filter(msg -> user.getMessages().stream() + .anyMatch(userMsg -> userMsg.getId().equals(msg.getId()))) + .forEach(msg -> msg.getUser().setUserName(newName)); + + //users.forEach(u -> System.out.println(u.getUserName())); + + + + saveUsers(users); + FileChannelRepository.getInstance().saveChannels(channelsFromFile); + FileMessageRepository.getInstance().saveMessages(messagesFromFile); } @Override public void deleteUser(User user) { + + List users = loadUsers(); + Optional hostChannel = user.getChannels().stream() .filter(channel -> channel.getHostUser().equals(user)) .findFirst(); if (hostChannel.isPresent()) { - System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n", user.getUserName(), hostChannel.get().getChannelName()); + //System.out.printf("'%s'는 '%s' 채널의 호스트이므로 유저를 삭제할 수 없습니다.\n", user.getUserName(), hostChannel.get().getChannelName()); return; //메서드 종료 } + //System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); + // 직접적으로 유저를 삭제하진 않고 유저의 status를 false로 바꾼다. + for (User userFromFile : users) { + if (userFromFile.getId().equals(user.getId())){ + // 파일내에 있는 유저를 찾는 과정 + userFromFile.setStatus(UserStatus.DEACTIVE); + userFromFile.getChannels().stream() + .map(channel -> { + channel.removeUser(userFromFile); + return channel; + }); + userFromFile.clearChannels(); + + userFromFile.getMessages().stream() + .map(message -> { + message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. + return message; + }); + userFromFile.clearMessages(); + break; + } + } + + //-------------- + List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); - System.out.printf("유저 삭제 \n유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId()); - // 직접적으로 유저를 사제하진 않고 유저의 status를 false로 바꾼다. - user.setStatus(UserStatus.DEACTIVE); - // 유저를 삭제하면 유저가 가지고 있는 모든 채널리스트를 clear - // 유저를 삭제하면 유저가 가지고 있는 모든 메시지들을 초기화 - // 모든 메시지들을 가지고 있는 채널들에선 해당 메세지를 빼야한다. - user.getChannels().stream() - .map(channel -> { - channel.removeUser(user); - return channel; - }); - user.clearChannels(); - // 해당 유저가 채널의 주인이면 유저를 삭제할 수 없어야 한다. - user.getMessages().stream() - .map(message -> { - message.getChannel().removeMessage(message); // 메세지들은 자기고 속한 채널들에서 자신을 지워야한다. !!오류가 날 것 같은 코드, 오류가 나면 이 부분을 의심하자 - return message; - }); - user.clearMessages(); - - saveUsers(); - FileMessageRepository.getInstance().saveMessages(); - FileChannelRepository.getInstance().saveChannels(); - // 채널과 메세지들도 변경되었으니 변경 + user.getChannels().forEach(userChannel -> + channelsFromFile.stream() + .filter(fileChannel -> fileChannel.getId().equals(userChannel.getId())) + .forEach(matchedChannel -> + matchedChannel.getUsers().removeIf(u -> u.getId().equals(user.getId())) + ) + ); + + List messagesFromFile = FileMessageRepository.getInstance().getMessages(); + + messagesFromFile.removeIf(messageFromFile -> + user.getMessages().stream() + .anyMatch(messageFromUser -> messageFromUser.getId().equals(messageFromFile.getId())) + ); + + + saveUsers(users); + FileChannelRepository.getInstance().saveChannels(channelsFromFile); + FileMessageRepository.getInstance().saveMessages(messagesFromFile); } @Override public void restoreUser(User user) { - System.out.printf("'%s' 유저를 복구합니다. %n", user.getUserName()); - user.setStatus(UserStatus.ACTIVE); - saveUsers(); + List users = loadUsers(); + for (User targetUserInFile : users) { + if (targetUserInFile.getId().equals(user.getId())){ + targetUserInFile.setStatus(UserStatus.ACTIVE); + break; + } + } + saveUsers(users); + } + + @Override + public List getUsers() { + return loadUsers(); //서비스에서 사용됨, 사실 loadUsers랑 같은거라 지워도 될듯 } public void printAllUsers() { - System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); - data + System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", this.loadUsers().size()); + this.loadUsers() .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); - //제대로 레포지터리가 작동하는지를 확인하기위한 메소드 + //제대로 레포지터리가 작동하는지를 확인하기위한 메소드, 나중에 코드 완성되면 지우기 } - } 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 8a56b06ef..27c97a167 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 @@ -176,4 +176,9 @@ public void printAllChannels() { System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); data.forEach(channel -> System.out.println(channel.getChannelName())); } + + @Override + public ArrayList getAllChannels() { + return data; + } } 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 87c30081f..c6b6319f6 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 @@ -91,4 +91,9 @@ public void printAllMessage() { .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); } + + @Override + public ArrayList getMessages() { + return data; + } } 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 b85bfe222..6b9d32111 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 @@ -10,6 +10,8 @@ import java.util.Optional; public class JCFUserRepository implements UserRepository { + + private static final String CHANNEL_FILE_PATH = "./data/channels.ser"; private static final JCFUserRepository instance = new JCFUserRepository(); private final ArrayList data; @@ -77,4 +79,9 @@ public void printAllUsers() { .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); //제대로 레포지터리가 작동하는지를 확인하기위한 메소드 } + + @Override + public ArrayList getUsers() { + return data; + } } diff --git a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java index 6cbc1f701..d37812dd2 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java @@ -3,10 +3,19 @@ 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.RepositoryFactory; import com.sprint.mission.discodeit.factory.ServiceFactory; +import com.sprint.mission.discodeit.repository.ChannelRepository; +import com.sprint.mission.discodeit.repository.MessageRepository; +import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; +import com.sprint.mission.discodeit.service.basic.BasicUserService; +import com.sprint.mission.discodeit.service.jcf.JCFUserService; + +import java.io.File; +import java.util.stream.Collectors; public class JavaApplication { public static void main(String[] args) { @@ -15,286 +24,375 @@ public static void main(String[] args) { } public static void testFileService() { - + UserRepository JCFUserRepository = RepositoryFactory.getInstance().getJCFUserRepository(); + UserRepository FileUserRepository = RepositoryFactory.getInstance().getFileUserRepository(); + + ChannelRepository JCFChannelRepository = RepositoryFactory.getInstance().getJCFChannelRepository(); + ChannelRepository FileChannelRepository = RepositoryFactory.getInstance().getFileChannelRepository(); + + MessageRepository JCFMessageRepository = RepositoryFactory.getInstance().getJCFMessageRepository(); + MessageRepository FileMessageRepository = RepositoryFactory.getInstance().getFileMessageRepository(); + // 레포지터리 생성 + System.out.println("============================================================"); + + UserService basicUserServiceForJCF = ServiceFactory.getInstance().getBasicUserService(JCFUserRepository); + ChannelService basicChannelServiceForJCF = ServiceFactory.getInstance().getBasicChannelService(JCFChannelRepository); + MessageService basicMessageServiceForJCF = ServiceFactory.getInstance().getBasicMessageService(JCFMessageRepository); + // JCF를 사용하는 베이직 서비스 생성 + /* - System.out.println("************************************************************** *"); - System.out.println("\n========== userService Test start ==========================================\n"); - userTestApplication(); - System.out.println("\n========== userService Test end ==========================================\n"); + System.out.println("---------JCF User Repository"); + userTestApplication(basicUserServiceForJCF); + loadUserTestApplication(basicUserServiceForJCF); - System.out.println("\n========== load userService Test start ==========================================\n"); - loadUserTestApplication(); - System.out.println("\n========== load userService Test end ==========================================\n"); - System.out.println("***************************************************************");*/ + System.out.println("---------JCF Channel Repository"); + channelTestApplication(basicUserServiceForJCF, basicChannelServiceForJCF); + loadChannelTestApplication(basicUserServiceForJCF, basicChannelServiceForJCF); + + System.out.println("---------JCF Message Repository"); + messageTestApplication(basicUserServiceForJCF, basicChannelServiceForJCF, basicMessageServiceForJCF); + loadMessageTestApplication(basicUserServiceForJCF, basicChannelServiceForJCF, basicMessageServiceForJCF); + */ + + + System.out.println("============================================================"); + deleteAllFilesInDataFolder(); // data폴더의 하위 파일들 삭제, 원활한 테스틀 위함 + UserService basicUserServiceForFile = ServiceFactory.getInstance().getBasicUserService(FileUserRepository); + ChannelService basicChannelServiceForFile = ServiceFactory.getInstance().getBasicChannelService(FileChannelRepository); + MessageService basicMessageServiceForFile = ServiceFactory.getInstance().getBasicMessageService(FileMessageRepository); - // userService 테스트 /* - System.out.println("***************************************************************"); - System.out.println("\n========== channelService Test start ==========================================\n"); - //channelTestApplication(); - System.out.println("\n========== channelService Test end ==========================================\n"); - // channelService 테스트 + System.out.println("---------File User Repository"); + userTestApplication(basicUserServiceForFile); + loadUserTestApplication(basicUserServiceForFile); - System.out.println("\n========== load channelService Test start ==========================================\n"); - //loadChannelTestApplication(); - System.out.println("\n========== load channelService Test end ==========================================\n"); - System.out.println("***************************************************************"); - // channelService 테스트 - */ + System.out.println("---------File Channel Repository"); + channelTestApplication(basicUserServiceForFile, basicChannelServiceForFile); + loadChannelTestApplication(basicUserServiceForFile, basicChannelServiceForFile);*/ - System.out.println("***************************************************************"); - System.out.println("\n========== messageService Test start ==========================================\n"); - messageTestApplication(); - System.out.println("\n========== messageService Test end ==========================================\n"); - // messageService 테스트 - System.out.println("***************************************************************"); - System.out.println("\n========== load messageService Test start ==========================================\n"); - loadMessageTestApplication(); - System.out.println("\n========== load messageService Test end ==========================================\n"); - System.out.println("***************************************************************"); - // messageService 테스트 + System.out.println("---------File Message Repository"); + messageTestApplication(basicUserServiceForFile, basicChannelServiceForFile, basicMessageServiceForFile); + loadMessageTestApplication(basicUserServiceForFile, basicChannelServiceForFile, basicMessageServiceForFile); + //loadMessageTestApplication(basicUserServiceForFile, basicChannelServiceForFile, basicMessageServiceForFile); + + + for (User user : FileUserRepository.getUsers()) { + String channelIds = user.getChannels().stream() + .map(channel -> channel.getId().toString()) + .collect(Collectors.joining(", ")); + String messageIds = user.getMessages().stream() + .map(message -> message.getId().toString()) + .collect(Collectors.joining(", ")); + String messageContents = user.getMessages().stream() + .map(Message::getMessageContents) + .collect(Collectors.joining(", ")); + + System.out.printf("유저 ID: %s, 유저 이름: %s, 유저가 속한 채널들 목록: [%s], 유저가 작성한 메시지 종류및 내용: [%s | %s] %n", + user.getId(), user.getUserName(), channelIds, messageIds, messageContents); + } + + System.out.println(); + System.out.println(); + + for (Channel channel : FileChannelRepository.getAllChannels()) { + String userIds = channel.getUsers().stream() + .map(user -> user.getUserName().toString()) + .collect(Collectors.joining(", ")); + String messageIds = channel.getMessages().stream() + .map(Message::getMessageContents) + .collect(Collectors.joining(", ")); + String messageContents = channel.getMessages().stream() + .map(message -> message.getId().toString()) + .collect(Collectors.joining(", ")); + System.out.printf("채널 ID: %s, 채널 이름: %s, 채널이 가지고 있는 유저 목록: [%s], 채널에 연관된 메시지 종류: [%s | %s]%n", + channel.getId(), channel.getChannelName(), userIds, messageIds, messageContents); + } + + System.out.println(); + System.out.println(); + + for (Message message : FileMessageRepository.getMessages()) { + System.out.printf("메세지 ID: %s, 메세지를 가지고 있는 유저 ID와 이름: %s|%s, 메세지를 가지고 있는 채널 ID와 이름: %s|%s%n", + message.getId(), + message.getUser().getId(), + message.getUser().getUserName(), + message.getChannel().getId(), + message.getChannel().getChannelName() + ); + } + + // 유저의 정보가 삭제되거나 변경되도 나머지가 정상적으로 반영됬는지 확인 필요 -> messaageTest 뒤에 붙혀 작서 - // 데이터를 계속 추가히나까 저장되는게 점점 더 많아진다. - // 현재 출력되는게 정상 - // 좀 더 정상적으로 볼려면 testApplication을 하나씩 만 사용해야된다. - // data 폴더 내의 파일들을 모두 지워야 보기편하다. } - public static void userTestApplication() { + public static void userTestApplication(UserService userService) { - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); // sprint2 이므로 file 서비스를 이용하게 될것 - + System.out.println("\n========== userService Test start ==========================================\n"); System.out.println("1. 유저 등록================="); - User user1 = basicUserService.createUser("권용진-1"); - User user2 = basicUserService.createUser("권용진-2"); + User user1 = userService.createUser("권용진-1"); + User user2 = userService.createUser("권용진-2"); System.out.println(); // 가독성을 위한 줄바꾸 // 두 명의 유저를 등록 System.out.println("2. 단일 유저 조회================="); - basicUserService.printUser(user1); + userService.printUser(user1); System.out.println(); // 유저 한명의 정보를 단일 조회 System.out.println("3. 전체 유저 조회================="); - basicUserService.printActiveUsers(); + userService.printActiveUsers(); System.out.println(); // 유저 전체의 정보를 조회 System.out.println("4. 유저 정보 변경================="); - basicUserService.updateUser(user1, "수정된 권용진-1"); + userService.updateUser(user1, "수정된 권용진-1"); System.out.println(); // 유저의 이름을 변경 - basicUserService.printUser(user1); + userService.printUser(user1); System.out.println(); // 변경된 유저의 정보를 조회 System.out.println("5. 유저 삭제(비활성화)================="); - basicUserService.deleteUser(user1); + userService.deleteUser(user1); System.out.println(); // 유저 한 명을 삭제를 통해 비활성화 - basicUserService.printActiveUsers(); // 조회 + userService.printActiveUsers(); // 조회 System.out.println(); // 정상적을 삭제 되었는지를 확인 하기 위한 활성화 상태인 유저 전체 조회 - basicUserService.printAllUsers(); // 조회 + userService.printAllUsers(); // 조회 System.out.println(); // 활성화된 유저와 비활성화된 유저 전체 조회 - basicUserService.printDeactivatedUsers(); // 조회 + userService.printDeactivatedUsers(); // 조회 System.out.println(); // 비활성화된 유저만 조회 System.out.println("6. 유저 활성화==============="); - basicUserService.restoreUser(user1); + userService.restoreUser(user1); System.out.println(); - basicUserService.printActiveUsers(); // 조회 + userService.printActiveUsers(); // 조회 System.out.println(); - basicUserService.printDeactivatedUsers(); // 조회 + userService.printDeactivatedUsers(); // 조회 System.out.println(); + System.out.println("\n========== userService Test end ==========================================\n"); } - public static void loadUserTestApplication() { + public static void loadUserTestApplication(UserService userService) { + System.out.println("\n========== load userService Test start ==========================================\n"); System.out.println("1. 유저 파일 불러온 후 전체 유저 조회"); - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); - basicUserService.printAllUsers(); + userService.printAllUsers(); System.out.println(); + System.out.println("\n========== load userService Test end ==========================================\n"); } - public static void channelTestApplication() { - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); - ChannelService basicChannelService = ServiceFactory.getInstance().getBasicChannelService(); - + public static void channelTestApplication(UserService userService, ChannelService channelService) { + System.out.println("\n========== channelService Test start ==========================================\n"); System.out.println("1. 유저 생성================="); - User user1 = basicUserService.createUser("권용진-1"); - User user2 = basicUserService.createUser("권용진-2"); + User user1 = userService.createUser("권용진-1"); + User user2 = userService.createUser("권용진-2"); System.out.println(); // 채널을 만들기 위한 유저 생성 System.out.println("2. 채널 생성================="); - Channel channel1 = basicChannelService.createChannel(user1, "권용진-1-서버"); - Channel channel2 = basicChannelService.createChannel(user2, "권용진-2-서버"); + Channel channel1 = channelService.createChannel(user1, "권용진-1-서버"); + Channel channel2 = channelService.createChannel(user2, "권용진-2-서버"); System.out.println(); // 만들어진 유저를 이용하여 채널 생성 System.out.println(); System.out.println("3. 채널 전체 조회================="); - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); // 생성된 채널 전체 조회 System.out.println("4. 채널 단일 조회================="); - basicChannelService.printChannel(channel1); + channelService.printChannel(channel1); System.out.println(); // 생성된 채널 단일 조회 System.out.println("5. 채널 정보 수정, 유저 채널 입장, 동일 유저가 중복 입장하려 할 때================="); - basicChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + channelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 // 이미 만들어진 채널에 다른 유저가 입장 - basicChannelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 + channelService.addUserToChannel(user2, channel1); // user2 번이 1번 채널에 추가됨 System.out.println(); - basicChannelService.printUsersFromChannel(channel1); + channelService.printUsersFromChannel(channel1); System.out.println(); // 유저가 새로이 입장한 채널의 정보를 조회하여 성공적으로 유저가 입장했는지 확인 System.out.println("6. 채널 정보 수정, 채널 이름 수정, 권한 없는 유저가 수정하려 할 떄================="); - basicChannelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); + channelService.updateChannelName(user2, channel1, "권용진-1-서버의 새이름"); // 채널 주인인 유저만 채널의 이름을 변경할 수 있음 - basicChannelService.printChannel(channel1); + channelService.printChannel(channel1); System.out.println(); // 채널의 정보가 안변했음을 확인하기 위해 채널 정보 조회 - basicChannelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 + channelService.updateChannelName(user1, channel1, "권용진-1-서버의 새이름");// 채널 이름 변경 System.out.println(); // 채널 주인은 채널의 이름을 변경할 수 있음 - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); // 변경된 채널 이름 조회 System.out.println("7. 채널 정보 수정, 채널 내 유저 퇴장================="); - basicChannelService.leaveUserFromChannel(user2, channel1); - basicChannelService.printChannel(channel1); + channelService.leaveUserFromChannel(user2, channel1); + channelService.printChannel(channel1); System.out.println(); // 채널에 참여해 있던 유저가 해당 채널을 떠났을 때 해당 채널의 정보를 조회하여 성공적으로 유저가 채널을 빠져나갔는지 확인 System.out.println("8. 채널 정보 수정, 채널 주인 변경, 권한 없는 유저가 수정하려 할 떄================="); - basicChannelService.addUserToChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 - basicChannelService.updateHostUser(user2, channel1, user1); + channelService.addUserToChannel(user2, channel1); // 위에서 퇴장했으니 다시 입장시켜서 + channelService.updateHostUser(user2, channel1, user1); // 채널의 주인을 변경하려는 시도, 채널 주인이 아니면 채널의 주인을 다른 유저로 변경할 수 없다. - basicChannelService.updateHostUser(user1, channel1, user2); + channelService.updateHostUser(user1, channel1, user2); // 채널의 주인을 변경 - basicChannelService.printChannel(channel1); + channelService.printChannel(channel1); System.out.println(); // 주인이 변경된 채널을 조회 System.out.println("9. 채널 삭제, 권한 없는 유저가 삭제하려 할 때================="); - basicChannelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 + channelService.deleteChannel(user1 ,channel1); // "권용진-1-서버" 채널 삭제 System.out.println(); // 주인이 아니면 채널을 삭제 할 수 없다. - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); - basicChannelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 + channelService.deleteChannel(user2 ,channel1); // "권용진-1-서버" 채널 삭제 System.out.println(); // 채널 주인은 채널을 성공적으로 지울 수 있다. - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); // 성공적으로 삭제되었는지를 확인하기위한 채널 전체 조회 + System.out.println("\n========== channelService Test end ==========================================\n"); } - public static void loadChannelTestApplication() { + public static void loadChannelTestApplication(UserService userService, ChannelService channelService) { + System.out.println("\n========== load channelService Test start ==========================================\n"); System.out.println("1. 유저 파일및 채널 파일 불러온 후 전체 유저 조회"); - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); - ChannelService basicChannelService = ServiceFactory.getInstance().getBasicChannelService(); - - basicUserService.printAllUsers(); + userService.printAllUsers(); System.out.println(); - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); + System.out.println("\n========== load channelService Test end ==========================================\n"); } - public static void messageTestApplication() { - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); - ChannelService basicChannelService = ServiceFactory.getInstance().getBasicChannelService(); - MessageService basicMessageService = ServiceFactory.getInstance().getBasicMessageService(); - + public static void messageTestApplication(UserService userService, ChannelService channelService, MessageService messageService) { + System.out.println("\n========== messageService Test start ==========================================\n"); System.out.println("1. 유저 생성================="); - User user1 = basicUserService.createUser("권용진-1"); - User user2 = basicUserService.createUser("권용진-2"); + User user1 = userService.createUser("권용진-1"); + User user2 = userService.createUser("권용진-2"); System.out.println(); // 가독성을 위한 개행 // 메세지를 생성하기 위한 유저 생성 System.out.println("2. 채널 생성================="); - Channel channel1 = basicChannelService.createChannel(user1, "권용진-1의 채널1"); - Channel channel2 = basicChannelService.createChannel(user1, "권용진-1의 채널2"); + Channel channel1 = channelService.createChannel(user1, "권용진-1의 채널1"); + Channel channel2 = channelService.createChannel(user1, "권용진-1의 채널2"); System.out.println(); // 가독성을 위한 개행 // 메세지를 생성하기 위한 채널 생성 System.out.println("3. 메세지 생성================="); - Message message1 = basicMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 - Message message2 = basicMessageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 - Message message3 = basicMessageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 + Message message1 = messageService.createMessage(user1, channel1, "채널1의 테스트 메세지1 입니다"); // 메세지 등록 + Message message2 = messageService.createMessage(user1, channel1, "채널1의 테스트 메세지2 입니다"); // 메세지 등록 + Message message3 = messageService.createMessage(user1, channel2, "채널2의 테스트 메세지1 입니다"); // 메세지 등록 System.out.println(); System.out.println("4. 유저 별 메세지 조회================="); - basicMessageService.printAllMessageByUser(user1); //유저 별 조회 + messageService.printAllMessageByUser(user1); //유저 별 조회 System.out.println(); System.out.println("5. 채널 별 메시지 조회================="); - basicMessageService.printMessagesByChannel(channel1); // 채널 별 조회 + messageService.printMessagesByChannel(channel1); // 채널 별 조회 System.out.println(); - basicMessageService.printMessagesByChannel(channel2); // 채널 별 조회 + messageService.printMessagesByChannel(channel2); // 채널 별 조회 System.out.println(); System.out.println("6. 메세지 단일 조회================="); - basicMessageService.printMessage(message1); + messageService.printMessage(message1); System.out.println(); System.out.println("7. 메세지 전체 조회================="); - basicMessageService.printAllMessage(); // 전체 조회 + messageService.printAllMessage(); // 전체 조회 System.out.println(); System.out.println("8. 메세지 정보 수정================="); - basicMessageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + messageService.updateMessage(user1, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); System.out.println(); - basicMessageService.printAllMessage(); // 전체 조회 + messageService.printAllMessage(); // 전체 조회 System.out.println(); System.out.println("8. 메시지 주인이 아닌 유저가 메세지 삭제 하고자 할 때와 메시지 주인인 유저가 메시지 삭제할 떄================="); - basicMessageService.deleteMessage(user2, message1); - basicMessageService.deleteMessage(user1, message1); + messageService.deleteMessage(user2, message1); + messageService.deleteMessage(user1, message1); System.out.println(); - basicMessageService.printAllMessage(); // 전체 조회 + messageService.printAllMessage(); // 전체 조회 System.out.println(); System.out.println("9. 유저 삭제시 메시지도 동시 삭제================="); - basicChannelService.addUserToChannel(user2, channel1); - Message message4 = basicMessageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 - basicMessageService.printAllMessage(); // 전체 조회 + channelService.addUserToChannel(user2, channel1); + Message message4 = messageService.createMessage(user2, channel1, "삭제 될 유저의 테스트 메시지 입니다."); // 메세지 등록 + messageService.printAllMessage(); // 전체 조회 System.out.println(); - basicUserService.deleteUser(user2); - basicMessageService.printAllMessage(); // 전체 조회 + userService.deleteUser(user2); + messageService.printAllMessage(); // 전체 조회 System.out.println(); System.out.println("10. 삭제되어 비활성화 된 유저가 메시지를 생성하고자 할 때================="); - basicMessageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); + messageService.createMessage(user2, channel1, "삭제된 유저의 테스트 메시지입니다."); System.out.println(); - basicUserService.restoreUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 - basicMessageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); - basicMessageService.printAllMessage(); // 전체 조회 + userService.restoreUser(user2); // 이전 단게에서 user2는 삭제된 상태이므로 다시 활성화 상태로 바꿔준다 + messageService.createMessage(user2, channel1, "복구된 유저의 테스트 메시지입니다."); + messageService.printAllMessage(); // 전체 조회 System.out.println(); System.out.println("11. 유저 본인이 아닌 다른 유저가 메시지를 변경하고자 시도 했을 때================="); - basicMessageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); + messageService.updateMessage(user2, message1, "채널 1의 테스트 메세지의 새로운 업데이트입니다."); System.out.println(); // user2는 해당 메시지의 주인이 아니므로 메시지의 내용을 변경할 수 없다. - basicMessageService.printAllMessage(); // 전체 조회 + messageService.printAllMessage(); // 전체 조회 System.out.println(); + System.out.println("\n========== messageService Test end ==========================================\n"); + + // 1번 유저 정보 변경 + // 2번 유저 삭제 + userService.updateUser(user1, "새로운 권용진"); // 성공적 + channelService.addUserToChannel(user2, channel1); // 성공적 + userService.deleteUser(user2); // 성공적 + + // 채널 정보 변경 + // 채널 삭제 + //channelService.updateChannelName(user1, channel1, "새로운 채널 이름");// 성공적 + //channelService.deleteChannel(user1, channel1);// 성공적 + + // 메세지 정보 변경 + // 메시지 삭제 + messageService.updateMessage(user1, message1, "새로운 메세지"); // 성공적 + messageService.deleteMessage(user1, message1); } - public static void loadMessageTestApplication() { + public static void loadMessageTestApplication(UserService userService, ChannelService channelService, MessageService messageService) { + System.out.println("\n========== load messageService Test start ==========================================\n"); System.out.println("1. 유저 파일 채널 파일및 메세지 파일을 불러온 후 전체 유저 조회"); - UserService basicUserService = ServiceFactory.getInstance().getBasicUserService(); - ChannelService basicChannelService = ServiceFactory.getInstance().getBasicChannelService(); - MessageService basicMessageService = ServiceFactory.getInstance().getBasicMessageService(); - - basicUserService.printAllUsers(); + userService.printAllUsers(); System.out.println(); - basicChannelService.printAllChannels(); + channelService.printAllChannels(); System.out.println(); - basicMessageService.printAllMessage(); + messageService.printAllMessage(); System.out.println(); + System.out.println("\n========== load messageService Test end ==========================================\n"); + } + public static void deleteAllFilesInDataFolder() { + File folder = new File("./data"); + + if (!folder.exists()) { + System.out.println("data 폴더가 존재하지 않습니다."); + return; + } + + File[] files = folder.listFiles(); + + if (files == null || files.length == 0) { + System.out.println("data 폴더에 삭제할 파일이 없습니다."); + return; + } + + for (File file : files) { + if (file.isFile()) { + boolean deleted = file.delete(); + System.out.printf("파일 %s 삭제 %s%n", file.getName(), deleted ? "성공" : "실패"); + } + } } } diff --git a/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java b/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java index 9721474a6..2d61fdddf 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/run/TestJCFServiceApplication.java @@ -11,7 +11,7 @@ public class TestJCFServiceApplication { public static void main(String[] args) { - testJCFService(); + testJCFService(); // sprint1 때 만든 코드 내용들 // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 } diff --git a/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java b/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java index f701dd71d..92d77ad76 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java +++ b/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java @@ -6,7 +6,7 @@ public class TestRepository { public static void main(String[] args) { - FileMessageRepository.getInstance().printAllMessage(); + //FileMessageRepository.getInstance().printAllMessage(); FileChannelRepository.getInstance().printAllChannels(); FileUserRepository.getInstance().printAllUsers(); } 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 053845c40..15769da04 100644 --- a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java +++ b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java @@ -2,61 +2,57 @@ import com.sprint.mission.discodeit.entity.Channel; import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.factory.RepositoryFactory; +import com.sprint.mission.discodeit.repository.ChannelRepository; import com.sprint.mission.discodeit.repository.file.FileChannelRepository; import com.sprint.mission.discodeit.service.ChannelService; import java.util.ArrayList; +import java.util.List; public class BasicChannelService implements ChannelService { - private static final BasicChannelService instance = new BasicChannelService(); - private final FileChannelRepository fileChannelRepository; - private final ArrayList data; // channelData - // data를 많이 참조하고 있는데 본 클래스에서 data를 못 다루는건 문제가 나중에 생길지도? + private final ChannelRepository channelRepository; - public BasicChannelService() { - fileChannelRepository = FileChannelRepository.getInstance(); - data = fileChannelRepository.getChannels(); - } - - public static BasicChannelService getInstance() { - return instance; + public BasicChannelService(ChannelRepository channelRepository) { + this.channelRepository = channelRepository; } @Override public Channel createChannel(User user, String channelName) { - return fileChannelRepository.createChannel(user, channelName); + return channelRepository.createChannel(user, channelName); } @Override public void addUserToChannel(User user, Channel channel) { - fileChannelRepository.addUserToChannel(user, channel); + channelRepository.addUserToChannel(user, channel); } @Override public void leaveUserFromChannel(User user, Channel channel) { - fileChannelRepository.leaveUserFromChannel(user, channel); + channelRepository.leaveUserFromChannel(user, channel); } @Override public void updateChannelName(User user, Channel channel, String newName) { - fileChannelRepository.updateChannelName(user, channel, newName); + channelRepository.updateChannelName(user, channel, newName); } @Override public void deleteChannel(User user, Channel channel) { - fileChannelRepository.deleteChannel(user, channel); + channelRepository.deleteChannel(user, channel); } @Override public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - fileChannelRepository.updateHostUser(oldHostUser, channel, newHostUser); + channelRepository.updateHostUser(oldHostUser, channel, newHostUser); } @Override public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", data.size()); - data.forEach(channel -> System.out.println(channel.getChannelName())); + List channels = channelRepository.getAllChannels(); + System.out.printf("전체 채널 조회, 채널 수: %d%n", channels.size()); + channels.forEach(channel -> System.out.printf("채널 명: %s, 채널 ID: %s, 채널내 유저 수: %d%n", channel.getChannelName(), channel.getId(), channel.getUsers().size())); } @Override 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 0ff1eed7a..9c92ed1fa 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 @@ -4,38 +4,33 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; -import com.sprint.mission.discodeit.repository.file.FileMessageRepository; +import com.sprint.mission.discodeit.factory.RepositoryFactory; +import com.sprint.mission.discodeit.repository.MessageRepository; import com.sprint.mission.discodeit.service.MessageService; import java.util.ArrayList; +import java.util.List; public class BasicMessageService implements MessageService { - private static BasicMessageService instance = new BasicMessageService(); - private final FileMessageRepository fileMessageRepository; - private final ArrayList data; + private final MessageRepository messageRepository; - public BasicMessageService() { - fileMessageRepository = FileMessageRepository.getInstance(); - data = fileMessageRepository.getMessages(); - } - - public static BasicMessageService getInstance() { - return instance; + public BasicMessageService(MessageRepository messageRepository) { + this.messageRepository = messageRepository; } @Override public Message createMessage(User user, Channel channel, String contents) { - return fileMessageRepository.createMessage(user, channel, contents); + return messageRepository.createMessage(user, channel, contents); } @Override public void deleteMessage(User user, Message message) { - fileMessageRepository.deleteMessage(user, message); + messageRepository.deleteMessage(user, message); } @Override public void updateMessage(User user, Message message, String newContents) { - fileMessageRepository.updateMessage(user, message, newContents); + messageRepository.updateMessage(user, message, newContents); } @Override @@ -44,8 +39,10 @@ public void printMessagesByChannel(Channel channel) { System.out.println("채널이 null 입니다."); return; } + List data = messageRepository.getMessages(); System.out.printf("%s 채널의 메세지를 조회합니다. 메시지 수: %d%n", channel.getChannelName(), channel.getMessages().size()); + data.stream() .filter(message -> message.getChannel().equals(channel)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", @@ -64,16 +61,16 @@ public void printMessage(Message message) { @Override public void printAllMessage() { - System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.stream() - .filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) - .toList().size()); - data - .stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) + List data = messageRepository.getMessages(); + System.out.printf("전체 메시지를 출력합니다. 메세지 수: %d%n", data.size()); + + data.stream().filter(message -> message.getUser().getStatus().equals(UserStatus.ACTIVE)) .forEach(message -> System.out.printf("작성자: %s, 내용: %s%n", message.getUser().getUserName(), message.getMessageContents())); } @Override public void printAllMessageByUser(User user) { + // 이렇게 하면 최신 저장된 메시지가 출력되지는 않을 것 같은데 System.out.printf("%s이 작성한 모든 메세지를 출력합니다. 메시지 수: %d%n", user.getUserName(), user.getMessages().size()); user.getMessages() 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 ca20bce0b..f67c37673 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 @@ -2,48 +2,44 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.entity.UserStatus; -import com.sprint.mission.discodeit.repository.file.FileUserRepository; +import com.sprint.mission.discodeit.factory.RepositoryFactory; +import com.sprint.mission.discodeit.repository.UserRepository; import com.sprint.mission.discodeit.service.UserService; -import java.util.ArrayList; +import java.util.List; public class BasicUserService implements UserService { - private static final BasicUserService instance = new BasicUserService(); - private final FileUserRepository fileUserRepository; - private final ArrayList data; + private final UserRepository userRepository; - public BasicUserService() { - fileUserRepository = FileUserRepository.getInstance(); - data = fileUserRepository.getUsers(); - } - - public static BasicUserService getInstance() { - return instance; + public BasicUserService(UserRepository userRepository) { + this.userRepository = userRepository; } @Override public User createUser(String userName) { - return fileUserRepository.createUser(userName); + return userRepository.createUser(userName); } @Override public void updateUser(User user, String newName) { - fileUserRepository.updateUser(user, newName); + userRepository.updateUser(user, newName); } @Override public void deleteUser(User user) { - fileUserRepository.deleteUser(user); + userRepository.deleteUser(user); } @Override public void restoreUser(User user) { - fileUserRepository.restoreUser(user); + userRepository.restoreUser(user); } @Override public void printActiveUsers(){ // status를 판별하는 식을 추가 + List data = userRepository.getUsers(); + System.out.printf("전체 유저 조회(탈퇴 유저 미포함), 총 유저 수: %d \n", (data.stream() .filter(user -> user.getStatus().equals(UserStatus.ACTIVE))).toList().size()); data.stream() @@ -59,6 +55,7 @@ public void printUser(User user) { @Override public void printAllUsers() { + List data = userRepository.getUsers(); System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", data.size()); data .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); @@ -66,6 +63,7 @@ public void printAllUsers() { @Override public void printDeactivatedUsers() { + List data = userRepository.getUsers(); System.out.printf("탈퇴 유저 조회, 총 유저 수: %d \n", (data.stream() .filter(user -> user.getStatus().equals(UserStatus.DEACTIVE))).toList().size()); data.stream() diff --git "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" index e69de29bb..33cc388a9 100644 --- "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" +++ "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" @@ -0,0 +1,3 @@ +동기화 저장 +객체가 서로 참조하고 있어 무한 루프 형태를 띔 +어떻게 해결해야하는가? \ No newline at end of file From 68c68c0366a9c426987d8a54b0cfed2ff8682a9c Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 12 Jun 2025 17:58:13 +0900 Subject: [PATCH 13/16] =?UTF-8?q?basic=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/factory/RepositoryFactory.java | 79 ++++++++++ .../BasicChannelService11.java" | 115 +++++++++++++++ .../FileChannelRepository11.java" | 136 ++++++++++++++++++ 3 files changed, 330 insertions(+) create mode 100644 src/main/java/com/sprint/mission/discodeit/factory/RepositoryFactory.java create mode 100644 "src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" create mode 100644 "src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" diff --git a/src/main/java/com/sprint/mission/discodeit/factory/RepositoryFactory.java b/src/main/java/com/sprint/mission/discodeit/factory/RepositoryFactory.java new file mode 100644 index 000000000..df88029d8 --- /dev/null +++ b/src/main/java/com/sprint/mission/discodeit/factory/RepositoryFactory.java @@ -0,0 +1,79 @@ +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.repository.jcf.JCFChannelRepository; +import com.sprint.mission.discodeit.repository.jcf.JCFMessageRepository; +import com.sprint.mission.discodeit.repository.jcf.JCFUserRepository; + +public class RepositoryFactory { + + private static RepositoryFactory instance; + private JCFUserRepository jcfUserRepository; + private JCFChannelRepository jcfChannelRepository; + private JCFMessageRepository jcfMessageRepository; + + private FileUserRepository fileUserRepository; + private FileChannelRepository fileChannelRepository; + private FileMessageRepository fileMessageRepository; + + public static RepositoryFactory getInstance() { + if (instance == null) { + instance = new RepositoryFactory(); + } + return instance; + } + + private RepositoryFactory() { + jcfUserRepository = JCFUserRepository.getInstance(); + jcfChannelRepository = JCFChannelRepository.getInstance(); + jcfMessageRepository = JCFMessageRepository.getInstance(); + + fileUserRepository = FileUserRepository.getInstance(); + fileChannelRepository = FileChannelRepository.getInstance(); + fileMessageRepository = FileMessageRepository.getInstance(); + } + + public JCFUserRepository getJCFUserRepository() { + if (jcfUserRepository == null) { + jcfUserRepository = new JCFUserRepository(); + } + return jcfUserRepository; + } + + public JCFChannelRepository getJCFChannelRepository() { + if (jcfChannelRepository == null) { + jcfChannelRepository = new JCFChannelRepository(); + } + return jcfChannelRepository; + } + + public JCFMessageRepository getJCFMessageRepository() { + if (jcfMessageRepository == null) { + jcfMessageRepository = new JCFMessageRepository(); + } + return jcfMessageRepository; + } + + public FileUserRepository getFileUserRepository() { + if (fileUserRepository == null) { + fileUserRepository = new FileUserRepository(); + } + return fileUserRepository; + } + + public FileChannelRepository getFileChannelRepository() { + if (fileChannelRepository == null) { + fileChannelRepository = new FileChannelRepository(); + } + return fileChannelRepository; + } + + public FileMessageRepository getFileMessageRepository() { + if (fileMessageRepository == null) { + fileMessageRepository = new FileMessageRepository(); + } + return fileMessageRepository; + } +} diff --git "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" new file mode 100644 index 000000000..219ac4603 --- /dev/null +++ "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" @@ -0,0 +1,115 @@ +package com.sprint.mission.discodeit.참고; + +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.service.ChannelService; + +import java.util.List; + +/** + * ChannelService 구현체 + * - 비즈니스 로직만 담당하고, 저장/불러오기 등의 영속화는 ChannelRepository에 위임 + */ +public class BasicChannelService11 implements ChannelService { + + private final ChannelRepository channelRepository; + + /** + * 생성자 주입 방식으로 저장소 주입 + * (이 방식은 추후 테스트 시 mock 주입이 쉬움) + */ + public BasicChannelService11(ChannelRepository channelRepository) { + this.channelRepository = channelRepository; + } + + /** + * 채널 생성 요청을 저장소에 위임 + */ + @Override + public Channel createChannel(User user, String channelName) { + return channelRepository.createChannel(user, channelName); + } + + /** + * 유저를 채널에 추가하는 로직을 저장소에 위임 + */ + @Override + public void addUserToChannel(User user, Channel channel) { + channelRepository.addUserToChannel(user, channel); + } + + /** + * 유저를 채널에서 제거하는 로직을 저장소에 위임 + */ + @Override + public void leaveUserFromChannel(User user, Channel channel) { + channelRepository.leaveUserFromChannel(user, channel); + } + + /** + * 채널 이름 수정 요청 위임 + */ + @Override + public void updateChannelName(User user, Channel channel, String newName) { + channelRepository.updateChannelName(user, channel, newName); + } + + /** + * 채널 삭제 로직 위임 + */ + @Override + public void deleteChannel(User user, Channel channel) { + channelRepository.deleteChannel(user, channel); + } + + /** + * 채널 주인 변경 로직 위임 + */ + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + channelRepository.updateHostUser(oldHostUser, channel, newHostUser); + } + + /** + * 전체 채널 출력 (Repository가 제공해야 할 책임이지만, 현재는 Service에서 직접 사용) + */ + @Override + public void printAllChannels() { + System.out.println("전체 채널은 저장소에서 직접 조회해야 합니다. 해당 기능은 Repository에 위임되어야 합니다."); + // 필요한 경우 channelRepository.getAllChannels() 메서드를 추가할 것 + List channels = channelRepository.getAllChannels(); + for (Channel channel : channels) { + System.out.println(channel); + } + } + + /** + * 단일 채널 출력 + */ + @Override + public void printChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + System.out.printf("채널 주인: '%s', 채널 내 유저들: %s%n", + channel.getHostUser().getUserName(), channel.getUsers()); + } + + /** + * 채널 내 유저 출력 + */ + @Override + public void printUsersFromChannel(Channel channel) { + if(channel == null) { + System.out.println("채널이 null 입니다."); + return; + } + System.out.printf("%s 채널 내 유저 검색, 유저 수: %d%n", + channel.getChannelName(), channel.getUsers().size()); + channel.getUsers().forEach(user -> System.out.println(user.getUserName())); + } +} diff --git "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" new file mode 100644 index 000000000..c280dfecb --- /dev/null +++ "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" @@ -0,0 +1,136 @@ +package com.sprint.mission.discodeit.참고; + +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 java.io.*; +import java.util.ArrayList; +import java.util.List; + +public class FileChannelRepository11 implements ChannelRepository { + + private static final String CHANNEL_FILE_PATH = "./data/channels.ser"; + private static final FileChannelRepository11 instance = new FileChannelRepository11(); + + private FileChannelRepository11() {} + + public static FileChannelRepository11 getInstance() { + return instance; + } + + /** + * 채널 목록을 파일에서 불러옵니다. + */ + private List loadChannels() { + File file = new File(CHANNEL_FILE_PATH); + if (!file.exists() || file.length() == 0) { + return new ArrayList<>(); + } + + try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { + return (List) ois.readObject(); + } catch (IOException | ClassNotFoundException e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } + + /** + * 채널 목록을 파일에 저장합니다. + */ + private void saveChannels(List channels) { + try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(CHANNEL_FILE_PATH))) { + oos.writeObject(channels); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public Channel createChannel(User user, String channelName) { + if (user.getStatus() == UserStatus.DEACTIVE) return null; + + List channels = loadChannels(); + Channel channel = new Channel(user, channelName); + channels.add(channel); + saveChannels(channels); + + return channel; + } + + @Override + public void addUserToChannel(User user, Channel channel) { + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + for (Channel ch : channels) { + if (ch.equals(channel) && !ch.getUsers().contains(user)) { + ch.addUser(user); + break; + } + } + saveChannels(channels); + } + + @Override + public void leaveUserFromChannel(User user, Channel channel) { + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + channels.removeIf(ch -> { + if (ch.equals(channel)) { + ch.removeUser(user); + return ch.getUsers().isEmpty(); // 유저 다 나가면 삭제 + } + return false; + }); + saveChannels(channels); + } + + @Override + public void updateChannelName(User user, Channel channel, String newName) { + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + for (Channel ch : channels) { + if (ch.equals(channel) && ch.getHostUser().equals(user)) { + ch.updateChannelName(newName); + break; + } + } + saveChannels(channels); + } + + @Override + public void deleteChannel(User user, Channel channel) { + if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; + + List channels = loadChannels(); + channels.removeIf(ch -> ch.equals(channel) && ch.getHostUser().equals(user)); + saveChannels(channels); + } + + @Override + public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { + if (channel == null || oldHostUser.getStatus() == UserStatus.DEACTIVE || newHostUser.getStatus() == UserStatus.DEACTIVE) + return; + + List channels = loadChannels(); + for (Channel ch : channels) { + if (ch.equals(channel) && ch.getHostUser().equals(oldHostUser) && ch.getUsers().contains(newHostUser)) { + ch.updateHostUser(newHostUser); + break; + } + } + saveChannels(channels); + } + + /** + * 저장소에 있는 모든 채널을 반환합니다. + */ + public List getAllChannels() { + return loadChannels(); + } +} \ No newline at end of file From 053ad9031d79a181a7948942e0a1e874a96f243d Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 12 Jun 2025 17:58:59 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=EB=A0=88=ED=8F=AC=EC=A7=80=ED=84=B0?= =?UTF-8?q?=EB=A6=AC=20=EB=8B=A4=EC=88=98=20=EB=B3=80=EA=B2=BD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=8F=99=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/\353\251\224\353\252\250" | 3 - .../BasicChannelService11.java" | 115 --------------- .../FileChannelRepository11.java" | 136 ------------------ 3 files changed, 254 deletions(-) delete mode 100644 "src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" delete mode 100644 "src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" delete mode 100644 "src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" diff --git "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" "b/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" deleted file mode 100644 index 33cc388a9..000000000 --- "a/src/main/java/com/sprint/mission/discodeit/\353\251\224\353\252\250" +++ /dev/null @@ -1,3 +0,0 @@ -동기화 저장 -객체가 서로 참조하고 있어 무한 루프 형태를 띔 -어떻게 해결해야하는가? \ No newline at end of file diff --git "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" deleted file mode 100644 index 219ac4603..000000000 --- "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/BasicChannelService11.java" +++ /dev/null @@ -1,115 +0,0 @@ -package com.sprint.mission.discodeit.참고; - -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.service.ChannelService; - -import java.util.List; - -/** - * ChannelService 구현체 - * - 비즈니스 로직만 담당하고, 저장/불러오기 등의 영속화는 ChannelRepository에 위임 - */ -public class BasicChannelService11 implements ChannelService { - - private final ChannelRepository channelRepository; - - /** - * 생성자 주입 방식으로 저장소 주입 - * (이 방식은 추후 테스트 시 mock 주입이 쉬움) - */ - public BasicChannelService11(ChannelRepository channelRepository) { - this.channelRepository = channelRepository; - } - - /** - * 채널 생성 요청을 저장소에 위임 - */ - @Override - public Channel createChannel(User user, String channelName) { - return channelRepository.createChannel(user, channelName); - } - - /** - * 유저를 채널에 추가하는 로직을 저장소에 위임 - */ - @Override - public void addUserToChannel(User user, Channel channel) { - channelRepository.addUserToChannel(user, channel); - } - - /** - * 유저를 채널에서 제거하는 로직을 저장소에 위임 - */ - @Override - public void leaveUserFromChannel(User user, Channel channel) { - channelRepository.leaveUserFromChannel(user, channel); - } - - /** - * 채널 이름 수정 요청 위임 - */ - @Override - public void updateChannelName(User user, Channel channel, String newName) { - channelRepository.updateChannelName(user, channel, newName); - } - - /** - * 채널 삭제 로직 위임 - */ - @Override - public void deleteChannel(User user, Channel channel) { - channelRepository.deleteChannel(user, channel); - } - - /** - * 채널 주인 변경 로직 위임 - */ - @Override - public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - channelRepository.updateHostUser(oldHostUser, channel, newHostUser); - } - - /** - * 전체 채널 출력 (Repository가 제공해야 할 책임이지만, 현재는 Service에서 직접 사용) - */ - @Override - public void printAllChannels() { - System.out.println("전체 채널은 저장소에서 직접 조회해야 합니다. 해당 기능은 Repository에 위임되어야 합니다."); - // 필요한 경우 channelRepository.getAllChannels() 메서드를 추가할 것 - List channels = channelRepository.getAllChannels(); - for (Channel channel : channels) { - System.out.println(channel); - } - } - - /** - * 단일 채널 출력 - */ - @Override - public void printChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("채널 단일 조회, 채널 이름: %s, 채널 내 유저 수: %d%n", - channel.getChannelName(), channel.getUsers().size()); - System.out.printf("채널 주인: '%s', 채널 내 유저들: %s%n", - channel.getHostUser().getUserName(), channel.getUsers()); - } - - /** - * 채널 내 유저 출력 - */ - @Override - public void printUsersFromChannel(Channel channel) { - if(channel == null) { - System.out.println("채널이 null 입니다."); - return; - } - System.out.printf("%s 채널 내 유저 검색, 유저 수: %d%n", - channel.getChannelName(), channel.getUsers().size()); - channel.getUsers().forEach(user -> System.out.println(user.getUserName())); - } -} diff --git "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" "b/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" deleted file mode 100644 index c280dfecb..000000000 --- "a/src/main/java/com/sprint/mission/discodeit/\354\260\270\352\263\240/FileChannelRepository11.java" +++ /dev/null @@ -1,136 +0,0 @@ -package com.sprint.mission.discodeit.참고; - -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 java.io.*; -import java.util.ArrayList; -import java.util.List; - -public class FileChannelRepository11 implements ChannelRepository { - - private static final String CHANNEL_FILE_PATH = "./data/channels.ser"; - private static final FileChannelRepository11 instance = new FileChannelRepository11(); - - private FileChannelRepository11() {} - - public static FileChannelRepository11 getInstance() { - return instance; - } - - /** - * 채널 목록을 파일에서 불러옵니다. - */ - private List loadChannels() { - File file = new File(CHANNEL_FILE_PATH); - if (!file.exists() || file.length() == 0) { - return new ArrayList<>(); - } - - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (List) ois.readObject(); - } catch (IOException | ClassNotFoundException e) { - e.printStackTrace(); - return new ArrayList<>(); - } - } - - /** - * 채널 목록을 파일에 저장합니다. - */ - private void saveChannels(List channels) { - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(CHANNEL_FILE_PATH))) { - oos.writeObject(channels); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public Channel createChannel(User user, String channelName) { - if (user.getStatus() == UserStatus.DEACTIVE) return null; - - List channels = loadChannels(); - Channel channel = new Channel(user, channelName); - channels.add(channel); - saveChannels(channels); - - return channel; - } - - @Override - public void addUserToChannel(User user, Channel channel) { - if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; - - List channels = loadChannels(); - for (Channel ch : channels) { - if (ch.equals(channel) && !ch.getUsers().contains(user)) { - ch.addUser(user); - break; - } - } - saveChannels(channels); - } - - @Override - public void leaveUserFromChannel(User user, Channel channel) { - if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; - - List channels = loadChannels(); - channels.removeIf(ch -> { - if (ch.equals(channel)) { - ch.removeUser(user); - return ch.getUsers().isEmpty(); // 유저 다 나가면 삭제 - } - return false; - }); - saveChannels(channels); - } - - @Override - public void updateChannelName(User user, Channel channel, String newName) { - if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; - - List channels = loadChannels(); - for (Channel ch : channels) { - if (ch.equals(channel) && ch.getHostUser().equals(user)) { - ch.updateChannelName(newName); - break; - } - } - saveChannels(channels); - } - - @Override - public void deleteChannel(User user, Channel channel) { - if (user.getStatus() == UserStatus.DEACTIVE || channel == null) return; - - List channels = loadChannels(); - channels.removeIf(ch -> ch.equals(channel) && ch.getHostUser().equals(user)); - saveChannels(channels); - } - - @Override - public void updateHostUser(User oldHostUser, Channel channel, User newHostUser) { - if (channel == null || oldHostUser.getStatus() == UserStatus.DEACTIVE || newHostUser.getStatus() == UserStatus.DEACTIVE) - return; - - List channels = loadChannels(); - for (Channel ch : channels) { - if (ch.equals(channel) && ch.getHostUser().equals(oldHostUser) && ch.getUsers().contains(newHostUser)) { - ch.updateHostUser(newHostUser); - break; - } - } - saveChannels(channels); - } - - /** - * 저장소에 있는 모든 채널을 반환합니다. - */ - public List getAllChannels() { - return loadChannels(); - } -} \ No newline at end of file From 96c51c35ca2ff348f4033b2750a5648fc3f01cf4 Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Thu, 12 Jun 2025 18:23:14 +0900 Subject: [PATCH 15/16] =?UTF-8?q?=EB=A0=88=ED=8F=AC=EC=A7=80=ED=84=B0?= =?UTF-8?q?=EB=A6=AC=20=EB=8B=A4=EC=88=98=20=EB=B3=80=EA=B2=BD=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=8F=99=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sprint/mission/discodeit/run/JavaApplication.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java index d37812dd2..29c448500 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java @@ -11,8 +11,6 @@ import com.sprint.mission.discodeit.service.ChannelService; import com.sprint.mission.discodeit.service.MessageService; import com.sprint.mission.discodeit.service.UserService; -import com.sprint.mission.discodeit.service.basic.BasicUserService; -import com.sprint.mission.discodeit.service.jcf.JCFUserService; import java.io.File; import java.util.stream.Collectors; From 0f46433fe8c27f2ab3761e4257c9f59d5cb0fcbe Mon Sep 17 00:00:00 2001 From: KwonYongJin Date: Sun, 15 Jun 2025 12:51:11 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=B0=8F=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C=20=EC=A4=91=EC=B2=A9=20for?= =?UTF-8?q?=EB=AC=B8=20stream=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 --- .../file/FileChannelRepository.java | 11 +--------- .../file/FileMessageRepository.java | 22 ++++++++++++++++--- .../repository/file/FileUserRepository.java | 13 +---------- .../discodeit/run/JavaApplication.java | 4 ---- .../mission/discodeit/run/TestRepository.java | 13 ----------- 5 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/com/sprint/mission/discodeit/run/TestRepository.java 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 db839e3bc..28c474391 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 @@ -60,15 +60,12 @@ public Channel createChannel(User user, String channelName) { for (User userFromFile : users) { if(userFromFile.getId().equals(user.getId())) { - System.out.println("\n1231412 - 1"+channel+"\n"); - userFromFile.addChannel(channel); // 여기가 문제네, 중복 뭔데 왜 중복제거 안하는데 - System.out.println("\n1231412 - 2"+channel+"\n"); + userFromFile.addChannel(channel); break; } } FileUserRepository.getInstance().saveUsers(users); // 채널을 생성하면 자동으로 유저 정보도 재저장 - // 무한루프 이거 어떻게 해결할 수 있을까?? return channel; } @@ -93,7 +90,6 @@ public void deleteChannel(User user, Channel channel) { List messages = FileMessageRepository.getInstance().getMessages(); messages.removeIf(message -> message.getChannel().getId().equals(channel.getId())); - // 메세지는 어떻게하지? 메세지 전부 삭제 saveChannels(channels); FileUserRepository.getInstance().saveUsers(users); FileMessageRepository.getInstance().saveMessages(messages); @@ -204,9 +200,4 @@ public List getAllChannels() { return loadChannels(); } - public void printAllChannels() { - System.out.printf("전체 채널 조회, 채널 수: %d%n", loadChannels().size()); - loadChannels().forEach(channel -> System.out.println(channel.getChannelName())); - // 테스트용으로 남겨둔 메소드, 레퍼지토리에는 없어야 됨, 개발 중이므로 남겨둠, 나중에 본 메소드 지우기 - } } 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 0fe1455d5..9db859dd4 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 @@ -157,6 +157,7 @@ public void updateMessage(User user, Message message, String newContents){ } List usersFromFile = FileUserRepository.getInstance().getUsers(); + /* for (User userFromFile : usersFromFile) { if(userFromFile.getId().equals(user.getId())) { // 유저를 찾음 @@ -167,10 +168,17 @@ public void updateMessage(User user, Message message, String newContents){ } } } - } //이야 화살이 미쳤구만 - // 유저 파일에서 원하는 유저 찾기 -> 유저의 메세지들에서 원하는 메세지 찾기 -> 해당 메세지가 맞다면 변환 + }*/ + usersFromFile.stream() + .filter(u -> u.getId().equals(user.getId())) + .flatMap(u -> u.getMessages().stream()) + .filter(m -> m.getId().equals(message.getId())) + .findFirst() + .ifPresent(m -> m.updateMessageContent(newContents)); + // 위 for문을 stream으로 변환함 List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); + /* for (Channel channelFromFile : channelsFromFile) { if(channelFromFile.getId().equals(message.getChannel().getId())) { // 속한 채널 찾음 @@ -181,7 +189,15 @@ public void updateMessage(User user, Message message, String newContents){ } } } - } + }*/ + // 끔찍한 코드 개선 요망!! + + channelsFromFile.stream() + .filter(ch -> ch.getId().equals(message.getChannel().getId())) + .flatMap(ch -> ch.getMessages().stream()) + .filter(msg -> msg.getId().equals(message.getId())) + .findFirst() + .ifPresent(msg -> msg.updateMessageContent(newContents)); saveMessages(messagesFromFile); FileUserRepository.getInstance().saveUsers(usersFromFile); 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 69f973ffb..a58e5a912 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 @@ -88,8 +88,6 @@ public void updateUser(User user, String newName) { //users.forEach(u -> System.out.println(u.getUserName())); - - saveUsers(users); FileChannelRepository.getInstance().saveChannels(channelsFromFile); FileMessageRepository.getInstance().saveMessages(messagesFromFile); @@ -130,8 +128,6 @@ public void deleteUser(User user) { break; } } - - //-------------- List channelsFromFile = FileChannelRepository.getInstance().getAllChannels(); user.getChannels().forEach(userChannel -> @@ -149,7 +145,6 @@ public void deleteUser(User user) { .anyMatch(messageFromUser -> messageFromUser.getId().equals(messageFromFile.getId())) ); - saveUsers(users); FileChannelRepository.getInstance().saveChannels(channelsFromFile); FileMessageRepository.getInstance().saveMessages(messagesFromFile); @@ -169,13 +164,7 @@ public void restoreUser(User user) { @Override public List getUsers() { - return loadUsers(); //서비스에서 사용됨, 사실 loadUsers랑 같은거라 지워도 될듯 + return loadUsers(); } - public void printAllUsers() { - System.out.printf("전체 유저 조회(탈퇴 유저 포함), 유저 수: %d \n", this.loadUsers().size()); - this.loadUsers() - .forEach(user -> System.out.printf("유저 이름: '%s', 유저 ID: '%s'\n", user.getUserName(), user.getId())); - //제대로 레포지터리가 작동하는지를 확인하기위한 메소드, 나중에 코드 완성되면 지우기 - } } diff --git a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java index 29c448500..6a53a340e 100644 --- a/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java +++ b/src/main/java/com/sprint/mission/discodeit/run/JavaApplication.java @@ -18,7 +18,6 @@ public class JavaApplication { public static void main(String[] args) { testFileService(); - // sprint1 떄 만든 코드로써 저장 로직이 변경 되었으므로 data 폴던안의 파일들을 전부 삭제하면 돌아간다. -- sprint2 개발 중 } public static void testFileService() { @@ -119,9 +118,6 @@ public static void testFileService() { message.getChannel().getChannelName() ); } - - // 유저의 정보가 삭제되거나 변경되도 나머지가 정상적으로 반영됬는지 확인 필요 -> messaageTest 뒤에 붙혀 작서 - } public static void userTestApplication(UserService userService) { diff --git a/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java b/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java deleted file mode 100644 index 92d77ad76..000000000 --- a/src/main/java/com/sprint/mission/discodeit/run/TestRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.sprint.mission.discodeit.run; - -import com.sprint.mission.discodeit.repository.file.FileChannelRepository; -import com.sprint.mission.discodeit.repository.file.FileMessageRepository; -import com.sprint.mission.discodeit.repository.file.FileUserRepository; - -public class TestRepository { - public static void main(String[] args) { - //FileMessageRepository.getInstance().printAllMessage(); - FileChannelRepository.getInstance().printAllChannels(); - FileUserRepository.getInstance().printAllUsers(); - } -}