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 50e19c2..c38b95a 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -5,7 +5,7 @@ public class Group { private String gId, uri, name; - //private ArrayList members; + private ArrayList members; private ArrayList requests; 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 0c7b42e..725970d 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -7,6 +7,7 @@ @Singleton + public class Groups { private static Groups thaInstance = null; private ArrayList accounts = new ArrayList<>(); @@ -31,7 +32,7 @@ return null; } - public Group getGroupByGid(String gId){ + public Group getGroupInfoByGid(String gId){ return null; } @@ -47,7 +48,7 @@ return null; } - public HashMap deleteMember(String gId){ + public HashMap deleteMember(String gId, String uId){ return null; } @@ -56,7 +57,7 @@ } public Request addRequests(String gId, String uId, String product, - String deadline, int location){ + String deadline, int location){ return null; } @@ -65,7 +66,7 @@ } public Request updateRequest(String gId, String rId, String uId, String product, - String deadline, int location, boolean done){ + String deadline, int location, boolean done){ return null; }