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 da46412..20de437 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -15,16 +15,6 @@ } - //これはテスト用です。 - public Group(String gId, String uri, String name, String uId){ - this.gId = gId; - this.uri = uri; - this.name = name; - this.members.add(getUserById(uId)); - this.requests = null; - } - - /* public Group(String gId, String uri, String name, String uId){ setGid(gId); setUri(uri); @@ -32,7 +22,6 @@ this.members.add(getUserById(uId)); this.requests = null; } - */ private void setGid(String gId){ this.gId = gId; 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 b9b1bd1..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,18 +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; @@ -33,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; } @@ -41,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; + } }