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 8a39bf1..cdf8d01 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -7,7 +7,7 @@ @Singleton public class Groups { private static Groups thaInstance = null; - private ArrayList accounts = new ArrayList<>(); + private static ArrayList groups = new ArrayList<>(); private Groups(){ @@ -21,53 +21,76 @@ } - public HashMap getGroupsListByUid(String uId){ + public static HashMap getGroupsListByUid(String uId){ return null; } - public Group createGroup(String name, String uId){ + public static Group createGroup(String name, String uId){ + //先にGidとuriの発行を行う + Group testGroup = new Group("123456789", "http://test,com", name, uId); + groups.add(testGroup); + return testGroup; + } + + public static Group getGroupByGid(String gId){ + Group editGroup; + for (int i = 0; i < groups.size(); i++) { + editGroup = groups.get(i); + if (editGroup.getGid().equals(gId)) { + return editGroup; + } + } return null; } - public Group getGroupInfoByGid(String gId){ + public static DeleteResult deleteGroup(String gId){ + Group editGroup = Groups.getInstance().getGroupByGid(gId); + if(editGroup == null){ + return DeleteResult.FAILURE; + } + //以下に削除処理を行う。 + return DeleteResult.SUCCESS; + } + + public static HashMap getMembersListByGid(String gId){ return null; } - public DeleteResult deleteGroup(String gId){ + public static HashMap addMember(String gId, String uId){ return null; } - public HashMap getMembersListByGid(String gId){ + public static HashMap deleteMember(String gId, String uId){ return null; } - public HashMap addMember(String gId, String uId){ + public static HashMap getRequestsListByGid(String gId){ return null; } - public HashMap deleteMember(String gId, String uId){ - return null; - } - - public HashMap getRequestsListByGid(String gId){ - return null; - } - - public Request addRequests(String gId, String uId, String product, + public static Request addRequests(String gId, String uId, String product, String deadline, int location){ + //テスト用 + Request testRequest = new Request("123456789", "http://test,com", "1999/01/01/15:00:00", + uId, product, "1999/01/01/15:00:00", 999); + return testRequest; + } + + public static Request getRequestDetailByGidAndRid(String gId, String rId){ return null; } - public Request getRequestDetailByGidAndRid(String gId, String rId){ - return null; - } - - public Request updateRequest(String gId, String rId, String uId, String product, + public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){ - return null; + + //テスト用 + Request testRequest = new Request("123456789", "http://test,com", "1999/01/01/15:00:00", + uId, product, "1999/01/01/15:00:00", 999); + + return testRequest; } - public DeleteResult deleteRequest(String gId, String rId){ - return null; + public static DeleteResult deleteRequest(String gId, String rId){ + return DeleteResult.SUCCESS; } }