diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java index de69a3e..9f20f74 100644 --- a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java +++ b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java @@ -47,7 +47,7 @@ } //アクティビティのテキストが存在しないとき - public boolean isValidActivity(String userId, String activityId, String textId) { + public boolean isValidActivity(String userId, String activityId) { HashMap userActivities = activityMap.get(userId); if (userActivities == null) return false; @@ -57,7 +57,7 @@ String activityText = activity.getText(); if (activityText == null || activityText == "") return false; - return activityText.equals(textId); + return true; } //アクティビティを削除するメソッド diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java index a20d86f..59910eb 100644 --- a/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java +++ b/src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java @@ -50,8 +50,8 @@ System.out.println(a6); //アクティビティのテキストが存在しないとき - boolean result3 = activityRepository.isValidActivity("abc", a100.getActivityId(), "プログラミングなう"); - boolean result4 = activityRepository.isValidActivity("abc", a101.getActivityId(), ""); + boolean result3 = activityRepository.isValidActivity("abc", a100.getActivityId()); + boolean result4 = activityRepository.isValidActivity("abc", a101.getActivityId()); assertTrue(result3); // 一致するので true assertFalse(result4); // activity-id101 が存在しないか、テキストが空なので false Activity a7 = activityRepository.getActivity("xyz", a1.getActivityId());