diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java
index 9f20f74..13d3e19 100644
--- a/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java
+++ b/src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java
@@ -38,13 +38,30 @@
 
         return a;
     }
-    //アクティビティを取得
+    //単一のアクティビティを取得
     public Activity getActivity(String userId,String activityId) {
         if(activityMap.get(userId) == null) {
             return null;
         }
-        return activityMap.get(userId).get(activityId);
+
+        HashMap<String, Activity> activities = activityMap.get(userId);
+
+        if(activities.get(activityId) == null) {
+            return null;
+        }
+        Activity activity = activities.get(activityId);
+        return activity;
     }
+//
+//    public HashMap<String, Activity> getActivitiesForUser(String userId){
+//        if(activityMap.get(userId) == null) {
+//            return null;
+//        }
+//
+//        //keySet());ならアクティビティIDだけで詳細が取れない
+//        HashMap<String, Activity> value = activityMap.get(userId);
+//        return value;
+//    }
 
     //アクティビティのテキストが存在しないとき
     public boolean isValidActivity(String userId, String activityId) {
@@ -105,12 +122,13 @@
     }
 
     //そのユーザの全アクティビティ情報を保存するリストをの作成
-    public List<String> getActivitiesForUser(String userId){
+    public HashMap<String, Activity> getActivitiesForUser(String userId){
         if(activityMap.get(userId) == null) {
-            return new ArrayList<>();
+            return null;
         }
 
         //keySet());ならアクティビティIDだけで詳細が取れない
-        return new ArrayList<>(activityMap.get(userId).keySet());
+        HashMap<String, Activity> value = activityMap.get(userId);
+        return value;
     }
 }