diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java index c6807aa..cb48a1e 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java @@ -45,46 +45,80 @@ this.email = email; this.password = password; } + //----------------------------------------------------------------- //----------------------------------------------------------------- // setter - public void setUid(Integer uid){this.uid = uid;} + public void setUid(Integer uid) { + this.uid = uid; + } + public void setName(String name) { this.name = name; } + public void setEmail(String email) { this.email = email; } - public void setPassword(String password){ + + public void setPassword(String password) { this.password = password; } - public void addWork(Work work){ this.workList.add(work); } + + public void addWork(Work work) { + this.workList.add(work); + } //----------------------------------------------------------------- // getter - public Integer getUid() {return (this.uid);} - public String getName(){ + public Integer getUid() { + return (this.uid); + } + + public String getName() { return (this.name); } + public String getEmail() { return (this.email); } + public String getPassword() { return (this.password); } + public String getToken() { return (this.token); } - public ArrayList getWork() { - return (this.workList); - } //----------------------------------------------------------------- + // 招待されている作品を返す + public ArrayList getInvitedList() { + var invitedList = new ArrayList(); + + for (var work : workList){ + if (work.isInviting()) invitedList.add(work); + } + + return invitedList; + } + //----------------------------------------------------------------- + // 参加している作品を返す + public ArrayList getWorkingList() { + var workingList = new ArrayList(); + + for (var work : workList) { + if (work.isWorking()) workingList.add(work); + } + return workingList; + } + //----------------------------------------------------------------- //----------------------------------------------------------------- // トークンを更新する 藤井 public void updateToken() { this.token = UUID.randomUUID().toString(); } + //----------------------------------------------------------------- // パスワードが一致しているかを判定 public boolean isMatchedPassword(String password) {