Skip to content

Commit ecbf374

Browse files
committed
피드백 반영
1 parent 67da311 commit ecbf374

File tree

12 files changed

+50
-38
lines changed

12 files changed

+50
-38
lines changed
Binary file not shown.
Binary file not shown.
405 Bytes
Binary file not shown.

src/main/java/com/sprint/mission/discodeit/entity/BaseEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.UUID;
55

66
public abstract class BaseEntity implements Serializable {
7-
private static final long serialVersionUID = 1L;
7+
private static final long serialVersionUID = -571597392321654385L;
88

99
private final UUID id;
1010
private final long createdAt;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.*;
55

66
public class Channel extends BaseEntity implements Serializable {
7-
private static final long serialVersionUID = 1L;
7+
private static final long serialVersionUID = 3253334103732539416L;
88
private String channelName;
99
private final Set<UUID> userIds = new HashSet<>();
1010
private final List<UUID> messageIds = new ArrayList<>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.UUID;
66

77
public class Message extends BaseEntity implements Serializable {
8-
private static final long serialVersionUID = 1L;
8+
private static final long serialVersionUID = 5140283631663474458L;
99
private String msgContent;
1010
private final UUID senderId;
1111
private final UUID channelId;

src/main/java/com/sprint/mission/discodeit/entity/User.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,21 @@
77
import java.util.UUID;
88

99
public class User extends BaseEntity implements Serializable {
10-
private static final long serialVersionUID = 1L;
10+
private static final long serialVersionUID = -1421022282607757997L;
1111
private String userName;
12-
private final Set<UUID> channelIds = new HashSet<>();
1312

1413
public User(String userName) {
1514
this.userName = userName;
1615
}
1716

18-
public Set<UUID> getChannelIds() {
19-
return channelIds;
20-
}
21-
2217
public void updateUserName(String userName) {
2318
this.userName = userName;
2419
updateTime();
2520
}
2621

27-
public void addChannel(UUID channelId) {
28-
channelIds.add(channelId);
29-
}
30-
3122
@Override
3223
public String toString() {
3324
return "User{name='" + userName + '\'' +
34-
", channelIds=" + channelIds +
3525
", createdAt=" + new Date(getCreatedAt()) +
3626
", updatedAt=" + new Date(getUpdatedAt()) +
3727
'}';

src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFChannelRepository.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@
88
public class JCFChannelRepository implements ChannelRepository {
99
private final Map<UUID, Channel> data = new HashMap<>();
1010

11-
public Channel save(Channel channel) { return data.put(channel.getId(), channel); }
12-
public Optional<Channel> findById(UUID channelId) { return Optional.ofNullable(data.get(channelId)); }
13-
public List<Channel> findAll() { return new ArrayList<>(data.values()); }
14-
public void deleteById(UUID channelId) { data.remove(channelId); }
11+
public Channel save(Channel channel) {
12+
return data.put(channel.getId(), channel);
13+
}
14+
15+
public Optional<Channel> findById(UUID channelId) {
16+
return Optional.ofNullable(data.get(channelId));
17+
}
18+
19+
public List<Channel> findAll() {
20+
return new ArrayList<>(data.values());
21+
}
22+
23+
public void deleteById(UUID channelId) {
24+
data.remove(channelId);
25+
}
1526
}

src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFMessageRepository.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@
88
public class JCFMessageRepository implements MessageRepository {
99
private final Map<UUID, Message> data = new HashMap<>();
1010

11-
public Message save(Message message) { return data.put(message.getId(), message); }
12-
public Optional<Message> findById(UUID messageId) { return Optional.ofNullable(data.get(messageId)); }
13-
public List<Message> findAll() { return new ArrayList<>(data.values()); }
14-
public void deleteById(UUID messageId) { data.remove(messageId); }
11+
public Message save(Message message) {
12+
return data.put(message.getId(), message);
13+
}
14+
15+
public Optional<Message> findById(UUID messageId) {
16+
return Optional.ofNullable(data.get(messageId));
17+
}
18+
19+
public List<Message> findAll() {
20+
return new ArrayList<>(data.values());
21+
}
22+
23+
public void deleteById(UUID messageId) {
24+
data.remove(messageId);
25+
}
1526
}

src/main/java/com/sprint/mission/discodeit/repository/jcf/JCFUserRepository.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@
88
public class JCFUserRepository implements UserRepository {
99
private final Map<UUID, User> data = new HashMap<>();
1010

11-
public User save(User user) { return data.put(user.getId(), user); }
12-
public Optional<User> findById(UUID userId) { return Optional.ofNullable(data.get(userId)); }
13-
public List<User> findAll() { return new ArrayList<>(data.values()); }
14-
public void deleteById(UUID userId) { data.remove(userId); }
11+
public User save(User user) {
12+
return data.put(user.getId(), user);
13+
}
14+
15+
public Optional<User> findById(UUID userId) {
16+
return Optional.ofNullable(data.get(userId));
17+
}
18+
19+
public List<User> findAll() {
20+
return new ArrayList<>(data.values());
21+
}
22+
23+
public void deleteById(UUID userId) {
24+
data.remove(userId);
25+
}
1526
}

0 commit comments

Comments
 (0)