diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java index e3beab2..bd1cb7a 100644 --- a/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java +++ b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java @@ -4,10 +4,7 @@ import org.ntlab.amaryllis.server.entities.Account; import javax.ws.rs.WebApplicationException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; +import java.util.*; public class Accounts { private static Accounts theInstance = null; @@ -144,6 +141,13 @@ getAccount(toUid).getFollowers().remove(fromUid); } + /** + * Uidを生成するメソッド + * @return 生成されたuid + */ + public String createUid(){ + return UUID.randomUUID().toString(); + } } diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/AccountRest.java b/src/main/java/org/ntlab/amaryllis/server/resources/AccountRest.java index d0440e8..15898d7 100644 --- a/src/main/java/org/ntlab/amaryllis/server/resources/AccountRest.java +++ b/src/main/java/org/ntlab/amaryllis/server/resources/AccountRest.java @@ -84,4 +84,10 @@ return accounts.getAccount(uid).getHistory(); } + @Path("/{uid}/contributions") + @GET + @Produces(MediaType.APPLICATION_JSON) + public ArrayList getContributions(@PathParam("uid")String uid){ + return accounts.getAccount(uid).getContributions(); + } } diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java index e80f385..0fbca47 100644 --- a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java +++ b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java @@ -32,6 +32,10 @@ SignUpJson sj=createAccount("name", "pass"); accounts.getAccountByName("name").setUid("test"); } + { + SignUpJson sj=createAccount("hoge", "pass"); + accounts.getAccountByName("hoge").setUid("hogehoge"); + } } @GET