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 7b34aaa..c900ac4 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -70,13 +70,6 @@ requests.add(request); } - /* - public ArrayList getRequestsList(){ - ArrayList list = new ArrayList(getRequests()); - return list; - } - */ - public void setMembers(Set members) { this.members = members; } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/RequestJson.java b/src/main/java/com/example/cosmos_serversb/jsons/RequestJson.java index 26f8a65..17ac3c5 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/RequestJson.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/RequestJson.java @@ -8,9 +8,8 @@ public class RequestJson { private String rId; -// private String uri, IssuerUid, product; private String uri, product; - private User Issuer; + private UserJsonForRequests Issuer; private Date date, deadline; private int location;// YahooローカルサーチAPIの業種コード private boolean done = false; @@ -24,7 +23,6 @@ setUri(request.getrId()); setDate(request.getDate()); SetIssuerByUid(request.getIssuerUid()); - //setIssuer(IssuerUid); setProduct(request.getProduct()); setDeadline(request.getDeadline()); setLocation(request.getLocation()); @@ -55,24 +53,16 @@ return date; } -// private void setIssuerUid(String IssuerUid){ -// this.IssuerUid = IssuerUid; -// } -// -// public String getIssuerUid(){ -// return IssuerUid; -// } - - private User getIssuer(){ + public UserJsonForRequests getIssuer(){ return Issuer; } - private void setIssuer(User user){ + private void setIssuer(UserJsonForRequests user){ this.Issuer = user; } private void SetIssuerByUid(String uId){ - this.Issuer = Users.getInstance().getUserById(uId); + this.Issuer = new UserJsonForRequests(Users.getInstance().getUserById(uId)); } public String getProduct() { diff --git a/src/main/java/com/example/cosmos_serversb/jsons/RequestsJson.java b/src/main/java/com/example/cosmos_serversb/jsons/RequestsJson.java index 04ed055..44e2f21 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/RequestsJson.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/RequestsJson.java @@ -9,8 +9,8 @@ public class RequestsJson { public ArrayList requests = new ArrayList<>(); - public RequestsJson(Set set){ - changeRequests(set); + public RequestsJson(Set set, int quantity){ + changeRequests(set, quantity); } public ArrayList getRequests(){ @@ -21,9 +21,11 @@ this.requests = requests; } - public void changeRequests(Set set){ + private void changeRequests(Set set, int quantity){ + if(quantity <= 0) return; for( Request request : (Set) set ) { - requests.add(new RequestJson(request)); + requests.add(new RequestJson(request)); + if(requests.size() == quantity) break; } } } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java new file mode 100644 index 0000000..0c9fe54 --- /dev/null +++ b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java @@ -0,0 +1,74 @@ +package com.example.cosmos_serversb.jsons; + +import com.example.cosmos_serversb.entities.Group; +import com.example.cosmos_serversb.entities.User; + +import java.util.HashSet; +import java.util.Set; + +public class UserJsonForRequests { + public String uId, uri, name, iconUri; + public boolean login = true; + public String token; + + public UserJsonForRequests() { + + } + public UserJsonForRequests(User user) { + setuId(user.getuId()); + setUri(user.getUri()); + setName(user.getName()); + setIconUri(user.getIconUri()); + setToken(user.getToken()); + this.login = true; + } + + public String getuId() { + return uId; + } + + public void setuId(String uId) { + this.uId = uId; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIconUri() { + return iconUri; + } + + public void setIconUri(String iconUri) { + this.iconUri = iconUri; + } + + public boolean getLogin() { + return login; + } + + public void setLogin(boolean login) { + this.login = login; + } + + public void setToken(String token) { + this.token = token; + } + + public String getToken() { + return token; + } + +} 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 6e1da04..28f67bf 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -122,7 +122,7 @@ Session session = SessionManager.getInstance().getSession(); Group group = session.get(Group.class, gId); if(group != null) { - RequestsJson requestsJson = new RequestsJson(group.getRequests()); + RequestsJson requestsJson = new RequestsJson(group.getRequests(), quantity); return requestsJson; } //例外処理 diff --git a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java index c541c3e..bd30720 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java @@ -127,7 +127,7 @@ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Groups.getInstance().addRequests(gId, uId, product, deadline, location)); - SessionManager.getInstance().closeSession();//だめ + SessionManager.getInstance().closeSession(); return json; }