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 d870807..bdaec55 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Work.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Work.java @@ -1,15 +1,21 @@ package org.ntlab.acanthus_server.entities; +import org.ntlab.acanthus_server.models.Gallery; + public class Work { int status = 0; - Animation animation = null; + private Gallery animations = Gallery.getInstance(); public Animation getAnimation(){ return this.animation; } public void setAnimation(Animation anime) { this.animation = anime; } - public void setInvites(){ this.status = 1; } + public void setInvites(int aid){ + Animation animation = animations.getAnimationByAid(aid); + this.setAnimation(animation); + this.status = 1; + } public void setWork(){ this.status = 2; } 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 f5b89ab..dbe6cd4 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 @@ -61,7 +61,7 @@ //招待された作品の招待者の中に自分が含まれているか確認 if(invitedAnimation.searchAnimationInvites(aid, String.valueOf(invitedUid)) != null){ //Workクラスのstateを1に変更 - accountInvitedMap.get(aid).setInvites(); + //accountInvitedMap.get(aid).setInvites(); }else{ throw new WebApplicationException(400);