diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d8d8714..a20886e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,12 +6,12 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4ff842e..bc8d0a3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,14 +1,7 @@ - - - - - - - - + + \ No newline at end of file diff --git a/.idea/sbt.xml b/.idea/sbt.xml deleted file mode 100644 index 2018743..0000000 --- a/.idea/sbt.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file 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 47ac114..6ad2e98 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -3,7 +3,7 @@ import com.example.cosmos_serversb.models.SessionManager; import com.example.cosmos_serversb.models.Users; -import com.sun.corba.se.impl.orbutil.graph.Graph; +//import com.sun.corba.se.impl.orbutil.graph.Graph; import org.hibernate.Session; import java.util.ArrayList; 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 4da04c6..af44d36 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -1,9 +1,12 @@ //このクラスは仮です package com.example.cosmos_serversb.entities; +import java.util.Date; + public class Request { private String rId; - private String uri, date, IssuerUid, product, deadline; + private String uri, IssuerUid, product; + private Date date, deadline; private int location;// YahooローカルサーチAPIの業種コード private boolean done = false; @@ -11,7 +14,7 @@ } - public Request(String rId, String uri, String date, String IssuerUid, String product, String deadline, int location){ + public Request(String rId, String uri, Date date, String IssuerUid, String product, Date deadline, int location){ setrId(rId); setUri(uri); setDate(date); @@ -30,7 +33,6 @@ return rId; } - private void setUri(String uri){ this.uri = uri; } @@ -39,11 +41,11 @@ return uri; } - private void setDate(String date){ + private void setDate(Date date){ this.date = date; } - public String getDate() { + public Date getDate() { return date; } @@ -63,11 +65,11 @@ this.product = product; } - public String getDeadline() { + public Date getDeadline() { return deadline; } - public void setDeadline(String deadline) { + public void setDeadline(Date deadline) { this.deadline = deadline; } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java index 3d53ca4..b807883 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java @@ -63,7 +63,7 @@ this.members = members; } - public ArrayList getRequest() { + public ArrayList getRequests() { return requests; } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UsersMapJson.java b/src/main/java/com/example/cosmos_serversb/jsons/UsersMapJson.java new file mode 100644 index 0000000..c44487a --- /dev/null +++ b/src/main/java/com/example/cosmos_serversb/jsons/UsersMapJson.java @@ -0,0 +1,29 @@ +package com.example.cosmos_serversb.jsons; + +import com.example.cosmos_serversb.entities.Group; +import com.example.cosmos_serversb.entities.User; + +import java.util.ArrayList; +import java.util.Set; + +public class UsersMapJson { + private ArrayList users = new ArrayList<>(); + + public UsersMapJson(Group group) { + changeUsersMap(group.getMembers()); + } + + public ArrayList getUsers() { + return users; + } + + public void setUsers(ArrayList users) { + this.users = users; + } + + private void changeUsersMap(Set set) { + for (User user : (Set) set) { + users.add(new UidUriJson(user)); + } + } +} 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 db5cd0b..506c6b2 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -2,6 +2,7 @@ import java.util.*; import javax.inject.Singleton; +import java.util.Date; import com.example.cosmos_serversb.entities.*; import com.example.cosmos_serversb.jsons.*; @@ -83,14 +84,15 @@ return null; } - public static HashMap addMember(String gId, String uId){ + public static UsersMapJson addMember(String gId, String uId){ Session session = SessionManager.getInstance().getSession(); Group editGroup = session.load(Group.class, gId); if(editGroup != null) { editGroup.addMember(uId); session.update(editGroup); } - return null;//HashMapへの変更が必要 + UsersMapJson usersMapJson = new UsersMapJson(editGroup); + return usersMapJson; } public static HashMap deleteMember(String gId, String uId){ @@ -105,8 +107,8 @@ //テスト用 String rId = getInstance().createRId(); String uri = baseURI + AppName + "/groups/" + gId + "/requests/" + rId; - Request testRequest = new Request(rId, uri, "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + Request testRequest = new Request(rId, uri, new Date(1999,01,01), + uId, product, new Date(1999,12,01), 999); return testRequest; } @@ -117,8 +119,8 @@ public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){ //テスト用 - Request testRequest = new Request(rId, "http://test.com", "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + Request testRequest = new Request(rId, "http://test.com", new Date(1999,01,01), + uId, product, new Date(1999,12,01), 999); return testRequest; } diff --git a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java index 50e4f9f..92e07a7 100644 --- a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java +++ b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java @@ -29,7 +29,7 @@ import java.util.Set; import com.example.cosmos_serversb.resources.UsersRest; -import com.sun.org.apache.xerces.internal.util.SynchronizedSymbolTable; +//import com.sun.org.apache.xerces.internal.util.SynchronizedSymbolTable; import hibernateTest.entities.Event; import hibernateTest.entities.Group; import hibernateTest.entities.Request;