diff --git a/src/main/java/org/ntlab/tampoposerver/models/User.java b/src/main/java/org/ntlab/tampoposerver/models/User.java index 3f82997..76713a6 100644 --- a/src/main/java/org/ntlab/tampoposerver/models/User.java +++ b/src/main/java/org/ntlab/tampoposerver/models/User.java @@ -1,5 +1,6 @@ package org.ntlab.tampoposerver.models; +import java.util.ArrayList; import java.util.UUID; public class User { @@ -9,6 +10,7 @@ private String email; private String icon; private String token; + private ArrayList friendPairs = new ArrayList<>(); public User(String userId, String password){ this.userId = userId; @@ -77,6 +79,14 @@ this.token = token; } + public ArrayList getFriendPairs() { + return friendPairs; + } + + public void setFriendPairs(ArrayList friendPairs) { + this.friendPairs = friendPairs; + } + } diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java index ec2bef3..a571337 100644 --- a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java +++ b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java @@ -1,22 +1,49 @@ package org.ntlab.tampoposerver.repositories; +import org.ntlab.tampoposerver.models.FriendPair; import org.ntlab.tampoposerver.models.User; import org.springframework.stereotype.Repository; +import java.util.ArrayList; import java.util.HashMap; @Repository public class UserRepository { private final HashMap userMap = new HashMap<>(); + + public User addUser(String userId, String password) { + User u = new User(userId, password); + userMap.put(userId, u); + return u; + } + public User addUser(String userId, String name, String password, String email, String icon) { User u = new User(userId, name, password, email, icon); userMap.put(userId, u); return u; } - public User getUser(String userId) { + + public User getUser(String userId) { return userMap.get(userId); } + public User deleteUser(String userId) { return userMap.remove(userId); } + + public User addFriendPair(String userId, FriendPair pair) { + User user = getUser(userId); + user.getFriendPairs().add(pair); + return user; + } + + public ArrayList getFriendPairs(String userId) { + User user = getUser(userId); + return user.getFriendPairs(); + } + + public void deleteFriendPair(String userId, FriendPair pair) { + User user = getUser(userId); + user.getFriendPairs().remove(pair); + } } diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java index c143e92..08c3f3b 100644 --- a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java +++ b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java @@ -1,23 +1,30 @@ package org.ntlab.tampoposerver.repositories; import org.junit.jupiter.api.Test; +import org.ntlab.tampoposerver.models.FriendPair; import org.ntlab.tampoposerver.models.User; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest public class UserRepositoryTest { @Test void contextLoads() { - UserRepository userRepository = new UserRepository(); + UserRepository userRepository = new UserRepository(); +// User u1 = userRepository.addUser("u01", "asdf", "xyz","asdf@gmail.com","123a876bca878de3"); +// User u2 = userRepository.addUser("u02", "zcv", "abc","dfgdf@gmail.com","123a876bca878d125"); +// User u = userRepository.getUser("u02"); +// assertEquals(u2, u); +// assertNotEquals(u1, u); +// userRepository.deleteUser("u02"); +// u = userRepository.getUser("u02"); +// assertNull(u); +// User user = userRepository.addPairId("u01", 2); User u1 = userRepository.addUser("u01", "asdf", "xyz","asdf@gmail.com","123a876bca878de3"); User u2 = userRepository.addUser("u02", "zcv", "abc","dfgdf@gmail.com","123a876bca878d125"); - User u = userRepository.getUser("u02"); - assertEquals(u2, u); - assertNotEquals(u1, u); - userRepository.deleteUser("u02"); - u = userRepository.getUser("u02"); - assertNull(u); + FriendPair pair = new FriendPair(1, "u01", "u02"); + userRepository.addFriendPair("u01", pair); + userRepository.addFriendPair("u02", pair); + System.out.println(userRepository.getFriendPairs("u01").get(0).getUser1Id()); + System.out.println(userRepository.getFriendPairs("u02").get(0).getUser0Id()); } } \ No newline at end of file