Merge branch 'feature-domain-implement' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-backend into feature-domain-implement

core/src/main/java/com/mooctest/crowd/domain/controller/CrowdTestProjectController.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 
 @RestController
-@RequestMapping("project")
+@RequestMapping("/api/project/")
 public class CrowdTestProjectController {
 
     @Autowired

core/src/main/java/com/mooctest/crowd/domain/model/CrowdTestProjectPO.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
@@ -13,7 +14,7 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "crowd_test_project")
-public class CrowdTestProjectPO {
+public class CrowdTestProjectPO implements Serializable {
 
     @Id
     @Column(name = "CTP_ID")

core/src/test/java/com/mooctest/crowd/domain/repository/UserRepoTest.java

@@ -1,8 +1,7 @@
 package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.dao.*;
-import com.mooctest.crowd.domain.domainobject.Role;
-import com.mooctest.crowd.domain.domainobject.User;
+import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.UserNotExistException;
 import com.mooctest.crowd.domain.model.*;
 import org.junit.Assert;
@@ -19,7 +18,6 @@ import java.util.List;
 import java.util.Optional;
 
 import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -37,6 +35,12 @@ public class UserRepoTest {
     private RoleToPermissionDao roleToPermissionDao;
     @Mock
     private PermissionDao permissionDao;
+    @Mock
+    private EvaluationAgencyDao evaluationAgencyDao;
+    @Mock
+    private RegionalManagerDao regionalManagerDao;
+    @Mock
+    private RegionalDao regionalDao;
 
     private UserPO expectUserPO;
     private RolePO expectRolePO;
@@ -44,7 +48,7 @@ public class UserRepoTest {
     private List<UserToRolePO> expectUserToRolePOList;
     private List<RoleToPermissionPO> expectRoleToPermissionPOList;
     private UserToRolePO expectUserToRolePO;
-    private RoleToPermissionPO expectRoleToPermissionPO;
+
     @Before
     public void before() {
         MockitoAnnotations.initMocks(this);
@@ -52,7 +56,7 @@ public class UserRepoTest {
         expectUserPO = new UserPO();
         expectRolePO = new RolePO();
         expectUserToRolePO = new UserToRolePO();
-        expectRoleToPermissionPO = new RoleToPermissionPO();
+        RoleToPermissionPO expectRoleToPermissionPO = new RoleToPermissionPO();
         expectPermission = new PermissionPO();
         expectUserToRolePOList = new LinkedList<>();
         expectRoleToPermissionPOList = new LinkedList<>();
@@ -63,11 +67,20 @@ public class UserRepoTest {
     @Test
     public void should_return_user_optional_when_get_by_id_success() {
         //arrange
+        EvaluationAgencyPO expectEvaluationAgency = new EvaluationAgencyPO();
+        List<RegionalManagerPO> expectRegionalManagerList = new LinkedList<>();
+        RegionalManagerPO regionalManagerPO = new RegionalManagerPO();
+        expectRegionalManagerList.add(regionalManagerPO);
+        RegionalPO expectRegional = new RegionalPO();
+
         when(userDao.findById(anyLong())).thenReturn(Optional.of(expectUserPO));
         when(userToRoleDao.findByUserId(anyLong())).thenReturn(expectUserToRolePOList);
         when(roleDao.findById(anyLong())).thenReturn(Optional.of(expectRolePO));
         when(roleToPermissionDao.findAllByRoleId(anyLong())).thenReturn(expectRoleToPermissionPOList);
         when(permissionDao.findById(anyLong())).thenReturn(Optional.of(expectPermission));
+        when(evaluationAgencyDao.findByUserId(anyLong())).thenReturn(expectEvaluationAgency);
+        when(regionalManagerDao.findByUserId(anyLong())).thenReturn(expectRegionalManagerList);
+        when(regionalDao.findById(anyLong())).thenReturn(Optional.of(expectRegional));
         //action
         User user = userRepo.getByID(0L);
         //assert
@@ -107,7 +120,7 @@ public class UserRepoTest {
     }
 
     @Test
-    public void should_return_user_when_save_user_and_role(){
+    public void should_return_user_when_save_user_and_role() {
         //arrange
         Role expectRole = new Role();
         List<Role> roleList = new LinkedList<>();
@@ -124,17 +137,29 @@ public class UserRepoTest {
     }
 
     @Test
-    public void should_return_user_when_save_user(){
+    public void should_return_user_when_save_user() {
         //arrange
+        List<Permission> permissionList = new LinkedList<>();
+        Permission permission = new Permission();
+        permissionList.add(permission);
+        List<Role> roleList = new LinkedList<>();
+        Role role = new Role();
+        role.setPermissionList(permissionList);
+        roleList.add(role);
+        EvaluationAgency evaluationAgency = new EvaluationAgency();
         User user = new User();
+        user.setEvaluationAgency(evaluationAgency);
+        user.setRoleList(roleList);
+
         when(userDao.save(any(UserPO.class))).thenReturn(expectUserPO);
         //action
         User resultUser = userRepo.saveUser(user);
         //assert
         Assert.assertNotNull(resultUser);
     }
+
     @Test
-    public void should_return_user_list_when_get_by_id_list(){
+    public void should_return_user_list_when_get_by_id_list() {
         //arrange
         List<UserPO> expectUserPOList = new LinkedList<>();
         expectUserPOList.add(new UserPO());
@@ -147,7 +172,7 @@ public class UserRepoTest {
     }
 
     @Test
-    public void should_return_user_list_when_get_all_user(){
+    public void should_return_user_list_when_get_all_user() {
         //arrange
         List<UserPO> expectUserPOList = new LinkedList<>();
         expectUserPOList.add(new UserPO());
@@ -160,7 +185,7 @@ public class UserRepoTest {
     }
 
     @Test
-    public void should_return_void_when_remove_user(){
+    public void should_return_void_when_remove_user() {
         //arrange
         User user = new User();
         //action
@@ -170,7 +195,7 @@ public class UserRepoTest {
     }
 
     @Test
-    public void should_return_void_when_remove_user_list(){
+    public void should_return_void_when_remove_user_list() {
         //arrange
         List<User> userList = new LinkedList<>();
         userList.add(new User());