Merge pull request #840 from minwoo-jung/issue-762

[#762] add logic to add user information

web/src/main/java/com/navercorp/pinpoint/web/vo/User.java

@@ -7,6 +7,17 @@ public class User {
     private String phoneNumber;
     private String email;
     
+    public User() {
+    }
+    
+    public User(String userId, String name, String department, String phoneNumber, String email) {
+        this.userId = userId;
+        this.name = name;
+        this.department = department;
+        this.phoneNumber = phoneNumber;
+        this.email = email;
+    }
+
     public String getUserId() {
         return userId;
     }

web/src/main/java/com/navercorp/pinpoint/web/vo/UserGroupMember.java

@@ -2,24 +2,16 @@ package com.navercorp.pinpoint.web.vo;
 
 public class UserGroupMember {
     
-    private String number;
     private String userGroupId;
     private String memberId;
+    private String name;
+    private String department;
     
     public UserGroupMember() {
     }
 
-    public String getNumber() {
-        return number;
-    }
-    
-    public void setNumber(String number) {
-        this.number = number;
-    }
-    
-    public UserGroupMember(String number, String userGroupId, String memberId) {
+    public UserGroupMember(String userGroupId, String memberId) {
         this.userGroupId = userGroupId;
-        this.memberId  = memberId;
     }
     
     public String getUserGroupId() {
@@ -38,4 +30,19 @@ public class UserGroupMember {
         this.memberId = memberId;
     }
 
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public String getDepartment() {
+        return department;
+    }
+    
+    public void setDepartment(String department) {
+        this.department = department;
+    }
 }

web/src/main/resources/mapper/UserGroupMapper.xml

@@ -38,9 +38,10 @@
     </delete>
     
     <select id="selectMemberList" resultType="UserGroupMember">
-        SELECT *
-        FROM user_group_member
-        WHERE user_group_id = #{userGroupId}
+        SELECT a.user_group_id, a.member_id, b.name, b.department 
+        FROM user_group_member a
+        INNER JOIN user b ON a.member_id = b.user_id
+        WHERE a.user_group_id =  #{userGroupId}
     </select>
     
     <update id="updateMember" parameterType="UserGroupMember">

web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java

@@ -27,6 +27,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -42,7 +43,9 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.navercorp.pinpoint.web.dao.UserDao;
 import com.navercorp.pinpoint.web.dao.UserGroupDao;
+import com.navercorp.pinpoint.web.vo.User;
 import com.navercorp.pinpoint.web.vo.UserGroup;
 import com.navercorp.pinpoint.web.vo.UserGroupMember;
 
@@ -68,15 +71,26 @@ public class UserGroupControllerTest {
     @Autowired
     private UserGroupDao userGroupDao;
     
+    @Autowired
+    private UserDao userDao;
+    
     private MockMvc mockMvc;
     
+    private User user = new User(TEST_USER_GROUP_MEMBER_ID, "userName", "pinpoint_team", "0101234", "pinpoint_team@navercorp.com");
     @Before
     public void setup() {
         this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
         userGroupDao.deleteUserGroup(new UserGroup("", TEST_USER_GROUP_ID));
         userGroupDao.deleteUserGroup(new UserGroup("", TEST_USER_GROUP_ID_UPDATED));
-        userGroupDao.deleteMember(new UserGroupMember("", TEST_USER_GROUP_ID, TEST_USER_GROUP_MEMBER_ID));
-        userGroupDao.deleteMember(new UserGroupMember("", TEST_USER_GROUP_ID, TEST_USER_GROUP_MEMBER_ID_UPDATE));
+        userGroupDao.deleteMember(new UserGroupMember(TEST_USER_GROUP_ID, TEST_USER_GROUP_MEMBER_ID));
+        userGroupDao.deleteMember(new UserGroupMember(TEST_USER_GROUP_ID, TEST_USER_GROUP_MEMBER_ID_UPDATE));
+        
+        userDao.insertUser(user);
+    }
+    
+    @After
+    public void after(){
+        userDao.deleteUser(user);
     }
 
     @Test
@@ -161,12 +175,14 @@ public class UserGroupControllerTest {
                             .andExpect(jsonPath("$.result").value("SUCCESS"))
                             .andReturn();
     
-            this.mockMvc.perform(get("/userGroup/member.pinpoint?userGroupId=" + TEST_USER_GROUP_ID))
+            MvcResult andReturn = this.mockMvc.perform(get("/userGroup/member.pinpoint?userGroupId=" + TEST_USER_GROUP_ID))
                             .andExpect(status().isOk())
                             .andExpect(content().contentType("application/json;charset=UTF-8"))
                             .andExpect(jsonPath("$[0]", hasKey("userGroupId")))
                             .andExpect(jsonPath("$[0]", hasKey("memberId")))
                             .andReturn();
+            System.out.println(andReturn.getResponse().getContentAsString());
+            
             
             this.mockMvc.perform(delete("/userGroup/member.pinpoint").contentType(MediaType.APPLICATION_JSON).content("{\"userGroupId\" : \"" + TEST_USER_GROUP_ID + "\", \"memberId\" : \"" + TEST_USER_GROUP_MEMBER_ID + "\"}"))
                             .andExpect(status().isOk())