diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java index 3547dc6..827fb82 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java @@ -60,7 +60,6 @@ private HashMap posts = new HashMap<>(); - //新規投稿 public Post createPost(Shop shop, int rate, String genre, String comment, String image1, String image2, String image3) { Post post = new Post(this, genre, rate, shop); diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java b/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java index 1e3221f..6abf378 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java @@ -18,6 +18,12 @@ } return theInstance; } + + // //全てのアカウントの取得 + public HashMap getAccountsMap() { + return accountsMap; + } + //アカウントの取得 public Account getAccount(String id){ @@ -27,7 +33,7 @@ public Account createAccount(String name, String pw){ //ランダムにトークンを作成 UUID uuid = UUID.randomUUID(); - String token = (String) uuid.toString(); + String token = uuid.toString(); Account ac = new Account(name, pw); ac.setToken(token); //IDの作成 @@ -41,7 +47,7 @@ public Account updateAccount(String id) { Account ac = accountsMap.get(id); UUID uuid = UUID.randomUUID(); - String token = (String) uuid.toString(); + String token = uuid.toString(); ac.setToken(token); return ac; } diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java index 819c2b3..8cb3ae3 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java @@ -6,10 +6,18 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import java.util.HashMap; @Component @Path("/accounts") public class AccountsRest { + @GET + @Produces(MediaType.APPLICATION_JSON) + public HashMap getAccounts() { + AccountManager am = AccountManager.getInstance(); + return am.getAccountsMap(); + } + //ユーザー新規登録 @POST @Produces(MediaType.APPLICATION_JSON)