This is an automated email from the ASF dual-hosted git repository.
ztang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new dc3e5a7 [Submarine 203] [SERVER] Submarine project manager
TeamRestApi bug fix
dc3e5a7 is described below
commit dc3e5a7fc4ecddfb9e31777e86c37c0acf0754e4
Author: LinhaoZhu <[email protected]>
AuthorDate: Sun Sep 29 16:18:23 2019 +0800
[Submarine 203] [SERVER] Submarine project manager TeamRestApi bug fix
### What is this PR for?
1. Fix TeamRestApi bug (accidentally write ownName dead)
2. Optimize TeamMapper.xml/TeamMemberMapper.xml data set of insert and
update duration
3. Optimize the unreasonable points in the Team test cases (some scenarios
are not covered)
### What type of PR is it?
[Bug Fix ]
### Todos
* [ ] - Task
### What is the Jira issue?
* [SUBMARINE-203](https://issues.apache.org/jira/browse/SUBMARINE-203)
### How should this be tested?
* [CI
Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/591041416)
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: LinhaoZhu <[email protected]>
Author: Linhao Zhu <[email protected]>
Closes #21 from LinhaoZhu/SUBMARINE-203 and squashes the following commits:
d171ad9 [LinhaoZhu] [SUBMARINE-203] [SERVER] NewlineAtEndOfFile: File does
not end with a newline.
eb68d77 [LinhaoZhu] [SUBMARINE-203] [SERVER] Set the value of updateBy when
adding data
dc0811c [LinhaoZhu] [SUBMARINE-203] [SERVER] Add TeamMemberService test,
Change naming convention issues, fix TeamMemberMapper.xml bug.
fdd04d9 [LinhaoZhu] [SUBMARINE-203] [SERVER] Submarine project manager
TeamRestApi bug fix and Code specification optimization
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
---
.../submarine/database/mappers/TeamMapper.java | 1 -
.../database/mappers/TeamMemberMapper.java | 1 -
.../database/service/TeamMemberService.java | 15 +++---
.../submarine/database/service/TeamService.java | 6 +--
.../org/apache/submarine/rest/TeamRestApi.java | 10 ++--
.../database/mappers/ProjectFilesMapper.xml | 10 +++-
.../submarine/database/mappers/ProjectMapper.xml | 10 +++-
.../submarine/database/mappers/TeamMapper.xml | 12 ++---
.../database/mappers/TeamMemberMapper.xml | 33 +++++-------
.../database/service/ProjectServiceTest.java | 2 +-
.../database/service/TeamMemberServiceTest.java | 63 ++++++++++++++++++++++
.../database/service/TeamServiceTest.java | 51 +++++++++---------
12 files changed, 138 insertions(+), 76 deletions(-)
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
index 089c7c8..8da6551 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMapper.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
public interface TeamMapper {
-
List<Team> selectAll(Map<String, Object> where, RowBounds rowBounds);
int deleteByPrimaryKey(String id);
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
index 50d2e0f..0c60b11 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/mappers/TeamMemberMapper.java
@@ -19,7 +19,6 @@ import java.util.List;
import java.util.Map;
public interface TeamMemberMapper {
-
List<TeamMember> selectAll(Map<String, Object> where);
int deleteByPrimaryKey(String id);
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
index c9939dd..098eb41 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
@@ -27,8 +27,8 @@ import java.util.Map;
public class TeamMemberService {
private static final Logger LOG =
LoggerFactory.getLogger(TeamMemberService.class);
- public List<TeamMember> queryList(String teamName) throws Exception {
- LOG.info("queryList teamName:{}", teamName);
+ public List<TeamMember> queryList(String teamId) throws Exception {
+ LOG.info("queryList teamId:{}", teamId);
List<TeamMember> list = null;
SqlSession sqlSession = null;
@@ -36,7 +36,7 @@ public class TeamMemberService {
sqlSession = MyBatisUtil.getSqlSession();
TeamMemberMapper teamMemberMapper =
sqlSession.getMapper(TeamMemberMapper.class);
Map<String, Object> where = new HashMap<>();
- where.put("teamName", teamName);
+ where.put("teamId", teamId);
list = teamMemberMapper.selectAll(where);
} catch (Exception e) {
LOG.error(e.getMessage(), e);
@@ -47,14 +47,15 @@ public class TeamMemberService {
return list;
}
- public void add(TeamMember teamMember) throws Exception {
- LOG.info("add({})", teamMember.toString());
+ public boolean insertSelective(TeamMember teamMember) throws Exception {
+ LOG.info("insertSelective({})", teamMember.toString());
SqlSession sqlSession = null;
try {
sqlSession = MyBatisUtil.getSqlSession();
TeamMemberMapper teamMemberMapper =
sqlSession.getMapper(TeamMemberMapper.class);
- teamMemberMapper.insert(teamMember);
+ teamMemberMapper.insertSelective(teamMember);
+
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
@@ -62,6 +63,7 @@ public class TeamMemberService {
} finally {
sqlSession.close();
}
+ return true;
}
public void deleteByPrimaryKey(String id) throws Exception {
@@ -80,5 +82,4 @@ public class TeamMemberService {
sqlSession.close();
}
}
-
}
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
index 9ad9c8a..7f3d079 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
@@ -36,7 +36,7 @@ public class TeamService {
String order,
int pageNo,
int pageSize) throws Exception {
- LOG.info("queryDictList owner:{}, column:{}, order:{}, pageNo:{},
pageSize:{}",
+ LOG.info("queryPageList owner:{}, column:{}, order:{}, pageNo:{},
pageSize:{}",
owner, column, order, pageNo, pageSize);
List<Team> list = null;
@@ -82,7 +82,7 @@ public class TeamService {
// add teamMember, when add team, should insert 'Collaborators' to
team_member
List<TeamMember> list = team.getCollaborators();
for (TeamMember teamMember : list) {
- // todo: teamMember's member is sys_user's id now.
+ // TODO(zhulinhao): teamMember's member is sys_user's id now.
teamMember.setTeamId(team.getId());
teamMemberMapper.insert(teamMember);
}
@@ -131,7 +131,7 @@ public class TeamService {
for (TeamMember curr : curr_teamMembers) {
if (!old_teamMembers_member.contains(curr.getMember())) {
- // todo：teamId Send it by the front desk, here there is no assignment
+ // TODO(zhulinhao)：teamId Send it by the front desk, here there is
no assignment
curr.setTeamId(team.getId());
curr.setTeamName(team.getTeamName());
teamMemberMapper.insert(curr);
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
index ec269ab..2aaa619 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/rest/TeamRestApi.java
@@ -16,7 +16,6 @@ package org.apache.submarine.rest;
import com.github.pagehelper.PageInfo;
import org.apache.submarine.annotation.SubmarineApi;
import org.apache.submarine.database.entity.Team;
-import org.apache.submarine.database.service.SysMessageService;
import org.apache.submarine.database.service.TeamService;
import org.apache.submarine.server.JsonResponse;
import org.apache.submarine.server.JsonResponse.ListResult;
@@ -25,12 +24,12 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
-import javax.ws.rs.GET;
import javax.ws.rs.Produces;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.PUT;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
import java.util.ArrayList;
@@ -43,7 +42,6 @@ public class TeamRestApi {
private static final Logger LOG = LoggerFactory.getLogger(TeamRestApi.class);
private TeamService teamService = new TeamService();
- private SysMessageService sysMessageService = new SysMessageService();
@Inject
public TeamRestApi() {
@@ -63,7 +61,7 @@ public class TeamRestApi {
try {
// TODO(zhulinhao): Front need to correct 'owner' value, and Whether
need the
// front to create_by value（At the time of pr commited）
- teams = teamService.queryPageList("liuxun", column, order, pageNo,
pageSize);
+ teams = teamService.queryPageList(owner, column, order, pageNo,
pageSize);
} catch (Exception e) {
LOG.error(e.getMessage(), e);
return new
JsonResponse.Builder<>(Response.Status.OK).success(false).build();
diff --git
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
index f37c24d..5427091 100644
---
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
+++
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectFilesMapper.xml
@@ -67,9 +67,9 @@
SELECT REPLACE(UUID(),"-","")
</selectKey>
insert into project_files (id, project_id, file_name,
- create_by, create_time, update_time, file_content)
+ create_by, create_time, update_by, update_time, file_content)
values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR},
- #{createBy,jdbcType=VARCHAR}, now(), now(),
#{fileContent,jdbcType=LONGVARCHAR})
+ #{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR},
now(), #{fileContent,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective"
parameterType="org.apache.submarine.database.entity.ProjectFiles">
@@ -87,6 +87,9 @@
<if test="createBy != null">
create_by,
</if>
+ <if test="updateBy != null">
+ update_by,
+ </if>
create_time, update_time,
<if test="fileContent != null">
file_content,
@@ -105,6 +108,9 @@
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
+ <if test="updateBy != null">
+ #{updateBy,jdbcType=VARCHAR},
+ </if>
now(), now(),
<if test="fileContent != null">
#{fileContent,jdbcType=LONGVARCHAR},
diff --git
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
index 7d440e3..5bf5987 100644
---
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
+++
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/ProjectMapper.xml
@@ -62,10 +62,10 @@
</selectKey>
insert into project (id, project_name, visibility,
type, description, user_name,
- create_by, create_time, update_time)
+ create_by, create_time, update_by, update_time)
values (#{id,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR},
#{visibility,jdbcType=INTEGER},
#{type,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR},
#{userName,jdbcType=VARCHAR},
- #{createBy,jdbcType=VARCHAR}, now(), now())
+ #{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR}, now())
</insert>
<insert id="insertSelective"
parameterType="org.apache.submarine.database.entity.Project">
@@ -95,6 +95,9 @@
<if test="createTime != null">
create_time,
</if>
+ <if test="updateBy != null">
+ update_by,
+ </if>
<if test="updateTime != null">
update_time,
</if>
@@ -124,6 +127,9 @@
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
+ <if test="updateBy != null">
+ #{updateBy,jdbcType=VARCHAR},
+ </if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
diff --git
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
index 7f6dc53..6a372a4 100644
---
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
+++
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMapper.xml
@@ -59,9 +59,9 @@
<selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
SELECT REPLACE(UUID(),"-","")
</selectKey>
- insert into team (id, owner, team_name, create_by, create_time,
update_time)
+ insert into team (id, owner, team_name, create_by, create_time, update_by,
update_time)
values (#{id,jdbcType=VARCHAR}, #{owner,jdbcType=VARCHAR},
#{teamName,jdbcType=VARCHAR},
- #{createBy,jdbcType=VARCHAR}, now(), now())
+ #{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR}, now())
</insert>
<insert id="insertSelective"
parameterType="org.apache.submarine.database.entity.Team">
@@ -126,9 +126,7 @@
<if test="updateBy != null">
update_by = #{updateBy,jdbcType=VARCHAR},
</if>
- <if test="updateTime != null">
- update_time = now()
- </if>
+ update_time = now()
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
@@ -137,10 +135,8 @@
update team
set owner = #{owner,jdbcType=VARCHAR},
team_name = #{teamName,jdbcType=VARCHAR},
- create_by = #{createBy,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
index e9ae7c9..6b178ef 100644
---
a/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
+++
b/submarine-workbench/workbench-server/src/main/resources/org/apache/submarine/database/mappers/TeamMemberMapper.xml
@@ -71,17 +71,18 @@
SELECT REPLACE(UUID(),"-","")
</selectKey>
insert into team_member (id, team_id, team_name, member,
- inviter, create_by, create_time, update_time)
+ inviter, create_by, create_time, update_by, update_time)
values (#{id,jdbcType=VARCHAR}, #{teamId,jdbcType=VARCHAR},
#{teamName,jdbcType=VARCHAR}, #{member,jdbcType=VARCHAR},
- #{inviter,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, now(), now())
+ #{inviter,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, now(),
#{updateBy,jdbcType=VARCHAR}, now())
</insert>
<insert id="insertSelective"
parameterType="org.apache.submarine.database.entity.TeamMember">
+ <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+ SELECT REPLACE(UUID(),"-","")
+ </selectKey>
insert into team_member
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
+ id,
<if test="teamId != null">
team_id,
</if>
@@ -97,20 +98,14 @@
<if test="createBy != null">
create_by,
</if>
- <if test="createTime != null">
- create_time,
- </if>
+ create_time,
<if test="updateBy != null">
update_by,
</if>
- <if test="updateTime != null">
- update_time,
- </if>
+ update_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=VARCHAR},
- </if>
+ #{id,jdbcType=VARCHAR},
<if test="teamId != null">
#{teamId,jdbcType=VARCHAR},
</if>
@@ -126,15 +121,11 @@
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
+ now(),
<if test="updateBy != null">
#{updateBy,jdbcType=VARCHAR},
</if>
- <if test="updateTime != null">
- #{updateTime,jdbcType=TIMESTAMP},
- </if>
+ now(),
</trim>
</insert>
@@ -184,4 +175,4 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=VARCHAR}
</update>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git
a/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
index 9b03862..b56085d 100644
---
a/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
+++
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/ProjectServiceTest.java
@@ -27,7 +27,7 @@ import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.assertTrue;
public class ProjectServiceTest {
- private static final Logger LOG =
LoggerFactory.getLogger(TeamServiceTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ProjectServiceTest.class);
ProjectService projectService = new ProjectService();
@After
diff --git
a/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamMemberServiceTest.java
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamMemberServiceTest.java
new file mode 100644
index 0000000..85d02f2
--- /dev/null
+++
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamMemberServiceTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. See accompanying LICENSE file.
+ */
+package org.apache.submarine.database.service;
+
+import org.apache.submarine.database.entity.TeamMember;
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TeamMemberServiceTest {
+ private static final Logger LOG =
LoggerFactory.getLogger(TeamMemberServiceTest.class);
+ TeamMemberService teamMemberService = new TeamMemberService();
+
+ @After
+ public void removeAllRecord() throws Exception {
+ List<TeamMember> teamMemberList = teamMemberService.queryList("teamId");
+ assertTrue(teamMemberList.size() > 0);
+ for (TeamMember member : teamMemberList) {
+ teamMemberService.deleteByPrimaryKey(member.getId());
+ }
+ }
+
+ @Test
+ public void insertSelective() throws Exception {
+ TeamMember teamMember = new TeamMember();
+ teamMember.setTeamId("teamId");
+ teamMember.setTeamName("teamName");
+ teamMember.setCreateBy("createBy");
+ teamMember.setMember("member");
+ teamMember.setInviter(1);
+ Boolean ret = teamMemberService.insertSelective(teamMember);
+ assertTrue(ret);
+
+ List<TeamMember> teamMemberList = teamMemberService.queryList("teamId");
+ assertEquals(teamMemberList.size(), 1);
+ for (TeamMember member : teamMemberList) {
+ assertEquals(member.getTeamName(), teamMember.getTeamName());
+ assertEquals(member.getTeamId(), teamMember.getTeamId());
+ assertEquals(member.getCreateBy(), teamMember.getCreateBy());
+ assertEquals(member.getMember(), teamMember.getMember());
+ assertEquals(member.getInviter(), teamMember.getInviter());
+
+ LOG.info("member.createTime:{}, member.updateTime:{}",
member.getCreateTime(), member.getUpdateTime());
+ }
+ }
+}
diff --git
a/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
index 56ad735..1a8addc 100644
---
a/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
+++
b/submarine-workbench/workbench-server/src/test/java/org/apache/submarine/database/service/TeamServiceTest.java
@@ -60,18 +60,18 @@ public class TeamServiceTest {
List<Team> teamList = teamService.queryPageList("test_sub", "create_time",
"desc", 0, 100);
assertEquals(teamList.size(), 1);
- Team team_db = teamList.get(0);
- assertEquals(team.getTeamName(), team_db.getTeamName());
- assertEquals(team.getOwner(), team_db.getOwner());
- assertEquals(team.getCreateBy(), team_db.getCreateBy());
-
- assertEquals(team_db.getCollaborators().size(), 1);
- TeamMember teamMember_db = team_db.getCollaborators().get(0);
- assertEquals(team.getId(), teamMember_db.getTeamId());
- assertEquals(teamMember.getTeamName(), teamMember_db.getTeamName());
- assertEquals(teamMember.getInviter(), teamMember_db.getInviter());
- assertEquals(teamMember.getMember(), teamMember_db.getMember());
- assertEquals(teamMember.getCreateBy(), teamMember_db.getCreateBy());
+ Team teamDb = teamList.get(0);
+ assertEquals(team.getTeamName(), teamDb.getTeamName());
+ assertEquals(team.getOwner(), teamDb.getOwner());
+ assertEquals(team.getCreateBy(), teamDb.getCreateBy());
+
+ assertEquals(teamDb.getCollaborators().size(), 1);
+ TeamMember teamMemberDb = teamDb.getCollaborators().get(0);
+ assertEquals(team.getId(), teamMemberDb.getTeamId());
+ assertEquals(teamMember.getTeamName(), teamMemberDb.getTeamName());
+ assertEquals(teamMember.getInviter(), teamMemberDb.getInviter());
+ assertEquals(teamMember.getMember(), teamMemberDb.getMember());
+ assertEquals(teamMember.getCreateBy(), teamMemberDb.getCreateBy());
}
@Test
@@ -93,26 +93,28 @@ public class TeamServiceTest {
assertTrue(ret);
team.setTeamName("submarine_update");
- TeamMember teamMember_update = new TeamMember();
- teamMember_update.setTeamName("submarine");
- teamMember_update.setInviter(0);
- teamMember_update.setMember("test_member");
- teamMember_update.setCreateBy("createByteamMember2");
- list.add(teamMember_update);
+ team.setUpdateBy("submarine_user_update");
+ TeamMember teamMemberUpdate = new TeamMember();
+ teamMemberUpdate.setTeamName("submarine");
+ teamMemberUpdate.setInviter(0);
+ teamMemberUpdate.setMember("test_member");
+ teamMemberUpdate.setCreateBy("createByteamMember2");
+ list.add(teamMemberUpdate);
boolean editRet = teamService.updateByPrimaryKeySelective(team);
assertTrue(editRet);
List<Team> teamList = teamService.queryPageList("test_sub", "create_time",
"desc", 0, 100);
assertEquals(teamList.size(), 1);
- Team team_db = teamList.get(0);
- assertEquals(team.getTeamName(), team_db.getTeamName());
- List<TeamMember> teamMemberList = team_db.getCollaborators();
+ Team teamDb = teamList.get(0);
+ assertEquals(team.getTeamName(), teamDb.getTeamName());
+ List<TeamMember> teamMemberList = teamDb.getCollaborators();
assertEquals(teamMemberList.size(), 2);
for (TeamMember member : teamMemberList) {
assertEquals(member.getTeamName(), team.getTeamName());
+ assertEquals(team.getUpdateBy(), teamDb.getUpdateBy());
}
-
+ LOG.info("team.UpdateTime:{}", teamDb.getUpdateTime());
}
@Test
@@ -136,11 +138,12 @@ public class TeamServiceTest {
Boolean deleteRet = teamService.delete(team.getId());
assertTrue(deleteRet);
- List<Team> teamList = teamService.queryPageList("test_sub", "create_time",
"desc", 0, 100);
+ List<Team> teamList = teamService.queryPageList("test_sub",
+ "create_time", "desc", 0, 100);
assertEquals(teamList.size(), 0);
TeamMemberService teamMemberService = new TeamMemberService();
- List<TeamMember> teamMemberList =
teamMemberService.queryList(team.getTeamName());
+ List<TeamMember> teamMemberList =
teamMemberService.queryList(team.getId());
assertEquals(teamMemberList.size(), 0);
}
}
