diff --git a/src/main/java/com/example/cosmos_serversb/entities/Group.java b/src/main/java/com/example/cosmos_serversb/entities/Group.java index 50e19c2..e5ecd27 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -3,12 +3,13 @@ import java.util.ArrayList; +import static com.example.cosmos_serversb.models.Users.*; + public class Group { private String gId, uri, name; - //private ArrayList members; + private ArrayList members; private ArrayList requests; - private Group(){ } @@ -17,7 +18,8 @@ setGid(gId); setUri(uri); setName(name); - //addMemberByUid(uId); + this.members.add(getUserById(uId)); + this.requests = null; } private void setGid(String gId){ @@ -36,7 +38,7 @@ return uri; } - public void setName(String name){ + private void setName(String name){ this.name = name; } @@ -60,8 +62,6 @@ //} /*リクエスト*/ -// - } diff --git a/src/main/java/com/example/cosmos_serversb/entities/Request.java b/src/main/java/com/example/cosmos_serversb/entities/Request.java index 23e9280..40246a2 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -4,15 +4,22 @@ public class Request { private String rId, uri, date, IssuerUid, product, deadline; private int location;// YahooローカルサーチAPIの業種コード - private boolean done; + private boolean done = false; -// private Request(){ -// -// } + private Request(){ -// public Request(){ -// -// } + } + + public Request(String rId, String uri, String date, String IssuerUid, String product, String deadline, int location){ + setRid(rId); + setUri(uri); + setDate(date); + setIssuerUid(IssuerUid); + setProduct(product); + setDeadline(deadline); + setLocation(location); + this.done = false; + } private void setRid(String rId){ this.rId = rId; @@ -30,7 +37,15 @@ return uri; } - public void setIssuerUid(String IssuerUid){ + private void setDate(String date){ + this.date = date; + } + + public String getDate() { + return date; + } + + private void setIssuerUid(String IssuerUid){ this.IssuerUid = IssuerUid; } @@ -38,5 +53,35 @@ return IssuerUid; } + public String getProduct() { + return product; + } + public void setProduct(String product) { + this.product = product; + } + + public String getDeadline() { + return deadline; + } + + public void setDeadline(String deadline) { + this.deadline = deadline; + } + + public int getLocation() { + return location; + } + + public void setLocation(int location) { + this.location = location; + } + + public boolean isDone() { + return done; + } + + public void setDone(boolean done) { + this.done = done; + } } diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java index 0c7b42e..8a39bf1 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -1,11 +1,9 @@ package com.example.cosmos_serversb.models; - import java.util.*; import javax.inject.Singleton; import com.example.cosmos_serversb.entities.*; - @Singleton public class Groups { private static Groups thaInstance = null; @@ -31,7 +29,7 @@ return null; } - public Group getGroupByGid(String gId){ + public Group getGroupInfoByGid(String gId){ return null; } @@ -47,7 +45,7 @@ return null; } - public HashMap deleteMember(String gId){ + public HashMap deleteMember(String gId, String uId){ return null; } @@ -56,7 +54,7 @@ } public Request addRequests(String gId, String uId, String product, - String deadline, int location){ + String deadline, int location){ return null; } @@ -65,7 +63,7 @@ } public Request updateRequest(String gId, String rId, String uId, String product, - String deadline, int location, boolean done){ + String deadline, int location, boolean done){ return null; }