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 a968594..3d81b47 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 @@ -19,15 +19,25 @@ *トークン認証 * */ + @Path("/{uid}/invited") @GET @Produces(MediaType.APPLICATION_JSON) - public Collection getAccountInvited(@PathParam("uid") int uid, @QueryParam("token") String token){ - return null; + public boolean getAccountInvited(@PathParam("uid") int uid, @QueryParam("token") String token, @QueryParam("aid") int aid){ + var account = accounts.getAccountByUid(uid); + + /*if(account != null && account.getToken().equals(token)){ + + }else{ + //ユーザーID、トークンが間違っている時のレスポンス + throw new WebApplicationException(401); + }*/ + return true; } /** * 作品に招待されたときgalleryのinvitesとaccountのinvitedにそれぞれuid,aidを追加する */ + @Path("/{uid}/invited") @PUT @Produces(MediaType.APPLICATION_JSON) public void addAccountInvited(@PathParam("uid") int uid, @FormParam("token") String token){ @@ -40,6 +50,7 @@ * 招待を拒否した時 * それぞれのinviteからuid,aidを削除する */ + @Path("/{uid}/invited") @DELETE @Produces(MediaType.APPLICATION_JSON) public void removeAccountInvited(@PathParam("uid") int uid, @FormParam("token") String token){ diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java index ab8804b..911b322 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java @@ -4,21 +4,27 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import java.util.ArrayList; @Component @Path("/gallery") public class LayersRest { + /* + * 指定したレイヤー情報(順番、枚数)を獲得 + * @PathParam Integer aid 作品ID + */ + @Path("/{aid}/pageMap/0/layers/0") @GET @Produces(MediaType.APPLICATION_JSON) - public void getLayersRest(@PathParam("aid") Integer aid) { - + public ArrayList getLayersRest(@PathParam("aid") Integer aid) { + return null; /* if() { } */ - throw new WebApplicationException(404); +/**/ } }