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 296bedb..3e213f5 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -159,6 +159,12 @@ this.createdDate = LocalDateTime.now(); //this.lastAccess = LocalDateTime.of(2015, 12, 15, 0, 0); + + var newWork = new Work(); //ユーザーの制作作品の作成 + + newWork.setWork(); + newWork.setAnimation(this); + ownerAccount.addWork(newWork); } //----------------------------------------------------------------- } 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 4052ad6..0cbcd78 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Work.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Work.java @@ -1,9 +1,7 @@ package org.ntlab.acanthus_server.entities; -import org.ntlab.acanthus_server.models.Gallery; public class Work { - private Gallery animations = Gallery.getInstance(); int status = 0; Animation animation = null; @@ -12,8 +10,7 @@ public void setAnimation(Animation anime) { this.animation = anime; } - public void setInvites(int aid){ - animation = animations.getAnimationByAid(aid); + public void setInvites(Animation animation){ this.setAnimation(animation); this.status = 1; } 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 da21c06..3458cc5 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(invitedAccount) != null){ //Workクラスのstateを1に変更 - accountInvitedMap.get(aid).setInvites(aid); + accountInvitedMap.get(aid).setInvites(invitedAnimation); }else{ throw new WebApplicationException(400); 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 c4038f3..8ad2b7e 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 @@ -33,7 +33,7 @@ @Path("/{aid}/invites") @GET @Produces(MediaType.APPLICATION_JSON) - public Collection isGalleryInvites(@PathParam("aid") Integer aid, @QueryParam("invitedUid") String invitedUid, @QueryParam("invitedUidToken") String invitedUserToken, @QueryParam("Token") String ownerToken) { + public Collection isGalleryInvites(@PathParam("aid") Integer aid, @QueryParam("invitedUid") String invitedUid, @QueryParam("invitedUserToken") String invitedUserToken, @QueryParam("ownerToken") String ownerToken) { Animation animation = animations.getAnimationByAid(aid); //招待した人を確認する @@ -50,8 +50,10 @@ if (ownerToken == null) { Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid)); if (invitedAccount != null && invitedAccount.getToken().equals(invitedUserToken)) { + //相手の作品の招待リストの中に自分が存在する return animation.searchAnimationInvites(invitedAccount); } else { + //相手の作品の招待リストの中に自分が存在しない throw new WebApplicationException(404); } } @@ -85,7 +87,7 @@ Account account = accounts.getAccountByUid(Integer.parseInt(invitedUid)); var work = owner.getWorkHashMap().get(aid); account.getWorkHashMap().put(aid,work); - account.getWorkHashMap().get(aid).setInvites(aid); + account.getWorkHashMap().get(aid).setInvites(animation); return "追加しました"; } else { throw new WebApplicationException(404);