diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java
index db70806..40e44ba 100644
--- a/src/main/java/org/ntlab/amaryllis/server/models/Categories.java
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Categories.java
@@ -54,8 +54,12 @@
      * 持っているカテゴリを全て取得するメソッド
      * @return  持っているカテゴリのリスト
      */
-    public ArrayList<String> getCategoryList() {
-        return new ArrayList<>(categoryHashMap.keySet());
+    public ArrayList<Category> getCategoryList() {
+        ArrayList<Category> clist = new ArrayList<>();
+        for (Category c : categoryHashMap.values()) {
+            clist.add(c);
+        }
+        return  clist;
     }
 
     /**