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 5bd2854..2744949 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -4,13 +4,43 @@ import java.util.Collection; public class Animation { - private ArrayList invitedUid; + private Integer aid; + private String name; + private String description; + private Boolean ispublic; + private String createdDate; + private String lastUpdate; + private Integer likes; + private Integer views; + private ArrayList hashTag; + private Integer owner; + private ArrayList editors; + private ArrayList invites; + private ArrayList pageMap; - public Animation(Integer invitedUid) { + public Animation(String name, Integer owner) { + //一意のaidをふる + // this.aid = + this.ispublic = false; + this.owner = owner; + //this.editors.add(Editor); + //this.pageMap.add(0, this.aid); } - public Collection getGalleryInvites() { - return invitedUid; + public void setName(String name){ + this.name = name; + } + + public void setDescription(String description){ + this.description = description; + } + + public void setIsPublic(Boolean ispublic){ + this.ispublic = ispublic; + } + + public Collection getAnimationInvites() { + return invites; } } 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 0739fa2..bca3267 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 @@ -1,6 +1,7 @@ package org.ntlab.acanthus_server.resources.gallery; import org.ntlab.acanthus_server.entities.Animation; +import org.ntlab.acanthus_server.models.Gallery; import org.springframework.stereotype.Component; import javax.ws.rs.*; @@ -11,19 +12,20 @@ @Path("/gallery") public class InvitesRest { + private Gallery animation = Gallery.getInstance(); + @Path("/{aid}/invites") @GET @Produces(MediaType.APPLICATION_JSON) - public String 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("invitedUidToken") String invitedUserToken, @QueryParam("Token") String ownerToken) { if (invitedUid == null && invitedUserToken == null) { //招待した人を確認する - - + return null; }else{ //招待されているかを確認する } - return "hello"; + return null; } @Path("/{aid}/invites")