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 2b97551..78f6291 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Animation.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Animation.java @@ -50,7 +50,6 @@ private boolean isDummy; - public Animation(Integer aid, String name, Account owner) { LocalDateTime date = LocalDateTime.now(); @@ -64,6 +63,7 @@ this.owner = owner; this.editors.add(new Editor(owner, true)); this.pageMap.put(0, new Page()); + this.pages.add(this.pageMap.get(0)); this.lastUpdate = date.format(dateTimeFormatter); } @@ -76,6 +76,7 @@ // page情報 private ArrayList pages = new ArrayList<>(); + public ArrayList getPages() { return (this.pages); } @@ -104,6 +105,10 @@ this.lastUpdate = dt.toString(); } + public void setPageMap(int pid, Page page) { + this.pageMap.put(pid, page); + } + //----------------------------------------------------------------- // add @@ -146,9 +151,13 @@ return invites; } - public String getCreatedDate(){return createdDate;} + public String getCreatedDate() { + return createdDate; + } - public String getLastUpdate(){return lastUpdate;} + public String getLastUpdate() { + return lastUpdate; + } //----------------------------------------------------------------- // remover @@ -223,8 +232,7 @@ //this.lastAccess = LocalDateTime.of(2015, 12, 15, 0, 0); // pageとlayerを1枚ずつ追加 - this.pages.add(new Page()); - this.pages.get(0).getLayers().add(new Layer()); + this.pages.add(this.pageMap.get(0)); var newWork = new Work(); //ユーザーの制作作品の作成 diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java index ba96364..96ee38c 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/PagesRest.java @@ -10,6 +10,8 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import java.util.ArrayList; +import java.util.Random; +import java.util.UUID; // _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/ // @@ -41,9 +43,13 @@ @POST @Produces(MediaType.APPLICATION_JSON) public Integer addPage(@PathParam("aid") Integer aid) { - var pages = gallery.getAnimationByAid(aid).getPages(); - pages.add(new Page()); - return pages.size(); + var animation = gallery.getAnimationByAid(aid); + var newPage = new Page(); + + animation.getPages().add(newPage); + animation.setPageMap(new Random().nextInt(), newPage); + + return animation.getPages().size(); } // _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/ }