Skip to content

Commit 28ecb23

Browse files
barrackkkbarrackkk
committed
refactor: 메서드명 changeChannel -> getChannelByNumber로 변경
1 parent 05e92f9 commit 28ecb23

File tree

8 files changed

+127
-123
lines changed

8 files changed

+127
-123
lines changed

‎src/main/java/com/sprint/JavaApplication.java

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
package com.sprint;
2-
3-
import com.sprint.mission.discodeit.menu.ChannelMenu;
4-
import com.sprint.mission.discodeit.menu.MessageMenu;
5-
import com.sprint.mission.discodeit.menu.UserMenu;
6-
import com.sprint.mission.discodeit.service.ChannelService;
7-
import com.sprint.mission.discodeit.service.MessageService;
8-
import com.sprint.mission.discodeit.service.UserService;
9-
import com.sprint.mission.discodeit.service.file.FileChannelService;
10-
import com.sprint.mission.discodeit.service.file.FileMessageService;
11-
import com.sprint.mission.discodeit.service.file.FileUserService;
12-
import java.util.Scanner;
13-
14-
public class JavaApplication {
15-
16-
private static final Scanner sc = new Scanner(System.in);
17-
18-
public static void main(String[] args) {
19-
ChannelService channelService = new FileChannelService();
20-
MessageService messageService = new FileMessageService();
21-
UserService userService = new FileUserService();
22-
23-
UserMenu userMenu = new UserMenu(sc, userService);
24-
ChannelMenu channelMenu = new ChannelMenu(sc, channelService);
25-
MessageMenu messageMenu = new MessageMenu(sc, messageService);
26-
27-
userMenu.loginUser();
28-
29-
System.out.println("모든 채널 정보를 출력합니다.");
30-
channelService.outputAllChannelInfo();
31-
System.out.println("들어가실 채널 번호를 선택해 주세요.");
32-
int channelNumber = Integer.parseInt(sc.nextLine());
33-
channelService.selectChannel(channelNumber);
34-
35-
while (true) {
36-
System.out.println("원하는 기능을 입력 해 주세요.");
37-
System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
38-
int choice = Integer.parseInt(sc.nextLine());
39-
40-
switch (choice) {
41-
case 1 -> userMenu.run();
42-
case 2 -> channelMenu.run();
43-
case 3 -> messageMenu.run();
44-
case 4 -> {
45-
System.out.println("Discodeit을 종료합니다. 감사합니다.");
46-
sc.close();
47-
return;
48-
}
49-
default -> System.out.println("올바른 번호를 입력해 주세요.");
50-
}
51-
}
52-
}
53-
}
1+
//package com.sprint;
2+
//
3+
//import com.sprint.mission.discodeit.menu.ChannelMenu;
4+
//import com.sprint.mission.discodeit.menu.MessageMenu;
5+
//import com.sprint.mission.discodeit.menu.UserMenu;
6+
//import com.sprint.mission.discodeit.service.ChannelService;
7+
//import com.sprint.mission.discodeit.service.MessageService;
8+
//import com.sprint.mission.discodeit.service.UserService;
9+
//import com.sprint.mission.discodeit.service.file.FileChannelService;
10+
//import com.sprint.mission.discodeit.service.file.FileMessageService;
11+
//import com.sprint.mission.discodeit.service.file.FileUserService;
12+
//import java.util.Scanner;
13+
//
14+
//public class JavaApplication {
15+
//스프린트 미션1 코드
16+
// private static final Scanner sc = new Scanner(System.in);
17+
//
18+
// public static void main(String[] args) {
19+
// ChannelService channelService = new FileChannelService();
20+
// MessageService messageService = new FileMessageService();
21+
// UserService userService = new FileUserService();
22+
//
23+
// UserMenu userMenu = new UserMenu(sc, userService);
24+
// ChannelMenu channelMenu = new ChannelMenu(sc, channelService);
25+
// MessageMenu messageMenu = new MessageMenu(sc, messageService);
26+
//
27+
// userMenu.loginUser();
28+
//
29+
// System.out.println("모든 채널 정보를 출력합니다.");
30+
// channelService.outputAllChannelInfo();
31+
// System.out.println("들어가실 채널 번호를 선택해 주세요.");
32+
// int channelNumber = Integer.parseInt(sc.nextLine());
33+
// channelService.selectChannel(channelNumber);
34+
//
35+
// while (true) {
36+
// System.out.println("원하는 기능을 입력 해 주세요.");
37+
// System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
38+
// int choice = Integer.parseInt(sc.nextLine());
39+
//
40+
// switch (choice) {
41+
// case 1 -> userMenu.run();
42+
// case 2 -> channelMenu.run();
43+
// case 3 -> messageMenu.run();
44+
// case 4 -> {
45+
// System.out.println("Discodeit을 종료합니다. 감사합니다.");
46+
// sc.close();
47+
// return;
48+
// }
49+
// default -> System.out.println("올바른 번호를 입력해 주세요.");
50+
// }
51+
// }
52+
// }
53+
//}

‎src/main/java/com/sprint/JavaApplication2.java

Lines changed: 67 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,67 @@
1-
package com.sprint;
2-
3-
import com.sprint.mission.discodeit.menu.ChannelMenu;
4-
import com.sprint.mission.discodeit.menu.MessageMenu;
5-
import com.sprint.mission.discodeit.menu.UserMenu;
6-
import com.sprint.mission.discodeit.repository.ChannelDefaultRepository;
7-
import com.sprint.mission.discodeit.repository.jcf.JCFChannelRepository;
8-
import com.sprint.mission.discodeit.repository.jcf.JCFMessageRepository;
9-
import com.sprint.mission.discodeit.repository.jcf.JCFUserRepository;
10-
import com.sprint.mission.discodeit.service.ChannelService;
11-
import com.sprint.mission.discodeit.service.MessageService;
12-
import com.sprint.mission.discodeit.service.UserService;
13-
import com.sprint.mission.discodeit.service.basic.BasicChannelService;
14-
import com.sprint.mission.discodeit.service.basic.BasicMessageService;
15-
import com.sprint.mission.discodeit.service.basic.BasicUserService;
16-
import java.util.Scanner;
17-
18-
public class JavaApplication2 {
19-
20-
private static final Scanner sc = new Scanner(System.in);
21-
22-
public static void main(String[] args) {
23-
JCFUserRepository jcfUserRepo = new JCFUserRepository();
24-
JCFChannelRepository jcfChannelRepo = new JCFChannelRepository();
25-
JCFMessageRepository jcfMessageRepo = new JCFMessageRepository();
26-
ChannelDefaultRepository.getChannel()
27-
.forEach(jcfChannelRepo::saveChannel);
28-
29-
UserService userServiceJCF = new BasicUserService(jcfUserRepo);
30-
ChannelService channelServiceJCF = new BasicChannelService(jcfChannelRepo);
31-
MessageService messageServiceJCF = new BasicMessageService(jcfMessageRepo);
32-
33-
UserMenu userMenu = new UserMenu(sc, userServiceJCF);
34-
ChannelMenu channelMenu = new ChannelMenu(sc, channelServiceJCF);
35-
MessageMenu messageMenu = new MessageMenu(sc, messageServiceJCF);
36-
37-
userMenu.loginUser();
38-
39-
System.out.println("모든 채널 정보를 출력합니다.");
40-
channelServiceJCF.outputAllChannelInfo();
41-
System.out.println("들어가실 채널 번호를 선택해 주세요.");
42-
int channelNumber = Integer.parseInt(sc.nextLine());
43-
channelServiceJCF.selectChannel(channelNumber);
44-
45-
while (true) {
46-
System.out.println("원하는 기능을 입력 해 주세요.");
47-
System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
48-
int choice = Integer.parseInt(sc.nextLine());
49-
50-
switch (choice) {
51-
case 1 -> userMenu.run();
52-
case 2 -> channelMenu.run();
53-
case 3 -> messageMenu.run();
54-
case 4 -> {
55-
System.out.println("Discodeit을 종료합니다. 감사합니다.");
56-
sc.close();
57-
return;
58-
}
59-
default -> System.out.println("올바른 번호를 입력해 주세요.");
60-
}
61-
}
62-
}
63-
}
1+
//package com.sprint;
2+
//
3+
//import com.sprint.mission.discodeit.entity.Channel;
4+
//import com.sprint.mission.discodeit.menu.ChannelMenu;
5+
//import com.sprint.mission.discodeit.menu.MessageMenu;
6+
//import com.sprint.mission.discodeit.menu.UserMenu;
7+
//import com.sprint.mission.discodeit.repository.DefaultChannelFactory;
8+
//import com.sprint.mission.discodeit.repository.jcf.JCFChannelRepository;
9+
//import com.sprint.mission.discodeit.repository.jcf.JCFMessageRepository;
10+
//import com.sprint.mission.discodeit.repository.jcf.JCFUserRepository;
11+
//import com.sprint.mission.discodeit.service.ChannelService;
12+
//import com.sprint.mission.discodeit.service.MessageService;
13+
//import com.sprint.mission.discodeit.service.UserService;
14+
//import com.sprint.mission.discodeit.service.basic.BasicChannelService;
15+
//import com.sprint.mission.discodeit.service.basic.BasicMessageService;
16+
//import com.sprint.mission.discodeit.service.basic.BasicUserService;
17+
//import java.util.Scanner;
18+
//
19+
//public class JavaApplication2 {
20+
//
21+
// private static final Scanner sc = new Scanner(System.in);
22+
//
23+
// //JCF 기반 테스트
24+
// public static void main(String[] args) {
25+
// JCFUserRepository jcfUserRepo = new JCFUserRepository();
26+
// JCFChannelRepository jcfChannelRepo = new JCFChannelRepository();
27+
// JCFMessageRepository jcfMessageRepo = new JCFMessageRepository();
28+
// DefaultChannelFactory.getChannel()
29+
// .forEach(jcfChannelRepo::saveChannel);
30+
//
31+
// UserService userServiceJCF = new BasicUserService(jcfUserRepo);
32+
// ChannelService channelServiceJCF = new BasicChannelService(jcfChannelRepo);
33+
// MessageService messageServiceJCF = new BasicMessageService(jcfMessageRepo);
34+
//
35+
// UserMenu userMenu = new UserMenu(sc, userServiceJCF);
36+
//
37+
// MessageMenu messageMenu = new MessageMenu(sc, messageServiceJCF);
38+
//
39+
// userMenu.loginUser();
40+
//
41+
// System.out.println("모든 채널 정보를 출력합니다.");
42+
// channelServiceJCF.outputAllChannelInfo();
43+
// System.out.println("들어가실 채널 번호를 선택해 주세요.");
44+
// int channelNumber = Integer.parseInt(sc.nextLine());
45+
// Channel selectedChannel = channelServiceJCF.getChannelByNumber(channelNumber);
46+
// channelServiceJCF.selectChannel(channelNumber);
47+
//
48+
// ChannelMenu channelMenu = new ChannelMenu(sc, channelServiceJCF, selectedChannel);
49+
// while (true) {
50+
// System.out.println("원하는 기능을 입력 해 주세요.");
51+
// System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
52+
// int choice = Integer.parseInt(sc.nextLine());
53+
//
54+
// switch (choice) {
55+
// case 1 -> userMenu.run();
56+
// case 2 -> channelMenu.run();
57+
// case 3 -> messageMenu.run();
58+
// case 4 -> {
59+
// System.out.println("Discodeit을 종료합니다. 감사합니다.");
60+
// sc.close();
61+
// return;
62+
// }
63+
// default -> System.out.println("올바른 번호를 입력해 주세요.");
64+
// }
65+
// }
66+
// }
67+
//}

‎src/main/java/com/sprint/JavaApplication3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static void main(String[] args) {
3737
channelServiceFile.outputAllChannelInfo();
3838
System.out.println("들어가실 채널 번호를 선택해 주세요.");
3939
int channelNumber = Integer.parseInt(sc.nextLine());
40-
Channel selectedChannel = channelServiceFile.changeChannel(channelNumber);
40+
Channel selectedChannel = channelServiceFile.getChannelByNumber(channelNumber);
4141

4242
if (selectedChannel == null) {
4343
System.out.println("유효하지 않은 채널 번호입니다. 프로그램을 종료합니다.");

‎src/main/java/com/sprint/mission/discodeit/menu/ChannelMenu.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void run() {
4343
System.out.println("정상적으로 채널이 삭제됐습니다. 변경하실 채널 번호를 입력해주세요.");
4444
channelService.outputAllChannelInfo();
4545
int newChannelNumber = Integer.parseInt(sc.nextLine());
46-
currentChannel = channelService.changeChannel(newChannelNumber);
46+
currentChannel = channelService.getChannelByNumber(newChannelNumber);
4747
if (currentChannel == null) {
4848
System.out.println("유효하지 않은 채널 번호입니다.");
4949
}
@@ -53,7 +53,7 @@ public void run() {
5353
System.out.println("변경하실 채널 번호를 입력해주세요.");
5454
channelService.outputAllChannelInfo();
5555
int newChannelNumber = Integer.parseInt(sc.nextLine());
56-
currentChannel = channelService.changeChannel(newChannelNumber);
56+
currentChannel = channelService.getChannelByNumber(newChannelNumber);
5757
if (currentChannel == null) {
5858
System.out.println("유효하지 않은 채널 번호입니다.");
5959
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public interface ChannelService {
1414

1515
public void createNewChannel(String channelName);
1616

17-
public Channel changeChannel(int channelNumber);
17+
public Channel getChannelByNumber(int channelNumber);
1818

1919
public void selectChannel(int channelNumber);
2020

‎src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void createNewChannel(String channelName) {
4949
}
5050

5151
@Override
52-
public Channel changeChannel(int channelNumber) {
52+
public Channel getChannelByNumber(int channelNumber) {
5353
return channelRepo.findChannel(channelNumber);
5454
}
5555

‎src/main/java/com/sprint/mission/discodeit/service/file/FileChannelService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void createNewChannel(String channelName) {
112112
}
113113

114114
@Override
115-
public Channel changeChannel(int channelNumber) {
115+
public Channel getChannelByNumber(int channelNumber) {
116116
Channel newChannel = channelMap.get(channelNumber);
117117
if (newChannel != null) {
118118
currentChannel = newChannel;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void createNewChannel(String channelName) {
6161
}
6262

6363

64-
public Channel changeChannel(int channelNumber) {
64+
public Channel getChannelByNumber(int channelNumber) {
6565
Channel newChannel = channelMap.get(channelNumber);
6666
if (newChannel != null) {
6767
currentChannel = newChannel;

0 commit comments

Comments
 (0)