diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Work.java b/src/main/java/org/ntlab/acanthus_server/entities/Work.java index bdaec55..4052ad6 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Work.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Work.java @@ -3,16 +3,17 @@ import org.ntlab.acanthus_server.models.Gallery; public class Work { + private Gallery animations = Gallery.getInstance(); int status = 0; - private Gallery animations = Gallery.getInstance(); + Animation animation = null; public Animation getAnimation(){ return this.animation; } public void setAnimation(Animation anime) { this.animation = anime; } public void setInvites(int aid){ - Animation animation = animations.getAnimationByAid(aid); + animation = animations.getAnimationByAid(aid); this.setAnimation(animation); this.status = 1; } 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 8de0c7f..31e2fb6 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 @@ -81,7 +81,7 @@ animation.addAccoutToAnimationInvites(aid, ownerUid, invitedUid); //↓矢印Workのstatusを招待状態にする処理 Account account = accounts.getAccountByUid(Integer.parseInt(invitedUid)); - account.getWorkHashMap().get(aid).setInvites(); + account.getWorkHashMap().get(aid).setInvites(aid); return "追加しました"; } else { throw new WebApplicationException(404);