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 707a8f8..ff277a5 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -1,9 +1,6 @@ package com.example.cosmos_serversb.entities; -import com.sun.imageio.plugins.common.SingleTileRenderedImage; - import java.util.ArrayList; -import com.example.cosmos_serversb.entities.*; //後で岸本君が作ってくれるやつへ移行 enum DeleteResult { @@ -14,7 +11,7 @@ public class Group { private String gId, uri, name; //private ArrayList members; - //private ArrayList requests; + private ArrayList requests; private Group(){ @@ -25,10 +22,10 @@ setGid(gId); setUri(uri); setName(name); - //addMember(uId); + //addMemberByUid(uId); } - public void setGid(String gId){ + private void setGid(String gId){ this.gId = gId; } @@ -36,11 +33,11 @@ return gId; } - public void setUri(String uri){ + private void setUri(String uri){ this.uri = uri; } - public String getUri(){ + public String getUriByGid(String gId){ return uri; } @@ -48,12 +45,18 @@ this.name = name; } - public String getName(){ + public String getNameByGid(String gId){ return name; } - //public void addMember(String uid){ - // members.add(uid); + /*メンバー*/ + //public ArrayList getMembersList(){ + // return null; + //} + + //public void addMemberByUid(String uId){ + // + // members.add(user); //} //public DeleteResult deleteMember(String uid){ @@ -61,14 +64,9 @@ // return null; //} - //public void addRequest(Request request){ - // requests.add(request); - //} + /*リクエスト*/ +// - //public DeleteResult deleteMember(Request request){ - // members.remove(requests.indexOf(request)); - // return null; - //} } diff --git a/src/main/java/com/example/cosmos_serversb/entities/Request.java b/src/main/java/com/example/cosmos_serversb/entities/Request.java new file mode 100644 index 0000000..6c07f49 --- /dev/null +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -0,0 +1,41 @@ +package com.example.cosmos_serversb.entities; + +public class Request { + private String rId, uri, date, IssuerUid, productName, deadline; + private int location;// YahooローカルサーチAPIの業種コード + private boolean done; + +// private Request(){ +// +// } + +// public Request(){ +// +// } + + private void setRid(String rId){ + this.rId = rId; + } + + public String getRid(){ + return rId; + } + + private void setUri(String uri){ + this.uri = uri; + } + + public String getUri(){ + return uri; + } + + public void setIssuerUid(String IssuerUid){ + this.IssuerUid = IssuerUid; + } + + public String getIssuerUid(){ + return IssuerUid; + } + + +} diff --git a/src/main/java/com/example/cosmos_serversb/entities/request.java b/src/main/java/com/example/cosmos_serversb/entities/request.java deleted file mode 100644 index f1d9b62..0000000 --- a/src/main/java/com/example/cosmos_serversb/entities/request.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.cosmos_serversb.entities; - -public class request { -} 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 6d835c0..9319efc 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -1,7 +1,6 @@ package com.example.cosmos_serversb.models; -import java.lang.reflect.Array; import java.util.*; import javax.inject.Singleton; import com.example.cosmos_serversb.entities.*; @@ -30,7 +29,7 @@ } - public HashMap groupsListByUid(String uId, String token){ + public HashMap getGroupsListByUid(String uId, String token){ return null; } @@ -38,7 +37,7 @@ return null; } - public Group getGroupByGId(String gId, String token){ + public Group getGroupByGid(String gId, String token){ return null; } @@ -48,4 +47,15 @@ + /*リクエスト*/ + public HashMap getRequestsListByGid(String gId, String token){ + return null; + } + + //リクエストの発行 + + + + + }