diff --git a/src/main/java/org/ntlab/nemophila/models/shops/Shop.java b/src/main/java/org/ntlab/nemophila/models/shops/Shop.java index 3559e50..d233070 100644 --- a/src/main/java/org/ntlab/nemophila/models/shops/Shop.java +++ b/src/main/java/org/ntlab/nemophila/models/shops/Shop.java @@ -1,19 +1,20 @@ package org.ntlab.nemophila.models.shops; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import org.ntlab.nemophila.models.accounts.Post; import java.util.ArrayList; public class Shop { - @JsonProperty("id") + @JsonProperty("sid") private String id; - @JsonProperty("name") + @JsonIgnore private String name; - @JsonProperty("longitude") + @JsonIgnore private double longitude; - @JsonProperty("latitude") + @JsonIgnore private double latitude; - + @JsonProperty("posts") private ArrayList posts = new ArrayList<>(); //Getter @@ -55,7 +56,4 @@ public void deletePost(Post post) { posts.remove(post); } - public int getPostsCount() { - return posts.size(); - } } diff --git a/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java b/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java index be41ff6..ee79010 100644 --- a/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java +++ b/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java @@ -23,16 +23,17 @@ return theInstance; } - //idからお店の情報を取得 + //idからお店の情報を返す public Shop getShop(String id) { return shopsMap.get(id); } + //お店の情報を全て返す public Collection getShops() { return shopsMap.values(); } - //idからその店の投稿を取得 + //sidからその店の投稿を取得 public ArrayList getPosts (String id) { Shop shop = shopsMap.get(id); return shop.getPosts(); @@ -58,6 +59,8 @@ shopsMap.put(shop.getId(), shop); } + + public void removeShop(String id) { shopsMap.remove(id); } diff --git a/src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java b/src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java index 911f135..2069f7c 100644 --- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java @@ -17,9 +17,10 @@ ShopManager shopManager = ShopManager.getInstance(); return shopManager.getShops(); } + @POST public void createShop(@FormParam("name") String name, @FormParam("longitude") double longitude, @FormParam("latitude") double latitude) { ShopManager shopManager = ShopManager.getInstance(); shopManager.createShop(name, longitude, latitude); } -} +} \ No newline at end of file