피드백 전체 반영 완료

bs8841 · bs8841 · commit 717474226513 · 2025-04-16T10:56:19.000+09:00
diff --git a/src/main/java/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java
@@ -3,23 +3,28 @@
 import com.sprint.mission.discodeit.menu.ChannelMenu;
 import com.sprint.mission.discodeit.menu.MessageMenu;
 import com.sprint.mission.discodeit.menu.UserMenu;
+import com.sprint.mission.discodeit.service.ChannelService;
+import com.sprint.mission.discodeit.service.MessageService;
+import com.sprint.mission.discodeit.service.UserService;
+import com.sprint.mission.discodeit.service.jcf.integration.ChannelIntegration;
 import com.sprint.mission.discodeit.service.jcf.JCFChannelService;
 import com.sprint.mission.discodeit.service.jcf.JCFMessageService;
 import com.sprint.mission.discodeit.service.jcf.JCFUserService;
+import com.sprint.mission.discodeit.service.jcf.integration.MessageIntegration;
+import com.sprint.mission.discodeit.service.jcf.integration.UserIntegration;
 
 import java.util.Scanner;
 
 public class JavaApplication {
     public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
-        JCFUserService userService = new JCFUserService();
-        JCFMessageService messageService = new JCFMessageService(userService, null);
-        JCFChannelService channelService = new JCFChannelService();
+        UserService userService = new JCFUserService();
+        MessageService messageService = new JCFMessageService();
+        ChannelService channelService = new JCFChannelService();
 
-        messageService.setChannelService(channelService);
-        userService.setChannelService(channelService);
-
-        ChannelApplication channelApplication = new ChannelApplication(channelService, userService, messageService);
+        UserIntegration userIntegration = new UserIntegration(userService, channelService);
+        MessageIntegration messageIntegration = new MessageIntegration(messageService, userService, channelService);
+        ChannelIntegration channelIntegration = new ChannelIntegration(channelService, userService, messageService);
 
         while (true) {
             System.out.println("\n===== MAIN MENU =====");
@@ -34,13 +39,13 @@ public static void main(String[] args) {
             try {
                 switch (mainChoice) {
                     case "1":
-                        UserMenu.manageUsers(scanner, userService);
+                        UserMenu.manageUsers(scanner, userService, userIntegration);
                         break;
                     case "2":
-                        ChannelMenu.manageChannels(scanner, channelService, channelApplication);
+                        ChannelMenu.manageChannels(scanner, channelService, channelIntegration);
                         break;
                     case "3":
-                        MessageMenu.manageMessages(scanner, messageService);
+                        MessageMenu.manageMessages(scanner, messageService, messageIntegration);
                         break;
                     case "0":
                         System.out.println("종료합니다.");
diff --git a/src/main/java/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java
@@ -13,8 +13,8 @@ public User(String userName) {
         this.userName = userName;
     }
 
-    public String getUserName() {
-        return userName;
+    public Set<UUID> getChannelIds() {
+        return channelIds;
     }
 
     public void updateUserName(String userName) {
diff --git a/src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java
@@ -1,14 +1,14 @@
 package com.sprint.mission.discodeit.menu;
 
-import com.sprint.mission.discodeit.ChannelApplication;
+import com.sprint.mission.discodeit.service.jcf.integration.ChannelIntegration;
 import com.sprint.mission.discodeit.entity.Channel;
 import com.sprint.mission.discodeit.service.ChannelService;
 
 import java.util.Scanner;
 import java.util.UUID;
 
 public class ChannelMenu {
-    public static void manageChannels(Scanner scanner, ChannelService channelService, ChannelApplication channelApplication) {
+    public static void manageChannels(Scanner scanner, ChannelService channelService, ChannelIntegration channelIntegration) {
         while (true) {
             System.out.println("\n===== CHANNEL MENU =====");
             System.out.println("1. 채널 생성");
@@ -52,14 +52,14 @@ public static void manageChannels(Scanner scanner, ChannelService channelService
                     case "5":
                         System.out.print("삭제할 채널 ID 입력: ");
                         UUID delId = UUID.fromString(scanner.nextLine());
-                        channelApplication.deleteChannel(delId);
+                        channelIntegration.deleteChannel(delId);
                         break;
                     case "6":
                         System.out.print("채널 ID 입력: ");
                         UUID chId = UUID.fromString(scanner.nextLine());
                         System.out.print("사용자 ID 입력: ");
                         UUID userId = UUID.fromString(scanner.nextLine());
-                        channelApplication.addUserToChannel(chId, userId);
+                        channelIntegration.addUserToChannel(chId, userId);
                         break;
                     case "0":
                         return;
diff --git a/src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/MessageMenu.java
@@ -1,13 +1,14 @@
 package com.sprint.mission.discodeit.menu;
 
 import com.sprint.mission.discodeit.entity.Message;
-import com.sprint.mission.discodeit.service.jcf.JCFMessageService;
+import com.sprint.mission.discodeit.service.MessageService;
+import com.sprint.mission.discodeit.service.jcf.integration.MessageIntegration;
 
 import java.util.Scanner;
 import java.util.UUID;
 
 public class MessageMenu {
-    public static void manageMessages(Scanner scanner, JCFMessageService messageService) {
+    public static void manageMessages(Scanner scanner, MessageService messageService, MessageIntegration messageIntegration) {
         while (true) {
             System.out.println("\n===== MESSAGE MENU =====");
             System.out.println("1. 메시지 생성");
@@ -28,7 +29,7 @@ public static void manageMessages(Scanner scanner, JCFMessageService messageServ
                         UUID sender = UUID.fromString(scanner.nextLine());
                         System.out.print("채널 ID: ");
                         UUID ch = UUID.fromString(scanner.nextLine());
-                        Message m = messageService.createMessageCheck(content, sender, ch);
+                        Message m = messageIntegration.createMessage(content, sender, ch);
                         System.out.println("생성된 메시지 ID: " + m.getId());
                         break;
                     case "2":
@@ -53,7 +54,7 @@ public static void manageMessages(Scanner scanner, JCFMessageService messageServ
                     case "5":
                         System.out.print("삭제할 메시지 ID 입력: ");
                         UUID delId = UUID.fromString(scanner.nextLine());
-                        messageService.deleteMessage(delId);
+                        messageIntegration.deleteMessage(delId);
                         break;
                     case "0":
                         return;
diff --git a/src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java b/src/main/java/com/sprint/mission/discodeit/menu/UserMenu.java
@@ -1,13 +1,14 @@
 package com.sprint.mission.discodeit.menu;
 
 import com.sprint.mission.discodeit.entity.User;
-import com.sprint.mission.discodeit.service.jcf.JCFUserService;
+import com.sprint.mission.discodeit.service.UserService;
+import com.sprint.mission.discodeit.service.jcf.integration.UserIntegration;
 
 import java.util.Scanner;
 import java.util.UUID;
 
 public class UserMenu {
-    public static void manageUsers(Scanner scanner, JCFUserService userService) {
+    public static void manageUsers(Scanner scanner, UserService userService, UserIntegration userIntegration) {
         while (true) {
             System.out.println("\n===== USER MENU =====");
             System.out.println("1. 사용자 등록");
@@ -50,7 +51,7 @@ public static void manageUsers(Scanner scanner, JCFUserService userService) {
                     case "5":
                         System.out.print("삭제할 사용자 ID 입력: ");
                         UUID delId = UUID.fromString(scanner.nextLine());
-                        userService.deleteUser(delId);
+                        userIntegration.deleteUser(delId);
                         break;
                     case "0":
                         return;
diff --git a/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java
@@ -12,6 +12,4 @@ public interface ChannelService {
     List<Channel> getAllChannels();
     void updateChannel(UUID channelId, String channelName);
     void deleteChannel(UUID channelId);
-    void addMessageId(UUID channelId, UUID messageId);
-    void addUserId(UUID channelId, UUID userId);
 }
diff --git a/src/main/java/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java
@@ -12,5 +12,4 @@ public interface MessageService {
     List<Message> getAllMessages();
     void updateMessage(UUID messageId, String msgContent);
     void deleteMessage(UUID messageId);
-    Message createMessageCheck(String msgContent, UUID senderId, UUID channelId);
 }
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
@@ -28,14 +28,4 @@ public void updateChannel(UUID channelId, String channelName) {
     public void deleteChannel(UUID channelId) {
         data.remove(channelId);
     }
-
-    @Override
-    public void addMessageId(UUID channelId, UUID messageId) {
-        getChannel(channelId).ifPresent(channel -> channel.addMessage(messageId));
-    }
-
-    @Override
-    public void addUserId(UUID channelId, UUID userId) {
-        getChannel(channelId).ifPresent(channel -> channel.addUser(userId));
-    }
 }
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
@@ -1,22 +1,12 @@
 package com.sprint.mission.discodeit.service.jcf;
 
-import com.sprint.mission.discodeit.entity.Channel;
 import com.sprint.mission.discodeit.entity.Message;
-import com.sprint.mission.discodeit.service.ChannelService;
 import com.sprint.mission.discodeit.service.MessageService;
-import com.sprint.mission.discodeit.service.UserService;
 
 import java.util.*;
 
 public class JCFMessageService implements MessageService {
     private final Map<UUID, Message> data = new HashMap<>();
-    private final UserService userService;
-    private ChannelService channelService;
-
-    public JCFMessageService(UserService userService, ChannelService channelService) {
-        this.userService = userService;
-        this.channelService = channelService;
-    }
 
     public Message createMessage(Message message) {
         data.put(message.getId(), message);
@@ -31,10 +21,6 @@ public List<Message> getAllMessages() {
         return new ArrayList<>(data.values());
     }
 
-    public void setChannelService(JCFChannelService channelService) {
-        this.channelService = channelService;
-    }
-
     // update 실패 시 피드백 출력
     public void updateMessage(UUID messageId, String message) {
         getMessage(messageId)
@@ -46,20 +32,4 @@ public void deleteMessage(UUID messageId) {
         data.remove(messageId);
     }
 
-    public Message createMessageCheck(String msgContent, UUID senderId, UUID channelId) {
-        userService.getUser(senderId)
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저"));
-
-        Channel channel = channelService.getChannel(channelId)
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 채널"));
-
-        if(!channel.getUserIds().contains(senderId)) {
-            throw new SecurityException("채널에 속해있지 않은 유저"); // 권한이 없는 경우이므로 SecurityException으로 수정
-        }
-
-        Message message = new Message(msgContent, senderId, channelId);
-        Message created = createMessage(message);
-        channelService.addMessageId(channelId, created.getId());
-        return created;
-    }
 }
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
@@ -1,18 +1,12 @@
 package com.sprint.mission.discodeit.service.jcf;
 
 import com.sprint.mission.discodeit.entity.User;
-import com.sprint.mission.discodeit.service.ChannelService;
 import com.sprint.mission.discodeit.service.UserService;
 
 import java.util.*;
 
 public class JCFUserService implements UserService {
     private final Map<UUID, User> data = new HashMap<>();
-    private ChannelService channelService; // 복수개 필요가 없으므로 단일로 변경
-
-    public void setChannelService(ChannelService channelService) {
-        this.channelService = channelService;
-    }
 
     @Override
     public User createUser(User user) {
@@ -38,8 +32,5 @@ public void updateUser(UUID userId, String userName) {
     @Override
     public void deleteUser(UUID userId) {
         data.remove(userId);
-        if (channelService != null) {
-            channelService.getAllChannels().forEach(channel -> channel.getUserIds().remove(userId));
-        }
     }
 }
diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/ChannelIntegration.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/ChannelIntegration.java
@@ -1,20 +1,19 @@
-package com.sprint.mission.discodeit;
+package com.sprint.mission.discodeit.service.jcf.integration;
 
 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 java.util.UUID;
 
-public class ChannelApplication {
+public class ChannelIntegration {
     private final ChannelService channelService;
     private final UserService userService;
     private final MessageService messageService;
 
-    public ChannelApplication(ChannelService channelService, UserService userService, MessageService messageService) {
+    public ChannelIntegration(ChannelService channelService, UserService userService, MessageService messageService) {
         this.channelService = channelService;
         this.userService = userService;
         this.messageService = messageService;
@@ -28,21 +27,7 @@ public void addUserToChannel(UUID channelId, UUID userId) {
                 .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저"));
 
         user.addChannel(channelId);
-        channelService.addUserId(channelId, userId);
-    }
-
-    public void addMessageToChannel(UUID channelId, UUID messageId) {
-        Channel channel = channelService.getChannel(channelId)
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 채널"));
-
-        Message message = messageService.getMessage(messageId)
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 메시지"));
-
-        if (!message.getChannelId().equals(channelId)) {
-            throw new IllegalStateException("이 채널에 속하지 않은 메시지입니다");
-        }
-
-        channelService.addMessageId(channelId, messageId);
+        channel.addUser(userId);
     }
 
     public void deleteChannel(UUID channelId) {
@@ -53,6 +38,10 @@ public void deleteChannel(UUID channelId) {
             messageService.deleteMessage(messageId);
         }
 
+        for (UUID userId : channel.getUserIds()) {
+            userService.getUser(userId).ifPresent(user -> user.getChannelIds().remove(channelId));
+        }
+
         channelService.deleteChannel(channelId);
     }
 }
diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/MessageIntegration.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/MessageIntegration.java
@@ -0,0 +1,46 @@
+package com.sprint.mission.discodeit.service.jcf.integration;
+
+import com.sprint.mission.discodeit.entity.Channel;
+import com.sprint.mission.discodeit.entity.Message;
+import com.sprint.mission.discodeit.service.ChannelService;
+import com.sprint.mission.discodeit.service.MessageService;
+import com.sprint.mission.discodeit.service.UserService;
+
+import java.util.UUID;
+
+public class MessageIntegration {
+    private final MessageService messageService;
+    private final UserService userService;
+    private final ChannelService channelService;
+
+    public MessageIntegration(MessageService messageService, UserService userService, ChannelService channelService) {
+        this.messageService = messageService;
+        this.userService = userService;
+        this.channelService = channelService;
+    }
+
+    public Message createMessage(String msgContent, UUID senderId, UUID channelId) {
+        userService.getUser(senderId)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저"));
+
+        Channel channel = channelService.getChannel(channelId)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 채널"));
+
+        if(!channel.getUserIds().contains(senderId)) {
+            throw new SecurityException("채널에 속해있지 않은 유저"); // 권한이 없는 경우이므로 SecurityException으로 수정
+        }
+
+        Message message = new Message(msgContent, senderId, channelId);
+        Message created = messageService.createMessage(message);
+        channel.addMessage(created.getId());
+        return created;
+    }
+
+    public void deleteMessage(UUID messageId) {
+        Message message = messageService.getMessage(messageId)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 메시지"));
+
+        channelService.getChannel(message.getChannelId()).ifPresent(channel -> channel.getMessageIds().remove(messageId));
+        messageService.deleteMessage(messageId);
+    }
+}
diff --git a/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/UserIntegration.java b/src/main/java/com/sprint/mission/discodeit/service/jcf/integration/UserIntegration.java
@@ -0,0 +1,21 @@
+package com.sprint.mission.discodeit.service.jcf.integration;
+
+import com.sprint.mission.discodeit.service.ChannelService;
+import com.sprint.mission.discodeit.service.UserService;
+
+import java.util.UUID;
+
+public class UserIntegration {
+    private final UserService userService;
+    private final ChannelService channelService;
+
+    public UserIntegration(UserService userService, ChannelService channelService) {
+        this.userService = userService;
+        this.channelService = channelService;
+    }
+
+    public void deleteUser(UUID userId) {
+        userService.deleteUser(userId);
+        channelService.getAllChannels().forEach(channel -> channel.getUserIds().remove(userId));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public User(String userName) {`
`13`	`13`	`this.userName = userName;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public String getUserName() {`
`17`		`- return userName;`
	`16`	`+ public Set<UUID> getChannelIds() {`
	`17`	`+ return channelIds;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public void updateUserName(String userName) {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,4 @@ public interface ChannelService {`
`12`	`12`	`List<Channel> getAllChannels();`
`13`	`13`	`void updateChannel(UUID channelId, String channelName);`
`14`	`14`	`void deleteChannel(UUID channelId);`
`15`		`- void addMessageId(UUID channelId, UUID messageId);`
`16`		`- void addUserId(UUID channelId, UUID userId);`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,4 @@ public interface MessageService {`
`12`	`12`	`List<Message> getAllMessages();`
`13`	`13`	`void updateMessage(UUID messageId, String msgContent);`
`14`	`14`	`void deleteMessage(UUID messageId);`
`15`		`- Message createMessageCheck(String msgContent, UUID senderId, UUID channelId);`
`16`	`15`	`}`