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 740d058..c86a6b1 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -12,7 +12,7 @@ private int aid; private String name; private String description; - private Boolean ispublic; + private Boolean isPublic; private String createdDate; private String lastUpdate; private Integer likes; @@ -36,22 +36,35 @@ private Gallery gallery = Gallery.getInstance(); private Accounts accounts = Accounts.getInstance(); - public void setName(String name){ - this.name = name; - } - public void setAid(Integer aid){ this.aid = aid; } + 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 void setIsPublic(Boolean publicStatus){ + this.isPublic = isPublic; } + public void addEditors(Editor editor) { this.editors.add(editor); } + + public void setlastUpdate() { + Date dt = new Date(); + this.lastUpdate = dt.toString(); + } + + public void addLikes() { this.likes++; } + + public void addViews() { this.views++; } + + public void addHashTag(String inputHashTag) { this.hashTag.add(inputHashTag); } + public Integer getAid() { return aid; } public String getName() { return name; } @@ -67,14 +80,14 @@ public Collection searchAnimationInvites(Integer aid, String invitedUid) { Animation anime_info = gallery.getAnimationInformation(aid); Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid)); - ArrayList invitedlist = null; + ArrayList inviters = null; for(Account account : anime_info.invites) { if(account == invitedAccount) { - invitedlist.add(account); + inviters.add(account); } } - return invitedlist; + return inviters; } //----------------------------------------------------------------- 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 c932056..8de0c7f 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 @@ -75,12 +75,13 @@ @Produces(MediaType.APPLICATION_JSON) public String addInvite(@PathParam("aid") Integer aid, @FormParam("ownerUid") String ownerUid, @FormParam("invitedUid") String invitedUid, @FormParam("ownerToken") String ownerToken) { Animation animation = animations.getAnimationByAid(aid); - Account owner = animation.getOwner(); - //トークンの確認 + if (owner != null && owner.getToken().equals(ownerToken)) { animation.addAccoutToAnimationInvites(aid, ownerUid, invitedUid); - //accountのinvitedカラム(workカラム?)に追加する処理をかく + //↓矢印Workのstatusを招待状態にする処理 + Account account = accounts.getAccountByUid(Integer.parseInt(invitedUid)); + account.getWorkHashMap().get(aid).setInvites(); return "追加しました"; } else { throw new WebApplicationException(404); @@ -108,7 +109,6 @@ Account invitedAccount = accounts.getAccountByUid(Integer.parseInt(invitedUid)); if (invitedAccount != null && invitedAccount.getToken().equals(invitedToken)) { animation.deleteAccountFromAnimationInvites(aid, invitedUid); - return "削除しました"; } else { throw new WebApplicationException(404);