기존 코드들 제거 및 오류 수정, 심화 요구사항 반영

Author: bs8841

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

@@ -1,20 +1,47 @@
 package com.sprint.mission.discodeit;
 
+import com.sprint.mission.discodeit.dto.data.ChannelDto;
+import com.sprint.mission.discodeit.dto.data.UserDto;
+import com.sprint.mission.discodeit.dto.request.MessageCreateRequest;
+import com.sprint.mission.discodeit.dto.request.PublicChannelCreateRequest;
+import com.sprint.mission.discodeit.dto.request.UserCreateRequest;
 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.repository.ChannelRepository;
+import com.sprint.mission.discodeit.repository.UserRepository;
 import com.sprint.mission.discodeit.service.ChannelService;
 import com.sprint.mission.discodeit.service.MessageService;
 import com.sprint.mission.discodeit.service.UserService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import java.util.Scanner;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Optional;
 
 @SpringBootApplication
 public class DiscodeitApplication {
 
+	static User setupUser(UserService userService) {
+		UserCreateRequest request = new UserCreateRequest("woody", "[email protected]", "woody1234");
+		User user = userService.create(request, Optional.empty());
+		return user;
+	}
+
+	static Channel setupChannel(ChannelService channelService) {
+		PublicChannelCreateRequest request = new PublicChannelCreateRequest("공지", "공지 채널입니다.");
+		Channel channel = channelService.create(request);
+		return channel;
+	}
+
+	static void messageCreateTest(MessageService messageService, Channel channel, User author) {
+		MessageCreateRequest request = new MessageCreateRequest(channel.getId(), author.getId(), "안녕하세요.");
+		Message message = messageService.create(request, new ArrayList<>());
+		System.out.println("메시지 생성: " + message.getId());
+	}
+
 	public static void main(String[] args) {
 		ConfigurableApplicationContext context = SpringApplication.run(DiscodeitApplication.class, args);
 
@@ -27,34 +54,4 @@ public static void main(String[] args) {
 
 		messageCreateTest(messageService, channel, user);
 	}
-
-	private static User setupUser(UserService userService) {
-		Scanner scanner = new Scanner(System.in);
-		System.out.print("사용자 이름 입력: ");
-		String userName = scanner.nextLine();
-		User user = new User(userName);
-		userService.createUser(user);
-		System.out.println("생성된 사용자: " + user);
-		return user;
-	}
-
-	private static Channel setupChannel(ChannelService channelService) {
-		Scanner scanner = new Scanner(System.in);
-		System.out.print("채널 이름 입력: ");
-		String channelName = scanner.nextLine();
-		Channel channel = new Channel(channelName);
-		channelService.createChannel(channel);
-		System.out.println("생성된 채널: " + channel);
-		return channel;
-	}
-
-	private static void messageCreateTest(MessageService messageService, Channel channel, User user) {
-		Scanner scanner = new Scanner(System.in);
-		System.out.print("보낼 메시지 입력: ");
-		String msgContent = scanner.nextLine();
-		Message message = new Message(msgContent, user.getId(), channel.getId());
-		messageService.createMessage(message);
-		System.out.println("메시지 전송: " + message);
-	}
-
-}
+}

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

@@ -1,5 +1,7 @@
 package com.sprint.mission.discodeit.dto.data;
 
+import com.sprint.mission.discodeit.entity.ChannelType;
+
 import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
@@ -8,7 +10,7 @@ public record ChannelDto(
         UUID id,
         String name,
         String description,
-        String type,
+        ChannelType type,
         Instant latestMessageTimestamp,
         List<UUID> memberIds
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/data/ChannelDto.java

@@ -1,11 +1,14 @@
 package com.sprint.mission.discodeit.dto.data;
 
+import java.time.Instant;
 import java.util.UUID;
 
 public record UserDto (
         UUID id,
-        String userName,
+        Instant createdAt,
+        Instant updatedAt,
+        String username,
         String email,
-        boolean isOnline,
-        UUID profileId
+        UUID profileId,
+        Boolean online
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/data/UserDto.java

@@ -1,9 +1,7 @@
 package com.sprint.mission.discodeit.dto.request;
 
-import java.util.UUID;
-
 public record BinaryContentCreateRequest(
-        UUID ownerId,
+        String fileName,
         byte[] data,
         String contentType
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/request/BinaryContentCreateRequest.java

@@ -1,11 +1,9 @@
 package com.sprint.mission.discodeit.dto.request;
 
-import java.util.List;
 import java.util.UUID;
 
 public record MessageCreateRequest(
         UUID channelId,
         UUID authorId,
-        String content,
-        List<UUID> attachmentIds
+        String content
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/request/MessageCreateRequest.java

@@ -1,8 +1,5 @@
 package com.sprint.mission.discodeit.dto.request;
 
-import java.util.UUID;
-
 public record MessageUpdateRequest(
-        UUID messageId,
         String content
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/request/MessageUpdateRequest.java

@@ -5,4 +5,4 @@
 
 public record PrivateChannelCreateRequest(
         List<UUID> memberIds
-) {}
+) {}

src/main/java/com/sprint/mission/discodeit/dto/request/PrivateChannelCreateRequest.java

@@ -1,9 +1,6 @@
 package com.sprint.mission.discodeit.dto.request;
 
-import java.util.UUID;
-
 public record PublicChannelUpdateRequest(
-        UUID channelId,
         String name,
         String description
 ) {}

src/main/java/com/sprint/mission/discodeit/dto/request/PublicChannelUpdateRequest.java

@@ -1,8 +1,10 @@
 package com.sprint.mission.discodeit.dto.request;
 
+import java.time.Instant;
 import java.util.UUID;
 
 public record ReadStatusCreateRequest(
         UUID channelId,
-        UUID userId
+        UUID userId,
+        Instant lastReadAt
 ) {}