From def9663827a1fae620c9e12f628ec8cd68921b92 Mon Sep 17 00:00:00 2001 From: Minwoo Jung Date: Fri, 14 Aug 2015 08:22:23 +0900 Subject: [PATCH] [#762] add logic to add user information --- .../com/navercorp/pinpoint/web/vo/User.java | 11 +++++++ .../pinpoint/web/vo/UserGroupMember.java | 29 ++++++++++++------- .../main/resources/mapper/UserGroupMapper.xml | 7 +++-- .../controller/UserGroupControllerTest.java | 22 ++++++++++++-- 4 files changed, 52 insertions(+), 17 deletions(-) diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/User.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/User.java index 2a68e8390862..b8661001d6ad 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/User.java +++ b/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; } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/UserGroupMember.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/UserGroupMember.java index 9df05b490993..fd5935af252e 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/UserGroupMember.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/UserGroupMember.java @@ -2,24 +2,16 @@ 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 void setMemberId(String memberId) { 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; + } } diff --git a/web/src/main/resources/mapper/UserGroupMapper.xml b/web/src/main/resources/mapper/UserGroupMapper.xml index 1c113729d38d..140efc88be10 100644 --- a/web/src/main/resources/mapper/UserGroupMapper.xml +++ b/web/src/main/resources/mapper/UserGroupMapper.xml @@ -38,9 +38,10 @@ diff --git a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java index 7ebc632f1fe8..2d22491364f8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java @@ -27,6 +27,7 @@ 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.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 void insertAndSelectDeleteMember() throws Exception { .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())