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 827fb82..b681080 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java @@ -18,6 +18,9 @@ @JsonProperty("token") private String token; + @JsonIgnore + private HashMap posts = new HashMap<>(); + //Accountから対応するFriendManagerを1つ呼び出す(初期化) @JsonIgnore FriendManager friendManager = new FriendManager(); @@ -58,8 +61,6 @@ this.token = token; } - 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 dd08f65..21f5182 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java @@ -1,5 +1,8 @@ package org.ntlab.nemophila.models.accounts; +import org.ntlab.nemophila.models.shops.Shop; +import org.ntlab.nemophila.models.shops.ShopManager; + import java.util.HashMap; import java.util.UUID; @@ -9,12 +12,31 @@ private int newId = 1111; private AccountManager() { - //ダミーアカウントとの作成 + //ダミーのお店を作成 + ShopManager sm = ShopManager.getInstance(); + Shop shopA = sm.createShop("店A", 12.3, 34.5); + Shop shopB = sm.createShop("店B", 56.7, 78.9); + Shop shopC = sm.createShop("店C", 12.3, 34.5); + Shop shopD = sm.createShop("店D", 56.7, 78.9); + + //ダミーアカウントの作成 this.createAccount("a","a"); + Account testAc1 = this.getAccount("1111"); + testAc1.createPost(shopA, 5, "ラーメン", "おいしかった", null, null, null); + this.createAccount("b","b"); + Account testAc2 = this.getAccount("1112"); + testAc2.createPost(shopB, 2, "そば", "濃かった", null, null, null); + this.createAccount("c","c"); + Account testAc3 = this.getAccount("1113"); + testAc3.createPost(shopC, 3, "中華", "王将の方がおいしい", null, null, null); + this.createAccount("d","d"); + Account testAc4 = this.getAccount("1114"); + testAc4.createPost(shopD, 5, "カレー", "なかなかおいしかった", null, null, null); } + //シングルトン化 public static AccountManager getInstance() { if(theInstance == null){ @@ -23,7 +45,7 @@ return theInstance; } - // //全てのアカウントの取得 + //全てのアカウントの取得 public HashMap getAccountsMap() { return accountsMap; } 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 b2ee499..624c495 100644 --- a/src/main/java/org/ntlab/nemophila/models/shops/Shop.java +++ b/src/main/java/org/ntlab/nemophila/models/shops/Shop.java @@ -14,7 +14,7 @@ private double longitude; @JsonProperty("latitude") private double latitude; - @JsonProperty("posts") + @JsonIgnore private ArrayList posts = new ArrayList<>(); //Getter 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 591b7ba..bdfd27d 100644 --- a/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java +++ b/src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java @@ -13,9 +13,6 @@ //コンストラクタにアクセス制限をつけることで,インスタンス生成できなくする private ShopManager() { - //ダミーカウント作成 - this.createShop("店A", 12.3, 45.6); - this.createShop("店B", 78.9, 10.1); } //インスタンスがなければ作成する 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 7ded7cd..13f1d60 100644 --- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java @@ -25,7 +25,6 @@ if (shop != null) { return shop.getPosts(); } - return null; }