Merge pull request #52 from hyohyo-zz/sprint2-advenced

[조현아] sprint2

Author: azjaehyun

HELP.md

@@ -0,0 +1,22 @@
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Gradle documentation](https://docs.gradle.org)
+* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.4/gradle-plugin)
+* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.4/gradle-plugin/packaging-oci-image.html)
+* [Spring Web](https://docs.spring.io/spring-boot/3.4.4/reference/web/servlet.html)
+
+### Guides
+The following guides illustrate how to use some features concretely:
+
+* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
+* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
+* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/)
+
+### Additional Links
+These additional references should also help you:
+
+* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle)
+

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

@@ -7,12 +7,16 @@
 import com.sprint.mission.discodeit.service.ChannelService;
 import com.sprint.mission.discodeit.service.MessageService;
 import com.sprint.mission.discodeit.service.UserService;
+import com.sprint.mission.discodeit.util.DataInitializer;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 public class JavaApplication {
     public static void main(String[] args) {
+        //초기화
+        DataInitializer.clearSerializedData();
+
         ServiceFactory serviceFactory = ServiceFactory.getInstance();
 
         ChannelService channelService = serviceFactory.createChannelService();
@@ -30,7 +34,6 @@ public static void main(String[] args) {
 
     }
 
-
     //유저생성 및 등록
     private static List<User> createAndRegisterUsers(UserService userService) {
         List<User> users = List.of(
@@ -40,9 +43,7 @@ private static List<User> createAndRegisterUsers(UserService userService) {
             new User("이훈이", "남", "[email protected]", "010-2345-6789", "2hun222"),
             new User("맹구", "남", "[email protected]", "010-1010-0101", "stone_lover"),
             new User("한유리", "여", "[email protected]", "010-1111-2222", "12345"),
-            //-----심화-----//
-            //중복 이메일 유저_ex)
-            new User("한유리", "여", "[email protected]", "010-1111-2222", "12345")
+            new User("한유리", "여", "[email protected]", "010-1111-2222", "12345")  //중복 이메일 유저_ex)
         );
 
         System.out.println("<--------------------유저를 등록합니다------------------------->\n.\n.");
@@ -62,7 +63,6 @@ private static List<User> createAndRegisterUsers(UserService userService) {
 
         System.out.println(".\n.\n<--------------------유저 등록 종료---------------------------->\n");
         return registeredUsers;
-        //-----심화-----//
     }
 
     //채널,멤버,카테고리 생성 및 등록
@@ -71,11 +71,9 @@ private static List<Channel> createAndRegisterChannels(ChannelService channelSer
         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 = new HashSet<>(Set.of(users.get(1), users.get(2), users.get(4)));
         List<String> cat2 = List.of("이벤트", "소통");
 
-        //채널3 멤버, 카테고리생성
         Set<User> members3 = new HashSet<>(Set.of(users.get(5)));
         List<String> cat3 = List.of("기타");
 
@@ -147,7 +145,6 @@ private static void demonstrateUserOperations(UserService userService, List<User
         readUser(userService, users);
         updateUser(userService, users);
         deleteUser(userService, users);
-        groupingUser(userService, users);
 
     }
 
@@ -202,23 +199,12 @@ private static void deleteUser(UserService userService, List<User> users){
         System.out.println();
     }
 
-    private static void groupingUser(UserService userService, List<User> users){
-        System.out.println("------------------------- GroupingUser -------------------------");
-        //성별 그룹화
-        System.out.println("\n성별 그룹화");
-        userService.groupByGender().forEach((gender, list) -> {
-            System.out.println("[" + gender + "]\n" + list);
-        });
-    }
-
-
     private static void demonstrateChannelOperations(ChannelService channelService, List<Channel> channels, List<User> users) {
         System.out.println("\n########################### Channel ############################");
 
         readChannel(channelService,channels,users);
         updateChannel(channelService,channels,users);
         deleteChannel(channelService,channels,users);
-        groupingChannel(channelService, channels, users);
     }
 
     private static void readChannel(ChannelService channelService, List<Channel> channels, List<User> users){
@@ -317,22 +303,6 @@ private static void deleteChannel(ChannelService channelService, List<Channel> c
         channelService.readAll().forEach(System.out::println);
 
     }
-    private static void groupingChannel(ChannelService channelService, List<Channel> channels, List<User> users) {
-        System.out.println("------------------------- GroupingUser -------------------------");
-        //채널별 카테고리
-        System.out.print("\n채널별 카테고리 목록:\n");
-        channelService.groupByChannel().forEach((channelName, list) -> {
-            System.out.println("[" + channelName + "]\n" + list);
-        });
-
-        //채널별 유저 수
-        System.out.println("\n채널별 유저 수:");
-        for (Channel channel : channels) {
-            int memberCount = channelService.members(channel.getId()).size();
-            System.out.println("[" + channel.getChannelName() + "] 채널 유저 수: " + memberCount + "명");
-        }
-    }
-
 
     private static void demonstrateMessageOperations(MessageService messageService) {
         System.out.println("\n########################### Message ###########################");

src/main/java/com/sprint/mission/discodeit/channel.ser

@@ -1,9 +1,12 @@
 package com.sprint.mission.discodeit.entity;
 
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class Channel {
+public class Channel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private UUID id;
     private String channelName;
     private User keyUser;
@@ -32,13 +35,15 @@ public UUID getId() {
     public String getChannelName() {
         return channelName;
     }
+
     public void setChannelName(String channelName) {
         this.channelName = channelName;
     }
 
     public List<String> getCategory() {
         return categories;
     }
+
     public void setCategory(List<String> categories) {
         this.categories = categories;
     }
@@ -53,13 +58,15 @@ public void setMembers(Set<User> members) {
     public long getCreatedAt() {
         return createdAt;
     }
+
     public void setCreatedAt(long createdAt) {
         this.createdAt = createdAt;
     }
 
     public long getUpdatedAt() {
         return updatedAt;
     }
+
     public void setUpdatedAt(long updatedAt) {
         this.updatedAt = updatedAt;
     }
@@ -80,21 +87,46 @@ public void update(Channel updateChannelData) {
         this.updatedAt = System.currentTimeMillis();
     }
 
+    //채널 멤버가 아닌 유저가 메시지 생성시
     public void validateMembership(User sender) {
-        //채널 멤버가 아닌 유저가 메시지 생성시
         if (!members.contains(sender)) {
             throw new IllegalArgumentException(
                     " ---" + sender.getName() + "(은/는) [" + channelName + "]채널 멤버가 아닙니다.");
         }
     }
-        public void validateCategory(String category) {
-        //채널에 없는 카테고리에 메시지 생성시
+
+    //카테고리 중복 확인
+    public void validateUniqueCategory() {
+        Set<String> categorySet = new HashSet<>(this.categories);
+        if (categorySet.size() != this.categories.size()) {
+            throw new IllegalArgumentException(" --- 중복된 카테고리가 포함되어 있습니다.");
+        }
+    }
+
+    //채널에 없는 카테고리에 메시지 생성시
+    public void validateCategory(String category){
         if (!categories.contains(category)) {
             throw new IllegalArgumentException(
                     " ---"+ category + "(은/는) [" +channelName + "]채널에 존재 하지 않는 카테고리입니다.");
         }
     }
 
+    public void addKeyUserToMembers() {
+        this.members.add(this.keyUser);
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof Channel channel)) return false;
+        return id.equals(channel.id);
+    }
+
     public String toString() {
         return "Channel{" +
                 "ChannelName= '" + channelName + '\'' +

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

@@ -1,10 +1,13 @@
 package com.sprint.mission.discodeit.entity;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-public class Message {
+public class Message implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private UUID id;
     private User sender;        //보낸사람
     private Channel channel;
@@ -79,6 +82,18 @@ public void validateContent() {
         }
     }
 
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof Message message)) return false;
+        return id.equals(message.id);
+    }
+
     public String toString() {
         return "Message{" +
                 "id= '" + id + '\'' +

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

@@ -1,16 +1,19 @@
 package com.sprint.mission.discodeit.entity;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.UUID;
 
-public class User {
+public class User implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private UUID id;
     private String gender;
     private String name;
     private String email;
     private String phone;
-    private String password;
+    private transient String password;
     private long createdAt;
     private long updatedAt;
 
@@ -32,48 +35,71 @@ public UUID getId() {
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
 
-    public String getGender() {return gender;}
-    public void setGender(String gender) {this.gender = gender;}
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
 
     public String getEmail() {
         return email;
     }
+
     public void setEmail(String email) {
         this.email = email;
     }
 
     public String getPhone() {
         return phone;
     }
+
     public void setPhone(String phone) {
         this.phone = phone;
     }
 
     public String getPassword() {
         return password;
     }
+
     public void setPassword(String password) {
         this.password = password;
     }
 
     public long getCreatedAt() {
         return createdAt;
     }
+
     public void setCreatedAt(long createdAt) {
         this.createdAt = createdAt;
     }
 
     public long getUpdatedAt() {
         return updatedAt;
     }
+
     public void setUpdatedAt(long updatedAt) {
         this.updatedAt = updatedAt;
     }
 
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof User user)) return false;
+        return id.equals(user.id);
+    }
+
     public void update(User updateUserData) {
         this.name = updateUserData.name;
         this.gender = updateUserData.gender;