細かな修正

Browse code 細かな修正 COSMOS-462 COSMOS-469 COSMOS-478 CreateShopsRest CreateUsersHibernate RequesetUser chengeLogsProperty fixGetRequests getRequestsListByGid master ...yolp
commit 04c6f7a717f38ce60593e71938f350ff0432d110 2 parents 960ad2c + 2206ee9 t-kume authored on 2 Jul 2019

 //このクラスは仮です
 package com.example.cosmos_serversb.entities;
+import com.example.cosmos_serversb.models.Users;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Set;
 public class Group {
     private String gId;
     private String uri, name;
+    private ArrayList<User> members;
+    private Set<User> members = new HashSet<>();//HashSetでいいのかな？
     //private ArrayList<Request> requests;
     private Set<Request> requests;
     public Group(){
     public void addRequests(Request request){
         requests.add(request);
     }
+/*
+    /*
     public ArrayList<Request> getRequestsList(){
         ArrayList<Request> list = new ArrayList<Request>(getRequests());
         return list;
     }
+   */
+ */
+    public void setMembers(Set<User> members) {
+        this.members = members;
+    }
+    public Set<User> getMembers() {
+        return members;
+    }
+    /*メンバー*/
+    //public ArrayList<User> getMembersList(){
+    //    return null;
+    //}
+    //public void addMemberByUid(String uId){
+    //
+    //    members.add(user);
+    //}
+    //public DeleteResult deleteMember(String uid){
+    //    members.remove(members.indexOf(uid));
+    //    return null;
+    //}
+    /*リクエスト*/
+    public void addMember(String uId){
+        //User user = new User(uId, uId, "http:test", "sa", "hogehoge");
+        User user = Users.getInstance().getUserById(uId);
+        members.add(user);
+        user.addGroups(this);
+    }
 }

 package com.example.cosmos_serversb.entities;
+import java.util.HashSet;
+import java.util.Set;
 public class User {
     public String uId, uri, name, iconUri;
     public boolean login = true;
+    public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
     public User() {
     }
     public User(String name, String uId, String uri, String iconUri) {
         setuId(uId);
         setUri(uri);
     public void setLogin(boolean login) {
         this.login = login;
     }
+    public Set<Group> getGroups() {
+        return groups;
+    }
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
+    }
+    public void addGroups(Group group){
+        //テスト用
+        //Group group = Groups.getInstance().getGroupByGid(gId);
+        groups.add(group);
+    }
 }

         String rId = UUID.randomUUID().toString();
         return rId;
     }
+    //getGroupsListByUidは現状うまく処理されない
     public static HashMap<String, String> getGroupsListByUid(String uId){
         return getTestHashMap();
     }
     }
     //テスト用にHashMapの作成
     public static void createTestHashMap(String gId, String uri){
-        HashMap<String, String> testMap = new HashMap<>();
         testMap.put(gId, uri);
         /*
         //Key, valueの取り出し方例(拡張for文)
         for (String key : TestMap.keySet()) {