From 529cce2749d48a094fced17c6b68b5431faec13e Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Thu, 3 Apr 2025 18:13:29 +0900 Subject: [PATCH 01/14] =?UTF-8?q?-=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=86=A1?= =?UTF-8?q?=EC=8B=A0=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20-?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=A0=84=EC=B2=B4=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 29 +++++++++++++++++++ .idea/misc.xml | 6 ++++ .idea/modules.xml | 8 +++++ .idea/vcs.xml | 6 ++++ 3-sprint-mission_01.iml | 11 +++++++ .../mission/discodeit/JavaApplication.java | 28 ++++++++++++++++++ .../mission/discodeit/entity/Channel.java | 4 +++ .../mission/discodeit/entity/Message.java | 20 +++++++++++++ .../sprint/mission/discodeit/entity/User.java | 24 +++++++++++++++ .../discodeit/jcf/ChannelRepository.java | 4 +++ .../discodeit/jcf/MessageRepository.java | 5 ++++ .../mission/discodeit/jcf/UserRepository.java | 4 +++ .../discodeit/service/ChannelService.java | 4 +++ .../discodeit/service/MessageService.java | 29 +++++++++++++++++++ .../discodeit/service/UserService.java | 4 +++ 15 files changed, 186 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 3-sprint-mission_01.iml create mode 100644 src/com/sprint/mission/discodeit/JavaApplication.java create mode 100644 src/com/sprint/mission/discodeit/entity/Channel.java create mode 100644 src/com/sprint/mission/discodeit/entity/Message.java create mode 100644 src/com/sprint/mission/discodeit/entity/User.java create mode 100644 src/com/sprint/mission/discodeit/jcf/ChannelRepository.java create mode 100644 src/com/sprint/mission/discodeit/jcf/MessageRepository.java create mode 100644 src/com/sprint/mission/discodeit/jcf/UserRepository.java create mode 100644 src/com/sprint/mission/discodeit/service/ChannelService.java create mode 100644 src/com/sprint/mission/discodeit/service/MessageService.java create mode 100644 src/com/sprint/mission/discodeit/service/UserService.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..8eb68708 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +### IntelliJ IDEA ### +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ +.idea +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..07115cdf --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..4409663a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/3-sprint-mission_01.iml b/3-sprint-mission_01.iml new file mode 100644 index 00000000..c90834f2 --- /dev/null +++ b/3-sprint-mission_01.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java new file mode 100644 index 00000000..c20cf10b --- /dev/null +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -0,0 +1,28 @@ +package com.sprint.mission.discodeit; + +import com.sprint.mission.discodeit.service.MessageService; + + +public class JavaApplication { + public static void main(String[] args) { + //MessageService msgService = new MessageService(MessageRepository.getMessage) + + System.out.println("====================================================================="); + System.out.println(" >>> Sprint Posting Channel에 접속하셨습니다.");//User.userlogin(); // 추후 로그인 기능 구현예정 + // System.out.println(" >>> 원하는 기능을 선택해 주세요..."); + // System.out.println("=====================================================================\n" + + // "| [1] Channel 입장 || [2] 개별 메세지 수정/삭제 |\n" + + // "| [3] 개별 메세지 수정/삭제 이력 || [4] Sprint Posting Channel 종료 |\n" + + // "====================================================================="); + MessageService.sendMessage("메세지테스트. 첫번째"); + MessageService.sendMessage("두번째"); + MessageService.sendMessage("세번째"); + MessageService.sendMessage("메시지테스트4"); + MessageService.sendMessage("메시지테스트5"); + MessageService.sendMessage("메시지 마지막"); + MessageService.readAllMessage(); + + } + + +} diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/com/sprint/mission/discodeit/entity/Channel.java new file mode 100644 index 00000000..afdf2369 --- /dev/null +++ b/src/com/sprint/mission/discodeit/entity/Channel.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.entity; + +public class Channel { +} diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/com/sprint/mission/discodeit/entity/Message.java new file mode 100644 index 00000000..a290a0c7 --- /dev/null +++ b/src/com/sprint/mission/discodeit/entity/Message.java @@ -0,0 +1,20 @@ +package com.sprint.mission.discodeit.entity; + +import java.util.List; + +public class Message { + public static int msgNumber = 0; + List msgs; + List msgTstamps; + + + + public Message(List msgs, List msgTstamps) { + this.msgs = msgs; + this.msgTstamps = msgTstamps; + } + + @Override + public String toString() { return "" + msgs + msgTstamps; } +} + diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/com/sprint/mission/discodeit/entity/User.java new file mode 100644 index 00000000..47b127c7 --- /dev/null +++ b/src/com/sprint/mission/discodeit/entity/User.java @@ -0,0 +1,24 @@ +package com.sprint.mission.discodeit.entity; + +import java.text.SimpleDateFormat; +import java.util.UUID; + +import static java.lang.System.currentTimeMillis; + +public class User { + private UUID id = UUID.randomUUID(); + private String name; + private String createdAt = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); + private String UpdatedAt; + + // UUID id | String name | String createdAt | String UpdatedAt |의 getter및 setter + public UUID getId() { return id;} + public String getName() {return name;} + public void setName(String name) {this.name = name;} + public String getCreatedAt() { return createdAt;} + public String getUpdatedAt() { return UpdatedAt;} + public void setUpdatedAt(String updatedAt) {UpdatedAt = updatedAt;} + + +} + diff --git a/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java b/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java new file mode 100644 index 00000000..dfb2a556 --- /dev/null +++ b/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.jcf; + +public class ChannelRepository { +} diff --git a/src/com/sprint/mission/discodeit/jcf/MessageRepository.java b/src/com/sprint/mission/discodeit/jcf/MessageRepository.java new file mode 100644 index 00000000..ee1836ce --- /dev/null +++ b/src/com/sprint/mission/discodeit/jcf/MessageRepository.java @@ -0,0 +1,5 @@ +package com.sprint.mission.discodeit.jcf; +public class MessageRepository { + + +} diff --git a/src/com/sprint/mission/discodeit/jcf/UserRepository.java b/src/com/sprint/mission/discodeit/jcf/UserRepository.java new file mode 100644 index 00000000..57ee3fbb --- /dev/null +++ b/src/com/sprint/mission/discodeit/jcf/UserRepository.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.jcf; + +public class UserRepository { +} diff --git a/src/com/sprint/mission/discodeit/service/ChannelService.java b/src/com/sprint/mission/discodeit/service/ChannelService.java new file mode 100644 index 00000000..f4518eeb --- /dev/null +++ b/src/com/sprint/mission/discodeit/service/ChannelService.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.service; + +public class ChannelService { +} diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java new file mode 100644 index 00000000..5e23ff99 --- /dev/null +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -0,0 +1,29 @@ +package com.sprint.mission.discodeit.service; + +import com.sprint.mission.discodeit.entity.Message; +import static com.sprint.mission.discodeit.entity.Message.msgNumber; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static java.lang.System.currentTimeMillis; + +public class MessageService { + //메세지 목록을 저장할 MAP 생성 + public static Map messageMap = new HashMap<>(); + // Key : 메세지넘버(int msgNumber) , Value : 메세지내용(msgText) + public static void sendMessage(String nMessage) { + String nowTime = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); + messageMap.put(msgNumber++,new Message(List.of("Sender1",nMessage),List.of(nowTime,nowTime))); + } + public static void readAllMessage() { + //메세지 목록 MAP 전체 불러오기 + System.out.println(" 입력된 메세지는 아래와 같습니다. \n 글번호 | 작성자 , 메세지 , 작성시간 , 수정시간"); + for (Map.Entry entry : messageMap.entrySet()) { + int msgNumber = entry.getKey(); + Message msgBody = entry.getValue(); + System.out.println(msgNumber + " | " + msgBody); + } + } +} diff --git a/src/com/sprint/mission/discodeit/service/UserService.java b/src/com/sprint/mission/discodeit/service/UserService.java new file mode 100644 index 00000000..4964d682 --- /dev/null +++ b/src/com/sprint/mission/discodeit/service/UserService.java @@ -0,0 +1,4 @@ +package com.sprint.mission.discodeit.service; + +public class UserService { +} From ce2c433fe1bde782d292f7adfff8bf9f79bb46a8 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Thu, 3 Apr 2025 18:15:24 +0900 Subject: [PATCH 02/14] =?UTF-8?q?-User.java=20line9=20UUID=20final?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/sprint/mission/discodeit/entity/User.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/com/sprint/mission/discodeit/entity/User.java index 47b127c7..2a8e2032 100644 --- a/src/com/sprint/mission/discodeit/entity/User.java +++ b/src/com/sprint/mission/discodeit/entity/User.java @@ -6,7 +6,7 @@ import static java.lang.System.currentTimeMillis; public class User { - private UUID id = UUID.randomUUID(); + private final UUID id = UUID.randomUUID(); private String name; private String createdAt = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); private String UpdatedAt; From 22d70a681a2f823b36066b43eb3090f774a3fd5f Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Tue, 8 Apr 2025 18:20:46 +0900 Subject: [PATCH 03/14] =?UTF-8?q?-=20=EA=B8=B0=EB=B3=B8=EC=9A=94=EA=B5=AC?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EA=B5=AC=EC=A1=B0=20=EC=9E=AC=EC=A0=95?= =?UTF-8?q?=EB=A0=AC.=20-=20Application=EC=83=81=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=ED=95=98=EC=97=AC=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EC=BA=A1=EC=8A=90=ED=99=94=20-=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=83=9D=EC=84=B1/=EC=88=98?= =?UTF-8?q?=EC=A0=95/=EC=82=AD=EC=A0=9C/=EC=A1=B0=ED=9A=8C=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/jcf/ChannelRepository.java | 4 -- ...Repository.java => JCFChannelService.java} | 2 +- .../discodeit/jcf/JCFMessageService.java | 43 +++++++++++++++++++ .../mission/discodeit/jcf/JCFUserService.java | 9 ++++ .../discodeit/jcf/MessageRepository.java | 5 --- 5 files changed, 53 insertions(+), 10 deletions(-) delete mode 100644 src/com/sprint/mission/discodeit/jcf/ChannelRepository.java rename src/com/sprint/mission/discodeit/jcf/{UserRepository.java => JCFChannelService.java} (60%) create mode 100644 src/com/sprint/mission/discodeit/jcf/JCFMessageService.java create mode 100644 src/com/sprint/mission/discodeit/jcf/JCFUserService.java delete mode 100644 src/com/sprint/mission/discodeit/jcf/MessageRepository.java diff --git a/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java b/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java deleted file mode 100644 index dfb2a556..00000000 --- a/src/com/sprint/mission/discodeit/jcf/ChannelRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.sprint.mission.discodeit.jcf; - -public class ChannelRepository { -} diff --git a/src/com/sprint/mission/discodeit/jcf/UserRepository.java b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java similarity index 60% rename from src/com/sprint/mission/discodeit/jcf/UserRepository.java rename to src/com/sprint/mission/discodeit/jcf/JCFChannelService.java index 57ee3fbb..eb37e701 100644 --- a/src/com/sprint/mission/discodeit/jcf/UserRepository.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java @@ -1,4 +1,4 @@ package com.sprint.mission.discodeit.jcf; -public class UserRepository { +public class JCFChannel { } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java new file mode 100644 index 00000000..874e7f8c --- /dev/null +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -0,0 +1,43 @@ +package com.sprint.mission.discodeit.jcf; + +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.service.MessageService; + +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.Map; +import java.util.Scanner; + +import static com.sprint.mission.discodeit.entity.Message.msgNumber; +import static java.lang.System.currentTimeMillis; + +public class JCFMessage implements MessageService { + + public void sendMessage() { // 새로운 메세지 입력 + while (true) { + System.out.print("메세지 입력 >>> "); + Scanner sc = new Scanner(System.in); + String scannedMsg = sc.nextLine(); + if (scannedMsg.length() == 0) {break;} + String nowTime = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); // 현재시각 TimeStamp생성 + messageMap.put(msgNumber++, new Message(List.of("Sender1", scannedMsg, nowTime, nowTime))); + System.out.println(messageMap.get(msgNumber -1)); + } + } + + public void readAllMessage() { // 메세지 목록 MAP 전체 불러오기 + System.out.println(" 입력된 메세지는 아래와 같습니다. \n 글번호 | 작성자 , 메세지 , 작성시간 , 수정시간"); + for (Map.Entry entry : messageMap.entrySet()) { + int msgNumber = entry.getKey(); + Message msgBody = entry.getValue(); + System.out.println(msgNumber + " | " + msgBody); + } + } +// public void modifyMessage(int modMsgNumber){ +// String newmessage = "modified"; +// messageMap.get(modMsgNumber).setMsgs(1,newmessage); +// messageMap.put(modMsgNumber,) +// +// } + +} diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java new file mode 100644 index 00000000..89ff5466 --- /dev/null +++ b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java @@ -0,0 +1,9 @@ +package com.sprint.mission.discodeit.jcf; + +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.service.UserService; + + +public class JCFUser implements UserService { + +} diff --git a/src/com/sprint/mission/discodeit/jcf/MessageRepository.java b/src/com/sprint/mission/discodeit/jcf/MessageRepository.java deleted file mode 100644 index ee1836ce..00000000 --- a/src/com/sprint/mission/discodeit/jcf/MessageRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sprint.mission.discodeit.jcf; -public class MessageRepository { - - -} From c21a62283d52e9f4fb63fc14b6dbff6ba7e90f6d Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Tue, 8 Apr 2025 18:21:09 +0900 Subject: [PATCH 04/14] =?UTF-8?q?-=20=EA=B8=B0=EB=B3=B8=EC=9A=94=EA=B5=AC?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EA=B5=AC=EC=A1=B0=20=EC=9E=AC=EC=A0=95?= =?UTF-8?q?=EB=A0=AC.=20-=20Application=EC=83=81=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=ED=95=98=EC=97=AC=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EC=BA=A1=EC=8A=90=ED=99=94=20-=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=83=9D=EC=84=B1/=EC=88=98?= =?UTF-8?q?=EC=A0=95/=EC=82=AD=EC=A0=9C/=EC=A1=B0=ED=9A=8C=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/JavaApplication.java | 340 +++++++++++++++++- .../mission/discodeit/entity/Channel.java | 5 + .../mission/discodeit/entity/Message.java | 37 +- .../sprint/mission/discodeit/entity/User.java | 39 +- .../discodeit/jcf/JCFChannelService.java | 2 +- .../discodeit/jcf/JCFMessageService.java | 61 ++-- .../mission/discodeit/jcf/JCFUserService.java | 73 +++- .../discodeit/service/ChannelService.java | 2 +- .../discodeit/service/MessageService.java | 37 +- .../discodeit/service/UserService.java | 18 +- 10 files changed, 522 insertions(+), 92 deletions(-) diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java index c20cf10b..b7f30eec 100644 --- a/src/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -1,28 +1,334 @@ package com.sprint.mission.discodeit; -import com.sprint.mission.discodeit.service.MessageService; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.jcf.JCFMessageService; +import com.sprint.mission.discodeit.jcf.JCFUserService; +import java.util.InputMismatchException; +import java.util.Scanner; public class JavaApplication { + private static final JCFUserService userService = new JCFUserService(); + private static final JCFMessageService messageService = new JCFMessageService(); + static final Scanner scanner = new Scanner(System.in); + private static User currentUser; + public static void main(String[] args) { - //MessageService msgService = new MessageService(MessageRepository.getMessage) - - System.out.println("====================================================================="); - System.out.println(" >>> Sprint Posting Channel에 접속하셨습니다.");//User.userlogin(); // 추후 로그인 기능 구현예정 - // System.out.println(" >>> 원하는 기능을 선택해 주세요..."); - // System.out.println("=====================================================================\n" + - // "| [1] Channel 입장 || [2] 개별 메세지 수정/삭제 |\n" + - // "| [3] 개별 메세지 수정/삭제 이력 || [4] Sprint Posting Channel 종료 |\n" + - // "====================================================================="); - MessageService.sendMessage("메세지테스트. 첫번째"); - MessageService.sendMessage("두번째"); - MessageService.sendMessage("세번째"); - MessageService.sendMessage("메시지테스트4"); - MessageService.sendMessage("메시지테스트5"); - MessageService.sendMessage("메시지 마지막"); - MessageService.readAllMessage(); + // 0. 초기 사용자 인증 + currentUser = verifyUser(); + // 0_1. intro 메세지 + System.out.println(" ▶ discodeit 메세지 서비스에 연결되었습니다."); + // 1. mainmenu 호출 + menuMain(); + //// <<메뉴 트리>> + //// 메인메뉴 ┬ 1. 채널입장 (채널상 메세지 관리) || 메서드 : menuMessageMng() + //// │ ├ 1_1 메세지 작성 + //// │ ├ 1_2 전체 메세지 조회 + //// │ ├ 1_3 메세지 수정 + //// │ ├ 1_4 메세지 삭제 + //// │ └ 1_5 현재 사용자 변경 + //// │ └ 1_6 상위메뉴로 + //// ├ 2. 채널 관리(신규,수정,삭제) || 메서드 : menuChannelMng() + //// │ ├ 2_1 신규 채널 개설 + //// │ ├ 2_2 채널명 수정 + //// │ ├ 2_3 채널 삭제 + //// │ └ 2_4 전체 채널 목록 조회 + //// │ └ 2_5 상위메뉴로 + //// ├ 3. 사용자 관리(신규,수정,삭제) || 메서드 : menuUserMng() + //// │ ├ 3_1 신규 사용자 추가 + //// │ ├ 3_2 현재 사용자 변경 + //// │ └ 3_3 전체 사용자 목록 조회 + //// │ └ 3_4 전체 사용자 목록 조회 + //// │ └ 3_5 상위메뉴로 + //// └ 5. 프로그램 종료 + + + + + + + + + + + // 메세지 생성 + while (true){ + boolean breakpoint= messageService.uploadMsg(currentUser); + if (breakpoint != true){ + break; + } + } + + messageService.printAllMessages(); + + + + + // 이름으로 찾기 +// userService.findUserByName("이유정").ifPresent(u -> +// System.out.println("Found by name: " + u.getName() + ", ID: " + u.getId()) +// ); +// // ID로 삭제 +// boolean deleted = userService.deleteUserById(user1.getId()); +// System.out.println("Deleted Alice by ID: " + deleted); +// +// // 남은 사용자 출력 +// System.out.println("Remaining Users: "); +// userService.getAllUsers().forEach(u -> System.out.println(u.getName())); + + } + + public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 + System.out.print(" ▶ 사용자명을 입력해 주세요 : "); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 님 환영합니다." + ", ID: " + user.getId()); + return user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 신규 사용자로 등록합니다."); + User newUser = userService.createUser(username); + System.out.println("\n ▶ 환영합니다 [" + newUser.getName() + "] 님, 새로운 ID가 발급되였습니다.\n 신규 사용자 UUID : " + newUser.getId()); + return newUser; + } + } + public static void menuMain(){ + while (true) { + System.out.println(" ▶ 원하는 메뉴를 선택해 주세요."); + System.out.println("**********************************************\n" + + "[1] 채널 입장\n" + + "[2] 채널 관리 (신규, 수정, 삭제, 조회)\n" + + "[3] 사용자 관리 (신규, 수정, 삭제, 조회)\n" + + "[4] 종료\n" + + "**********************************************\n"); + System.out.print(" >> "); + + int choice = -1; + try { + choice = scanner.nextInt(); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } catch (InputMismatchException e){ + System.out.println("숫자만 입력해 주세요"); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } + + switch (choice) { + case 1: + System.out.println(" ▶ 1번 메뉴는 아직 미지원입니다.\n "); + // menuEnterChannel(); + break; + case 2: + System.out.println(" ▶ 2번 메뉴는 아직 미지원입니다.\n "); + // menuSetting(); + break; + case 3: + menuUserMng(currentUser); + break; + case 4: + System.out.println(" ▶ 프로그램을 종료합니다."); + break; + default: + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 4) {break;} + } } +// public static void menuMessageMng(User currentUser){ // 1_1 채널 조작 메서드 +// +// while (true) { +// System.out.println(" *******************************************************\n" +// + " || 채널에 입장했습니다. 원하는 기능을 선택하세요. ||\n" +// + " || 1 > 신규 사용자 생성 ||\n" +// + " || 2 > 현재 사용자 이름 변경 ||\n" +// + " || 3 > 현재 사용자 삭제 ||\n" +// + " || 4 > 전체 사용자 상세조회 ||\n" +// + " || 5 > 상위 메뉴로 돌아가기 ||\n" +// + " *******************************************************\n"); +// System.out.print(" >> "); +// +// int choice = scanner.nextInt(); +// scanner.nextLine(); +// +// switch (choice) { +// case 1: // 1_4_1 신규 사용자 생성 메뉴 +// System.out.println(" ▶ 새로운 사용자를 생성합니다."); +// while (true) { +// System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); +// String username = scanner.nextLine(); +// User user = userService.findUserByName(username); +// if (user == null) { +// User newUser = userService.createUser(username); +// System.out.println(" ▶ 사용자 생성에 성공했습니다."); +// System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); +// System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); +// String newUserChange = scanner.nextLine(); +// if (newUserChange.equals("y") || newUserChange.equals("Y")) { +// currentUser = newUser; +// System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); +// } else { +// System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); +// } +// break; +// } else if (username.length() == 0) { +// System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); +// break; +// } else { +// System.out.println(" ▶ 이미 존재하는 사용자명입니다. 다른 이름을 입력해 주세요.\n"); +// } +// } +// break; +// +// case 2: +// while (true){ // 1_4_2 사용자 이름 변경 메뉴 +// System.out.println("\n ▶ 사용자 이름을 변경합니다. * 현재 사용자 이름 : [" + currentUser.getName() + "]"); +// System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); +// String newName = scanner.nextLine(); +// if(userService.chkExistName(newName)){ +// System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); +// } else if(newName.length() ==0) { +// System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); +// break; +// } else{ +// userService.updateUserName(currentUser, newName); +// break; +// } +// } +// break; +// case 3: // 1_4_3 사용자 삭제 메뉴 +// System.out.println(" ▶ 3번 메뉴는 아직 미지원입니다.\n "); +// // menuChannelMng(); +// break; +// case 4: // 1_4_4 모든 사용자 정보 출력 메뉴 +// System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); +// userService.printAllUsers(); +// break; +// case 5: // 1_4_5 상위메뉴 복귀 +// break; +// default: // 1_4 세부메뉴 입력예외처리 +// System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); +// } +// if (choice == 5) {break;} +// } +// +// +// } // 1_3 사용자 관리 세부메뉴 메서드 +// + public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 내부메뉴 메서드 + while (true) { + System.out.println(" *******************************************************\n" + + " || 사용자 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 사용자 생성 ||\n" + + " || 2 > 현재 사용자 이름 변경 ||\n" + + " || 3 > 사용자 삭제 ||\n" + + " || 4 > 전체 사용자 상세조회 ||\n" + + " || 5 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + System.out.print(" >> "); + int choice = -1; + try { + choice = scanner.nextInt(); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } catch (InputMismatchException e){ + System.out.println("숫자만 입력해 주세요"); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } + + switch (choice) { + case 1: // 1_4_1 신규 사용자 생성 메뉴 + System.out.println(" ▶ 새로운 사용자를 생성합니다."); + while (true) { + System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); + String username = scanner.nextLine(); + if (username.length() == 0) { // 입력값이 없는경우 상위 메뉴로 이동 + System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); + break;} + User user = userService.findUserByName(username); + if (user == null) { // 중복 유저명 체크하여 중복유저가 없는경우 사용자 생성 + User newUser = userService.createUser(username); + System.out.println(" ▶ 사용자 생성에 성공했습니다."); + System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); + // 새로 생성한 사용자로 currentUser 변경여부 체크 + System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); + String newUserChange = scanner.nextLine(); + if (newUserChange.equals("y") || newUserChange.equals("Y")) { + currentUser = newUser; + System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); + } + + System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); + break; + } else { // user.name 중복값 확인시 while문 재시작 + System.out.println(" ▶ 이미 존재하는 사용자명입니다. 다른 이름을 입력해 주세요.\n"); + } + } + break; + + case 2: + while (true){ // 1_4_2 사용자 이름 변경 메뉴 + System.out.println("\n ▶ 사용자 이름을 변경합니다. * 현재 사용자 이름 : [" + currentUser.getName() + "]"); + System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); + System.out.print(" >> "); + String newName = scanner.nextLine(); + if(newName.length() ==0) {// 사용자 이름 입력값이 없는경우 상위메뉴로 이동 + System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); + break;} + User user = userService.findUserByName(newName); + if(user != null){ // 중복값 존재시 재입력 + System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); + } else{ // 중복값 미확인시 유저명 변경 + userService.updateUserName(currentUser, newName); + break; + } + } + break; + case 3: // 1_4_3 사용자 삭제 메뉴 + System.out.println(" ▶ 삭제할 사용자의 ID나 이름을 입력해 주세요"); + System.out.println(" ▶ 현재 등록된 사용자는 아래와 같습니다."); + userService.printAllUsers(); + System.out.print(" >> "); + String deleteUser = scanner.nextLine(); + if (deleteUser.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + } else if (deleteUser.equals(currentUser.getName())){ + System.out.println(" ▶ 현재 로그인된 사용자는 삭제할 수 없습니다! 이전 메뉴로 돌아갑니다."); + break; + } else { + System.out.println(" ▶ 입력하신 사용자는 아래와 같습니다."); + User userToDel = userService.findUserByName(deleteUser); + System.out.println(userToDel); + System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요"); + System.out.print(" >> "); + String deleteConfirm = scanner.nextLine(); + if (deleteConfirm.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + break; + }else if(deleteConfirm.equals("삭제")) { + userService.deleteUser(deleteUser); + System.out.println("[" + deleteUser + "] 사용자가 삭제되었습니다."); + }else{ + System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); + } + } + break; + case 4: // 1_4_4 모든 사용자 정보 출력 메뉴 + System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); + userService.printAllUsers(); + break; + case 5: // 1_4_5 상위메뉴 복귀 + break; + default: // 1_4 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 5) {break;} + } + + + } // 1_4 사용자 관리 세부메뉴 메서드 } + + + diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/com/sprint/mission/discodeit/entity/Channel.java index afdf2369..028fe56e 100644 --- a/src/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/com/sprint/mission/discodeit/entity/Channel.java @@ -1,4 +1,9 @@ package com.sprint.mission.discodeit.entity; +import java.util.UUID; + public class Channel { + private final UUID id = UUID.randomUUID(); + private long createdAt = System.currentTimeMillis(); + private long updatedAt; } diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/com/sprint/mission/discodeit/entity/Message.java index a290a0c7..ae3aad55 100644 --- a/src/com/sprint/mission/discodeit/entity/Message.java +++ b/src/com/sprint/mission/discodeit/entity/Message.java @@ -1,20 +1,39 @@ package com.sprint.mission.discodeit.entity; +import java.text.SimpleDateFormat; import java.util.List; +import java.util.UUID; public class Message { - public static int msgNumber = 0; - List msgs; - List msgTstamps; + private final UUID id = UUID.randomUUID(); + public static int totMsgNumber = 0; + private int msgNumber; + private String author; + private String textMsg; + private long createdAt = System.currentTimeMillis(); + private long updatedAt; - - public Message(List msgs, List msgTstamps) { - this.msgs = msgs; - this.msgTstamps = msgTstamps; + public Message(int msgNumber, String author, String textMsg,long createdAt, long updatedAt) { + this.msgNumber = msgNumber; + this.author = author; + this.textMsg = textMsg; + this.createdAt = createdAt; + this.updatedAt = updatedAt; } + public UUID getId() {return id;} + public int getMsgNumber() {return msgNumber;} + public String getAuthor() {return author;} + public void setAuthor(String newAuthor) {this.author = newAuthor;} + public void setTextMsg(String textMsg) {this.textMsg = textMsg;} + public String getTextMsg() {return textMsg;} - @Override - public String toString() { return "" + msgs + msgTstamps; } + public String getCreatedAt() { + String formatedTime = new SimpleDateFormat("HH:mm:ss").format(createdAt); + return formatedTime;} + public String getUpdatedAt() { + String formatedTime = new SimpleDateFormat("HH:mm:ss").format(updatedAt); + return formatedTime;} + public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} } diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/com/sprint/mission/discodeit/entity/User.java index 2a8e2032..e1fdb95e 100644 --- a/src/com/sprint/mission/discodeit/entity/User.java +++ b/src/com/sprint/mission/discodeit/entity/User.java @@ -3,22 +3,41 @@ import java.text.SimpleDateFormat; import java.util.UUID; -import static java.lang.System.currentTimeMillis; - public class User { private final UUID id = UUID.randomUUID(); + private long createdAt = System.currentTimeMillis(); + private long updatedAt; private String name; - private String createdAt = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); - private String UpdatedAt; - // UUID id | String name | String createdAt | String UpdatedAt |의 getter및 setter - public UUID getId() { return id;} + public User(String name, long createdAt, long updatedAt) { + this.name = name; + this.createdAt = createdAt; + this.updatedAt = updatedAt; + } + + public UUID getId() {return id;} public String getName() {return name;} public void setName(String name) {this.name = name;} - public String getCreatedAt() { return createdAt;} - public String getUpdatedAt() { return UpdatedAt;} - public void setUpdatedAt(String updatedAt) {UpdatedAt = updatedAt;} + public String getCreatedAt() { + String formatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(createdAt); + return formatedTime;} + public String getUpdatedAt() { + String formatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(updatedAt); + return formatedTime;} + public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} -} +@Override +public String toString() { + String result; + if(getCreatedAt().equals(getUpdatedAt())){ + result = "\n 사용자 이름 : " + name + "\n 생성된 시점 : " + getCreatedAt() + "\n 사용자 UUID : " + id + "\n"; + } else { + result = "\n 사용자 이름 : " + name + "\n 생성된 시점 : " + getCreatedAt() + "\n 수정된 시점 : " + getUpdatedAt() + "\n 사용자 UUID : " + id + "\n"; + } + return result; + } + + +} diff --git a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java index eb37e701..17155ced 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java @@ -1,4 +1,4 @@ package com.sprint.mission.discodeit.jcf; -public class JCFChannel { +public class JCFChannelService { } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java index 874e7f8c..f7c879b8 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -1,43 +1,48 @@ package com.sprint.mission.discodeit.jcf; import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.service.MessageService; -import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Scanner; -import static com.sprint.mission.discodeit.entity.Message.msgNumber; -import static java.lang.System.currentTimeMillis; +public class JCFMessageService implements MessageService { + private final List messages = new ArrayList<>(); + private static Scanner scanner = new Scanner(System.in); -public class JCFMessage implements MessageService { - - public void sendMessage() { // 새로운 메세지 입력 - while (true) { - System.out.print("메세지 입력 >>> "); - Scanner sc = new Scanner(System.in); - String scannedMsg = sc.nextLine(); - if (scannedMsg.length() == 0) {break;} - String nowTime = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); // 현재시각 TimeStamp생성 - messageMap.put(msgNumber++, new Message(List.of("Sender1", scannedMsg, nowTime, nowTime))); - System.out.println(messageMap.get(msgNumber -1)); + @Override + public boolean uploadMsg(User user){ + System.out.print("\n 메세지를 입력해주세요 >> "); + String txtMsg = scanner.nextLine(); + if (txtMsg.length()!=0){ + long now = System.currentTimeMillis(); + Message message = new Message(Message.totMsgNumber++,user.getName(),txtMsg,now,now); + messages.add(message); + System.out.print("\n System : [메세지 등록 완료]"); + System.out.println(" >> 메세지 번호 : " + message.getMsgNumber() + " 등록시간 : " + message.getCreatedAt()); + return true;} else{ + System.out.println(" System : 메세지 입력을 종료합니다"); + return false; } } - public void readAllMessage() { // 메세지 목록 MAP 전체 불러오기 - System.out.println(" 입력된 메세지는 아래와 같습니다. \n 글번호 | 작성자 , 메세지 , 작성시간 , 수정시간"); - for (Map.Entry entry : messageMap.entrySet()) { - int msgNumber = entry.getKey(); - Message msgBody = entry.getValue(); - System.out.println(msgNumber + " | " + msgBody); - } + @Override + public void updateMsg(Message message) { + System.out.println("저장된 메세지 : " + message.getTextMsg()); + System.out.print("변경할 메세지 : "); + String newMsg = scanner.nextLine(); + message.setTextMsg(newMsg); + message.setUpdatedAt(System.currentTimeMillis()); + System.out.println(); } -// public void modifyMessage(int modMsgNumber){ -// String newmessage = "modified"; -// messageMap.get(modMsgNumber).setMsgs(1,newmessage); -// messageMap.put(modMsgNumber,) -// -// } + public void printAllMessages() { + System.out.println("<< 입력된 전체 메세지 >>"); + messages.forEach(m -> System.out.println(m.getMsgNumber() + "|" + m.getAuthor() + "|" + m.getTextMsg() + "|" + m.getCreatedAt() + "|" + m.getUpdatedAt() + "|||" + m.getId())); + } + public List getMessagesList() { + return new ArrayList<>(messages); + } } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java index 89ff5466..2c1d0d6d 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java @@ -3,7 +3,76 @@ import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.service.UserService; +import java.util.*; -public class JCFUser implements UserService { -} +public class JCFUserService implements UserService { + private final List users = new ArrayList<>(); + // 테스트용 초기 더미 데이터 입력 + public JCFUserService() { + users.add(new User("희동이" , 1744036538250L , 1744036538250L)); + users.add(new User("고길동" , 1744036738250L , 1744071238250L)); + users.add(new User("도우너" , 1744036938250L , 1744036538250L)); + } + + @Override // 유저 생성 메서드 createUser() + public User createUser(String name) { + long now = System.currentTimeMillis(); + User user = new User(name, now, now); + users.add(user); + System.out.println("사용자의 이름을 [" + user.getName() + "] 으로 생성하였습니다. | " + user.getCreatedAt()); + return user; + } + + @Override //유저 이름 변경 메서드 updateUserName() + public void updateUserName(User user, String newName) { + String oldName = user.getName(); + user.setName(newName); + user.setUpdatedAt(System.currentTimeMillis()); + System.out.println("[" + oldName + "] 사용자의 이름을 [" + user.getName() + "] 으로 변경하였습니다. | " + user.getUpdatedAt()); + } + + @Override + public User findUserById(UUID id) { + for (User user : users) { + if (user.getId().equals(id)) { + return user; // 일치하는 ID 발견시 user 리턴 + } + } + return null; // 없으면 null 리턴 + } + + @Override + public User findUserByName(String name) { + for (User user : users) { + if (user.getName().equals(name)) { + return user; // 일치하는 name 발견시 user 리턴 + } + } + return null; // 없으면 null 리턴 + } + + @Override + public boolean deleteUser(UUID id) { + return users.removeIf(user -> user.getId().equals(id)); + } + + @Override + public boolean deleteUser(String name) { + + return users.removeIf(user -> user.getName().equals(name)); + } + + + + // 유틸 메서드: 모든 사용자 출력 + public void printAllUsers(){ + System.out.println(" □ □ □ 전체 사용자 목록 □ □ □ \n 사용자이름 | 사용자생성시간 | 사용자정보 수정시간 | 사용자UUID"); + users.forEach(u -> System.out.println(" " + u.getName() + " | " + u.getCreatedAt() + " | " + u.getUpdatedAt() + " | " + u.getId())); + System.out.println(""); + } + public List getUserslist() { + return new ArrayList<>(users); + } + +} \ No newline at end of file diff --git a/src/com/sprint/mission/discodeit/service/ChannelService.java b/src/com/sprint/mission/discodeit/service/ChannelService.java index f4518eeb..67eb3e0b 100644 --- a/src/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,4 +1,4 @@ package com.sprint.mission.discodeit.service; -public class ChannelService { +public interface ChannelService { } diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java index 5e23ff99..cfcceeab 100644 --- a/src/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -1,29 +1,20 @@ package com.sprint.mission.discodeit.service; + import com.sprint.mission.discodeit.entity.Message; -import static com.sprint.mission.discodeit.entity.Message.msgNumber; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.sprint.mission.discodeit.entity.User; + +import java.util.*; -import static java.lang.System.currentTimeMillis; +public interface MessageService{ + boolean uploadMsg(User user); + void updateMsg(Message message); -public class MessageService { - //메세지 목록을 저장할 MAP 생성 - public static Map messageMap = new HashMap<>(); - // Key : 메세지넘버(int msgNumber) , Value : 메세지내용(msgText) - public static void sendMessage(String nMessage) { - String nowTime = new SimpleDateFormat("HH:mm:ss").format(currentTimeMillis()); - messageMap.put(msgNumber++,new Message(List.of("Sender1",nMessage),List.of(nowTime,nowTime))); - } - public static void readAllMessage() { - //메세지 목록 MAP 전체 불러오기 - System.out.println(" 입력된 메세지는 아래와 같습니다. \n 글번호 | 작성자 , 메세지 , 작성시간 , 수정시간"); - for (Map.Entry entry : messageMap.entrySet()) { - int msgNumber = entry.getKey(); - Message msgBody = entry.getValue(); - System.out.println(msgNumber + " | " + msgBody); - } - } +// Optional findMsgByNum(UUID id); +// Optional findUserByUser(String name); +// boolean deleteUserById(UUID id); +// boolean deleteUserByName(String name); +// + void printAllMessages(); + List getMessagesList(); // 사용자 전체 조회 } diff --git a/src/com/sprint/mission/discodeit/service/UserService.java b/src/com/sprint/mission/discodeit/service/UserService.java index 4964d682..aca9a860 100644 --- a/src/com/sprint/mission/discodeit/service/UserService.java +++ b/src/com/sprint/mission/discodeit/service/UserService.java @@ -1,4 +1,20 @@ package com.sprint.mission.discodeit.service; -public class UserService { +import com.sprint.mission.discodeit.entity.User; + +import java.util.List; +import java.util.UUID; + +public interface UserService { + + User createUser(String name); // 새로운 유저 생성 + void updateUserName(User user,String name); // 기존 유저 수정 + void printAllUsers(); + List getUserslist(); // 유저 리스트 반환 + + User findUserById(UUID id); // ID로 단일유저 찾기 + User findUserByName(String name); // 이름으로 단일유저 찾기 + boolean deleteUser(UUID id); // ID로 유저 삭제 + boolean deleteUser(String name); // 이름으로 유저 삭제 + } From 2d40cf02b38b7714b079bb33d0fadefb46c4eff0 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Wed, 9 Apr 2025 11:15:54 +0900 Subject: [PATCH 05/14] =?UTF-8?q?-=20=EB=A9=94=EC=9D=B8=EB=A9=94=EB=89=B4?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=EC=A7=80=204=EA=B0=88=EB=9E=98=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20-=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=97=90=205=EB=B2=88=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=EB=B3=80=EA=B2=BD=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EC=B1=84=EB=84=90=EC=9E=85=EC=9E=A5=20=EC=84=B8=EB=B6=80?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B5=AC=ED=98=84=20=20=20=E3=84=B4?= =?UTF-8?q?=EC=B1=84=EB=84=90=20=EB=82=B4=EB=B6=80=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EA=B4=80=EB=A0=A8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=AA=A8=EB=91=90=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/JavaApplication.java | 242 +++++++++--------- .../discodeit/jcf/JCFMessageService.java | 41 ++- .../mission/discodeit/jcf/JCFUserService.java | 2 +- .../discodeit/service/MessageService.java | 5 +- 4 files changed, 155 insertions(+), 135 deletions(-) diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java index b7f30eec..69e9670a 100644 --- a/src/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -43,28 +43,6 @@ public static void main(String[] args) { //// │ └ 3_5 상위메뉴로 //// └ 5. 프로그램 종료 - - - - - - - - - - // 메세지 생성 - while (true){ - boolean breakpoint= messageService.uploadMsg(currentUser); - if (breakpoint != true){ - break; - } - } - - messageService.printAllMessages(); - - - - // 이름으로 찾기 // userService.findUserByName("이유정").ifPresent(u -> // System.out.println("Found by name: " + u.getName() + ", ID: " + u.getId()) @@ -78,7 +56,18 @@ public static void main(String[] args) { // userService.getAllUsers().forEach(u -> System.out.println(u.getName())); } - + private static int scanInt(){ + System.out.print(" >> "); + int inputNum = -1; + try { + inputNum = scanner.nextInt(); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } catch (InputMismatchException e){ + System.out.println("숫자만 입력해 주세요"); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } + return inputNum; +} public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 System.out.print(" ▶ 사용자명을 입력해 주세요 : "); String username = scanner.nextLine(); @@ -102,27 +91,17 @@ public static void menuMain(){ + "[3] 사용자 관리 (신규, 수정, 삭제, 조회)\n" + "[4] 종료\n" + "**********************************************\n"); - System.out.print(" >> "); - - int choice = -1; - try { - choice = scanner.nextInt(); - scanner.nextLine(); // scanner 내부 개행문자 제거 - } catch (InputMismatchException e){ - System.out.println("숫자만 입력해 주세요"); - scanner.nextLine(); // scanner 내부 개행문자 제거 - } + int choice = scanInt(); // 숫자 입력 메서드 호출 switch (choice) { - case 1: - System.out.println(" ▶ 1번 메뉴는 아직 미지원입니다.\n "); - // menuEnterChannel(); + case 1: // 채널 입장 : 메세지 관리 메서드 호출 + menuMessageMng(currentUser); break; case 2: System.out.println(" ▶ 2번 메뉴는 아직 미지원입니다.\n "); // menuSetting(); break; - case 3: + case 3: // 사용자 관리 : 사용자 관리 메서드 호출 menuUserMng(currentUser); break; case 4: @@ -135,86 +114,95 @@ public static void menuMain(){ } } -// public static void menuMessageMng(User currentUser){ // 1_1 채널 조작 메서드 -// -// while (true) { -// System.out.println(" *******************************************************\n" -// + " || 채널에 입장했습니다. 원하는 기능을 선택하세요. ||\n" -// + " || 1 > 신규 사용자 생성 ||\n" -// + " || 2 > 현재 사용자 이름 변경 ||\n" -// + " || 3 > 현재 사용자 삭제 ||\n" -// + " || 4 > 전체 사용자 상세조회 ||\n" -// + " || 5 > 상위 메뉴로 돌아가기 ||\n" -// + " *******************************************************\n"); -// System.out.print(" >> "); -// -// int choice = scanner.nextInt(); -// scanner.nextLine(); -// -// switch (choice) { -// case 1: // 1_4_1 신규 사용자 생성 메뉴 -// System.out.println(" ▶ 새로운 사용자를 생성합니다."); -// while (true) { -// System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); -// String username = scanner.nextLine(); -// User user = userService.findUserByName(username); -// if (user == null) { -// User newUser = userService.createUser(username); -// System.out.println(" ▶ 사용자 생성에 성공했습니다."); -// System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); -// System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); -// String newUserChange = scanner.nextLine(); -// if (newUserChange.equals("y") || newUserChange.equals("Y")) { -// currentUser = newUser; -// System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); -// } else { -// System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); -// } -// break; -// } else if (username.length() == 0) { -// System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); -// break; -// } else { -// System.out.println(" ▶ 이미 존재하는 사용자명입니다. 다른 이름을 입력해 주세요.\n"); -// } -// } -// break; -// -// case 2: -// while (true){ // 1_4_2 사용자 이름 변경 메뉴 -// System.out.println("\n ▶ 사용자 이름을 변경합니다. * 현재 사용자 이름 : [" + currentUser.getName() + "]"); -// System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); -// String newName = scanner.nextLine(); -// if(userService.chkExistName(newName)){ -// System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); -// } else if(newName.length() ==0) { -// System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); -// break; -// } else{ -// userService.updateUserName(currentUser, newName); -// break; -// } -// } -// break; -// case 3: // 1_4_3 사용자 삭제 메뉴 -// System.out.println(" ▶ 3번 메뉴는 아직 미지원입니다.\n "); -// // menuChannelMng(); -// break; -// case 4: // 1_4_4 모든 사용자 정보 출력 메뉴 -// System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); -// userService.printAllUsers(); -// break; -// case 5: // 1_4_5 상위메뉴 복귀 -// break; -// default: // 1_4 세부메뉴 입력예외처리 -// System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); -// } -// if (choice == 5) {break;} -// } -// -// -// } // 1_3 사용자 관리 세부메뉴 메서드 -// + public static void menuMessageMng(User currentUser){ // 1 채널 조작 메서드 + + while (true) { + System.out.println(" *******************************************************\n" + + " || 채널에 입장했습니다. 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 메세지 작성 ||\n" + + " || 2 > 전체 메세지 조회 ||\n" + + " || 3 > 메세지 수정 ||\n" + + " || 4 > 메세지 삭제 ||\n" + + " || 5 > 현재 사용자 변경 ||\n" + + " || 6 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + int choice = scanInt(); // 숫자 입력 메서드 호출 + int inputMsgNum = -1; + Message currentMsg = null; + switch (choice) { + case 1: // 1_1 메세지 작성 + while (true){ + System.out.println(" ▶ 새로운 메세지를 등록합니다.\n "); + boolean breakpoint= messageService.uploadMsg(currentUser); + if (breakpoint != true){ + break; + } + } + break; + + case 2: //1_2 전체 메세지 조회 + System.out.println(" ▶ 채널에 등록된 모든 메세지를 조회합니다.\n "); + messageService.printAllMessages(); + break; + case 3: // 1_3 메세지 수정 + System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); + messageService.printAllMessages(); + System.out.println(" ▶ 수정할 메세지의 번호를 입력해 주세요"); + inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 + currentMsg = messageService.findMessageByNum(inputMsgNum); + System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); + System.out.println(currentMsg.getTextMsg()); + + System.out.print("수정할 새로운 메세지를 입력해 주세요.\n >> "); + String newMessage = scanner.nextLine(); + messageService.updateMsg(currentMsg,newMessage); + System.out.println("기존 내용을 [" + newMessage + "] 로 수정하였습니다."); + break; + case 4: // 1_4 메세지 삭제 + System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); + messageService.printAllMessages(); + System.out.println(" ▶ 삭제할 메세지의 번호를 입력해 주세요"); + inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 + currentMsg = messageService.findMessageByNum(inputMsgNum); + System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); + System.out.println(currentMsg.getTextMsg()); + + System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요.\n >> "); + String deleteConfirm = scanner.nextLine(); + if (deleteConfirm.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + break; + }else if(deleteConfirm.equals("삭제")) { + messageService.deleteMessage(currentMsg); + System.out.println("메세지가 삭제되었습니다."); + }else{ + System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); + } + break; + case 5: // 1_5 현재 사용자 변경 + System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); + currentUser = user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); + userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); + System.out.println(""); + } + break; + case 6: // 1_6 상위메뉴로 이동 + break; + default: // 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 6) {break;} + } + + + } +// 1_3 사용자 관리 세부메뉴 메서드 public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 내부메뉴 메서드 while (true) { System.out.println(" *******************************************************\n" @@ -223,7 +211,8 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 + " || 2 > 현재 사용자 이름 변경 ||\n" + " || 3 > 사용자 삭제 ||\n" + " || 4 > 전체 사용자 상세조회 ||\n" - + " || 5 > 상위 메뉴로 돌아가기 ||\n" + + " || 5 > 다른 사용자로 진행 ||\n" + + " || 6 > 상위 메뉴로 돌아가기 ||\n" + " *******************************************************\n"); System.out.print(" >> "); int choice = -1; @@ -317,12 +306,25 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); userService.printAllUsers(); break; - case 5: // 1_4_5 상위메뉴 복귀 + case 5: // 1_4_5 다른 사용자로 진행 + System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); + currentUser = user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); + userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); + System.out.println(""); + } + break; + case 6: // 1_4_6 상위메뉴 복귀 break; default: // 1_4 세부메뉴 입력예외처리 System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); } - if (choice == 5) {break;} + if (choice == 6) {break;} } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java index f7c879b8..a022673e 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -11,36 +11,53 @@ public class JCFMessageService implements MessageService { private final List messages = new ArrayList<>(); private static Scanner scanner = new Scanner(System.in); - + // 테스트용 초기 더미 데이터 입력 + public JCFMessageService() { + messages.add(new Message(001,"희동이","요리보고 조리봐도", 1744036548250L , 1744036548250L)); + messages.add(new Message(002,"희동이","알수없는 둘리둘리", 1744036558250L , 1744036558250L)); + messages.add(new Message(003,"도우너","빙하타고~내려와아~", 1744036938250L , 1744036938250L)); + messages.add(new Message(004,"고길동","우리집에 들어왔지 이 식충이녀석들", 1744036938250L , 1744036938250L)); + } @Override public boolean uploadMsg(User user){ - System.out.print("\n 메세지를 입력해주세요 >> "); + System.out.print(" >> "); String txtMsg = scanner.nextLine(); if (txtMsg.length()!=0){ long now = System.currentTimeMillis(); - Message message = new Message(Message.totMsgNumber++,user.getName(),txtMsg,now,now); + Message.totMsgNumber = messages.size(); + Message message = new Message(Message.totMsgNumber + 1,user.getName(),txtMsg,now,now); messages.add(message); - System.out.print("\n System : [메세지 등록 완료]"); - System.out.println(" >> 메세지 번호 : " + message.getMsgNumber() + " 등록시간 : " + message.getCreatedAt()); + System.out.print("\n ▶ [메세지 등록 완료]"); + System.out.println(" ▶ 메세지 번호 : " + message.getMsgNumber() + " ▶ 등록시간 : " + message.getCreatedAt()); return true;} else{ - System.out.println(" System : 메세지 입력을 종료합니다"); + System.out.println(" ▶ 메세지 입력을 종료합니다"); return false; } } @Override - public void updateMsg(Message message) { - System.out.println("저장된 메세지 : " + message.getTextMsg()); - System.out.print("변경할 메세지 : "); - String newMsg = scanner.nextLine(); + public void updateMsg(Message message,String newMsg) { message.setTextMsg(newMsg); message.setUpdatedAt(System.currentTimeMillis()); - System.out.println(); } + public void deleteMessage(Message message){ + message.setTextMsg("*deleted"); + message.setAuthor("*deleted"); + message.setUpdatedAt(System.currentTimeMillis()); + } + public Message findMessageByNum(int num){ + for (Message message : messages) { + if (message.getMsgNumber() == num) { + return message; // 일치하는 메세지 번호 발견시 message 리턴 + } + }return null; + } public void printAllMessages() { System.out.println("<< 입력된 전체 메세지 >>"); - messages.forEach(m -> System.out.println(m.getMsgNumber() + "|" + m.getAuthor() + "|" + m.getTextMsg() + "|" + m.getCreatedAt() + "|" + m.getUpdatedAt() + "|||" + m.getId())); + System.out.println("번호 | 사용자 : 메세지"); + messages.forEach(m -> System.out.println(m.getMsgNumber() + " | " + m.getAuthor() + " : " + m.getTextMsg() + " | " + m.getCreatedAt() + " | " + m.getUpdatedAt() + " | " + m.getId())); + System.out.println(""); } public List getMessagesList() { return new ArrayList<>(messages); diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java index 2c1d0d6d..f569cbe8 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java @@ -72,7 +72,7 @@ public void printAllUsers(){ System.out.println(""); } public List getUserslist() { - return new ArrayList<>(users); + return users; } } \ No newline at end of file diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java index cfcceeab..01075fef 100644 --- a/src/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -8,12 +8,13 @@ public interface MessageService{ boolean uploadMsg(User user); - void updateMsg(Message message); + void updateMsg(Message message,String Msg); + Message findMessageByNum(int num); // Optional findMsgByNum(UUID id); // Optional findUserByUser(String name); // boolean deleteUserById(UUID id); -// boolean deleteUserByName(String name); + void deleteMessage(Message message); // void printAllMessages(); List getMessagesList(); // 사용자 전체 조회 From 5100546177b8b1dbd5964d8730cbb96c5b5a5c16 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Wed, 9 Apr 2025 13:53:13 +0900 Subject: [PATCH 06/14] =?UTF-8?q?-=20=EC=B1=84=EB=84=90=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EA=B5=AC=ED=98=84=20-=20=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=B1=84?= =?UTF-8?q?=EB=84=90=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/JavaApplication.java | 79 +++++++++++++------ .../mission/discodeit/entity/Channel.java | 40 ++++++++++ .../mission/discodeit/entity/Message.java | 10 ++- .../discodeit/jcf/JCFChannelService.java | 38 +++++++++ .../discodeit/jcf/JCFMessageService.java | 23 ++---- .../discodeit/service/ChannelService.java | 13 +++ .../discodeit/service/MessageService.java | 2 +- 7 files changed, 161 insertions(+), 44 deletions(-) diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java index 69e9670a..099982f5 100644 --- a/src/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -1,7 +1,9 @@ package com.sprint.mission.discodeit; +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.jcf.JCFChannelService; import com.sprint.mission.discodeit.jcf.JCFMessageService; import com.sprint.mission.discodeit.jcf.JCFUserService; @@ -10,14 +12,17 @@ public class JavaApplication { private static final JCFUserService userService = new JCFUserService(); - private static final JCFMessageService messageService = new JCFMessageService(); + private static final JCFChannelService channelService = new JCFChannelService(); static final Scanner scanner = new Scanner(System.in); private static User currentUser; + private static Channel currentChannel; public static void main(String[] args) { // 0. 초기 사용자 인증 currentUser = verifyUser(); // 0_1. intro 메세지 + + System.out.println(" ▶ discodeit 메세지 서비스에 연결되었습니다."); // 1. mainmenu 호출 menuMain(); @@ -40,6 +45,7 @@ public static void main(String[] args) { //// │ ├ 3_2 현재 사용자 변경 //// │ └ 3_3 전체 사용자 목록 조회 //// │ └ 3_4 전체 사용자 목록 조회 + //// │ └ 3_5 현재 사용자 변경 //// │ └ 3_5 상위메뉴로 //// └ 5. 프로그램 종료 @@ -82,6 +88,23 @@ public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : return newUser; } } + public static Channel verifyChannel(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 + System.out.print(" ▶ 채널명을 입력해 주세요 : "); + String chanName = scanner.nextLine(); + Channel channel = channelService.findChannelByName(chanName); + if (channel != null) { + System.out.println("[" + channel.getChannelName() + "] 에 접속합니다." + ", 채널 ID: " + channel.getId()); + return channel; + } else { + System.out.println("\n ▶ 존재하지 않는 채널입니다. 새로운 채널을 개설합니다."); + System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); + String chanDesc = scanner.nextLine(); + Channel newChannel = channelService.addChannel(chanName,chanDesc,currentUser); + System.out.println("\n ▶ 생성에 성공하였습니다."); + System.out.println("[" + newChannel.getChannelName() + "] 에 접속합니다." + ", 채널 ID: " + newChannel.getId()); + return newChannel; + } + } public static void menuMain(){ while (true) { System.out.println(" ▶ 원하는 메뉴를 선택해 주세요."); @@ -95,7 +118,9 @@ public static void menuMain(){ switch (choice) { case 1: // 채널 입장 : 메세지 관리 메서드 호출 - menuMessageMng(currentUser); + currentChannel = verifyChannel(); + channelService.printAllChannels(); + menuMessageMng(currentUser,currentChannel); break; case 2: System.out.println(" ▶ 2번 메뉴는 아직 미지원입니다.\n "); @@ -114,56 +139,61 @@ public static void menuMain(){ } } - public static void menuMessageMng(User currentUser){ // 1 채널 조작 메서드 + public static void menuMessageMng(User currentUser,Channel currentChannel){ // 1 채널 조작 메서드 while (true) { System.out.println(" *******************************************************\n" - + " || 채널에 입장했습니다. 원하는 기능을 선택하세요. ||\n" + + " || "+currentChannel.getChannelName()+"채널에 입장했습니다.\n" + + " || 원하는 기능을 선택하세요. ||\n" + " || 1 > 신규 메세지 작성 ||\n" + " || 2 > 전체 메세지 조회 ||\n" + " || 3 > 메세지 수정 ||\n" + " || 4 > 메세지 삭제 ||\n" - + " || 5 > 현재 사용자 변경 ||\n" - + " || 6 > 상위 메뉴로 돌아가기 ||\n" + + " || 5 > 다른 채널에 접속 ||\n" + + " || 6 > 현재 사용자 변경 ||\n" + + " || 7 > 상위 메뉴로 돌아가기 ||\n" + " *******************************************************\n"); int choice = scanInt(); // 숫자 입력 메서드 호출 - int inputMsgNum = -1; - Message currentMsg = null; + int inputMsgNum; + Message currentMsg; switch (choice) { case 1: // 1_1 메세지 작성 while (true){ - System.out.println(" ▶ 새로운 메세지를 등록합니다.\n "); - boolean breakpoint= messageService.uploadMsg(currentUser); - if (breakpoint != true){ - break; + System.out.println(" ▶ 새로운 메세지를 등록합니다.\n >> "); + String txtMsg = scanner.nextLine(); + if (txtMsg.length()!=0) { + currentChannel.messageService().uploadMsg(currentUser, txtMsg); + }else { + System.out.println(" ▶ 메세지 입력을 종료합니다"); + break; + } } - } break; case 2: //1_2 전체 메세지 조회 System.out.println(" ▶ 채널에 등록된 모든 메세지를 조회합니다.\n "); - messageService.printAllMessages(); + currentChannel.messageService().printAllMessages(); break; case 3: // 1_3 메세지 수정 System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); - messageService.printAllMessages(); + currentChannel.messageService().printAllMessages(); System.out.println(" ▶ 수정할 메세지의 번호를 입력해 주세요"); inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 - currentMsg = messageService.findMessageByNum(inputMsgNum); + currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); System.out.println(currentMsg.getTextMsg()); System.out.print("수정할 새로운 메세지를 입력해 주세요.\n >> "); String newMessage = scanner.nextLine(); - messageService.updateMsg(currentMsg,newMessage); + currentChannel.messageService().updateMsg(currentMsg,newMessage); System.out.println("기존 내용을 [" + newMessage + "] 로 수정하였습니다."); break; case 4: // 1_4 메세지 삭제 System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); - messageService.printAllMessages(); + currentChannel.messageService().printAllMessages(); System.out.println(" ▶ 삭제할 메세지의 번호를 입력해 주세요"); inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 - currentMsg = messageService.findMessageByNum(inputMsgNum); + currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); System.out.println(currentMsg.getTextMsg()); @@ -173,13 +203,16 @@ public static void menuMessageMng(User currentUser){ // 1 채널 조작 System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); break; }else if(deleteConfirm.equals("삭제")) { - messageService.deleteMessage(currentMsg); + currentChannel.messageService().deleteMessage(currentMsg); System.out.println("메세지가 삭제되었습니다."); }else{ System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); } break; - case 5: // 1_5 현재 사용자 변경 + case 5: // 1_5 현재 채널 변경 + currentChannel = verifyChannel(); + break; + case 6: // 1_5 현재 사용자 변경 System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); String username = scanner.nextLine(); User user = userService.findUserByName(username); @@ -192,12 +225,12 @@ public static void menuMessageMng(User currentUser){ // 1 채널 조작 System.out.println(""); } break; - case 6: // 1_6 상위메뉴로 이동 + case 7: // 1_7 상위메뉴로 이동 break; default: // 세부메뉴 입력예외처리 System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); } - if (choice == 6) {break;} + if (choice == 7) {break;} } diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/com/sprint/mission/discodeit/entity/Channel.java index 028fe56e..76db6840 100644 --- a/src/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/com/sprint/mission/discodeit/entity/Channel.java @@ -1,9 +1,49 @@ package com.sprint.mission.discodeit.entity; +import com.sprint.mission.discodeit.jcf.JCFMessageService; + +import java.text.SimpleDateFormat; import java.util.UUID; + public class Channel { private final UUID id = UUID.randomUUID(); private long createdAt = System.currentTimeMillis(); private long updatedAt; + + private JCFMessageService messageService; + + private String channelName; + private String channelDescription; + private String channelCreater; + + + public Channel(String channelName, String channelDescription, String channelCreater, long createdAt, long updatedAt) { + this.channelName = channelName; + this.channelDescription = channelDescription; + this.channelCreater = channelCreater; + this.createdAt = createdAt; + this.updatedAt = updatedAt; + this.messageService = new JCFMessageService(); + } + + public UUID getId() {return id;} + public String getCreatedAt() { + String formatedTime = new SimpleDateFormat("HH:mm:ss").format(createdAt); + return formatedTime;} + + public String getUpdatedAt() { + String formatedTime = new SimpleDateFormat("HH:mm:ss").format(updatedAt); + return formatedTime;} + public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} + + public String getChannelName() {return channelName;} + public void setChannelName(String channelName) {this.channelName = channelName;} + + public String getChannelDescription() {return channelDescription;} + public void setChannelDescription(String channelDescription) {this.channelDescription = channelDescription;} + + public String getChannelCreater() {return channelCreater;} + + public JCFMessageService messageService() {return messageService;} } diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/com/sprint/mission/discodeit/entity/Message.java index ae3aad55..8400871e 100644 --- a/src/com/sprint/mission/discodeit/entity/Message.java +++ b/src/com/sprint/mission/discodeit/entity/Message.java @@ -6,12 +6,13 @@ public class Message { private final UUID id = UUID.randomUUID(); - public static int totMsgNumber = 0; + private long createdAt = System.currentTimeMillis(); + private long updatedAt; + private int msgNumber; + private String author; private String textMsg; - private long createdAt = System.currentTimeMillis(); - private long updatedAt; public Message(int msgNumber, String author, String textMsg,long createdAt, long updatedAt) { @@ -34,6 +35,7 @@ public String getCreatedAt() { public String getUpdatedAt() { String formatedTime = new SimpleDateFormat("HH:mm:ss").format(updatedAt); return formatedTime;} - public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} + public void setUpdatedAt(long updatedAt) { + this.updatedAt = updatedAt;} } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java index 17155ced..494fd712 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java @@ -1,4 +1,42 @@ package com.sprint.mission.discodeit.jcf; +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.Message; +import com.sprint.mission.discodeit.entity.User; + +import java.util.ArrayList; +import java.util.List; + public class JCFChannelService { + // 초기 채널 입력 + private final List channels = new ArrayList<>(); + public JCFChannelService(){ + channels.add(new Channel("ch01","default Channel","관리자",1744036548250L,1744036548250L)); + } + public Channel addChannel(String channelName, String channelDesc, User user){ + long now = System.currentTimeMillis(); + Channel channel = new Channel(channelName,channelDesc,user.getName(),now,now); + channels.add(channel); + System.out.print("\n ▶ [새로운 채널 생성완료]"); + System.out.println(" ▶ 채널명 : " + channel.getChannelName() + " ▶ 생성시간 : " + channel.getCreatedAt()); + return channel; + }; + void UpdateChannel(String channelName, String channelDescription){}; + void deleteChannel(Channel channel){}; + + public void printAllChannels(){ + System.out.println("<< 생성된 전체 채널 >>"); + System.out.println("채널명 | 개설자 | 채널설명(개설시간)"); + channels.forEach(chan -> System.out.println(chan.getChannelName()+" | "+chan.getChannelCreater()+" | "+chan.getChannelDescription()+" ("+chan.getCreatedAt() + ")")); + System.out.println(""); + }; + //List getAllChannels(){}; + public Channel findChannelByName(String name){ + for (Channel channel : channels) { + if (channel.getChannelName().equals(name)) { + return channel; // 일치하는 name 발견시 user 리턴 + } + } + return null; // 없으면 null + }; } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java index a022673e..9eb1e3c9 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -6,11 +6,9 @@ import java.util.ArrayList; import java.util.List; -import java.util.Scanner; public class JCFMessageService implements MessageService { private final List messages = new ArrayList<>(); - private static Scanner scanner = new Scanner(System.in); // 테스트용 초기 더미 데이터 입력 public JCFMessageService() { messages.add(new Message(001,"희동이","요리보고 조리봐도", 1744036548250L , 1744036548250L)); @@ -19,20 +17,13 @@ public JCFMessageService() { messages.add(new Message(004,"고길동","우리집에 들어왔지 이 식충이녀석들", 1744036938250L , 1744036938250L)); } @Override - public boolean uploadMsg(User user){ - System.out.print(" >> "); - String txtMsg = scanner.nextLine(); - if (txtMsg.length()!=0){ - long now = System.currentTimeMillis(); - Message.totMsgNumber = messages.size(); - Message message = new Message(Message.totMsgNumber + 1,user.getName(),txtMsg,now,now); - messages.add(message); - System.out.print("\n ▶ [메세지 등록 완료]"); - System.out.println(" ▶ 메세지 번호 : " + message.getMsgNumber() + " ▶ 등록시간 : " + message.getCreatedAt()); - return true;} else{ - System.out.println(" ▶ 메세지 입력을 종료합니다"); - return false; - } + public void uploadMsg(User user,String txtMsg){ + long now = System.currentTimeMillis(); + Message message = new Message(messages.size() + 1,user.getName(),txtMsg,now,now); + messages.add(message); + System.out.print("\n ▶ [메세지 등록 완료]"); + System.out.println(" ▶ 메세지 번호 : " + message.getMsgNumber() + " ▶ 등록시간 : " + message.getCreatedAt()); + } @Override diff --git a/src/com/sprint/mission/discodeit/service/ChannelService.java b/src/com/sprint/mission/discodeit/service/ChannelService.java index 67eb3e0b..d1d4d55f 100644 --- a/src/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/com/sprint/mission/discodeit/service/ChannelService.java @@ -1,4 +1,17 @@ package com.sprint.mission.discodeit.service; +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; + +import java.util.List; + public interface ChannelService { + Channel addChannel(String channelName, String channelDesc, User user); + void UpdateChannel(String channelName, String channelDescription); + void deleteChannel(Channel channel); + + void printAllChannels(); + List getAllChannels(); + + Channel findChannelByName(String name); } diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java index 01075fef..d9022b7a 100644 --- a/src/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -7,7 +7,7 @@ import java.util.*; public interface MessageService{ - boolean uploadMsg(User user); + void uploadMsg(User user,String txtMsg); void updateMsg(Message message,String Msg); Message findMessageByNum(int num); From e8f08867d4f0dba7ee0b03d774acfa951eb3a5c7 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Wed, 9 Apr 2025 19:11:02 +0900 Subject: [PATCH 07/14] =?UTF-8?q?-application=EC=83=81=20=EB=8C=80?= =?UTF-8?q?=EB=B6=80=EB=B6=84=EC=9D=98=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=EB=90=A8=20=20=20=E3=84=B4=EC=B1=84=EB=84=90=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EB=AF=B8=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/discodeit/JavaApplication.java | 171 +++++++++++++----- .../mission/discodeit/entity/Channel.java | 5 +- .../mission/discodeit/entity/Message.java | 1 - .../sprint/mission/discodeit/entity/User.java | 4 +- .../discodeit/jcf/JCFChannelService.java | 32 +++- .../discodeit/jcf/JCFMessageService.java | 8 +- .../mission/discodeit/jcf/JCFUserService.java | 19 +- .../discodeit/service/MessageService.java | 3 - 8 files changed, 166 insertions(+), 77 deletions(-) diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java index 099982f5..3177f137 100644 --- a/src/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -4,16 +4,16 @@ import com.sprint.mission.discodeit.entity.Message; import com.sprint.mission.discodeit.entity.User; import com.sprint.mission.discodeit.jcf.JCFChannelService; -import com.sprint.mission.discodeit.jcf.JCFMessageService; import com.sprint.mission.discodeit.jcf.JCFUserService; import java.util.InputMismatchException; import java.util.Scanner; public class JavaApplication { + private static final JCFUserService userService = new JCFUserService(); private static final JCFChannelService channelService = new JCFChannelService(); - static final Scanner scanner = new Scanner(System.in); + private static final Scanner scanner = new Scanner(System.in); private static User currentUser; private static Channel currentChannel; @@ -21,8 +21,6 @@ public static void main(String[] args) { // 0. 초기 사용자 인증 currentUser = verifyUser(); // 0_1. intro 메세지 - - System.out.println(" ▶ discodeit 메세지 서비스에 연결되었습니다."); // 1. mainmenu 호출 menuMain(); @@ -47,21 +45,12 @@ public static void main(String[] args) { //// │ └ 3_4 전체 사용자 목록 조회 //// │ └ 3_5 현재 사용자 변경 //// │ └ 3_5 상위메뉴로 - //// └ 5. 프로그램 종료 + //// └ 4. 프로그램 종료 + } - // 이름으로 찾기 -// userService.findUserByName("이유정").ifPresent(u -> -// System.out.println("Found by name: " + u.getName() + ", ID: " + u.getId()) -// ); -// // ID로 삭제 -// boolean deleted = userService.deleteUserById(user1.getId()); -// System.out.println("Deleted Alice by ID: " + deleted); -// -// // 남은 사용자 출력 -// System.out.println("Remaining Users: "); -// userService.getAllUsers().forEach(u -> System.out.println(u.getName())); + // ▽▽▽main메서드에서 사용되는 내부 메서드 - } + // 메뉴 선택시 int값 입력 필터링 메서드 private static int scanInt(){ System.out.print(" >> "); int inputNum = -1; @@ -74,6 +63,7 @@ private static int scanInt(){ } return inputNum; } + // 어플리케이션 최초 실행시 User 신규여부 판별 메서드. 있으면 있는 유저로 로그인 / 없으면 새 유저 생성 public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 System.out.print(" ▶ 사용자명을 입력해 주세요 : "); String username = scanner.nextLine(); @@ -88,7 +78,8 @@ public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : return newUser; } } - public static Channel verifyChannel(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 + // 채널입장시 Channel 신규개설 판별 메서드. . 있으면 있는 채널에 참가 / 없으면 없는채널 생성 + public static Channel verifyChannel(){ System.out.print(" ▶ 채널명을 입력해 주세요 : "); String chanName = scanner.nextLine(); Channel channel = channelService.findChannelByName(chanName); @@ -105,11 +96,12 @@ public static Channel verifyChannel(){ // 사용자명 입력 >> 없는 사용 return newChannel; } } + // 메인 메뉴 call 메서드. 각 세부 메뉴로 접근하기 위함. public static void menuMain(){ while (true) { System.out.println(" ▶ 원하는 메뉴를 선택해 주세요."); System.out.println("**********************************************\n" - + "[1] 채널 입장\n" + + "[1] 채널 입장 및 메세지 관리\n" + "[2] 채널 관리 (신규, 수정, 삭제, 조회)\n" + "[3] 사용자 관리 (신규, 수정, 삭제, 조회)\n" + "[4] 종료\n" @@ -123,8 +115,7 @@ public static void menuMain(){ menuMessageMng(currentUser,currentChannel); break; case 2: - System.out.println(" ▶ 2번 메뉴는 아직 미지원입니다.\n "); - // menuSetting(); + menuChannelMng(currentUser); break; case 3: // 사용자 관리 : 사용자 관리 메서드 호출 menuUserMng(currentUser); @@ -137,13 +128,12 @@ public static void menuMain(){ } if (choice == 4) {break;} } - } - public static void menuMessageMng(User currentUser,Channel currentChannel){ // 1 채널 조작 메서드 - + // 메인메뉴 [1]번 하위메뉴. -> 채널입장 후 해당 채널에서의 메세지 개설/수정/삭제/조회 메뉴 + public static void menuMessageMng(User currentUser,Channel currentChannel){ // 1 메세지 관리 메서드 while (true) { System.out.println(" *******************************************************\n" - + " || "+currentChannel.getChannelName()+"채널에 입장했습니다.\n" + + " || ["+currentChannel.getChannelName()+"] 채널에 입장했습니다.\n" + " || 원하는 기능을 선택하세요. ||\n" + " || 1 > 신규 메세지 작성 ||\n" + " || 2 > 전체 메세지 조회 ||\n" @@ -153,13 +143,13 @@ public static void menuMessageMng(User currentUser,Channel currentChannel){ + " || 6 > 현재 사용자 변경 ||\n" + " || 7 > 상위 메뉴로 돌아가기 ||\n" + " *******************************************************\n"); - int choice = scanInt(); // 숫자 입력 메서드 호출 + int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 int inputMsgNum; Message currentMsg; switch (choice) { case 1: // 1_1 메세지 작성 while (true){ - System.out.println(" ▶ 새로운 메세지를 등록합니다.\n >> "); + System.out.print(" ▶ 새로운 메세지를 등록합니다.\n >> "); String txtMsg = scanner.nextLine(); if (txtMsg.length()!=0) { currentChannel.messageService().uploadMsg(currentUser, txtMsg); @@ -222,7 +212,7 @@ public static void menuMessageMng(User currentUser,Channel currentChannel){ } else { System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); - System.out.println(""); + System.out.println(); } break; case 7: // 1_7 상위메뉴로 이동 @@ -234,8 +224,95 @@ public static void menuMessageMng(User currentUser,Channel currentChannel){ } - } -// 1_3 사용자 관리 세부메뉴 메서드 + } // 1 메세지 관리 메서드 + // 메인메뉴 [2]번 하위메뉴. -> 각 채널의 개설/수정/삭제/조회 메뉴 + public static void menuChannelMng(User currentUser){ // 2. 채널 관리 메서드 + while (true) { + System.out.println(" *******************************************************\n" + + " || 채널 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 채널 생성 ||\n" + + " || 2 > 특정 채널 이름,설명 변경 ||\n" + + " || 3 > 개별 채널 삭제 ||\n" + + " || 4 > 전체 채널 정보 상세조회 ||\n" + + " || 5 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 + + switch (choice) { + case 1: // 2_1 신규 채널 생성, 채널설명 추가 + System.out.println(" ▶ 새로운 채널을 개설합니다."); + while(true) { + System.out.print(" ▶ 채널명을 입력해 주세요 : "); + String chanName = scanner.nextLine(); + Channel channel = channelService.findChannelByName(chanName); + if (channel == null) { + System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); + String chanDesc = scanner.nextLine(); + Channel newChan = channelService.addChannel(chanName, chanDesc, currentUser); + System.out.println("\n ▶ "+newChan.getChannelName()+" 채널 생성에 성공하였습니다."); + break; + } else {System.out.println("\n ▶ 이미 존재하는 채널입니다. 다른 이름을 입력해주세요.");} + } + break; + case 2: // 2_2 채널 이름으로 검색하여 해당 채널 이름,설명 변경 + while (true){ + System.out.println("\n ▶ 채널 이름을 변경합니다. 현재 개설된 채널은 아래와 같습니다. \n"); + channelService.printAllChannels(); + while(true) { + System.out.println(" ▶ 변경할 채널의 이름을 선택해 주세요."); + System.out.print(" >> "); + String chnName = scanner.nextLine(); + Channel targetChannel = channelService.findChannelByName(chnName); + if (targetChannel != null) { + System.out.println(" ▶ 선택하신 채널은 ["+targetChannel.getChannelName()+"] 입니다"); + System.out.println(" ▶ 변경할 이름을 입력해 주세요."); + while(true) { + System.out.print(" >> "); + String newName = scanner.nextLine(); + if (newName.length() != 0) { + targetChannel.setChannelName(newName); + System.out.println(" ▶ 채널명 변경에 성공했습니다."); + break; + } + System.out.println(" ▶ 잘못된 입력입니다. 다시 입력해 주세요."); + } + + System.out.println(" ▶ 변경된 채널의 설명을 입력해 주세요."); + while(true){ + System.out.print(" >> "); + String newDesc = scanner.nextLine(); + if (newDesc.length() == 0) { + targetChannel.setChannelDescription("-"); + System.out.println(" ▶ 채널 설명을 공백으로 설정했습니다."); + break; + }else{ + targetChannel.setChannelDescription(newDesc); + System.out.println(" ▶ 채널 설명 변경에 성공했습니다."); + break; + } + } + break; + }else{System.out.println("존재하지 않는 채널명입니다. 다시 입력해 주세요"); + } + }break; + } + break; + case 3: // 2_3 개별 채널 삭제 + break; + case 4: // 2_4 개별 채널 정보 상세조회 + channelService.printAllChannels(); + break; + case 6: // 2_5 상위메뉴 복귀 + break; + default: // 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 5) {break;} + } + + + } // 2. 채널 관리 메서드 + // 1_3 사용자 관리 세부메뉴 메서드 public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 내부메뉴 메서드 while (true) { System.out.println(" *******************************************************\n" @@ -263,9 +340,9 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 while (true) { System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); String username = scanner.nextLine(); - if (username.length() == 0) { // 입력값이 없는경우 상위 메뉴로 이동 - System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); - break;} + if (username.length() == 0) { // 입력값이 없는경우 상위 메뉴로 이동 + System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); + break;} User user = userService.findUserByName(username); if (user == null) { // 중복 유저명 체크하여 중복유저가 없는경우 사용자 생성 User newUser = userService.createUser(username); @@ -273,12 +350,12 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); // 새로 생성한 사용자로 currentUser 변경여부 체크 - System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); - String newUserChange = scanner.nextLine(); - if (newUserChange.equals("y") || newUserChange.equals("Y")) { - currentUser = newUser; - System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); - } + System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); + String newUserChange = scanner.nextLine(); + if (newUserChange.equals("y") || newUserChange.equals("Y")) { + currentUser = newUser; + System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); + } System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); break; @@ -294,9 +371,9 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); System.out.print(" >> "); String newName = scanner.nextLine(); - if(newName.length() ==0) {// 사용자 이름 입력값이 없는경우 상위메뉴로 이동 - System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); - break;} + if(newName.length() ==0) {// 사용자 이름 입력값이 없는경우 상위메뉴로 이동 + System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); + break;} User user = userService.findUserByName(newName); if(user != null){ // 중복값 존재시 재입력 System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); @@ -349,7 +426,7 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 } else { System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); - System.out.println(""); + System.out.println(); } break; case 6: // 1_4_6 상위메뉴 복귀 @@ -359,11 +436,5 @@ public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 } if (choice == 6) {break;} } - - - } // 1_4 사용자 관리 세부메뉴 메서드 - + } // 1_3 사용자 관리 세부메뉴 메서드 } - - - diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/com/sprint/mission/discodeit/entity/Channel.java index 76db6840..de33589f 100644 --- a/src/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/com/sprint/mission/discodeit/entity/Channel.java @@ -10,13 +10,12 @@ public class Channel { private final UUID id = UUID.randomUUID(); private long createdAt = System.currentTimeMillis(); private long updatedAt; - - private JCFMessageService messageService; - private String channelName; private String channelDescription; private String channelCreater; + private JCFMessageService messageService; + public Channel(String channelName, String channelDescription, String channelCreater, long createdAt, long updatedAt) { this.channelName = channelName; diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/com/sprint/mission/discodeit/entity/Message.java index 8400871e..0c7387af 100644 --- a/src/com/sprint/mission/discodeit/entity/Message.java +++ b/src/com/sprint/mission/discodeit/entity/Message.java @@ -1,7 +1,6 @@ package com.sprint.mission.discodeit.entity; import java.text.SimpleDateFormat; -import java.util.List; import java.util.UUID; public class Message { diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/com/sprint/mission/discodeit/entity/User.java index e1fdb95e..065f073f 100644 --- a/src/com/sprint/mission/discodeit/entity/User.java +++ b/src/com/sprint/mission/discodeit/entity/User.java @@ -23,8 +23,8 @@ public String getCreatedAt() { String formatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(createdAt); return formatedTime;} public String getUpdatedAt() { - String formatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(updatedAt); - return formatedTime;} + String aformatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(updatedAt); + return aformatedTime;} public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} @Override diff --git a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java index 494fd712..bdcb69b6 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java @@ -3,16 +3,19 @@ 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 java.util.ArrayList; import java.util.List; -public class JCFChannelService { +public class JCFChannelService implements ChannelService { // 초기 채널 입력 private final List channels = new ArrayList<>(); public JCFChannelService(){ channels.add(new Channel("ch01","default Channel","관리자",1744036548250L,1744036548250L)); } + // 채널 생성 메서드 + @Override public Channel addChannel(String channelName, String channelDesc, User user){ long now = System.currentTimeMillis(); Channel channel = new Channel(channelName,channelDesc,user.getName(),now,now); @@ -21,20 +24,39 @@ public Channel addChannel(String channelName, String channelDesc, User user){ System.out.println(" ▶ 채널명 : " + channel.getChannelName() + " ▶ 생성시간 : " + channel.getCreatedAt()); return channel; }; - void UpdateChannel(String channelName, String channelDescription){}; - void deleteChannel(Channel channel){}; + // 채널 수정 메서드 + @Override + public void UpdateChannel(String channelName, String channelDescription){ + + }; + // 채널 삭제 메서드 + @Override + public void deleteChannel(Channel channel){ + + }; + // 전체채널목록 출력 메서드 + @Override public void printAllChannels(){ System.out.println("<< 생성된 전체 채널 >>"); System.out.println("채널명 | 개설자 | 채널설명(개설시간)"); channels.forEach(chan -> System.out.println(chan.getChannelName()+" | "+chan.getChannelCreater()+" | "+chan.getChannelDescription()+" ("+chan.getCreatedAt() + ")")); System.out.println(""); - }; + } + + @Override + public List getAllChannels() { + return List.of(); + } + + ; //List getAllChannels(){}; + + @Override // 이름으로 채널 검색 메서드. 채널객체를 return public Channel findChannelByName(String name){ for (Channel channel : channels) { if (channel.getChannelName().equals(name)) { - return channel; // 일치하는 name 발견시 user 리턴 + return channel; // 일치하는 name 발견시 channel 객체를 리턴 } } return null; // 없으면 null diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java index 9eb1e3c9..ae125f58 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -11,10 +11,10 @@ public class JCFMessageService implements MessageService { private final List messages = new ArrayList<>(); // 테스트용 초기 더미 데이터 입력 public JCFMessageService() { - messages.add(new Message(001,"희동이","요리보고 조리봐도", 1744036548250L , 1744036548250L)); - messages.add(new Message(002,"희동이","알수없는 둘리둘리", 1744036558250L , 1744036558250L)); - messages.add(new Message(003,"도우너","빙하타고~내려와아~", 1744036938250L , 1744036938250L)); - messages.add(new Message(004,"고길동","우리집에 들어왔지 이 식충이녀석들", 1744036938250L , 1744036938250L)); + messages.add(new Message(001,"희동이","더미 데이터 1 요리보고 조리봐도", 1744036548250L , 1744036548250L)); + messages.add(new Message(002,"희동이","더미 데이터 2 알수없는 둘리둘리", 1744036558250L , 1744036558250L)); + messages.add(new Message(003,"도우너","더미 데이터 3 빙하타고~내려와아", 1744036938250L , 1744036938250L)); + messages.add(new Message(004,"고길동","더미 데이터 4 치인구를 만났지만", 1744036938250L , 1744036938250L)); } @Override public void uploadMsg(User user,String txtMsg){ diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java index f569cbe8..da1630b3 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java @@ -32,6 +32,16 @@ public void updateUserName(User user, String newName) { System.out.println("[" + oldName + "] 사용자의 이름을 [" + user.getName() + "] 으로 변경하였습니다. | " + user.getUpdatedAt()); } + @Override + public boolean deleteUser(UUID id) { + return users.removeIf(user -> user.getId().equals(id)); + } + + @Override + public boolean deleteUser(String name) { + return users.removeIf(user -> user.getName().equals(name)); + } + @Override public User findUserById(UUID id) { for (User user : users) { @@ -52,16 +62,7 @@ public User findUserByName(String name) { return null; // 없으면 null 리턴 } - @Override - public boolean deleteUser(UUID id) { - return users.removeIf(user -> user.getId().equals(id)); - } - @Override - public boolean deleteUser(String name) { - - return users.removeIf(user -> user.getName().equals(name)); - } diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java index d9022b7a..507ad435 100644 --- a/src/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -11,9 +11,6 @@ public interface MessageService{ void updateMsg(Message message,String Msg); Message findMessageByNum(int num); -// Optional findMsgByNum(UUID id); -// Optional findUserByUser(String name); -// boolean deleteUserById(UUID id); void deleteMessage(Message message); // void printAllMessages(); From 867be6d78ff9348880e3e44e82ed9559a444aec0 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Sun, 13 Apr 2025 18:41:47 +0900 Subject: [PATCH 08/14] =?UTF-8?q?-=20=EA=B0=81=20=ED=95=98=EC=9C=84?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20.control?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC=ED=95=A8=20=20=20=E3=84=B4Messag?= =?UTF-8?q?eControl.java=20:=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20=ED=8C=A8=EB=84=90=20?= =?UTF-8?q?=20=20=E3=84=B4ChannelControl.java=20:=20=EC=B1=84=EB=84=90=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20=ED=8C=A8?= =?UTF-8?q?=EB=84=90=20=20=20=E3=84=B4UserControl.java=20:=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EA=B4=80=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20?= =?UTF-8?q?=ED=8C=A8=EB=84=90=20-=20Channel=EB=AA=85=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EA=B2=80=EC=82=AC=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80=ED=95=A8=20-=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EB=A9=94=EC=84=B8=EC=A7=80=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=B7=20=EB=B3=80=EA=B2=BD=20-=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=ED=91=9C=EC=8B=9C=20=ED=8F=AC=EB=A7=B7=20yyyy.MM.d?= =?UTF-8?q?d=20hh.mm.ss=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discodeit/control/ChannelControl.java | 7 + .../discodeit/control/MessageControl.java | 138 ++++++++++++++++++ .../discodeit/control/UserControl.java | 7 + 3 files changed, 152 insertions(+) create mode 100644 src/com/sprint/mission/discodeit/control/ChannelControl.java create mode 100644 src/com/sprint/mission/discodeit/control/MessageControl.java create mode 100644 src/com/sprint/mission/discodeit/control/UserControl.java diff --git a/src/com/sprint/mission/discodeit/control/ChannelControl.java b/src/com/sprint/mission/discodeit/control/ChannelControl.java new file mode 100644 index 00000000..e4ca4a30 --- /dev/null +++ b/src/com/sprint/mission/discodeit/control/ChannelControl.java @@ -0,0 +1,7 @@ +package com.sprint.mission.discodeit.menu; + +import com.sprint.mission.discodeit.JavaApplication; + +public class ChannelControl extends JavaApplication { + +} diff --git a/src/com/sprint/mission/discodeit/control/MessageControl.java b/src/com/sprint/mission/discodeit/control/MessageControl.java new file mode 100644 index 00000000..f0c39915 --- /dev/null +++ b/src/com/sprint/mission/discodeit/control/MessageControl.java @@ -0,0 +1,138 @@ +package com.sprint.mission.discodeit.menu; + +import com.sprint.mission.discodeit.JavaApplication; +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.jcf.JCFChannelService; +import com.sprint.mission.discodeit.jcf.JCFUserService; + +import java.util.List; +import java.util.Scanner; + +public class MessageControl extends JavaApplication { + private static final JCFUserService userService = new JCFUserService(); + private static final JCFChannelService channelService = new JCFChannelService(); + private static final Scanner scanner = new Scanner(System.in); + private static User currentUser; + private static Channel currentChannel; + public static void menuMessageMng(User currentUser, Channel currentChannel){ // 1 메세지 관리 메서드 + while (true) { + System.out.println(" *******************************************************\n" + + " || ["+currentChannel.getChannelName()+"] 채널에 입장했습니다.\n" + + " || 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 메세지 작성 ||\n" + + " || 2 > 전체 메세지 조회 ||\n" + + " || 3 > 단건 메세지 조회 ||\n" + + " || 4 > 메세지 수정 ||\n" + + " || 5 > 메세지 삭제 ||\n" + + " || 6 > 다른 채널에 접속 ||\n" + + " || 7 > 현재 사용자 변경 ||\n" + + " || 8 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 + int inputMsgNum; + Message currentMsg; + List messages = currentChannel.messageService().getMessagesList(); + switch (choice) { + case 1: // 1_1 메세지 작성 + System.out.print(" ▶ 새로운 대화를 시작합니다.\n"); + while (true){ + int goNum; + if((messages.size()) < 5){goNum=0;}else{goNum = messages.size() - 5;} + System.out.println("번호 | 사용자명 : 메세지(생성일/수정일)"); + for (int i = goNum ; i < messages.size(); i++) { + currentChannel.messageService().printOneMessage(i+1); + } + + System.out.print(" >> "); + String txtMsg = scanner.nextLine(); + if (txtMsg.length()!=0) { + currentChannel.messageService().uploadMsg(currentUser, txtMsg); + }else { + System.out.println(" ▶ 메세지 입력을 종료합니다"); + break; + } + } + break; + + case 2: //1_2 전체 메세지 조회 + System.out.println(" ▶ 채널에 등록된 모든 메세지를 조회합니다.\n "); + currentChannel.messageService().printAllMessages(); + break; + case 3: //1_3 단건 메세지 조회 + System.out.println(" ▶ 조회할 메세지의 번호를 입력해 주세요"); + inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 + if(inputMsgNum <= messages.size()) { + System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); + System.out.println("번호 | 사용자 : 메세지 ( 생성시각 / 수정시각 )"); + System.out.println(currentChannel.messageService().findMessageByNum(inputMsgNum)); + break;} + System.out.println(" ▶ 잘못된 입력입니다. 상위메뉴로 돌아갑니다."); + + break; + case 4: // 1_4 메세지 수정 + System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); + currentChannel.messageService().printAllMessages(); + System.out.println(" ▶ 수정할 메세지의 번호를 입력해 주세요"); + inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 + if(inputMsgNum <= messages.size()) { + currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); + System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); + System.out.println(currentMsg.getTextMsg()); + + System.out.print("수정할 새로운 메세지를 입력해 주세요.\n >> "); + String newMessage = scanner.nextLine(); + currentChannel.messageService().updateMsg(currentMsg, newMessage); + System.out.println("기존 내용을 [" + newMessage + "] 로 수정하였습니다."); + break;} + System.out.println(" ▶ 잘못된 입력입니다. 상위메뉴로 돌아갑니다."); + break; + case 5: // 1_5 메세지 삭제 + System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); + currentChannel.messageService().printAllMessages(); + System.out.println(" ▶ 삭제할 메세지의 번호를 입력해 주세요"); + inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 + currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); + System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); + System.out.println(currentMsg.getTextMsg()); + + System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요.\n >> "); + String deleteConfirm = scanner.nextLine(); + if (deleteConfirm.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + break; + }else if(deleteConfirm.equals("삭제")) { + currentChannel.messageService().deleteMessage(currentMsg); + System.out.println("메세지가 삭제되었습니다."); + }else{ + System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); + } + break; + case 6: // 1_6 현재 채널 변경 + currentChannel = verifyChannel(); + break; + case 7: // 1_7 현재 사용자 변경 + System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); + currentUser = user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); + userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); + System.out.println(); + } + break; + case 8: // 1_8 상위메뉴로 이동 + break; + default: // 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 8) {break;} + } + + + } // 1 메세지 관리 메서드 +} diff --git a/src/com/sprint/mission/discodeit/control/UserControl.java b/src/com/sprint/mission/discodeit/control/UserControl.java new file mode 100644 index 00000000..8fecfcd0 --- /dev/null +++ b/src/com/sprint/mission/discodeit/control/UserControl.java @@ -0,0 +1,7 @@ +package com.sprint.mission.discodeit.menu; + +import com.sprint.mission.discodeit.JavaApplication; + +public class UserControl extends JavaApplication { + +} From 09bbb5c28df62eb0ea002ccfe130ec73da602c91 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Sun, 13 Apr 2025 18:41:55 +0900 Subject: [PATCH 09/14] =?UTF-8?q?-=20=EA=B0=81=20=ED=95=98=EC=9C=84?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20.control?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC=ED=95=A8=20=20=20=E3=84=B4Messag?= =?UTF-8?q?eControl.java=20:=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20=ED=8C=A8=EB=84=90=20?= =?UTF-8?q?=20=20=E3=84=B4ChannelControl.java=20:=20=EC=B1=84=EB=84=90=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20=ED=8C=A8?= =?UTF-8?q?=EB=84=90=20=20=20=E3=84=B4UserControl.java=20:=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EA=B4=80=EB=A6=AC=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=20?= =?UTF-8?q?=ED=8C=A8=EB=84=90=20-=20Channel=EB=AA=85=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EA=B2=80=EC=82=AC=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80=ED=95=A8=20-=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EB=A9=94=EC=84=B8=EC=A7=80=20=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=B7=20=EB=B3=80=EA=B2=BD=20-=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=ED=91=9C=EC=8B=9C=20=ED=8F=AC=EB=A7=B7=20yyyy.MM.d?= =?UTF-8?q?d=20hh.mm.ss=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 - .../mission/discodeit/JavaApplication.java | 420 ++---------------- .../discodeit/control/ChannelControl.java | 150 ++++++- .../discodeit/control/MessageControl.java | 18 +- .../discodeit/control/UserControl.java | 159 ++++++- .../mission/discodeit/entity/Channel.java | 15 +- .../mission/discodeit/entity/Message.java | 14 +- .../sprint/mission/discodeit/entity/User.java | 8 +- .../discodeit/jcf/JCFChannelService.java | 19 +- .../discodeit/jcf/JCFMessageService.java | 28 +- .../mission/discodeit/jcf/JCFUserService.java | 7 +- .../discodeit/service/ChannelService.java | 2 +- .../discodeit/service/MessageService.java | 7 +- 13 files changed, 413 insertions(+), 435 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 07115cdf..ef89d983 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/com/sprint/mission/discodeit/JavaApplication.java index 3177f137..ac67e001 100644 --- a/src/com/sprint/mission/discodeit/JavaApplication.java +++ b/src/com/sprint/mission/discodeit/JavaApplication.java @@ -1,57 +1,56 @@ package com.sprint.mission.discodeit; 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.jcf.JCFChannelService; -import com.sprint.mission.discodeit.jcf.JCFUserService; +import com.sprint.mission.discodeit.control.ChannelControl; +import com.sprint.mission.discodeit.control.MessageControl; +import com.sprint.mission.discodeit.control.UserControl; import java.util.InputMismatchException; import java.util.Scanner; public class JavaApplication { - - private static final JCFUserService userService = new JCFUserService(); - private static final JCFChannelService channelService = new JCFChannelService(); - private static final Scanner scanner = new Scanner(System.in); - private static User currentUser; - private static Channel currentChannel; + public static final Scanner scanner = new Scanner(System.in); + public static User currentUser; + public static Channel currentChannel; public static void main(String[] args) { // 0. 초기 사용자 인증 - currentUser = verifyUser(); + currentUser = UserControl.verifyUser(); // 0_1. intro 메세지 System.out.println(" ▶ discodeit 메세지 서비스에 연결되었습니다."); // 1. mainmenu 호출 menuMain(); //// <<메뉴 트리>> - //// 메인메뉴 ┬ 1. 채널입장 (채널상 메세지 관리) || 메서드 : menuMessageMng() - //// │ ├ 1_1 메세지 작성 - //// │ ├ 1_2 전체 메세지 조회 - //// │ ├ 1_3 메세지 수정 - //// │ ├ 1_4 메세지 삭제 - //// │ └ 1_5 현재 사용자 변경 - //// │ └ 1_6 상위메뉴로 - //// ├ 2. 채널 관리(신규,수정,삭제) || 메서드 : menuChannelMng() - //// │ ├ 2_1 신규 채널 개설 - //// │ ├ 2_2 채널명 수정 - //// │ ├ 2_3 채널 삭제 - //// │ └ 2_4 전체 채널 목록 조회 - //// │ └ 2_5 상위메뉴로 - //// ├ 3. 사용자 관리(신규,수정,삭제) || 메서드 : menuUserMng() - //// │ ├ 3_1 신규 사용자 추가 - //// │ ├ 3_2 현재 사용자 변경 - //// │ └ 3_3 전체 사용자 목록 조회 - //// │ └ 3_4 전체 사용자 목록 조회 - //// │ └ 3_5 현재 사용자 변경 - //// │ └ 3_5 상위메뉴로 + //// 메인메뉴 ┬ 1. 채널입장 (채널상 메세지 관리) || 메서드 : control.menuMessageMng() + //// │ ├ 1_1 메세지 작성 ok + //// │ ├ 1_2 전체 메세지 조회 ok + //// │ ├ 1_3 단건 메세지 조회 ok + //// │ ├ 1_4 메세지 수정 ok + //// │ ├ 1_5 메세지 삭제 ok + //// │ └ 1_6 다른 채널에 접속 ok + //// │ └ 1_7 현재 사용자 변경 ok + //// │ └ 1_8 상위메뉴로 ok + //// ├ 2. 채널 관리(신규,수정,삭제) || 메서드 : control.menuChannelMng() + //// │ ├ 2_1 신규 채널 개설 ok + //// │ ├ 2_2 개별 채널 정보 상세조회 ok + //// │ ├ 2_3 개별 채널 이름,설명 변경 ok + //// │ └ 2_4 개별 채널 삭제 ok + //// │ └ 2_5 전체 채널 정보 상세조회 ok + //// │ └ 2_6 상위메뉴로 ok + //// ├ 3. 사용자 관리(신규,수정,삭제) || 메서드 : control.menuUserMng() + //// │ ├ 3_1 신규 사용자 추가 ok + //// │ ├ 3_2 현재 사용자 변경 ok + //// │ ├ 3_3 사용자 삭제 ok + //// │ └ 3_4 단일 사용자 상세 조회 ok + //// │ └ 3_5 전체 사용자 목록 조회 ok + //// │ └ 3_6 현재 사용자 변경 ok + //// │ └ 3_7 상위메뉴로 ok //// └ 4. 프로그램 종료 } // ▽▽▽main메서드에서 사용되는 내부 메서드 - - // 메뉴 선택시 int값 입력 필터링 메서드 - private static int scanInt(){ + public static int scanInt(){ // 메뉴 선택시 int값 입력 필터링 메서드 System.out.print(" >> "); int inputNum = -1; try { @@ -63,41 +62,9 @@ private static int scanInt(){ } return inputNum; } - // 어플리케이션 최초 실행시 User 신규여부 판별 메서드. 있으면 있는 유저로 로그인 / 없으면 새 유저 생성 - public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 - System.out.print(" ▶ 사용자명을 입력해 주세요 : "); - String username = scanner.nextLine(); - User user = userService.findUserByName(username); - if (user != null) { - System.out.println("[" + user.getName() + "] 님 환영합니다." + ", ID: " + user.getId()); - return user; - } else { - System.out.println("\n ▶ 존재하지 않는 사용자입니다. 신규 사용자로 등록합니다."); - User newUser = userService.createUser(username); - System.out.println("\n ▶ 환영합니다 [" + newUser.getName() + "] 님, 새로운 ID가 발급되였습니다.\n 신규 사용자 UUID : " + newUser.getId()); - return newUser; - } - } - // 채널입장시 Channel 신규개설 판별 메서드. . 있으면 있는 채널에 참가 / 없으면 없는채널 생성 - public static Channel verifyChannel(){ - System.out.print(" ▶ 채널명을 입력해 주세요 : "); - String chanName = scanner.nextLine(); - Channel channel = channelService.findChannelByName(chanName); - if (channel != null) { - System.out.println("[" + channel.getChannelName() + "] 에 접속합니다." + ", 채널 ID: " + channel.getId()); - return channel; - } else { - System.out.println("\n ▶ 존재하지 않는 채널입니다. 새로운 채널을 개설합니다."); - System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); - String chanDesc = scanner.nextLine(); - Channel newChannel = channelService.addChannel(chanName,chanDesc,currentUser); - System.out.println("\n ▶ 생성에 성공하였습니다."); - System.out.println("[" + newChannel.getChannelName() + "] 에 접속합니다." + ", 채널 ID: " + newChannel.getId()); - return newChannel; - } - } - // 메인 메뉴 call 메서드. 각 세부 메뉴로 접근하기 위함. - public static void menuMain(){ + + + public static void menuMain(){ // 메인 메뉴 call 메서드. 각 세부 메뉴로 접근하기 위함. while (true) { System.out.println(" ▶ 원하는 메뉴를 선택해 주세요."); System.out.println("**********************************************\n" @@ -110,15 +77,14 @@ public static void menuMain(){ switch (choice) { case 1: // 채널 입장 : 메세지 관리 메서드 호출 - currentChannel = verifyChannel(); - channelService.printAllChannels(); - menuMessageMng(currentUser,currentChannel); + currentChannel = ChannelControl.verifyChannel(); + MessageControl.menuMessageMng(currentUser,currentChannel); break; case 2: - menuChannelMng(currentUser); + ChannelControl.menuChannelMng(currentUser); break; case 3: // 사용자 관리 : 사용자 관리 메서드 호출 - menuUserMng(currentUser); + UserControl.menuUserMng(currentUser); break; case 4: System.out.println(" ▶ 프로그램을 종료합니다."); @@ -129,312 +95,4 @@ public static void menuMain(){ if (choice == 4) {break;} } } - // 메인메뉴 [1]번 하위메뉴. -> 채널입장 후 해당 채널에서의 메세지 개설/수정/삭제/조회 메뉴 - public static void menuMessageMng(User currentUser,Channel currentChannel){ // 1 메세지 관리 메서드 - while (true) { - System.out.println(" *******************************************************\n" - + " || ["+currentChannel.getChannelName()+"] 채널에 입장했습니다.\n" - + " || 원하는 기능을 선택하세요. ||\n" - + " || 1 > 신규 메세지 작성 ||\n" - + " || 2 > 전체 메세지 조회 ||\n" - + " || 3 > 메세지 수정 ||\n" - + " || 4 > 메세지 삭제 ||\n" - + " || 5 > 다른 채널에 접속 ||\n" - + " || 6 > 현재 사용자 변경 ||\n" - + " || 7 > 상위 메뉴로 돌아가기 ||\n" - + " *******************************************************\n"); - int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 - int inputMsgNum; - Message currentMsg; - switch (choice) { - case 1: // 1_1 메세지 작성 - while (true){ - System.out.print(" ▶ 새로운 메세지를 등록합니다.\n >> "); - String txtMsg = scanner.nextLine(); - if (txtMsg.length()!=0) { - currentChannel.messageService().uploadMsg(currentUser, txtMsg); - }else { - System.out.println(" ▶ 메세지 입력을 종료합니다"); - break; - } - } - break; - - case 2: //1_2 전체 메세지 조회 - System.out.println(" ▶ 채널에 등록된 모든 메세지를 조회합니다.\n "); - currentChannel.messageService().printAllMessages(); - break; - case 3: // 1_3 메세지 수정 - System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); - currentChannel.messageService().printAllMessages(); - System.out.println(" ▶ 수정할 메세지의 번호를 입력해 주세요"); - inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 - currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); - System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); - System.out.println(currentMsg.getTextMsg()); - - System.out.print("수정할 새로운 메세지를 입력해 주세요.\n >> "); - String newMessage = scanner.nextLine(); - currentChannel.messageService().updateMsg(currentMsg,newMessage); - System.out.println("기존 내용을 [" + newMessage + "] 로 수정하였습니다."); - break; - case 4: // 1_4 메세지 삭제 - System.out.println(" ▶ 현재 등록된 메세지는 아래와 같습니다."); - currentChannel.messageService().printAllMessages(); - System.out.println(" ▶ 삭제할 메세지의 번호를 입력해 주세요"); - inputMsgNum = scanInt(); // 숫자 입력 메서드 호출 - currentMsg = currentChannel.messageService().findMessageByNum(inputMsgNum); - System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); - System.out.println(currentMsg.getTextMsg()); - - System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요.\n >> "); - String deleteConfirm = scanner.nextLine(); - if (deleteConfirm.length() == 0) { - System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); - break; - }else if(deleteConfirm.equals("삭제")) { - currentChannel.messageService().deleteMessage(currentMsg); - System.out.println("메세지가 삭제되었습니다."); - }else{ - System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); - } - break; - case 5: // 1_5 현재 채널 변경 - currentChannel = verifyChannel(); - break; - case 6: // 1_5 현재 사용자 변경 - System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); - String username = scanner.nextLine(); - User user = userService.findUserByName(username); - if (user != null) { - System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); - currentUser = user; - } else { - System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); - userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); - System.out.println(); - } - break; - case 7: // 1_7 상위메뉴로 이동 - break; - default: // 세부메뉴 입력예외처리 - System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); - } - if (choice == 7) {break;} - } - - - } // 1 메세지 관리 메서드 - // 메인메뉴 [2]번 하위메뉴. -> 각 채널의 개설/수정/삭제/조회 메뉴 - public static void menuChannelMng(User currentUser){ // 2. 채널 관리 메서드 - while (true) { - System.out.println(" *******************************************************\n" - + " || 채널 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" - + " || 1 > 신규 채널 생성 ||\n" - + " || 2 > 특정 채널 이름,설명 변경 ||\n" - + " || 3 > 개별 채널 삭제 ||\n" - + " || 4 > 전체 채널 정보 상세조회 ||\n" - + " || 5 > 상위 메뉴로 돌아가기 ||\n" - + " *******************************************************\n"); - int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 - - switch (choice) { - case 1: // 2_1 신규 채널 생성, 채널설명 추가 - System.out.println(" ▶ 새로운 채널을 개설합니다."); - while(true) { - System.out.print(" ▶ 채널명을 입력해 주세요 : "); - String chanName = scanner.nextLine(); - Channel channel = channelService.findChannelByName(chanName); - if (channel == null) { - System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); - String chanDesc = scanner.nextLine(); - Channel newChan = channelService.addChannel(chanName, chanDesc, currentUser); - System.out.println("\n ▶ "+newChan.getChannelName()+" 채널 생성에 성공하였습니다."); - break; - } else {System.out.println("\n ▶ 이미 존재하는 채널입니다. 다른 이름을 입력해주세요.");} - } - break; - case 2: // 2_2 채널 이름으로 검색하여 해당 채널 이름,설명 변경 - while (true){ - System.out.println("\n ▶ 채널 이름을 변경합니다. 현재 개설된 채널은 아래와 같습니다. \n"); - channelService.printAllChannels(); - while(true) { - System.out.println(" ▶ 변경할 채널의 이름을 선택해 주세요."); - System.out.print(" >> "); - String chnName = scanner.nextLine(); - Channel targetChannel = channelService.findChannelByName(chnName); - if (targetChannel != null) { - System.out.println(" ▶ 선택하신 채널은 ["+targetChannel.getChannelName()+"] 입니다"); - System.out.println(" ▶ 변경할 이름을 입력해 주세요."); - while(true) { - System.out.print(" >> "); - String newName = scanner.nextLine(); - if (newName.length() != 0) { - targetChannel.setChannelName(newName); - System.out.println(" ▶ 채널명 변경에 성공했습니다."); - break; - } - System.out.println(" ▶ 잘못된 입력입니다. 다시 입력해 주세요."); - } - - System.out.println(" ▶ 변경된 채널의 설명을 입력해 주세요."); - while(true){ - System.out.print(" >> "); - String newDesc = scanner.nextLine(); - if (newDesc.length() == 0) { - targetChannel.setChannelDescription("-"); - System.out.println(" ▶ 채널 설명을 공백으로 설정했습니다."); - break; - }else{ - targetChannel.setChannelDescription(newDesc); - System.out.println(" ▶ 채널 설명 변경에 성공했습니다."); - break; - } - } - break; - }else{System.out.println("존재하지 않는 채널명입니다. 다시 입력해 주세요"); - } - }break; - } - break; - case 3: // 2_3 개별 채널 삭제 - break; - case 4: // 2_4 개별 채널 정보 상세조회 - channelService.printAllChannels(); - break; - case 6: // 2_5 상위메뉴 복귀 - break; - default: // 세부메뉴 입력예외처리 - System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); - } - if (choice == 5) {break;} - } - - - } // 2. 채널 관리 메서드 - // 1_3 사용자 관리 세부메뉴 메서드 - public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 내부메뉴 메서드 - while (true) { - System.out.println(" *******************************************************\n" - + " || 사용자 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" - + " || 1 > 신규 사용자 생성 ||\n" - + " || 2 > 현재 사용자 이름 변경 ||\n" - + " || 3 > 사용자 삭제 ||\n" - + " || 4 > 전체 사용자 상세조회 ||\n" - + " || 5 > 다른 사용자로 진행 ||\n" - + " || 6 > 상위 메뉴로 돌아가기 ||\n" - + " *******************************************************\n"); - System.out.print(" >> "); - int choice = -1; - try { - choice = scanner.nextInt(); - scanner.nextLine(); // scanner 내부 개행문자 제거 - } catch (InputMismatchException e){ - System.out.println("숫자만 입력해 주세요"); - scanner.nextLine(); // scanner 내부 개행문자 제거 - } - - switch (choice) { - case 1: // 1_4_1 신규 사용자 생성 메뉴 - System.out.println(" ▶ 새로운 사용자를 생성합니다."); - while (true) { - System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); - String username = scanner.nextLine(); - if (username.length() == 0) { // 입력값이 없는경우 상위 메뉴로 이동 - System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); - break;} - User user = userService.findUserByName(username); - if (user == null) { // 중복 유저명 체크하여 중복유저가 없는경우 사용자 생성 - User newUser = userService.createUser(username); - System.out.println(" ▶ 사용자 생성에 성공했습니다."); - System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); - - // 새로 생성한 사용자로 currentUser 변경여부 체크 - System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); - String newUserChange = scanner.nextLine(); - if (newUserChange.equals("y") || newUserChange.equals("Y")) { - currentUser = newUser; - System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); - } - - System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); - break; - } else { // user.name 중복값 확인시 while문 재시작 - System.out.println(" ▶ 이미 존재하는 사용자명입니다. 다른 이름을 입력해 주세요.\n"); - } - } - break; - - case 2: - while (true){ // 1_4_2 사용자 이름 변경 메뉴 - System.out.println("\n ▶ 사용자 이름을 변경합니다. * 현재 사용자 이름 : [" + currentUser.getName() + "]"); - System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); - System.out.print(" >> "); - String newName = scanner.nextLine(); - if(newName.length() ==0) {// 사용자 이름 입력값이 없는경우 상위메뉴로 이동 - System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); - break;} - User user = userService.findUserByName(newName); - if(user != null){ // 중복값 존재시 재입력 - System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); - } else{ // 중복값 미확인시 유저명 변경 - userService.updateUserName(currentUser, newName); - break; - } - } - break; - case 3: // 1_4_3 사용자 삭제 메뉴 - System.out.println(" ▶ 삭제할 사용자의 ID나 이름을 입력해 주세요"); - System.out.println(" ▶ 현재 등록된 사용자는 아래와 같습니다."); - userService.printAllUsers(); - System.out.print(" >> "); - String deleteUser = scanner.nextLine(); - if (deleteUser.length() == 0) { - System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); - } else if (deleteUser.equals(currentUser.getName())){ - System.out.println(" ▶ 현재 로그인된 사용자는 삭제할 수 없습니다! 이전 메뉴로 돌아갑니다."); - break; - } else { - System.out.println(" ▶ 입력하신 사용자는 아래와 같습니다."); - User userToDel = userService.findUserByName(deleteUser); - System.out.println(userToDel); - System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요"); - System.out.print(" >> "); - String deleteConfirm = scanner.nextLine(); - if (deleteConfirm.length() == 0) { - System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); - break; - }else if(deleteConfirm.equals("삭제")) { - userService.deleteUser(deleteUser); - System.out.println("[" + deleteUser + "] 사용자가 삭제되었습니다."); - }else{ - System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); - } - } - break; - case 4: // 1_4_4 모든 사용자 정보 출력 메뉴 - System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); - userService.printAllUsers(); - break; - case 5: // 1_4_5 다른 사용자로 진행 - System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); - String username = scanner.nextLine(); - User user = userService.findUserByName(username); - if (user != null) { - System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); - currentUser = user; - } else { - System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); - userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); - System.out.println(); - } - break; - case 6: // 1_4_6 상위메뉴 복귀 - break; - default: // 1_4 세부메뉴 입력예외처리 - System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); - } - if (choice == 6) {break;} - } - } // 1_3 사용자 관리 세부메뉴 메서드 } diff --git a/src/com/sprint/mission/discodeit/control/ChannelControl.java b/src/com/sprint/mission/discodeit/control/ChannelControl.java index e4ca4a30..9a05b86c 100644 --- a/src/com/sprint/mission/discodeit/control/ChannelControl.java +++ b/src/com/sprint/mission/discodeit/control/ChannelControl.java @@ -1,7 +1,155 @@ -package com.sprint.mission.discodeit.menu; +package com.sprint.mission.discodeit.control; import com.sprint.mission.discodeit.JavaApplication; +import com.sprint.mission.discodeit.entity.Channel; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.jcf.JCFChannelService; public class ChannelControl extends JavaApplication { + private static final JCFChannelService channelService = new JCFChannelService(); + + public static Channel verifyChannel(){ // 채널입장시 Channel 신규개설 판별 메서드. 있으면 있는 채널에 참가 / 없으면 없는채널 생성 + System.out.print(" ▶ 채널명을 입력해 주세요 : "); + String chanName = scanner.nextLine(); + Channel channel = channelService.findChannelByName(chanName); + if (channel != null) { + System.out.println("[" + channel.getChannelName() + "] 에 접속합니다." + ", 채널 ID: " + channel.getId()); + return channel; + } else { + System.out.println("\n ▶ 존재하지 않는 채널입니다. 새로운 채널을 개설합니다."); + System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); + String chanDesc = scanner.nextLine(); + Channel newChannel = channelService.addChannel(chanName,chanDesc,currentUser); + System.out.println(" ▶ [" + newChannel.getChannelName() + "] 채널에 접속합니다." + " 채널 ID: " + newChannel.getId()); + return newChannel; + } + } + public static void menuChannelMng(User currentUser){ // 2. 채널 관리 메서드 + while (true) { + System.out.println(" *******************************************************\n" + + " || 채널 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 채널 생성 ||\n" + + " || 2 > 개별 채널 정보 상세조회 ||\n" + + " || 3 > 개별 채널 이름,설명 변경 ||\n" + + " || 4 > 개별 채널 삭제 ||\n" + + " || 5 > 전체 채널 정보 상세조회 ||\n" + + " || 6 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + int choice = scanInt(); // 숫자 입력 필터링 메서드 호출 + + switch (choice) { + case 1: // 2_1 신규 채널 생성, 채널설명 추가 + System.out.println(" ▶ 새로운 채널을 개설합니다."); + while(true) { + System.out.print(" ▶ 채널명을 입력해 주세요 : "); + String chanName = scanner.nextLine(); + Channel channel = channelService.findChannelByName(chanName); + if (channel == null) { + System.out.println("\n ▶ 새로운 채널의 설명을 입력해주세요."); + String chanDesc = scanner.nextLine(); + Channel newChan = channelService.addChannel(chanName, chanDesc, currentUser); + System.out.println("\n ▶ "+newChan.getChannelName()+" 채널 생성에 성공하였습니다."); + break; + } else {System.out.println("\n ▶ 이미 존재하는 채널입니다. 다른 이름을 입력해주세요.");} + } + break; + case 2: // 2_2 채널 이름으로 검색하여 개별 채널 조회 + System.out.println(" ▶ 조회할 채널의 이름을 입력해 주세요."); + System.out.print(" >> "); + String chnName = scanner.nextLine(); + Channel toPrintChannel = channelService.findChannelByName(chnName); + if (toPrintChannel != null) { + System.out.println(toPrintChannel); + break; + }else{System.out.println("존재하지 않는 채널명입니다. 다시 입력해 주세요"); + } + break; + case 3: // 2_3 채널 이름으로 검색하여 해당 채널 이름,설명 변경 + while (true){ + System.out.println("\n ▶ 채널 이름을 변경합니다. 현재 개설된 채널은 아래와 같습니다. \n"); + channelService.printAllChannels(); + while(true) { + String newName; + String newDesc; + System.out.println(" ▶ 변경할 채널의 이름을 선택해 주세요."); + System.out.print(" >> "); + String fndChnName = scanner.nextLine(); + Channel toRenameChannel = channelService.findChannelByName(fndChnName); + if (toRenameChannel != null) { + System.out.println(" ▶ 선택하신 채널은 ["+toRenameChannel.getChannelName()+"] 입니다"); + System.out.println(" ▶ 변경할 이름을 입력해 주세요."); + while(true) { + System.out.print(" >> "); + newName = scanner.nextLine(); + if(channelService.findChannelByName(newName) == null){ + if (newName.length() != 0) { + toRenameChannel.setChannelName(newName); + break; + } else { + System.out.println(" ▶ 잘못된 입력입니다. 다시 입력해 주세요."); + } + } else { + System.out.println(" ▶ 이미 존재하는 채널명입니다. 다시 입력해 주세요."); + } + } + + System.out.println(" ▶ 변경할 채널의 설명을 입력해 주세요."); + while(true){ + System.out.print(" >> "); + newDesc = scanner.nextLine(); + if (newDesc.length() == 0) { + channelService.UpdateChannel(toRenameChannel,newName,"-"); + System.out.println(" ▶ 채널 설명을 공백으로 설정했습니다."); + break; + }else{ + channelService.UpdateChannel(toRenameChannel,newName,newDesc); + System.out.println(" ▶ 채널정보 수정에 성공했습니다."); + break; + } + } + break; + }else{System.out.println("존재하지 않는 채널명입니다. 다시 입력해 주세요"); + } + }break; + } + break; + case 4: // 2_4 개별 채널 삭제 + System.out.println(" ▶ 현재 개설된 채널은 아래와 같습니다."); + channelService.printAllChannels(); + System.out.println(" ▶ 삭제할 채널의 이름을 입력해 주세요"); + + String fndChnName = scanner.nextLine(); + Channel toDeleteChannel = channelService.findChannelByName(fndChnName); + if (toDeleteChannel != null) { + System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요.\n >> "); + String deleteConfirm = scanner.nextLine(); + if (deleteConfirm.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + break; + }else if(deleteConfirm.equals("삭제")) { + channelService.deleteChannel(toDeleteChannel); + System.out.println(" ▶ [" + fndChnName+ "]채널이 삭제되었습니다."); + }else{ + System.out.println(" ▶ 잘못된 입력입니다. 채널 삭제를 취소합니다."); + } + } else { + System.out.println(" ▶ 잘못된 입력입니다. 채널 삭제를 취소합니다."); + } + + + break; + case 5: // 2_5 개별 채널 정보 상세조회 + channelService.printAllChannels(); + break; + case 6: // 2_6 상위메뉴 복귀 + break; + default: // 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 6) {break;} + } + + + } // 2. 채널 관리 메서드 } diff --git a/src/com/sprint/mission/discodeit/control/MessageControl.java b/src/com/sprint/mission/discodeit/control/MessageControl.java index f0c39915..5f56b2ae 100644 --- a/src/com/sprint/mission/discodeit/control/MessageControl.java +++ b/src/com/sprint/mission/discodeit/control/MessageControl.java @@ -1,21 +1,15 @@ -package com.sprint.mission.discodeit.menu; +package com.sprint.mission.discodeit.control; import com.sprint.mission.discodeit.JavaApplication; 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.jcf.JCFChannelService; import com.sprint.mission.discodeit.jcf.JCFUserService; import java.util.List; -import java.util.Scanner; public class MessageControl extends JavaApplication { private static final JCFUserService userService = new JCFUserService(); - private static final JCFChannelService channelService = new JCFChannelService(); - private static final Scanner scanner = new Scanner(System.in); - private static User currentUser; - private static Channel currentChannel; public static void menuMessageMng(User currentUser, Channel currentChannel){ // 1 메세지 관리 메서드 while (true) { System.out.println(" *******************************************************\n" @@ -66,7 +60,7 @@ public static void menuMessageMng(User currentUser, Channel currentChannel){ if(inputMsgNum <= messages.size()) { System.out.println(" ▶ [" + inputMsgNum + "]번 메세지는 아래와 같습니다."); System.out.println("번호 | 사용자 : 메세지 ( 생성시각 / 수정시각 )"); - System.out.println(currentChannel.messageService().findMessageByNum(inputMsgNum)); + currentChannel.messageService().printOneMessage(inputMsgNum); break;} System.out.println(" ▶ 잘못된 입력입니다. 상위메뉴로 돌아갑니다."); @@ -83,8 +77,8 @@ public static void menuMessageMng(User currentUser, Channel currentChannel){ System.out.print("수정할 새로운 메세지를 입력해 주세요.\n >> "); String newMessage = scanner.nextLine(); - currentChannel.messageService().updateMsg(currentMsg, newMessage); - System.out.println("기존 내용을 [" + newMessage + "] 로 수정하였습니다."); + currentChannel.messageService().updateMsg(currentUser,currentMsg, newMessage); + System.out.println("기존 내용을 [" + currentMsg.getTextMsg() + "] 로 수정하였습니다."); break;} System.out.println(" ▶ 잘못된 입력입니다. 상위메뉴로 돌아갑니다."); break; @@ -103,14 +97,14 @@ public static void menuMessageMng(User currentUser, Channel currentChannel){ System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); break; }else if(deleteConfirm.equals("삭제")) { - currentChannel.messageService().deleteMessage(currentMsg); + currentChannel.messageService().deleteMessage(currentUser,currentMsg); System.out.println("메세지가 삭제되었습니다."); }else{ System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); } break; case 6: // 1_6 현재 채널 변경 - currentChannel = verifyChannel(); + currentChannel = ChannelControl.verifyChannel(); break; case 7: // 1_7 현재 사용자 변경 System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); diff --git a/src/com/sprint/mission/discodeit/control/UserControl.java b/src/com/sprint/mission/discodeit/control/UserControl.java index 8fecfcd0..2bedad50 100644 --- a/src/com/sprint/mission/discodeit/control/UserControl.java +++ b/src/com/sprint/mission/discodeit/control/UserControl.java @@ -1,7 +1,164 @@ -package com.sprint.mission.discodeit.menu; +package com.sprint.mission.discodeit.control; import com.sprint.mission.discodeit.JavaApplication; +import com.sprint.mission.discodeit.entity.User; +import com.sprint.mission.discodeit.jcf.JCFUserService; + +import java.util.InputMismatchException; public class UserControl extends JavaApplication { + private static final JCFUserService userService = new JCFUserService(); + // 어플리케이션 최초 실행시 User 신규여부 판별 메서드. 있으면 있는 유저로 로그인 / 없으면 새 유저 생성 + public static User verifyUser(){ // 사용자명 입력 >> 없는 사용자 : 사용자 생성 / 있는 사용자 : 이름으로 확인, ID연결 + System.out.print(" ▶ 사용자명을 입력해 주세요 : "); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 님 환영합니다." + ", ID: " + user.getId()); + return user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 신규 사용자로 등록합니다."); + User newUser = userService.createUser(username); + System.out.println("\n ▶ 환영합니다 [" + newUser.getName() + "] 님, 새로운 ID가 발급되였습니다.\n 신규 사용자 UUID : " + newUser.getId()); + return newUser; + } + } + // 1_3 사용자 관리 세부메뉴 메서드 + public static void menuUserMng(User currentUser){ // 1_4 사용자 관리 내부메뉴 메서드 + while (true) { + System.out.println(" *******************************************************\n" + + " || 사용자 관리 메뉴입니다. 원하는 기능을 선택하세요. ||\n" + + " || 1 > 신규 사용자 생성 ||\n" + + " || 2 > 현재 사용자 이름 변경 ||\n" + + " || 3 > 사용자 삭제 ||\n" + + " || 4 > 단일 사용자 상세조회 ||\n" + + " || 5 > 전체 사용자 상세조회 ||\n" + + " || 6 > 다른 사용자로 진행 ||\n" + + " || 7 > 상위 메뉴로 돌아가기 ||\n" + + " *******************************************************\n"); + System.out.print(" >> "); + int choice = -1; + try { + choice = scanner.nextInt(); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } catch (InputMismatchException e){ + System.out.println("숫자만 입력해 주세요"); + scanner.nextLine(); // scanner 내부 개행문자 제거 + } + + switch (choice) { + case 1: // 1_4_1 신규 사용자 생성 메뉴 + System.out.println(" ▶ 새로운 사용자를 생성합니다."); + while (true) { + System.out.print(" ▶ 원하는 사용자명을 입력해 주세요 : "); + String username = scanner.nextLine(); + if (username.length() == 0) { // 입력값이 없는경우 상위 메뉴로 이동 + System.out.println(" ▶ 입력값이 없습니다. 사용자 생성을 취소합니다.\n"); + break;} + User user = userService.findUserByName(username); + if (user == null) { // 중복 유저명 체크하여 중복유저가 없는경우 사용자 생성 + User newUser = userService.createUser(username); + System.out.println(" ▶ 사용자 생성에 성공했습니다."); + System.out.println(" ▶ 사용자명 : " + newUser.getName() + " SSID : " + newUser.getId() + "\n"); + + // 새로 생성한 사용자로 currentUser 변경여부 체크 + System.out.println(" ▶ 새로운 사용자로 로그인하시겠습니까? Y/N"); + String newUserChange = scanner.nextLine(); + if (newUserChange.equals("y") || newUserChange.equals("Y")) { + currentUser = newUser; + System.out.println("\n ▶ [" + currentUser.getName() + "] 사용자로 로그인 했습니다."); + } + + System.out.println(" ▶ 기존 사용자 [" + currentUser.getName() + "]로 계속합니다."); + break; + } else { // user.name 중복값 확인시 while문 재시작 + System.out.println(" ▶ 이미 존재하는 사용자명입니다. 다른 이름을 입력해 주세요.\n"); + } + } + break; + + case 2: + while (true){ // 1_4_2 사용자 이름 변경 메뉴 + System.out.println("\n ▶ 사용자 이름을 변경합니다. * 현재 사용자 이름 : [" + currentUser.getName() + "]"); + System.out.println(" ▶ 변경할 사용자 이름을 입력해 주세요"); + System.out.print(" >> "); + String newName = scanner.nextLine(); + if(newName.length() ==0) {// 사용자 이름 입력값이 없는경우 상위메뉴로 이동 + System.out.println(" ▶ 새 이름을 입력하지 않았습니다. 사용자 이름 변경을 취소합니다."); + break;} + User user = userService.findUserByName(newName); + if(user != null){ // 중복값 존재시 재입력 + System.out.print(" ▶ 이미 존재하는 이름입니다. 다시 입력해 주세요.\n >>> "); + } else{ // 중복값 미확인시 유저명 변경 + userService.updateUserName(currentUser, newName); + break; + } + } + break; + case 3: // 1_4_3 사용자 삭제 메뉴 + System.out.println(" ▶ 삭제할 사용자의 이름을 입력해 주세요"); + System.out.println(" ▶ 현재 등록된 사용자는 아래와 같습니다."); + userService.printAllUsers(); + System.out.print(" >> "); + String deleteUser = scanner.nextLine(); + if ((deleteUser.length() == 0) || (userService.findUserByName(deleteUser) == null)) { + System.out.println(" ▶ 존재하지 않는 사용자이거나 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + } else if (deleteUser.equals(currentUser.getName())){ + System.out.println(" ▶ 현재 로그인된 사용자는 삭제할 수 없습니다! 이전 메뉴로 돌아갑니다."); + break; + } else { + System.out.println(" ▶ 입력하신 사용자는 아래와 같습니다."); + User userToDel = userService.findUserByName(deleteUser); + System.out.println(userToDel); + System.out.println(" ▶ 정말로 삭제할까요? 삭제를 원하시면 [삭제]라고 입력해 주세요"); + System.out.print(" >> "); + String deleteConfirm = scanner.nextLine(); + if (deleteConfirm.length() == 0) { + System.out.println(" ▶ 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + break; + }else if(deleteConfirm.equals("삭제")) { + userService.deleteUser(deleteUser); + System.out.println("[" + deleteUser + "] 사용자가 삭제되었습니다."); + }else{ + System.out.println(" ▶ 잘못된 입력입니다. 사용자 삭제를 취소합니다."); + } + } + break; + case 4: // 1_4_4 단일 사용자 정보 출력 메뉴 + System.out.print(" ▶ 조회할 사용자의 이름을 입력해 주세요.\n >> "); + String oneUser = scanner.nextLine(); + if ((oneUser.length() == 0) || (userService.findUserByName(oneUser) == null)) { + System.out.println(" ▶ 존재하지 않는 사용자이거나 잘못된 입력입니다. 이전 메뉴로 돌아갑니다."); + } else { + System.out.println(" ▶ 입력하신 사용자는 아래와 같습니다."); + User userToRead = userService.findUserByName(oneUser); + System.out.println(userToRead); + } + break; + case 5: // 1_4_5 모든 사용자 정보 출력 메뉴 + System.out.println(" ▶ 모든 사용자 정보를 출력합니다."); + userService.printAllUsers(); + break; + case 6: // 1_4_6 다른 사용자로 진행 + System.out.print(" ▶ 어떤 사용자로 로그인할까요?"); + String username = scanner.nextLine(); + User user = userService.findUserByName(username); + if (user != null) { + System.out.println("[" + user.getName() + "] 사용자로 진행합니다." + ", ID: " + user.getId()); + currentUser = user; + } else { + System.out.println("\n ▶ 존재하지 않는 사용자입니다. 기존 사용자[" + currentUser.getName() + "]로 진행합니다.\n 현재 사용가능한 사용자는 아래와 같습니다."); + userService.getUserslist().forEach(u -> System.out.print(u.getName()+ " , ")); + System.out.println(); + } + break; + case 7: // 1_4_7 상위메뉴 복귀 + break; + default: // 1_4 세부메뉴 입력예외처리 + System.out.println(" ▶ 잘못된 접근입니다. 다시 입력해 주세요"); + } + if (choice == 7) {break;} + } + } // 1_3 사용자 관리 세부메뉴 메서드 } diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/com/sprint/mission/discodeit/entity/Channel.java index de33589f..7bce68ed 100644 --- a/src/com/sprint/mission/discodeit/entity/Channel.java +++ b/src/com/sprint/mission/discodeit/entity/Channel.java @@ -28,11 +28,11 @@ public Channel(String channelName, String channelDescription, String channelCrea public UUID getId() {return id;} public String getCreatedAt() { - String formatedTime = new SimpleDateFormat("HH:mm:ss").format(createdAt); + String formatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(createdAt); return formatedTime;} public String getUpdatedAt() { - String formatedTime = new SimpleDateFormat("HH:mm:ss").format(updatedAt); + String formatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(updatedAt); return formatedTime;} public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} @@ -45,4 +45,15 @@ public String getUpdatedAt() { public String getChannelCreater() {return channelCreater;} public JCFMessageService messageService() {return messageService;} + @Override + public String toString() { + String result; + if(getCreatedAt().equals(getUpdatedAt())){ + result = "채널명 : " + channelName + " 개설자 : " + channelCreater + " 채널설명 : " + channelDescription + " 개설일자 : " + getCreatedAt() + " UUID : " + getId(); + } else { + result = "채널명 : " + channelName + " 개설자 : " + channelCreater + " 채널설명 : " + channelDescription + " 개설일자 : " + getCreatedAt() + " 수정일자 : " + getUpdatedAt() + " UUID : " + getId(); + } + return result; + } } + diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/com/sprint/mission/discodeit/entity/Message.java index 0c7387af..6fc6e858 100644 --- a/src/com/sprint/mission/discodeit/entity/Message.java +++ b/src/com/sprint/mission/discodeit/entity/Message.java @@ -29,12 +29,22 @@ public Message(int msgNumber, String author, String textMsg,long createdAt, long public String getTextMsg() {return textMsg;} public String getCreatedAt() { - String formatedTime = new SimpleDateFormat("HH:mm:ss").format(createdAt); + String formatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(createdAt); return formatedTime;} public String getUpdatedAt() { - String formatedTime = new SimpleDateFormat("HH:mm:ss").format(updatedAt); + String formatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(updatedAt); return formatedTime;} public void setUpdatedAt(long updatedAt) { this.updatedAt = updatedAt;} + @Override + public String toString() { + String result; + if(getCreatedAt().equals(getUpdatedAt())){ + result = msgNumber + " | " + author + " : " + textMsg + " (" + getCreatedAt() + ") : " + getId(); + } else { + result = msgNumber + " | " + author + " : " + textMsg + " (" + getCreatedAt() + " / " + getUpdatedAt() + ") : " + getId(); + } + return result; + } } diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/com/sprint/mission/discodeit/entity/User.java index 065f073f..d6d6bcf8 100644 --- a/src/com/sprint/mission/discodeit/entity/User.java +++ b/src/com/sprint/mission/discodeit/entity/User.java @@ -20,10 +20,10 @@ public User(String name, long createdAt, long updatedAt) { public void setName(String name) {this.name = name;} public String getCreatedAt() { - String formatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(createdAt); + String formatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(createdAt); return formatedTime;} public String getUpdatedAt() { - String aformatedTime = new SimpleDateFormat("MM.dd HH:mm:ss").format(updatedAt); + String aformatedTime = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(updatedAt); return aformatedTime;} public void setUpdatedAt(long updatedAt) {this.updatedAt = updatedAt;} @@ -31,9 +31,9 @@ public String getUpdatedAt() { public String toString() { String result; if(getCreatedAt().equals(getUpdatedAt())){ - result = "\n 사용자 이름 : " + name + "\n 생성된 시점 : " + getCreatedAt() + "\n 사용자 UUID : " + id + "\n"; + result = "\n 사용자 이름 : " + name + "\n 생성일 : " + getCreatedAt() + "\n 사용자 UUID : " + id + "\n"; } else { - result = "\n 사용자 이름 : " + name + "\n 생성된 시점 : " + getCreatedAt() + "\n 수정된 시점 : " + getUpdatedAt() + "\n 사용자 UUID : " + id + "\n"; + result = "\n 사용자 이름 : " + name + "\n 생성일 : " + getCreatedAt() + "\n 수정일 : " + getUpdatedAt() + "\n 사용자 UUID : " + id + "\n"; } return result; } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java index bdcb69b6..d731f9cc 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java @@ -1,7 +1,6 @@ package com.sprint.mission.discodeit.jcf; 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; @@ -13,6 +12,7 @@ public class JCFChannelService implements ChannelService { private final List channels = new ArrayList<>(); public JCFChannelService(){ channels.add(new Channel("ch01","default Channel","관리자",1744036548250L,1744036548250L)); + } // 채널 생성 메서드 @Override @@ -26,14 +26,18 @@ public Channel addChannel(String channelName, String channelDesc, User user){ }; // 채널 수정 메서드 @Override - public void UpdateChannel(String channelName, String channelDescription){ - - + public void UpdateChannel(Channel channel, String channelName, String channelDescription){ + long now = System.currentTimeMillis(); + channel.setChannelName(channelName); + channel.setChannelDescription(channelDescription); + channel.setUpdatedAt(now); + System.out.print("\n ▶ [채널 정보 수정 완료]"); + System.out.println(channel); }; // 채널 삭제 메서드 @Override public void deleteChannel(Channel channel){ - + channels.remove(channel); }; // 전체채널목록 출력 메서드 @Override @@ -49,9 +53,6 @@ public List getAllChannels() { return List.of(); } - ; - //List getAllChannels(){}; - @Override // 이름으로 채널 검색 메서드. 채널객체를 return public Channel findChannelByName(String name){ for (Channel channel : channels) { @@ -60,5 +61,5 @@ public Channel findChannelByName(String name){ } } return null; // 없으면 null - }; + } } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java index ae125f58..c9013ad9 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java @@ -21,20 +21,20 @@ public void uploadMsg(User user,String txtMsg){ long now = System.currentTimeMillis(); Message message = new Message(messages.size() + 1,user.getName(),txtMsg,now,now); messages.add(message); - System.out.print("\n ▶ [메세지 등록 완료]"); - System.out.println(" ▶ 메세지 번호 : " + message.getMsgNumber() + " ▶ 등록시간 : " + message.getCreatedAt()); - } @Override - public void updateMsg(Message message,String newMsg) { - message.setTextMsg(newMsg); + public void updateMsg(User user, Message message,String newMsg) { + String resetColor = "\u001B[0m"; + String setColorYellow = "\u001B[33m"; + message.setTextMsg(newMsg + setColorYellow + " *** [" + user.getName() + "] 에 의해 수정됨" + resetColor); message.setUpdatedAt(System.currentTimeMillis()); } - public void deleteMessage(Message message){ - message.setTextMsg("*deleted"); - message.setAuthor("*deleted"); + public void deleteMessage(User user, Message message){ + String resetColor = "\u001B[0m"; + String setColorRed = "\u001B[31m"; + message.setTextMsg(setColorRed + " - ////// " + user.getName() + " 사용자에 의해 삭제됨 ////// -" +message.getUpdatedAt() + resetColor); message.setUpdatedAt(System.currentTimeMillis()); } public Message findMessageByNum(int num){ @@ -46,11 +46,15 @@ public Message findMessageByNum(int num){ } public void printAllMessages() { System.out.println("<< 입력된 전체 메세지 >>"); - System.out.println("번호 | 사용자 : 메세지"); - messages.forEach(m -> System.out.println(m.getMsgNumber() + " | " + m.getAuthor() + " : " + m.getTextMsg() + " | " + m.getCreatedAt() + " | " + m.getUpdatedAt() + " | " + m.getId())); - System.out.println(""); + System.out.println("번호 | 사용자 : 메세지"); + messages.forEach(m -> System.out.printf("%4d | %-10s: %s \n 생성일 : %s 수정일 : %s UUID : %s\n",m.getMsgNumber(),m.getAuthor(),m.getTextMsg(),m.getCreatedAt(),m.getUpdatedAt(),m.getId())); + System.out.println(); + } + public void printOneMessage(int msgNum){ + Message message = findMessageByNum(msgNum); + System.out.printf("%4d | %-10s: %s \n 생성일 : %s 수정일 : %s UUID : %s\n", message.getMsgNumber(),message.getAuthor(),message.getTextMsg(),message.getCreatedAt(),message.getUpdatedAt(),message.getId() ); } public List getMessagesList() { - return new ArrayList<>(messages); + return messages; } } diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java index da1630b3..46b50eab 100644 --- a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java +++ b/src/com/sprint/mission/discodeit/jcf/JCFUserService.java @@ -5,7 +5,6 @@ import java.util.*; - public class JCFUserService implements UserService { private final List users = new ArrayList<>(); // 테스트용 초기 더미 데이터 입력 @@ -62,15 +61,11 @@ public User findUserByName(String name) { return null; // 없으면 null 리턴 } - - - - // 유틸 메서드: 모든 사용자 출력 public void printAllUsers(){ System.out.println(" □ □ □ 전체 사용자 목록 □ □ □ \n 사용자이름 | 사용자생성시간 | 사용자정보 수정시간 | 사용자UUID"); users.forEach(u -> System.out.println(" " + u.getName() + " | " + u.getCreatedAt() + " | " + u.getUpdatedAt() + " | " + u.getId())); - System.out.println(""); + System.out.println(); } public List getUserslist() { return users; diff --git a/src/com/sprint/mission/discodeit/service/ChannelService.java b/src/com/sprint/mission/discodeit/service/ChannelService.java index d1d4d55f..2ac81252 100644 --- a/src/com/sprint/mission/discodeit/service/ChannelService.java +++ b/src/com/sprint/mission/discodeit/service/ChannelService.java @@ -7,7 +7,7 @@ public interface ChannelService { Channel addChannel(String channelName, String channelDesc, User user); - void UpdateChannel(String channelName, String channelDescription); + void UpdateChannel(Channel channel, String channelName, String channelDescription); void deleteChannel(Channel channel); void printAllChannels(); diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/com/sprint/mission/discodeit/service/MessageService.java index 507ad435..9ef7819e 100644 --- a/src/com/sprint/mission/discodeit/service/MessageService.java +++ b/src/com/sprint/mission/discodeit/service/MessageService.java @@ -8,11 +8,12 @@ public interface MessageService{ void uploadMsg(User user,String txtMsg); - void updateMsg(Message message,String Msg); + void updateMsg(User user, Message message,String Msg); Message findMessageByNum(int num); - void deleteMessage(Message message); -// + void deleteMessage(User user, Message message); + void printAllMessages(); + void printOneMessage(int msgNum); List getMessagesList(); // 사용자 전체 조회 } From 98ec5da93cdb2a5fbf399d58f2b6361479743b83 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Sun, 13 Apr 2025 19:12:17 +0900 Subject: [PATCH 10/14] =?UTF-8?q?-intelliJ=EB=A1=9C=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=ED=95=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20gradle=20=EB=B9=8C=EB=93=9C=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/modules.xml | 8 -------- 3-sprint-mission_01.iml | 11 ----------- build.gradle | 0 settings.gradle | 0 4 files changed, 19 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 3-sprint-mission_01.iml create mode 100644 build.gradle create mode 100644 settings.gradle diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 4409663a..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/3-sprint-mission_01.iml b/3-sprint-mission_01.iml deleted file mode 100644 index c90834f2..00000000 --- a/3-sprint-mission_01.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..e69de29b diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e69de29b From a51903d796160fb2973b82960e42ac7f826d4a87 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Sun, 13 Apr 2025 19:12:22 +0900 Subject: [PATCH 11/14] =?UTF-8?q?-intelliJ=EB=A1=9C=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=ED=95=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20gradle=20=EB=B9=8C=EB=93=9C=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 5 +++++ build.gradle | 19 +++++++++++++++++++ settings.gradle | 1 + 3 files changed, 25 insertions(+) diff --git a/.idea/misc.xml b/.idea/misc.xml index ef89d983..fe0b0dab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,9 @@ + + + + + diff --git a/build.gradle b/build.gradle index e69de29b..abbd3113 100644 --- a/build.gradle +++ b/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group 'com.sprint.mission' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e69de29b..0eb36903 100644 --- a/settings.gradle +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = '3-sprint-mission_01' \ No newline at end of file From 82a146a8f4307be6ecf04e42753d99074661b2bf Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Sun, 13 Apr 2025 19:16:51 +0900 Subject: [PATCH 12/14] =?UTF-8?q?-intelliJ=EB=A1=9C=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=ED=95=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=A5=BC=20gra?= =?UTF-8?q?dle=20=EB=B9=8C=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gradle/8.10/checksums/checksums.lock | Bin 0 -> 17 bytes .gradle/8.10/checksums/md5-checksums.bin | Bin 0 -> 19047 bytes .gradle/8.10/checksums/sha1-checksums.bin | Bin 0 -> 19415 bytes .../8.10/dependencies-accessors/gc.properties | 0 .../executionHistory/executionHistory.bin | Bin 0 -> 19641 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/8.10/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/8.10/fileHashes/fileHashes.bin | Bin 0 -> 19297 bytes .gradle/8.10/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/8.10/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 18659 bytes .gradle/file-system.probe | Bin 0 -> 8 bytes .gradle/vcs-1/gc.properties | 0 gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ 19 files changed, 355 insertions(+) create mode 100644 .gradle/8.10/checksums/checksums.lock create mode 100644 .gradle/8.10/checksums/md5-checksums.bin create mode 100644 .gradle/8.10/checksums/sha1-checksums.bin create mode 100644 .gradle/8.10/dependencies-accessors/gc.properties create mode 100644 .gradle/8.10/executionHistory/executionHistory.bin create mode 100644 .gradle/8.10/executionHistory/executionHistory.lock create mode 100644 .gradle/8.10/fileChanges/last-build.bin create mode 100644 .gradle/8.10/fileHashes/fileHashes.bin create mode 100644 .gradle/8.10/fileHashes/fileHashes.lock create mode 100644 .gradle/8.10/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin create mode 100644 .gradle/file-system.probe create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat diff --git a/.gradle/8.10/checksums/checksums.lock b/.gradle/8.10/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..1792351fbb46a949db040f5aef32e85ee6869f93 GIT binary patch literal 17 TcmZQ}NC_5QUu2tOaHztxvvH6oFAF zMmi(xL((iVlL&F3vsttjqmV{pioF$Dpx53?S+e_y=S#E!xmzL}43e)HJu)J1jEwdIqyg}zLV>!EWTvQ6VhffGV z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa z0SG_<0uX?}zbTN#Z!4WYHwve`{XkPe|N04&*VQ~9ifPyLzl?9o>^?G1_P(-^zh?g3 z=!q`>d?_N&JAXwVN^@+DBMo~LX(%SdjW@?x$zegU#xWPv2>yjWi^!;)ZAK zqbjYfbc1Ded~Zg}&neotO&U_+|CE-jQQvTO^qC|7?E}}e*=%&bq>TV+BnHKer#ZX2 zvqyitf9-sy303O&T?p@Sw1G5aE#gMX7JtT9=fTF)ox9HrjcHW0af>t*`^1gG3*q@| uvFiyD61rZF0_!B0}>ct6dw{$w{4RH0!Lj$(6ChvXUIes76QY zhZ-Z1Ux!$8LZtjiepQ6|aXU>z4dY~a?!MpejK^R8wD)cGJbORi_xIED`nTt~2#)iX z_tOve>*M+B6lV~C00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf{4WA}{zit7oAC~C zbDqdDIW9=bpD1c0_B!5oWtc`ELhC~I)=f7t8!#s0y%IjHSbp3Rex7%bTACp8kNUqVb+)=6hFeCVko$iy#a>-R5=bSHTvi~E&1H|uHKOij1JROdz4_pqEDIZkwxT*Ge&KmY;|fB*y_009U<00Izz00bZa0SG_< z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz01*i04}tuT^PzdAhmU^t zkyOd)&Rn7tV3`nEk4s z4=VrkD91fNv*3+|&WfY6#tUbKe~Z3)vUh&`rVuVWzc4oC;=YmmGyYBuqnWe@6bM_f z`Tp^FR|=QP?2kD|^>smXTfOBgyn{pi#dkHyO}V9xd%NtdHrk4GwcHX;3tNQ)&8lm*l8TH} zT}E=zc;n7v)A&VBjkH`>i<6p!t+rN^X5T!MB00fVy+COwJ`{CMM_bjT<+()Ia(}dO z?dMFtt_O92ckjIIeYe_UQ8{fj&{==EFRN9q{wmW-HmQnEeUygwMb*6E&0K%sE7I~< zBb=4jWDofwN-XExN=imWcP*~ka^V|krIYtz#8cXZt%HZV&Gqtau@RQ$DVuW#OG4ti R`9;oI=|QepZdJa{)=ysm(q;ev literal 0 HcmV?d00001 diff --git a/.gradle/8.10/dependencies-accessors/gc.properties b/.gradle/8.10/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/8.10/executionHistory/executionHistory.bin b/.gradle/8.10/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..a6888b448829d8b6f9ac95b5d928ede8bd9ae532 GIT binary patch literal 19641 zcmeI%OK1~890u^&HisgLt5~flD$*)NvrW>bX+?$B)GGL*59=YYY_ij4+9bQqOcL6I z6j2ZqTNNLmco7v5^kz{+trr!+2Y4(+Jg5g1!Rny}>u%D}iXIAj5cw8%ci7$ee>=a- z>?L7B%GAlJjZAN)(@nG>009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cppN+MR*S z$q%M%eUaOkpC!aM*J&ue*s^^^^R8UX-`>_x`2V1AcCJ_E@8Jjm2tWV=5P$##AOHaf zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fWW^X zP)&%(a`rBFKQB51JP``i?vF-m?9Se3En~@y?8};I^{sbwsI6r6W%=Uy-LVgAN=KAm zE|HrS@6x)sVJ4_%*i4g#=n-0$8@5fk){#H!VH&fzA*rc;Ts6AM+M*;9Gv=I4!LRwJMIKIfRhV{w+DjfS8lH)b=^@;!!(yN{n}ZfOYb zXwutTn_Bd3yLUDfYPk;-AD;rMGMSL#gnQ&HnwHE;{f(@j3jQYW%*?>nxDg1}wx*Nh zr*3V%HZ8d|t1*XXyuRD*P~-MpgEJ%Ad7}7UTuNJPsHzf_XIPAi!mM#3ats9kQI(%g z-a5_i^F~=p>tpuu{I$K53&*JVuzPPHMP=6FJ#8#Wt+ezIvQ|BpF%rylX4=ema^e-@ zITkf!ES{ev%JnT9BFWxnCObr=+AD0%Qqr4b!mY0R{E>WIR&)9g)la)0o?rBBxNmUr z%JKHQ4Nr#pzrG2aS>id;ZSbuuL6u=;R`nuNKl@a9Z(*4@Wr%tt^JVzM%8HJ_$i~it zFW;{|dCN_?|EkC{U~|h^O_EWOOMCohY17q+`g%zPX}*17!HVTO{qy#mEgj5-PAHzE qBDb1yc~@sOxGYgWosLu-=&yWwYGj4JbltOe{W+*RVUOZ`YUB_0JlS*r literal 0 HcmV?d00001 diff --git a/.gradle/8.10/executionHistory/executionHistory.lock b/.gradle/8.10/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..c830febd5b9c4c066d06cd53c9145c7f27f2eca3 GIT binary patch literal 17 UcmZRcp6c(&bW-LR0|f8`04Np%OaK4? literal 0 HcmV?d00001 diff --git a/.gradle/8.10/fileChanges/last-build.bin b/.gradle/8.10/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/8.10/fileHashes/fileHashes.bin b/.gradle/8.10/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..dacaf81aa6052d058cdbfbce86be8e5556c12974 GIT binary patch literal 19297 zcmeI){V!Ev00;2nr6lQIdAURsY3|5dUdroI8?Kj8$c&W<)r2%jGcT7+*$tWZ8&dMp zC7YLO(~G9H=!MeEywtGx0sWAnEOoAPPF!c}4`|=BopYXj&-p&j&S&?xd+t3-5Zc_| z^hT_0nrlOhAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0ucCL1Omwi*-AZ(wwb(i zz)2zq%WdRx)p|9K{lQQZa)APqCyxndLtK{Y z=)9N7nKMDi6;Ri3ga8B}009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf zKmY;|fB*y_009U<00Izz00bZa0SNqC-~f4%OMuP$?$Q=CX~POW(U@42(}$k2pmM`=<@*#ty2{=*n(<;TaR|kHu>GdOlXF zekJ5T6|Jtpr5c3vE&2^>%oT+ir>66J3rF-%>X^Qpq8sT{!_a}ZgA&XEBgnO zxRN)4JrlkfOY7HARGqPBH#8T@-rsX_u2_C>z0H*OvSxjQP!vY88$I5WZNg_umYKQY z%`IAaX)+B${}sCt{>UxNcD7IKn)73Rvc`z~3CQYmw3By|o1F`J*r40F5`2HrhBG{P zwL5LM?%9F$YbY;-E3q5F-x@6}nm*c#8j6HZh8oA#H;7Gq3wA@~nxQBcqSlc0R(t8I zjkm8%gV3pBHw@*6KTAUU7lQnp$|Vyk&t)3z%|YyjdUn>e8`B)W&Qp$)9B~p)rok`i fW;ap;LP`@9DxQvtRK(M6(T8LjJQ4XBAk6;&$?TS| literal 0 HcmV?d00001 diff --git a/.gradle/8.10/fileHashes/fileHashes.lock b/.gradle/8.10/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..05d485dcb3d9becc4deb36dff12c2ac0e78999bc GIT binary patch literal 17 UcmZSXJ8E|^w(;;11_+P<06Gx_!vFvP literal 0 HcmV?d00001 diff --git a/.gradle/8.10/gc.properties b/.gradle/8.10/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..9dbfcfe208c6b0b8a0ee94430beea7ace6ed8694 GIT binary patch literal 17 TcmZQ}cF$kXl6LqUV6OB@bCLk_No2qBH))E+bxK{Pa_qnj>m zP0l*m)L>JfAXM-2`;^AON&XM+?&E*FgZEqS*qFrjw=A<D-x+*z&QJhcv__qFH!{E63jyqA8o=y#_n zcU*L(d)mu8mwxM|QILM6z4p4%?tV`8q}R3U)AslIJMIV|fB*srAb!K-L~3Y%fPH6Zunu O{QqJ%tz_5lcYXjTg@-l( literal 0 HcmV?d00001 diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000000000000000000000000000000000000..9b4d56a04b7bd97a69084462fae40366b784cb30 GIT binary patch literal 8 PcmZQzV4SA6K>85?2CM>O literal 0 HcmV?d00001 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9355b415 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..f5feea6d --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From f36121fa95080b4d8aa0b83715f96083f82cf5ea Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Mon, 14 Apr 2025 18:52:54 +0900 Subject: [PATCH 13/14] =?UTF-8?q?-=20=EB=B9=8C=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=B5=9C=EC=B4=88=20=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=9C=20IntelliJ=EC=97=90=EC=84=9C=20Gradle?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=ED=9B=84=20=EB=9F=B0=EC=9D=B4?= =?UTF-8?q?=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EB=B0=9C?= =?UTF-8?q?=EA=B2=AC=20-=20IntelliJ=EB=A1=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1=EC=8B=9C=20src\main\java\main.ja?= =?UTF-8?q?va=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20=EB=A7=8C=EB=93=A4=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EA=B3=A0=20src\main.java=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=20=EC=83=9D=EC=84=B1=ED=95=98=EB=8A=94=EB=8D=B0=20?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=A4=EC=97=90=EC=84=9C=20src\ma?= =?UTF-8?q?in\java\=20=EA=B5=AC=EC=A1=B0=EA=B0=80=20=EC=97=86=EC=9C=BC?= =?UTF-8?q?=EB=A9=B4=20=EB=B9=8C=EB=93=9C=EB=A5=BC=20=EC=95=88=ED=95=B4?= =?UTF-8?q?=EC=A3=BC=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=99=95=EC=9D=B8=20?= =?UTF-8?q?-=20src\=20=EC=95=84=EB=9E=98=20=EC=9E=88=EB=8A=94=20=EB=AA=A8?= =?UTF-8?q?=EB=93=A0=20=EA=B5=AC=EC=A1=B0=20=EB=B0=8F=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A5=BC=20src\main\java=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=ED=95=98=EC=9C=84=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99,=20=EC=A0=95=EC=83=81=20=EB=9F=B0=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 0 .idea/gradle.xml | 0 .../java}/com/sprint/mission/discodeit/JavaApplication.java | 0 .../com/sprint/mission/discodeit/control/ChannelControl.java | 0 .../com/sprint/mission/discodeit/control/MessageControl.java | 0 .../java}/com/sprint/mission/discodeit/control/UserControl.java | 0 .../java}/com/sprint/mission/discodeit/entity/Channel.java | 0 .../java}/com/sprint/mission/discodeit/entity/Message.java | 0 src/{ => main/java}/com/sprint/mission/discodeit/entity/User.java | 0 .../java}/com/sprint/mission/discodeit/jcf/JCFChannelService.java | 0 .../java}/com/sprint/mission/discodeit/jcf/JCFMessageService.java | 0 .../java}/com/sprint/mission/discodeit/jcf/JCFUserService.java | 0 .../com/sprint/mission/discodeit/service/ChannelService.java | 0 .../com/sprint/mission/discodeit/service/MessageService.java | 0 .../java}/com/sprint/mission/discodeit/service/UserService.java | 0 15 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/gradle.xml rename src/{ => main/java}/com/sprint/mission/discodeit/JavaApplication.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/control/ChannelControl.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/control/MessageControl.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/control/UserControl.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/entity/Channel.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/entity/Message.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/entity/User.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/jcf/JCFChannelService.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/jcf/JCFMessageService.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/jcf/JCFUserService.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/service/ChannelService.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/service/MessageService.java (100%) rename src/{ => main/java}/com/sprint/mission/discodeit/service/UserService.java (100%) diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..e69de29b diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..e69de29b diff --git a/src/com/sprint/mission/discodeit/JavaApplication.java b/src/main/java/com/sprint/mission/discodeit/JavaApplication.java similarity index 100% rename from src/com/sprint/mission/discodeit/JavaApplication.java rename to src/main/java/com/sprint/mission/discodeit/JavaApplication.java diff --git a/src/com/sprint/mission/discodeit/control/ChannelControl.java b/src/main/java/com/sprint/mission/discodeit/control/ChannelControl.java similarity index 100% rename from src/com/sprint/mission/discodeit/control/ChannelControl.java rename to src/main/java/com/sprint/mission/discodeit/control/ChannelControl.java diff --git a/src/com/sprint/mission/discodeit/control/MessageControl.java b/src/main/java/com/sprint/mission/discodeit/control/MessageControl.java similarity index 100% rename from src/com/sprint/mission/discodeit/control/MessageControl.java rename to src/main/java/com/sprint/mission/discodeit/control/MessageControl.java diff --git a/src/com/sprint/mission/discodeit/control/UserControl.java b/src/main/java/com/sprint/mission/discodeit/control/UserControl.java similarity index 100% rename from src/com/sprint/mission/discodeit/control/UserControl.java rename to src/main/java/com/sprint/mission/discodeit/control/UserControl.java diff --git a/src/com/sprint/mission/discodeit/entity/Channel.java b/src/main/java/com/sprint/mission/discodeit/entity/Channel.java similarity index 100% rename from src/com/sprint/mission/discodeit/entity/Channel.java rename to src/main/java/com/sprint/mission/discodeit/entity/Channel.java diff --git a/src/com/sprint/mission/discodeit/entity/Message.java b/src/main/java/com/sprint/mission/discodeit/entity/Message.java similarity index 100% rename from src/com/sprint/mission/discodeit/entity/Message.java rename to src/main/java/com/sprint/mission/discodeit/entity/Message.java diff --git a/src/com/sprint/mission/discodeit/entity/User.java b/src/main/java/com/sprint/mission/discodeit/entity/User.java similarity index 100% rename from src/com/sprint/mission/discodeit/entity/User.java rename to src/main/java/com/sprint/mission/discodeit/entity/User.java diff --git a/src/com/sprint/mission/discodeit/jcf/JCFChannelService.java b/src/main/java/com/sprint/mission/discodeit/jcf/JCFChannelService.java similarity index 100% rename from src/com/sprint/mission/discodeit/jcf/JCFChannelService.java rename to src/main/java/com/sprint/mission/discodeit/jcf/JCFChannelService.java diff --git a/src/com/sprint/mission/discodeit/jcf/JCFMessageService.java b/src/main/java/com/sprint/mission/discodeit/jcf/JCFMessageService.java similarity index 100% rename from src/com/sprint/mission/discodeit/jcf/JCFMessageService.java rename to src/main/java/com/sprint/mission/discodeit/jcf/JCFMessageService.java diff --git a/src/com/sprint/mission/discodeit/jcf/JCFUserService.java b/src/main/java/com/sprint/mission/discodeit/jcf/JCFUserService.java similarity index 100% rename from src/com/sprint/mission/discodeit/jcf/JCFUserService.java rename to src/main/java/com/sprint/mission/discodeit/jcf/JCFUserService.java diff --git a/src/com/sprint/mission/discodeit/service/ChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/ChannelService.java similarity index 100% rename from src/com/sprint/mission/discodeit/service/ChannelService.java rename to src/main/java/com/sprint/mission/discodeit/service/ChannelService.java diff --git a/src/com/sprint/mission/discodeit/service/MessageService.java b/src/main/java/com/sprint/mission/discodeit/service/MessageService.java similarity index 100% rename from src/com/sprint/mission/discodeit/service/MessageService.java rename to src/main/java/com/sprint/mission/discodeit/service/MessageService.java diff --git a/src/com/sprint/mission/discodeit/service/UserService.java b/src/main/java/com/sprint/mission/discodeit/service/UserService.java similarity index 100% rename from src/com/sprint/mission/discodeit/service/UserService.java rename to src/main/java/com/sprint/mission/discodeit/service/UserService.java From be9bd196e730c46dd9c256c9c561eeb1a7d75767 Mon Sep 17 00:00:00 2001 From: Leichtstar Date: Mon, 14 Apr 2025 20:57:51 +0900 Subject: [PATCH 14/14] =?UTF-8?q?-=20=EB=B9=8C=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=B5=9C=EC=B4=88=20=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=9C=20IntelliJ=EC=97=90=EC=84=9C=20Gradle?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=ED=9B=84=20=EB=9F=B0=EC=9D=B4?= =?UTF-8?q?=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EB=B0=9C?= =?UTF-8?q?=EA=B2=AC=20-=20IntelliJ=EB=A1=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1=EC=8B=9C=20src\main\java\main.ja?= =?UTF-8?q?va=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20=EB=A7=8C=EB=93=A4=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EA=B3=A0=20src\main.java=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EB=A1=9C=20=EC=83=9D=EC=84=B1=ED=95=98=EB=8A=94=EB=8D=B0=20?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=A4=EC=97=90=EC=84=9C=20src\ma?= =?UTF-8?q?in\java\=20=EA=B5=AC=EC=A1=B0=EA=B0=80=20=EC=97=86=EC=9C=BC?= =?UTF-8?q?=EB=A9=B4=20=EB=B9=8C=EB=93=9C=EB=A5=BC=20=EC=95=88=ED=95=B4?= =?UTF-8?q?=EC=A3=BC=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=99=95=EC=9D=B8=20?= =?UTF-8?q?-=20src\=20=EC=95=84=EB=9E=98=20=EC=9E=88=EB=8A=94=20=EB=AA=A8?= =?UTF-8?q?=EB=93=A0=20=EA=B5=AC=EC=A1=B0=20=EB=B0=8F=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A5=BC=20src\main\java=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=ED=95=98=EC=9C=84=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99,=20=EC=A0=95=EC=83=81=20=EB=9F=B0=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 15 +++++- .gradle/8.10/checksums/checksums.lock | Bin 17 -> 17 bytes .../executionHistory/executionHistory.bin | Bin 19641 -> 26650 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.10/fileHashes/fileHashes.bin | Bin 19297 -> 20497 bytes .gradle/8.10/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 +- .gradle/buildOutputCleanup/outputFiles.bin | Bin 18659 -> 19127 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .idea/.name | 1 + .idea/gradle.xml | 15 ++++++ build.gradle | 8 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 43583 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 44 ++++++------------ gradlew.bat | 37 +++++++-------- settings.gradle | 3 +- 18 files changed, 67 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 8eb68708..b63da455 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,21 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + ### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr out/ !**/src/main/**/out/ !**/src/test/**/out/ -.idea + ### Eclipse ### .apt_generated .classpath diff --git a/.gradle/8.10/checksums/checksums.lock b/.gradle/8.10/checksums/checksums.lock index 1792351fbb46a949db040f5aef32e85ee6869f93..d4598fdc276a9f3da92fbac9df9e401b07e42363 100644 GIT binary patch literal 17 TcmZQxc}g!K{EwqP0~7!NF((7a literal 17 TcmZQ}NC_5QUu_Ux{T1QC_hsz(l}6;LeLLNUq?$&d^rGht?efUjD$ zATL1yQLIoaE$d=c5EKQ``dY2vt0=4W0oIDGg6-ORe01GAuMh%DaK(L`b2%p_-1+YJ z{qOI7_uenpqrM0-K=w@hL4+SvczeeiLHaHQpNEO<@C_1x1Rw!O01|)%AOT1K5`Y9C z0Z0H6fCL}`NB|Om1Rw!O01|)%{?7@#2lV$9#xP)X5AMUOix6Z?KkxzV@u!YuedI#+zg=g?jNB|Om1Rw!O01|)%AOT1K5`Y9C0Z0H6fCL}`NB|Om1Rw!O z01|)%AOT1K5`Y9C0Z0H6fCL}`NB|Om1Rw!O01|)%AOT1K5`Y9C0Z0H6_+KF43I3S? z3tl?zl^0L53FGMqLrg>@<`u1)fO%3{CZ5EiVr27fVaSfJT7E2~6ob6O`}DbF)2<0A zrD%;pLt|Hx@HyNUS5Y*^;%eEwq1OigIq313F^Z|r zf*hxOhIWgW!D&&g(P%kRZKf=<3c3BIgAoKhDMg420Ng6(n!7>SX_QB!X& zGle9W4fa$Y9mX)oCdqZ{Los=g4CxV#>u`+0kt~KX(kh%w3b3Xl2pvdRo0T43Su93t zaJF5$U9yUc0gSbXNhL;-l&~etr70E8Fci(DB$6jZi=Zf$VQI|33*m%hJhrB<3LmRf$-Ld?5JC|z4IWC>jMj$Qx!#<-L{|Hz4_+YwS8<5+3538 zAw%{fR|YsH{?;)0i3@1*y~ftYgsxffaAJeYByvYIXu2?}U+A}ug=r%~R{Cwcz;IR@ zM%4!VR&yxo$#mC{dN=YH+b^U!)!-z~7a77-1{zs#PPGp9a+fAn7_G^bQb-g=*+I6o zvH-FI>#8q?dajqR?(MmI{PfH;+bxnTEsm*i+EPvJ3#k!&n$1Q>3UUoJ9!pS0hFedB zPMCX8wxIRT5u4Q;xb)^KIzKMeC7*6WBk$CWD~1#iASYxMRS$EgYzm!P+rP+fms|F^ zGyIG%wFUo4W#4#Ed^!b#mp}K)ONfYxWfC;eBpER-4$~52_0i)DQP>0nCTrY6KPaB- zVfV2ea;Nx!o;}~ET~oJ|jj;GMmFTpos)fZT|3yZqa$)gFk+Ap_N;IJygvIB-`YI2L z&lfE|9lkd|nJtUX@G%}rt97TEV8HhioM6GJO|mqlQ~GE@?SkukgkQy)bnU7zhswCM z!<_1g=$Q4f7tjiDo?F(WCSUHNFZT|7y$s2-K{XF0ler`zfs+MG~c8fQC1Hch{!DJbnRTHYnZmX5A^ z9LL&qr}rv7nx2kUWp5n39NpciPQizi3A~S&AW@t(QR2IW>f5&mC(loPkmG#vNI`Aa zB%1rU()|><Ue)hsE9aDi*wPWY!|XE2YUv_7ru{fhTlBl(cV+6FZE~5mt5;Tg ztwedQ+bSg4RN^2>VvU1lTNF9sT^3<~qd?d5gc~`&px?bazHc2(d<~> zzi7Xh(AztpV_E{r@;n_w9K$l!aQ44ULf3KRER5?MZY*@W)PL;s%tx=G54~$2@x~>S z!L?3s($zgJ7atQ9O*f}Zk;OV9iNXntri(fiVnElyVJ^Mpg~KN$e4(CM^K5Nt5*M(@ z8BG@jN`}L0cFw$Yf(bJ=xPEWfIHUL$Z&=VsyN<&FcZlLxNWo#dJ2IU%dS zwvFbt-?znn4cZ`o_htDdVG};^4>-2t>kWMD#^HPyi-jU~IhOD6*X1`qusiZf-rujM zM3d+FF7&VHH!h_3>EDz- z4ZoId)qtkMt9leUEp}VnzpC8j!z=F9pvlu~DeW<{HX}FcL)-IZE=JJgc4t`4jm!7w z#GF*!vX%Y=K~tf3NdeljbYk^@DpxP{435LX3%@^p=k>(zVhvv(I2&*vu*)~Cb=D5D z|I{Vx$$wYKi`}nY=vvt4yjm?Mi?nt3-#+x{sv&LLu)X;|CUfiiR8Q`1)hYC!^QGJ_ literal 19641 zcmeI%OK1~890u^&HisgLt5~flD$*)NvrW>bX+?$B)GGL*59=YYY_ij4+9bQqOcL6I z6j2ZqTNNLmco7v5^kz{+trr!+2Y4(+Jg5g1!Rny}>u%D}iXIAj5cw8%ci7$ee>=a- z>?L7B%GAlJjZAN)(@nG>009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cppN+MR*S z$q%M%eUaOkpC!aM*J&ue*s^^^^R8UX-`>_x`2V1AcCJ_E@8Jjm2tWV=5P$##AOHaf zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fWW^X zP)&%(a`rBFKQB51JP``i?vF-m?9Se3En~@y?8};I^{sbwsI6r6W%=Uy-LVgAN=KAm zE|HrS@6x)sVJ4_%*i4g#=n-0$8@5fk){#H!VH&fzA*rc;Ts6AM+M*;9Gv=I4!LRwJMIKIfRhV{w+DjfS8lH)b=^@;!!(yN{n}ZfOYb zXwutTn_Bd3yLUDfYPk;-AD;rMGMSL#gnQ&HnwHE;{f(@j3jQYW%*?>nxDg1}wx*Nh zr*3V%HZ8d|t1*XXyuRD*P~-MpgEJ%Ad7}7UTuNJPsHzf_XIPAi!mM#3ats9kQI(%g z-a5_i^F~=p>tpuu{I$K53&*JVuzPPHMP=6FJ#8#Wt+ezIvQ|BpF%rylX4=ema^e-@ zITkf!ES{ev%JnT9BFWxnCObr=+AD0%Qqr4b!mY0R{E>WIR&)9g)la)0o?rBBxNmUr z%JKHQ4Nr#pzrG2aS>id;ZSbuuL6u=;R`nuNKl@a9Z(*4@Wr%tt^JVzM%8HJ_$i~it zFW;{|dCN_?|EkC{U~|h^O_EWOOMCohY17q+`g%zPX}*17!HVTO{qy#mEgj5-PAHzE qBDb1yc~@sOxGYgWosLu-=&yWwYGj4JbltOe{W+*RVUOZ`YUB_0JlS*r diff --git a/.gradle/8.10/executionHistory/executionHistory.lock b/.gradle/8.10/executionHistory/executionHistory.lock index c830febd5b9c4c066d06cd53c9145c7f27f2eca3..60995b4c0516ffe2ce16b96ea1dc48a60a3b61c0 100644 GIT binary patch literal 17 TcmZRswb!mb*P5@%00H6vDVqam literal 17 UcmZRcp6c(&bW-LR0|f8`04Np%OaK4? diff --git a/.gradle/8.10/fileHashes/fileHashes.bin b/.gradle/8.10/fileHashes/fileHashes.bin index dacaf81aa6052d058cdbfbce86be8e5556c12974..072a2a34a78491409be2e0eebfca6a6aa6ba2119 100644 GIT binary patch literal 20497 zcmeI3_fwQd9Eabd96>mwNk=JBA$Wp{6p1omqZ~!Xf*6eou>!#s14Ix|qMq254mJ?T zojRhRBh3+l1wI?Jml_{sqo=XKs1t!#-P{_ul>G-krfP2ATt; zFdxf^kC$)-2EYIq00UqE41fVJ00zJS7ytuc01SWuFaQR?02lxRU;qq!DF)`Dg$%=s zF&L*Hy%@fkVeHh=g;o42=dn=(4u1IGexCIAgZ&RO`y4fkALHE9h2{tSbDkz1YtA5f zJ@i-Un%(>fRX;RhxPS=Yk}fXZq~TKVX_H#<_c^1&m(lzz?+?9%b&?&VpACb#FfYNdeM$t*y;jn^j9GA3H>$<}=Ym&* zxlTonbxN);>ED*-Rhzta2p6=3kbXYUy!u*K95=r>3Fp3rG{1do%=(*r!7H45G|{}F zYOny*_@8`H|wBhQP^3z~17p>oWqX5B>G-Y=Twk&olM zgQmSdg>$dTG^c+VMv?S|TR;s4zyKHk17H9QfB`T72EYIq00UqE41fVJ00zJS7ytuc z01SWuFaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72Ef3VZD0~wo;CWIOFx?S6XIR< zRSV}#&vS4}iyejDbmtrn{?YL$`X?&4gHbhpC=oL^C}q83dRcRlT1Kb)O6MVje$rkx zG2(4%UGBG2)8C)jb>2q5>i7^sDgFmG@h;0KxVhNQ{jy!MBz}QK6C#dG64phcmZ&I> zMU~vFD*1=ijEpC=80Pfs9-o)Nml3-|3SmF>fiDYeZN+ySlkyM8m)hZeYUbT&^VLNsJwDD#iPz=GCf-a)KHuMQee8dSIE@{7S?C>pbUzMwKSwQ5 z8B>8Oxpln1(^lpY+3PS({fXTJqtWPXdKvKowM4}{9943J(7kl@_Z$9+6xnY`H1RFG zPKYiUz}O71iOZ5#8cDpJa|3wY^BZ1Pv=gEm6RO+TL{z4ZdFZq2dKw+ejh~u+V>*;j zv0xMaZ9N{NMyDlbo!jb{>+L?35IuMd<%?{>Dw-cWD=;m*DdF-@mTUYo3GoaQx>{@^ zRFbl0_qnZ)UJt0KPj74cnGi2AF-&@RNX}JqS-AP>j9`Z&5d~)=inzLj_!|@I(oI2* zXrFZaMf1wYS^E?o`t_fD)Ix|?m{3z=6Bfnlr+(MWJ2~5V>6WmKLUis#b_ZW$LIJsx zA4Bg1r;y99bFt-z&8fL%hTO=AH-wOGY;v>u(d2>Xet_%RkSo0h$3K#Y2_YfG4K}e_ z?a9$lZZ$uA@=^8fXEQ8iM7E;zTaJq10aVG25xqK0jmNQjDY%e6Nqd2I5GIt!xgOI^ zY@(6(WC_1XZ{p1TeL9?8w_Akhla9bJBhhzReheFvAk(k3axA7qoeG&3u+jXN4-cSy|Mcnf+(=hM-NYHXX`OXNd?Q-EUD*b3m0G(ZpP8u)eY@xl_AOpcS*C zl@P8nfKf&Jusm_keEH&LNsno)wqf}$!|mv#j&xRv=*g0nVd4kqfVXW-_PHR3 zh2DZH@l7%Y+Eb)OYdNaqh^lPfwb-_W%2zeg-?RwVqUTz+@&FmY=-guyD&v{bmFKh$ z-P<|sNX0Uv6hc&CLiaN}!~R8%ojn&U{e>gaiQ(8{_260 z_A61MN+&`{cTZFldQl~}4o;kvVg1!7J1gr|xn?Dk(H)bmqeccW3P;#PQFz{}#=l)E X`kEt>PMQ~^yF-mz4M)`77jn delta 692 zcmbQZfbrop#tkMCkphzgmOg4*cy|s17VwX9x+AUjLX;A zKqNe_!!&s1c?AY z^6g;N1Tpzvp?e&GN~h^9kUj}9ihCN6)o5UqfEcfa#)8EdmfN3?L7oS@LdbjA~tj=IP0IYk+fuWGczGgX-3V?c%J{HI}uh8zX#6t@IB9-bIxa%#~=t% zkqdkXi$l3M#S8)vfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwx`|3zS*{2*)C!$fIA z{F8N7LC}TEleik2D?d3Q=M_6G71R5JI$=}U*crz`){U0~z0Yyrm?^!E_cH4B&n+)| zZr8e57yGGScz0z!HS+EU-b<)A-PqX?d#bII?~_U0UbwAc(0S_)U!O<4#iq!rc8XQ3 zOQF$4peHGqUQ-S(g&1 zZ`t^HRjZ^Z;C*|bJ9iIztCb6^i!IdEmLdJy_%Gvp{c-A==5kG3?9esdo2VygD||MW zdW825>N;!O%AU>q7 zR}MVd+Oxl#uh&qQ+KM)7r*gHtk5ezroA_o{?|sI)agKVWr@O}Rdh#mkQV#VKePLaX zXTQhr^}W>TTM$Bv*g1Sc00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;| zfB*y_009U<00Izz00bZa0SG_<0uTtEK(f5`YWY~f4yS-cB{qnpc0O7i8+z7I&Xb+ zpyI(W@kGJOymdz!y`kcrlVhdDMayBbFd8WPa--r8@r?!s;*%XcLMP{Wda#1D@Bsks Cb$NCG diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 9b4d56a04b7bd97a69084462fae40366b784cb30..ec8534c8b934c5a354c52ae7ebc793e6b83dfacf 100644 GIT binary patch literal 8 PcmZQzV4P+=pCKFo1^fZQ literal 8 PcmZQzV4SA6K>85?2CM>O diff --git a/.idea/.name b/.idea/.name index e69de29b..77fd1730 100644 --- a/.idea/.name +++ b/.idea/.name @@ -0,0 +1 @@ +3-sprint-mission \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e69de29b..f9163b40 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index abbd3113..668101a2 100644 --- a/build.gradle +++ b/build.gradle @@ -2,16 +2,16 @@ plugins { id 'java' } -group 'com.sprint.mission' -version '1.0-SNAPSHOT' +group = 'com.sprint.mission' +version = '1.0-SNAPSHOT' repositories { mavenCentral() } dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' } test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d66f5e68d973ea569d8e19de379189..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch literal 60756 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b415..af85458d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ +#Mon Apr 14 18:05:24 KST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip -networkTimeout=10000 -validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index f5feea6d..1b6c7873 100644 --- a/gradlew +++ b/gradlew @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# SPDX-License-Identifier: Apache-2.0 -# ############################################################################## # @@ -57,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -82,12 +80,13 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -134,29 +133,22 @@ location of your Java installation." fi else JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then done fi - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -217,12 +205,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..107acd32 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,10 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -27,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail @@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. goto fail @@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 0eb36903..79373e36 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -rootProject.name = '3-sprint-mission_01' \ No newline at end of file +rootProject.name = '3-sprint-mission' +