diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java new file mode 100644 index 0000000..71ebd81 --- /dev/null +++ b/src/main/java/org/ntlab/acanthus_server/entities/FollowJson.java @@ -0,0 +1,25 @@ +package org.ntlab.acanthus_server.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.HashMap; + +public class FollowJson { + @JsonProperty("follows") + private HashMap follows = new HashMap<>(); + + //Json型でフォローしているユーザーIDを表示する処理 + public FollowJson(HashMap followsHashMap){ + for (var follow : followsHashMap.values()){ + follows.put(follow.getUid(), follow.getName()); + } + } + + public HashMap getFollows() { + return follows; + } + + public void setFollows(HashMap follows) { + this.follows = follows; + } +} diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowUidJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowUidJson.java deleted file mode 100644 index 1440ce6..0000000 --- a/src/main/java/org/ntlab/acanthus_server/entities/FollowUidJson.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ntlab.acanthus_server.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.ArrayList; -import java.util.Collection; - -public class FollowUidJson { - @JsonProperty("followsUid") - private ArrayList followsUid = new ArrayList<>(); - - //Json型でフォローしているユーザーIDを表示する処理 - public FollowUidJson(Collection followUidList){ - for (var followUid : followUidList){ - followsUid.add(followUid); - } - } - - public Collection getFollowsUid() { - return followsUid; - } - - public void setFollowsUid(ArrayList followsUid) { - this.followsUid = followsUid; - } - -} diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java new file mode 100644 index 0000000..6e7b05c --- /dev/null +++ b/src/main/java/org/ntlab/acanthus_server/entities/FollowerJson.java @@ -0,0 +1,25 @@ +package org.ntlab.acanthus_server.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.HashMap; + +public class FollowerJson { + @JsonProperty("followers") + private HashMap followers = new HashMap<>(); + + //Json型でフォロワーのユーザーIDを表示する処理 + public FollowerJson(HashMap followersHashMap){ + for (var follower : followersHashMap.values()){ + followers.put(follower.getUid(), follower.getName()); + } + } + + public HashMap getFollowers() { + return followers; + } + + public void setFollowers(HashMap followers) { + this.followers = followers; + } +} diff --git a/src/main/java/org/ntlab/acanthus_server/entities/FollowerUidJson.java b/src/main/java/org/ntlab/acanthus_server/entities/FollowerUidJson.java deleted file mode 100644 index fe7cc33..0000000 --- a/src/main/java/org/ntlab/acanthus_server/entities/FollowerUidJson.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ntlab.acanthus_server.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.ArrayList; -import java.util.Collection; - -public class FollowerUidJson { - @JsonProperty("followersUid") - private ArrayList followersUid = new ArrayList<>(); - - //Json型でフォロワーのユーザーIDを表示する処理 - public FollowerUidJson(Collection followUidList){ - for (var followerUid : followUidList){ - followersUid.add(followerUid); - } - } - - public Collection getFollowersUid() { - return followersUid; - } - - public void setFollowersUid(ArrayList followersUid) { - this.followersUid = followersUid; - } -} diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowersRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowersRest.java index 3cbe5f8..50272f2 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowersRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowersRest.java @@ -1,13 +1,14 @@ package org.ntlab.acanthus_server.resources.accounts; -import org.ntlab.acanthus_server.entities.FollowerUidJson; +import org.ntlab.acanthus_server.entities.Account; +import org.ntlab.acanthus_server.entities.FollowerJson; import org.ntlab.acanthus_server.models.Accounts; import org.springframework.stereotype.Component; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.util.Collection; +import java.util.HashMap; @Component @Path("/accounts") @@ -19,13 +20,13 @@ @Path("/{uid}/followers") @GET @Produces(MediaType.APPLICATION_JSON) - public FollowerUidJson getFollowers(@PathParam("uid") Integer uid){ + public FollowerJson getFollowers(@PathParam("uid") Integer uid){ var account = accounts.getAccountByUid(uid);//ユーザー情報の取得 if (account != null){ - Collection followersUidList = account.getFollowersHashMap().keySet(); + HashMap followersHashMap = account.getFollowersHashMap(); - return new FollowerUidJson(followersUidList); + return new FollowerJson(followersHashMap); }else { var response = Response.status(401).entity("ユーザーIDが間違っています"); throw new WebApplicationException(response.build()); diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java index 5370bb1..552ecba 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/FollowsRest.java @@ -7,7 +7,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.util.Collection; +import java.util.HashMap; @Component @Path("/accounts") @@ -19,13 +19,13 @@ @Path("/{uid}/follows") @GET @Produces(MediaType.APPLICATION_JSON) - public FollowUidJson getFollows(@PathParam("uid") Integer uid){ + public FollowJson getFollows(@PathParam("uid") Integer uid){ var account = accounts.getAccountByUid(uid);//ユーザー情報取得 if (account != null) {//アカウント認証 - Collection followUidList = account.getFollowsHashMap().keySet(); + HashMap followsHashMap = account.getFollowsHashMap(); - return new FollowUidJson(followUidList); + return new FollowJson(followsHashMap); }else { var response = Response.status(401).entity("ユーザーIDが間違っています"); throw new WebApplicationException(response.build());