diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java index 13d3e19..6285d7e 100644 --- a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java +++ b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java @@ -8,6 +8,8 @@ import java.util.HashMap; import java.util.List; +import static java.awt.SystemColor.text; + @Repository public class ActivityRepository { @@ -77,6 +79,21 @@ return true; } + //アクティビティのテキストを返すメソッド + public String getActivityText(String userId,String activityId) { + if(activityMap.get(userId) == null) { + return null; + } + + HashMap activities = activityMap.get(userId); + + if(activities.get(activityId) == null) { + return null; + } + Activity activity = activities.get(activityId); + return activity.getText(); + } + //アクティビティを削除するメソッド public boolean deleteActivity(String userId, String activityId) { HashMap userActivities = activityMap.get(userId); diff --git a/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java b/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java index cf0cc06..c016ec6 100644 --- a/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java +++ b/src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.List; import static jakarta.ws.rs.core.Response.status; @@ -45,7 +46,7 @@ //200(成功レスポンス） - ArrayList requests = chatRequestRepository.getChatRequestsForUser(userId);//前の人がListだったらArrayListになるから作ってて頼む時はListで頼め + List requests = chatRequestRepository.getChatRequestsForUser(userId);//前の人がListだったらArrayListになるから作ってて頼む時はListで頼め //tokenのチェックはこっちでする、ほかのひとがしていた // 岩谷さんのUserRepositoryでtokenの確認を行う if (!userRepository.checkToken(userId, token) ) { @@ -91,19 +92,25 @@ @Path("/chat-requests/{chat-request-id}") @DELETE public Response deleteChatRequest( - @QueryParam("receiver-token") String receiverToken, + @QueryParam("token") String token, @PathParam("chat-request-id") Integer chatRequestId) { //401承認が必要です - if (receiverToken == null || receiverToken.isEmpty()) { + if (token == null || token.isEmpty()) { return status(Response.Status.UNAUTHORIZED) .entity("認証が必要です") // 401 .build(); } //403(未認証&トークンの不一致) - //ChatRequestRepository.getChatRequest(chatRequestId); - if (!userRepository.checkToken(null, null) && !userRepository.checkToken(null, null)) { + ChatRequest chatRequest = chatRequestRepository.getChatRequest(chatRequestId); + if (chatRequest == null) { + return Response.status(Response.Status.NOT_FOUND).build(); + } + String senderId = chatRequest.getSenderId(); + String receiverId = chatRequest.getReceiverId(); + + if (!userRepository.checkToken(senderId, token) && !userRepository.checkToken(receiverId, token)) { return Response.status(Response.Status.UNAUTHORIZED).build(); } diff --git a/src/test/java/org/ntlab/tampoposerver/models/FriendPairTest.java b/src/test/java/org/ntlab/tampoposerver/models/FriendPairTest.java new file mode 100644 index 0000000..6fb65f1 --- /dev/null +++ b/src/test/java/org/ntlab/tampoposerver/models/FriendPairTest.java @@ -0,0 +1,25 @@ +package org.ntlab.tampoposerver.models; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@SpringBootTest +public class FriendPairTest { + @Test + public void verifyUserEquation() { + FriendPair testPair0 = new FriendPair("user0", "user1"); + FriendPair testPair1 = new FriendPair("another_user0", "another_user1"); + + assertEquals("user0", testPair0.getUser0Id()); + assertEquals("user1", testPair0.getUser1Id()); + assertEquals("another_user0", testPair1.getUser0Id()); + assertEquals("another_user1", testPair1.getUser1Id()); + assertNotEquals("user1", testPair0.getUser0Id()); + assertNotEquals("user0", testPair0.getUser1Id()); + assertNotEquals("another_user1", testPair1.getUser0Id()); + assertNotEquals("another_user0", testPair1.getUser1Id()); + } +} diff --git a/src/test/java/org/ntlab/tampoposerver/models/FriendRequestTest.java b/src/test/java/org/ntlab/tampoposerver/models/FriendRequestTest.java new file mode 100644 index 0000000..3d4682c --- /dev/null +++ b/src/test/java/org/ntlab/tampoposerver/models/FriendRequestTest.java @@ -0,0 +1,25 @@ +package org.ntlab.tampoposerver.models; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@SpringBootTest +public class FriendRequestTest { + @Test + public void verifyFriendRequestEquation() { + FriendRequest testRequest0 = new FriendRequest("user0", "user1"); + FriendRequest testRequest1 = new FriendRequest("another_user0", "another_user1"); + + assertEquals("user0", testRequest0.getSenderId()); + assertEquals("user1", testRequest0.getReceiverId()); + assertEquals("another_user0", testRequest1.getSenderId()); + assertEquals("another_user1", testRequest1.getReceiverId()); + assertNotEquals("user1", testRequest0.getSenderId()); + assertNotEquals("user0", testRequest0.getReceiverId()); + assertNotEquals("another_user1", testRequest1.getSenderId()); + assertNotEquals("another_user0", testRequest1.getReceiverId()); + } +} diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java index c29d918..3500e55 100644 --- a/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java +++ b/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java @@ -57,6 +57,17 @@ Activity a7 = activityRepository.getActivity("xyz", a1.getActivityId()); assertNull(a7); + //アクティビティのテキストを返すメソッド + String text = activityRepository.getActivityText("abc",a2.getActivityId()); + String text2 = activityRepository.getActivityText("abc","-1"); + assertEquals(a2.getText(),text); + assertNotEquals(a100.getText(),text); + assertNull(text2); + System.out.println(a1); + System.out.println(a2); + System.out.println(text); + System.out.println(text2); + //単一アクティビティの投稿時間の取得 String time = activityRepository.getActivityUpdateTime("abc",a2.getActivityId()); String time2 = activityRepository.getActivityUpdateTime("abc","-1"); diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/FriendRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/FriendRepositoryTest.java new file mode 100644 index 0000000..dc74bd1 --- /dev/null +++ b/src/test/java/org/ntlab/tampoposerver/repositories/FriendRepositoryTest.java @@ -0,0 +1,49 @@ +package org.ntlab.tampoposerver.repositories; + +import org.junit.jupiter.api.Test; +import org.ntlab.tampoposerver.models.FriendPair; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@SpringBootTest +public class FriendRepositoryTest { + @Autowired + private FriendRepository friendRepository; + + @Test + public void contextLoads() { + assertThat(friendRepository).isNotNull(); + } + + @Test + public void test() { + // Adding friend pair + FriendPair pair = new FriendPair("user-0", "user-1"); + FriendPair addedPair = friendRepository.add(pair); + assertEquals(0, addedPair.getId()); + assertEquals("user-0", addedPair.getUser0Id()); + assertEquals("user-1", addedPair.getUser1Id()); + + FriendPair anotherPair = new FriendPair("another-user-0", "another-user-1"); + FriendPair anotherAddedPair = friendRepository.add(anotherPair); + assertEquals(1, anotherAddedPair.getId()); + assertEquals("another-user-0", anotherAddedPair.getUser0Id()); + assertEquals("another-user-1", anotherAddedPair.getUser1Id()); + + FriendPair wrongIdPair = new FriendPair("wrong-user-0", "wrong-user-1"); + FriendPair addedWrongIdPair = friendRepository.add(wrongIdPair); + assertNotEquals(10, addedWrongIdPair.getId()); + assertNotEquals("wrong-user-10", addedWrongIdPair.getUser0Id()); + assertNotEquals("wrong-user-11", addedWrongIdPair.getUser1Id()); + + // Get friends + FriendPair foundPair = friendRepository.find(0); + assertEquals(0, foundPair.getId()); + assertEquals("user-0", foundPair.getUser0Id()); + assertEquals("user-1", foundPair.getUser1Id()); + } +} diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/FriendRequestRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/FriendRequestRepositoryTest.java new file mode 100644 index 0000000..22c7f92 --- /dev/null +++ b/src/test/java/org/ntlab/tampoposerver/repositories/FriendRequestRepositoryTest.java @@ -0,0 +1,49 @@ +package org.ntlab.tampoposerver.repositories; + +import org.junit.jupiter.api.Test; +import org.ntlab.tampoposerver.models.FriendRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +@SpringBootTest() +public class FriendRequestRepositoryTest { + @Autowired + private FriendRequestRepository friendRequestRepository; + + @Test + public void contextLoads() { + assertThat(friendRequestRepository).isNotNull(); + } + + @Test + public void test() { + // Adding friend pair + FriendRequest request = new FriendRequest("user-0", "user-1"); + FriendRequest createdRequest = friendRequestRepository.create(request); + assertEquals(0, createdRequest.getId()); + assertEquals("user-0", createdRequest.getSenderId()); + assertEquals("user-1", createdRequest.getReceiverId()); + + FriendRequest anotherRequest = new FriendRequest("another-user-0", "another-user-1"); + FriendRequest anotherCreatedRequest = friendRequestRepository.create(anotherRequest); + assertEquals(1, anotherCreatedRequest.getId()); + assertEquals("another-user-0", anotherCreatedRequest.getSenderId()); + assertEquals("another-user-1", anotherCreatedRequest.getReceiverId()); + + FriendRequest wrongIdRequest = new FriendRequest("wrong-user-0", "wrong-user-1"); + FriendRequest addedWrongIdRequest = friendRequestRepository.create(wrongIdRequest); + assertNotEquals(10, addedWrongIdRequest.getId()); + assertNotEquals("wrong-user-10", addedWrongIdRequest.getSenderId()); + assertNotEquals("wrong-user-11", addedWrongIdRequest.getReceiverId()); + + // Getting friends + FriendRequest foundRequest = friendRequestRepository.find(0); + assertEquals(0, foundRequest.getId()); + assertEquals("user-0", foundRequest.getSenderId()); + assertEquals("user-1", foundRequest.getReceiverId()); + } +}