Skip to content

Commit 2448189

Browse files
ssjf409ssjf409
authored
Merge pull request #53 from barrackkk/고희준-sprint2
[고희준] sprint2
2 parents 87e5795 + 99fcb66 commit 2448189

29 files changed

+1360
-154
lines changed

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

+53-68
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,53 @@
1-
package com.sprint;
2-
3-
import com.sprint.mission.discodeit.entity.Channel;
4-
import com.sprint.mission.discodeit.entity.User;
5-
import com.sprint.mission.discodeit.menu.ChannelMenu;
6-
import com.sprint.mission.discodeit.menu.MessageMenu;
7-
import com.sprint.mission.discodeit.menu.UserMenu;
8-
import com.sprint.mission.discodeit.repository.ChannelRepository;
9-
import com.sprint.mission.discodeit.service.ChannelService;
10-
import com.sprint.mission.discodeit.service.MessageService;
11-
import com.sprint.mission.discodeit.service.UserService;
12-
import com.sprint.mission.discodeit.service.jcf.JCFChannelService;
13-
import com.sprint.mission.discodeit.service.jcf.JCFMessageService;
14-
import com.sprint.mission.discodeit.service.jcf.JCFUserService;
15-
import java.util.ArrayList;
16-
import java.util.List;
17-
import java.util.Scanner;
18-
19-
public class JavaApplication {
20-
21-
private static final Scanner sc = new Scanner(System.in);
22-
23-
public static void main(String[] args) {
24-
List<User> users = new ArrayList<>();
25-
List<Channel> channels = ChannelRepository.getChannel();
26-
27-
UserService userService = new JCFUserService(users);
28-
ChannelService channelService = new JCFChannelService(channels);
29-
MessageService messageService = new JCFMessageService();
30-
31-
UserMenu userMenu = new UserMenu(sc, userService, users);
32-
ChannelMenu channelMenu = new ChannelMenu(sc, channelService);
33-
MessageMenu messageMenu = new MessageMenu(sc, messageService);
34-
userMenu.loginUser();
35-
36-
System.out.println("모든 채널 정보를 출력합니다.");
37-
channelService.outputAllChannelInfo();
38-
System.out.println("들어가실 채널 번호를 선택해 주세요.");
39-
int channelNumber = Integer.parseInt(sc.nextLine());
40-
channelService.selectChannel(channelNumber);
41-
42-
while (true) {
43-
System.out.println("원하는 기능을 입력 해 주세요.");
44-
System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
45-
int choice = Integer.parseInt(sc.nextLine());
46-
47-
switch (choice) {
48-
case 1 -> {
49-
userMenu.run();
50-
}
51-
case 2 -> {
52-
channelMenu.run();
53-
}
54-
case 3 -> {
55-
messageMenu.run();
56-
}
57-
case 4 -> {
58-
System.out.println("Discodeit을 종료합니다. 감사합니다.");
59-
sc.close();
60-
return;
61-
}
62-
default -> {
63-
System.out.println("올바른 번호를 입력해 주세요.");
64-
}
65-
}
66-
}
67-
}
68-
}
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

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
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

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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.file.FileChannelRepository;
7+
import com.sprint.mission.discodeit.repository.file.FileMessageRepository;
8+
import com.sprint.mission.discodeit.repository.file.FileUserRepository;
9+
import com.sprint.mission.discodeit.service.ChannelService;
10+
import com.sprint.mission.discodeit.service.MessageService;
11+
import com.sprint.mission.discodeit.service.UserService;
12+
import com.sprint.mission.discodeit.service.basic.BasicChannelService;
13+
import com.sprint.mission.discodeit.service.basic.BasicMessageService;
14+
import com.sprint.mission.discodeit.service.basic.BasicUserService;
15+
import java.util.Scanner;
16+
17+
public class JavaApplication3 {
18+
19+
private static final Scanner sc = new Scanner(System.in);
20+
21+
public static void main(String[] args) {
22+
FileUserRepository fileUserRepo = new FileUserRepository();
23+
FileChannelRepository fileChannelRepo = new FileChannelRepository();
24+
FileMessageRepository fileMessageRepo = new FileMessageRepository();
25+
26+
UserService userService = new BasicUserService(fileUserRepo);
27+
ChannelService channelService = new BasicChannelService(fileChannelRepo);
28+
MessageService messageService = new BasicMessageService(fileMessageRepo);
29+
30+
UserMenu userMenu = new UserMenu(sc, userService);
31+
ChannelMenu channelMenu = new ChannelMenu(sc, channelService);
32+
MessageMenu messageMenu = new MessageMenu(sc, messageService);
33+
34+
userMenu.loginUser();
35+
36+
while (true) {
37+
System.out.println("\n원하는 기능을 입력해 주세요.");
38+
System.out.println("1. 내 정보\t2. 채널 정보\t3. 메시지\t4. 로그아웃");
39+
int choice = Integer.parseInt(sc.nextLine());
40+
41+
switch (choice) {
42+
case 1 -> userMenu.run();
43+
case 2 -> channelMenu.run();
44+
case 3 -> messageMenu.run();
45+
case 4 -> {
46+
System.out.println("Discodeit을 종료합니다. 감사합니다.");
47+
sc.close();
48+
return;
49+
}
50+
default -> System.out.println("올바른 번호를 입력해 주세요.");
51+
}
52+
}
53+
}
54+
}

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

+29-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.sprint.mission.discodeit.entity;
22

3+
import java.io.Serializable;
34
import java.util.UUID;
45

5-
public class Channel {
6+
public class Channel implements Serializable {
7+
private static final long serialVersionUID = -8345660952343662023L;
68
private static int counter = 1;
9+
710
private int number;
811
private String channelName;
912
private UUID id;
@@ -43,6 +46,30 @@ public Long getUpdateAt() {
4346
return updateAt;
4447
}
4548

49+
public static void setCounter(int newCounter) {
50+
counter = newCounter;
51+
}
52+
53+
public void setNumber(int number) {
54+
this.number = number;
55+
}
56+
57+
public void setChannelName(String channelName) {
58+
this.channelName = channelName;
59+
}
60+
61+
public void setId(UUID id) {
62+
this.id = id;
63+
}
64+
65+
public void setCreatedAt(long createdAt) {
66+
this.createdAt = createdAt;
67+
}
68+
69+
public void setUpdateAt(long updateAt) {
70+
this.updateAt = updateAt;
71+
}
72+
4673
@Override
4774
public String toString() {
4875
return "Channel{" +
@@ -53,4 +80,4 @@ public String toString() {
5380
", updateAt=" + updateAt +
5481
'}';
5582
}
56-
}
83+
}

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

+30-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.sprint.mission.discodeit.entity;
22

3+
import java.io.Serializable;
34
import java.util.UUID;
45

5-
public class Message {
6+
public class Message implements Serializable {
7+
private static final long serialVersionUID = -953021662940755622L;
68
private static int counter = 1;
9+
710
private int number;
811
private UUID id;
912
private long createdAt;
@@ -44,14 +47,38 @@ public int getNumber() {
4447
return number;
4548
}
4649

50+
public static void setCounter(int counter) {
51+
Message.counter = counter;
52+
}
53+
54+
public void setNumber(int number) {
55+
this.number = number;
56+
}
57+
58+
public void setId(UUID id) {
59+
this.id = id;
60+
}
61+
62+
public void setCreatedAt(long createdAt) {
63+
this.createdAt = createdAt;
64+
}
65+
66+
public void setUpdateAt(long updateAt) {
67+
this.updateAt = updateAt;
68+
}
69+
70+
public void setMessage(String message) {
71+
this.message = message;
72+
}
73+
4774
@Override
4875
public String toString() {
4976
return "Message{" +
5077
"number=" + number +
51-
"id=" + id +
78+
", id=" + id +
5279
", createdAt=" + createdAt +
5380
", updateAt=" + updateAt +
5481
", message='" + message + '\'' +
5582
'}';
5683
}
57-
}
84+
}

0 commit comments

Comments
 (0)