diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java index 945a305..ce7d2b2 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java @@ -133,6 +133,7 @@ //----------------------------------------------------------------- // 招待されている作品を返す + @JsonIgnore public HashMap getInvitedMap() { var invitedMap = new HashMap(); @@ -147,6 +148,7 @@ //----------------------------------------------------------------- // 参加している作品を返す + @JsonIgnore public HashMap getWorkingMap() { var workingMap = new HashMap(); diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java index 3e213f5..d5cae5e 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -20,8 +20,11 @@ private Integer likes; private Integer views; private ArrayList hashTag = new ArrayList<>(); + @JsonIgnore private Account owner; + @JsonIgnore private ArrayList editors = new ArrayList<>(); + @JsonIgnore private ArrayList invites = new ArrayList<>(); private HashMap pageMap = new HashMap<>(); @@ -91,7 +94,7 @@ public Collection getEditors() { return editors; } - public Collection getAnimationInvites() { + public Collection getInvites() { return invites; } diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java index 3458cc5..9cfba2d 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/InvitedRest.java @@ -89,7 +89,7 @@ var animation = gallery.getAnimationByAid(aid); if(invitedAccount != null && invitedAccount.getToken().equals(invitedToken)){ - if(invitedAccount.getInvitedMap().get(aid) != null && animation.getAnimationInvites().contains(invitedAccount)) { + if(invitedAccount.getInvitedMap().get(aid) != null && animation.getInvites().contains(invitedAccount)) { //accountのworkHashMapから削除 invitedAccount.getWorkHashMap().remove(aid); //animationのinvitesから削除 diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java index 8ad2b7e..1866a84 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/InvitesRest.java @@ -2,10 +2,8 @@ import org.ntlab.acanthus_server.entities.Account; import org.ntlab.acanthus_server.entities.Animation; -import org.ntlab.acanthus_server.entities.Work; import org.ntlab.acanthus_server.models.Accounts; import org.ntlab.acanthus_server.models.Gallery; -import org.ntlab.acanthus_server.resources.accounts.InvitedRest; import org.springframework.stereotype.Component; import javax.ws.rs.*; @@ -40,7 +38,7 @@ if (invitedUid == null && invitedUserToken == null) { Account owner = animation.getOwner(); if (owner != null && owner.getToken().equals(ownerToken)) { - return animation.getAnimationInvites(); + return animation.getInvites(); } else { throw new WebApplicationException(404); }