sprint3 update

Author: martinP-Ghub

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

@@ -1,8 +1,11 @@
 package com.sprint.mission.discodeit;
 
-import com.sprint.mission.discodeit.dto.UserRequest;
-import com.sprint.mission.discodeit.dto.UserResponse;
+import com.sprint.mission.discodeit.domain.ChannelType;
+import com.sprint.mission.discodeit.dto.*;
+import com.sprint.mission.discodeit.entity.Channel;
 import com.sprint.mission.discodeit.entity.User;
+import com.sprint.mission.discodeit.service.AuthService;
+import com.sprint.mission.discodeit.service.ChannelService;
 import com.sprint.mission.discodeit.service.UserService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -16,8 +19,8 @@ public class DiscodeitApplication {
     static List<UserRequest> setupUser(UserService userService) {
         List<UserRequest> users = List.of(
                 new UserRequest("JohnDoe", "P@ssw0rd1", "john.doe@example.com", "010-1234-5678",null),
-                new UserRequest("JaneDoe", "P@ssw0rd2", "jane.doe@example.com", "010-5678-1234",123123123L),
-                new UserRequest("Alice", "P@ssw0rd3", "alice.wonderland@example.com", "010-8765-4321", 456456456L),
+                new UserRequest("JaneDoe", "P@ssw0rd2", "jane.doe@example.com", "010-5678-1234",null),
+                new UserRequest("Alice", "P@ssw0rd3", "alice.wonderland@example.com", "010-8765-4321", null),
                 new UserRequest("Bob", "P@ssw0rd4", "bob.builder@example.com", "010-4321-8765", null),
                 new UserRequest("Charlie", "P@ssw0rd5", "charlie.choco@example.com", "010-5678-9876", null)
         );
@@ -31,6 +34,8 @@ public static void main(String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args);
 
         UserService userService = context.getBean(UserService.class);
+        AuthService authService = context.getBean(AuthService.class);
+        ChannelService channelService = context.getBean(ChannelService.class);
 
         setupUser(userService);
 
@@ -40,11 +45,70 @@ public static void main(String[] args) {
             System.out.println("userName : " + user.username()
                     + " | Email : " + user.email()
                     + " | phoneNumber : " + user.phoneNumber()
+                    + " | isOnline : " + user.isOnline()
             );
         });
 
+        System.out.println("==== User 2 Read ====");
+        UserResponse findUser = userService.readOne(users.get(2).id());
+        System.out.println("userName : " + findUser.username()
+                + " | Email : " + findUser.email()
+                + " | phoneNumber : " + findUser.phoneNumber()
+                + " | isOnline : " + findUser.isOnline()
+        );
+
+//        System.out.println("==== User 2 Delete ====");
+//        userService.delete(users.get(2).id());
+
+        System.out.println("==== User 1 Update ====");
+        UserResponse updateUser = userService.update(users.get(1).id(), new UserRequest("martin", "3ksp21","martin@codeit.com", "010-2323-2323",null));
+
+        authService.login("alice.wonderland@example.com","P@ssw0rd3");
+        authService.login("bob.builder@example.com", "123123");
+
 
 
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>Channel>>>>>>>>>>>>>>>>>>>>>>>");
+        List<ChannelRequest> channels = List.of(
+                new ChannelRequest("SB_1_Sprint", "JAVA Spring BackEnd Developer discode",
+                        new ArrayList<>(List.of(users.get(0).id(), users.get(1).id())), users.get(1).id(), ChannelType.Private),
+                new ChannelRequest("JavaScript_TechTalk", "All about JavaScript and its frameworks",
+                        new ArrayList<>(), users.get(2).id(), ChannelType.Public),
+                new ChannelRequest("React_FrontEnd", "Front-end technologies focusing on React",
+                        new ArrayList<>(List.of(users.get(3).id(), users.get(4).id())), users.get(4).id(), ChannelType.Private),
+                new ChannelRequest("NodeJS_DevGroup", "Node.js development and deployment discussions",
+                        new ArrayList<>(), users.get(0).id(),ChannelType.Public),
+                new ChannelRequest("SpringBoot_Dev", "Discussions on SpringBoot applications and microservices",
+                        new ArrayList<>(List.of(users.get(1).id(), users.get(4).id())), users.get(1).id(), ChannelType.Private)
+        );
+
+
+        channels.forEach(channel -> channelService.create(channel));
 
+        List<ChannelResponse> channelList = channelService.readAll();
+        channelList.forEach(channel -> {
+            if(channel.channelType() == ChannelType.Private){
+                System.out.println("Private Channel");
+            }else{
+                System.out.println("channelName : " + channel.name()
+                        + " | description : " + channel.description()
+                );
+            }
+
+        });
+//        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>Message>>>>>>>>>>>>>>>>>>>>>>>");
+//
+//        List<MessageResponse> messages = List.of(
+//            new MessageResponse("Hello", users.get(1), users.get(4)),
+//            new MessageResponse("처음 뵙겠습니다~", users.get(1), channels.get(1)),
+//            new MessageResponse("안녕하세요!", users.get(2), channels.get(0)),
+//            new MessageResponse("채널 가입 요청 드립니다.", users.get(3), channels.get(2)),
+//            new MessageResponse("반가워요!", users.get(1), users.get(3)),
+//            new MessageResponse("공지사항 확인 부탁드립니다.", users.get(0), channels.get(3)),
+//            new MessageResponse("다음 모임은 언제인가요?", users.get(4), channels.get(1)),
+//            new MessageResponse("메일 보내드렸습니다.", users.get(2), users.get(0)),
+//            new MessageResponse("새 프로젝트에 대해서 논의해보아요.", users.get(3), channels.get(4)),
+//            new MessageResponse("다른 문의사항 있으면 알려주세요.", users.get(2), channels.get(0))
+//        );
     }
 }

src/main/java/com/sprint/mission/discodeit/domain/ChannelType.java

@@ -0,0 +1,5 @@
+package com.sprint.mission.discodeit.domain;
+
+public enum ChannelType {
+    Private, Public;
+}

src/main/java/com/sprint/mission/discodeit/domain/Mimetype.java

@@ -0,0 +1,5 @@
+package com.sprint.mission.discodeit.domain;
+
+public enum Mimetype {
+    User, Message;
+}

src/main/java/com/sprint/mission/discodeit/dto/ChannelRequest.java

@@ -1,11 +1,15 @@
 package com.sprint.mission.discodeit.dto;
 
+import com.sprint.mission.discodeit.domain.ChannelType;
+
 import java.util.List;
+import java.util.UUID;
 
 public record ChannelRequest(
         String name,
         String description,
-        List<UserResponse> member,
-        UserResponse owner
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
 ) {
 }

src/main/java/com/sprint/mission/discodeit/dto/ChannelResponse.java

@@ -1,23 +1,26 @@
 package com.sprint.mission.discodeit.dto;
 
+import com.sprint.mission.discodeit.domain.ChannelType;
 import com.sprint.mission.discodeit.entity.Channel;
 
+import javax.naming.directory.NoSuchAttributeException;
 import java.util.List;
+import java.util.UUID;
 
 public record ChannelResponse(
         String name,
         String description,
-        List<UserResponse> member,
-        UserResponse owner
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
 ) {
     public static ChannelResponse fromEntity(Channel channel){
         return new ChannelResponse(
             channel.getName(),
             channel.getDescription(),
-            channel.getMember().stream()
-                    .map(UserResponse::fromEntity)
-                    .toList(),
-            UserResponse.fromEntity(channel.getOwner())
+            channel.getMember(),
+            channel.getOwner(),
+            channel.getChannelType()
         );
     }
 }

src/main/java/com/sprint/mission/discodeit/dto/MessageRequest.java

@@ -0,0 +1,14 @@
+package com.sprint.mission.discodeit.dto;
+
+import java.util.UUID;
+
+public record MessageRequest(
+        String content,
+        UUID senderId,
+        UUID recipientId,
+        UUID channelId,
+        UUID attachedFileId
+) {
+
+
+}

src/main/java/com/sprint/mission/discodeit/dto/MessageResponse.java

@@ -0,0 +1,21 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.entity.Message;
+
+import java.util.UUID;
+
+public record MessageResponse(
+        String content,
+        UUID senderId,
+        UUID recipientId,
+        UUID channelId
+) {
+    public static MessageResponse fromEntity(Message message){
+        return new MessageResponse(
+                message.getContent(),
+                message.getSenderId(),
+                message.getRecipientId(),
+                message.getChannelId()
+        );
+    }
+}

src/main/java/com/sprint/mission/discodeit/dto/PrivateChannelRequest.java

@@ -0,0 +1,13 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+
+import java.util.List;
+import java.util.UUID;
+
+public record PrivateChannelRequest(
+        List<UUID> member,
+        UUID owner,
+        ChannelType channelType
+) {
+}

src/main/java/com/sprint/mission/discodeit/dto/PublicChannelRequest.java

@@ -0,0 +1,14 @@
+package com.sprint.mission.discodeit.dto;
+
+import com.sprint.mission.discodeit.domain.ChannelType;
+
+import java.util.List;
+import java.util.UUID;
+
+public record PublicChannelRequest(
+        String name,
+        String description,
+        UUID owner,
+        ChannelType channelType
+) {
+}

src/main/java/com/sprint/mission/discodeit/dto/UserRequest.java

@@ -1,10 +1,13 @@
 package com.sprint.mission.discodeit.dto;
 
+import java.util.UUID;
+
 public record UserRequest(
         String username,
         String password,
         String email,
         String phoneNumber,
-        Long profileImageId
+        UUID profileImageId
+//        String profileImageName
 ) {
 }