diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7e13a7a..5d9e04b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java
index 4cdd0e1..b1dc701 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -18,5 +18,4 @@
this.iconImage=iconImage;
this.iconUri=iconUri;
}
-
}
diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index 3a06992..4450341 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -1,41 +1,75 @@
package com.example.cosmos_serversb.models;
+import java.util.UUID;
+import javax.inject.Singleton;
+
import com.example.cosmos_serversb.entities.*;
+@Singleton
public class Users {
- //User testUser = new User("test", "123456789", "http://test.com", "testpw", "123456789", "123456789", "http://iconuri/123456789.com");
+ private static Users theInstance = null;
- public User createUser(String name, String pw, String iconImage) {
+ private Users() {
+ }
+
+ public static Users getInstance() {
+ if (theInstance == null) {
+ theInstance = new Users();
+ }
+ return theInstance;
+ }
+
+ public static User createUser(String name, String pw, String iconImage) {
User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
- testUser.token.add("123456789");
- testUser.token.add("987654321");
+ testUser.token.add(getInstance().createToken(testUser.uId));
+ testUser.token.add(getInstance().createToken(testUser.uId));
return testUser;
}
- public final static User getUserById(String uId) {
+ public static String createToken(String uId) {
+ //Tokenを作成しuIdと関連付けしDBに保存し作成したTokenを返す
+ String token = UUID.randomUUID().toString();
+ return token;
+ }
+
+ public static User setUser(String uId, String name, String pw, String iconImage) {
User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
- testUser.token.add("123456789");
- testUser.token.add("987654321");
+ testUser.token.add(getInstance().createToken(testUser.uId));
+ testUser.token.add(getInstance().createToken(testUser.uId));
return testUser;
}
- public User getUserByToken(String token) {
+ public static User getUserById(String uId) {
User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
- testUser.token.add("123456789");
- testUser.token.add("987654321");
+ testUser.token.add(getInstance().createToken(testUser.uId));
+ testUser.token.add(getInstance().createToken(testUser.uId));
return testUser;
}
- public DeleteResult deleteUser(String uId) {
+ public static User getUserByToken(String token) {
+ User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+ testUser.token.add(getInstance().createToken(testUser.uId));
+ testUser.token.add(getInstance().createToken(testUser.uId));
+ return testUser;
+ }
+
+ public static DeleteResult deleteUser(String uId) {
return DeleteResult.SUCCESS;
}
- public String login(String uId) {
-
- return "123456789";//testToken
+ public static String login(String uId) {
+ return getInstance().createToken(uId);//testToken
}
- public DeleteResult logout(String token) {
+ public static DeleteResult logout(String token) {
return DeleteResult.SUCCESS;
}
+
+ public static boolean checkToken(String uId, String token) {
+ return true;
+ }
+
+ public static boolean checkPassword(String uId, String pw) {
+ return true;
+ }
}
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 5fa76ed..56e936d 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
@@ -1,17 +1,107 @@
package com.example.cosmos_serversb.resources;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Component;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import javax.ws.rs.*;
@Component
-@Path("/groups")
-public class GroupsRest {
+public class GroupsRest {
+ @Path("/groups")
@GET
- public String index() {
- return "{1:Tiger}";
+ public String getGroupsListByUid(@QueryParam("uId") String uId, @QueryParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
}
+ @Path("/groups")
+ @POST
+ public String createGroup(@FormParam("name") String name, @FormParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}")
+ @GET
+ public String getGroupInfoByGid(@PathParam("gId") String gId, @QueryParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}")
+ @DELETE
+ public String deleteGroup(@PathParam("gId") String gId, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}/members")
+ @GET
+ public String getGroupMembersListByGid(@PathParam("gId") String gId, @QueryParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}/members")
+ @POST
+ public String addMember(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}/members")
+ @DELETE
+ public String deleteMember(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}/requests")
+ @GET
+ public String getRequestsListByGid(@PathParam("gId") String gId, @QueryParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("/{gId}/requests")
+ @POST
+ public String addRequests(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") String deadline, @FormParam("location") int location, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("{gId}/requests/{rId}")
+ @GET
+ public String getRequestsDetailByGidAndRid(@PathParam("gId") String gId, @PathParam("rId") String rId, @QueryParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("{gId}/requests/{rId}")
+ @PUT
+ public String updateRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") String deadline, @FormParam("location") int location, @FormParam("done") boolean done, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
+
+ @Path("{gId}/requests/{rId}")
+ @DELETE
+ public String deleteRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @FormParam("token") String token) throws JsonProcessingException{
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(null);
+ return json;
+ }
}