diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/Post.java b/src/main/java/org/ntlab/nemophila/models/accounts/Post.java index 96cd42a..41671a3 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/Post.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/Post.java @@ -19,7 +19,7 @@ private int rate; @JsonProperty("comment") private String comment; - @JsonIgnore + @JsonProperty("owner") private Account owner; @JsonIgnore private Shop shop; diff --git a/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java b/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java index 62af5a7..38fe8bb 100644 --- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java @@ -19,22 +19,23 @@ @GET @Produces(MediaType.APPLICATION_JSON) @Path("/{sid}/posts") - public ArrayList getPosts(@PathParam("sid") String sid) { + public ArrayList getPosts(@PathParam("sid") String sid) { ShopManager sm = ShopManager.getInstance(); Shop shop = sm.getShop(sid); //入力したsidに対する投稿が存在すれば、投稿情報を取得する - if (shop != null) { - ArrayList posts = shop.getPosts(); - ArrayList ids = new ArrayList<>(); - for(int i = 0; i < posts.size(); i++){ - PostJson pj = new PostJson(posts.get(i).getOwner().getId(), posts.get(i).getId()); - ids.add(pj); - } - - return ids; - } - return null; + return shop.getPosts(); +// if (shop != null) { +// ArrayList posts = shop.getPosts(); +// ArrayList ids = new ArrayList<>(); +// for(int i = 0; i < posts.size(); i++){ +// PostJson pj = new PostJson(posts.get(i).getOwner().getId(), posts.get(i).getId()); +// ids.add(pj); +// } +// +// return ids; +// } +// return null; } @DELETE