feat: 채널삭제기능 보충

Author: hyohyo-zz

src/main/java/com/sprint/mission/discodeit/JavaApplication.java

@@ -67,29 +67,29 @@ private static List<User> createAndRegisterUsers(JCFUserService userService) {
     //채널,멤버,카테고리 생성 및 등록
     private static List<Channel> createAndRegisterChannels(JCFChannelService channelService, List<User> users) {
         //채널1 멤버, 카테고리생성
-        Set<User> members1 = Set.of(users.get(0), users.get(1), users.get(3));
+        Set<User> members1 = new HashSet<>(Set.of(users.get(0), users.get(1), users.get(3)));
         List<String> cat1 = List.of("공지", "질문", "2팀");
 
         //채널2 멤버, 카테고리생성
-        Set<User> members2 = Set.of(users.get(1), users.get(2), users.get(4));
+        Set<User> members2 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4)));
         List<String> cat2 = List.of("이벤트", "소통");
 
         //채널3 멤버, 카테고리생성
-        Set<User> members3 = Set.of(users.get(5));
+        Set<User> members3 = new HashSet<>(Set.of(users.get(5)));
         List<String> cat3 = List.of("기타");
 
-        Channel channel1 = new Channel("sp01", cat1, members1);
-        Channel channel2 = new Channel("sp02", cat2, members2);
-        Channel channel3 = new Channel("sp03", cat3, members3);
+        Channel channel1 = new Channel("sp01", users.get(1), cat1, members1);
+        Channel channel2 = new Channel("sp02", users.get(1), cat2, members2);
+        Channel channel3 = new Channel("sp03", users.get(5), cat3, members3);
 
 
         //-----심화-----//
         //중복 채널명_ex)
-        Channel channel4 = new Channel("sp03", cat3, members3);
+        Channel channel4 = new Channel("sp03", users.get(5), cat3, members3);
 
         //중복 카테고리_ex)
         List<String> cat5 = List.of("공지","공지");
-        Channel channel5 = new Channel("sp05", cat5, members3);
+        Channel channel5 = new Channel("sp05", users.get(5), cat5, members3);
 
         System.out.println("<--------------------채널을 등록합니다------------------------->\n.\n.");
 
@@ -100,7 +100,8 @@ private static List<Channel> createAndRegisterChannels(JCFChannelService channel
             try {
                 channelService.create(ch_i.get(i));
                 channels.add(ch_i.get(i));
-                System.out.println("채널"+(i+1)+"[" + ch_i.get(i).getChannelName() + "] 등록 완료");
+                System.out.print("채널"+(i+1)+"[" + ch_i.get(i).getChannelName() + "] 등록 완료");
+                System.out.println(" --- 방장: " + ch_i.get(i).getKeyUser().getName());
 
             } catch (IllegalArgumentException e) {
                 System.out.println("!!채널" + (i+1) + "[" + ch_i.get(i).getChannelName() + "] 등록 실패!!" + e.getMessage());
@@ -134,7 +135,7 @@ private static void createAndRegisterMessages(JCFMessageService messageService,
             try {
                 messageService.create(me_i.get(i));
                 messages.add(me_i.get(i));
-                System.out.println("메시지"+(i+1)+" 저장 완료");
+                System.out.println("채널 ["+messages.get(i).getChannel().getChannelName() + "]에 메시지"+(i+1)+" 저장 완료");
             } catch (IllegalArgumentException e) {
                 System.out.println("!!메시지" + (i+1) + " 저장 실패!!" + e.getMessage());
             }
@@ -177,17 +178,20 @@ private static void updateUser(JCFUserService userService, List<User> users){
         //유저 수정 테스트
         System.out.println("\n유저 수정하기\n수정 전: ");
 
-        //수정하려는 유저 origin에 저장
-        User origin = users.get(2);
-        System.out.println(userService.read(origin.getId()));
+        //수정하려는 유저 original에 저장
+        User original = users.get(2);
+        System.out.println(userService.read(original.getId()));
 
         //수정한 유저정보 updated에 저장
-        User updated = userService.update(origin.getId(), new User("김철수", origin.getGender(), origin.getEmail(), origin.getPhone(), origin.getPassword()));
+        User updated = userService.update(original.getId(), new User("김철수", original.getGender(), original.getEmail(), "010-0011-0011", original.getPassword()));
         System.out.println("수정 후(이름, 번호): ");
         System.out.println(userService.read(updated.getId()));
     }
     private static void deleteUser(JCFUserService userService, List<User> users){
         System.out.println("\n------------------------ DeleteUser ----------------------------");
+        System.out.println("\n전체 유저 목록: ");
+        userService.readAll().forEach(System.out::println);
+
         //유저 삭제 실패
         System.out.println("\n"+ users.get(3).getName() +" 유저 탈퇴 진행중..\n.\n.\n");
         userService.delete(users.get(3).getId(),"0000");
@@ -250,26 +254,59 @@ private static void updateChannel(JCFChannelService channelService, List<Channel
         System.out.println("\n------------------------- UpdateChannel -----------------------");
 
         //채널 수정
-        System.out.println("\n채널 수정하기\n수정 전: ");
-        //수정하려는 채널 original에 저장
-        Channel original =  channels.get(2);
-        System.out.println(channelService.read(original.getId()));
+        Channel original, updated;
+        original = channels.get(2);     //수정하려는 채널
+
+        System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n.");
+        System.out.println("\n["+ original.getChannelName() +"] 수정 완료(채널 이름): ");
+        System.out.println("수정 전: " + channelService.read(original.getId()));
 
         //수정한 채널 updated에 저장, 출력(채널명 수정)
-        Channel updated = channelService.update(original.getId(), new Channel("변경sp03", original.getCategory(), original.getMembers()));
-        System.out.println("수정 후(채널 이름): ");
-        System.out.println(updated.toString());
+        updated = channelService.update(original.getId(), new Channel("변경sp03", original.getKeyUser(),original.getCategory(), original.getMembers()));
+        channelService.update(original.getId(), updated);
+        System.out.println("수정 후: " + channelService.read(original.getId()));
+
+
+        //수정한 채널 updated에 저장, 출력(방장 변경 + member에 추가)
+        System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n.");
+        System.out.println("\n["+ original.getChannelName() +"] 수정 완료(새 유저로 방장 변경): ");
+        System.out.println("수정 전: " + channelService.read(original.getId()));
+
+        updated = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(1), original.getCategory(), original.getMembers()));
+        channelService.update(original.getId(), updated);
+        System.out.println("수정 후: " + channelService.read(original.getId()));
+
+
+        //기존 유저에서 방장변경
+        //채널1에서 변경
+        original = channels.get(0);
+        System.out.println("\n["+ original.getChannelName() +"] 채널 수정 진행중\n.\n.\n.");
+        System.out.println("\n["+ original.getChannelName() +"] 수정 완료(기존 유저로 방장 변경): ");
+        System.out.println("수정 전: " + channelService.read(original.getId()));
+
+        updated = channelService.update(original.getId(), new Channel(original.getChannelName(), users.get(0), original.getCategory(), original.getMembers()));
+        channelService.update(original.getId(), updated);
+        System.out.println("수정 후: " + channelService.read(original.getId()));
+
     }
     private static void deleteChannel(JCFChannelService channelService, List<Channel> channels, List<User> users){
         System.out.println("\n------------------------ DeleteChannel ------------------------");
 
-        //채널 삭제
-        System.out.println("\n.\n.\n<<채널3 삭제 완료>>\n");
-        channelService.delete(channels.get(2).getId());
+        System.out.print("\n전체 채널 목록: \n");
+        channelService.readAll().forEach(System.out::println);
+
+        //채널 삭제 실패
+        System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n");
+        channelService.delete(channels.get(2).getId(), users.get(1), "0000");
+
+        //채널 삭제 성공
+        System.out.println("\n["+ channels.get(2).getChannelName() +"] 채널 삭제 진행중..\n.\n.\n");
+        channelService.delete(channels.get(2).getId(), users.get(1), "9999");
+
+        //삭제 후 전체 유저 조회
+        System.out.print("\n전체 채널 목록: \n");
+        channelService.readAll().forEach(System.out::println);
 
-        //채널 삭제 후 재조회
-        System.out.print("삭제 후 전체 채널: \n");
-        channelService.readAll().forEach(channel -> System.out.println("[" + channel.getChannelName() + "]"));
     }
     private static void groupingChannel(JCFChannelService channelService, List<Channel> channels, List<User> users) {
         System.out.println("------------------------- GroupingUser -------------------------");
@@ -317,15 +354,16 @@ private static void readMessages(JCFMessageService messageService) {
     }
     private static void updateMessages(JCFMessageService messageService) {
         System.out.println("\n------------------------- UpdateMessage ------------------------");
-        //수정할 메시지 origin변수에 저장
-        Message origin = messageService.read(messageService.readAll().get(0).getId());
+        //수정할 메시지 original변수에 저장
+        Message original = messageService.read(messageService.readAll().get(0).getId());
+        System.out.println("\n메시지1 수정 전: \n" + messageService.read(original.getId()));
 
         //변경 메시지 updated변수에 저장
-        Message updated = new Message(origin.getSender(), origin.getChannel(), origin.getCategory(), "공지 수정합니다~~~~");
+        Message updated = new Message(original.getSender(), original.getChannel(), original.getCategory(), "공지 수정합니다~~~~");
 
         //메시지 수정
-        messageService.update(origin.getId(), updated);
-        System.out.println("\n메시지1 수정: \n" + messageService.read(origin.getId()));
+        messageService.update(original.getId(), updated);
+        System.out.println("\n메시지1 수정 후: \n" + messageService.read(original.getId()));
 
         //수정후 전체 메시지
         System.out.println("\n전체 메시지");

src/main/java/com/sprint/mission/discodeit/entity/Channel.java

@@ -1,20 +1,26 @@
 package com.sprint.mission.discodeit.entity;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class Channel {
     private UUID id;
     private String channelName;
+    private User keyUser;
     private List<String> categories;
     private Set<User> members;
     private long createdAt;
     private long updatedAt;
 
-    public Channel(String channelName, List<String> categories, Set<User> members) {
+    public Channel(String channelName, User keyUser, List<String> categories, Set<User> members) {
         this.id = UUID.randomUUID();
         this.channelName = channelName;
         this.categories = categories;
-        this.members = members;
+
+        this.keyUser = keyUser;
+        this.members = new HashSet<>(members);
+        this.members.add(keyUser);
+
         this.createdAt = System.currentTimeMillis();
         this.updatedAt = this.createdAt;    //updatedAt의 처음 시간은 createAt과 동일해야 함
     }
@@ -58,18 +64,28 @@ public void setUpdatedAt(long updatedAt) {
         this.updatedAt = updatedAt;
     }
 
+    public User getKeyUser() {
+        return keyUser;
+    }
+
+    public void addMember(User user) {
+        members.add(user);
+    }
+
     public void update(Channel updateChannelData) {
         this.channelName = updateChannelData.channelName;
-        this.categories = new ArrayList<>(categories);
+        this.keyUser = updateChannelData.keyUser;
+        this.categories = new ArrayList<>(updateChannelData.categories);
         this.members = new HashSet<>(updateChannelData.members);
         this.updatedAt = System.currentTimeMillis();
     }
 
     public String toString() {
         return "Channel{" +
-                "ChannelName='" + channelName + '\'' +
-                ", Category=" + categories + '\'' +
-                ", Members=" + members +
-                '}';
+                "ChannelName= '" + channelName + '\'' +
+                ", KeyUser= '" + keyUser.getName() + '\'' +
+                ", Category= '" + categories + '\'' +
+                ", Members= '" + members.stream().map(User::getName).collect(Collectors.toList()) +
+                "'}";
     }
 }

src/main/java/com/sprint/mission/discodeit/entity/Message.java

@@ -74,11 +74,11 @@ public void update(Message updateMessageData) {
 
     public String toString() {
         return "Message{" +
-                "id= " + id + '\'' +
-                ", sender= " + sender.getName() + '\'' +
-                ", channel= " + channel.getChannelName() + '\'' +
+                "id= '" + id + '\'' +
+                ", sender= '" + sender.getName() + '\'' +
+                ", channel= '" + channel.getChannelName() + '\'' +
                 ", category= '" + category + '\'' +
-                ", content= " + content + '\'' +
+                ", content= '" + content + '\'' +
                 '}';
     }
 

src/main/java/com/sprint/mission/discodeit/entity/User.java

@@ -85,11 +85,11 @@ public void update(User updateUserData) {
 
     public String toString() {
         return "User{" +
-                "UserName='" + name + '\'' +
-                ", Gender='" + gender + '\'' +
-                ", email=" + email + '\'' +
-                ", phone=" + phone + '\'' +
-                ", password=" + password + '\'' +
+                "UserName= '" + name + '\'' +
+                ", Gender= '" + gender + '\'' +
+                ", email= '" + email + '\'' +
+                ", phone= '" + phone + '\'' +
+                ", password= '" + password + '\'' +
                 '}';
     }
 }

src/main/java/com/sprint/mission/discodeit/service/ChannelService.java

@@ -15,7 +15,7 @@ public interface ChannelService {
 
     public Channel update(UUID id, Channel update);
 
-    public boolean delete(UUID id);
+    public boolean delete(UUID id, User user, String password);
 
     public Set<User> members(UUID id);
 

src/main/java/com/sprint/mission/discodeit/service/jcf/JCFChannelService.java

@@ -13,20 +13,25 @@ public class JCFChannelService implements ChannelService {
     //채널 생성
     @Override
     public void create(Channel channel) {
-        //이미 생성된 채널 추가시
+
+        //중복 채널명 검증
         for (Channel existingChannel : data.values()) {
-            if (existingChannel.getChannelName().equals(channel.getChannelName())) {
-                throw new IllegalArgumentException(" --- 이미 등록된 채널입니다.");
+            if (existingChannel.getChannelName().equals(channel.getChannelName())
+            && existingChannel.getKeyUser().equals(channel.getKeyUser())) {
+
+                throw new IllegalArgumentException(" --- "+ channel.getKeyUser().getName()+"님! 이미 등록된 채널입니다.");
             }
         }
 
-        List<String> categoryList = channel.getCategory();
-        Set<String> categorySet = new HashSet<>(categoryList);
-        if (categoryList.size() != categorySet.size()) {    //list사이즈=2, set사이즈1 -> 중복있다
+        //중복 카테고리 검증
+        Set<String> categorySet = new HashSet<>(channel.getCategory());
+        if (channel.getCategory().size() != categorySet.size()) {      //list사이즈=2, set사이즈1 -> 중복있다
             throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다.");
         }
+        channel.getMembers().add(channel.getKeyUser()); // 키 유저를 초기 멤버로 추가
+
+        data.put(channel.getId(), channel);
 
-        this.data.put(channel.getId(),channel);
     }
 
     //채널 조회
@@ -51,10 +56,17 @@ public Channel update(UUID id, Channel update) {
 
     //채널 삭제
     @Override
-    public boolean delete(UUID id) {
-        return data.remove(id) != null;
+    public boolean delete(UUID id, User user, String password) {
+        Channel channel = this.data.get(id);
+        if (!user.getPassword().equals(password)) {
+            System.out.println("!!채널 삭제 실패!! --- 비밀번호 불일치");
+            return false;
+        }
+        System.out.println("<<채널 [" + channel.getChannelName() + "] 삭제 성공>>");
+        return this.data.remove(id) != null;
     }
 
+
     //채널 멤버셋
     @Override
     public Set<User> members(UUID id) {
@@ -78,15 +90,4 @@ public List<Channel> findChannel(String channelName) {
                 .collect(Collectors.toList());
     }
 
-    //멤버에서 유저삭제
-    public void removeMember(User user){
-        for (Channel channel : data.values()) {
-            Set<User> members = new HashSet<>(channel.getMembers());
-
-            if (members.remove(user)) {
-                Channel updated = new Channel(channel.getChannelName(), channel.getCategory(), members);
-                this.data.put(channel.getId(), updated);
-            }
-        }
-    }
 }

src/main/java/com/sprint/mission/discodeit/service/jcf/JCFUserService.java

@@ -85,6 +85,7 @@ private void removeUserFromChannels(User user) {
             if (members.remove(user)) {
                 Channel updatedChannel = new Channel(
                         channel.getChannelName(),
+                        channel.getKeyUser(),
                         channel.getCategory(),
                         members
                 );
@@ -94,8 +95,11 @@ private void removeUserFromChannels(User user) {
     }
 
     //성별 그룹화
-    public Map<String, List<User>> groupByGender() {
+    public Map<String, List<String>> groupByGender() {
         return data.values().stream()
-                .collect(Collectors.groupingBy(User::getGender));
+                .collect(Collectors.groupingBy(
+                        User::getGender,
+                        Collectors.mapping(User::getName, Collectors.toList())
+                ));
     }
 }