diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/WorkRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/WorkRest.java index 14d7e3d..e7e9951 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/WorkRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/WorkRest.java @@ -1,7 +1,5 @@ package org.ntlab.acanthus_server.resources.accounts; -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.entities.WorkJson; import org.ntlab.acanthus_server.models.Accounts; @@ -10,7 +8,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; -import java.util.ArrayList; import java.util.Collection; @Component @@ -30,7 +27,7 @@ if(account != null && account.getToken().equals(token)){ //指定ユーザーの制作作品の表示 - Collection workList = account.getWorkingList().values(); + Collection workList = account.getWorkingMap().values(); return new WorkJson(workList); }else{ //ユーザーID、トークンが間違っている時のレスポンス @@ -44,13 +41,12 @@ @Path("/{uid}/work") @POST @Produces(MediaType.APPLICATION_JSON) - public Integer createWork(@PathParam("uid") Integer uid, @FormParam("token") String token){ + public Integer createWork(@PathParam("uid") Integer uid, @FormParam("name") String animationName, @FormParam("token") String token){ var account = accounts.getAccountByUid(uid); if(account != null && account.getToken().equals(token)){ //指定ユーザーの新しい作品の追加 - String name = "aa"; - int newAid = gallery.registAnimation(name, account); + int newAid = gallery.registAnimation(animationName, account); var animation = gallery.getAnimationInformation(newAid); var newWork = new Work(); newWork.setWork(); @@ -69,12 +65,15 @@ @Path("/{uid}/work") @PUT @Produces(MediaType.APPLICATION_JSON) - public String updateWork(@PathParam("uid") Integer uid, @FormParam("token") String token, @FormParam("aid") Integer aid) { - var account = accounts.getAccountByUid(uid); + public void updateWork(@PathParam("uid") Integer invitedUid, @FormParam("token") String invitedToken, @FormParam("aid") Integer aid) { + var account = accounts.getAccountByUid(invitedUid); + var animation = gallery.getAnimationInformation(aid); - if(account != null && account.getToken().equals(token)){ + if(account != null && animation != null && account.getToken().equals(invitedToken)){ //指定ユーザーの制作作品への参加の許可 - return "fake3"; + //invitedUid = + //animation.searchAnimationInvites(aid, invitedUid, invitedToken); + String untitle = ""; }else{ //ユーザーID、トークンが間違っている時のレスポンス throw new WebApplicationException(401);