refactor: 废弃group功能 和 对应测试

web/src/main/java/seecoder/devcloud/web/dao/user/GroupMapper.java

@@ -1,33 +1,33 @@
-package seecoder.devcloud.web.dao.user;
-
-
-
-import org.apache.ibatis.annotations.*;
-import seecoder.devcloud.web.dao.provider.GeneralInsertUpdateSqlProvider;
-import seecoder.devcloud.web.model.po.user.Group;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/4
- * @description:
- * todo 因为组和gitlab相连，删除组的功能如要实现需要把gitlab资源也删除
- */
-@Mapper
-public interface GroupMapper {
-
-    /**
-     * group id并非由此后端生成，而是gitlab创建后，将gitlab groupid填入
-     */
-    @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
-    int insert(Group group,String... ignoredCols);
-
-    @UpdateProvider(type= GeneralInsertUpdateSqlProvider.class, method="updateById")
-    int update(Group group);
-
-    @Select("select * from `group` where id = #{id}")
-    Group findGroupById(Integer id);
-
-    @Select("select * from `group` where name = #{name}")
-    Group findGroupByName(String name);
-
-}
+//package seecoder.devcloud.web.dao.user;
+//
+//
+//
+//import org.apache.ibatis.annotations.*;
+//import seecoder.devcloud.web.dao.provider.GeneralInsertUpdateSqlProvider;
+//import seecoder.devcloud.web.model.po.user.Group;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/4
+// * @description:
+// * todo 因为组和gitlab相连，删除组的功能如要实现需要把gitlab资源也删除
+// */
+//@Mapper
+//public interface GroupMapper {
+//
+//    /**
+//     * group id并非由此后端生成，而是gitlab创建后，将gitlab groupid填入
+//     */
+//    @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
+//    int insert(Group group,String... ignoredCols);
+//
+//    @UpdateProvider(type= GeneralInsertUpdateSqlProvider.class, method="updateById")
+//    int update(Group group);
+//
+//    @Select("select * from `group` where id = #{id}")
+//    Group findGroupById(Integer id);
+//
+//    @Select("select * from `group` where name = #{name}")
+//    Group findGroupByName(String name);
+//
+//}

web/src/main/java/seecoder/devcloud/web/dao/user/GroupMemberMapper.java

@@ -1,35 +1,35 @@
-package seecoder.devcloud.web.dao.user;
-
-import org.apache.ibatis.annotations.*;
-import seecoder.devcloud.web.model.po.user.Group;
-import seecoder.devcloud.web.model.po.user.UserPO;
-
-import java.util.List;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/4
- * @description:
- */
-@Mapper
-public interface GroupMemberMapper {
-
-    @Insert("insert into group_member (group_id,user_id) values (#{groupId}, #{userId}) ")
-    int insert(@Param("groupId") int groupId,@Param("userId") int userId);
-
-    @Delete("delete from group_member where group_id = #{groupId} and user_id = #{userId}")
-    int delete(@Param("groupId") int groupId,@Param("userId")  int userId);
-
-    @Select("select user_id from group_member where group_id = #{groupId}")
-    List<Integer> selectUserIdsByGroupId(int groupId);
-
-    @Select("select group_id from group_member where user_id = #{userId}")
-    List<Integer> selectGroupIdsByUserId(int groupId);
-
-    @Select("select u.* from group_member gm, user u where u.id = gm.user_id and gm.group_id = #{groupId}")
-    List<UserPO> selectUsersByGroupId(int groupId);
-
-    @Select("select g.* from group_member gm, group g where g.id = gm.group_id and gm.userId = #{userId}")
-    List<Group> selectGroupsByUserId(int userId);
-
-}
+//package seecoder.devcloud.web.dao.user;
+//
+//import org.apache.ibatis.annotations.*;
+//import seecoder.devcloud.web.model.po.user.Group;
+//import seecoder.devcloud.web.model.po.user.UserPO;
+//
+//import java.util.List;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/4
+// * @description:
+// */
+//@Mapper
+//public interface GroupMemberMapper {
+//
+//    @Insert("insert into group_member (group_id,user_id) values (#{groupId}, #{userId}) ")
+//    int insert(@Param("groupId") int groupId,@Param("userId") int userId);
+//
+//    @Delete("delete from group_member where group_id = #{groupId} and user_id = #{userId}")
+//    int delete(@Param("groupId") int groupId,@Param("userId")  int userId);
+//
+//    @Select("select user_id from group_member where group_id = #{groupId}")
+//    List<Integer> selectUserIdsByGroupId(int groupId);
+//
+//    @Select("select group_id from group_member where user_id = #{userId}")
+//    List<Integer> selectGroupIdsByUserId(int groupId);
+//
+//    @Select("select u.* from group_member gm, user u where u.id = gm.user_id and gm.group_id = #{groupId}")
+//    List<UserPO> selectUsersByGroupId(int groupId);
+//
+//    @Select("select g.* from group_member gm, group g where g.id = gm.group_id and gm.userId = #{userId}")
+//    List<Group> selectGroupsByUserId(int userId);
+//
+//}

web/src/main/java/seecoder/devcloud/web/model/vo/user/GroupVO.java

@@ -1,28 +1,28 @@
-package seecoder.devcloud.web.model.vo.user;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import seecoder.devcloud.web.model.po.user.Group;
-
-/**
- * @EnumName GroupVO
- * @PackageName com.moekr.moocoder.logic.Serializer
- * @Author sheen
- * @Date 2019/1/9
- * @Version 1.0
- * @Description //TODO
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class GroupVO {
-    private Integer id;
-    private String name;
-
-    public GroupVO(Group group) {
-        this.id=group.getId();
-        this.name=group.getName();
-    }
-
-}
+//package seecoder.devcloud.web.model.vo.user;
+//
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import seecoder.devcloud.web.model.po.user.Group;
+//
+///**
+// * @EnumName GroupVO
+// * @PackageName com.moekr.moocoder.logic.Serializer
+// * @Author sheen
+// * @Date 2019/1/9
+// * @Version 1.0
+// * @Description //TODO
+// **/
+//@Data
+//@NoArgsConstructor
+//@AllArgsConstructor
+//public class GroupVO {
+//    private Integer id;
+//    private String name;
+//
+//    public GroupVO(Group group) {
+//        this.id=group.getId();
+//        this.name=group.getName();
+//    }
+//
+//}

web/src/test/java/seecoder/devcloud/web/dao/project/ProjectMapperTest.java

@@ -6,23 +6,17 @@ import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.test.context.junit4.SpringRunner;
-import seecoder.devcloud.web.dao.user.GroupMemberMapper;
 import seecoder.devcloud.web.model.po.project.Project;
 
-import java.util.List;
-
 @RunWith(SpringRunner.class)
 @MybatisTest
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 public class ProjectMapperTest {
     @Autowired
     ProjectMapper projectMapper;
-    @Autowired
-    GroupMemberMapper groupMemberMapper;
-
     @Test
     public void testInsert(){
-        Project project = new Project(null,"TEST","JUST A TEST","seecoder.cn",2);
+        Project project = new Project(null,"TEST","JUST A TEST","seecoder.cn");
         projectMapper.insertProject(project);
         Project project2 = projectMapper.getProjectById(project.getId());
         assert project.equals(project2);
@@ -34,7 +28,6 @@ public class ProjectMapperTest {
         project2.setName("modify");
         project2.setDescription("modify description");
         project2.setGitRemoteUrl("www.google.com");
-        project2.setGroupId(7);
         projectMapper.updateProject(project2);
         Project project = projectMapper.getProjectById(1);
         System.out.println(project);
@@ -43,15 +36,15 @@ public class ProjectMapperTest {
 
     @Test
     public void testListProjectsByGroupId(){
-        List<Project> projects = projectMapper.listProjectsByGroupId(1);
-        boolean res = true;
-        for (Project project:projects){
-            if(project.getGroupId()!=1){
-                res = false;
-                break;
-            }
-        }
-        assert res;
+//        List<Project> projects = projectMapper.listProjectsByGroupId(1);
+//        boolean res = true;
+//        for (Project project:projects){
+//            if(project.getGroupId()!=1){
+//                res = false;
+//                break;
+//            }
+//        }
+//        assert res;
     }
 
     /**
@@ -59,20 +52,20 @@ public class ProjectMapperTest {
      */
 //    @Test
     public void testListProjectsByUserId(){
-        Project project = new Project(0,"test","seecoder.cn","decription",2);
-        projectMapper.insertProject(project);
-        // TODO:插入如下两条数据
-//        groupMemberMapper.insert(2,1);
-//        groupMemberMapper.insert(1,1);
-        List<Project> projects = projectMapper.listProjectsByUserId(1);
-        boolean res = true;
-        for (Project project1:projects){
-            System.out.println(project1);
-            if(project1.getGroupId()!=1||project1.getGroupId()!=2){
-                res = false;
-                break;
-            }
-        }
-        assert res;
+//        Project project = new Project(0,"test","seecoder.cn","decription");
+//        projectMapper.insertProject(project);
+//        // TODO:插入如下两条数据
+////        groupMemberMapper.insert(2,1);
+////        groupMemberMapper.insert(1,1);
+//        List<Project> projects = projectMapper.listProjectsByUserId(1);
+//        boolean res = true;
+//        for (Project project1:projects){
+//            System.out.println(project1);
+//            if(project1.getGroupId()!=1||project1.getGroupId()!=2){
+//                res = false;
+//                break;
+//            }
+//        }
+//        assert res;
     }
 }

web/src/test/java/seecoder/devcloud/web/dao/user/GroupMapperTest.java

@@ -1,26 +1,26 @@
-package seecoder.devcloud.web.dao.user;
-
-import org.junit.runner.RunWith;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/4
- * @description:
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
-class GroupMapperTest {
-
-    @Autowired
-    private final GroupMapper groupMapper;
-
-    GroupMapperTest(GroupMapper groupMapper) {
-        this.groupMapper = groupMapper;
-    }
-
-}
+//package seecoder.devcloud.web.dao.user;
+//
+//import org.junit.runner.RunWith;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/4
+// * @description:
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+//class GroupMapperTest {
+//
+//    @Autowired
+//    private final GroupMapper groupMapper;
+//
+//    GroupMapperTest(GroupMapper groupMapper) {
+//        this.groupMapper = groupMapper;
+//    }
+//
+//}

web/src/test/java/seecoder/devcloud/web/dao/user/GroupMemberMapperTest.java

@@ -1,44 +1,44 @@
-package seecoder.devcloud.web.dao.user;
-
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/4
- * @description: 与gitlab交互，没有办法配事务，只能手动测试。mvn test的时候请排除这个类
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
-class GroupMemberMapperTest {
-
-
-    private final GroupMemberMapper groupMemberMapper;
-
-    @Autowired
-    GroupMemberMapperTest(GroupMemberMapper groupMemberMapper) {
-        this.groupMemberMapper = groupMemberMapper;
-    }
-
-
-    @Test
-    void selectUsersByGroupId() {
-        try{
-            System.out.println(groupMemberMapper.selectUsersByGroupId(47));
-        } catch (Exception e){
-            Assert.fail(e.getMessage());
-        }
-
-    }
-
-    @Test
-    void selectGroupsByUserId() {
-    }
-}
+//package seecoder.devcloud.web.dao.user;
+//
+//import org.junit.Assert;
+//import org.junit.jupiter.api.Test;
+//import org.junit.runner.RunWith;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.context.annotation.ComponentScan;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/4
+// * @description: 与gitlab交互，没有办法配事务，只能手动测试。mvn test的时候请排除这个类
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+//class GroupMemberMapperTest {
+//
+//
+//    private final GroupMemberMapper groupMemberMapper;
+//
+//    @Autowired
+//    GroupMemberMapperTest(GroupMemberMapper groupMemberMapper) {
+//        this.groupMemberMapper = groupMemberMapper;
+//    }
+//
+//
+//    @Test
+//    void selectUsersByGroupId() {
+//        try{
+//            System.out.println(groupMemberMapper.selectUsersByGroupId(47));
+//        } catch (Exception e){
+//            Assert.fail(e.getMessage());
+//        }
+//
+//    }
+//
+//    @Test
+//    void selectGroupsByUserId() {
+//    }
+//}

web/src/test/java/seecoder/devcloud/web/service/user/GroupServiceTest.java

@@ -1,87 +1,87 @@
-package seecoder.devcloud.web.service.user;
-
-import org.gitlab4j.api.GitLabApi;
-import org.gitlab4j.api.GitLabApiException;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import seecoder.devcloud.api.ApplicationProperties;
-import seecoder.devcloud.common.exceptions.EntityNotFoundException;
-import seecoder.devcloud.common.exceptions.ServiceException;
-
-/**
- * @author PuHong Weng
- * @date 2021/3/4
- * @description: 与gitlab交互，没有办法配事务，只能手动测试。mvn test的时候请排除这个类
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
-//@Transactional
-class GroupServiceTest {
-
-    @Autowired
-    GroupService groupService;
-
-    @Autowired
-    UserService userService;
-
-    @Autowired
-    ApplicationProperties properties;
-
-    /**
-     * 注意 GitlabApi 和 GitLabApi 区别
-     * GitlabApi 是我们对 GitLabApi 的一个小封装
-     * 这里作辅助测试用
-     */
-    GitLabApi gitLabApi;
-
-    @BeforeEach
-    void setUp() {
-        gitLabApi = new GitLabApi(properties.getGitlab().getHost(), properties.getGitlab().getToken());
-    }
-
-    @Test
-    void help(){
-        try {
-            //gitLabApi.getGroupApi().deleteGroup(46);
-            System.out.println(gitLabApi.getGroupApi().getGroups());
-        } catch (GitLabApiException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    @Test
-    void createGroup() {
-        int userId = 36;
-        try {
-            System.out.println(groupService.createGroup("test"));
-        } catch (Exception e) {
-            Assert.fail(e.getMessage());
-        }
-    }
-
-    @Test
-    void addMember() {
-        int groupId = 51;
-        int userId = 36;
-        int invitedUserId = 37;
-        try {
-            groupService.addMember(invitedUserId, groupId);
-        } catch (EntityNotFoundException e) {
-            e.printStackTrace();
-            Assert.fail(e.getMessage());
-        } catch (ServiceException serviceException) {
-            serviceException.printStackTrace();
-        }
-
-    }
-
-
-}
+//package seecoder.devcloud.web.service.user;
+//
+//import org.gitlab4j.api.GitLabApi;
+//import org.gitlab4j.api.GitLabApiException;
+//import org.junit.Assert;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
+//import org.junit.runner.RunWith;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//import seecoder.devcloud.api.ApplicationProperties;
+//import seecoder.devcloud.common.exceptions.EntityNotFoundException;
+//import seecoder.devcloud.common.exceptions.ServiceException;
+//
+///**
+// * @author PuHong Weng
+// * @date 2021/3/4
+// * @description: 与gitlab交互，没有办法配事务，只能手动测试。mvn test的时候请排除这个类
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+////@Transactional
+//class GroupServiceTest {
+//
+//    @Autowired
+//    GroupService groupService;
+//
+//    @Autowired
+//    UserService userService;
+//
+//    @Autowired
+//    ApplicationProperties properties;
+//
+//    /**
+//     * 注意 GitlabApi 和 GitLabApi 区别
+//     * GitlabApi 是我们对 GitLabApi 的一个小封装
+//     * 这里作辅助测试用
+//     */
+//    GitLabApi gitLabApi;
+//
+//    @BeforeEach
+//    void setUp() {
+//        gitLabApi = new GitLabApi(properties.getGitlab().getHost(), properties.getGitlab().getToken());
+//    }
+//
+//    @Test
+//    void help(){
+//        try {
+//            //gitLabApi.getGroupApi().deleteGroup(46);
+//            System.out.println(gitLabApi.getGroupApi().getGroups());
+//        } catch (GitLabApiException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//
+//    @Test
+//    void createGroup() {
+//        int userId = 36;
+//        try {
+//            System.out.println(groupService.createGroup("test"));
+//        } catch (Exception e) {
+//            Assert.fail(e.getMessage());
+//        }
+//    }
+//
+//    @Test
+//    void addMember() {
+//        int groupId = 51;
+//        int userId = 36;
+//        int invitedUserId = 37;
+//        try {
+//            groupService.addMember(invitedUserId, groupId);
+//        } catch (EntityNotFoundException e) {
+//            e.printStackTrace();
+//            Assert.fail(e.getMessage());
+//        } catch (ServiceException serviceException) {
+//            serviceException.printStackTrace();
+//        }
+//
+//    }
+//
+//
+//}