diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java index 71ebd81..a29b209 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java @@ -2,24 +2,36 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; import java.util.HashMap; public class FollowJson { - @JsonProperty("follows") - private HashMap follows = new HashMap<>(); + @JsonProperty("followUids") + private ArrayList followUids = new ArrayList<>(); + @JsonProperty("followNames") + private ArrayList followNames = new ArrayList<>(); //Json型でフォローしているユーザーIDを表示する処理 public FollowJson(HashMap followsHashMap){ for (var follow : followsHashMap.values()){ - follows.put(follow.getUid(), follow.getName()); + followUids.add(follow.getUid()); + followNames.add(follow.getName()); } } - public HashMap getFollows() { - return follows; + public ArrayList getFollowUids() { + return followUids; } - public void setFollows(HashMap follows) { - this.follows = follows; + public ArrayList getFollowNames() { + return followNames; + } + + public void setFollowUids(ArrayList followUids) { + this.followUids = followUids; + } + + public void setFollowNames(ArrayList followNames) { + this.followNames = followNames; } } diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java index 6e7b05c..678a3cc 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java @@ -2,24 +2,36 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; import java.util.HashMap; public class FollowerJson { - @JsonProperty("followers") - private HashMap followers = new HashMap<>(); + @JsonProperty("followerUids") + private ArrayList followerUids = new ArrayList<>(); + @JsonProperty("followerNames") + private ArrayList followerNames = new ArrayList<>(); //Json型でフォロワーのユーザーIDを表示する処理 public FollowerJson(HashMap followersHashMap){ for (var follower : followersHashMap.values()){ - followers.put(follower.getUid(), follower.getName()); + followerUids.add(follower.getUid()); + followerNames.add(follower.getName()); } } - public HashMap getFollowers() { - return followers; + public ArrayList getFollowerUids() { + return followerUids; } - public void setFollowers(HashMap followers) { - this.followers = followers; + public ArrayList getFollowerNames() { + return followerNames; + } + + public void setFollowerUids(ArrayList followerUids) { + this.followerUids = followerUids; + } + + public void setFollowerNames(ArrayList followerNames) { + this.followerNames = followerNames; } }