diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/PostJson.java b/src/main/java/org/ntlab/nemophila/models/accounts/PostJson.java new file mode 100644 index 0000000..de3a194 --- /dev/null +++ b/src/main/java/org/ntlab/nemophila/models/accounts/PostJson.java @@ -0,0 +1,16 @@ +package org.ntlab.nemophila.models.accounts; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class PostJson { + @JsonProperty("uid") + private String uid; + @JsonProperty("pid") + private String pid; + + public PostJson(String uid, String pid){ + this.uid = uid; + this.pid = pid; + } + +} 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 13f1d60..f21ce14 100644 --- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java @@ -3,6 +3,7 @@ import org.ntlab.nemophila.models.accounts.Account; import org.ntlab.nemophila.models.accounts.AccountManager; import org.ntlab.nemophila.models.accounts.Post; +import org.ntlab.nemophila.models.accounts.PostJson; import org.ntlab.nemophila.models.shops.Shop; import org.ntlab.nemophila.models.shops.ShopManager; import org.springframework.stereotype.Component; @@ -18,12 +19,20 @@ @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) { - return shop.getPosts(); + 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; } @@ -55,7 +64,9 @@ sm.removeShop(sid); } } else { - System.out.println("Error : Miss match token"); + var response = Response.status(Response.Status.NO_CONTENT); + response.status(401).entity("Error : Miss match token"); + throw new WebApplicationException(response.build()); } } } \ No newline at end of file