feat: 추가 요구사항 기능 구현

jaewoo9797 · jaewoo9797 · commit 6a468397bb77 · 2025-02-11T14:33:34.000+09:00
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/application/service/channel/JCFChannelService.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/application/service/channel/JCFChannelService.java
@@ -12,6 +12,7 @@
 import com.sprint.mission.discodeit.domain.channel.Channel;
 import com.sprint.mission.discodeit.domain.channel.enums.ChannelType;
 import com.sprint.mission.discodeit.domain.channel.enums.ChannelVisibility;
+import com.sprint.mission.discodeit.domain.channel.exception.AlreadyJoinUserException;
 import com.sprint.mission.discodeit.domain.channel.exception.ChannelNotFoundException;
 import com.sprint.mission.discodeit.domain.readStatus.ReadStatus;
 import com.sprint.mission.discodeit.domain.user.User;
@@ -73,6 +74,7 @@ public void joinPublicChannel(UUID invitedUserId, InviteChannelRequestDto reques
     public void joinPrivateChannel(UUID invitedUserId, InviteChannelRequestDto requestDto) {
         User foundUser = userService.findOneByIdOrThrow(invitedUserId);
         Channel foundChannel = findOneByIdOrThrow(requestDto.channelId());
+        throwIsAlreadyJoinUser(foundUser, foundChannel);
         foundChannel.join(foundUser);
         ReadStatus readStatus = new ReadStatus(foundUser, foundChannel);
         readStatusRepository.save(readStatus);
@@ -139,4 +141,10 @@ private FoundChannelResponseDto toFoundChannelResponseDto(Channel foundChannel)
             return FoundChannelResponseDto.ofPrivateChannel(foundChannel, lastMessageTime);
         }
     }
+
+    private void throwIsAlreadyJoinUser(User targetUser, Channel targetChannel) {
+        if (channelRepository.isExistUser(targetUser, targetChannel)) {
+            throw new AlreadyJoinUserException(ErrorCode.ALREADY_CHANNEL_JOIN_USER, targetUser.getNicknameValue());
+        }
+    }
 }
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/application/service/userstatus/UserStatusService.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/application/service/userstatus/UserStatusService.java
@@ -18,6 +18,9 @@ public UserStatusService(
     }
 
     public UserStatus createAtFirstJoin(User user) {
+        if (userStatusRepository.isExistUser(user)) {
+            throw new IllegalArgumentException("userStatus already exist");
+        }
         return userStatusRepository.save(new UserStatus(user));
     }
 
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/domain/channel/exception/AlreadyJoinUserException.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/domain/channel/exception/AlreadyJoinUserException.java
@@ -0,0 +1,11 @@
+package com.sprint.mission.discodeit.domain.channel.exception;
+
+import com.sprint.mission.discodeit.global.error.ErrorCode;
+import com.sprint.mission.discodeit.global.error.exception.InvalidException;
+
+public class AlreadyJoinUserException extends InvalidException {
+
+    public AlreadyJoinUserException(ErrorCode errorCode, String message) {
+        super(errorCode, message);
+    }
+}
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/global/error/ErrorCode.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/global/error/ErrorCode.java
@@ -29,7 +29,7 @@ public enum ErrorCode {
 
     // Channel
     INVALID_CHANNEL_NAME_NOT_NULL(400, "채널 이름은 필수 입력값 입니다."),
-
+    ALREADY_CHANNEL_JOIN_USER(400, "이미 참여한 채널입니다."),
     // Message
     INVALID_MESSAGE_CONTENT_NOT_NULL(400, "메시지 내용은 필수 입력값 입니다."),
     ;
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/FileChannelRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/FileChannelRepository.java
@@ -1,6 +1,7 @@
 package com.sprint.mission.discodeit.repository.channel;
 
 import com.sprint.mission.discodeit.domain.channel.Channel;
+import com.sprint.mission.discodeit.domain.user.User;
 import com.sprint.mission.discodeit.repository.channel.interfaces.ChannelRepository;
 import java.util.List;
 import java.util.Optional;
@@ -26,4 +27,9 @@ public List<Channel> findAllByUserId(UUID userId) {
     public void deleteById(UUID uuid) {
 
     }
+
+    @Override
+    public boolean isExistUser(User user, Channel channel) {
+        return false;
+    }
 }
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/InMemoryChannelRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/InMemoryChannelRepository.java
@@ -1,26 +1,28 @@
 package com.sprint.mission.discodeit.repository.channel;
 
 import com.sprint.mission.discodeit.domain.channel.Channel;
+import com.sprint.mission.discodeit.domain.user.User;
 import com.sprint.mission.discodeit.repository.channel.interfaces.ChannelRepository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
 public class InMemoryChannelRepository implements ChannelRepository {
 
-    private final Map<UUID, Channel> uuidChannels = new HashMap<>();
+    private final Map<UUID, Channel> channelUUIDStore = new HashMap<>();
 
     @Override
     public Channel save(Channel channel) {
-        Channel savedChannel = uuidChannels.put(channel.getId(), channel);
+        Channel savedChannel = channelUUIDStore.put(channel.getId(), channel);
         return channel;
     }
 
     @Override
     public Optional<Channel> findOneById(UUID uuid) {
-        return Optional.ofNullable(uuidChannels.get(uuid));
+        return Optional.ofNullable(channelUUIDStore.get(uuid));
     }
 
     @Override
@@ -30,6 +32,12 @@ public List<Channel> findAllByUserId(UUID userId) {
 
     @Override
     public void deleteById(UUID uuid) {
-        uuidChannels.remove(uuid);
+        channelUUIDStore.remove(uuid);
+    }
+
+    @Override
+    public boolean isExistUser(User user, Channel channel) {
+        Set<UUID> participantUserId = channelUUIDStore.get(channel.getId()).getParticipantUserId();
+        return participantUserId.contains(user.getId());
     }
 }
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/interfaces/ChannelRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/channel/interfaces/ChannelRepository.java
@@ -1,6 +1,7 @@
 package com.sprint.mission.discodeit.repository.channel.interfaces;
 
 import com.sprint.mission.discodeit.domain.channel.Channel;
+import com.sprint.mission.discodeit.domain.user.User;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -14,4 +15,6 @@ public interface ChannelRepository {
     List<Channel> findAllByUserId(UUID userId);
 
     void deleteById(UUID uuid);
+
+    boolean isExistUser(User user, Channel channel);
 }
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/readstatus/ReadStatusInMemoryRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/readstatus/ReadStatusInMemoryRepository.java
@@ -12,26 +12,26 @@
 
 public class ReadStatusInMemoryRepository implements ReadStatusRepository {
 
-    private final Map<ReadStatusKey, ReadStatus> readStatusMap = new HashMap<>();
+    private final Map<ReadStatusKey, ReadStatus> readStatusStore = new HashMap<>();
 
     @Override
     public ReadStatus save(ReadStatus readStatus) {
         ReadStatusKey readStatusKey = ReadStatusKey.of(readStatus.getUser(), readStatus.getChannel());
-        readStatusMap.put(readStatusKey, readStatus);
+        readStatusStore.put(readStatusKey, readStatus);
         return readStatus;
     }
 
     @Override
     public Optional<ReadStatus> findOneByUserIdAndChannelId(User user, Channel channel) {
         ReadStatusKey readStatusKey = ReadStatusKey.of(user, channel);
-        return Optional.ofNullable(readStatusMap.get(readStatusKey));
+        return Optional.ofNullable(readStatusStore.get(readStatusKey));
     }
 
     @Override
     public void deleteByChannel(Channel channel) {
         channel.getParticipantUserId().stream()
                 .map(userId -> new ReadStatusKey(userId, channel.getId()))
-                .forEach(readStatusMap::remove);
+                .forEach(readStatusStore::remove);
     }
 
     private static class ReadStatusKey {
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/user/InMemoryUserRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/user/InMemoryUserRepository.java
@@ -38,7 +38,7 @@ public Optional<User> findOneByEmail(Email email) {
 
     @Override
     public List<User> findAll() {
-        return uuidUsers.values().stream().toList();
+        return List.copyOf(uuidUsers.values());
     }
 
     @Override
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/userstatus/UserStatusInMemoryRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/userstatus/UserStatusInMemoryRepository.java
@@ -4,6 +4,7 @@
 import com.sprint.mission.discodeit.domain.userstatus.UserStatus;
 import com.sprint.mission.discodeit.repository.userstatus.interfaces.UserStatusRepository;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import org.springframework.stereotype.Repository;
@@ -25,8 +26,18 @@ public Optional<UserStatus> findByUser(User user) {
         return Optional.ofNullable(userStatuses.get(user));
     }
 
+    @Override
+    public List<UserStatus> findAll() {
+        return List.copyOf(userStatuses.values());
+    }
+
     @Override
     public void deleteByUser(User user) {
         userStatuses.remove(user);
     }
+
+    @Override
+    public boolean isExistUser(User user) {
+        return userStatuses.containsKey(user);
+    }
 }
diff --git a/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/userstatus/interfaces/UserStatusRepository.java b/codeit-bootcamp-spring/1-sprint-mission/src/main/java/com/sprint/mission/discodeit/repository/userstatus/interfaces/UserStatusRepository.java
@@ -2,6 +2,7 @@
 
 import com.sprint.mission.discodeit.domain.user.User;
 import com.sprint.mission.discodeit.domain.userstatus.UserStatus;
+import java.util.List;
 import java.util.Optional;
 
 public interface UserStatusRepository {
@@ -10,5 +11,9 @@ public interface UserStatusRepository {
 
     Optional<UserStatus> findByUser(User user);
 
+    List<UserStatus> findAll();
+
     void deleteByUser(User user);
+
+    boolean isExistUser(User user);
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ public UserStatusService(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public UserStatus createAtFirstJoin(User user) {`
	`21`	`+ if (userStatusRepository.isExistUser(user)) {`
	`22`	`+ throw new IllegalArgumentException("userStatus already exist");`
	`23`	`+ }`
`21`	`24`	`return userStatusRepository.save(new UserStatus(user));`
`22`	`25`	`}`
`23`	`26`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public enum ErrorCode {`
`29`	`29`
`30`	`30`	`// Channel`
`31`	`31`	`INVALID_CHANNEL_NAME_NOT_NULL(400, "채널 이름은 필수 입력값 입니다."),`
`32`		`-`
	`32`	`+ ALREADY_CHANNEL_JOIN_USER(400, "이미 참여한 채널입니다."),`
`33`	`33`	`// Message`
`34`	`34`	`INVALID_MESSAGE_CONTENT_NOT_NULL(400, "메시지 내용은 필수 입력값 입니다."),`
`35`	`35`	`;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Optional<User> findOneByEmail(Email email) {`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public List<User> findAll() {`
`41`		`- return uuidUsers.values().stream().toList();`
	`41`	`+ return List.copyOf(uuidUsers.values());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`